/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

  • Committer: Teddy Hogeborn
  • Date: 2019-07-14 23:39:53 UTC
  • mto: This revision was merged to the branch mainline in revision 384.
  • Revision ID: teddy@recompile.se-20190714233953-1zmsd3o062xloazt
Server bug fix: Allow restarts when using port= option

If the Mandos server is configured to use a specific TCP port to
listen to (by using the port= option in mandos.conf or the command
line --port option), that port becomes unusable for a time when the
Mandos server is restarted, making restarts fail.  Avoid this by, if a
port number is specified, using SO_REUSEADDR when binding the
listening TCP socket to a port number.

* mandos (IPv6_TCPServer.server_bind): Set self.allow_reuse_address if
                                       a port number is specified.

Reported-by: Juan Miguel Alcarria Herrera <juanmi@arco2000.es>

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
25
25
        -fsanitize=object-size -fsanitize=float-divide-by-zero \
26
26
        -fsanitize=float-cast-overflow -fsanitize=nonnull-attribute \
27
27
        -fsanitize=returns-nonnull-attribute -fsanitize=bool \
28
 
        -fsanitize=enum -fsanitize-address-use-after-scope
 
28
        -fsanitize=enum
29
29
 
30
30
# For info about _FORTIFY_SOURCE, see feature_test_macros(7)
31
31
# and <https://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
32
 
FORTIFY:=-fstack-protector-all -fPIC
33
 
CPPFLAGS+=-D_FORTIFY_SOURCE=3
 
32
FORTIFY:=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
34
33
LINK_FORTIFY_LD:=-z relro -z now
35
34
LINK_FORTIFY:=
36
35
 
42
41
#COVERAGE=--coverage
43
42
OPTIMIZE:=-Os -fno-strict-aliasing
44
43
LANGUAGE:=-std=gnu11
45
 
CPPFLAGS+=-D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64
46
44
htmldir:=man
47
 
version:=1.8.17
 
45
version:=1.8.4
48
46
SED:=sed
49
 
PKG_CONFIG?=pkg-config
50
47
 
51
48
USER:=$(firstword $(subst :, ,$(shell getent passwd _mandos \
52
49
        || getent passwd nobody || echo 65534)))
53
50
GROUP:=$(firstword $(subst :, ,$(shell getent group _mandos \
54
51
        || getent group nogroup || echo 65534)))
55
52
 
56
 
LINUXVERSION:=$(shell uname --kernel-release)
57
 
 
58
53
## Use these settings for a traditional /usr/local install
59
54
# PREFIX:=$(DESTDIR)/usr/local
60
 
# BINDIR:=$(PREFIX)/sbin
61
55
# CONFDIR:=$(DESTDIR)/etc/mandos
62
56
# KEYDIR:=$(DESTDIR)/etc/mandos/keys
63
57
# MANDIR:=$(PREFIX)/man
64
58
# INITRAMFSTOOLS:=$(DESTDIR)/etc/initramfs-tools
65
 
# DRACUTMODULE:=$(DESTDIR)/usr/lib/dracut/modules.d/90mandos
66
59
# STATEDIR:=$(DESTDIR)/var/lib/mandos
67
60
# LIBDIR:=$(PREFIX)/lib
68
 
# DBUSPOLICYDIR:=$(DESTDIR)/etc/dbus-1/system.d
69
61
##
70
62
 
71
63
## These settings are for a package-type install
72
64
PREFIX:=$(DESTDIR)/usr
73
 
BINDIR:=$(PREFIX)/sbin
74
65
CONFDIR:=$(DESTDIR)/etc/mandos
75
66
KEYDIR:=$(DESTDIR)/etc/keys/mandos
76
67
MANDIR:=$(PREFIX)/share/man
77
68
INITRAMFSTOOLS:=$(DESTDIR)/usr/share/initramfs-tools
78
 
DRACUTMODULE:=$(DESTDIR)/usr/lib/dracut/modules.d/90mandos
79
69
STATEDIR:=$(DESTDIR)/var/lib/mandos
80
70
LIBDIR:=$(shell \
81
71
        for d in \
82
 
        "/usr/lib/`dpkg-architecture \
83
 
                        -qDEB_HOST_MULTIARCH 2>/dev/null`" \
 
72
        "/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null`" \
84
73
        "`rpm --eval='%{_libdir}' 2>/dev/null`" /usr/lib; do \
85
74
                if [ -d "$$d" -a "$$d" = "$${d%/}" ]; then \
86
75
                        echo "$(DESTDIR)$$d"; \
87
76
                        break; \
88
77
                fi; \
89
78
        done)
