/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 -Wformat=2 -Winit-self -Wmissing-include-dirs \
2
 
        -Wswitch-default -Wswitch-enum -Wunused-parameter \
3
 
        -Wstrict-aliasing=1 -Wextra -Wfloat-equal -Wundef -Wshadow \
 
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 \
4
6
        -Wunsafe-loop-optimizations -Wpointer-arith \
5
7
        -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings \
6
 
        -Wconversion -Wstrict-prototypes -Wold-style-definition \
7
 
        -Wpacked -Wnested-externs -Winline -Wvolatile-register-var
8
 
#       -Wunreachable-code 
 
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
9
13
#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>
 
14
# For info about _FORTIFY_SOURCE, see feature_test_macros(7)
12
15
# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
13
16
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
 
17
# <https://developerblog.redhat.com/2014/10/16/gcc-undefined-behavior-sanitizer-ubsan/>
 
18
ALL_SANITIZE_OPTIONS:=-fsanitize=address -fsanitize=undefined \
 
19
        -fsanitize=shift -fsanitize=integer-divide-by-zero \
 
20
        -fsanitize=unreachable -fsanitize=vla-bound -fsanitize=null \
 
21
        -fsanitize=return -fsanitize=signed-integer-overflow \
 
22
        -fsanitize=bounds -fsanitize=alignment \
 
23
        -fsanitize=object-size -fsanitize=float-divide-by-zero \
 
24
        -fsanitize=float-cast-overflow -fsanitize=nonnull-attribute \
 
25
        -fsanitize=returns-nonnull-attribute -fsanitize=bool \
 
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)))
14
31
LINK_FORTIFY_LD=-z relro -z now
15
32
LINK_FORTIFY=
16
33
 
17
34
# If BROKEN_PIE is set, do not build with -pie
18
35
ifndef BROKEN_PIE
19
36
FORTIFY += -fPIE
20
 
LINK_FORTIFY_LD += -fPIE
21
37
LINK_FORTIFY += -pie
22
38
endif
23
39
#COVERAGE=--coverage
24
 
OPTIMIZE=-Os
25
 
LANGUAGE=-std=gnu99
 
40
OPTIMIZE=-Os -fno-strict-aliasing
 
41
LANGUAGE=-std=gnu11
26
42
htmldir=man
27
 
version=1.0.14
 
43
version=1.7.6
28
44
SED=sed
29
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)))
 
48
 
30
49
## Use these settings for a traditional /usr/local install
31
50
# PREFIX=$(DESTDIR)/usr/local
32
51
# CONFDIR=$(DESTDIR)/etc/mandos
33
52
# KEYDIR=$(DESTDIR)/etc/mandos/keys
34
53
# MANDIR=$(PREFIX)/man
35
54
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
 
55
# STATEDIR=$(DESTDIR)/var/lib/mandos
 
56
# LIBDIR=$(PREFIX)/lib
36
57
##
37
58
 
38
59
## These settings are for a package-type install
41
62
KEYDIR=$(DESTDIR)/etc/keys/mandos
42
63
MANDIR=$(PREFIX)/share/man
43
64
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
 
65
STATEDIR=$(DESTDIR)/var/lib/mandos
 
66
LIBDIR=$(shell \
 
67
        for d in \
 
68
        "/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null`" \
 
69
        "`rpm --eval='%{_libdir}' 2>/dev/null`" /usr/lib; do \
 
70
                if [ -d "$$d" -a "$$d" = "$${d%/}" ]; then \
 
71
                        echo "$(DESTDIR)$$d"; \
 
72
                        break; \
 
73
                fi; \
 
74
        done)
44
75
##
45
76
 
 
77
SYSTEMD=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
 
78
 
46
79
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
47
80
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
48
81
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
50
83
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
51
84
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
52
85
        getconf LFS_LDFLAGS)
 
86
LIBNL3_CFLAGS=$(shell pkg-config --cflags-only-I libnl-route-3.0)
 
87
LIBNL3_LIBS=$(shell pkg-config --libs libnl-route-3.0)
53
88
 
54
89
# Do not change these two
55
 
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
56
 
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
57
 
        -DVERSION='"$(version)"'
58
 
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(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))
59
94
 
60
95
# Commands to format a DocBook <refentry> document into a manual page
61
96
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
64
99
        --param make.single.year.ranges         1 \
65
100
        --param man.output.quietly              1 \
