/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to Makefile

* mandos (AvahiService.entry_group_state_changed): Better debug log
                                                   message.
  (AvahiService.server_state_changed): Added debug log message.

* mandos-monitor (isoformat_to_datetime): New function.
  (MandosClientWidget): Show a countdown to disabling if last checker
                        failed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
5
5
        -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings \
6
6
        -Wconversion -Wstrict-prototypes -Wold-style-definition \
7
7
        -Wpacked -Wnested-externs -Winline -Wvolatile-register-var
8
 
#       -Wunreachable-code
 
8
#       -Wunreachable-code 
9
9
#DEBUG=-ggdb3
10
10
# For info about _FORTIFY_SOURCE, see
11
11
# <http://www.kernel.org/doc/man-pages/online/pages/man7/feature_test_macros.7.html>
23
23
OPTIMIZE=-Os
24
24
LANGUAGE=-std=gnu99
25
25
htmldir=man
26
 
version=1.6.2
 
26
version=1.0.14
27
27
SED=sed
28
28
 
29
 
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
30
 
GROUP=$(firstword $(subst :, ,$(shell getent group _mandos || getent group nobody || echo 65534)))
31
 
 
32
29
## Use these settings for a traditional /usr/local install
33
30
# PREFIX=$(DESTDIR)/usr/local
34
31
# CONFDIR=$(DESTDIR)/etc/mandos
35
32
# KEYDIR=$(DESTDIR)/etc/mandos/keys
36
33
# MANDIR=$(PREFIX)/man
37
34
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
38
 
# STATEDIR=$(DESTDIR)/var/lib/mandos
39
35
##
40
36
 
41
37
## These settings are for a package-type install
44
40
KEYDIR=$(DESTDIR)/etc/keys/mandos
45
41
MANDIR=$(PREFIX)/share/man
46
42
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
47
 
STATEDIR=$(DESTDIR)/var/lib/mandos
48
43
##
49
44
 
50
45
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
56
51
        getconf LFS_LDFLAGS)
57
52
 
58
53
# Do not change these two
59
 
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
 
54
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
60
55
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
61
56
        -DVERSION='"$(version)"'
62
 
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
57
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
63
58
 
64
59
# Commands to format a DocBook <refentry> document into a manual page
65
60
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
68
63
        --param make.single.year.ranges         1 \
69
64
        --param man.output.quietly              1 \
70
65
        --param man.authors.section.enabled     0 \
71
 
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
 
66
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
72
67
        $(notdir $<); \
73
 
        $(MANPOST) $(notdir $@);\
74
 
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
75
 
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
76
 
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
77
 
        fi >/dev/null)
 
68
        $(MANPOST) $(notdir $@))
78
69
# DocBook-to-man post-processing to fix a '\n' escape bug
79
70
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
80
71
 
92
83
        --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
93
84
 
94
85
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
95
 
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
96
 
        plugins.d/plymouth
 
86
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
97
87
CPROGS=plugin-runner $(PLUGINS)
98
 
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
99
 
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
100
 
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
 
88
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
 
89
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
101
90
        plugins.d/mandos-client.8mandos \
102
 
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
103
 
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
104
 
        plugins.d/plymouth.8mandos intro.8mandos
 
91
        plugins.d/password-prompt.8mandos mandos.conf.5 \
 
92
        plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
 
93
        plugins.d/askpass-fifo.8mandos mandos-clients.conf.5
105
94
 
106
95
htmldocs=$(addsuffix .xhtml,$(DOCS))
107
96
 
128
117
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
129
118
        $(DOCBOOKTOHTML)
130
119
 
131
 
intro.8mandos: intro.xml common.ent legalnotice.xml
132
 
        $(DOCBOOKTOMAN)
133
 
intro.8mandos.xhtml: intro.xml common.ent legalnotice.xml
134
 
        $(DOCBOOKTOHTML)
135
 
 
136
120
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
137
121
                legalnotice.xml
138
122
        $(DOCBOOKTOMAN)
147
131
                 legalnotice.xml
148
132
        $(DOCBOOKTOHTML)
149
133
 
150
 
mandos-monitor.8: mandos-monitor.xml common.ent overview.xml \
151
 
                legalnotice.xml
152
 
        $(DOCBOOKTOMAN)
153
 
mandos-monitor.8.xhtml: mandos-monitor.xml common.ent overview.xml \
154
 
                 legalnotice.xml
