/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-17 20:40:55 UTC
  • Revision ID: teddy@recompile.se-20160317204055-bhsh5xsidq7w5cxu
Client: Fix plymouth agent; broken since 1.7.2.

Fix an very old memory bug in the plymouth agent (which has been
present since its apperance in version 1.2), but which was only
recently detected at run time due to the new -fsanitize=address
compile- time flag, which has been used since version 1.7.2.  This
detection of a memory access violation causes the program to abort,
making the Plymouth graphical boot system unable to accept interactive
input of passwords when using the Mandos client.

* plugins.d/plymouth.c (exec_and_wait): Fix memory allocation bug when
  allocating new_argv.  Also tolerate a zero-length argv.

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.6
 
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))
156
 
 
157
 
objects:=$(addsuffix .o,$(CPROGS))
158
 
 
159
 
.PHONY: all
 
135
htmldocs=$(addsuffix .xhtml,$(DOCS))
 
136
 
 
137
objects=$(addsuffix .o,$(CPROGS))
 
138
 
160
139
all: $(PROGS) mandos.lsm
161
140
 
162
 
.PHONY: doc
163
141
doc: $(DOCS)
164
142
 
165
 
.PHONY: html
166
143
html: $(htmldocs)
167
144
 
168
145
%.5: %.xml common.ent legalnotice.xml
227
204
                overview.xml legalnotice.xml
228
205
        $(DOCBOOKTOHTML)
229
206
 
230
 
dracut-module/password-agent.8mandos: \
231
 
                dracut-module/password-agent.xml common.ent \
232
 
                overview.xml legalnotice.xml
233
 
        $(DOCBOOKTOMAN)
234
 
dracut-module/password-agent.8mandos.xhtml: \
235
 
                dracut-module/password-agent.xml common.ent \
236
 
                overview.xml legalnotice.xml
237
 
        $(DOCBOOKTOHTML)
238
 
 
239
207
plugins.d/mandos-client.8mandos: plugins.d/mandos-client.xml \
240
208
                                        common.ent \
241
209
                                        mandos-options.xml \
284
252
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
285
253
                $@)
286
254
 
287
 
# Need to add the GnuTLS, Avahi and GPGME libraries
288
 
plugins.d/mandos-client: CFLAGS += $(GNUTLS_CFLAGS) $(strip \
289
 
        ) $(AVAHI_CFLAGS) $(GPGME_CFLAGS)
290
 
plugins.d/mandos-client: LDLIBS += $(GNUTLS_LIBS) $(strip \
291
 
        ) $(AVAHI_LIBS) $(GPGME_LIBS)
292
 
 
293
 
# Need to add the libnl-route library
294
 
plugin-helpers/mandos-client-iprouteadddel: CFLAGS += $(LIBNL3_CFLAGS)
295
 
plugin-helpers/mandos-client-iprouteadddel: LDLIBS += $(LIBNL3_LIBS)
296
 
 
297
 
# Need to add the GLib and pthread libraries
298
 
dracut-module/password-agent: CFLAGS += $(GLIB_CFLAGS)
299
 
dracut-module/password-agent: LDLIBS += $(GLIB_LIBS) -lpthread
300
 
 
301
 
.PHONY: clean
 
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 $@
 
262
 
 
263
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
 
264
        check run-client run-server install install-html \
 
265
        install-server install-client-nokey install-client uninstall \
 
266
        uninstall-server uninstall-client purge purge-server \
 
267
        purge-client
 
268
 
302
269
clean:
303
270
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
304
271
 
305
 
.PHONY: distclean
306
272
distclean: clean
307
 
.PHONY: mostlyclean
308
273
mostlyclean: clean
309
 
.PHONY: maintainer-clean
310
274
maintainer-clean: clean
311
275
        -rm --force --recursive keydir confdir statedir
312
276
 
313
 
.PHONY: check
314
 
check: all
 
277
check:  all
315
278
        ./mandos --check
316
279
        ./mandos-ctl --check
317
 
        ./mandos-keygen --version
318
 
        ./plugin-runner --version
