/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-03-08 23:55:34 UTC
  • Revision ID: teddy@recompile.se-20190308235534-kkiwc3oeyp0vxw5h
mandos-ctl: Add new --debug option to show D-Bus calls

* mandos-ctl (PropertyCmd, RemoveCmd, ApproveCmd, DenyCmd): Add debug
  output
  (add_command_line_options): Also add "--debug" options.
  (main): If debug option is set, set logging level to DEBUG.  Also
          add debug output when connecting to Mandos server.
* mandos-ctl.xml (SYNOPSIS): Show --debug option where appropriate.
  (OPTIONS): Document new "--debug" option.

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
#DEBUG:=-ggdb3 -fsanitize=address 
 
14
# For info about _FORTIFY_SOURCE, see feature_test_macros(7)
 
15
# and <https://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
 
16
FORTIFY:=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
 
17
# <https://developerblog.redhat.com/2014/10/16/gcc-undefined-behavior-sanitizer-ubsan/>
 
18
ALL_SANITIZE_OPTIONS:=-fsanitize=leak -fsanitize=undefined \
 
19
        -fsanitize=shift -fsanitize=integer-divide-by-zero \
 
20
        -fsanitize=unreachable -fsanitize=vla-bound -fsanitize=null \
 
21
        -fsanitize=return -fsanitize=signed-integer-overflow \
 
22
        -fsanitize=bounds -fsanitize=alignment \
 
23
        -fsanitize=object-size -fsanitize=float-divide-by-zero \
 
24
        -fsanitize=float-cast-overflow -fsanitize=nonnull-attribute \
 
25
        -fsanitize=returns-nonnull-attribute -fsanitize=bool \
 
26
        -fsanitize=enum
 
27
# Check which sanitizing options can be used
 
28
SANITIZE:=$(foreach option,$(ALL_SANITIZE_OPTIONS),$(shell \
 
29
        echo 'int main(){}' | $(CC) --language=c $(option) /dev/stdin \
 
30
        -o /dev/null >/dev/null 2>&1 && echo $(option)))
 
31
LINK_FORTIFY_LD:=-z relro -z now
 
32
LINK_FORTIFY:=
16
33
 
17
34
# If BROKEN_PIE is set, do not build with -pie
18
35
ifndef BROKEN_PIE
20
37
LINK_FORTIFY += -pie
21
38
endif
22
39
#COVERAGE=--coverage
23
 
OPTIMIZE=-Os
24
 
LANGUAGE=-std=gnu99
25
 
htmldir=man
26
 
version=1.6.2
27
 
SED=sed
 
40
OPTIMIZE:=-Os -fno-strict-aliasing
 
41
LANGUAGE:=-std=gnu11
 
42
htmldir:=man
 
43
version:=1.8.3
 
44
SED:=sed
28
45
 
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)))
 
46
USER:=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
 
47
GROUP:=$(firstword $(subst :, ,$(shell getent group _mandos || getent group nogroup || echo 65534)))
31
48
 
32
49
## 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
 
50
# PREFIX:=$(DESTDIR)/usr/local
 
51
# CONFDIR:=$(DESTDIR)/etc/mandos
 
52
# KEYDIR:=$(DESTDIR)/etc/mandos/keys
 
53
# MANDIR:=$(PREFIX)/man
 
54
# INITRAMFSTOOLS:=$(DESTDIR)/etc/initramfs-tools
 
55
# STATEDIR:=$(DESTDIR)/var/lib/mandos
 
56
# LIBDIR:=$(PREFIX)/lib
39
57
##
40
58
 
41
59
## 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
 
60
PREFIX:=$(DESTDIR)/usr
 
61
CONFDIR:=$(DESTDIR)/etc/mandos
 
62
KEYDIR:=$(DESTDIR)/etc/keys/mandos
 
63
MANDIR:=$(PREFIX)/share/man
 
64
INITRAMFSTOOLS:=$(DESTDIR)/usr/share/initramfs-tools
 
65
STATEDIR:=$(DESTDIR)/var/lib/mandos
 
66
LIBDIR:=$(shell \
 
67
        for d in \
 
68
        "/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null`" \
 
69
        "`rpm --eval='%{_libdir}' 2>/dev/null`" /usr/lib; do \
 
70
                if [ -d "$$d" -a "$$d" = "$${d%/}" ]; then \
 
71
                        echo "$(DESTDIR)$$d"; \
 
72
                        break; \
 
73
                fi; \
 
74
        done)
48
75
##
49
76
 
50
 
SYSTEMD=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
 
77
SYSTEMD:=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
 
78
TMPFILES:=$(DESTDIR)$(shell pkg-config systemd --variable=tmpfilesdir)
51
79
 
