/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 at recompile
  • Date: 2012-01-02 01:58:41 UTC
  • Revision ID: teddy@recompile.se-20120102015841-2krpl2epdhishtpg
* mandos: Consistent terminology; use the term "secret" for the
          client's stored data.
  (ClientDBus.__init__): Removed dead code.
  (Clienthandler.handle): Bug fix: send NewRequest signal with only IP
                          address, not str() of address tuple.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
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 \
 
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 \
6
4
        -Wunsafe-loop-optimizations -Wpointer-arith \
7
5
        -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings \
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:=
 
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=
35
16
 
36
17
# If BROKEN_PIE is set, do not build with -pie
37
18
ifndef BROKEN_PIE
39
20
LINK_FORTIFY += -pie
40
21
endif
41
22
#COVERAGE=--coverage
42
 
OPTIMIZE:=-Os -fno-strict-aliasing
43
 
LANGUAGE:=-std=gnu11
44
 
htmldir:=man
45
 
version:=1.8.4
46
 
SED:=sed
 
23
OPTIMIZE=-Os
 
24
LANGUAGE=-std=gnu99
 
25
htmldir=man
 
26
version=1.5.1
 
27
SED=sed
47
28
 
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)))
 
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)))
52
31
 
53
32
## Use these settings for a traditional /usr/local install
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
 
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
61
39
##
62
40
 
63
41
## These settings are for a package-type install
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)
 
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
79
48
##
80
49
 
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; \
 
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; \
90
56
        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)
93
57
 
94
58
# Do not change these two
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))
 
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))
99
63
 
100
64
# Commands to format a DocBook <refentry> document into a manual page
101
65
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
104
68
        --param make.single.year.ranges         1 \
105
69
        --param man.output.quietly              1 \
106
70
        --param man.authors.section.enabled     0 \
107
 
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
 
71
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
108
72
        $(notdir $<); \
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)
 
73
        $(MANPOST) $(notdir $@);\
 
74
        LANG=en_US.UTF-8 MANWIDTH=80 man --warnings --encoding=UTF-8 \
 
75
        --local-file $(notdir $@) >/dev/null)
 
76
# DocBook-to-man post-processing to fix a '\n' escape bug
 
77
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
113
78
 
114
79
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
115
80
        --param make.year.ranges                1 \
121
86
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
122
87
        $<; $(HTMLPOST) $@)
123
88
# Fix citerefentry links
124
 
HTMLPOST:=$(SED) --in-place \
 
89
HTMLPOST=$(SED) --in-place \
125
90
        --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
126
91
 
127
 
PLUGINS:=plugins.d/password-prompt plugins.d/mandos-client \
 
92
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
128
93
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
129
94
        plugins.d/plymouth
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 \
 
95
CPROGS=plugin-runner $(PLUGINS)
 
96
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
 
97
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
134
98
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
135
99
        plugins.d/mandos-client.8mandos \
136
100
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
137
101
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
138
102
        plugins.d/plymouth.8mandos intro.8mandos
139
103
 
140
 
htmldocs:=$(addsuffix .xhtml,$(DOCS))
 
104
htmldocs=$(addsuffix .xhtml,$(DOCS))
141
105
 
142
 
objects:=$(addsuffix .o,$(CPROGS))
 
106
objects=$(addsuffix .o,$(CPROGS))
143
107
 
144
108
all: $(PROGS) mandos.lsm
145
109
 
257
221
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
258
222
                $@)
259
223
 
260
 
# Need to add the GnuTLS, Avahi and GPGME libraries
261
224
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
 
# 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
 
225
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
 
226
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
 
227
 
 
228
.PHONY : all doc html clean distclean run-client run-server install \
 
229
        install-server install-client uninstall uninstall-server \
 
230
        uninstall-client purge purge-server purge-client
277
231
 
278
232
clean:
279
233
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
283
237
maintainer-clean: clean
284
238
        -rm --force --recursive keydir confdir statedir