319
 
        ./plugin-helpers/mandos-client-iprouteadddel --version
320
 
        ./dracut-module/password-agent --test
321
280
 
322
281
# Run the client with a local config and key
323
 
.PHONY: run-client
324
 
run-client: all keydir/seckey.txt keydir/pubkey.txt \
325
 
                        keydir/tls-privkey.pem keydir/tls-pubkey.pem
326
 
        @echo '######################################################'
327
 
        @echo '# The following error messages are harmless and can  #'
328
 
        @echo '#  be safely ignored:                                #'
329
 
        @echo '## From plugin-runner:                               #'
330
 
        @echo '# setgid: Operation not permitted                    #'
331
 
        @echo '# setuid: Operation not permitted                    #'
332
 
        @echo '## From askpass-fifo:                                #'
333
 
        @echo '# mkfifo: Permission denied                          #'
334
 
        @echo '## From mandos-client:                               #'
335
 
        @echo '# Failed to raise privileges: Operation not permi... #'
336
 
        @echo '# Warning: network hook "*" exited with status *     #'
337
 
        @echo '# ioctl SIOCSIFFLAGS +IFF_UP: Operation not permi... #'
338
 
        @echo '# Failed to bring up interface "*": Operation not... #'
339
 
        @echo '#                                                    #'
340
 
        @echo '# (The messages are caused by not running as root,   #'
341
 
        @echo '# but you should NOT run "make run-client" as root   #'
342
 
        @echo '# unless you also unpacked and compiled Mandos as    #'
343
 
        @echo '# root, which is also NOT recommended.)              #'
344
 
        @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 "###################################################################"
345
295
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
346
296
        ./plugin-runner --plugin-dir=plugins.d \
347
297
                --plugin-helper-dir=plugin-helpers \
348
298
                --config-file=plugin-runner.conf \
349
 
                --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 \
350
300
                --env-for=mandos-client:GNOME_KEYRING_CONTROL= \
351
301
                $(CLIENTARGS)
352
302
 
353
303
# Used by run-client
354
 
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
355
305
        install --directory keydir
356
306
        ./mandos-keygen --dir keydir --force
357
 
        if ! [ -e keydir/tls-privkey.pem ]; then \
358
 
                install --mode=u=rw /dev/null keydir/tls-privkey.pem; \
359
 
        fi
360
 
        if ! [ -e keydir/tls-pubkey.pem ]; then \
361
 
                install --mode=u=rw /dev/null keydir/tls-pubkey.pem; \
362
 
        fi
363
307
 
364
308
# Run the server with a local config
365
 
.PHONY: run-server
366
309
run-server: confdir/mandos.conf confdir/clients.conf statedir
367
310
        ./mandos --debug --no-dbus --configdir=confdir \
368
311
                --statedir=statedir $(SERVERARGS)
371
314
confdir/mandos.conf: mandos.conf
372
315
        install --directory confdir
373
316
        install --mode=u=rw,go=r $^ $@
374
 
confdir/clients.conf: clients.conf keydir/seckey.txt keydir/tls-pubkey.pem
 
317
confdir/clients.conf: clients.conf keydir/seckey.txt
375
318
        install --directory confdir
376
319
        install --mode=u=rw $< $@
377
320
# Add a client password
379
322
statedir:
380
323
        install --directory statedir
381
324
 
382
 
.PHONY: install
383
325
install: install-server install-client-nokey
384
326
 
385
 
.PHONY: install-html
386
327
install-html: html
387
328
        install --directory $(htmldir)
388
329
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
389
330
                $(htmldocs)
390
331
 
391
 
.PHONY: install-server
392
332
install-server: doc
393
333
        install --directory $(CONFDIR)
394
334
        if install --directory --mode=u=rwx --owner=$(USER) \
397
337
        elif install --directory --mode=u=rwx $(STATEDIR); then \
398
338
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
399
339
        fi
400
 
        if [ "$(TMPFILES)" != "$(DESTDIR)" \
401
 
                        -a -d "$(TMPFILES)" ]; then \
