/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: 2016-03-05 21:42:56 UTC
  • Revision ID: teddy@recompile.se-20160305214256-79progf0wfkd9068
Add bug reporting information to manual pages

* bugs.xml: New file.
* intro.xml (BUGS): New section; include "bugs.xml".
* mandos-clients.conf.xml (BUGS): Include "bugs.xml".
* mandos-ctl.xml (BUGS): Uncommented; include "bugs.xml".
* mandos-keygen.xml (BUGS): - '' -
* mandos-monitor.xml (BUGS): Include "bugs.xml".
* mandos.conf.xml (BUGS): - '' -
* mandos.xml (BUGS): - '' -
* plugin-runner.xml (BUGS): - '' -
* plugins.d/askpass-fifo.xml (BUGS): New section; include
                                     "../bugs.xml".
* plugins.d/mandos-client.xml (BUGS): Uncommented; include
                                     "../bugs.xml".
* plugins.d/password-prompt.xml (BUGS): Include "../bugs.xml".
* plugins.d/plymouth.xml (BUGS): - '' -
* plugins.d/splashy.xml (BUGS): - '' -
* plugins.d/usplash.xml (BUGS): - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
1
 
WARN:=-O -Wall -Wextra -Wdouble-promotion -Wformat=2 -Winit-self \
 
1
WARN=-O -Wall -Wextra -Wdouble-promotion -Wformat=2 -Winit-self \
2
2
        -Wmissing-include-dirs -Wswitch-default -Wswitch-enum \
3
3
        -Wunused -Wuninitialized -Wstrict-overflow=5 \
4
4
        -Wsuggest-attribute=pure -Wsuggest-attribute=const \
10
10
        -Wmissing-format-attribute -Wnormalized=nfc -Wpacked \
11
11
        -Wredundant-decls -Wnested-externs -Winline -Wvla \
12
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)))
 
13
#DEBUG=-ggdb3
 
14
# For info about _FORTIFY_SOURCE, see feature_test_macros(7)
 
15
# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
 
16
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
19
17
# <https://developerblog.redhat.com/2014/10/16/gcc-undefined-behavior-sanitizer-ubsan/>
20
 
ALL_SANITIZE_OPTIONS:=-fsanitize=leak -fsanitize=undefined \
 
18
ALL_SANITIZE_OPTIONS:=-fsanitize=address -fsanitize=undefined \
21
19
        -fsanitize=shift -fsanitize=integer-divide-by-zero \
22
20
        -fsanitize=unreachable -fsanitize=vla-bound -fsanitize=null \
23
21
        -fsanitize=return -fsanitize=signed-integer-overflow \
25
23
        -fsanitize=object-size -fsanitize=float-divide-by-zero \
26
24
        -fsanitize=float-cast-overflow -fsanitize=nonnull-attribute \
27
25
        -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:=
 
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=
35
33
 
36
34
# If BROKEN_PIE is set, do not build with -pie
37
35
ifndef BROKEN_PIE
39
37
LINK_FORTIFY += -pie
40
38
endif
41
39
#COVERAGE=--coverage
42
 
OPTIMIZE:=-Os -fno-strict-aliasing
43
 
LANGUAGE:=-std=gnu11
44
 
FEATURES:=-D_FILE_OFFSET_BITS=64
45
 
htmldir:=man
46
 
version:=1.8.9
47
 
SED:=sed
48
 
PKG_CONFIG?=pkg-config
49
 
 
50
 
USER:=$(firstword $(subst :, ,$(shell getent passwd _mandos \
51
 
        || getent passwd nobody || echo 65534)))
52
 
GROUP:=$(firstword $(subst :, ,$(shell getent group _mandos \
53
 
        || getent group nogroup || echo 65534)))
54
 
 
55
 
LINUXVERSION:=$(shell uname --kernel-release)
 
40
OPTIMIZE=-Os -fno-strict-aliasing
 
41
LANGUAGE=-std=gnu11
 
42
htmldir=man
 
43
version=1.7.3
 
44
SED=sed
 
45
 
 
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)))
56
48
 
57
49
## Use these settings for a traditional /usr/local install
58
 
# PREFIX:=$(DESTDIR)/usr/local
59
 
