/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-07-14 23:39:53 UTC
  • 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
1
 
WARN=-O -Wall -Wformat=2 -Winit-self -Wmissing-include-dirs \
2
 
        -Wswitch-default -Wswitch-enum -Wunused-parameter \
3
 
        -Wstrict-aliasing=1 -Wextra -Wfloat-equal -Wundef -Wshadow \
 
1
WARN:=-O -Wall -Wextra -Wdouble-promotion -Wformat=2 -Winit-self \
 
2
        -Wmissing-include-dirs -Wswitch-default -Wswitch-enum \
 
3
        -Wunused -Wuninitialized -Wstrict-overflow=5 \
 
4
        -Wsuggest-attribute=pure -Wsuggest-attribute=const \
 
5
        -Wsuggest-attribute=noreturn -Wfloat-equal -Wundef -Wshadow \
4
6
        -Wunsafe-loop-optimizations -Wpointer-arith \
5
7
        -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings \
6
 
        -Wconversion -Wstrict-prototypes -Wold-style-definition \
7
 
        -Wpacked -Wnested-externs -Winline -Wvolatile-register-var
8
 
#       -Wunreachable-code 
9
 
#DEBUG=-ggdb3
10
 
# For info about _FORTIFY_SOURCE, see
11
 
# <http://www.kernel.org/doc/man-pages/online/pages/man7/feature_test_macros.7.html>
12
 
# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
13
 
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
14
 
LINK_FORTIFY_LD=-z relro -z now
15
 
LINK_FORTIFY=
 
8
        -Wconversion -Wlogical-op -Waggregate-return \
 
9
        -Wstrict-prototypes -Wold-style-definition \
 
10
        -Wmissing-format-attribute -Wnormalized=nfc -Wpacked \
 
11
        -Wredundant-decls -Wnested-externs -Winline -Wvla \
 
12
        -Wvolatile-register-var -Woverlength-strings
 
13
 
 
14
#DEBUG:=-ggdb3 -fsanitize=address $(SANITIZE)
 
15
## Check which sanitizing options can be used
 
16
#SANITIZE:=$(foreach option,$(ALL_SANITIZE_OPTIONS),$(shell \
 
17
#       echo 'int main(){}' | $(CC) --language=c $(option) \
 
18
#       /dev/stdin -o /dev/null >/dev/null 2>&1 && echo $(option)))
 
19
# <https://developerblog.redhat.com/2014/10/16/gcc-undefined-behavior-sanitizer-ubsan/>
 
20
ALL_SANITIZE_OPTIONS:=-fsanitize=leak -fsanitize=undefined \
 
21
        -fsanitize=shift -fsanitize=integer-divide-by-zero \
 
22
        -fsanitize=unreachable -fsanitize=vla-bound -fsanitize=null \
 
23
        -fsanitize=return -fsanitize=signed-integer-overflow \
 
24
        -fsanitize=bounds -fsanitize=alignment \
 
25
        -fsanitize=object-size -fsanitize=float-divide-by-zero \
 
26
        -fsanitize=float-cast-overflow -fsanitize=nonnull-attribute \
 
27
        -fsanitize=returns-nonnull-attribute -fsanitize=bool \
 
28
        -fsanitize=enum
 
29
 
 
30
# For info about _FORTIFY_SOURCE, see feature_test_macros(7)
 
31
# and <https://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
 
32
FORTIFY:=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
 
33
LINK_FORTIFY_LD:=-z relro -z now
 
34
LINK_FORTIFY:=
16
35
 
17
36
# If BROKEN_PIE is set, do not build with -pie
18
37
ifndef BROKEN_PIE
20
39
LINK_FORTIFY += -pie
21
40
endif
22
41
#COVERAGE=--coverage
23
 
OPTIMIZE=-Os
24
 
LANGUAGE=-std=gnu99
25
 
htmldir=man
26
 
version=1.3.0
27
 
SED=sed
 
42
OPTIMIZE:=-Os -fno-strict-aliasing
 
43
LANGUAGE:=-std=gnu11
 
44
htmldir:=man
 
45
version:=1.8.4
 
46
SED:=sed
 
