/mandos/release

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

« back to all changes in this revision

Viewing changes to Makefile

* init.d-mandos (Required-Start, Required-Stop): Bug fix: Added
                 "$syslog", thanks to Petter Reinholdtsen
                 <pere@hungry.com> (Debian bug #546928).

* initramfs-tools-script: Removed erroneous comment.

* plugins.d/askpass-fifo.c: Removed TEMP_FAILURE_RETRY since it is
                            not needed.

* plugins.d/mandos-client.c (main): Bug fix: Initialize
                                    "old_sigterm_action".

* plugins.d/splashy.c (main): Bug fix: really check return value from
                              "sigaddset".  Fix some warnings on
                              64-bit systems.

* plugins.d/usplash.c (termination_handler, main): Save received
                                                   signal and
                                                   re-raise it on
                                                   exit.
  (usplash_write): Do not close FIFO, instead, take an additional file
                   descriptor pointer to it and open only when needed
                   (all callers changed).  Abort immediately on EINTR.
                   Bug fix:  Add NUL byte on single-word commands.
                   Ignore "interrupted_by_signal".
  (makeprompt, find_usplash): New; broken out from "main()".
  (find_usplash): Bug fix: close /proc/<pid>/cmdline FD on error.
  (main): Reorganized to jump to a new "failure" label on any error.
          Bug fix: check return values from sigaddset.
          New variable "usplash_accessed" to flag if usplash(8) needs
          to be killed and restarted.  Removed the "an_error_occured"
          variable.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
5
5
        -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings \
6
6
        -Wconversion -Wstrict-prototypes -Wold-style-definition \
7
7
        -Wpacked -Wnested-externs -Winline -Wvolatile-register-var
8
 
#       -Wunreachable-code
 
8
#       -Wunreachable-code 
9
9
#DEBUG=-ggdb3
10
10
# For info about _FORTIFY_SOURCE, see
11
 
# <http://www.kernel.org/doc/man-pages/online/pages/man7/feature_test_macros.7.html>
12
 
# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
13
 
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
14
 
LINK_FORTIFY_LD=-z relro -z now
15
 
LINK_FORTIFY=
16
 
 
17
 
# If BROKEN_PIE is set, do not build with -pie
18
 
ifndef BROKEN_PIE
19
 
FORTIFY += -fPIE
20
 
LINK_FORTIFY += -pie
21
 
endif
 
11
# <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>
 
12
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC -fPIE
 
13
LINK_FORTIFY_LD=-z relro -fPIE
 
14
LINK_FORTIFY=-pie
22
15
#COVERAGE=--coverage
23
16
OPTIMIZE=-Os
24
17
LANGUAGE=-std=gnu99
25
18
htmldir=man
26
 
version=1.6.2
 
19
version=1.0.11
27
20
SED=sed
28
21
 
29
 
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
30
 
GROUP=$(firstword $(subst :, ,$(shell getent group _mandos || getent group nobody || echo 65534)))
31
 
 
32
22
## Use these settings for a traditional /usr/local install
33
23
# PREFIX=$(DESTDIR)/usr/local
34
24
# CONFDIR=$(DESTDIR)/etc/mandos
35
25
# KEYDIR=$(DESTDIR)/etc/mandos/keys
36
26
# MANDIR=$(PREFIX)/man
37
27
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
38
 
# STATEDIR=$(DESTDIR)/var/lib/mandos
39
 
# LIBDIR=$(PREFIX)/lib
40
28
##
41
29
 
42
30
## These settings are for a package-type install
45
33
KEYDIR=$(DESTDIR)/etc/keys/mandos
46
34
MANDIR=$(PREFIX)/share/man
47
35
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
48
 
STATEDIR=$(DESTDIR)/var/lib/mandos
49
 
LIBDIR=$(shell \
50
 
        for d in \
51
 
        "/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null`" \
52
 
        "`rpm --eval='%{_libdir}' 2>/dev/null`" /usr/lib; do \
53
 
                if [ -d "$$d" -a "$$d" = "$${d%/}" ]; then \
54
 
                        echo "$(DESTDIR)$$d"; \
55
 
                        break; \
56
 
                fi; \
57
 
        done)
58
36
##
59
37
 
60
 
SYSTEMD=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
61
 
 
62
38
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
63
39
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
64
40
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
68
44
        getconf LFS_LDFLAGS)
69
45
 
70
46
# Do not change these two
71
 
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
 
47
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
72
48
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
73
49
        -DVERSION='"$(version)"'
74
 
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
50
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
75
51
 
76
52
# Commands to format a DocBook <refentry> document into a manual page
77
 
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
 
53
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
78
54
        --param man.charmap.use.subset          0 \
79
55
        --param make.year.ranges                1 \
80
56
        --param make.single.year.ranges         1 \