90
 
DBUSPOLICYDIR:=$(DESTDIR)/usr/share/dbus-1/system.d
91
79
##
92
80
 
93
 
SYSTEMD:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
94
 
                        --variable=systemdsystemunitdir)
95
 
TMPFILES:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
96
 
                        --variable=tmpfilesdir)
97
 
SYSUSERS:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
98
 
                        --variable=sysusersdir)
 
81
SYSTEMD:=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
 
82
TMPFILES:=$(DESTDIR)$(shell pkg-config systemd --variable=tmpfilesdir)
99
83
 
100
 
GNUTLS_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I gnutls)
101
 
GNUTLS_LIBS:=$(shell $(PKG_CONFIG) --libs gnutls)
102
 
AVAHI_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I avahi-core)
103
 
AVAHI_LIBS:=$(shell $(PKG_CONFIG) --libs avahi-core)
104
 
GPGME_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I gpgme 2>/dev/null \
105
 
        || gpgme-config --cflags; getconf LFS_CFLAGS)
106
 
GPGME_LIBS:=$(shell $(PKG_CONFIG) --libs gpgme 2>/dev/null \
107
 
        || gpgme-config --libs; getconf LFS_LIBS; \
 
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)
 
88
GPGME_CFLAGS:=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
 
89
GPGME_LIBS:=$(shell gpgme-config --libs; getconf LFS_LIBS; \
108
90
        getconf LFS_LDFLAGS)
109
 
LIBNL3_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I libnl-route-3.0)
110
 
LIBNL3_LIBS:=$(shell $(PKG_CONFIG) --libs libnl-route-3.0)
111
 
GLIB_CFLAGS:=$(shell $(PKG_CONFIG) --cflags glib-2.0)
112
 
GLIB_LIBS:=$(shell $(PKG_CONFIG) --libs glib-2.0)
 
91
LIBNL3_CFLAGS:=$(shell pkg-config --cflags-only-I libnl-route-3.0)
 
92
LIBNL3_LIBS:=$(shell pkg-config --libs libnl-route-3.0)
113
93
 
114
94
# Do not change these two
115
 
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
116
 
        $(LANGUAGE) -DVERSION='"$(version)"'
 
95
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) \
 
96
        $(OPTIMIZE) $(LANGUAGE) -DVERSION='"$(version)"'
117
97
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(strip \
118
98
        ) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
119
99
 
127
107
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
128
108
        $(notdir $<); \
129
109
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
130
 
        && command -v man >/dev/null; then LANG=en_US.UTF-8 \
131
 
        MANWIDTH=80 man --warnings --encoding=UTF-8 --local-file \
132
 
        $(notdir $@); fi >/dev/null)
 
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)
133
113
 
134
114
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
135
115
        --param make.year.ranges                1 \
148
128
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
149
129
        plugins.d/plymouth
150
130
PLUGIN_HELPERS:=plugin-helpers/mandos-client-iprouteadddel
151
 
CPROGS:=plugin-runner dracut-module/password-agent $(PLUGINS) \
152
 
        $(PLUGIN_HELPERS)
 
131
CPROGS:=plugin-runner $(PLUGINS) $(PLUGIN_HELPERS)
153
132
PROGS:=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
154
133
DOCS:=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
155
134
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
156
 
        dracut-module/password-agent.8mandos \
157
135
        plugins.d/mandos-client.8mandos \
158
136
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
159
137
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
163
141
 
164
142
objects:=$(addsuffix .o,$(CPROGS))
165
143
 
166
 
.PHONY: all
167
144
all: $(PROGS) mandos.lsm
168
145
 
169
 
.PHONY: doc
170
146
doc: $(DOCS)
171
147
 
172
 
.PHONY: html
173
148
html: $(htmldocs)
174
149
 
175
150
%.5: %.xml common.ent legalnotice.xml
234
209
                overview.xml legalnotice.xml
