/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: 2019-08-18 00:42:22 UTC
  • Revision ID: teddy@recompile.se-20190818004222-lfrgtnmqz766a08e
Client: Use the systemd sysusers.d mechanism, if present

* Makefile (install-client-nokey): Also install sysusers.d file, if
                                   $(SYSUSERS) exists.
* sysusers.d-mandos.conf: Adjust comment to match reality.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
41
41
#COVERAGE=--coverage
42
42
OPTIMIZE:=-Os -fno-strict-aliasing
43
43
LANGUAGE:=-std=gnu11
 
44
FEATURES:=-D_FILE_OFFSET_BITS=64
44
45
htmldir:=man
45
 
version:=1.8.4
 
46
version:=1.8.7
46
47
SED:=sed
 
48
PKG_CONFIG?=pkg-config
47
49
 
48
50
USER:=$(firstword $(subst :, ,$(shell getent passwd _mandos \
49
51
        || getent passwd nobody || echo 65534)))
50
52
GROUP:=$(firstword $(subst :, ,$(shell getent group _mandos \
51
53
        || getent group nogroup || echo 65534)))
52
54
 
 
55
LINUXVERSION:=$(shell uname --kernel-release)
 
56
 
53
57
## Use these settings for a traditional /usr/local install
54
58
# PREFIX:=$(DESTDIR)/usr/local
55
59
# CONFDIR:=$(DESTDIR)/etc/mandos
56
60
# KEYDIR:=$(DESTDIR)/etc/mandos/keys
57
61
# MANDIR:=$(PREFIX)/man
58
62
# INITRAMFSTOOLS:=$(DESTDIR)/etc/initramfs-tools
 
63
# DRACUTMODULE:=$(DESTDIR)/usr/lib/dracut/modules.d/90mandos
59
64
# STATEDIR:=$(DESTDIR)/var/lib/mandos
60
65
# LIBDIR:=$(PREFIX)/lib
61
66
##
66
71
KEYDIR:=$(DESTDIR)/etc/keys/mandos
67
72
MANDIR:=$(PREFIX)/share/man
68
73
INITRAMFSTOOLS:=$(DESTDIR)/usr/share/initramfs-tools
 