47
 
 
48
USER:=$(firstword $(subst :, ,$(shell getent passwd _mandos \
 
49
        || getent passwd nobody || echo 65534)))
 
50
GROUP:=$(firstword $(subst :, ,$(shell getent group _mandos \
 
51
        || getent group nogroup || echo 65534)))
28
52
 
29
53
## Use these settings for a traditional /usr/local install
30
 
# PREFIX=$(DESTDIR)/usr/local
31
 
# CONFDIR=$(DESTDIR)/etc/mandos
32
 
# KEYDIR=$(DESTDIR)/etc/mandos/keys
33
 
# MANDIR=$(PREFIX)/man
34
 
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
 
54
# PREFIX:=$(DESTDIR)/usr/local
 
55
# CONFDIR:=$(DESTDIR)/etc/mandos
 
56
# KEYDIR:=$(DESTDIR)/etc/mandos/keys
 
57
# MANDIR:=$(PREFIX)/man
 
58
# INITRAMFSTOOLS:=$(DESTDIR)/etc/initramfs-tools
 
59
# STATEDIR:=$(DESTDIR)/var/lib/mandos
 
60
# LIBDIR:=$(PREFIX)/lib
35
61
##
36
62
 
37
63
## These settings are for a package-type install
38
 
PREFIX=$(DESTDIR)/usr
39
 
CONFDIR=$(DESTDIR)/etc/mandos
40
 
KEYDIR=$(DESTDIR)/etc/keys/mandos
41
 
MANDIR=$(PREFIX)/share/man
42
 
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
 
64
PREFIX:=$(DESTDIR)/usr
 
65
CONFDIR:=$(DESTDIR)/etc/mandos
 
66
KEYDIR:=$(DESTDIR)/etc/keys/mandos
 
67
MANDIR:=$(PREFIX)/share/man
 
68
INITRAMFSTOOLS:=$(DESTDIR)/usr/share/initramfs-tools
 
69
STATEDIR:=$(DESTDIR)/var/lib/mandos
 
70
LIBDIR:=$(shell \
 
71
        for d in \
 
72
        "/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null`" \
 
73
        "`rpm --eval='%{_libdir}' 2>/dev/null`" /usr/lib; do \
 
74
                if [ -d "$$d" -a "$$d" = "$${d%/}" ]; then \
 
75
                        echo "$(DESTDIR)$$d"; \
 
76
                        break; \
 
77
                fi; \
 
78
        done)
43
79
##
44
80
 
45
 
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
46
 
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
47
 
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
48
 
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
49
 
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
50
 
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
 
81
SYSTEMD:=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
 
82
TMPFILES:=$(DESTDIR)$(shell pkg-config systemd --variable=tmpfilesdir)
 
83
 
 
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; \
51
90
        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)
52
93
 
53
94
# Do not change these two
54
 
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
55
 
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
56
 
        -DVERSION='"$(version)"'
57
 
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
95
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) \
 
96
        $(OPTIMIZE) $(LANGUAGE) -DVERSION='"$(version)"'
 
97
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(strip \
 
98
        ) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
58
99
 
59
100
# Commands to format a DocBook <refentry> document into a manual page
60
101
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
63
104
        --param make.single.year.ranges         1 \
64
105
        --param man.output.quietly              1 \
65
106
        --param man.authors.section.enabled     0 \
66
 
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
 
107
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
67
108
        $(notdir $<); \
68
 
        $(MANPOST) $(notdir $@))
69
 
# DocBook-to-man post-processing to fix a '\n' escape bug
70
 
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
 
109
        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)
71
113
 
72
114
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
73
115
        --param make.year.ranges                1 \
79
121
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
80
122
        $<; $(HTMLPOST) $@)
81
123
# Fix citerefentry links
82
 
HTMLPOST=$(SED) --in-place \
 
124
HTMLPOST:=$(SED) --in-place \
83
125
        --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
84
126
 
85
 
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
 
127
PLUGINS:=plugins.d/password-prompt plugins.d/mandos-client \
86
128
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
87
129
        plugins.d/plymouth
88
 
CPROGS=plugin-runner $(PLUGINS)
89
 
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
90
 
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
 
130
PLUGIN_HELPERS:=plugin-helpers/mandos-client-iprouteadddel
 