66
101
        --param man.authors.section.enabled     0 \
67
 
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
 
102
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
68
103
        $(notdir $<); \
69
 
        $(MANPOST) $(notdir $@))
70
 
# DocBook-to-man post-processing to fix a '\n' escape bug
71
 
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
 
104
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
 
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)
72
108
 
73
109
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
74
110
        --param make.year.ranges                1 \
84
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'
85
121
 
86
122
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
87
 
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
88
 
CPROGS=plugin-runner $(PLUGINS)
89
 
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
90
 
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
 
123
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
 
124
        plugins.d/plymouth
 
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 \
 
129
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
91
130
        plugins.d/mandos-client.8mandos \
92
 
        plugins.d/password-prompt.8mandos mandos.conf.5 \
93
 
        plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
94
 
        plugins.d/askpass-fifo.8mandos mandos-clients.conf.5
 
131
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
 
132
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
 
133
        plugins.d/plymouth.8mandos intro.8mandos
95
134
 
96
135
htmldocs=$(addsuffix .xhtml,$(DOCS))
97
136
 
118
157
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
119
158
        $(DOCBOOKTOHTML)
120
159
 
 
160
intro.8mandos: intro.xml common.ent legalnotice.xml
 
161
        $(DOCBOOKTOMAN)
 
162
intro.8mandos.xhtml: intro.xml common.ent legalnotice.xml
 
163
        $(DOCBOOKTOHTML)
 
164
 
121
165
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
122
166
                legalnotice.xml
123
167
        $(DOCBOOKTOMAN)
132
176
                 legalnotice.xml
133
177
        $(DOCBOOKTOHTML)
134
178
 
 
179
mandos-monitor.8: mandos-monitor.xml common.ent overview.xml \
 
180
                legalnotice.xml
 
181
        $(DOCBOOKTOMAN)
 
182
mandos-monitor.8.xhtml: mandos-monitor.xml common.ent overview.xml \
 
183
                 legalnotice.xml
 
184
        $(DOCBOOKTOHTML)
 
185
 
 
186
mandos-ctl.8: mandos-ctl.xml common.ent overview.xml \
 
187
                legalnotice.xml
 
188
        $(DOCBOOKTOMAN)
 
189
mandos-ctl.8.xhtml: mandos-ctl.xml common.ent overview.xml \
 
190
                 legalnotice.xml
 
191
        $(DOCBOOKTOHTML)
 
192
 
135
193
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
136
194
                legalnotice.xml
137
195
        $(DOCBOOKTOMAN)
178
236
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
179
237
                $@)
180
238
 
 
239
mandos-monitor: Makefile
 
240
        $(strip $(SED) --in-place \
 
241
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
242
                $@)
 
243
 
181
244
mandos.lsm: Makefile
182
245
        $(strip $(SED) --in-place \
183
246
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
190
253
                $@)
191
254
 
192
255
plugins.d/mandos-client: plugins.d/mandos-client.c
193
 
        $(LINK.c) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) $(strip\
194
 
                ) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
195
 
 
196
 
.PHONY : all doc html clean distclean run-client run-server install \
197
 
        install-server install-client uninstall uninstall-server \
198
 
        uninstall-client purge purge-server purge-client
 
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
199
268
 
200
269
clean:
201
270
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
203
272
distclean: clean
204
273
mostlyclean: clean
205
274
maintainer-clean: clean
206
 
        -rm --force --recursive keydir confdir
 
275
        -rm --force --recursive keydir confdir statedir
207
276
 
208
277
check:  all
209
278
        ./mandos --check
 
279
        ./mandos-ctl --check
210
280
 
211
281
# Run the client with a local config and key
212
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 "###################################################################"
 
295
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
213
296
        ./plugin-runner --plugin-dir=plugins.d \
 
297
                --plugin-helper-dir=plugin-helpers \
214
298
                --config-file=plugin-runner.conf \
215
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
 
299
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
 
300
                --env-for=mandos-client:GNOME_KEYRING_CONTROL= \
216
301
                $(CLIENTARGS)
217
302
 
218
303
# Used by run-client
221
306
        ./mandos-keygen --dir keydir --force
222
307
 
223
308
# Run the server with a local config
224
 
run-server: confdir/mandos.conf confdir/clients.conf
225
 
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
 
309
run-server: confdir/mandos.conf confdir/clients.conf statedir
 
310
        ./mandos --debug --no-dbus --configdir=confdir \
 