# CONFDIR:=$(DESTDIR)/etc/mandos
60
 
# KEYDIR:=$(DESTDIR)/etc/mandos/keys
61
 
# MANDIR:=$(PREFIX)/man
62
 
# INITRAMFSTOOLS:=$(DESTDIR)/etc/initramfs-tools
63
 
# DRACUTMODULE:=$(DESTDIR)/usr/lib/dracut/modules.d/90mandos
64
 
# STATEDIR:=$(DESTDIR)/var/lib/mandos
65
 
# LIBDIR:=$(PREFIX)/lib
 
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
66
57
##
67
58
 
68
59
## These settings are for a package-type install
69
 
PREFIX:=$(DESTDIR)/usr
70
 
CONFDIR:=$(DESTDIR)/etc/mandos
71
 
KEYDIR:=$(DESTDIR)/etc/keys/mandos
72
 
MANDIR:=$(PREFIX)/share/man
73
 
INITRAMFSTOOLS:=$(DESTDIR)/usr/share/initramfs-tools
74
 
DRACUTMODULE:=$(DESTDIR)/usr/lib/dracut/modules.d/90mandos
75
 
STATEDIR:=$(DESTDIR)/var/lib/mandos
76
 
LIBDIR:=$(shell \
 
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 \
77
67
        for d in \
78
 
        "/usr/lib/`dpkg-architecture \
79
 
                        -qDEB_HOST_MULTIARCH 2>/dev/null`" \
 
68
        "/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null`" \
80
69
        "`rpm --eval='%{_libdir}' 2>/dev/null`" /usr/lib; do \
81
70
                if [ -d "$$d" -a "$$d" = "$${d%/}" ]; then \
82
71
                        echo "$(DESTDIR)$$d"; \
85
74
        done)
86
75
##
87
76
 
88
 
SYSTEMD:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
89
 
                        --variable=systemdsystemunitdir)
90
 
TMPFILES:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
91
 
                        --variable=tmpfilesdir)
92
 
SYSUSERS:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
93
 
                        --variable=sysusersdir)
 
77
SYSTEMD=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
94
78
 
95
 
GNUTLS_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I gnutls)
96
 
GNUTLS_LIBS:=$(shell $(PKG_CONFIG) --libs gnutls)
97
 
AVAHI_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I avahi-core)
98
 
AVAHI_LIBS:=$(shell $(PKG_CONFIG) --libs avahi-core)
99
 
GPGME_CFLAGS:=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
100
 
GPGME_LIBS:=$(shell gpgme-config --libs; getconf LFS_LIBS; \
 
79
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
 
80
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
 
81
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
 
82
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
 
83
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
 
84
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
101
85
        getconf LFS_LDFLAGS)
102
 
LIBNL3_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I libnl-route-3.0)
103
 
LIBNL3_LIBS:=$(shell $(PKG_CONFIG) --libs libnl-route-3.0)
104
 
GLIB_CFLAGS:=$(shell $(PKG_CONFIG) --cflags glib-2.0)
105
 
GLIB_LIBS:=$(shell $(PKG_CONFIG) --libs glib-2.0)
 
86
LIBNL3_CFLAGS=$(shell pkg-config --cflags-only-I libnl-route-3.0)
 
87
LIBNL3_LIBS=$(shell pkg-config --libs libnl-route-3.0)
106
88
 
107
89
# Do not change these two
108
 
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
109
 
        $(LANGUAGE) $(FEATURES) -DVERSION='"$(version)"'
110
 
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(strip \
111
 
        ) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
90
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(SANITIZE) $(COVERAGE) \
 
91
        $(OPTIMIZE) $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) \
 
92
        $(GPGME_CFLAGS) -DVERSION='"$(version)"'
 
93
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
112
94
 
113
95
# Commands to format a DocBook <refentry> document into a manual page
114
96
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
120
102
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
121
103
        $(notdir $<); \
122
104
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
123
 
        && command -v man >/dev/null; then LANG=en_US.UTF-8 \
124
 
        MANWIDTH=80 man --warnings --encoding=UTF-8 --local-file \
125
 
        $(notdir $@); fi >/dev/null)
 
105
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
 
106
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
 
107
        fi >/dev/null)
126
108
 