235
210
        $(DOCBOOKTOHTML)
236
211
 
237
 
dracut-module/password-agent.8mandos: \
238
 
                dracut-module/password-agent.xml common.ent \
239
 
                overview.xml legalnotice.xml
240
 
        $(DOCBOOKTOMAN)
241
 
dracut-module/password-agent.8mandos.xhtml: \
242
 
                dracut-module/password-agent.xml common.ent \
243
 
                overview.xml legalnotice.xml
244
 
        $(DOCBOOKTOHTML)
245
 
 
246
212
plugins.d/mandos-client.8mandos: plugins.d/mandos-client.xml \
247
213
                                        common.ent \
248
214
                                        mandos-options.xml \
291
257
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
292
258
                $@)
293
259
 
294
 
# Does the linker support the --no-warn-execstack option?
295
 
ifeq ($(shell echo 'int main(){}'|$(CC) --language=c /dev/stdin -o /dev/null -Xlinker --no-warn-execstack >/dev/null 2>&1 && echo yes),yes)
296
 
# These programs use nested functions, which uses an executable stack
297
 
plugin-runner: LDFLAGS += -Xlinker --no-warn-execstack
298
 
dracut-module/password-agent: LDFLAGS += -Xlinker --no-warn-execstack
299
 
plugins.d/password-prompt: LDFLAGS += -Xlinker --no-warn-execstack
300
 
plugins.d/mandos-client: LDFLAGS += -Xlinker --no-warn-execstack
301
 
plugins.d/plymouth: LDFLAGS += -Xlinker --no-warn-execstack
302
 
endif
303
 
 
304
260
# Need to add the GnuTLS, Avahi and GPGME libraries
305
 
plugins.d/mandos-client: CFLAGS += $(GNUTLS_CFLAGS) $(strip \
306
 
        ) $(AVAHI_CFLAGS) $(GPGME_CFLAGS)
307
 
plugins.d/mandos-client: LDLIBS += $(GNUTLS_LIBS) $(strip \
308
 
        ) $(AVAHI_LIBS) $(GPGME_LIBS)
309
 
 
310
 
# Need to add the libnl-route library
311
 
plugin-helpers/mandos-client-iprouteadddel: CFLAGS += $(LIBNL3_CFLAGS)
312
 
plugin-helpers/mandos-client-iprouteadddel: LDLIBS += $(LIBNL3_LIBS)
313
 
 
314
 
# Need to add the GLib and pthread libraries
315
 
dracut-module/password-agent: CFLAGS += $(GLIB_CFLAGS)
316
 
# Note: -lpthread is unnecessary with the GNU C library 2.34 or later
317
 
dracut-module/password-agent: LDLIBS += $(GLIB_LIBS) -lpthread
318
 
 
319
 
.PHONY: clean
 
261
plugins.d/mandos-client: plugins.d/mandos-client.c
 
262
        $(LINK.c) $^ $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(strip\
 
263
                ) $(GPGME_CFLAGS) $(GNUTLS_LIBS) $(strip\
 
264
                ) $(AVAHI_LIBS) $(GPGME_LIBS) $(LOADLIBES) $(strip\
 
265
                ) $(LDLIBS) -o $@
 
266
 
 
267
plugin-helpers/mandos-client-iprouteadddel: plugin-helpers/mandos-client-iprouteadddel.c
 
268
        $(LINK.c) $(LIBNL3_CFLAGS) $^ $(LIBNL3_LIBS) $(strip\
 
269
                ) $(LOADLIBES) $(LDLIBS) -o $@
 
270
 
 
271
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
 
272
        check run-client run-server install install-html \
 
273
        install-server install-client-nokey install-client uninstall \
 
274
        uninstall-server uninstall-client purge purge-server \
 
275
        purge-client
 
276
 
320
277
clean:
321
278
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
322
279
 
323
 
.PHONY: distclean
324
280
distclean: clean
325
 
.PHONY: mostlyclean
326
281
mostlyclean: clean
327
 
.PHONY: maintainer-clean
328
282
maintainer-clean: clean
329
283
        -rm --force --recursive keydir confdir statedir
330
284
 
331
 
.PHONY: check
332
 
check: all
 