155
 
        $(DOCBOOKTOHTML)
156
 
 
157
 
mandos-ctl.8: mandos-ctl.xml common.ent overview.xml \
158
 
                legalnotice.xml
159
 
        $(DOCBOOKTOMAN)
160
 
mandos-ctl.8.xhtml: mandos-ctl.xml common.ent overview.xml \
161
 
                 legalnotice.xml
162
 
        $(DOCBOOKTOHTML)
163
 
 
164
134
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
165
135
                legalnotice.xml
166
136
        $(DOCBOOKTOMAN)
207
177
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
208
178
                $@)
209
179
 
210
 
mandos-monitor: Makefile
211
 
        $(strip $(SED) --in-place \
212
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
213
 
                $@)
214
 
 
215
180
mandos.lsm: Makefile
216
181
        $(strip $(SED) --in-place \
217
182
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
224
189
                $@)
225
190
 
226
191
plugins.d/mandos-client: plugins.d/mandos-client.c
227
 
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
228
 
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
 
192
        $(LINK.c) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) $(strip\
 
193
                ) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
229
194
 
230
195
.PHONY : all doc html clean distclean run-client run-server install \
231
196
        install-server install-client uninstall uninstall-server \
237
202
distclean: clean
238
203
mostlyclean: clean
239
204
maintainer-clean: clean
240
 
        -rm --force --recursive keydir confdir statedir
 
205
        -rm --force --recursive keydir confdir
241
206
 
242
207
check:  all
243
208
        ./mandos --check
244
 
        ./mandos-ctl --check
245
209
 
246
210
# Run the client with a local config and key
247
211
run-client: all keydir/seckey.txt keydir/pubkey.txt
248
 
        @echo "###################################################################"
249
 
        @echo "# The following error messages are harmless and can be safely     #"
250
 
        @echo "# ignored.  The messages are caused by not running as root, but   #"
251
 
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
252
 
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
253
 
        @echo "# From plugin-runner: setuid: Operation not permitted             #"
254
 
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
255
 
        @echo "# From mandos-client: setuid: Operation not permitted             #"
256
 
        @echo "#                     seteuid: Operation not permitted            #"
257
 
        @echo "#                     klogctl: Operation not permitted            #"
258
 
        @echo "###################################################################"
259
212
        ./plugin-runner --plugin-dir=plugins.d \
260
213
                --config-file=plugin-runner.conf \
261
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
 
214
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
262
215
                $(CLIENTARGS)
263
216
 
264
217
# Used by run-client
267
220
        ./mandos-keygen --dir keydir --force
268
221
 
269
222
# Run the server with a local config
270
 
run-server: confdir/mandos.conf confdir/clients.conf statedir
271
 
        ./mandos --debug --no-dbus --configdir=confdir \
272
 
                --statedir=statedir $(SERVERARGS)
 
223
run-server: confdir/mandos.conf confdir/clients.conf
 
224
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
273
225
 
274
226
# Used by run-server
275
227
confdir/mandos.conf: mandos.conf
280
232
        install --mode=u=rw $< $@
281
233
# Add a client password
282
234
        ./mandos-keygen --dir keydir --password >> $@
283
 
statedir:
284
 
        install --directory statedir
285
235
 
286
236
install: install-server install-client-nokey
287
237
 
292
242
 
293
243
install-server: doc
294
244
        install --directory $(CONFDIR)
295
 
        install --directory --mode=u=rwx --owner=$(USER) \
296
 
                --group=$(GROUP) $(STATEDIR)
297
245
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
298
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
299
 
                mandos-ctl
300
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
301
 
                mandos-monitor
302
246
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
303
247
                mandos.conf
304
248
        install --mode=u=rw --target-directory=$(CONFDIR) \
305
249
                clients.conf
306
 
        install --mode=u=rw,go=r dbus-mandos.conf \
307
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
308
250
        install --mode=u=rwx,go=rx init.d-mandos \
309
251
                $(DESTDIR)/etc/init.d/mandos
310
252
        install --mode=u=rw,go=r default-mandos \
314
256
        fi
315
257
        gzip --best --to-stdout mandos.8 \
316
258
                > $(MANDIR)/man8/mandos.8.gz
317
 
        gzip --best --to-stdout mandos-monitor.8 \