127
109
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
128
110
        --param make.year.ranges                1 \
134
116
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
135
117
        $<; $(HTMLPOST) $@)
136
118
# Fix citerefentry links
137
 
HTMLPOST:=$(SED) --in-place \
 
119
HTMLPOST=$(SED) --in-place \
138
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'
139
121
 
140
 
PLUGINS:=plugins.d/password-prompt plugins.d/mandos-client \
 
122
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
141
123
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
142
124
        plugins.d/plymouth
143
 
PLUGIN_HELPERS:=plugin-helpers/mandos-client-iprouteadddel
144
 
CPROGS:=plugin-runner dracut-module/password-agent $(PLUGINS) \
145
 
        $(PLUGIN_HELPERS)
146
 
PROGS:=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
147
 
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 \
148
129
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
149
 
        dracut-module/password-agent.8mandos \
150
130
        plugins.d/mandos-client.8mandos \
151
131
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
152
132
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
153
133
        plugins.d/plymouth.8mandos intro.8mandos
154
134
 
155
 
htmldocs:=$(addsuffix .xhtml,$(DOCS))
 
135
htmldocs=$(addsuffix .xhtml,$(DOCS))
156
136
 
157
 
objects:=$(addsuffix .o,$(CPROGS))
 
137
objects=$(addsuffix .o,$(CPROGS))
158
138
 
159
139
all: $(PROGS) mandos.lsm
160
140
 
224
204
                overview.xml legalnotice.xml
225
205
        $(DOCBOOKTOHTML)
226
206
 
227
 
dracut-module/password-agent.8mandos: \
228
 
                dracut-module/password-agent.xml common.ent \
229
 
                overview.xml legalnotice.xml
230
 
        $(DOCBOOKTOMAN)
231
 
dracut-module/password-agent.8mandos.xhtml: \
232
 
                dracut-module/password-agent.xml common.ent \
233
 
                overview.xml legalnotice.xml
234
 
        $(DOCBOOKTOHTML)
235
 
 
236
207
plugins.d/mandos-client.8mandos: plugins.d/mandos-client.xml \
237
208
                                        common.ent \
238
209
                                        mandos-options.xml \
281
252
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
282
253
                $@)
283
254
 
284
 
# Need to add the GnuTLS, Avahi and GPGME libraries
285
 
plugins.d/mandos-client: CFLAGS += $(GNUTLS_CFLAGS) $(strip \
286
 
        ) $(AVAHI_CFLAGS) $(GPGME_CFLAGS)
287
 
plugins.d/mandos-client: LDLIBS += $(GNUTLS_LIBS) $(strip \
288
 
        ) $(AVAHI_LIBS) $(GPGME_LIBS)
289
 
 
290
 
# Need to add the libnl-route library
291
 
plugin-helpers/mandos-client-iprouteadddel: CFLAGS += $(LIBNL3_CFLAGS)
292
 
plugin-helpers/mandos-client-iprouteadddel: LDLIBS += $(LIBNL3_LIBS)
293
 
 
294
 
# Need to add the GLib and pthread libraries
295
 
dracut-module/password-agent: CFLAGS += $(GLIB_CFLAGS)
296
 
dracut-module/password-agent: LDLIBS += $(GLIB_LIBS) -lpthread
 
255
plugins.d/mandos-client: plugins.d/mandos-client.c
 
256
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
 
257
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
 
258
 
 
259
plugin-helpers/mandos-client-iprouteadddel: plugin-helpers/mandos-client-iprouteadddel.c
 
260
        $(LINK.c) $(LIBNL3_CFLAGS) $^ $(LIBNL3_LIBS) $(strip\
 
261
                ) $(LOADLIBES) $(LDLIBS) -o $@
297
262
 
298
263
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
299
264
        check run-client run-server install install-html \
309
274
maintainer-clean: clean
310
275
        -rm --force --recursive keydir confdir statedir
311
276
 
312
 
check: all
 
277
check:  all
313
278
        ./mandos --check
314
279
        ./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
280
 
320
281
# 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 '######################################################'
 
282
run-client: all keydir/seckey.txt keydir/pubkey.txt
 
283
        @echo "###################################################################"
 
284
        @echo "# The following error messages are harmless and can be safely     #"
 