52
 
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
53
 
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
54
 
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
55
 
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
56
 
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
57
 
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
 
80
GNUTLS_CFLAGS:=$(shell pkg-config --cflags-only-I gnutls)
 
81
GNUTLS_LIBS:=$(shell pkg-config --libs gnutls)
 
82
AVAHI_CFLAGS:=$(shell pkg-config --cflags-only-I avahi-core)
 
83
AVAHI_LIBS:=$(shell pkg-config --libs avahi-core)
 
84
GPGME_CFLAGS:=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
 
85
GPGME_LIBS:=$(shell gpgme-config --libs; getconf LFS_LIBS; \
58
86
        getconf LFS_LDFLAGS)
 
87
LIBNL3_CFLAGS:=$(shell pkg-config --cflags-only-I libnl-route-3.0)
 
88
LIBNL3_LIBS:=$(shell pkg-config --libs libnl-route-3.0)
59
89
 
60
90
# Do not change these two
61
 
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
62
 
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
63
 
        -DVERSION='"$(version)"'
 
91
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(SANITIZE) $(COVERAGE) \
 
92
        $(OPTIMIZE) $(LANGUAGE) -DVERSION='"$(version)"'
64
93
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
65
94
 
66
95
# Commands to format a DocBook <refentry> document into a manual page
72
101
        --param man.authors.section.enabled     0 \
73
102
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
74
103
        $(notdir $<); \
75
 
        $(MANPOST) $(notdir $@);\
76
104
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
77
105
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
78
106
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
79
107
        fi >/dev/null)
80
 
# DocBook-to-man post-processing to fix a '\n' escape bug
81
 
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
82
108
 
83
109
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
84
110
        --param make.year.ranges                1 \
90
116
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
91
117
        $<; $(HTMLPOST) $@)
92
118
# Fix citerefentry links
93
 
HTMLPOST=$(SED) --in-place \
 
119
HTMLPOST:=$(SED) --in-place \
94
120
        --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
95
121
 
96
 
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
 
122
PLUGINS:=plugins.d/password-prompt plugins.d/mandos-client \
97
123
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
98
124
        plugins.d/plymouth
99
 
CPROGS=plugin-runner $(PLUGINS)
100
 
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
101
 
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
 
125
PLUGIN_HELPERS:=plugin-helpers/mandos-client-iprouteadddel
 
126
CPROGS:=plugin-runner $(PLUGINS) $(PLUGIN_HELPERS)
 
127
PROGS:=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
 
128
DOCS:=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
102
129
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
103
130
        plugins.d/mandos-client.8mandos \
104
131
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
105
132
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
106
133
        plugins.d/plymouth.8mandos intro.8mandos
107
134
 
108
 
htmldocs=$(addsuffix .xhtml,$(DOCS))
 
135
htmldocs:=$(addsuffix .xhtml,$(DOCS))
109
136
 
110
 
objects=$(addsuffix .o,$(CPROGS))
 
137
objects:=$(addsuffix .o,$(CPROGS))
111
138
 
112
139
all: $(PROGS) mandos.lsm
113
140
 
225
252
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
226
253
                $@)
227
254
 
 
255
# Need to add the GnuTLS, Avahi and GPGME libraries, and can't use
 
256
# -fsanitize=leak because GnuTLS and GPGME both leak memory.
228
257
plugins.d/mandos-client: plugins.d/mandos-client.c
229
 
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
 
258
        $(CC) $(filter-out -fsanitize=leak,$(CFLAGS)) $(strip\
 
259
        ) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) $(strip\
 
260
                ) $(CPPFLAGS) $(LDFLAGS) $(TARGET_ARCH) $^ $(strip\
 
261
                ) -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
230
262
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
231
263
 
232
 
.PHONY : all doc html clean distclean run-client run-server install \
233
 
        install-server install-client uninstall uninstall-server \
234
 
        uninstall-client purge purge-server purge-client
 
264
plugin-helpers/mandos-client-iprouteadddel: plugin-helpers/mandos-client-iprouteadddel.c
 
265
        $(LINK.c) $(LIBNL3_CFLAGS) $^ $(LIBNL3_LIBS) $(strip\
 
266
                ) $(LOADLIBES) $(LDLIBS) -o $@
 
267
 
 
268
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
 
269
        check run-client run-server install install-html \
 
270
        install-server install-client-nokey install-client uninstall \
 
271
        uninstall-server uninstall-client purge purge-server \
 
272
        purge-client
235
273
 
236
274
clean:
237
275
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
246
284
        ./mandos-ctl --check
247
285
 
