/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: Teddy Hogeborn
  • Date: 2011-11-26 20:59:56 UTC
  • mto: (237.12.8 mandos-persistent)
  • mto: This revision was merged to the branch mainline in revision 290.
  • Revision ID: teddy@recompile.se-20111126205956-vft6g0z2i6my0165
Use GPG to encrypt instead of AES.

* Makefile (run-server): Use "--no-restore" option.
* debian/control (mandos/Depends): Added "python-gnupginterface".
* mandos: (CryptoError, Crypto): New; uses GPG.
  (Client.encrypt_secret, Client.decrypt_secret): Removed.
  (ClientHandler.fingerprint): Use binascii.hexlify().
  (main): Use Crypto class to decrypt.
  (main/cleanup): Use Crypto class to encrypt.  Handle EACCES.

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.6
46
 
SED:=sed
47
 
PKG_CONFIG?=pkg-config
48
 
 
49
 
USER:=$(firstword $(subst :, ,$(shell getent passwd _mandos \
50
 
        || getent passwd nobody || echo 65534)))
51
 
GROUP:=$(firstword $(subst :, ,$(shell getent group _mandos \
52
 
        || getent group nogroup || echo 65534)))
53
 
 
54
 
LINUXVERSION:=$(shell uname --kernel-release)
 
23
OPTIMIZE=-Os
 
24
LANGUAGE=-std=gnu99
 
25
htmldir=man
 
26
version=1.4.1
 
27
SED=sed
55
28
 
56
29
## Use these settings for a traditional /usr/local install
57
 
# PREFIX:=$(DESTDIR)/usr/local
58
 
# CONFDIR:=$(DESTDIR)/etc/mandos
59
 
# KEYDIR:=$(DESTDIR)/etc/mandos/keys
60
 
# MANDIR:=$(PREFIX)/man
61
 
# INITRAMFSTOOLS:=$(DESTDIR)/etc/initramfs-tools
62
 
# DRACUTMODULE:=$(DESTDIR)/usr/lib/dracut/modules.d/90mandos
63
 
# STATEDIR:=$(DESTDIR)/var/lib/mandos
64
 
# 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
65
35
##
66
36
 
67
37
## These settings are for a package-type install
68
 
PREFIX:=$(DESTDIR)/usr
69
 
CONFDIR:=$(DESTDIR)/etc/mandos
70
 
KEYDIR:=$(DESTDIR)/etc/keys/mandos
71
 
MANDIR:=$(PREFIX)/share/man
72
 
INITRAMFSTOOLS:=$(DESTDIR)/usr/share/initramfs-tools
73
 
DRACUTMODULE:=$(DESTDIR)/usr/lib/dracut/modules.d/90mandos
74
 
STATEDIR:=$(DESTDIR)/var/lib/mandos
75
 