131
CPROGS:=plugin-runner $(PLUGINS) $(PLUGIN_HELPERS)
 
132
PROGS:=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
 
133
DOCS:=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
91
134
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
92
135
        plugins.d/mandos-client.8mandos \
93
136
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
94
137
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
95
 
        plugins.d/plymouth.8mandos
96
 
 
97
 
htmldocs=$(addsuffix .xhtml,$(DOCS))
98
 
 
99
 
objects=$(addsuffix .o,$(CPROGS))
 
138
        plugins.d/plymouth.8mandos intro.8mandos
 
139
 
 
140
htmldocs:=$(addsuffix .xhtml,$(DOCS))
 
141
 
 
142
objects:=$(addsuffix .o,$(CPROGS))
100
143
 
101
144
all: $(PROGS) mandos.lsm
102
145
 
119
162
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
120
163
        $(DOCBOOKTOHTML)
121
164
 
 
165
intro.8mandos: intro.xml common.ent legalnotice.xml
 
166
        $(DOCBOOKTOMAN)
 
167
intro.8mandos.xhtml: intro.xml common.ent legalnotice.xml
 
168
        $(DOCBOOKTOHTML)
 
169
 
122
170
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
123
171
                legalnotice.xml
124
172
        $(DOCBOOKTOMAN)
209
257
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
210
258
                $@)
211
259
 
 
260
# Need to add the GnuTLS, Avahi and GPGME libraries
212
261
plugins.d/mandos-client: plugins.d/mandos-client.c
213
 
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
214
 
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
215
 
 
216
 
.PHONY : all doc html clean distclean run-client run-server install \
217
 
        install-server install-client uninstall uninstall-server \
218
 
        uninstall-client purge purge-server purge-client
 
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
219
276
 
220
277
clean:
221
278
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
223
280
distclean: clean
224
281
mostlyclean: clean
225
282
maintainer-clean: clean
226
 
        -rm --force --recursive keydir confdir
 
283
        -rm --force --recursive keydir confdir statedir
227
284
 
228
285
check:  all
229
286
        ./mandos --check
 
287
        ./mandos-ctl --check
230
288
 
231
289
# Run the client with a local config and key
232
 
run-client: all keydir/seckey.txt keydir/pubkey.txt
 
290
run-client: all keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem
233
291
        @echo "###################################################################"
234
292
        @echo "# The following error messages are harmless and can be safely     #"
235
 
        @echo "# ignored.  The messages are caused by not running as root, but   #"
236
 
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
237
 
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
238
 
        @echo "# From plugin-runner: setuid: Operation not permitted             #"
 
293
        @echo "# ignored:                                                        #"
 
294
        @echo "# From plugin-runner: setgid: Operation not permitted             #"
 
295
        @echo "#                     setuid: Operation not permitted             #"
239
296
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
240
 
        @echo "# From mandos-client: setuid: Operation not permitted             #"
241
 
        @echo "#                     seteuid: Operation not permitted            #"
242
 
        @echo "#                     klogctl: Operation not permitted            #"
 
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.)        #"
243
304
        @echo "###################################################################"
 
305
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
244
306
        ./plugin-runner --plugin-dir=plugins.d \
 
307
                --plugin-helper-dir=plugin-helpers \
245
308
                --config-file=plugin-runner.conf \
246
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
 
309
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--tls-privkey=keydir/tls-privkey.pem,--tls-pubkey=keydir/tls-pubkey.pem,--network-hook-dir=network-hooks.d \
 
310
                --env-for=mandos-client:GNOME_KEYRING_CONTROL= \
247
311
                $(CLIENTARGS)
248
312
 
249
313
# Used by run-client
250
 
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
 
314
keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem: mandos-keygen
251
315
        install --directory keydir
252
316
        ./mandos-keygen --dir keydir --force
253
317
 
254
318
# Run the server with a local config
255
 
run-server: confdir/mandos.conf confdir/clients.conf
256
 
        @echo "#################################################################"
257
 
        @echo "# NOTE: Please IGNORE the error about \"Could not open file      #"
258
 
        @echo "# u'/var/run/mandos.pid'\" -  it is harmless and is caused by    #"
259
 
        @echo "# the server not running as root.  Do NOT run \"make run-server\" #"