248
286
# Run the client with a local config and key
249
 
run-client: all keydir/seckey.txt keydir/pubkey.txt
 
287
run-client: all keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem
250
288
        @echo "###################################################################"
251
289
        @echo "# The following error messages are harmless and can be safely     #"
252
 
        @echo "# ignored.  The messages are caused by not running as root, but   #"
253
 
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
254
 
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
255
 
        @echo "# From plugin-runner: setuid: Operation not permitted             #"
 
290
        @echo "# ignored:                                                        #"
 
291
        @echo "# From plugin-runner: setgid: Operation not permitted             #"
 
292
        @echo "#                     setuid: Operation not permitted             #"
256
293
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
257
 
        @echo "# From mandos-client: setuid: Operation not permitted             #"
258
 
        @echo "#                     seteuid: Operation not permitted            #"
259
 
        @echo "#                     klogctl: Operation not permitted            #"
 
294
        @echo "# From mandos-client:                                             #"
 
295
        @echo "#             Failed to raise privileges: Operation not permitted #"
 
296
        @echo "#             Warning: network hook \"*\" exited with status *      #"
 
297
        @echo "#                                                                 #"
 
298
        @echo "# (The messages are caused by not running as root, but you should #"
 
299
        @echo "# NOT run \"make run-client\" as root unless you also unpacked and  #"
 
300
        @echo "# compiled Mandos as root, which is also NOT recommended.)        #"
260
301
        @echo "###################################################################"
 
302
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
261
303
        ./plugin-runner --plugin-dir=plugins.d \
 
304
                --plugin-helper-dir=plugin-helpers \
262
305
                --config-file=plugin-runner.conf \
263
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
 
306
                --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 \
 
307
                --env-for=mandos-client:GNOME_KEYRING_CONTROL= \
264
308
                $(CLIENTARGS)
265
309
 
266
310
# Used by run-client
267
 
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
 
311
keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem: mandos-keygen
268
312
        install --directory keydir
269
313
        ./mandos-keygen --dir keydir --force
270
314
 
277
321
confdir/mandos.conf: mandos.conf
278
322
        install --directory confdir
279
323
        install --mode=u=rw,go=r $^ $@
280
 
confdir/clients.conf: clients.conf keydir/seckey.txt
 
324
confdir/clients.conf: clients.conf keydir/seckey.txt keydir/tls-pubkey.pem
281
325
        install --directory confdir
282
326
        install --mode=u=rw $< $@
283
327
# Add a client password
284
 
        ./mandos-keygen --dir keydir --password >> $@
 
328
        ./mandos-keygen --dir keydir --password --no-ssh >> $@
285
329
statedir:
286
330
        install --directory statedir
287
331
 
294
338
 
295
339
install-server: doc
296
340
        install --directory $(CONFDIR)
297
 
        install --directory --mode=u=rwx --owner=$(USER) \
298
 
                --group=$(GROUP) $(STATEDIR)
 
341
        if install --directory --mode=u=rwx --owner=$(USER) \
 
342
                --group=$(GROUP) $(STATEDIR); then \
 
343
                :; \
 
344
        elif install --directory --mode=u=rwx $(STATEDIR); then \
 
345
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
 
346
        fi
 
347
        if [ "$(TMPFILES)" != "$(DESTDIR)" -a -d "$(TMPFILES)" ]; then \
 
348
                install --mode=u=rw,go=r tmpfiles.d-mandos.conf \
 
349
                        $(TMPFILES)/mandos.conf; \
 
350
        fi
299
351
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
300
352
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
301
353
                mandos-ctl
310
362
        install --mode=u=rwx,go=rx init.d-mandos \
311
363
                $(DESTDIR)/etc/init.d/mandos
312
364
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
313
 
                install --mode=u=rw,go=r mandos.service $(SYSTEMD) \
 
365
                install --mode=u=rw,go=r mandos.service $(SYSTEMD); \
314
366
        fi
315
367
        install --mode=u=rw,go=r default-mandos \
316
368
                $(DESTDIR)/etc/default/mandos
331
383
                > $(MANDIR)/man8/intro.8mandos.gz
332
384
 
333
385
install-client-nokey: all doc
334
 
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
 
386
        install --directory $(LIBDIR)/mandos $(CONFDIR)
335
387
        install --directory --mode=u=rwx $(KEYDIR) \
336
 
                $(PREFIX)/lib/mandos/plugins.d
337
 
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
 
388
                $(LIBDIR)/mandos/plugins.d \
 
389
                $(LIBDIR)/mandos/plugin-helpers
 
390
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
338
391
                install --mode=u=rwx \
339
 
                        --directory "$(CONFDIR)/plugins.d"; \
 
