/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: 2012-05-26 22:21:17 UTC
  • mto: This revision was merged to the branch mainline in revision 591.
  • Revision ID: teddy@recompile.se-20120526222117-2n4oeb3hqyq4rjdh
* mandos: Implement "--socket" option.
  (IPv6_TCPServer.__init__): Take new "socketfd" parameter; use it.
  (MandosServer.__init__): Take new "socketfd" parameter.  Pass it on
                           to IPv6_TCPServer constructor.
  (main): Take new "--socket" option.  Also take "socket" parameter in
          "mandos.conf" configuration file.  If set, pass the value to
          MandosServer constructor.
* mandos-options.xml (socket): Document new "socket" option.
* mandos-conf.xml (OPTIONS): - '' -
* mandos.xml (SYNOPSIS, OPTIONS): Document new "--socket" 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.6.4
 
26
version=1.5.4
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
        if locale --all | grep --regexp='^en_US\.utf8$$' && type man \
 
75
        2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 man \
 
76
        --warnings --encoding=UTF-8 --local-file $(notdir $@); fi \
 
77
        >/dev/null)
90
78
# DocBook-to-man post-processing to fix a '\n' escape bug
91
79
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
92
80
 
253
241
 
254
242
check:  all
255
243
        ./mandos --check
256
 
        ./mandos-ctl --check
257
244
 
258
245
# Run the client with a local config and key
259
246
run-client: all keydir/seckey.txt keydir/pubkey.txt
304
291
 
305
292
install-server: doc
306
293
        install --directory $(CONFDIR)
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
        install --directory --mode=u=rwx --owner=$(USER) \
 
295
                --group=$(GROUP) $(STATEDIR)
313
296
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
314
297
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
315
298
                mandos-ctl
323
306
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
324
307
        install --mode=u=rwx,go=rx init.d-mandos \
325
308
                $(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
329
309
        install --mode=u=rw,go=r default-mandos \
330
310
                $(DESTDIR)/etc/default/mandos
331
311
        if [ -z $(DESTDIR) ]; then \
345
325
                > $(MANDIR)/man8/intro.8mandos.gz
346
326
 
347
327
install-client-nokey: all doc
348
 
        install --directory $(LIBDIR)/mandos $(CONFDIR)
 
328
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
349
329
        install --directory --mode=u=rwx $(KEYDIR) \
350
 
                $(LIBDIR)/mandos/plugins.d
351
 
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
 
330
                $(PREFIX)/lib/mandos/plugins.d
 
331
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
352
332
                install --mode=u=rwx \
353
333
                        --directory "$(CONFDIR)/plugins.d"; \
354
334
        fi
355
335
        install --mode=u=rwx,go=rx --directory \
356
336
                "$(CONFDIR)/network-hooks.d"
357
337
        install --mode=u=rwx,go=rx \
358
 
                --target-directory=$(LIBDIR)/mandos plugin-runner
 
338
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
359
339
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
360
340
                mandos-keygen
361
341
        install --mode=u=rwx,go=rx \
362
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
342
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
363
343
                plugins.d/password-prompt
364
344
        install --mode=u=rwxs,go=rx \
365
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
345
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
366
346
                plugins.d/mandos-client
367
347
        install --mode=u=rwxs,go=rx \
368
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
348
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
369
349
                plugins.d/usplash
370
350
        install --mode=u=rwxs,go=rx \
371
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
351
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
372
352
                plugins.d/splashy
373
353
        install --mode=u=rwxs,go=rx \
374
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
354
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
375
355
                plugins.d/askpass-fifo
376
356
        install --mode=u=rwxs,go=rx \
377
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
357
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
378
358
                plugins.d/plymouth
379
359
        install initramfs-tools-hook \
380
360
                $(INITRAMFSTOOLS)/hooks/mandos
426
406
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
427
407
                $(DESTDIR)/etc/crypttab
428
408
        -rm --force $(PREFIX)/sbin/mandos-keygen \
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 \
 
409
                $(PREFIX)/lib/mandos/plugin-runner \
 
410
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
 
411
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
 
412
                $(PREFIX)/lib/mandos/plugins.d/usplash \
 
413
                $(PREFIX)/lib/mandos/plugins.d/splashy \
 
414
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
 
415
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
436
416
                $(INITRAMFSTOOLS)/hooks/mandos \
437
417
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
438
418
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
444
424
                $(MANDIR)/man8/splashy.8mandos.gz \
445
425
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
446
426
                $(MANDIR)/man8/plymouth.8mandos.gz \
447
 
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
448
 
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
 
427
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
 
428
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
449
429
        update-initramfs -k all -u
450
430
 
451
431
purge: purge-server purge-client
455
435
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
456
436
                $(DESTDIR)/etc/default/mandos \
457
437
                $(DESTDIR)/etc/init.d/mandos \
458
 
                $(SYSTEMD)/mandos.service \
459
 
                $(DESTDIR)/run/mandos.pid \
460
438
                $(DESTDIR)/var/run/mandos.pid
461
439
        -rmdir $(CONFDIR)
462
440