/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 bsnet
  • Date: 2010-09-21 19:16:41 UTC
  • Revision ID: teddy@fukt.bsnet.se-20100921191641-yetps84gvjo7hrrc
* mandos-ctl.xml: New.
* Makefile (DOCS): Added "mandos-ctl.8".
  (mandos-ctl.8): New.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
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)))
 
23
OPTIMIZE=-Os
 
24
LANGUAGE=-std=gnu99
 
25
htmldir=man
 
26
version=1.0.14
 
27
SED=sed
52
28
 
53
29
## 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
 
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
61
35
##
62
36
 
63
37
## 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)
 
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
79
43
##
80
44
 
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; \
 
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; \
90
51
        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
52
 
94
53
# 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))
 
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))
99
58
 
100
59
# Commands to format a DocBook <refentry> document into a manual page
101
60
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
104
63
        --param make.single.year.ranges         1 \
105
64
        --param man.output.quietly              1 \
106
65
        --param man.authors.section.enabled     0 \
107
 
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
 
66
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
108
67
        $(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)
 
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'
113
71
 
114
72
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
115
73
        --param make.year.ranges                1 \
121
79
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
122
80
        $<; $(HTMLPOST) $@)
123
81
# Fix citerefentry links
124
 
HTMLPOST:=$(SED) --in-place \
 
82
HTMLPOST=$(SED) --in-place \
125
83
        --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
84
 
127
 
PLUGINS:=plugins.d/password-prompt plugins.d/mandos-client \
 
85
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
128
86
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
129
87
        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 \
134
 
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
 
88
CPROGS=plugin-runner $(PLUGINS)
 
89
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
 
90
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
 
91
        mandos-monitor.8 mandos-ctl.8 \
135
92
        plugins.d/mandos-client.8mandos \
136
 
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
137
 
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
138
 
        plugins.d/plymouth.8mandos intro.8mandos
139
 
 
140
 
htmldocs:=$(addsuffix .xhtml,$(DOCS))
141
 
 
142
 
objects:=$(addsuffix .o,$(CPROGS))
 
93
        plugins.d/password-prompt.8mandos mandos.conf.5 \
 
94
        plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
 
95
        plugins.d/askpass-fifo.8mandos mandos-clients.conf.5
 
96
 
 
97
htmldocs=$(addsuffix .xhtml,$(DOCS))
 
98
 
 
99
objects=$(addsuffix .o,$(CPROGS))
143
100
 
144
101
all: $(PROGS) mandos.lsm
145
102
 
162
119
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
163
120
        $(DOCBOOKTOHTML)
164
121
 
165
 
intro.8mandos: intro.xml common.ent legalnotice.xml
166
 
        $(DOCBOOKTOMAN)
167
 
intro.8mandos.xhtml: intro.xml common.ent legalnotice.xml
168
 
        $(DOCBOOKTOHTML)
169
 
 
170
122
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
171
123
                legalnotice.xml
172
124
        $(DOCBOOKTOMAN)
257
209
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
258
210
                $@)
259
211
 
260
 
# Need to add the GnuTLS, Avahi and GPGME libraries
261
212
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
 
213
        $(LINK.c) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) $(strip\
 
214
                ) $(COMMON) $^ $(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
277
219
 
278
220
clean:
279
221
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
281
223
distclean: clean
282
224
mostlyclean: clean
283
225
maintainer-clean: clean
284
 
        -rm --force --recursive keydir confdir statedir
 
226
        -rm --force --recursive keydir confdir
285
227
 
286
 
check: all
 
228
check:  all
287
229
        ./mandos --check
288
 
        ./mandos-ctl --check
289
 
        ./mandos-keygen --version
290
 
        ./plugin-runner --version
291
 
        ./plugin-helpers/mandos-client-iprouteadddel --version
292
230
 
293
231
# 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
 
232
run-client: all keydir/seckey.txt keydir/pubkey.txt
295
233
        @echo "###################################################################"
296
234
        @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             #"
 
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             #"
300
239
        @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.)        #"
 
240
        @echo "# From mandos-client: setuid: Operation not permitted             #"
 
241
        @echo "#                     seteuid: Operation not permitted            #"
 
242
        @echo "#                     klogctl: Operation not permitted            #"
308
243
        @echo "###################################################################"