392
                        --directory "$(CONFDIR)/plugins.d" \
 
393
                        "$(CONFDIR)/plugin-helpers"; \
340
394
        fi
341
395
        install --mode=u=rwx,go=rx --directory \
342
396
                "$(CONFDIR)/network-hooks.d"
343
397
        install --mode=u=rwx,go=rx \
344
 
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
 
398
                --target-directory=$(LIBDIR)/mandos plugin-runner
 
399
        install --mode=u=rwx,go=rx \
 
400
                --target-directory=$(LIBDIR)/mandos mandos-to-cryptroot-unlock
345
401
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
346
402
                mandos-keygen
347
403
        install --mode=u=rwx,go=rx \
348
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
404
                --target-directory=$(LIBDIR)/mandos/plugins.d \
349
405
                plugins.d/password-prompt
350
406
        install --mode=u=rwxs,go=rx \
351
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
407
                --target-directory=$(LIBDIR)/mandos/plugins.d \
352
408
                plugins.d/mandos-client
353
409
        install --mode=u=rwxs,go=rx \
354
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
410
                --target-directory=$(LIBDIR)/mandos/plugins.d \
355
411
                plugins.d/usplash
356
412
        install --mode=u=rwxs,go=rx \
357
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
413
                --target-directory=$(LIBDIR)/mandos/plugins.d \
358
414
                plugins.d/splashy
359
415
        install --mode=u=rwxs,go=rx \
360
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
416
                --target-directory=$(LIBDIR)/mandos/plugins.d \
361
417
                plugins.d/askpass-fifo
362
418
        install --mode=u=rwxs,go=rx \
363
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
419
                --target-directory=$(LIBDIR)/mandos/plugins.d \
364
420
                plugins.d/plymouth
 
421
        install --mode=u=rwx,go=rx \
 
422
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
 
423
                plugin-helpers/mandos-client-iprouteadddel
365
424
        install initramfs-tools-hook \
366
425
                $(INITRAMFSTOOLS)/hooks/mandos
367
 
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
368
 
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
 
426
        install --mode=u=rw,go=r initramfs-tools-conf \
 
427
                $(INITRAMFSTOOLS)/conf.d/mandos-conf
369
428
        install initramfs-tools-script \
370
429
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
 
430
        install initramfs-tools-script-stop \
 
431
                $(INITRAMFSTOOLS)/scripts/local-premount/mandos
371
432
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
372
433
        gzip --best --to-stdout mandos-keygen.8 \
373
434
                > $(MANDIR)/man8/mandos-keygen.8.gz
412
473
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
413
474
                $(DESTDIR)/etc/crypttab
414
475
        -rm --force $(PREFIX)/sbin/mandos-keygen \
415
 
                $(PREFIX)/lib/mandos/plugin-runner \
416
 
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
417
 
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
418
 
                $(PREFIX)/lib/mandos/plugins.d/usplash \
419
 
                $(PREFIX)/lib/mandos/plugins.d/splashy \
420
 
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
421
 
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
 
476
                $(LIBDIR)/mandos/plugin-runner \
 
477
                $(LIBDIR)/mandos/plugins.d/password-prompt \
 
478
                $(LIBDIR)/mandos/plugins.d/mandos-client \
 
479
                $(LIBDIR)/mandos/plugins.d/usplash \
 
480
                $(LIBDIR)/mandos/plugins.d/splashy \
 
481
                $(LIBDIR)/mandos/plugins.d/askpass-fifo \
 
482
                $(LIBDIR)/mandos/plugins.d/plymouth \
422
483
                $(INITRAMFSTOOLS)/hooks/mandos \
423
484
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
424
485
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
430
491
                $(MANDIR)/man8/splashy.8mandos.gz \
431
492
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
432
493
                $(MANDIR)/man8/plymouth.8mandos.gz \
433
 
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
434
 
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
 
494
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
 
495
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
435
496
        update-initramfs -k all -u
436
497
 
437
498
purge: purge-server purge-client
447
508
        -rmdir $(CONFDIR)
448
509
 
449
510
purge-client: uninstall-client
450
 
        -shred --remove $(KEYDIR)/seckey.txt
 
511
        -shred --remove $(KEYDIR)/seckey.txt $(KEYDIR)/tls-privkey.pem
451
512
        -rm --force $(CONFDIR)/plugin-runner.conf \
452
 
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt
 
513
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt \
 
514
                $(KEYDIR)/tls-pubkey.txt $(KEYDIR)/tls-privkey.txt
453
515
        -rmdir $(KEYDIR) $(CONFDIR)/plugins.d $(CONFDIR)