260
 
        @echo "# server as root if you didn't also unpack and compile it thus. #"
261
 
        @echo "#################################################################"
262
 
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
 
319
run-server: confdir/mandos.conf confdir/clients.conf statedir
 
320
        ./mandos --debug --no-dbus --configdir=confdir \
 
321
                --statedir=statedir $(SERVERARGS)
263
322
 
264
323
# Used by run-server
265
324
confdir/mandos.conf: mandos.conf
266
325
        install --directory confdir
267
326
        install --mode=u=rw,go=r $^ $@
268
 
confdir/clients.conf: clients.conf keydir/seckey.txt
 
327
confdir/clients.conf: clients.conf keydir/seckey.txt keydir/tls-pubkey.pem
269
328
        install --directory confdir
270
329
        install --mode=u=rw $< $@
271
330
# Add a client password
272
 
        ./mandos-keygen --dir keydir --password >> $@
 
331
        ./mandos-keygen --dir keydir --password --no-ssh >> $@
 
332
statedir:
 
333
        install --directory statedir
273
334
 
274
335
install: install-server install-client-nokey
275
336
 
280
341
 
281
342
install-server: doc
282
343
        install --directory $(CONFDIR)
 
344
        if install --directory --mode=u=rwx --owner=$(USER) \
 
345
                --group=$(GROUP) $(STATEDIR); then \
 
346
                :; \
 
347
        elif install --directory --mode=u=rwx $(STATEDIR); then \
 
348
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
 
349
        fi
 
350
        if [ "$(TMPFILES)" != "$(DESTDIR)" -a -d "$(TMPFILES)" ]; then \
 
351
                install --mode=u=rw,go=r tmpfiles.d-mandos.conf \
 
352
                        $(TMPFILES)/mandos.conf; \
 
353
        fi
283
354
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
284
355
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
285
356
                mandos-ctl
293
364
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
294
365
        install --mode=u=rwx,go=rx init.d-mandos \
295
366
                $(DESTDIR)/etc/init.d/mandos
 
367
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
 
368
                install --mode=u=rw,go=r mandos.service $(SYSTEMD); \
 
369
        fi
296
370
        install --mode=u=rw,go=r default-mandos \
297
371
                $(DESTDIR)/etc/default/mandos
298
372
        if [ -z $(DESTDIR) ]; then \
308
382
                > $(MANDIR)/man5/mandos.conf.5.gz
309
383
        gzip --best --to-stdout mandos-clients.conf.5 \
310
384
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
 
385
        gzip --best --to-stdout intro.8mandos \
 
386
                > $(MANDIR)/man8/intro.8mandos.gz
311
387
 
312
388
install-client-nokey: all doc
313
 
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
 
389
        install --directory $(LIBDIR)/mandos $(CONFDIR)
314
390
        install --directory --mode=u=rwx $(KEYDIR) \
315
 
                $(PREFIX)/lib/mandos/plugins.d
316
 
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
 
391
                $(LIBDIR)/mandos/plugins.d \
 
392
                $(LIBDIR)/mandos/plugin-helpers
 
393
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
317
394
                install --mode=u=rwx \
318
 
                        --directory "$(CONFDIR)/plugins.d"; \
 
395
                        --directory "$(CONFDIR)/plugins.d" \
 
396
                        "$(CONFDIR)/plugin-helpers"; \
319
397
        fi
320
 
        install --mode=u=rwx,go=rx \
321
 
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
 
398
        install --mode=u=rwx,go=rx --directory \
 
399
                "$(CONFDIR)/network-hooks.d"
 
400
        install --mode=u=rwx,go=rx \
 
401
                --target-directory=$(LIBDIR)/mandos plugin-runner
 
402
        install --mode=u=rwx,go=rx \
 
403
                --target-directory=$(LIBDIR)/mandos mandos-to-cryptroot-unlock
322
404
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
323
405
                mandos-keygen
324
406
        install --mode=u=rwx,go=rx \
325
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
407
                --target-directory=$(LIBDIR)/mandos/plugins.d \
326
408
                plugins.d/password-prompt
327
409
        install --mode=u=rwxs,go=rx \