81
57
        --param man.output.quietly              1 \
82
58
        --param man.authors.section.enabled     0 \
83
 
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
 
59
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
84
60
        $(notdir $<); \
85
 
        $(MANPOST) $(notdir $@);\
86
 
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
87
 
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
88
 
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
89
 
        fi >/dev/null)
 
61
        $(MANPOST) $(notdir $@)
90
62
# DocBook-to-man post-processing to fix a '\n' escape bug
91
63
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
92
64
 
93
 
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
 
65
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
94
66
        --param make.year.ranges                1 \
95
67
        --param make.single.year.ranges         1 \
96
68
        --param man.output.quietly              1 \
98
70
        --param citerefentry.link               1 \
99
71
        --output $@ \
100
72
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
101
 
        $<; $(HTMLPOST) $@)
 
73
        $<; $(HTMLPOST) $@
102
74
# Fix citerefentry links
103
75
HTMLPOST=$(SED) --in-place \
104
76
        --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
105
77
 
106
78
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
107
 
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
108
 
        plugins.d/plymouth
 
79
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
109
80
CPROGS=plugin-runner $(PLUGINS)
110
 
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
111
 
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
112
 
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
 
81
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
 
82
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
113
83
        plugins.d/mandos-client.8mandos \
114
 
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
115
 
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
116
 
        plugins.d/plymouth.8mandos intro.8mandos
 
84
        plugins.d/password-prompt.8mandos mandos.conf.5 \
 
85
        plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
 
86
        plugins.d/askpass-fifo.8mandos mandos-clients.conf.5
117
87
 
118
88
htmldocs=$(addsuffix .xhtml,$(DOCS))
119
89
 
140
110
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
141
111
        $(DOCBOOKTOHTML)
142
112
 
143
 
intro.8mandos: intro.xml common.ent legalnotice.xml
144
 
        $(DOCBOOKTOMAN)
145
 
intro.8mandos.xhtml: intro.xml common.ent legalnotice.xml
146
 
        $(DOCBOOKTOHTML)
147
 
 
148
113
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
149
114
                legalnotice.xml
150
115
        $(DOCBOOKTOMAN)
159
124
                 legalnotice.xml
160
125
        $(DOCBOOKTOHTML)
161
126
 
162
 
mandos-monitor.8: mandos-monitor.xml common.ent overview.xml \
163
 
                legalnotice.xml
164
 
        $(DOCBOOKTOMAN)
165
 
mandos-monitor.8.xhtml: mandos-monitor.xml common.ent overview.xml \
166
 
                 legalnotice.xml
167
 
        $(DOCBOOKTOHTML)
168
 
 
169
 
mandos-ctl.8: mandos-ctl.xml common.ent overview.xml \
170
 
                legalnotice.xml
171
 
        $(DOCBOOKTOMAN)
172
 
mandos-ctl.8.xhtml: mandos-ctl.xml common.ent overview.xml \
173
 
                 legalnotice.xml
174
 
        $(DOCBOOKTOHTML)
175
 
 
176
127
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
177
128
                legalnotice.xml
178
129
        $(DOCBOOKTOMAN)
200
151
 
201
152
# Update all these files with version number $(version)
202
153
common.ent: Makefile
203
 
        $(strip $(SED) --in-place \
 
154
        $(SED) --in-place \
204
155
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
205
 
                $@)
 
156
                $@
206
157
 
207
158
mandos: Makefile
208
 
        $(strip $(SED) --in-place \
 
159
        $(SED) --in-place \
209
160
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
210
 
                $@)
 
161
                $@
211
162
 
212
163
mandos-keygen: Makefile
213
 
        $(strip $(SED) --in-place \
 
164
        $(SED) --in-place \
214
165
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
215
 
                $@)
 
166
                $@
216
167
 
217
168
mandos-ctl: Makefile
218
 
        $(strip $(SED) --in-place \
219
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
220
 
                $@)
221
 
 
222
 
mandos-monitor: Makefile
223
 
        $(strip $(SED) --in-place \
224
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
225
 
                $@)
 
169
        $(SED) --in-place \
 
170
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
171
                $@
226
172
 
227
173
mandos.lsm: Makefile
228
 
        $(strip $(SED) --in-place \
 
174
        $(SED) --in-place \
229
175
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
230
 
                $@)
231
 
        $(strip $(SED) --in-place \
 
176
                $@
 
177
        $(SED) --in-place \
232
178
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
233
 
                $@)
234
 
        $(strip $(SED) --in-place \
 
179
                $@
 
180
        $(SED) --in-place \
235
181
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
236
 
                $@)
 
182
                $@
237
183
 
238
 
plugins.d/mandos-client: plugins.d/mandos-client.c
239
 
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
240
 
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
 
184
plugins.d/mandos-client: plugins.d/mandos-client.o
 