285
check:  all
333
286
        ./mandos --check
334
287
        ./mandos-ctl --check
335
 
        ./mandos-keygen --version
336
 
        ./plugin-runner --version
337
 
        ./plugin-helpers/mandos-client-iprouteadddel --version
338
 
        ./dracut-module/password-agent --test
339
288
 
340
289
# Run the client with a local config and key
341
 
.PHONY: run-client
342
 
run-client: all keydir/seckey.txt keydir/pubkey.txt \
343
 
                        keydir/tls-privkey.pem keydir/tls-pubkey.pem
344
 
        @echo '######################################################'
345
 
        @echo '# The following error messages are harmless and can  #'
346
 
        @echo '#  be safely ignored:                                #'
347
 
        @echo '## From plugin-runner:                               #'
348
 
        @echo '# setgid: Operation not permitted                    #'
349
 
        @echo '# setuid: Operation not permitted                    #'
350
 
        @echo '## From askpass-fifo:                                #'
351
 
        @echo '# mkfifo: Permission denied                          #'
352
 
        @echo '## From mandos-client:                               #'
353
 
        @echo '# Failed to raise privileges: Operation not permi... #'
354
 
        @echo '# Warning: network hook "*" exited with status *     #'
355
 
        @echo '# ioctl SIOCSIFFLAGS +IFF_UP: Operation not permi... #'
356
 
        @echo '# Failed to bring up interface "*": Operation not... #'
357
 
        @echo '#                                                    #'
358
 
        @echo '# (The messages are caused by not running as root,   #'
359
 
        @echo '# but you should NOT run "make run-client" as root   #'
360
 
        @echo '# unless you also unpacked and compiled Mandos as    #'
361
 
        @echo '# root, which is also NOT recommended.)              #'
362
 
        @echo '######################################################'
 
290
run-client: all keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem
 
291
        @echo "###################################################################"
 
292
        @echo "# The following error messages are harmless and can be safely     #"
 
293
        @echo "# ignored:                                                        #"
 
294
        @echo "# From plugin-runner: setgid: Operation not permitted             #"
 
295
        @echo "#                     setuid: Operation not permitted             #"
 
296
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
 
297
        @echo "# From mandos-client:                                             #"
 
298
        @echo "#             Failed to raise privileges: Operation not permitted #"
 
299
        @echo "#             Warning: network hook \"*\" exited with status *      #"
 
300
        @echo "#                                                                 #"
 
301
        @echo "# (The messages are caused by not running as root, but you should #"
 
302
        @echo "# NOT run \"make run-client\" as root unless you also unpacked and  #"
 
303
        @echo "# compiled Mandos as root, which is also NOT recommended.)        #"
 
304
        @echo "###################################################################"
363
305
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
364
306
        ./plugin-runner --plugin-dir=plugins.d \
365
307
                --plugin-helper-dir=plugin-helpers \
372
314
keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem: mandos-keygen
373
315
        install --directory keydir
374
316
        ./mandos-keygen --dir keydir --force
375
 
        if ! [ -e keydir/tls-privkey.pem ]; then \
376
 
                install --mode=u=rw /dev/null keydir/tls-privkey.pem; \
377
 
        fi
378
 
        if ! [ -e keydir/tls-pubkey.pem ]; then \
379
 
                install --mode=u=rw /dev/null keydir/tls-pubkey.pem; \
380
 
        fi
381
317
 
382
318
# Run the server with a local config
383
 
.PHONY: run-server
384
319
run-server: confdir/mandos.conf confdir/clients.conf statedir
385
320
        ./mandos --debug --no-dbus --configdir=confdir \
386
321
                --statedir=statedir $(SERVERARGS)
387
322
 
388
323
# Used by run-server
389
324
confdir/mandos.conf: mandos.conf
390
 
        install -D --mode=u=rw,go=r $^ $@
 
325
        install --directory confdir
 
326
        install --mode=u=rw,go=r $^ $@
391
327
confdir/clients.conf: clients.conf keydir/seckey.txt keydir/tls-pubkey.pem
392
 
        install -D --mode=u=rw $< $@
 
328
        install --directory confdir
 
329
        install --mode=u=rw $< $@
393
330
# Add a client password
394
331
        ./mandos-keygen --dir keydir --password --no-ssh >> $@
