/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-02-28 20:34:59 UTC
  • Revision ID: teddy@recompile.se-20160228203459-81vtqvr96yukyrok
Client: Remove calls to gnutls_global_init and gnutls_global_deinit

* plugins.d/mandos-client.c (init_gnutls_global, main): Don't call
  gnutls_global_init or gnutls_global_deinit anymore; these are
  unnecessary in GnuTLS 3.3.

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 \
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:=
 
18
# The sanitizing options are available in GCC 4.9 and above.
 
19
ifeq ($(shell test $(shell $(CC) -dumpversion) \> 4.9-; echo $$?),0)
 
20
SANITIZE:=-fsanitize=address -fsanitize=undefined -fsanitize=shift \
 
21
        -fsanitize=integer-divide-by-zero -fsanitize=unreachable \
 
22
        -fsanitize=vla-bound -fsanitize=null -fsanitize=return \
 
23
        -fsanitize=signed-integer-overflow
 
24
# GCC 5.3 has some more sanitizing options
 
25
ifeq ($(shell test $(shell $(CC) -dumpversion) \> 5.3-; echo $$?),0)
 
26
SANITIZE+=-fsanitize=bounds -fsanitize=alignment \
 
27
        -fsanitize=object-size -fsanitize=float-divide-by-zero \
 
28
        -fsanitize=float-cast-overflow -fsanitize=nonnull-attribute \
 
29
        -fsanitize=returns-nonnull-attribute -fsanitize=bool \
 
30
        -fsanitize=enum
 
31
endif
 
32
else
 
33
SANITIZE:=
 
34
endif
 
35
LINK_FORTIFY_LD=-z relro -z now
 
36
LINK_FORTIFY=
35
37
 
36
38
# If BROKEN_PIE is set, do not build with -pie
37
39
ifndef BROKEN_PIE
39
41
LINK_FORTIFY += -pie
40
42
endif
41
43
#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.7
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)
 
44
OPTIMIZE=-Os -fno-strict-aliasing
 
45
LANGUAGE=-std=gnu11
 
46
htmldir=man
 
47
version=1.7.2
 
48
SED=sed
 
49
 
 
50
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
 
51
GROUP=$(firstword $(subst :, ,$(shell getent group _mandos || getent group nobody || echo 65534)))
56
52
 
57
53
## 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
 
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
66
61
##
67
62
 
68
63
## 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 \
 
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 \
77
71
        for d in \
78
 
        "/usr/lib/`dpkg-architecture \
79
 
                        -qDEB_HOST_MULTIARCH 2>/dev/null`" \
 
72
        "/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null`" \
80
73
        "`rpm --eval='%{_libdir}' 2>/dev/null`" /usr/lib; do \
81
74
                if [ -d "$$d" -a "$$d" = "$${d%/}" ]; then \
82
75
                        echo "$(DESTDIR)$$d"; \
85
78
        done)
86
79
##
87
80
 
88
 
SYSTEMD:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
89
 
                        --variable=systemdsystemunitdir)
90
 
TMPFILES:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
91
 
                        --variable=tmpfilesdir)
 
81
SYSTEMD=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
92
82
 
93
 
GNUTLS_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I gnutls)
94
 
GNUTLS_LIBS:=$(shell $(PKG_CONFIG) --libs gnutls)
95
 
AVAHI_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I avahi-core)
96
 
AVAHI_LIBS:=$(shell $(PKG_CONFIG) --libs avahi-core)
97
 
GPGME_CFLAGS:=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
98
 
GPGME_LIBS:=$(shell gpgme-config --libs; getconf LFS_LIBS; \
 
83
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
 
84
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
 
85
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
 
86
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
 
87
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
 
88
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
99
89
        getconf LFS_LDFLAGS)
100
 
LIBNL3_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I libnl-route-3.0)
101
 
LIBNL3_LIBS:=$(shell $(PKG_CONFIG) --libs libnl-route-3.0)
102
 
GLIB_CFLAGS:=$(shell $(PKG_CONFIG) --cflags glib-2.0)
103
 
GLIB_LIBS:=$(shell $(PKG_CONFIG) --libs glib-2.0)
 
90
LIBNL3_CFLAGS=$(shell pkg-config --cflags-only-I libnl-route-3.0)
 
91
LIBNL3_LIBS=$(shell pkg-config --libs libnl-route-3.0)
104
92
 
105
93
# Do not change these two
106
 
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
107
 
        $(LANGUAGE) $(FEATURES) -DVERSION='"$(version)"'
108
 
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(strip \
109
 
        ) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
94
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(SANITIZE) $(COVERAGE) \
 
95
        $(OPTIMIZE) $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) \
 
96
        $(GPGME_CFLAGS) -DVERSION='"$(version)"'
 
97
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
110
98
 