LIBDIR:=$(shell \
76
 
        for d in \
77
 
        "/usr/lib/`dpkg-architecture \
78
 
                        -qDEB_HOST_MULTIARCH 2>/dev/null`" \
79
 
        "`rpm --eval='%{_libdir}' 2>/dev/null`" /usr/lib; do \
80
 
                if [ -d "$$d" -a "$$d" = "$${d%/}" ]; then \
81
 
                        echo "$(DESTDIR)$$d"; \
82
 
                        break; \
83
 
                fi; \
84
 
        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
85
43
##
86
44
 
87
 
SYSTEMD:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
88
 
                        --variable=systemdsystemunitdir)
89
 
TMPFILES:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
90
 
                        --variable=tmpfilesdir)
91
 
 
92
 
GNUTLS_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I gnutls)
93
 
GNUTLS_LIBS:=$(shell $(PKG_CONFIG) --libs gnutls)
94
 
AVAHI_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I avahi-core)
95
 
AVAHI_LIBS:=$(shell $(PKG_CONFIG) --libs avahi-core)
96
 
GPGME_CFLAGS:=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
97
 
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; \
98
51
        getconf LFS_LDFLAGS)
99
 
LIBNL3_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I libnl-route-3.0)
100
 
LIBNL3_LIBS:=$(shell $(PKG_CONFIG) --libs libnl-route-3.0)
101
 
GLIB_CFLAGS:=$(shell $(PKG_CONFIG) --cflags glib-2.0)
102
 
GLIB_LIBS:=$(shell $(PKG_CONFIG) --libs glib-2.0)
103
52
 
104
53
# Do not change these two
105
 
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) \
106
 
        $(OPTIMIZE) $(LANGUAGE) -DVERSION='"$(version)"'
107
 
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(strip \
108
 
        ) $(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=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
109
58
 
110
59
# Commands to format a DocBook <refentry> document into a manual page
111
60
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
114
63
        --param make.single.year.ranges         1 \
115
64
        --param man.output.quietly              1 \
116
65
        --param man.authors.section.enabled     0 \
117
 
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
 
66
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
118
67
        $(notdir $<); \
119
 
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
120
 
        && command -v man >/dev/null; then LANG=en_US.UTF-8 \
121
 
        MANWIDTH=80 man --warnings --encoding=UTF-8 --local-file \
122
 
        $(notdir $@); fi >/dev/null)
 
68
        $(MANPOST) $(notdir $@);\
 
69
        LANG=en_US.UTF-8 MANWIDTH=80 man --warnings --encoding=UTF-8 \
 
70
        --local-file $(notdir $@) >/dev/null)
 
71
# DocBook-to-man post-processing to fix a '\n' escape bug
 
72
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
123
73
 
124
74
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
125
75
        --param make.year.ranges                1 \
131
81
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
132
82
        $<; $(HTMLPOST) $@)
133
83
# Fix citerefentry links
134
 
HTMLPOST:=$(SED) --in-place \
 
84
HTMLPOST=$(SED) --in-place \
135
85
        --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
136
86
 
137
 
PLUGINS:=plugins.d/password-prompt plugins.d/mandos-client \
 
87
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
138
88
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
139
89
        plugins.d/plymouth
140
 
PLUGIN_HELPERS:=plugin-helpers/mandos-client-iprouteadddel
141
 
CPROGS:=plugin-runner dracut-module/password-agent $(PLUGINS) \
142
 
        $(PLUGIN_HELPERS)
143
 
PROGS:=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
144
 
DOCS:=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
 
90
CPROGS=plugin-runner $(PLUGINS)
 
91
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
 
92
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
145
93
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
146
 
        dracut-module/password-agent.8mandos \
147
94
        plugins.d/mandos-client.8mandos \
148
95
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
149
96
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
150
97
        plugins.d/plymouth.8mandos intro.8mandos
151
98
 
152
 
htmldocs:=$(addsuffix .xhtml,$(DOCS))
 
99
htmldocs=$(addsuffix .xhtml,$(DOCS))
153
100
 
154
 
objects:=$(addsuffix .o,$(CPROGS))
 
101
objects=$(addsuffix .o,$(CPROGS))
155
102
 
156
103
all: $(PROGS) mandos.lsm
157
104
 
221
168
                overview.xml legalnotice.xml
222
169
        $(DOCBOOKTOHTML)
223
170
 
224
 
dracut-module/password-agent.8mandos: \
225
 
                dracut-module/password-agent.xml common.ent \
226
 
                overview.xml legalnotice.xml
227
 
        $(DOCBOOKTOMAN)
228
 
dracut-module/password-agent.8mandos.xhtml: \
229
 
                dracut-module/password-agent.xml common.ent \
230
 
                overview.xml legalnotice.xml
231
 
        $(DOCBOOKTOHTML)
232
 
 
233
171
plugins.d/mandos-client.8mandos: plugins.d/mandos-client.xml \
234
172
                                        common.ent \
235
173
                                        mandos-options.xml \
278
216
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
279
217
                $@)
280
218
 
281
 
# Need to add the GnuTLS, Avahi and GPGME libraries
282
219
plugins.d/mandos-client: plugins.d/mandos-client.c
283
 
        $(LINK.c) $^ $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(strip\
284
 
                ) $(GPGME_CFLAGS) $(GNUTLS_LIBS) $(strip\
285
 
                ) $(AVAHI_LIBS) $(GPGME_LIBS) $(LOADLIBES) $(strip\
286
 
                ) $(LDLIBS) -o $@
287
 
 
288
 
# Need to add the libnl-route library
289
 
plugin-helpers/mandos-client-iprouteadddel: plugin-helpers/mandos-client-iprouteadddel.c
290
 
        $(LINK.c) $(LIBNL3_CFLAGS) $^ $(LIBNL3_LIBS) $(strip\
291
 
                ) $(LOADLIBES) $(LDLIBS) -o $@
292
 
 
293
 
# Need to add the GLib and pthread libraries
294
 
dracut-module/password-agent: dracut-module/password-agent.c
295
 
        $(LINK.c) $(GLIB_CFLAGS) $^ $(GLIB_LIBS) -lpthread $(strip\
296
 
                ) $(LOADLIBES) $(LDLIBS) -o $@
297
 
 
298
 
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
299
 
        check run-client run-server install install-html \
300
 
        install-server install-client-nokey install-client uninstall \
301
 
        uninstall-server uninstall-client purge purge-server \
302
 
        purge-client
 
220
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
 
221
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
 
222
 
 
223
.PHONY : all doc html clean distclean run-client run-server install \
 
224
        install-server install-client uninstall uninstall-server \
 
225
        uninstall-client purge purge-server purge-client
303
226
 
304
227
clean:
305
228
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
307
230
distclean: clean
308
231
mostlyclean: clean
309
232
maintainer-clean: clean
310
 
        -rm --force --recursive keydir confdir statedir
 
233
        -rm --force --recursive keydir confdir
311
234
 
312
 
check: all
 
235
check:  all
313
236
        ./mandos --check
314
 
        ./mandos-ctl --check
315
 
        ./mandos-keygen --version
316
 
        ./plugin-runner --version
317
 
        ./plugin-helpers/mandos-client-iprouteadddel --version
318
 
        ./dracut-module/password-agent --test
319
237
 
320
238
# Run the client with a local config and key
321
 
run-client: all keydir/seckey.txt keydir/pubkey.txt \
322
 
                        keydir/tls-privkey.pem keydir/tls-pubkey.pem
323
 
        @echo '######################################################'
324
 
        @echo '# The following error messages are harmless and can  #'
325
 
        @echo '#  be safely ignored:                                #'
326
 
        @echo '## From plugin-runner:                               #'
327
 
        @echo '# setgid: Operation not permitted                    #'
328
 
        @echo '# setuid: Operation not permitted                    #'
329
 
        @echo '## From askpass-fifo:                                #'
330
 
        @echo '# mkfifo: Permission denied                          #'
331
 
        @echo '## From mandos-client:                               #'
332
 
        @echo '# Failed to raise privileges: Operation not permi... #'
333
 
        @echo '# Warning: network hook "*" exited with status *     #'
334
 
        @echo '# ioctl SIOCSIFFLAGS +IFF_UP: Operation not permi... #'
335
 
        @echo '# Failed to bring up interface "*": Operation not... #'
336
 
        @echo '#                                                    #'
337
 
        @echo '# (The messages are caused by not running as root,   #'
338
 
        @echo '# but you should NOT run "make run-client" as root   #'
339
 
        @echo '# unless you also unpacked and compiled Mandos as    #'
340
 
        @echo '# root, which is also NOT recommended.)              #'
341
 
        @echo '######################################################'
342
 
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
 
239
run-client: all keydir/seckey.txt keydir/pubkey.txt
 
240
        @echo "###################################################################"
 
241
        @echo "# The following error messages are harmless and can be safely     #"
 
242
        @echo "# ignored.  The messages are caused by not running as root, but   #"
 
243
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
 
244
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
 
245
        @echo "# From plugin-runner: setuid: Operation not permitted             #"
 
246
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
 
247
        @echo "# From mandos-client: setuid: Operation not permitted             #"
 
248
        @echo "#                     seteuid: Operation not permitted            #"
 
249
        @echo "#                     klogctl: Operation not permitted            #"
 
250
        @echo "###################################################################"
343
251
        ./plugin-runner --plugin-dir=plugins.d \
344
 
                --plugin-helper-dir=plugin-helpers \
345
252
                --config-file=plugin-runner.conf \
346
 
                --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 \
347
 
                --env-for=mandos-client:GNOME_KEYRING_CONTROL= \
 
253
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
348
254
                $(CLIENTARGS)
349
255
 
350
256
# Used by run-client
351
 
keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem: mandos-keygen
 
257
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
352
258
        install --directory keydir
353
259
        ./mandos-keygen --dir keydir --force
354
260
 
355
261
# Run the server with a local config
356
 
run-server: confdir/mandos.conf confdir/clients.conf statedir
357
 
        ./mandos --debug --no-dbus --configdir=confdir \
358
 
                --statedir=statedir $(SERVERARGS)
 
262
run-server: confdir/mandos.conf confdir/clients.conf
 
263
        ./mandos --debug --no-dbus --configdir=confdir --no-restore \
 
264
        $(SERVERARGS)
359
265
 
360
266
# Used by run-server
361
267
confdir/mandos.conf: mandos.conf
362
268
        install --directory confdir
363
269
        install --mode=u=rw,go=r $^ $@
364
 
confdir/clients.conf: clients.conf keydir/seckey.txt keydir/tls-pubkey.pem
 
270
confdir/clients.conf: clients.conf keydir/seckey.txt
365
271
        install --directory confdir
366
272
        install --mode=u=rw $< $@
367
273
# Add a client password
368
 
        ./mandos-keygen --dir keydir --password --no-ssh >> $@
369
 
statedir:
370
 
        install --directory statedir
 
274
        ./mandos-keygen --dir keydir --password >> $@
371
275
 
372
276
install: install-server install-client-nokey
373
277
 
378
282
 
379
283
install-server: doc
380
284
        install --directory $(CONFDIR)
381
 
        if install --directory --mode=u=rwx --owner=$(USER) \
382
 
                --group=$(GROUP) $(STATEDIR); then \
383
 
                :; \
384
 
        elif install --directory --mode=u=rwx $(STATEDIR); then \
385
 
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
386
 
        fi
387
 
        if [ "$(TMPFILES)" != "$(DESTDIR)" \
388
 
                        -a -d "$(TMPFILES)" ]; then \
389
 
                install --mode=u=rw,go=r tmpfiles.d-mandos.conf \
390
 
                        $(TMPFILES)/mandos.conf; \
391
 
        fi
392
285
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
393
286
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
394
287
                mandos-ctl
402
295
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
403
296
        install --mode=u=rwx,go=rx init.d-mandos \
404
297
                $(DESTDIR)/etc/init.d/mandos
405
 
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
406
 
                install --mode=u=rw,go=r mandos.service $(SYSTEMD); \
407
 
        fi
408
298
        install --mode=u=rw,go=r default-mandos \
409
299
                $(DESTDIR)/etc/default/mandos
410
300
        if [ -z $(DESTDIR) ]; then \
420
310
                > $(MANDIR)/man5/mandos.conf.5.gz
421
311
        gzip --best --to-stdout mandos-clients.conf.5 \
422
312
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
423
 
        gzip --best --to-stdout intro.8mandos \
424
 
                > $(MANDIR)/man8/intro.8mandos.gz
425
313
 
426
314
install-client-nokey: all doc
427
 
        install --directory $(LIBDIR)/mandos $(CONFDIR)
 
315
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
428
316
        install --directory --mode=u=rwx $(KEYDIR) \
429
 
                $(LIBDIR)/mandos/plugins.d \
430
 
                $(LIBDIR)/mandos/plugin-helpers
431
 
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
 
317
                $(PREFIX)/lib/mandos/plugins.d
 
318
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
432
319
                install --mode=u=rwx \
433
 
                        --directory "$(CONFDIR)/plugins.d" \
434
 
                        "$(CONFDIR)/plugin-helpers"; \
 
320
                        --directory "$(CONFDIR)/plugins.d"; \
435
321
        fi
436
 
        install --mode=u=rwx,go=rx --directory \
437
 
                "$(CONFDIR)/network-hooks.d"
438
 
        install --mode=u=rwx,go=rx \
439
 
                --target-directory=$(LIBDIR)/mandos plugin-runner
440
 
        install --mode=u=rwx,go=rx \
441
 
                --target-directory=$(LIBDIR)/mandos \
442
 
                mandos-to-cryptroot-unlock
 
322
        install --mode=u=rwx,go=rx \
 
323
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
443
324
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
444
325
                mandos-keygen
445
326
        install --mode=u=rwx,go=rx \
446
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
327
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
447
328
                plugins.d/password-prompt
448
329
        install --mode=u=rwxs,go=rx \
449
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
330
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
450
331
                plugins.d/mandos-client
451
332
        install --mode=u=rwxs,go=rx \
452
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
333
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
453
334
                plugins.d/usplash
454
335
        install --mode=u=rwxs,go=rx \
455
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
336
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
456
337
                plugins.d/splashy
457
338
        install --mode=u=rwxs,go=rx \
458
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
339
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
459
340
                plugins.d/askpass-fifo
460
341
        install --mode=u=rwxs,go=rx \
461
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
342
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
462
343
                plugins.d/plymouth
463
 
        install --mode=u=rwx,go=rx \
464
 
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
465
 
                plugin-helpers/mandos-client-iprouteadddel
466
344
        install initramfs-tools-hook \
467
345
                $(INITRAMFSTOOLS)/hooks/mandos
468
 
        install --mode=u=rw,go=r initramfs-tools-conf \
469
 
                $(INITRAMFSTOOLS)/conf.d/mandos-conf
470
 
        install --mode=u=rw,go=r initramfs-tools-conf-hook \
471
 
                $(INITRAMFSTOOLS)/conf-hooks.d/zz-mandos
 
346
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
 
347
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
472
348
        install initramfs-tools-script \
473
349
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
474
 
        install initramfs-tools-script-stop \
475
 
                $(INITRAMFSTOOLS)/scripts/local-premount/mandos
476
 
        install --directory $(DRACUTMODULE)
477
 
        install --mode=u=rw,go=r --target-directory=$(DRACUTMODULE) \
478
 
                dracut-module/ask-password-mandos.path \
479
 
                dracut-module/ask-password-mandos.service
480
 
        install --mode=u=rwxs,go=rx \
481
 
                --target-directory=$(DRACUTMODULE) \
482
 
                dracut-module/module-setup.sh \
483
 
                dracut-module/cmdline-mandos.sh \
484
 
                dracut-module/password-agent
485
350
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
486
351
        gzip --best --to-stdout mandos-keygen.8 \
487
352
                > $(MANDIR)/man8/mandos-keygen.8.gz
499
364
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
500
365
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
501
366
                > $(MANDIR)/man8/plymouth.8mandos.gz
502
 
        gzip --best --to-stdout dracut-module/password-agent.8mandos \
503
 
                > $(MANDIR)/man8/password-agent.8mandos.gz
504
367
 
505
368
install-client: install-client-nokey
506
369
# Post-installation stuff
507
370
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
508
 
        if command -v update-initramfs >/dev/null; then \
509
 
            update-initramfs -k all -u; \
510
 
        elif command -v dracut >/dev/null; then \
511
 
            for initrd in $(DESTDIR)/boot/initr*-$(LINUXVERSION); do \
512
 
                if [ -w "$$initrd" ]; then \
513
 
                    chmod go-r "$$initrd"; \
514
 
                    dracut --force "$$initrd"; \
515
 
                fi; \
516
 
            done; \
517
 
        fi
 
371
        update-initramfs -k all -u
518
372
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
519
373
 
520
374
uninstall: uninstall-server uninstall-client
537
391
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
538
392
                $(DESTDIR)/etc/crypttab
539
393
        -rm --force $(PREFIX)/sbin/mandos-keygen \
540
 
                $(LIBDIR)/mandos/plugin-runner \
541
 
                $(LIBDIR)/mandos/plugins.d/password-prompt \
542
 
                $(LIBDIR)/mandos/plugins.d/mandos-client \
543
 
                $(LIBDIR)/mandos/plugins.d/usplash \
544
 
                $(LIBDIR)/mandos/plugins.d/splashy \
545
 
                $(LIBDIR)/mandos/plugins.d/askpass-fifo \
546
 
                $(LIBDIR)/mandos/plugins.d/plymouth \
 
394
                $(PREFIX)/lib/mandos/plugin-runner \
 
395
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
 
396
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
 
397
                $(PREFIX)/lib/mandos/plugins.d/usplash \
 
398
                $(PREFIX)/lib/mandos/plugins.d/splashy \
 
399
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
 
400
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
547
401
                $(INITRAMFSTOOLS)/hooks/mandos \
548
402
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
549
403
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
550
 
                $(INITRAMFSTOOLS)/scripts/local-premount/mandos \
551
 
                $(DRACUTMODULE)/ask-password-mandos.path \
552
 
                $(DRACUTMODULE)/ask-password-mandos.service \
553
 
                $(DRACUTMODULE)/module-setup.sh \
554
 
                $(DRACUTMODULE)/cmdline-mandos.sh \
555
 
                $(DRACUTMODULE)/password-agent \
556
404
                $(MANDIR)/man8/mandos-keygen.8.gz \
557
405
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
558
406
                $(MANDIR)/man8/mandos-client.8mandos.gz
561
409
                $(MANDIR)/man8/splashy.8mandos.gz \
562
410
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
563
411
                $(MANDIR)/man8/plymouth.8mandos.gz \
564
 
                $(MANDIR)/man8/password-agent.8mandos.gz \
565
 
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
566
 
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR) $(DRACUTMODULE)
567
 
        if command -v update-initramfs >/dev/null; then \
568
 
            update-initramfs -k all -u; \
569
 
        elif command -v dracut >/dev/null; then \
570
 
            for initrd in $(DESTDIR)/boot/initr*-$(LINUXVERSION); do \
571
 
                test -w "$$initrd" && dracut --force "$$initrd"; \
572
 
            done; \
573
 
        fi
 
412
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
 
413
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
 
414
        update-initramfs -k all -u
574
415
 
575
416
purge: purge-server purge-client
576
417
 
579
420
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
580
421
                $(DESTDIR)/etc/default/mandos \
581
422
                $(DESTDIR)/etc/init.d/mandos \
582
 
                $(SYSTEMD)/mandos.service \
583
 
                $(DESTDIR)/run/mandos.pid \
584
423
                $(DESTDIR)/var/run/mandos.pid
585
424
        -rmdir $(CONFDIR)
586
425
 
587
426
purge-client: uninstall-client
588
 
        -shred --remove $(KEYDIR)/seckey.txt $(KEYDIR)/tls-privkey.pem
 
427
        -shred --remove $(KEYDIR)/seckey.txt
589
428
        -rm --force $(CONFDIR)/plugin-runner.conf \
590
 
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt \
591
 
                $(KEYDIR)/tls-pubkey.txt $(KEYDIR)/tls-privkey.txt
 
429
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt
592
430
        -rmdir $(KEYDIR) $(CONFDIR)/plugins.d $(CONFDIR)