311
                --statedir=statedir $(SERVERARGS)
226
312
 
227
313
# Used by run-server
228
314
confdir/mandos.conf: mandos.conf
232
318
        install --directory confdir
233
319
        install --mode=u=rw $< $@
234
320
# Add a client password
235
 
        ./mandos-keygen --dir keydir --password >> $@
 
321
        ./mandos-keygen --dir keydir --password --no-ssh >> $@
 
322
statedir:
 
323
        install --directory statedir
236
324
 
237
325
install: install-server install-client-nokey
238
326
 
243
331
 
244
332
install-server: doc
245
333
        install --directory $(CONFDIR)
 
334
        if install --directory --mode=u=rwx --owner=$(USER) \
 
335
                --group=$(GROUP) $(STATEDIR); then \
 
336
                :; \
 
337
        elif install --directory --mode=u=rwx $(STATEDIR); then \
 
338
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
 
339
        fi
246
340
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
 
341
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
 
342
                mandos-ctl
 
343
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
 
344
                mandos-monitor
247
345
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
248
346
                mandos.conf
249
347
        install --mode=u=rw --target-directory=$(CONFDIR) \
250
348
                clients.conf
 
349
        install --mode=u=rw,go=r dbus-mandos.conf \
 
350
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
251
351
        install --mode=u=rwx,go=rx init.d-mandos \
252
352
                $(DESTDIR)/etc/init.d/mandos
 
353
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
 
354
                install --mode=u=rw,go=r mandos.service $(SYSTEMD); \
 
355
        fi
253
356
        install --mode=u=rw,go=r default-mandos \
254
357
                $(DESTDIR)/etc/default/mandos
255
358
        if [ -z $(DESTDIR) ]; then \
257
360
        fi
258
361
        gzip --best --to-stdout mandos.8 \
259
362
                > $(MANDIR)/man8/mandos.8.gz
 
363
        gzip --best --to-stdout mandos-monitor.8 \
 
364
                > $(MANDIR)/man8/mandos-monitor.8.gz
 
365
        gzip --best --to-stdout mandos-ctl.8 \
 
366
                > $(MANDIR)/man8/mandos-ctl.8.gz
260
367
        gzip --best --to-stdout mandos.conf.5 \
261
368
                > $(MANDIR)/man5/mandos.conf.5.gz
262
369
        gzip --best --to-stdout mandos-clients.conf.5 \
263
370
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
 
371
        gzip --best --to-stdout intro.8mandos \
 
372
                > $(MANDIR)/man8/intro.8mandos.gz
264
373
 
265
374
install-client-nokey: all doc
266
 
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
 
375
        install --directory $(LIBDIR)/mandos $(CONFDIR)
267
376
        install --directory --mode=u=rwx $(KEYDIR) \
268
 
                $(PREFIX)/lib/mandos/plugins.d
269
 
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
 
377
                $(LIBDIR)/mandos/plugins.d \
 
378
                $(LIBDIR)/mandos/plugin-helpers
 
379
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
270
380
                install --mode=u=rwx \
271
381
                        --directory "$(CONFDIR)/plugins.d"; \
 
382
                install --directory "$(CONFDIR)/plugin-helpers"; \
272
383
        fi
 
384
        install --mode=u=rwx,go=rx --directory \
 
385
                "$(CONFDIR)/network-hooks.d"
273
386
        install --mode=u=rwx,go=rx \
274
 
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
 
387
                --target-directory=$(LIBDIR)/mandos plugin-runner
275
388
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
276
389
                mandos-keygen
277
390
        install --mode=u=rwx,go=rx \
278
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
391
                --target-directory=$(LIBDIR)/mandos/plugins.d \
279
392
                plugins.d/password-prompt
280
393
        install --mode=u=rwxs,go=rx \
281
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
394
                --target-directory=$(LIBDIR)/mandos/plugins.d \
282
395
                plugins.d/mandos-client
283
396
        install --mode=u=rwxs,go=rx \
284
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
397
                --target-directory=$(LIBDIR)/mandos/plugins.d \
285
398
                plugins.d/usplash
286
399
        install --mode=u=rwxs,go=rx \
287
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
400
                --target-directory=$(LIBDIR)/mandos/plugins.d \
288
401
                plugins.d/splashy
289
402
        install --mode=u=rwxs,go=rx \
290
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
403
                --target-directory=$(LIBDIR)/mandos/plugins.d \