402
 
                install --mode=u=rw,go=r tmpfiles.d-mandos.conf \
403
 
                        $(TMPFILES)/mandos.conf; \
404
 
        fi
405
 
        if [ "$(SYSUSERS)" != "$(DESTDIR)" \
406
 
                        -a -d "$(SYSUSERS)" ]; then \
407
 
                install --mode=u=rw,go=r sysusers.d-mandos.conf \
408
 
                        $(SYSUSERS)/mandos.conf; \
409
 
        fi
410
340
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
411
341
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
412
342
                mandos-ctl
441
371
        gzip --best --to-stdout intro.8mandos \
442
372
                > $(MANDIR)/man8/intro.8mandos.gz
443
373
 
444
 
.PHONY: install-client-nokey
445
374
install-client-nokey: all doc
446
375
        install --directory $(LIBDIR)/mandos $(CONFDIR)
447
376
        install --directory --mode=u=rwx $(KEYDIR) \
448
377
                $(LIBDIR)/mandos/plugins.d \
449
378
                $(LIBDIR)/mandos/plugin-helpers
450
 
        if [ "$(SYSUSERS)" != "$(DESTDIR)" \
451
 
                        -a -d "$(SYSUSERS)" ]; then \
452
 
                install --mode=u=rw,go=r sysusers.d-mandos.conf \
453
 
                        $(SYSUSERS)/mandos-client.conf; \
454
 
        fi
455
379
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
456
380
                install --mode=u=rwx \
457
 
                        --directory "$(CONFDIR)/plugins.d" \
458
 
                        "$(CONFDIR)/plugin-helpers"; \
 
381
                        --directory "$(CONFDIR)/plugins.d"; \
 
382
                install --directory "$(CONFDIR)/plugin-helpers"; \
459
383
        fi
460
384
        install --mode=u=rwx,go=rx --directory \
461
385
                "$(CONFDIR)/network-hooks.d"
462
386
        install --mode=u=rwx,go=rx \
463
387
                --target-directory=$(LIBDIR)/mandos plugin-runner
464
 
        install --mode=u=rwx,go=rx \
465
 
                --target-directory=$(LIBDIR)/mandos \
466
 
                mandos-to-cryptroot-unlock
467
388
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
468
389
                mandos-keygen
469
390
        install --mode=u=rwx,go=rx \
484
405
        install --mode=u=rwxs,go=rx \
485
406
                --target-directory=$(LIBDIR)/mandos/plugins.d \
486
407
                plugins.d/plymouth
487
 
        install --mode=u=rwx,go=rx \
 
408
        install --mode=u=rwxs,go=rx \
488
409
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
489
410
                plugin-helpers/mandos-client-iprouteadddel
490
411
        install initramfs-tools-hook \
491
412
                $(INITRAMFSTOOLS)/hooks/mandos
492
 
        install --mode=u=rw,go=r initramfs-tools-conf \
493
 
                $(INITRAMFSTOOLS)/conf.d/mandos-conf
494
 
        install --mode=u=rw,go=r initramfs-tools-conf-hook \
495
 
                $(INITRAMFSTOOLS)/conf-hooks.d/zz-mandos
 
413
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
 
414
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
496
415
        install initramfs-tools-script \
497
416
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
498
 
        install initramfs-tools-script-stop \
499
 
                $(INITRAMFSTOOLS)/scripts/local-premount/mandos
500
 
        install --directory $(DRACUTMODULE)
501
 
        install --mode=u=rw,go=r --target-directory=$(DRACUTMODULE) \
502
 
                dracut-module/ask-password-mandos.path \
503
 
                dracut-module/ask-password-mandos.service
504
 
        install --mode=u=rwxs,go=rx \
505
 
                --target-directory=$(DRACUTMODULE) \
506
 
                dracut-module/module-setup.sh \
507
 
                dracut-module/cmdline-mandos.sh \
508
 
                dracut-module/password-agent
509
417
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
510
418
        gzip --best --to-stdout mandos-keygen.8 \
511
419
                > $(MANDIR)/man8/mandos-keygen.8.gz