328
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
410
                --target-directory=$(LIBDIR)/mandos/plugins.d \
329
411
                plugins.d/mandos-client
330
412
        install --mode=u=rwxs,go=rx \
331
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
413
                --target-directory=$(LIBDIR)/mandos/plugins.d \
332
414
                plugins.d/usplash
333
415
        install --mode=u=rwxs,go=rx \
334
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
416
                --target-directory=$(LIBDIR)/mandos/plugins.d \
335
417
                plugins.d/splashy
336
418
        install --mode=u=rwxs,go=rx \
337
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
419
                --target-directory=$(LIBDIR)/mandos/plugins.d \
338
420
                plugins.d/askpass-fifo
339
421
        install --mode=u=rwxs,go=rx \
340
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
422
                --target-directory=$(LIBDIR)/mandos/plugins.d \
341
423
                plugins.d/plymouth
 
424
        install --mode=u=rwx,go=rx \
 
425
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
 
426
                plugin-helpers/mandos-client-iprouteadddel
342
427
        install initramfs-tools-hook \
343
428
                $(INITRAMFSTOOLS)/hooks/mandos
344
 
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
345
 
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
 
429
        install --mode=u=rw,go=r initramfs-tools-conf \
 
430
                $(INITRAMFSTOOLS)/conf.d/mandos-conf
 
431
        install --mode=u=rw,go=r initramfs-tools-conf-hook \
 
432
                $(INITRAMFSTOOLS)/conf-hooks.d/zz-mandos
346
433
        install initramfs-tools-script \
347
434
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
 
435
        install initramfs-tools-script-stop \
 
436
                $(INITRAMFSTOOLS)/scripts/local-premount/mandos
348
437
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
349
438
        gzip --best --to-stdout mandos-keygen.8 \
350
439
                > $(MANDIR)/man8/mandos-keygen.8.gz
389
478
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
390
479
                $(DESTDIR)/etc/crypttab
391
480
        -rm --force $(PREFIX)/sbin/mandos-keygen \
392
 
                $(PREFIX)/lib/mandos/plugin-runner \
393
 
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
394
 
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
395
 
                $(PREFIX)/lib/mandos/plugins.d/usplash \
396
 
                $(PREFIX)/lib/mandos/plugins.d/splashy \
397
 
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
398
 
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
 
481
                $(LIBDIR)/mandos/plugin-runner \
 
482
                $(LIBDIR)/mandos/plugins.d/password-prompt \
 
483
                $(LIBDIR)/mandos/plugins.d/mandos-client \
 
484
                $(LIBDIR)/mandos/plugins.d/usplash \
 
485
                $(LIBDIR)/mandos/plugins.d/splashy \
 
486
                $(LIBDIR)/mandos/plugins.d/askpass-fifo \
 
487
                $(LIBDIR)/mandos/plugins.d/plymouth \
399
488
                $(INITRAMFSTOOLS)/hooks/mandos \
400
489
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
401
490
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
407
496
                $(MANDIR)/man8/splashy.8mandos.gz \
408
497
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
409
498
                $(MANDIR)/man8/plymouth.8mandos.gz \
410
 
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
411
 
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
 
499
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
 
500
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
412
501
        update-initramfs -k all -u
413
502
 
414
503
purge: purge-server purge-client
418
507
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
419
508
                $(DESTDIR)/etc/default/mandos \
420
509
                $(DESTDIR)/etc/init.d/mandos \
 
510
                $(SYSTEMD)/mandos.service \
 
511
                $(DESTDIR)/run/mandos.pid \
421
512
                $(DESTDIR)/var/run/mandos.pid
422
513
        -rmdir $(CONFDIR)
423
514
 
424
515
purge-client: uninstall-client
425
 
        -shred --remove $(KEYDIR)/seckey.txt
 
516
        -shred --remove $(KEYDIR)/seckey.txt $(KEYDIR)/tls-privkey.pem
426
517
        -rm --force $(CONFDIR)/plugin-runner.conf \
427
 
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt
 
518
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt \
 
519
                $(KEYDIR)/tls-pubkey.txt $(KEYDIR)/tls-privkey.txt
428
520
        -rmdir $(KEYDIR) $(CONFDIR)/plugins.d $(CONFDIR)