285
239
 
286
 
check: all
 
240
check:  all
287
241
        ./mandos --check
288
 
        ./mandos-ctl --check
289
 
        ./mandos-keygen --version
290
 
        ./plugin-runner --version
291
 
        ./plugin-helpers/mandos-client-iprouteadddel --version
292
242
 
293
243
# Run the client with a local config and key
294
 
run-client: all keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem
 
244
run-client: all keydir/seckey.txt keydir/pubkey.txt
295
245
        @echo "###################################################################"
296
246
        @echo "# The following error messages are harmless and can be safely     #"
297
 
        @echo "# ignored:                                                        #"
298
 
        @echo "# From plugin-runner: setgid: Operation not permitted             #"
299
 
        @echo "#                     setuid: Operation not permitted             #"
 
247
        @echo "# ignored.  The messages are caused by not running as root, but   #"
 
248
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
 
249
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
 
250
        @echo "# From plugin-runner: setuid: Operation not permitted             #"
300
251
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
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.)        #"
 
252
        @echo "# From mandos-client: setuid: Operation not permitted             #"
 
253
        @echo "#                     seteuid: Operation not permitted            #"
 
254
        @echo "#                     klogctl: Operation not permitted            #"
308
255
        @echo "###################################################################"
309
 
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
310
256
        ./plugin-runner --plugin-dir=plugins.d \
311
 
                --plugin-helper-dir=plugin-helpers \
312
257
                --config-file=plugin-runner.conf \
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= \
 
258
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
315
259
                $(CLIENTARGS)
316
260
 
317
261
# Used by run-client
318
 
keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem: mandos-keygen
 
262
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
319
263
        install --directory keydir
320
264
        ./mandos-keygen --dir keydir --force
321
265
 
322
266
# Run the server with a local config
323
 
run-server: confdir/mandos.conf confdir/clients.conf statedir
 
267
run-server: confdir/mandos.conf confdir/clients.conf
324
268
        ./mandos --debug --no-dbus --configdir=confdir \
325
269
                --statedir=statedir $(SERVERARGS)
326
270
 
328
272
confdir/mandos.conf: mandos.conf
329
273
        install --directory confdir
330
274
        install --mode=u=rw,go=r $^ $@
331
 
confdir/clients.conf: clients.conf keydir/seckey.txt keydir/tls-pubkey.pem
 
275
confdir/clients.conf: clients.conf keydir/seckey.txt
332
276
        install --directory confdir
333
277
        install --mode=u=rw $< $@
334
278
# Add a client password
335
 
        ./mandos-keygen --dir keydir --password --no-ssh >> $@
 
279
        ./mandos-keygen --dir keydir --password >> $@
336
280
statedir:
337
281
        install --directory statedir
338
282
 
345
289
 
346
290
install-server: doc
347
291
        install --directory $(CONFDIR)
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
 
292
        install --directory --mode=u=rwx --owner=$(USER) \
 
293
                --group=$(GROUP) $(STATEDIR)
358
294
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
359
295
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
360
296
                mandos-ctl
368
304
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
369
305
        install --mode=u=rwx,go=rx init.d-mandos \