285
        @echo "# ignored.  The messages are caused by not running as root, but   #"
 
286
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
 
287
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
 
288
        @echo "# From plugin-runner: setgid: Operation not permitted             #"
 
289
        @echo "#                     setuid: Operation not permitted             #"
 
290
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
 
291
        @echo "# From mandos-client:                                             #"
 
292
        @echo "#             Failed to raise privileges: Operation not permitted #"
 
293
        @echo "#             Warning: network hook \"*\" exited with status *      #"
 
294
        @echo "###################################################################"
342
295
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
343
296
        ./plugin-runner --plugin-dir=plugins.d \
344
297
                --plugin-helper-dir=plugin-helpers \
345
298
                --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 \
 
299
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
347
300
                --env-for=mandos-client:GNOME_KEYRING_CONTROL= \
348
301
                $(CLIENTARGS)
349
302
 
350
303
# Used by run-client
351
 
keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem: mandos-keygen
 
304
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
352
305
        install --directory keydir
353
306
        ./mandos-keygen --dir keydir --force
354
307
 
361
314
confdir/mandos.conf: mandos.conf
362
315
        install --directory confdir
363
316
        install --mode=u=rw,go=r $^ $@
364
 
confdir/clients.conf: clients.conf keydir/seckey.txt keydir/tls-pubkey.pem
 
317
confdir/clients.conf: clients.conf keydir/seckey.txt
365
318
        install --directory confdir
366
319
        install --mode=u=rw $< $@
367
320
# Add a client password
384
337
        elif install --directory --mode=u=rwx $(STATEDIR); then \
385
338
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
386
339
        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
 
        if [ "$(SYSUSERS)" != "$(DESTDIR)" \
393
 
                        -a -d "$(SYSUSERS)" ]; then \
394
 
                install --mode=u=rw,go=r sysusers.d-mandos.conf \
395
 
                        $(SYSUSERS)/mandos.conf; \
396
 
        fi
397
340
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
398
341
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
399
342
                mandos-ctl
433
376
        install --directory --mode=u=rwx $(KEYDIR) \
434
377
                $(LIBDIR)/mandos/plugins.d \
435
378
                $(LIBDIR)/mandos/plugin-helpers
436
 
        if [ "$(SYSUSERS)" != "$(DESTDIR)" \
437
 
                        -a -d "$(SYSUSERS)" ]; then \
438
 
                install --mode=u=rw,go=r sysusers.d-mandos.conf \
439
 
                        $(SYSUSERS)/mandos-client.conf; \
440
 
        fi
441
379
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
442
380
                install --mode=u=rwx \
443
 
                        --directory "$(CONFDIR)/plugins.d" \
444
 
                        "$(CONFDIR)/plugin-helpers"; \
 
381
                        --directory "$(CONFDIR)/plugins.d"; \
 
382
                install --directory "$(CONFDIR)/plugin-helpers"; \
445
383
        fi
446
384
        install --mode=u=rwx,go=rx --directory \
447
385
                "$(CONFDIR)/network-hooks.d"
448
386
        install --mode=u=rwx,go=rx \
449
387
                --target-directory=$(LIBDIR)/mandos plugin-runner
450
 
        install --mode=u=rwx,go=rx \
451
 
                --target-directory=$(LIBDIR)/mandos \
452
 
                mandos-to-cryptroot-unlock
453
388
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
454
389
                mandos-keygen
455
390
        install --mode=u=rwx,go=rx \
470
405
        install --mode=u=rwxs,go=rx \
471
406
                --target-directory=$(LIBDIR)/mandos/plugins.d \
472
407
                plugins.d/plymouth
473
 
        install --mode=u=rwx,go=rx \
 
408
        install --mode=u=rwxs,go=rx \
474
409
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
475
410
                plugin-helpers/mandos-client-iprouteadddel
476
411
        install initramfs-tools-hook \
477
412
                $(INITRAMFSTOOLS)/hooks/mandos
478
 
        install --mode=u=rw,go=r initramfs-tools-conf \
479
 
                $(INITRAMFSTOOLS)/conf.d/mandos-conf
480
 
        install --mode=u=rw,go=r initramfs-tools-conf-hook \