74
DRACUTMODULE:=$(DESTDIR)/usr/lib/dracut/modules.d/90mandos
69
75
STATEDIR:=$(DESTDIR)/var/lib/mandos
70
76
LIBDIR:=$(shell \
71
77
        for d in \
72
 
        "/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null`" \
 
78
        "/usr/lib/`dpkg-architecture \
 
79
                        -qDEB_HOST_MULTIARCH 2>/dev/null`" \
73
80
        "`rpm --eval='%{_libdir}' 2>/dev/null`" /usr/lib; do \
74
81
                if [ -d "$$d" -a "$$d" = "$${d%/}" ]; then \
75
82
                        echo "$(DESTDIR)$$d"; \
78
85
        done)
79
86
##
80
87
 
81
 
SYSTEMD:=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
82
 
TMPFILES:=$(DESTDIR)$(shell pkg-config systemd --variable=tmpfilesdir)
 
88
SYSTEMD:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
 
89
                        --variable=systemdsystemunitdir)
 
90
TMPFILES:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
 
91
                        --variable=tmpfilesdir)
 
92
SYSUSERS:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
 
93
                        --variable=sysusersdir)
83
94
 
84
 
GNUTLS_CFLAGS:=$(shell pkg-config --cflags-only-I gnutls)
85
 
GNUTLS_LIBS:=$(shell pkg-config --libs gnutls)
86
 
AVAHI_CFLAGS:=$(shell pkg-config --cflags-only-I avahi-core)
87
 
AVAHI_LIBS:=$(shell pkg-config --libs avahi-core)
 
95
GNUTLS_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I gnutls)
 
96
GNUTLS_LIBS:=$(shell $(PKG_CONFIG) --libs gnutls)
 
97
AVAHI_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I avahi-core)
 
98
AVAHI_LIBS:=$(shell $(PKG_CONFIG) --libs avahi-core)
88
99
GPGME_CFLAGS:=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
89
100
GPGME_LIBS:=$(shell gpgme-config --libs; getconf LFS_LIBS; \
90
101
        getconf LFS_LDFLAGS)
91
 
LIBNL3_CFLAGS:=$(shell pkg-config --cflags-only-I libnl-route-3.0)
92
 
LIBNL3_LIBS:=$(shell pkg-config --libs libnl-route-3.0)
 
102
LIBNL3_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I libnl-route-3.0)
 
103
LIBNL3_LIBS:=$(shell $(PKG_CONFIG) --libs libnl-route-3.0)
 
104
GLIB_CFLAGS:=$(shell $(PKG_CONFIG) --cflags glib-2.0)
 
105
GLIB_LIBS:=$(shell $(PKG_CONFIG) --libs glib-2.0)
93
106
 
94
107
# Do not change these two
95
 
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) \
96
 
        $(OPTIMIZE) $(LANGUAGE) -DVERSION='"$(version)"'
 
108
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
 
109
        $(LANGUAGE) $(FEATURES) -DVERSION='"$(version)"'
97
110
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(strip \
98
111
        ) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
99
112
 
107
120
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
108
121
        $(notdir $<); \
109
122
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
110
 
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
111
 
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
112
 
        fi >/dev/null)
 
123
        && command -v man >/dev/null; then LANG=en_US.UTF-8 \
 
124
        MANWIDTH=80 man --warnings --encoding=UTF-8 --local-file \
 
125
        $(notdir $@); fi >/dev/null)
113
126
 
114
127
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
115
128
        --param make.year.ranges                1 \
128
141
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
129
142
        plugins.d/plymouth
130
143
PLUGIN_HELPERS:=plugin-helpers/mandos-client-iprouteadddel
131
 
CPROGS:=plugin-runner $(PLUGINS) $(PLUGIN_HELPERS)
 
144
CPROGS:=plugin-runner dracut-module/password-agent $(PLUGINS) \
 
145
        $(PLUGIN_HELPERS)
132
146
PROGS:=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
133
147
DOCS:=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
134
148
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
 
149
        dracut-module/password-agent.8mandos \
135
150
        plugins.d/mandos-client.8mandos \
136
151
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
137
152
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
209
224
                overview.xml legalnotice.xml
210
225
        $(DOCBOOKTOHTML)
211
226
 
 
227
dracut-module/password-agent.8mandos: \
 
228
                dracut-module/password-agent.xml common.ent \
 
229
                overview.xml legalnotice.xml
 
230
        $(DOCBOOKTOMAN)
 
231
dracut-module/password-agent.8mandos.xhtml: \
 
232
                dracut-module/password-agent.xml common.ent \
 
233
                overview.xml legalnotice.xml
 
234
        $(DOCBOOKTOHTML)
 
235
 
212
236
plugins.d/mandos-client.8mandos: plugins.d/mandos-client.xml \
213
237
                                        common.ent \
214
238
                                        mandos-options.xml \
264
288
                ) $(AVAHI_LIBS) $(GPGME_LIBS) $(LOADLIBES) $(strip\
265
289
                ) $(LDLIBS) -o $@
266
290
 
 
291
# Need to add the libnl-route library
267
292
plugin-helpers/mandos-client-iprouteadddel: plugin-helpers/mandos-client-iprouteadddel.c
268
293
        $(LINK.c) $(LIBNL3_CFLAGS) $^ $(LIBNL3_LIBS) $(strip\
269
294
                ) $(LOADLIBES) $(LDLIBS) -o $@
270
295
 
 
296
# Need to add the GLib and pthread libraries
 
297
dracut-module/password-agent: dracut-module/password-agent.c
 
298
        $(LINK.c) $(GLIB_CFLAGS) $^ $(GLIB_LIBS) -lpthread $(strip\
 
299
                ) $(LOADLIBES) $(LDLIBS) -o $@
 
300
 
271
301
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
272
302
        check run-client run-server install install-html \
273
303
        install-server install-client-nokey install-client uninstall \
288
318
        ./mandos-keygen --version
289
319
        ./plugin-runner --version
290
320
        ./plugin-helpers/mandos-client-iprouteadddel --version
 
321
        ./dracut-module/password-agent --test
291
322
 
292
323
# Run the client with a local config and key
293
 
run-client: all keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem
294
 
        @echo "###################################################################"
295
 
        @echo "# The following error messages are harmless and can be safely     #"
296
 
        @echo "# ignored:                                                        #"
297
 
        @echo "# From plugin-runner: setgid: Operation not permitted             #"
298
 
        @echo "#                     setuid: Operation not permitted             #"
299
 
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
300
 
        @echo "# From mandos-client:                                             #"
301
 
        @echo "#             Failed to raise privileges: Operation not permitted #"
302
 
        @echo "#             Warning: network hook \"*\" exited with status *      #"
303
 
        @echo "#                                                                 #"
304
 
        @echo "# (The messages are caused by not running as root, but you should #"
305
 
        @echo "# NOT run \"make run-client\" as root unless you also unpacked and  #"
306
 
        @echo "# compiled Mandos as root, which is also NOT recommended.)        #"
307
 
        @echo "###################################################################"
 
324
run-client: all keydir/seckey.txt keydir/pubkey.txt \
 
325
                        keydir/tls-privkey.pem keydir/tls-pubkey.pem
 
326
        @echo '######################################################'
 
327
        @echo '# The following error messages are harmless and can  #'
 
328
        @echo '#  be safely ignored:                                #'
 
329
        @echo '## From plugin-runner:                               #'
 
330
        @echo '# setgid: Operation not permitted                    #'
 
331
        @echo '# setuid: Operation not permitted                    #'
 
332
        @echo '## From askpass-fifo:                                #'
 
333
        @echo '# mkfifo: Permission denied                          #'
 
334
        @echo '## From mandos-client:                               #'
 
335
        @echo '# Failed to raise privileges: Operation not permi... #'
 
336
        @echo '# Warning: network hook "*" exited with status *     #'
 
337
        @echo '# ioctl SIOCSIFFLAGS +IFF_UP: Operation not permi... #'
 
338
        @echo '# Failed to bring up interface "*": Operation not... #'
 
339
        @echo '#                                                    #'
 
340
        @echo '# (The messages are caused by not running as root,   #'
 
341
        @echo '# but you should NOT run "make run-client" as root   #'
 
342
        @echo '# unless you also unpacked and compiled Mandos as    #'
 
343
        @echo '# root, which is also NOT recommended.)              #'
 
344
        @echo '######################################################'
308
345
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
309
346
        ./plugin-runner --plugin-dir=plugins.d \
310
347
                --plugin-helper-dir=plugin-helpers \
350
387
        elif install --directory --mode=u=rwx $(STATEDIR); then \
351
388
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
352
389
        fi
353
 
        if [ "$(TMPFILES)" != "$(DESTDIR)" -a -d "$(TMPFILES)" ]; then \
 
390
        if [ "$(TMPFILES)" != "$(DESTDIR)" \
 
391
                        -a -d "$(TMPFILES)" ]; then \
354
392
                install --mode=u=rw,go=r tmpfiles.d-mandos.conf \
355
393
                        $(TMPFILES)/mandos.conf; \
356
394
        fi
 
395
        if [ "$(SYSUSERS)" != "$(DESTDIR)" \
 
396
                        -a -d "$(SYSUSERS)" ]; then \
 
397
                install --mode=u=rw,go=r sysusers.d-mandos.conf \
 
398
                        $(SYSUSERS)/mandos.conf; \
 
399
        fi
357
400
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
358
401
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
359
402
                mandos-ctl
393
436
        install --directory --mode=u=rwx $(KEYDIR) \
394
437
                $(LIBDIR)/mandos/plugins.d \
395
438
                $(LIBDIR)/mandos/plugin-helpers
 
439
        if [ "$(SYSUSERS)" != "$(DESTDIR)" \
 
440
                        -a -d "$(SYSUSERS)" ]; then \
 
441
                install --mode=u=rw,go=r sysusers.d-mandos.conf \
 
442
                        $(SYSUSERS)/mandos-client.conf; \
 
443
        fi
396
444
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
397
445
                install --mode=u=rwx \
398
446
                        --directory "$(CONFDIR)/plugins.d" \
403
451
        install --mode=u=rwx,go=rx \
404
452
                --target-directory=$(LIBDIR)/mandos plugin-runner
405
453
        install --mode=u=rwx,go=rx \
406
 
                --target-directory=$(LIBDIR)/mandos mandos-to-cryptroot-unlock
 
454
                --target-directory=$(LIBDIR)/mandos \
 
455
                mandos-to-cryptroot-unlock
407
456
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
408
457
                mandos-keygen
409
458
        install --mode=u=rwx,go=rx \
437
486
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
438
487
        install initramfs-tools-script-stop \
439
488
                $(INITRAMFSTOOLS)/scripts/local-premount/mandos
 
489
        install --directory $(DRACUTMODULE)
 
490
        install --mode=u=rw,go=r --target-directory=$(DRACUTMODULE) \
 
491
                dracut-module/ask-password-mandos.path \
 
492
                dracut-module/ask-password-mandos.service
 
493
        install --mode=u=rwxs,go=rx \
 
494
                --target-directory=$(DRACUTMODULE) \
 
495
                dracut-module/module-setup.sh \
 
496
                dracut-module/cmdline-mandos.sh \
 
497
                dracut-module/password-agent
440
498
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
441
499
        gzip --best --to-stdout mandos-keygen.8 \
442
500
                > $(MANDIR)/man8/mandos-keygen.8.gz
454
512
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
455
513
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
456
514
                > $(MANDIR)/man8/plymouth.8mandos.gz
 
515
        gzip --best --to-stdout dracut-module/password-agent.8mandos \
 
516
                > $(MANDIR)/man8/password-agent.8mandos.gz
457
517
 
458
518
install-client: install-client-nokey
459
519
# Post-installation stuff
460
520
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
461
 
        update-initramfs -k all -u
 
521
        if command -v update-initramfs >/dev/null; then \
 
522
            update-initramfs -k all -u; \
 
523
        elif command -v dracut >/dev/null; then \
 
524
            for initrd in $(DESTDIR)/boot/initr*-$(LINUXVERSION); do \
 
525
                if [ -w "$$initrd" ]; then \
 
526
                    chmod go-r "$$initrd"; \
 
527
                    dracut --force "$$initrd"; \
 
528
                fi; \
 
529
            done; \
 
530
        fi
462
531
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
463
532
 
464
533
uninstall: uninstall-server uninstall-client
491
560
                $(INITRAMFSTOOLS)/hooks/mandos \
492
561
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
493
562
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
563
                $(INITRAMFSTOOLS)/scripts/local-premount/mandos \
 
564
                $(DRACUTMODULE)/ask-password-mandos.path \
 
565
                $(DRACUTMODULE)/ask-password-mandos.service \
 
566
                $(DRACUTMODULE)/module-setup.sh \
 
567
                $(DRACUTMODULE)/cmdline-mandos.sh \
 
568
                $(DRACUTMODULE)/password-agent \
494
569
                $(MANDIR)/man8/mandos-keygen.8.gz \
495
570
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
496
571
                $(MANDIR)/man8/mandos-client.8mandos.gz
499
574
                $(MANDIR)/man8/splashy.8mandos.gz \
500
575
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
501
576
                $(MANDIR)/man8/plymouth.8mandos.gz \
 
577
                $(MANDIR)/man8/password-agent.8mandos.gz \
502
578
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
503
 
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
504
 
        update-initramfs -k all -u
 
579
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR) $(DRACUTMODULE)
 
580
        if command -v update-initramfs >/dev/null; then \
 
581
            update-initramfs -k all -u; \
 
582
        elif command -v dracut >/dev/null; then \
 
583
            for initrd in $(DESTDIR)/boot/initr*-$(LINUXVERSION); do \
 
584
                test -w "$$initrd" && dracut --force "$$initrd"; \
 
585
            done; \
 
586
        fi
505
587
 
506
588
purge: purge-server purge-client
507
589