111
99
# Commands to format a DocBook <refentry> document into a manual page
112
100
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
118
106
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
119
107
        $(notdir $<); \
120
108
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
121
 
        && command -v man >/dev/null; then LANG=en_US.UTF-8 \
122
 
        MANWIDTH=80 man --warnings --encoding=UTF-8 --local-file \
123
 
        $(notdir $@); fi >/dev/null)
 
109
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
 
110
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
 
111
        fi >/dev/null)
124
112
 
125
113
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
126
114
        --param make.year.ranges                1 \
132
120
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
133
121
        $<; $(HTMLPOST) $@)
134
122
# Fix citerefentry links
135
 
HTMLPOST:=$(SED) --in-place \
 
123
HTMLPOST=$(SED) --in-place \
136
124
        --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
137
125
 
138
 
PLUGINS:=plugins.d/password-prompt plugins.d/mandos-client \
 
126
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
139
127
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
140
128
        plugins.d/plymouth
141
 
PLUGIN_HELPERS:=plugin-helpers/mandos-client-iprouteadddel
142
 
CPROGS:=plugin-runner dracut-module/password-agent $(PLUGINS) \
143
 
        $(PLUGIN_HELPERS)
144
 
PROGS:=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
145
 
DOCS:=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
 
129
PLUGIN_HELPERS=plugin-helpers/mandos-client-iprouteadddel
 
130
CPROGS=plugin-runner $(PLUGINS) $(PLUGIN_HELPERS)
 
131
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
 
132
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
146
133
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
147
 
        dracut-module/password-agent.8mandos \
148
134
        plugins.d/mandos-client.8mandos \
149
135
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
150
136
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
151
137
        plugins.d/plymouth.8mandos intro.8mandos
152
138
 
153
 
htmldocs:=$(addsuffix .xhtml,$(DOCS))
 
139
htmldocs=$(addsuffix .xhtml,$(DOCS))
154
140
 
155
 
objects:=$(addsuffix .o,$(CPROGS))
 
141
objects=$(addsuffix .o,$(CPROGS))
156
142
 
157
143
all: $(PROGS) mandos.lsm
158
144
 
222
208
                overview.xml legalnotice.xml
223
209
        $(DOCBOOKTOHTML)
224
210
 
225
 
dracut-module/password-agent.8mandos: \
226
 
                dracut-module/password-agent.xml common.ent \
227
 
                overview.xml legalnotice.xml
228
 
        $(DOCBOOKTOMAN)
229
 
dracut-module/password-agent.8mandos.xhtml: \
230
 
                dracut-module/password-agent.xml common.ent \
231
 
                overview.xml legalnotice.xml
232
 
        $(DOCBOOKTOHTML)
233
 
 
234
211
plugins.d/mandos-client.8mandos: plugins.d/mandos-client.xml \
235
212
                                        common.ent \
236
213
                                        mandos-options.xml \
279
256
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
280
257
                $@)
281
258
 
282
 
# Need to add the GnuTLS, Avahi and GPGME libraries
283
259
plugins.d/mandos-client: plugins.d/mandos-client.c
284
 
        $(LINK.c) $^ $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(strip\
285
 
                ) $(GPGME_CFLAGS) $(GNUTLS_LIBS) $(strip\
286
 
                ) $(AVAHI_LIBS) $(GPGME_LIBS) $(LOADLIBES) $(strip\
287
 
                ) $(LDLIBS) -o $@
 
260
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
 
261
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
288
262
 
289
 
# Need to add the libnl-route library
290
263
plugin-helpers/mandos-client-iprouteadddel: plugin-helpers/mandos-client-iprouteadddel.c
291
264
        $(LINK.c) $(LIBNL3_CFLAGS) $^ $(LIBNL3_LIBS) $(strip\
292
265
                ) $(LOADLIBES) $(LDLIBS) -o $@
293
266
 
294
 
# Need to add the GLib and pthread libraries
295
 
dracut-module/password-agent: dracut-module/password-agent.c
296
 
        $(LINK.c) $(GLIB_CFLAGS) $^ $(GLIB_LIBS) -lpthread $(strip\
297
 
                ) $(LOADLIBES) $(LDLIBS) -o $@
298
 
 
299
267
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
300
268
        check run-client run-server install install-html \
301
269
        install-server install-client-nokey install-client uninstall \
310
278
maintainer-clean: clean
311
279
        -rm --force --recursive keydir confdir statedir
312
280
 
313
 
check: all
 
281
check:  all
314
282
        ./mandos --check
315
283
        ./mandos-ctl --check
316
 
        ./mandos-keygen --version
317
 
        ./plugin-runner --version
318
 
        ./plugin-helpers/mandos-client-iprouteadddel --version
319
 
        ./dracut-module/password-agent --test
320
284
 