309
 
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
310
244
        ./plugin-runner --plugin-dir=plugins.d \
311
 
                --plugin-helper-dir=plugin-helpers \
312
245
                --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= \
 
246
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
315
247
                $(CLIENTARGS)
316
248
 
317
249
# Used by run-client
318
 
keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem: mandos-keygen
 
250
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
319
251
        install --directory keydir
320
252
        ./mandos-keygen --dir keydir --force
321
253
 
322
254
# Run the server with a local config
323
 
run-server: confdir/mandos.conf confdir/clients.conf statedir
324
 
        ./mandos --debug --no-dbus --configdir=confdir \
325
 
                --statedir=statedir $(SERVERARGS)
 
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)
326
263
 
327
264
# Used by run-server
328
265
confdir/mandos.conf: mandos.conf
329
266
        install --directory confdir
330
267
        install --mode=u=rw,go=r $^ $@
331
 
confdir/clients.conf: clients.conf keydir/seckey.txt keydir/tls-pubkey.pem
 
268
confdir/clients.conf: clients.conf keydir/seckey.txt
332
269
        install --directory confdir
333
270
        install --mode=u=rw $< $@
334
271
# Add a client password
335
 
        ./mandos-keygen --dir keydir --password --no-ssh >> $@
336
 
statedir:
337
 
        install --directory statedir
 
272
        ./mandos-keygen --dir keydir --password >> $@
338
273
 
339
274
install: install-server install-client-nokey
340
275
 
345
280
 
346
281
install-server: doc
347
282
        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
358
283
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
359
284
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
360
285
                mandos-ctl
368
293
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
369
294
        install --mode=u=rwx,go=rx init.d-mandos \
