/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-18 00:02:43 UTC
  • Revision ID: teddy@recompile.se-20190718000243-okz4s9xao1r1tfnx
Document bug in mandos-keygen which strips white space from passwords

Passwords, as read by mandos-keygen when given the --password or -p
options, are stripped of white space from the start and from the end
of the password.  This is because mandos-keygen is a shell script, and
the Bourne Shell "read" builtin does not seem to have a way to avoid
this.  Document this bug.

* manods-keygen.xml (OPTIONS): Document the white space-stripping
                               nature of the --password/-p option, and
                               also note in the description of
                               --passfile and -F that they avoid this
                               behavior.
  (BUGS): Again mention the problem with the --password and -p
          options, and suggest --passfile as a possible workaround.

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 -fsanitize-address-use-after-scope
 
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.5.5
27
 
SED=sed
 
42
OPTIMIZE:=-Os -fno-strict-aliasing
 
43
LANGUAGE:=-std=gnu11
 
44
htmldir:=man
 
45
version:=1.8.4
 
46
SED:=sed
28
47
 
29
 
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
30
 
GROUP=$(firstword $(subst :, ,$(shell getent group _mandos || getent group nobody || echo 65534)))
 
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)))
31
52
 
32
53
## Use these settings for a traditional /usr/local install
33
 
# PREFIX=$(DESTDIR)/usr/local
34
 
# CONFDIR=$(DESTDIR)/etc/mandos
35
 
# KEYDIR=$(DESTDIR)/etc/mandos/keys
36
 
# MANDIR=$(PREFIX)/man
37
 
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
38
 
# STATEDIR=$(DESTDIR)/var/lib/mandos
 
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
39
61
##
40
62
 
41
63
## These settings are for a package-type install
42
 
PREFIX=$(DESTDIR)/usr
43
 
CONFDIR=$(DESTDIR)/etc/mandos
44
 
KEYDIR=$(DESTDIR)/etc/keys/mandos
45
 
MANDIR=$(PREFIX)/share/man
46
 
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
47
 
STATEDIR=$(DESTDIR)/var/lib/mandos
 
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)
48
79
##
49
80
 
50
 
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
51
 
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
52
 
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
53
 
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
54
 
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
55
 
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; \
56
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)
57
93
 
58
94
# Do not change these two
59
 
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
60
 
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
61
 
        -DVERSION='"$(version)"'
62
 
LDFLAGS=-Xlinker --as-needed $(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))
63
99
 
64
100
# Commands to format a DocBook <refentry> document into a manual page
65
101
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
70
106
        --param man.authors.section.enabled     0 \
71
107
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
72
108
        $(notdir $<); \
73
 
        $(MANPOST) $(notdir $@);\
74
109
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
75
110
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
76
111
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
77
112
        fi >/dev/null)
78
 
# DocBook-to-man post-processing to fix a '\n' escape bug
79
 
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
80
113
 
81
114
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
82
115
        --param make.year.ranges                1 \
88
121
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
89
122
        $<; $(HTMLPOST) $@)
90
123
# Fix citerefentry links
91
 
HTMLPOST=$(SED) --in-place \
 
124
HTMLPOST:=$(SED) --in-place \
92
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'
93
126
 
94
 
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
 
127
PLUGINS:=plugins.d/password-prompt plugins.d/mandos-client \
95
128
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
96
129
        plugins.d/plymouth
97
 
CPROGS=plugin-runner $(PLUGINS)
98
 
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
99
 
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 \
100
134
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
101
135
        plugins.d/mandos-client.8mandos \
102
136
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
103
137
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
104
138
        plugins.d/plymouth.8mandos intro.8mandos
105
139
 
106
 
htmldocs=$(addsuffix .xhtml,$(DOCS))
 
140
htmldocs:=$(addsuffix .xhtml,$(DOCS))
107
141
 
108
 
objects=$(addsuffix .o,$(CPROGS))
 
142
objects:=$(addsuffix .o,$(CPROGS))
109
143
 
110
144
all: $(PROGS) mandos.lsm
111
145
 
223
257
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
224
258
                $@)
225
259
 
 
260
# Need to add the GnuTLS, Avahi and GPGME libraries
226
261
plugins.d/mandos-client: plugins.d/mandos-client.c
227
 
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
228
 
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
229
 
 
230
 
.PHONY : all doc html clean distclean run-client run-server install \
231
 
        install-server install-client uninstall uninstall-server \
232
 
        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
# Need to add the libnl-route library
 
268
plugin-helpers/mandos-client-iprouteadddel: plugin-helpers/mandos-client-iprouteadddel.c
 
269
        $(LINK.c) $(LIBNL3_CFLAGS) $^ $(LIBNL3_LIBS) $(strip\
 
270
                ) $(LOADLIBES) $(LDLIBS) -o $@
 
271
 
 
272
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
 
273
        check run-client run-server install install-html \
 
274
        install-server install-client-nokey install-client uninstall \
 
275
        uninstall-server uninstall-client purge purge-server \
 