321
285
# Run the client with a local config and key
322
 
run-client: all keydir/seckey.txt keydir/pubkey.txt \
323
 
                        keydir/tls-privkey.pem keydir/tls-pubkey.pem
324
 
        @echo '######################################################'
325
 
        @echo '# The following error messages are harmless and can  #'
326
 
        @echo '#  be safely ignored:                                #'
327
 
        @echo '## From plugin-runner:                               #'
328
 
        @echo '# setgid: Operation not permitted                    #'
329
 
        @echo '# setuid: Operation not permitted                    #'
330
 
        @echo '## From askpass-fifo:                                #'
331
 
        @echo '# mkfifo: Permission denied                          #'
332
 
        @echo '## From mandos-client:                               #'
333
 
        @echo '# Failed to raise privileges: Operation not permi... #'
334
 
        @echo '# Warning: network hook "*" exited with status *     #'
335
 
        @echo '# ioctl SIOCSIFFLAGS +IFF_UP: Operation not permi... #'
336
 
        @echo '# Failed to bring up interface "*": Operation not... #'
337
 
        @echo '#                                                    #'
338
 
        @echo '# (The messages are caused by not running as root,   #'
339
 
        @echo '# but you should NOT run "make run-client" as root   #'
340
 
        @echo '# unless you also unpacked and compiled Mandos as    #'
341
 
        @echo '# root, which is also NOT recommended.)              #'
342
 
        @echo '######################################################'
 
286
run-client: all keydir/seckey.txt keydir/pubkey.txt
 
287
        @echo "###################################################################"
 
288
        @echo "# The following error messages are harmless and can be safely     #"
 
289
        @echo "# ignored.  The messages are caused by not running as root, but   #"
 
290
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
 
291
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
 
292
        @echo "# From plugin-runner: setgid: Operation not permitted             #"
 
293
        @echo "#                     setuid: Operation not permitted             #"
 
294
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
 
295
        @echo "# From mandos-client:                                             #"
 
296
        @echo "#             Failed to raise privileges: Operation not permitted #"
 
297
        @echo "#             Warning: network hook \"*\" exited with status *      #"
 
298
        @echo "###################################################################"
343
299
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
344
300
        ./plugin-runner --plugin-dir=plugins.d \
345
301
                --plugin-helper-dir=plugin-helpers \
346
302
                --config-file=plugin-runner.conf \
347
 
                --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 \
 
303
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
348
304
                --env-for=mandos-client:GNOME_KEYRING_CONTROL= \
349
305
                $(CLIENTARGS)
350
306
 
351
307
# Used by run-client
352
 
keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem: mandos-keygen
 
308
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
353
309
        install --directory keydir
354
310
        ./mandos-keygen --dir keydir --force
355
311
 
362
318
confdir/mandos.conf: mandos.conf
363
319
        install --directory confdir
364
320
        install --mode=u=rw,go=r $^ $@
365
 
confdir/clients.conf: clients.conf keydir/seckey.txt keydir/tls-pubkey.pem
 
321
confdir/clients.conf: clients.conf keydir/seckey.txt
366
322
        install --directory confdir
367
323
        install --mode=u=rw $< $@
368
324
# Add a client password
385
341
        elif install --directory --mode=u=rwx $(STATEDIR); then \
386
342
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
387
343
        fi
388
 
        if [ "$(TMPFILES)" != "$(DESTDIR)" \
389
 
                        -a -d "$(TMPFILES)" ]; then \
390
 
                install --mode=u=rw,go=r tmpfiles.d-mandos.conf \
391
 
                        $(TMPFILES)/mandos.conf; \
392
 
        fi
393
344
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
394
345
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
395
346
                mandos-ctl
431
382
                $(LIBDIR)/mandos/plugin-helpers
432
383
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
433
384
                install --mode=u=rwx \
434
 
                        --directory "$(CONFDIR)/plugins.d" \
435
 
                        "$(CONFDIR)/plugin-helpers"; \
 
385
                        --directory "$(CONFDIR)/plugins.d"; \
 
386
                install --directory "$(CONFDIR)/plugin-helpers"; \
436
387
        fi
437
388
        install --mode=u=rwx,go=rx --directory \
438
389
                "$(CONFDIR)/network-hooks.d"
439
390
        install --mode=u=rwx,go=rx \
440
391
                --target-directory=$(LIBDIR)/mandos plugin-runner
441
 
        install --mode=u=rwx,go=rx \
442
 
                --target-directory=$(LIBDIR)/mandos \
443
 
                mandos-to-cryptroot-unlock
444
392
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
445
393
                mandos-keygen
446
394
        install --mode=u=rwx,go=rx \
461
409
        install --mode=u=rwxs,go=rx \
462
410
                --target-directory=$(LIBDIR)/mandos/plugins.d \
