/mandos/trunk

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

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: Teddy Hogeborn
  • Date: 2011-11-26 23:08:17 UTC
  • mto: (518.1.8 mandos-persistent)
  • mto: This revision was merged to the branch mainline in revision 524.
  • Revision ID: teddy@recompile.se-20111126230817-tv08v831s2yltbkd
Make "enabled" a client config option.

* DBUS-API: Fix wording on "Expires" option.
* clients.conf (enabled): New.
* mandos (Client): "last_enabled" can now be None.
  (Client.__init__): Get "enabled" from config.  Only set
                     "last_enabled" and "expires" if enabled.
  (ClientDBus.Created_dbus_property): Removed redundant dbus.String().
  (ClientDBus.Interval_dbus_property): If changed, only reschedule
                                       checker if enabled.
  (main/special_settings): Added "enabled".
* mandos-clients.conf (OPTIONS): Added "enabled".

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
23
23
OPTIMIZE=-Os
24
24
LANGUAGE=-std=gnu99
25
25
htmldir=man
26
 
version=1.6.2
 
26
version=1.4.1
27
27
SED=sed
28
28
 
29
29
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
36
36
# MANDIR=$(PREFIX)/man
37
37
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
38
38
# STATEDIR=$(DESTDIR)/var/lib/mandos
39
 
# LIBDIR=$(PREFIX)/lib
40
39
##
41
40
 
42
41
## These settings are for a package-type install
46
45
MANDIR=$(PREFIX)/share/man
47
46
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
48
47
STATEDIR=$(DESTDIR)/var/lib/mandos
49
 
LIBDIR=$(shell \
50
 
        for d in \
51
 
        "/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null`" \
52
 
        "`rpm --eval='%{_libdir}' 2>/dev/null`" /usr/lib; do \
53
 
                if [ -d "$$d" -a "$$d" = "$${d%/}" ]; then \
54
 
                        echo "$(DESTDIR)$$d"; \
55
 
                        break; \
56
 
                fi; \
57
 
        done)
58
48
##
59
49
 
60
 
SYSTEMD=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
61
 
 
62
50
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
63
51
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
64
52
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
68
56
        getconf LFS_LDFLAGS)
69
57
 
70
58
# Do not change these two
71
 
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
 
59
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
72
60
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
73
61
        -DVERSION='"$(version)"'
74
 
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
62
LDFLAGS=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
75
63
 
76
64
# Commands to format a DocBook <refentry> document into a manual page
77
65
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
80
68
        --param make.single.year.ranges         1 \
81
69
        --param man.output.quietly              1 \
82
70
        --param man.authors.section.enabled     0 \
83
 
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
 
71
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
84
72
        $(notdir $<); \
85
73
        $(MANPOST) $(notdir $@);\
86
 
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
87
 
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
88
 
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
89
 
        fi >/dev/null)
 
74
        LANG=en_US.UTF-8 MANWIDTH=80 man --warnings --encoding=UTF-8 \
 
75
        --local-file $(notdir $@) >/dev/null)
90
76
# DocBook-to-man post-processing to fix a '\n' escape bug
91
77
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
92
78
 
253
239
 
254
240
check:  all
255
241
        ./mandos --check
256
 
        ./mandos-ctl --check
257
242
 
258
243
# Run the client with a local config and key
259
244
run-client: all keydir/seckey.txt keydir/pubkey.txt
270
255
        @echo "###################################################################"
271
256
        ./plugin-runner --plugin-dir=plugins.d \
272
257
                --config-file=plugin-runner.conf \
273
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
 
258
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
274
259
                $(CLIENTARGS)
275
260
 
276
261
# Used by run-client
279
264
        ./mandos-keygen --dir keydir --force
280
265
 
281
266
# Run the server with a local config
282
 
run-server: confdir/mandos.conf confdir/clients.conf statedir
 
267
run-server: confdir/mandos.conf confdir/clients.conf
283
268
        ./mandos --debug --no-dbus --configdir=confdir \
284
269
                --statedir=statedir $(SERVERARGS)
285
270
 
319
304
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
320
305
        install --mode=u=rwx,go=rx init.d-mandos \