276
        purge-client
233
277
 
234
278
clean:
235
279
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
239
283
maintainer-clean: clean
240
284
        -rm --force --recursive keydir confdir statedir
241
285
 
242
 
check:  all
 
286
check: all
243
287
        ./mandos --check
 
288
        ./mandos-ctl --check
 
289
        ./mandos-keygen --version
 
290
        ./plugin-runner --version
 
291
        ./plugin-helpers/mandos-client-iprouteadddel --version
244
292
 
245
293
# Run the client with a local config and key
246
 
run-client: all keydir/seckey.txt keydir/pubkey.txt
 
294
run-client: all keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem
247
295
        @echo "###################################################################"
248
296
        @echo "# The following error messages are harmless and can be safely     #"
249
 
        @echo "# ignored.  The messages are caused by not running as root, but   #"
250
 
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
251
 
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
252
 
        @echo "# From plugin-runner: setuid: Operation not permitted             #"
 
297
        @echo "# ignored:                                                        #"
 
298
        @echo "# From plugin-runner: setgid: Operation not permitted             #"
 
299
        @echo "#                     setuid: Operation not permitted             #"
253
300
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
254
 
        @echo "# From mandos-client: setuid: Operation not permitted             #"
255
 
        @echo "#                     seteuid: Operation not permitted            #"
256
 
        @echo "#                     klogctl: Operation not permitted            #"
 
301
        @echo "# From mandos-client:                                             #"
 
302
        @echo "#             Failed to raise privileges: Operation not permitted #"
 
303
        @echo "#             Warning: network hook \"*\" exited with status *      #"
 
304
        @echo "#                                                                 #"
 
305
        @echo "# (The messages are caused by not running as root, but you should #"
 
306
        @echo "# NOT run \"make run-client\" as root unless you also unpacked and  #"
 
307
        @echo "# compiled Mandos as root, which is also NOT recommended.)        #"
257
308
        @echo "###################################################################"
 
309
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
258
310
        ./plugin-runner --plugin-dir=plugins.d \
 
311
                --plugin-helper-dir=plugin-helpers \
259
312
                --config-file=plugin-runner.conf \
260
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
 
313
                --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 \
 
314
                --env-for=mandos-client:GNOME_KEYRING_CONTROL= \
261
315
                $(CLIENTARGS)
262
316
 
263
317
# Used by run-client
264
 
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
 
318
keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem: mandos-keygen
265
319
        install --directory keydir
266
320
        ./mandos-keygen --dir keydir --force
267
321
 
274
328
confdir/mandos.conf: mandos.conf
275
329
        install --directory confdir
276
330
        install --mode=u=rw,go=r $^ $@
277
 
confdir/clients.conf: clients.conf keydir/seckey.txt
 
331
confdir/clients.conf: clients.conf keydir/seckey.txt keydir/tls-pubkey.pem
278
332
        install --directory confdir
279
333
        install --mode=u=rw $< $@
280
334
# Add a client password
281
 
        ./mandos-keygen --dir keydir --password >> $@
 
335
        ./mandos-keygen --dir keydir --password --no-ssh >> $@
282
336
statedir:
283
337
        install --directory statedir
284
338
 
291
345
 
292
346
install-server: doc
293
347
        install --directory $(CONFDIR)
294
 
        install --directory --mode=u=rwx --owner=$(USER) \
295
 
                --group=$(GROUP) $(STATEDIR)
 
348
        if install --directory --mode=u=rwx --owner=$(USER) \
 
349
                --group=$(GROUP) $(STATEDIR); then \
 
350
                :; \
 
351
        elif install --directory --mode=u=rwx $(STATEDIR); then \
 
352
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
 
353
        fi
 
354
        if [ "$(TMPFILES)" != "$(DESTDIR)" -a -d "$(TMPFILES)" ]; then \
 
355
                install --mode=u=rw,go=r tmpfiles.d-mandos.conf \
 
356
                        $(TMPFILES)/mandos.conf; \
 
357
        fi
296
358
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
297
359
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
298
360
                mandos-ctl
306
368
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
307
369
        install --mode=u=rwx,go=rx init.d-mandos \
308
370
                $(DESTDIR)/etc/init.d/mandos
 
371
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
 
372
                install --mode=u=rw,go=r mandos.service $(SYSTEMD); \
 
373
        fi
309
374
        install --mode=u=rw,go=r default-mandos \
310
375
                $(DESTDIR)/etc/default/mandos
311
376
        if [ -z $(DESTDIR) ]; then \
325
390
                > $(MANDIR)/man8/intro.8mandos.gz
326
391
 
327
392
install-client-nokey: all doc
328
 
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
 
393
        install --directory $(LIBDIR)/mandos $(CONFDIR)
329
394
        install --directory --mode=u=rwx $(KEYDIR) \
330
 
                $(PREFIX)/lib/mandos/plugins.d
331
 
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
 
395
                $(LIBDIR)/mandos/plugins.d \
 