291
404
                plugins.d/askpass-fifo
 
405
        install --mode=u=rwxs,go=rx \
 
406
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
407
                plugins.d/plymouth
 
408
        install --mode=u=rwxs,go=rx \
 
409
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
 
410
                plugin-helpers/mandos-client-iprouteadddel
292
411
        install initramfs-tools-hook \
293
412
                $(INITRAMFSTOOLS)/hooks/mandos
294
413
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
300
419
                > $(MANDIR)/man8/mandos-keygen.8.gz
301
420
        gzip --best --to-stdout plugin-runner.8mandos \
302
421
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
422
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
 
423
                > $(MANDIR)/man8/mandos-client.8mandos.gz
303
424
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
304
425
                > $(MANDIR)/man8/password-prompt.8mandos.gz
305
 
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
306
 
                > $(MANDIR)/man8/mandos-client.8mandos.gz
307
426
        gzip --best --to-stdout plugins.d/usplash.8mandos \
308
427
                > $(MANDIR)/man8/usplash.8mandos.gz
309
428
        gzip --best --to-stdout plugins.d/splashy.8mandos \
310
429
                > $(MANDIR)/man8/splashy.8mandos.gz
311
430
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
312
431
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
 
432
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
 
433
                > $(MANDIR)/man8/plymouth.8mandos.gz
313
434
 
314
435
install-client: install-client-nokey
315
436
# Post-installation stuff
321
442
 
322
443
uninstall-server:
323
444
        -rm --force $(PREFIX)/sbin/mandos \
 
445
                $(PREFIX)/sbin/mandos-ctl \
 
446
                $(PREFIX)/sbin/mandos-monitor \
324
447
                $(MANDIR)/man8/mandos.8.gz \
 
448
                $(MANDIR)/man8/mandos-monitor.8.gz \
 
449
                $(MANDIR)/man8/mandos-ctl.8.gz \
325
450
                $(MANDIR)/man5/mandos.conf.5.gz \
326
451
                $(MANDIR)/man5/mandos-clients.conf.5.gz
327
452
        update-rc.d -f mandos remove
333
458
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
334
459
                $(DESTDIR)/etc/crypttab
335
460
        -rm --force $(PREFIX)/sbin/mandos-keygen \
336
 
                $(PREFIX)/lib/mandos/plugin-runner \
337
 
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
338
 
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
339
 
                $(PREFIX)/lib/mandos/plugins.d/usplash \
340
 
                $(PREFIX)/lib/mandos/plugins.d/splashy \
341
 
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
 
461
                $(LIBDIR)/mandos/plugin-runner \
 
462
                $(LIBDIR)/mandos/plugins.d/password-prompt \
 
463
                $(LIBDIR)/mandos/plugins.d/mandos-client \
 
464
                $(LIBDIR)/mandos/plugins.d/usplash \
 
465
                $(LIBDIR)/mandos/plugins.d/splashy \
 
466
                $(LIBDIR)/mandos/plugins.d/askpass-fifo \
 
467
                $(LIBDIR)/mandos/plugins.d/plymouth \
342
468
                $(INITRAMFSTOOLS)/hooks/mandos \
343
469
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
344
470
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
471
                $(MANDIR)/man8/mandos-keygen.8.gz \
345
472
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
346
 
                $(MANDIR)/man8/mandos-keygen.8.gz \
 
473
                $(MANDIR)/man8/mandos-client.8mandos.gz
347
474
                $(MANDIR)/man8/password-prompt.8mandos.gz \
348
475
                $(MANDIR)/man8/usplash.8mandos.gz \
349
476
                $(MANDIR)/man8/splashy.8mandos.gz \
350
477
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
351
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
352
 
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
353
 
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
 
478
                $(MANDIR)/man8/plymouth.8mandos.gz \
 
479
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
 
480
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
354
481
        update-initramfs -k all -u
355
482
 
356
483
purge: purge-server purge-client
357
484
 
358
485
purge-server: uninstall-server
359
486
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
 
487
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
360
488
                $(DESTDIR)/etc/default/mandos \
361
489
                $(DESTDIR)/etc/init.d/mandos \
 
490
                $(SYSTEMD)/mandos.service \
 
491
                $(DESTDIR)/run/mandos.pid \
362
492
                $(DESTDIR)/var/run/mandos.pid
363
493
        -rmdir $(CONFDIR)
364
494