370
306
                $(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
374
307
        install --mode=u=rw,go=r default-mandos \
375
308
                $(DESTDIR)/etc/default/mandos
376
309
        if [ -z $(DESTDIR) ]; then \
390
323
                > $(MANDIR)/man8/intro.8mandos.gz
391
324
 
392
325
install-client-nokey: all doc
393
 
        install --directory $(LIBDIR)/mandos $(CONFDIR)
 
326
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
394
327
        install --directory --mode=u=rwx $(KEYDIR) \
395
 
                $(LIBDIR)/mandos/plugins.d \
396
 
                $(LIBDIR)/mandos/plugin-helpers
397
 
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
 
328
                $(PREFIX)/lib/mandos/plugins.d
 
329
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
398
330
                install --mode=u=rwx \
399
 
                        --directory "$(CONFDIR)/plugins.d" \
400
 
                        "$(CONFDIR)/plugin-helpers"; \
 
331
                        --directory "$(CONFDIR)/plugins.d"; \
401
332
        fi
402
333
        install --mode=u=rwx,go=rx --directory \
403
334
                "$(CONFDIR)/network-hooks.d"
404
335
        install --mode=u=rwx,go=rx \
405
 
                --target-directory=$(LIBDIR)/mandos plugin-runner
406
 
        install --mode=u=rwx,go=rx \
407
 
                --target-directory=$(LIBDIR)/mandos mandos-to-cryptroot-unlock
 
336
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
408
337
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
409
338
                mandos-keygen
410
339
        install --mode=u=rwx,go=rx \
411
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
340
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
412
341
                plugins.d/password-prompt
413
342
        install --mode=u=rwxs,go=rx \
414
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
343
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
415
344
                plugins.d/mandos-client
416
345
        install --mode=u=rwxs,go=rx \
417
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
346
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
418
347
                plugins.d/usplash
419
348
        install --mode=u=rwxs,go=rx \
420
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
349
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
421
350
                plugins.d/splashy
422
351
        install --mode=u=rwxs,go=rx \
423
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
352
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
424
353
                plugins.d/askpass-fifo
425
354
        install --mode=u=rwxs,go=rx \
426
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
355
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
427
356
                plugins.d/plymouth
428
 
        install --mode=u=rwx,go=rx \
429
 
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
430
 
                plugin-helpers/mandos-client-iprouteadddel
431
357
        install initramfs-tools-hook \
432
358
                $(INITRAMFSTOOLS)/hooks/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
 
359
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
 
360
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
437
361
        install initramfs-tools-script \
438
362
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
439
 
        install initramfs-tools-script-stop \
440
 
                $(INITRAMFSTOOLS)/scripts/local-premount/mandos
441
363
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
442
364
        gzip --best --to-stdout mandos-keygen.8 \
443
365
                > $(MANDIR)/man8/mandos-keygen.8.gz
482
404
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
483
405
                $(DESTDIR)/etc/crypttab
484
406
        -rm --force $(PREFIX)/sbin/mandos-keygen \
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 \
 
407
                $(PREFIX)/lib/mandos/plugin-runner \
 
408
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
 
409
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
 
410
                $(PREFIX)/lib/mandos/plugins.d/usplash \
 
411
                $(PREFIX)/lib/mandos/plugins.d/splashy \
 
412
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
 
413
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
492
414
                $(INITRAMFSTOOLS)/hooks/mandos \
493
415
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
494
416
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
500
422
                $(MANDIR)/man8/splashy.8mandos.gz \
501
423
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
502
424
                $(MANDIR)/man8/plymouth.8mandos.gz \
503
 
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
504
 
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
 
425
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
 
426
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
505
427
        update-initramfs -k all -u
506
428
 
507
429
purge: purge-server purge-client
511
433
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
512
434
                $(DESTDIR)/etc/default/mandos \
513
435
                $(DESTDIR)/etc/init.d/mandos \
514
 
                $(SYSTEMD)/mandos.service \
515
 
                $(DESTDIR)/run/mandos.pid \
516
436
                $(DESTDIR)/var/run/mandos.pid
517
437
        -rmdir $(CONFDIR)
518
438
 
519
439
purge-client: uninstall-client
520
 
        -shred --remove $(KEYDIR)/seckey.txt $(KEYDIR)/tls-privkey.pem
 
440
        -shred --remove $(KEYDIR)/seckey.txt
521
441
        -rm --force $(CONFDIR)/plugin-runner.conf \
522
 
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt \
523
 
                $(KEYDIR)/tls-pubkey.txt $(KEYDIR)/tls-privkey.txt
 
442
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt
524
443
        -rmdir $(KEYDIR) $(CONFDIR)/plugins.d $(CONFDIR)