185
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
 
186
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
241
187
 
242
188
.PHONY : all doc html clean distclean run-client run-server install \
243
189
        install-server install-client uninstall uninstall-server \
249
195
distclean: clean
250
196
mostlyclean: clean
251
197
maintainer-clean: clean
252
 
        -rm --force --recursive keydir confdir statedir
 
198
        -rm --force --recursive keydir confdir
253
199
 
254
200
check:  all
255
201
        ./mandos --check
256
 
        ./mandos-ctl --check
257
202
 
258
203
# Run the client with a local config and key
259
204
run-client: all keydir/seckey.txt keydir/pubkey.txt
260
 
        @echo "###################################################################"
261
 
        @echo "# The following error messages are harmless and can be safely     #"
262
 
        @echo "# ignored.  The messages are caused by not running as root, but   #"
263
 
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
264
 
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
265
 
        @echo "# From plugin-runner: setuid: Operation not permitted             #"
266
 
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
267
 
        @echo "# From mandos-client: setuid: Operation not permitted             #"
268
 
        @echo "#                     seteuid: Operation not permitted            #"
269
 
        @echo "#                     klogctl: Operation not permitted            #"
270
 
        @echo "###################################################################"
271
205
        ./plugin-runner --plugin-dir=plugins.d \
272
206
                --config-file=plugin-runner.conf \
273
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
 
207
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
274
208
                $(CLIENTARGS)
275
209
 
276
210
# Used by run-client
279
213
        ./mandos-keygen --dir keydir --force
280
214
 
281
215
# Run the server with a local config
282
 
run-server: confdir/mandos.conf confdir/clients.conf statedir
283
 
        ./mandos --debug --no-dbus --configdir=confdir \
284
 
                --statedir=statedir $(SERVERARGS)
 
216
run-server: confdir/mandos.conf confdir/clients.conf
 
217
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
285
218
 
286
219
# Used by run-server
287
220
confdir/mandos.conf: mandos.conf
292
225
        install --mode=u=rw $< $@
293
226
# Add a client password
294
227
        ./mandos-keygen --dir keydir --password >> $@
295
 
statedir:
296
 
        install --directory statedir
297
228
 
298
229
install: install-server install-client-nokey
299
230
 
304
235
 
305
236
install-server: doc
306
237
        install --directory $(CONFDIR)
307
 
        install --directory --mode=u=rwx --owner=$(USER) \
308
 
                --group=$(GROUP) $(STATEDIR)
309
238
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
310
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
311
 
                mandos-ctl
312
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
313
 
                mandos-monitor
314
239
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
315
240
                mandos.conf
316
241
        install --mode=u=rw --target-directory=$(CONFDIR) \
317
242
                clients.conf
318
 
        install --mode=u=rw,go=r dbus-mandos.conf \
319
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
320
243
        install --mode=u=rwx,go=rx init.d-mandos \
321
244
                $(DESTDIR)/etc/init.d/mandos
322
 
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
323
 
                install --mode=u=rw,go=r mandos.service $(SYSTEMD); \
324
 
        fi
325
245
        install --mode=u=rw,go=r default-mandos \
326
246
                $(DESTDIR)/etc/default/mandos
327
247
        if [ -z $(DESTDIR) ]; then \
329
249
        fi
330
250
        gzip --best --to-stdout mandos.8 \
331
251
                > $(MANDIR)/man8/mandos.8.gz
332
 
        gzip --best --to-stdout mandos-monitor.8 \
333
 
                > $(MANDIR)/man8/mandos-monitor.8.gz
334
 
        gzip --best --to-stdout mandos-ctl.8 \
335
 
                > $(MANDIR)/man8/mandos-ctl.8.gz
336
252
        gzip --best --to-stdout mandos.conf.5 \
337
253
                > $(MANDIR)/man5/mandos.conf.5.gz
338
254
        gzip --best --to-stdout mandos-clients.conf.5 \
339
255
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
340
 
        gzip --best --to-stdout intro.8mandos \
341
 
                > $(MANDIR)/man8/intro.8mandos.gz
342
256
 
343
257
install-client-nokey: all doc
344
 
        install --directory $(LIBDIR)/mandos $(CONFDIR)
 
258
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
345
259
        install --directory --mode=u=rwx $(KEYDIR) \
346
 
                $(LIBDIR)/mandos/plugins.d
347
 
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
 
260
                $(PREFIX)/lib/mandos/plugins.d
 
261
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
348
262
                install --mode=u=rwx \
349
263
                        --directory "$(CONFDIR)/plugins.d"; \
350
264
        fi
351
 
        install --mode=u=rwx,go=rx --directory \
352
 
                "$(CONFDIR)/network-hooks.d"
353
265
        install --mode=u=rwx,go=rx \
354
 
                --target-directory=$(LIBDIR)/mandos plugin-runner
 
