/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: 2014-01-20 20:54:47 UTC
  • Revision ID: teddy@recompile.se-20140120205447-z5fwrk7r2y9gkbfg
Documentation change to clarify support of --connect option.

* plugins.d/mandos.xml (OPTIONS): Clarify support of --connect option.

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