395
332
statedir:
396
333
        install --directory statedir
397
334
 
398
 
.PHONY: install
399
335
install: install-server install-client-nokey
400
336
 
401
 
.PHONY: install-html
402
337
install-html: html
403
 
        install -D --mode=u=rw,go=r --target-directory=$(htmldir) \
 
338
        install --directory $(htmldir)
 
339
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
404
340
                $(htmldocs)
405
341
 
406
 
.PHONY: install-server
407
342
install-server: doc
 
343
        install --directory $(CONFDIR)
408
344
        if install --directory --mode=u=rwx --owner=$(USER) \
409
345
                --group=$(GROUP) $(STATEDIR); then \
410
346
                :; \
411
347
        elif install --directory --mode=u=rwx $(STATEDIR); then \
412
348
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
413
349
        fi
414
 
        if [ "$(TMPFILES)" != "$(DESTDIR)" ]; then \
415
 
                install -D --mode=u=rw,go=r tmpfiles.d-mandos.conf \
 
350
        if [ "$(TMPFILES)" != "$(DESTDIR)" -a -d "$(TMPFILES)" ]; then \
 
351
                install --mode=u=rw,go=r tmpfiles.d-mandos.conf \
416
352
                        $(TMPFILES)/mandos.conf; \
417
353
        fi
418
 
        if [ "$(SYSUSERS)" != "$(DESTDIR)" ]; then \
419
 
                install -D --mode=u=rw,go=r sysusers.d-mandos.conf \
420
 
                        $(SYSUSERS)/mandos.conf; \
421
 
        fi
422
 
        install --directory $(BINDIR)
423
 
        install --mode=u=rwx,go=rx --target-directory=$(BINDIR) mandos
424
 
        install --mode=u=rwx,go=rx --target-directory=$(BINDIR) \
 
354
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
 
355
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
425
356
                mandos-ctl
426
 
        install --mode=u=rwx,go=rx --target-directory=$(BINDIR) \
 
357
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
427
358
                mandos-monitor
428
 
        install --directory $(CONFDIR)
429
359
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
430
360
                mandos.conf
431
361
        install --mode=u=rw --target-directory=$(CONFDIR) \
432
362
                clients.conf
433
 
        install -D --mode=u=rw,go=r dbus-mandos.conf \
434
 
                $(DBUSPOLICYDIR)/mandos.conf
435
 
        install -D --mode=u=rwx,go=rx init.d-mandos \
 
363
        install --mode=u=rw,go=r dbus-mandos.conf \
 
364
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
 
365
        install --mode=u=rwx,go=rx init.d-mandos \
436
366
                $(DESTDIR)/etc/init.d/mandos
437
 
        if [ "$(SYSTEMD)" != "$(DESTDIR)" ]; then \
438
 
                install -D --mode=u=rw,go=r mandos.service \
439
 
                        $(SYSTEMD); \
 
367
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
 
368
                install --mode=u=rw,go=r mandos.service $(SYSTEMD); \
440
369
        fi
441
 
        install -D --mode=u=rw,go=r default-mandos \
 
370
        install --mode=u=rw,go=r default-mandos \
442
371
                $(DESTDIR)/etc/default/mandos
443
372
        if [ -z $(DESTDIR) ]; then \
444
373
                update-rc.d mandos defaults 25 15;\
445
374
        fi
446
 
        install --directory $(MANDIR)/man8 $(MANDIR)/man5
447
375
        gzip --best --to-stdout mandos.8 \
448
376
                > $(MANDIR)/man8/mandos.8.gz
449
377
        gzip --best --to-stdout mandos-monitor.8 \
457
385
        gzip --best --to-stdout intro.8mandos \
458
386
                > $(MANDIR)/man8/intro.8mandos.gz
459
387
 
460
 
.PHONY: install-client-nokey
461
388
install-client-nokey: all doc
 
389
        install --directory $(LIBDIR)/mandos $(CONFDIR)
462
390
        install --directory --mode=u=rwx $(KEYDIR) \
463
391
                $(LIBDIR)/mandos/plugins.d \
464
392
                $(LIBDIR)/mandos/plugin-helpers
465
 
        if [ "$(SYSUSERS)" != "$(DESTDIR)" ]; then \
