/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: 2014-03-10 06:34:36 UTC
  • Revision ID: teddy@recompile.se-20140310063436-zksdghqvv6k1pbyg
Do not add a new server to server list if clock_gettime() fails

* plugins.d/mandos-client.c (add_server): Set server.last_seen before
                                          adding new server, in case
                                          clock_gettime() fails.

Show diffs side-by-side

added added

removed removed

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