396
                $(LIBDIR)/mandos/plugin-helpers
 
397
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
332
398
                install --mode=u=rwx \
333
 
                        --directory "$(CONFDIR)/plugins.d"; \
 
399
                        --directory "$(CONFDIR)/plugins.d" \
 
400
                        "$(CONFDIR)/plugin-helpers"; \
334
401
        fi
335
402
        install --mode=u=rwx,go=rx --directory \
336
403
                "$(CONFDIR)/network-hooks.d"
337
404
        install --mode=u=rwx,go=rx \
338
 
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
 
405
                --target-directory=$(LIBDIR)/mandos plugin-runner
 
406
        install --mode=u=rwx,go=rx \
 
407
                --target-directory=$(LIBDIR)/mandos mandos-to-cryptroot-unlock
339
408
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
340
409
                mandos-keygen
341
410
        install --mode=u=rwx,go=rx \
342
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
411
                --target-directory=$(LIBDIR)/mandos/plugins.d \
343
412
                plugins.d/password-prompt
344
413
        install --mode=u=rwxs,go=rx \
345
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
414
                --target-directory=$(LIBDIR)/mandos/plugins.d \
346
415
                plugins.d/mandos-client
347
416
        install --mode=u=rwxs,go=rx \
348
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
417
                --target-directory=$(LIBDIR)/mandos/plugins.d \
349
418
                plugins.d/usplash
350
419
        install --mode=u=rwxs,go=rx \
351
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
420
                --target-directory=$(LIBDIR)/mandos/plugins.d \
352
421
                plugins.d/splashy
353
422
        install --mode=u=rwxs,go=rx \
354
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
423
                --target-directory=$(LIBDIR)/mandos/plugins.d \
355
424
                plugins.d/askpass-fifo
356
425
        install --mode=u=rwxs,go=rx \
357
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
426
                --target-directory=$(LIBDIR)/mandos/plugins.d \
358
427
                plugins.d/plymouth
 
428
        install --mode=u=rwx,go=rx \
 
429
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
 
430
                plugin-helpers/mandos-client-iprouteadddel
359
431
        install initramfs-tools-hook \
360
432
                $(INITRAMFSTOOLS)/hooks/mandos
361
 
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
362
 
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
 
433
        install --mode=u=rw,go=r initramfs-tools-conf \
 
434
                $(INITRAMFSTOOLS)/conf.d/mandos-conf
 
435
        install --mode=u=rw,go=r initramfs-tools-conf-hook \
 
436
                $(INITRAMFSTOOLS)/conf-hooks.d/zz-mandos
363
437
        install initramfs-tools-script \
364
438
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
 
439
        install initramfs-tools-script-stop \
 
440
                $(INITRAMFSTOOLS)/scripts/local-premount/mandos
365
441
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
366
442
        gzip --best --to-stdout mandos-keygen.8 \
367
443
                > $(MANDIR)/man8/mandos-keygen.8.gz
406
482
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
407
483
                $(DESTDIR)/etc/crypttab
408
484
        -rm --force $(PREFIX)/sbin/mandos-keygen \
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 \
 
485
                $(LIBDIR)/mandos/plugin-runner \
 
486
                $(LIBDIR)/mandos/plugins.d/password-prompt \
 
487
                $(LIBDIR)/mandos/plugins.d/mandos-client \
 
488
                $(LIBDIR)/mandos/plugins.d/usplash \
 
489
                $(LIBDIR)/mandos/plugins.d/splashy \
 
490
                $(LIBDIR)/mandos/plugins.d/askpass-fifo \
 
491
                $(LIBDIR)/mandos/plugins.d/plymouth \
416
492
                $(INITRAMFSTOOLS)/hooks/mandos \
417
493
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
418
494
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
424
500
                $(MANDIR)/man8/splashy.8mandos.gz \
425
501
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
426
502
                $(MANDIR)/man8/plymouth.8mandos.gz \
427
 
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
428
 
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
 
503
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
 
504
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
429
505
        update-initramfs -k all -u
430
506
 
431
507
purge: purge-server purge-client
435
511
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
436
512
                $(DESTDIR)/etc/default/mandos \
437
513
                $(DESTDIR)/etc/init.d/mandos \
 
514
                $(SYSTEMD)/mandos.service \
 
515
                $(DESTDIR)/run/mandos.pid \
438
516
                $(DESTDIR)/var/run/mandos.pid
439
517
        -rmdir $(CONFDIR)
440
518
 
441
519
purge-client: uninstall-client
442
 
        -shred --remove $(KEYDIR)/seckey.txt
 
520
        -shred --remove $(KEYDIR)/seckey.txt $(KEYDIR)/tls-privkey.pem
443
521
        -rm --force $(CONFDIR)/plugin-runner.conf \
444
 
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt
 
522
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt \
 
523
                $(KEYDIR)/tls-pubkey.txt $(KEYDIR)/tls-privkey.txt
445
524
        -rmdir $(KEYDIR) $(CONFDIR)/plugins.d $(CONFDIR)