481
 
                $(INITRAMFSTOOLS)/conf-hooks.d/zz-mandos
 
413
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
 
414
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
482
415
        install initramfs-tools-script \
483
416
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
484
 
        install initramfs-tools-script-stop \
485
 
                $(INITRAMFSTOOLS)/scripts/local-premount/mandos
486
 
        install --directory $(DRACUTMODULE)
487
 
        install --mode=u=rw,go=r --target-directory=$(DRACUTMODULE) \
488
 
                dracut-module/ask-password-mandos.path \
489
 
                dracut-module/ask-password-mandos.service
490
 
        install --mode=u=rwxs,go=rx \
491
 
                --target-directory=$(DRACUTMODULE) \
492
 
                dracut-module/module-setup.sh \
493
 
                dracut-module/cmdline-mandos.sh \
494
 
                dracut-module/password-agent
495
417
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
496
418
        gzip --best --to-stdout mandos-keygen.8 \
497
419
                > $(MANDIR)/man8/mandos-keygen.8.gz
509
431
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
510
432
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
511
433
                > $(MANDIR)/man8/plymouth.8mandos.gz
512
 
        gzip --best --to-stdout dracut-module/password-agent.8mandos \
513
 
                > $(MANDIR)/man8/password-agent.8mandos.gz
514
434
 
515
435
install-client: install-client-nokey
516
436
# Post-installation stuff
517
437
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
518
 
        if command -v update-initramfs >/dev/null; then \
519
 
            update-initramfs -k all -u; \
520
 
        elif command -v dracut >/dev/null; then \
521
 
            for initrd in $(DESTDIR)/boot/initr*-$(LINUXVERSION); do \
522
 
                if [ -w "$$initrd" ]; then \
523
 
                    chmod go-r "$$initrd"; \
524
 
                    dracut --force "$$initrd"; \
525
 
                fi; \
526
 
            done; \
527
 
        fi
 
438
        update-initramfs -k all -u
528
439
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
529
440
 
530
441
uninstall: uninstall-server uninstall-client
557
468
                $(INITRAMFSTOOLS)/hooks/mandos \
558
469
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
559
470
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
560
 
                $(INITRAMFSTOOLS)/scripts/local-premount/mandos \
561
 
                $(DRACUTMODULE)/ask-password-mandos.path \
562
 
                $(DRACUTMODULE)/ask-password-mandos.service \
563
 
                $(DRACUTMODULE)/module-setup.sh \
564
 
                $(DRACUTMODULE)/cmdline-mandos.sh \
565
 
                $(DRACUTMODULE)/password-agent \
566
471
                $(MANDIR)/man8/mandos-keygen.8.gz \
567
472
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
568
473
                $(MANDIR)/man8/mandos-client.8mandos.gz
571
476
                $(MANDIR)/man8/splashy.8mandos.gz \
572
477
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
573
478
                $(MANDIR)/man8/plymouth.8mandos.gz \
574
 
                $(MANDIR)/man8/password-agent.8mandos.gz \
575
479
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
576
 
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR) $(DRACUTMODULE)
577
 
        if command -v update-initramfs >/dev/null; then \
578
 
            update-initramfs -k all -u; \
579
 
        elif command -v dracut >/dev/null; then \
580
 
            for initrd in $(DESTDIR)/boot/initr*-$(LINUXVERSION); do \
581
 
                test -w "$$initrd" && dracut --force "$$initrd"; \
582
 
            done; \
583
 
        fi
 
480
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
 
481
        update-initramfs -k all -u
584
482
 
585
483
purge: purge-server purge-client
586
484
 
595
493
        -rmdir $(CONFDIR)
596
494
 
597
495
purge-client: uninstall-client
598
 
        -shred --remove $(KEYDIR)/seckey.txt $(KEYDIR)/tls-privkey.pem
 
496
        -shred --remove $(KEYDIR)/seckey.txt
599
497
        -rm --force $(CONFDIR)/plugin-runner.conf \
600
 
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt \
601
 
                $(KEYDIR)/tls-pubkey.txt $(KEYDIR)/tls-privkey.txt
 
498
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt
602
499
        -rmdir $(KEYDIR) $(CONFDIR)/plugins.d $(CONFDIR)