466
 
                install -D --mode=u=rw,go=r sysusers.d-mandos.conf \
467
 
                        $(SYSUSERS)/mandos-client.conf; \
468
 
        fi
469
393
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
470
 
                install --directory \
471
 
                        --mode=u=rwx "$(CONFDIR)/plugins.d" \
 
394
                install --mode=u=rwx \
 
395
                        --directory "$(CONFDIR)/plugins.d" \
472
396
                        "$(CONFDIR)/plugin-helpers"; \
473
397
        fi
474
 
        install --directory --mode=u=rwx,go=rx \
 
398
        install --mode=u=rwx,go=rx --directory \
475
399
                "$(CONFDIR)/network-hooks.d"
476
400
        install --mode=u=rwx,go=rx \
477
401
                --target-directory=$(LIBDIR)/mandos plugin-runner
478
402
        install --mode=u=rwx,go=rx \
479
 
                --target-directory=$(LIBDIR)/mandos \
480
 
                mandos-to-cryptroot-unlock
481
 
        install --directory $(BINDIR)
482
 
        install --mode=u=rwx,go=rx --target-directory=$(BINDIR) \
 
403
                --target-directory=$(LIBDIR)/mandos mandos-to-cryptroot-unlock
 
404
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
483
405
                mandos-keygen
484
406
        install --mode=u=rwx,go=rx \
485
407
                --target-directory=$(LIBDIR)/mandos/plugins.d \
502
424
        install --mode=u=rwx,go=rx \
503
425
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
504
426
                plugin-helpers/mandos-client-iprouteadddel
505
 
        install -D initramfs-tools-hook \
 
427
        install initramfs-tools-hook \
506
428
                $(INITRAMFSTOOLS)/hooks/mandos
507
 
        install -D --mode=u=rw,go=r initramfs-tools-conf \
 
429
        install --mode=u=rw,go=r initramfs-tools-conf \
508
430
                $(INITRAMFSTOOLS)/conf.d/mandos-conf
509
 
        install -D --mode=u=rw,go=r initramfs-tools-conf-hook \
 
431
        install --mode=u=rw,go=r initramfs-tools-conf-hook \
510
432
                $(INITRAMFSTOOLS)/conf-hooks.d/zz-mandos
511
 
        install -D initramfs-tools-script \
 
433
        install initramfs-tools-script \
512
434
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
513
 
        install -D initramfs-tools-script-stop \
 
435
        install initramfs-tools-script-stop \
514
436
                $(INITRAMFSTOOLS)/scripts/local-premount/mandos
515
 
        install -D --mode=u=rw,go=r \
516
 
                --target-directory=$(DRACUTMODULE) \
517
 
                dracut-module/ask-password-mandos.path \
518
 
                dracut-module/ask-password-mandos.service
519
 
        install --mode=u=rwxs,go=rx \
520
 
                --target-directory=$(DRACUTMODULE) \
521
 
                dracut-module/module-setup.sh \
522
 
                dracut-module/cmdline-mandos.sh \
523
 
                dracut-module/password-agent
524
437
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
525
 
        install --directory $(MANDIR)/man8
526
438
        gzip --best --to-stdout mandos-keygen.8 \
527
439
                > $(MANDIR)/man8/mandos-keygen.8.gz
528
440
        gzip --best --to-stdout plugin-runner.8mandos \
539
451
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
540
452
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
541
453
                > $(MANDIR)/man8/plymouth.8mandos.gz
542
 
        gzip --best --to-stdout dracut-module/password-agent.8mandos \
543
 
                > $(MANDIR)/man8/password-agent.8mandos.gz
544
454
 
545
 
.PHONY: install-client
546
455
install-client: install-client-nokey
547
456
# Post-installation stuff
548
 
        -$(BINDIR)/mandos-keygen --dir "$(KEYDIR)"
549
 
        if command -v update-initramfs >/dev/null; then \
550
 
            update-initramfs -k all -u; \
551
 
        elif command -v dracut >/dev/null; then \
552
 
            for initrd in $(DESTDIR)/boot/initr*-$(LINUXVERSION); do \
553
 
                if [ -w "$$initrd" ]; then \
554
 
                    chmod go-r "$$initrd"; \