266
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
355
267
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
356
268
                mandos-keygen
357
269
        install --mode=u=rwx,go=rx \
358
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
270
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
359
271
                plugins.d/password-prompt
360
272
        install --mode=u=rwxs,go=rx \
361
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
273
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
362
274
                plugins.d/mandos-client
363
275
        install --mode=u=rwxs,go=rx \
364
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
276
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
365
277
                plugins.d/usplash
366
278
        install --mode=u=rwxs,go=rx \
367
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
279
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
368
280
                plugins.d/splashy
369
281
        install --mode=u=rwxs,go=rx \
370
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
282
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
371
283
                plugins.d/askpass-fifo
372
 
        install --mode=u=rwxs,go=rx \
373
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
374
 
                plugins.d/plymouth
375
284
        install initramfs-tools-hook \
376
285
                $(INITRAMFSTOOLS)/hooks/mandos
377
286
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
383
292
                > $(MANDIR)/man8/mandos-keygen.8.gz
384
293
        gzip --best --to-stdout plugin-runner.8mandos \
385
294
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
295
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
 
296
                > $(MANDIR)/man8/password-prompt.8mandos.gz
386
297
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
387
298
                > $(MANDIR)/man8/mandos-client.8mandos.gz
388
 
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
389
 
                > $(MANDIR)/man8/password-prompt.8mandos.gz
390
299
        gzip --best --to-stdout plugins.d/usplash.8mandos \
391
300
                > $(MANDIR)/man8/usplash.8mandos.gz
392
301
        gzip --best --to-stdout plugins.d/splashy.8mandos \
393
302
                > $(MANDIR)/man8/splashy.8mandos.gz
394
303
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
395
304
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
396
 
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
397
 
                > $(MANDIR)/man8/plymouth.8mandos.gz
398
305
 
399
306
install-client: install-client-nokey
400
307
# Post-installation stuff
406
313
 
407
314
uninstall-server:
408
315
        -rm --force $(PREFIX)/sbin/mandos \
409
 
                $(PREFIX)/sbin/mandos-ctl \
410
 
                $(PREFIX)/sbin/mandos-monitor \
411
316
                $(MANDIR)/man8/mandos.8.gz \
412
 
                $(MANDIR)/man8/mandos-monitor.8.gz \
413
 
                $(MANDIR)/man8/mandos-ctl.8.gz \
414
317
                $(MANDIR)/man5/mandos.conf.5.gz \
415
318
                $(MANDIR)/man5/mandos-clients.conf.5.gz
416
319
        update-rc.d -f mandos remove
422
325
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
423
326
                $(DESTDIR)/etc/crypttab
424
327
        -rm --force $(PREFIX)/sbin/mandos-keygen \
425
 
                $(LIBDIR)/mandos/plugin-runner \
426
 
                $(LIBDIR)/mandos/plugins.d/password-prompt \
427
 
                $(LIBDIR)/mandos/plugins.d/mandos-client \
428
 
                $(LIBDIR)/mandos/plugins.d/usplash \
429
 
                $(LIBDIR)/mandos/plugins.d/splashy \
430
 
                $(LIBDIR)/mandos/plugins.d/askpass-fifo \
431
 
                $(LIBDIR)/mandos/plugins.d/plymouth \
 
328
                $(PREFIX)/lib/mandos/plugin-runner \
 
329
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
 
330
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
 
331
                $(PREFIX)/lib/mandos/plugins.d/usplash \
 
332
                $(PREFIX)/lib/mandos/plugins.d/splashy \
 
333
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
432
334
                $(INITRAMFSTOOLS)/hooks/mandos \
433
335
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
434
336
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
337
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
435
338
                $(MANDIR)/man8/mandos-keygen.8.gz \
436
 
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
437
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
438
339
                $(MANDIR)/man8/password-prompt.8mandos.gz \
439
340
                $(MANDIR)/man8/usplash.8mandos.gz \
440
341
                $(MANDIR)/man8/splashy.8mandos.gz \
441
342
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
442
 
                $(MANDIR)/man8/plymouth.8mandos.gz \
443
 
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
444
 
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
 
343
                $(MANDIR)/man8/mandos-client.8mandos.gz
 
344
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
 
345
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
445
346
        update-initramfs -k all -u
446
347
 
447
348
purge: purge-server purge-client
448
349
 
449
350
purge-server: uninstall-server
450
351
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
451
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
452
352
                $(DESTDIR)/etc/default/mandos \
453
353
                $(DESTDIR)/etc/init.d/mandos \
454
 
                $(SYSTEMD)/mandos.service \
455
 
                $(DESTDIR)/run/mandos.pid \
456
354
                $(DESTDIR)/var/run/mandos.pid
457
355
        -rmdir $(CONFDIR)
458
356