523
431
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
524
432
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
525
433
                > $(MANDIR)/man8/plymouth.8mandos.gz
526
 
        gzip --best --to-stdout dracut-module/password-agent.8mandos \
527
 
                > $(MANDIR)/man8/password-agent.8mandos.gz
528
434
 
529
 
.PHONY: install-client
530
435
install-client: install-client-nokey
531
436
# Post-installation stuff
532
437
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
533
 
        if command -v update-initramfs >/dev/null; then \
534
 
            update-initramfs -k all -u; \
535
 
        elif command -v dracut >/dev/null; then \
536
 
            for initrd in $(DESTDIR)/boot/initr*-$(LINUXVERSION); do \
537
 
                if [ -w "$$initrd" ]; then \
538
 
                    chmod go-r "$$initrd"; \
539
 
                    dracut --force "$$initrd"; \
540
 
                fi; \
541
 
            done; \
542
 
        fi
 
438
        update-initramfs -k all -u
543
439
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
544
440
 
545
 
.PHONY: uninstall
546
441
uninstall: uninstall-server uninstall-client
547
442
 
548
 
.PHONY: uninstall-server
549
443
uninstall-server:
550
444
        -rm --force $(PREFIX)/sbin/mandos \
551
445
                $(PREFIX)/sbin/mandos-ctl \
558
452
        update-rc.d -f mandos remove
559
453
        -rmdir $(CONFDIR)
560
454
 
561
 
.PHONY: uninstall-client
562
455
uninstall-client:
563
456
# Refuse to uninstall client if /etc/crypttab is explicitly configured
564
457
# to use it.
575
468
                $(INITRAMFSTOOLS)/hooks/mandos \
576
469
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
577
470
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
578
 
                $(INITRAMFSTOOLS)/scripts/local-premount/mandos \
579
 
                $(DRACUTMODULE)/ask-password-mandos.path \
580
 
                $(DRACUTMODULE)/ask-password-mandos.service \
581
 
                $(DRACUTMODULE)/module-setup.sh \
582
 
                $(DRACUTMODULE)/cmdline-mandos.sh \
583
 
                $(DRACUTMODULE)/password-agent \
584
471
                $(MANDIR)/man8/mandos-keygen.8.gz \
585
472
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
586
473
                $(MANDIR)/man8/mandos-client.8mandos.gz
589
476
                $(MANDIR)/man8/splashy.8mandos.gz \
590
477
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
591
478
                $(MANDIR)/man8/plymouth.8mandos.gz \
592
 
                $(MANDIR)/man8/password-agent.8mandos.gz \
593
479
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
594
 
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR) $(DRACUTMODULE)
595
 
        if command -v update-initramfs >/dev/null; then \
596
 
            update-initramfs -k all -u; \
597
 
        elif command -v dracut >/dev/null; then \
598
 
            for initrd in $(DESTDIR)/boot/initr*-$(LINUXVERSION); do \
599
 
                test -w "$$initrd" && dracut --force "$$initrd"; \
600
 
            done; \
601
 
        fi
 
480
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
 
481
        update-initramfs -k all -u
602
482
 
603
 
.PHONY: purge
604
483
purge: purge-server purge-client
605
484
 
606
 
.PHONY: purge-server
607
485
purge-server: uninstall-server
608
486
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
609
487
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
614
492
                $(DESTDIR)/var/run/mandos.pid
615
493
        -rmdir $(CONFDIR)
616
494
 
617
 
.PHONY: purge-client
618
495
purge-client: uninstall-client
619
 
        -shred --remove $(KEYDIR)/seckey.txt $(KEYDIR)/tls-privkey.pem
 
496
        -shred --remove $(KEYDIR)/seckey.txt
620
497
        -rm --force $(CONFDIR)/plugin-runner.conf \
621
 
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt \
622
 
                $(KEYDIR)/tls-pubkey.txt $(KEYDIR)/tls-privkey.txt
 
498
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt
623
499
        -rmdir $(KEYDIR) $(CONFDIR)/plugins.d $(CONFDIR)