370
295
                $(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
296
        install --mode=u=rw,go=r default-mandos \
375
297
                $(DESTDIR)/etc/default/mandos
376
298
        if [ -z $(DESTDIR) ]; then \
378
300
        fi
379
301
        gzip --best --to-stdout mandos.8 \
380
302
                > $(MANDIR)/man8/mandos.8.gz
381
 
        gzip --best --to-stdout mandos-monitor.8 \
382
 
                > $(MANDIR)/man8/mandos-monitor.8.gz
383
 
        gzip --best --to-stdout mandos-ctl.8 \
384
 
                > $(MANDIR)/man8/mandos-ctl.8.gz
385
303
        gzip --best --to-stdout mandos.conf.5 \
386
304
                > $(MANDIR)/man5/mandos.conf.5.gz
387
305
        gzip --best --to-stdout mandos-clients.conf.5 \
388
306
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
389
 
        gzip --best --to-stdout intro.8mandos \
390
 
                > $(MANDIR)/man8/intro.8mandos.gz
391
307
 
392
308
install-client-nokey: all doc
393
 
        install --directory $(LIBDIR)/mandos $(CONFDIR)
 
309
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
394
310
        install --directory --mode=u=rwx $(KEYDIR) \
395
 
                $(LIBDIR)/mandos/plugins.d \
396
 
                $(LIBDIR)/mandos/plugin-helpers
397
 
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
 
311
                $(PREFIX)/lib/mandos/plugins.d
 
312
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
398
313
                install --mode=u=rwx \
399
 
                        --directory "$(CONFDIR)/plugins.d" \
400
 
                        "$(CONFDIR)/plugin-helpers"; \
 
314
                        --directory "$(CONFDIR)/plugins.d"; \
401
315
        fi
402
 
        install --mode=u=rwx,go=rx --directory \
403
 
                "$(CONFDIR)/network-hooks.d"
404
 
        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
 
316
        install --mode=u=rwx,go=rx \
 
317
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
408
318
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
409
319
                mandos-keygen
410
320
        install --mode=u=rwx,go=rx \
411
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
321
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
412
322
                plugins.d/password-prompt
413
323
        install --mode=u=rwxs,go=rx \
414
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
324
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
415
325
                plugins.d/mandos-client
416
326
        install --mode=u=rwxs,go=rx \
417
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
327
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
418
328
                plugins.d/usplash
419
329
        install --mode=u=rwxs,go=rx \
420
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
330
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
421
331
                plugins.d/splashy
422
332
        install --mode=u=rwxs,go=rx \
423
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
333
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
424
334
                plugins.d/askpass-fifo
425
335
        install --mode=u=rwxs,go=rx \
426
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
336
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
427
337
                plugins.d/plymouth
428
 
        install --mode=u=rwx,go=rx \
429
 
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
430
 
                plugin-helpers/mandos-client-iprouteadddel
431
338
        install initramfs-tools-hook \
432
339
                $(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
 
340
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
 
341
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
437
342
        install initramfs-tools-script \
438
343
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
439
 
        install initramfs-tools-script-stop \
440
 
                $(INITRAMFSTOOLS)/scripts/local-premount/mandos
441
344
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
442
345
        gzip --best --to-stdout mandos-keygen.8 \
443
346
                > $(MANDIR)/man8/mandos-keygen.8.gz
444
347
        gzip --best --to-stdout plugin-runner.8mandos \
445
348
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
349
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
 
350
                > $(MANDIR)/man8/password-prompt.8mandos.gz
446
351
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
447
352
                > $(MANDIR)/man8/mandos-client.8mandos.gz
448
 
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
449
 
                > $(MANDIR)/man8/password-prompt.8mandos.gz
450
353
        gzip --best --to-stdout plugins.d/usplash.8mandos \
451
354
                > $(MANDIR)/man8/usplash.8mandos.gz
452
355
        gzip --best --to-stdout plugins.d/splashy.8mandos \
453
356
                > $(MANDIR)/man8/splashy.8mandos.gz
454
357
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
455
358
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
456
 
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
457
 
                > $(MANDIR)/man8/plymouth.8mandos.gz
458
359
 
459
360
install-client: install-client-nokey
460
361
# Post-installation stuff
469
370
                $(PREFIX)/sbin/mandos-ctl \
470
371
                $(PREFIX)/sbin/mandos-monitor \
471
372
                $(MANDIR)/man8/mandos.8.gz \
472
 
                $(MANDIR)/man8/mandos-monitor.8.gz \
473
 
                $(MANDIR)/man8/mandos-ctl.8.gz \
474
373
                $(MANDIR)/man5/mandos.conf.5.gz \
475
374
                $(MANDIR)/man5/mandos-clients.conf.5.gz
476
375
        update-rc.d -f mandos remove
482
381
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
483
382
                $(DESTDIR)/etc/crypttab
484
383
        -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 \
 
384
                $(PREFIX)/lib/mandos/plugin-runner \
 
385
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
 
386
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
 
387
                $(PREFIX)/lib/mandos/plugins.d/usplash \
 
388
                $(PREFIX)/lib/mandos/plugins.d/splashy \
 
389
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
 
390
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
492
391
                $(INITRAMFSTOOLS)/hooks/mandos \
493
392
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
494
393
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
394
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
495
395
                $(MANDIR)/man8/mandos-keygen.8.gz \
496
 
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
497
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
498
396
                $(MANDIR)/man8/password-prompt.8mandos.gz \
499
397
                $(MANDIR)/man8/usplash.8mandos.gz \
500
398
                $(MANDIR)/man8/splashy.8mandos.gz \
501
399
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
502
 
                $(MANDIR)/man8/plymouth.8mandos.gz \
503
 
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
504
 
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
 
400
                $(MANDIR)/man8/mandos-client.8mandos.gz
 
401
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
 
402
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
505
403
        update-initramfs -k all -u
506
404
 
507
405
purge: purge-server purge-client
511
409
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
512
410
                $(DESTDIR)/etc/default/mandos \
513
411
                $(DESTDIR)/etc/init.d/mandos \
514
 
                $(SYSTEMD)/mandos.service \
515
 
                $(DESTDIR)/run/mandos.pid \
516
412
                $(DESTDIR)/var/run/mandos.pid
517
413
        -rmdir $(CONFDIR)
518
414
 
519
415
purge-client: uninstall-client
520
 
        -shred --remove $(KEYDIR)/seckey.txt $(KEYDIR)/tls-privkey.pem
 
416
        -shred --remove $(KEYDIR)/seckey.txt
521
417
        -rm --force $(CONFDIR)/plugin-runner.conf \
522
 
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt \
523
 
                $(KEYDIR)/tls-pubkey.txt $(KEYDIR)/tls-privkey.txt
 
418
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt
524
419
        -rmdir $(KEYDIR) $(CONFDIR)/plugins.d $(CONFDIR)