463
411
                plugins.d/plymouth
464
 
        install --mode=u=rwx,go=rx \
 
412
        install --mode=u=rwxs,go=rx \
465
413
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
466
414
                plugin-helpers/mandos-client-iprouteadddel
467
415
        install initramfs-tools-hook \
468
416
                $(INITRAMFSTOOLS)/hooks/mandos
469
 
        install --mode=u=rw,go=r initramfs-tools-conf \
470
 
                $(INITRAMFSTOOLS)/conf.d/mandos-conf
471
 
        install --mode=u=rw,go=r initramfs-tools-conf-hook \
472
 
                $(INITRAMFSTOOLS)/conf-hooks.d/zz-mandos
 
417
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
 
418
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
473
419
        install initramfs-tools-script \
474
420
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
475
 
        install initramfs-tools-script-stop \
476
 
                $(INITRAMFSTOOLS)/scripts/local-premount/mandos
477
 
        install --directory $(DRACUTMODULE)
478
 
        install --mode=u=rw,go=r --target-directory=$(DRACUTMODULE) \
479
 
                dracut-module/ask-password-mandos.path \
480
 
                dracut-module/ask-password-mandos.service
481
 
        install --mode=u=rwxs,go=rx \
482
 
                --target-directory=$(DRACUTMODULE) \
483
 
                dracut-module/module-setup.sh \
484
 
                dracut-module/cmdline-mandos.sh \
485
 
                dracut-module/password-agent
486
421
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
487
422
        gzip --best --to-stdout mandos-keygen.8 \
488
423
                > $(MANDIR)/man8/mandos-keygen.8.gz
500
435
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
501
436
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
502
437
                > $(MANDIR)/man8/plymouth.8mandos.gz
503
 
        gzip --best --to-stdout dracut-module/password-agent.8mandos \
504
 
                > $(MANDIR)/man8/password-agent.8mandos.gz
505
438
 
506
439
install-client: install-client-nokey
507
440
# Post-installation stuff
508
441
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
509
 
        if command -v update-initramfs >/dev/null; then \
510
 
            update-initramfs -k all -u; \
511
 
        elif command -v dracut >/dev/null; then \
512
 
            for initrd in $(DESTDIR)/boot/initr*-$(LINUXVERSION); do \
513
 
                if [ -w "$$initrd" ]; then \
514
 
                    chmod go-r "$$initrd"; \
515
 
                    dracut --force "$$initrd"; \
516
 
                fi; \
517
 
            done; \
518
 
        fi
 
442
        update-initramfs -k all -u
519
443
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
520
444
 
521
445
uninstall: uninstall-server uninstall-client
548
472
                $(INITRAMFSTOOLS)/hooks/mandos \
549
473
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
550
474
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
551
 
                $(INITRAMFSTOOLS)/scripts/local-premount/mandos \
552
 
                $(DRACUTMODULE)/ask-password-mandos.path \
553
 
                $(DRACUTMODULE)/ask-password-mandos.service \
554
 
                $(DRACUTMODULE)/module-setup.sh \
555
 
                $(DRACUTMODULE)/cmdline-mandos.sh \
556
 
                $(DRACUTMODULE)/password-agent \
557
475
                $(MANDIR)/man8/mandos-keygen.8.gz \
558
476
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
559
477
                $(MANDIR)/man8/mandos-client.8mandos.gz
562
480
                $(MANDIR)/man8/splashy.8mandos.gz \
563
481
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
564
482
                $(MANDIR)/man8/plymouth.8mandos.gz \
565
 
                $(MANDIR)/man8/password-agent.8mandos.gz \
566
483
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
567
 
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR) $(DRACUTMODULE)
568
 
        if command -v update-initramfs >/dev/null; then \
569
 
            update-initramfs -k all -u; \
570
 
        elif command -v dracut >/dev/null; then \
571
 
            for initrd in $(DESTDIR)/boot/initr*-$(LINUXVERSION); do \
572
 
                test -w "$$initrd" && dracut --force "$$initrd"; \
573
 
            done; \
574
 
        fi
 
484
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
 
485
        update-initramfs -k all -u
575
486
 
576
487
purge: purge-server purge-client
577
488
 
586
497
        -rmdir $(CONFDIR)
587
498
 
588
499
purge-client: uninstall-client
589
 
        -shred --remove $(KEYDIR)/seckey.txt $(KEYDIR)/tls-privkey.pem
 
500
        -shred --remove $(KEYDIR)/seckey.txt
590
501
        -rm --force $(CONFDIR)/plugin-runner.conf \
591
 
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt \
592
 
                $(KEYDIR)/tls-pubkey.txt $(KEYDIR)/tls-privkey.txt
 
502
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt
593
503
        -rmdir $(KEYDIR) $(CONFDIR)/plugins.d $(CONFDIR)