318
 
                > $(MANDIR)/man8/mandos-monitor.8.gz
319
 
        gzip --best --to-stdout mandos-ctl.8 \
320
 
                > $(MANDIR)/man8/mandos-ctl.8.gz
321
259
        gzip --best --to-stdout mandos.conf.5 \
322
260
                > $(MANDIR)/man5/mandos.conf.5.gz
323
261
        gzip --best --to-stdout mandos-clients.conf.5 \
324
262
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
325
 
        gzip --best --to-stdout intro.8mandos \
326
 
                > $(MANDIR)/man8/intro.8mandos.gz
327
263
 
328
264
install-client-nokey: all doc
329
265
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
333
269
                install --mode=u=rwx \
334
270
                        --directory "$(CONFDIR)/plugins.d"; \
335
271
        fi
336
 
        install --mode=u=rwx,go=rx --directory \
337
 
                "$(CONFDIR)/network-hooks.d"
338
272
        install --mode=u=rwx,go=rx \
339
273
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
340
274
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
354
288
        install --mode=u=rwxs,go=rx \
355
289
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
356
290
                plugins.d/askpass-fifo
357
 
        install --mode=u=rwxs,go=rx \
358
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
359
 
                plugins.d/plymouth
360
291
        install initramfs-tools-hook \
361
292
                $(INITRAMFSTOOLS)/hooks/mandos
362
293
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
368
299
                > $(MANDIR)/man8/mandos-keygen.8.gz
369
300
        gzip --best --to-stdout plugin-runner.8mandos \
370
301
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
302
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
 
303
                > $(MANDIR)/man8/password-prompt.8mandos.gz
371
304
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
372
305
                > $(MANDIR)/man8/mandos-client.8mandos.gz
373
 
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
374
 
                > $(MANDIR)/man8/password-prompt.8mandos.gz
375
306
        gzip --best --to-stdout plugins.d/usplash.8mandos \
376
307
                > $(MANDIR)/man8/usplash.8mandos.gz
377
308
        gzip --best --to-stdout plugins.d/splashy.8mandos \
378
309
                > $(MANDIR)/man8/splashy.8mandos.gz
379
310
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
380
311
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
381
 
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
382
 
                > $(MANDIR)/man8/plymouth.8mandos.gz
383
312
 
384
313
install-client: install-client-nokey
385
314
# Post-installation stuff
391
320
 
392
321
uninstall-server:
393
322
        -rm --force $(PREFIX)/sbin/mandos \
394
 
                $(PREFIX)/sbin/mandos-ctl \
395
 
                $(PREFIX)/sbin/mandos-monitor \
396
323
                $(MANDIR)/man8/mandos.8.gz \
397
 
                $(MANDIR)/man8/mandos-monitor.8.gz \
398
 
                $(MANDIR)/man8/mandos-ctl.8.gz \
399
324
                $(MANDIR)/man5/mandos.conf.5.gz \
400
325
                $(MANDIR)/man5/mandos-clients.conf.5.gz
401
326
        update-rc.d -f mandos remove
413
338
                $(PREFIX)/lib/mandos/plugins.d/usplash \
414
339
                $(PREFIX)/lib/mandos/plugins.d/splashy \
415
340
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
416
 
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
417
341
                $(INITRAMFSTOOLS)/hooks/mandos \
418
342
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
419
343
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
344
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
420
345
                $(MANDIR)/man8/mandos-keygen.8.gz \
421
 
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
422
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
423
346
                $(MANDIR)/man8/password-prompt.8mandos.gz \
424
347
                $(MANDIR)/man8/usplash.8mandos.gz \
425
348
                $(MANDIR)/man8/splashy.8mandos.gz \
426
349
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
427
 
                $(MANDIR)/man8/plymouth.8mandos.gz \
 
350
                $(MANDIR)/man8/mandos-client.8mandos.gz
428
351
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
429
352
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
430
353
        update-initramfs -k all -u
433
356
 
434
357
purge-server: uninstall-server
435
358
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
436
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
437
359
                $(DESTDIR)/etc/default/mandos \
438
360
                $(DESTDIR)/etc/init.d/mandos \
439
 
                $(DESTDIR)/run/mandos.pid
 
361
                $(DESTDIR)/var/run/mandos.pid
440
362
        -rmdir $(CONFDIR)
441
363
 
442
364
purge-client: uninstall-client