321
306
                $(DESTDIR)/etc/init.d/mandos
322
 
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
323
 
                install --mode=u=rw,go=r mandos.service $(SYSTEMD); \
324
 
        fi
325
307
        install --mode=u=rw,go=r default-mandos \
326
308
                $(DESTDIR)/etc/default/mandos
327
309
        if [ -z $(DESTDIR) ]; then \
337
319
                > $(MANDIR)/man5/mandos.conf.5.gz
338
320
        gzip --best --to-stdout mandos-clients.conf.5 \
339
321
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
340
 
        gzip --best --to-stdout intro.8mandos \
341
 
                > $(MANDIR)/man8/intro.8mandos.gz
342
322
 
343
323
install-client-nokey: all doc
344
 
        install --directory $(LIBDIR)/mandos $(CONFDIR)
 
324
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
345
325
        install --directory --mode=u=rwx $(KEYDIR) \
346
 
                $(LIBDIR)/mandos/plugins.d
347
 
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
 
326
                $(PREFIX)/lib/mandos/plugins.d
 
327
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
348
328
                install --mode=u=rwx \
349
329
                        --directory "$(CONFDIR)/plugins.d"; \
350
330
        fi
351
 
        install --mode=u=rwx,go=rx --directory \
352
 
                "$(CONFDIR)/network-hooks.d"
353
331
        install --mode=u=rwx,go=rx \
354
 
                --target-directory=$(LIBDIR)/mandos plugin-runner
 
332
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
355
333
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
356
334
                mandos-keygen
357
335
        install --mode=u=rwx,go=rx \
358
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
336
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
359
337
                plugins.d/password-prompt
360
338
        install --mode=u=rwxs,go=rx \
361
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
339
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
362
340
                plugins.d/mandos-client
363
341
        install --mode=u=rwxs,go=rx \
364
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
342
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
365
343
                plugins.d/usplash
366
344
        install --mode=u=rwxs,go=rx \
367
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
345
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
368
346
                plugins.d/splashy
369
347
        install --mode=u=rwxs,go=rx \
370
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
348
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
371
349
                plugins.d/askpass-fifo
372
350
        install --mode=u=rwxs,go=rx \
373
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
351
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
374
352
                plugins.d/plymouth
375
353
        install initramfs-tools-hook \
376
354
                $(INITRAMFSTOOLS)/hooks/mandos
422
400
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
423
401
                $(DESTDIR)/etc/crypttab
424
402
        -rm --force $(PREFIX)/sbin/mandos-keygen \
425
 
                $(LIBDIR)/mandos/plugin-runner \
426
 
                $(LIBDIR)/mandos/plugins.d/password-prompt \
427
 
                $(LIBDIR)/mandos/plugins.d/mandos-client \
428
 
                $(LIBDIR)/mandos/plugins.d/usplash \
429
 
                $(LIBDIR)/mandos/plugins.d/splashy \
430
 
                $(LIBDIR)/mandos/plugins.d/askpass-fifo \
431
 
                $(LIBDIR)/mandos/plugins.d/plymouth \
 
403
                $(PREFIX)/lib/mandos/plugin-runner \
 
404
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
 
405
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
 
406
                $(PREFIX)/lib/mandos/plugins.d/usplash \
 
407
                $(PREFIX)/lib/mandos/plugins.d/splashy \
 
408
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
 
409
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
432
410
                $(INITRAMFSTOOLS)/hooks/mandos \
433
411
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
434
412
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
440
418
                $(MANDIR)/man8/splashy.8mandos.gz \
441
419
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
442
420
                $(MANDIR)/man8/plymouth.8mandos.gz \
443
 
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
444
 
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
 
421
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
 
422
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
445
423
        update-initramfs -k all -u
446
424
 
447
425
purge: purge-server purge-client
451
429
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
452
430
                $(DESTDIR)/etc/default/mandos \
453
431
                $(DESTDIR)/etc/init.d/mandos \
454
 
                $(SYSTEMD)/mandos.service \
455
 
                $(DESTDIR)/run/mandos.pid \
456
432
                $(DESTDIR)/var/run/mandos.pid
457
433
        -rmdir $(CONFDIR)
458
434