555
 
                    dracut --force "$$initrd"; \
556
 
                fi; \
557
 
            done; \
558
 
        fi
 
457
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
 
458
        update-initramfs -k all -u
559
459
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
560
460
 
561
 
.PHONY: uninstall
562
461
uninstall: uninstall-server uninstall-client
563
462
 
564
 
.PHONY: uninstall-server
565
463
uninstall-server:
566
 
        -rm --force $(BINDIR)/mandos \
567
 
                $(BINDIR)/mandos-ctl \
568
 
                $(BINDIR)/mandos-monitor \
 
464
        -rm --force $(PREFIX)/sbin/mandos \
 
465
                $(PREFIX)/sbin/mandos-ctl \
 
466
                $(PREFIX)/sbin/mandos-monitor \
569
467
                $(MANDIR)/man8/mandos.8.gz \
570
468
                $(MANDIR)/man8/mandos-monitor.8.gz \
571
469
                $(MANDIR)/man8/mandos-ctl.8.gz \
574
472
        update-rc.d -f mandos remove
575
473
        -rmdir $(CONFDIR)
576
474
 
577
 
.PHONY: uninstall-client
578
475
uninstall-client:
579
476
# Refuse to uninstall client if /etc/crypttab is explicitly configured
580
477
# to use it.
581
478
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
582
479
                $(DESTDIR)/etc/crypttab
583
 
        -rm --force $(BINDIR)/mandos-keygen \
 
480
        -rm --force $(PREFIX)/sbin/mandos-keygen \
584
481
                $(LIBDIR)/mandos/plugin-runner \
585
482
                $(LIBDIR)/mandos/plugins.d/password-prompt \
586
483
                $(LIBDIR)/mandos/plugins.d/mandos-client \
591
488
                $(INITRAMFSTOOLS)/hooks/mandos \
592
489
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
593
490
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
594
 
                $(INITRAMFSTOOLS)/scripts/local-premount/mandos \
595
 
                $(DRACUTMODULE)/ask-password-mandos.path \
596
 
                $(DRACUTMODULE)/ask-password-mandos.service \
597
 
                $(DRACUTMODULE)/module-setup.sh \
598
 
                $(DRACUTMODULE)/cmdline-mandos.sh \
599
 
                $(DRACUTMODULE)/password-agent \
600
491
                $(MANDIR)/man8/mandos-keygen.8.gz \
601
492
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
602
493
                $(MANDIR)/man8/mandos-client.8mandos.gz
605
496
                $(MANDIR)/man8/splashy.8mandos.gz \
606
497
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
607
498
                $(MANDIR)/man8/plymouth.8mandos.gz \
608
 
                $(MANDIR)/man8/password-agent.8mandos.gz \
609
499
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
610
 
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR) $(DRACUTMODULE)
611
 
        if command -v update-initramfs >/dev/null; then \
612
 
            update-initramfs -k all -u; \
613
 
        elif command -v dracut >/dev/null; then \
614
 
            for initrd in $(DESTDIR)/boot/initr*-$(LINUXVERSION); do \
615
 
                test -w "$$initrd" && dracut --force "$$initrd"; \
616
 
            done; \
617
 
        fi
 
500
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
 
501
        update-initramfs -k all -u
618
502
 
619
 
.PHONY: purge
620
503
purge: purge-server purge-client
621
504
 
622
 
.PHONY: purge-server
623
505
purge-server: uninstall-server
624
506
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
625
507
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
626
508
                $(DESTDIR)/etc/default/mandos \
627
509
                $(DESTDIR)/etc/init.d/mandos \
 
510
                $(SYSTEMD)/mandos.service \
628
511
                $(DESTDIR)/run/mandos.pid \
629
512
                $(DESTDIR)/var/run/mandos.pid
630
 
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
631
 
                -rm --force -- $(SYSTEMD)/mandos.service; \
632
 
        fi
633
513
        -rmdir $(CONFDIR)
634
514
 
635
 
.PHONY: purge-client
636
515
purge-client: uninstall-client
637
516
        -shred --remove $(KEYDIR)/seckey.txt $(KEYDIR)/tls-privkey.pem
638
517
        -rm --force $(CONFDIR)/plugin-runner.conf \