/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

  • Committer: Teddy Hogeborn
  • Date: 2019-07-14 23:39:53 UTC
  • mto: This revision was merged to the branch mainline in revision 384.
  • Revision ID: teddy@recompile.se-20190714233953-1zmsd3o062xloazt
Server bug fix: Allow restarts when using port= option

If the Mandos server is configured to use a specific TCP port to
listen to (by using the port= option in mandos.conf or the command
line --port option), that port becomes unusable for a time when the
Mandos server is restarted, making restarts fail.  Avoid this by, if a
port number is specified, using SO_REUSEADDR when binding the
listening TCP socket to a port number.

* mandos (IPv6_TCPServer.server_bind): Set self.allow_reuse_address if
                                       a port number is specified.

Reported-by: Juan Miguel Alcarria Herrera <juanmi@arco2000.es>

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
25
25
        -fsanitize=object-size -fsanitize=float-divide-by-zero \
26
26
        -fsanitize=float-cast-overflow -fsanitize=nonnull-attribute \
27
27
        -fsanitize=returns-nonnull-attribute -fsanitize=bool \
28
 
        -fsanitize=enum -fsanitize-address-use-after-scope
 
28
        -fsanitize=enum
29
29
 
30
30
# For info about _FORTIFY_SOURCE, see feature_test_macros(7)
31
31
# and <https://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
32
 
FORTIFY:=-D_FORTIFY_SOURCE=3 -fstack-protector-all -fPIC
 
32
FORTIFY:=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
33
33
LINK_FORTIFY_LD:=-z relro -z now
34
34
LINK_FORTIFY:=
35
35
 
41
41
#COVERAGE=--coverage
42
42
OPTIMIZE:=-Os -fno-strict-aliasing
43
43
LANGUAGE:=-std=gnu11
44
 
FEATURES:=-D_FILE_OFFSET_BITS=64
45
44
htmldir:=man
46
 
version:=1.8.15
 
45
version:=1.8.4
47
46
SED:=sed
48
 
PKG_CONFIG?=pkg-config
49
47
 
50
48
USER:=$(firstword $(subst :, ,$(shell getent passwd _mandos \
51
49
        || getent passwd nobody || echo 65534)))
52
50
GROUP:=$(firstword $(subst :, ,$(shell getent group _mandos \
53
51
        || getent group nogroup || echo 65534)))
54
52
 
55
 
LINUXVERSION:=$(shell uname --kernel-release)
56
 
 
57
53
## Use these settings for a traditional /usr/local install
58
54
# PREFIX:=$(DESTDIR)/usr/local
59
55
# CONFDIR:=$(DESTDIR)/etc/mandos
60
56
# KEYDIR:=$(DESTDIR)/etc/mandos/keys
61
57
# MANDIR:=$(PREFIX)/man
62
58
# INITRAMFSTOOLS:=$(DESTDIR)/etc/initramfs-tools
63
 
# DRACUTMODULE:=$(DESTDIR)/usr/lib/dracut/modules.d/90mandos
64
59
# STATEDIR:=$(DESTDIR)/var/lib/mandos
65
60
# LIBDIR:=$(PREFIX)/lib
66
61
##
71
66
KEYDIR:=$(DESTDIR)/etc/keys/mandos
72
67
MANDIR:=$(PREFIX)/share/man
73
68
INITRAMFSTOOLS:=$(DESTDIR)/usr/share/initramfs-tools
74
 
DRACUTMODULE:=$(DESTDIR)/usr/lib/dracut/modules.d/90mandos
75
69
STATEDIR:=$(DESTDIR)/var/lib/mandos
76
70
LIBDIR:=$(shell \
77
71
        for d in \
78
 
        "/usr/lib/`dpkg-architecture \
79
 
                        -qDEB_HOST_MULTIARCH 2>/dev/null`" \
 
72
        "/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null`" \
80
73
        "`rpm --eval='%{_libdir}' 2>/dev/null`" /usr/lib; do \
81
74
                if [ -d "$$d" -a "$$d" = "$${d%/}" ]; then \
82
75
                        echo "$(DESTDIR)$$d"; \
85
78
        done)
86
79
##
87
80
 
88
 
SYSTEMD:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
89
 
                        --variable=systemdsystemunitdir)
90
 
TMPFILES:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
91
 
                        --variable=tmpfilesdir)
92
 
SYSUSERS:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
93
 
                        --variable=sysusersdir)
 
81
SYSTEMD:=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
 
82
TMPFILES:=$(DESTDIR)$(shell pkg-config systemd --variable=tmpfilesdir)
94
83
 
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 $(PKG_CONFIG) --cflags-only-I gpgme 2>/dev/null \
100
 
        || gpgme-config --cflags; getconf LFS_CFLAGS)
101
 
GPGME_LIBS:=$(shell $(PKG_CONFIG) --libs gpgme 2>/dev/null \
102
 
        || gpgme-config --libs; getconf LFS_LIBS; \
 
84
GNUTLS_CFLAGS:=$(shell pkg-config --cflags-only-I gnutls)
 
85
GNUTLS_LIBS:=$(shell pkg-config --libs gnutls)
 
86
AVAHI_CFLAGS:=$(shell pkg-config --cflags-only-I avahi-core)
 
87
AVAHI_LIBS:=$(shell pkg-config --libs avahi-core)
 
88
GPGME_CFLAGS:=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
 
89
GPGME_LIBS:=$(shell gpgme-config --libs; getconf LFS_LIBS; \
103
90
        getconf LFS_LDFLAGS)
104
 
LIBNL3_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I libnl-route-3.0)
105
 
LIBNL3_LIBS:=$(shell $(PKG_CONFIG) --libs libnl-route-3.0)
106
 
GLIB_CFLAGS:=$(shell $(PKG_CONFIG) --cflags glib-2.0)
107
 
GLIB_LIBS:=$(shell $(PKG_CONFIG) --libs glib-2.0)
 
91
LIBNL3_CFLAGS:=$(shell pkg-config --cflags-only-I libnl-route-3.0)
 
92
LIBNL3_LIBS:=$(shell pkg-config --libs libnl-route-3.0)
108
93
 
109
94
# Do not change these two
110
 
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
111
 
        $(LANGUAGE) $(FEATURES) -DVERSION='"$(version)"'
 
95
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) \
 
96
        $(OPTIMIZE) $(LANGUAGE) -DVERSION='"$(version)"'
112
97
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(strip \
113
98
        ) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
114
99
 
122
107
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
123
108
        $(notdir $<); \
124
109
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
125
 
        && command -v man >/dev/null; then LANG=en_US.UTF-8 \
126
 
        MANWIDTH=80 man --warnings --encoding=UTF-8 --local-file \
127
 
        $(notdir $@); fi >/dev/null)
 
110
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
 
111
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
 
112
        fi >/dev/null)
128
113
 
129
114
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
130
115
        --param make.year.ranges                1 \
143
128
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
144
129
        plugins.d/plymouth
145
130
PLUGIN_HELPERS:=plugin-helpers/mandos-client-iprouteadddel
146
 
CPROGS:=plugin-runner dracut-module/password-agent $(PLUGINS) \
147
 
        $(PLUGIN_HELPERS)
 
131
CPROGS:=plugin-runner $(PLUGINS) $(PLUGIN_HELPERS)
148
132
PROGS:=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
149
133
DOCS:=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
150
134
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
151
 
        dracut-module/password-agent.8mandos \
152
135
        plugins.d/mandos-client.8mandos \
153
136
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
154
137
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
158
141
 
159
142
objects:=$(addsuffix .o,$(CPROGS))
160
143
 
161
 
.PHONY: all
162
144
all: $(PROGS) mandos.lsm
163
145
 
164
 
.PHONY: doc
165
146
doc: $(DOCS)
166
147
 
167
 
.PHONY: html
168
148
html: $(htmldocs)
169
149
 
170
150
%.5: %.xml common.ent legalnotice.xml
229
209
                overview.xml legalnotice.xml
230
210
        $(DOCBOOKTOHTML)
231
211
 
232
 
dracut-module/password-agent.8mandos: \
233
 
                dracut-module/password-agent.xml common.ent \
234
 
                overview.xml legalnotice.xml
235
 
        $(DOCBOOKTOMAN)
236
 
dracut-module/password-agent.8mandos.xhtml: \
237
 
                dracut-module/password-agent.xml common.ent \
238
 
                overview.xml legalnotice.xml
239
 
        $(DOCBOOKTOHTML)
240
 
 
241
212
plugins.d/mandos-client.8mandos: plugins.d/mandos-client.xml \
242
213
                                        common.ent \
243
214
                                        mandos-options.xml \
287
258
                $@)
288
259
 
289
260
# Need to add the GnuTLS, Avahi and GPGME libraries
290
 
plugins.d/mandos-client: CFLAGS += $(GNUTLS_CFLAGS) $(strip \
291
 
        ) $(AVAHI_CFLAGS) $(GPGME_CFLAGS)
292
 
plugins.d/mandos-client: LDLIBS += $(GNUTLS_LIBS) $(strip \
293
 
        ) $(AVAHI_LIBS) $(GPGME_LIBS)
294
 
 
295
 
# Need to add the libnl-route library
296
 
plugin-helpers/mandos-client-iprouteadddel: CFLAGS += $(LIBNL3_CFLAGS)
297
 
plugin-helpers/mandos-client-iprouteadddel: LDLIBS += $(LIBNL3_LIBS)
298
 
 
299
 
# Need to add the GLib and pthread libraries
300
 
dracut-module/password-agent: CFLAGS += $(GLIB_CFLAGS)
301
 
# Note: -lpthread is unnecessary with the GNU C library 2.34 or later
302
 
dracut-module/password-agent: LDLIBS += $(GLIB_LIBS) -lpthread
303
 
 
304
 
.PHONY: clean
 
261
plugins.d/mandos-client: plugins.d/mandos-client.c
 
262
        $(LINK.c) $^ $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(strip\
 
263
                ) $(GPGME_CFLAGS) $(GNUTLS_LIBS) $(strip\
 
264
                ) $(AVAHI_LIBS) $(GPGME_LIBS) $(LOADLIBES) $(strip\
 
265
                ) $(LDLIBS) -o $@
 
266
 
 
267
plugin-helpers/mandos-client-iprouteadddel: plugin-helpers/mandos-client-iprouteadddel.c
 
268
        $(LINK.c) $(LIBNL3_CFLAGS) $^ $(LIBNL3_LIBS) $(strip\
 
269
                ) $(LOADLIBES) $(LDLIBS) -o $@
 
270
 
 
271
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
 
272
        check run-client run-server install install-html \
 
273
        install-server install-client-nokey install-client uninstall \
 
274
        uninstall-server uninstall-client purge purge-server \
 
275
        purge-client
 
276
 
305
277
clean:
306
278
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
307
279
 
308
 
.PHONY: distclean
309
280
distclean: clean
310
 
.PHONY: mostlyclean
311
281
mostlyclean: clean
312
 
.PHONY: maintainer-clean
313
282
maintainer-clean: clean
314
283
        -rm --force --recursive keydir confdir statedir
315
284
 
316
 
.PHONY: check
317
 
check: all
 
285
check:  all
318
286
        ./mandos --check
319
287
        ./mandos-ctl --check
320
 
        ./mandos-keygen --version
321
 
        ./plugin-runner --version
322
 
        ./plugin-helpers/mandos-client-iprouteadddel --version
323
 
        ./dracut-module/password-agent --test
324
288
 
325
289
# Run the client with a local config and key
326
 
.PHONY: run-client
327
 
run-client: all keydir/seckey.txt keydir/pubkey.txt \
328
 
                        keydir/tls-privkey.pem keydir/tls-pubkey.pem
329
 
        @echo '######################################################'
330
 
        @echo '# The following error messages are harmless and can  #'
331
 
        @echo '#  be safely ignored:                                #'
332
 
        @echo '## From plugin-runner:                               #'
333
 
        @echo '# setgid: Operation not permitted                    #'
334
 
        @echo '# setuid: Operation not permitted                    #'
335
 
        @echo '## From askpass-fifo:                                #'
336
 
        @echo '# mkfifo: Permission denied                          #'
337
 
        @echo '## From mandos-client:                               #'
338
 
        @echo '# Failed to raise privileges: Operation not permi... #'
339
 
        @echo '# Warning: network hook "*" exited with status *     #'
340
 
        @echo '# ioctl SIOCSIFFLAGS +IFF_UP: Operation not permi... #'
341
 
        @echo '# Failed to bring up interface "*": Operation not... #'
342
 
        @echo '#                                                    #'
343
 
        @echo '# (The messages are caused by not running as root,   #'
344
 
        @echo '# but you should NOT run "make run-client" as root   #'
345
 
        @echo '# unless you also unpacked and compiled Mandos as    #'
346
 
        @echo '# root, which is also NOT recommended.)              #'
347
 
        @echo '######################################################'
 
290
run-client: all keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem
 
291
        @echo "###################################################################"
 
292
        @echo "# The following error messages are harmless and can be safely     #"
 
293
        @echo "# ignored:                                                        #"
 
294
        @echo "# From plugin-runner: setgid: Operation not permitted             #"
 
295
        @echo "#                     setuid: Operation not permitted             #"
 
296
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
 
297
        @echo "# From mandos-client:                                             #"
 
298
        @echo "#             Failed to raise privileges: Operation not permitted #"
 
299
        @echo "#             Warning: network hook \"*\" exited with status *      #"
 
300
        @echo "#                                                                 #"
 
301
        @echo "# (The messages are caused by not running as root, but you should #"
 
302
        @echo "# NOT run \"make run-client\" as root unless you also unpacked and  #"
 
303
        @echo "# compiled Mandos as root, which is also NOT recommended.)        #"
 
304
        @echo "###################################################################"
348
305
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
349
306
        ./plugin-runner --plugin-dir=plugins.d \
350
307
                --plugin-helper-dir=plugin-helpers \
357
314
keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem: mandos-keygen
358
315
        install --directory keydir
359
316
        ./mandos-keygen --dir keydir --force
360
 
        if ! [ -e keydir/tls-privkey.pem ]; then \
361
 
                install --mode=u=rw /dev/null keydir/tls-privkey.pem; \
362
 
        fi
363
 
        if ! [ -e keydir/tls-pubkey.pem ]; then \
364
 
                install --mode=u=rw /dev/null keydir/tls-pubkey.pem; \
365
 
        fi
366
317
 
367
318
# Run the server with a local config
368
 
.PHONY: run-server
369
319
run-server: confdir/mandos.conf confdir/clients.conf statedir
370
320
        ./mandos --debug --no-dbus --configdir=confdir \
371
321
                --statedir=statedir $(SERVERARGS)
382
332
statedir:
383
333
        install --directory statedir
384
334
 
385
 
.PHONY: install
386
335
install: install-server install-client-nokey
387
336
 
388
 
.PHONY: install-html
389
337
install-html: html
390
338
        install --directory $(htmldir)
391
339
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
392
340
                $(htmldocs)
393
341
 
394
 
.PHONY: install-server
395
342
install-server: doc
396
343
        install --directory $(CONFDIR)
397
344
        if install --directory --mode=u=rwx --owner=$(USER) \
400
347
        elif install --directory --mode=u=rwx $(STATEDIR); then \
401
348
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
402
349
        fi
403
 
        if [ "$(TMPFILES)" != "$(DESTDIR)" \
404
 
                        -a -d "$(TMPFILES)" ]; then \
 
350
        if [ "$(TMPFILES)" != "$(DESTDIR)" -a -d "$(TMPFILES)" ]; then \
405
351
                install --mode=u=rw,go=r tmpfiles.d-mandos.conf \
406
352
                        $(TMPFILES)/mandos.conf; \
407
353
        fi
408
 
        if [ "$(SYSUSERS)" != "$(DESTDIR)" \
409
 
                        -a -d "$(SYSUSERS)" ]; then \
410
 
                install --mode=u=rw,go=r sysusers.d-mandos.conf \
411
 
                        $(SYSUSERS)/mandos.conf; \
412
 
        fi
413
354
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
414
355
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
415
356
                mandos-ctl
444
385
        gzip --best --to-stdout intro.8mandos \
445
386
                > $(MANDIR)/man8/intro.8mandos.gz
446
387
 
447
 
.PHONY: install-client-nokey
448
388
install-client-nokey: all doc
449
389
        install --directory $(LIBDIR)/mandos $(CONFDIR)
450
390
        install --directory --mode=u=rwx $(KEYDIR) \
451
391
                $(LIBDIR)/mandos/plugins.d \
452
392
                $(LIBDIR)/mandos/plugin-helpers
453
 
        if [ "$(SYSUSERS)" != "$(DESTDIR)" \
454
 
                        -a -d "$(SYSUSERS)" ]; then \
455
 
                install --mode=u=rw,go=r sysusers.d-mandos.conf \
456
 
                        $(SYSUSERS)/mandos-client.conf; \
457
 
        fi
458
393
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
459
394
                install --mode=u=rwx \
460
395
                        --directory "$(CONFDIR)/plugins.d" \
465
400
        install --mode=u=rwx,go=rx \
466
401
                --target-directory=$(LIBDIR)/mandos plugin-runner
467
402
        install --mode=u=rwx,go=rx \
468
 
                --target-directory=$(LIBDIR)/mandos \
469
 
                mandos-to-cryptroot-unlock
 
403
                --target-directory=$(LIBDIR)/mandos mandos-to-cryptroot-unlock
470
404
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
471
405
                mandos-keygen
472
406
        install --mode=u=rwx,go=rx \
500
434
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
501
435
        install initramfs-tools-script-stop \
502
436
                $(INITRAMFSTOOLS)/scripts/local-premount/mandos
503
 
        install --directory $(DRACUTMODULE)
504
 
        install --mode=u=rw,go=r --target-directory=$(DRACUTMODULE) \
505
 
                dracut-module/ask-password-mandos.path \
506
 
                dracut-module/ask-password-mandos.service
507
 
        install --mode=u=rwxs,go=rx \
508
 
                --target-directory=$(DRACUTMODULE) \
509
 
                dracut-module/module-setup.sh \
510
 
                dracut-module/cmdline-mandos.sh \
511
 
                dracut-module/password-agent
512
437
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
513
438
        gzip --best --to-stdout mandos-keygen.8 \
514
439
                > $(MANDIR)/man8/mandos-keygen.8.gz
526
451
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
527
452
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
528
453
                > $(MANDIR)/man8/plymouth.8mandos.gz
529
 
        gzip --best --to-stdout dracut-module/password-agent.8mandos \
530
 
                > $(MANDIR)/man8/password-agent.8mandos.gz
531
454
 
532
 
.PHONY: install-client
533
455
install-client: install-client-nokey
534
456
# Post-installation stuff
535
457
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
536
 
        if command -v update-initramfs >/dev/null; then \
537
 
            update-initramfs -k all -u; \
538
 
        elif command -v dracut >/dev/null; then \
539
 
            for initrd in $(DESTDIR)/boot/initr*-$(LINUXVERSION); do \
540
 
                if [ -w "$$initrd" ]; then \
541
 
                    chmod go-r "$$initrd"; \
542
 
                    dracut --force "$$initrd"; \
543
 
                fi; \
544
 
            done; \
545
 
        fi
 
458
        update-initramfs -k all -u
546
459
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
547
460
 
548
 
.PHONY: uninstall
549
461
uninstall: uninstall-server uninstall-client
550
462
 
551
 
.PHONY: uninstall-server
552
463
uninstall-server:
553
464
        -rm --force $(PREFIX)/sbin/mandos \
554
465
                $(PREFIX)/sbin/mandos-ctl \
561
472
        update-rc.d -f mandos remove
562
473
        -rmdir $(CONFDIR)
563
474
 
564
 
.PHONY: uninstall-client
565
475
uninstall-client:
566
476
# Refuse to uninstall client if /etc/crypttab is explicitly configured
567
477
# to use it.
578
488
                $(INITRAMFSTOOLS)/hooks/mandos \
579
489
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
580
490
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
581
 
                $(INITRAMFSTOOLS)/scripts/local-premount/mandos \
582
 
                $(DRACUTMODULE)/ask-password-mandos.path \
583
 
                $(DRACUTMODULE)/ask-password-mandos.service \
584
 
                $(DRACUTMODULE)/module-setup.sh \
585
 
                $(DRACUTMODULE)/cmdline-mandos.sh \
586
 
                $(DRACUTMODULE)/password-agent \
587
491
                $(MANDIR)/man8/mandos-keygen.8.gz \
588
492
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
589
493
                $(MANDIR)/man8/mandos-client.8mandos.gz
592
496
                $(MANDIR)/man8/splashy.8mandos.gz \
593
497
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
594
498
                $(MANDIR)/man8/plymouth.8mandos.gz \
595
 
                $(MANDIR)/man8/password-agent.8mandos.gz \
596
499
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
597
 
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR) $(DRACUTMODULE)
598
 
        if command -v update-initramfs >/dev/null; then \
599
 
            update-initramfs -k all -u; \
600
 
        elif command -v dracut >/dev/null; then \
601
 
            for initrd in $(DESTDIR)/boot/initr*-$(LINUXVERSION); do \
602
 
                test -w "$$initrd" && dracut --force "$$initrd"; \
603
 
            done; \
604
 
        fi
 
500
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
 
501
        update-initramfs -k all -u
605
502
 
606
 
.PHONY: purge
607
503
purge: purge-server purge-client
608
504
 
609
 
.PHONY: purge-server
610
505
purge-server: uninstall-server
611
506
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
612
507
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
617
512
                $(DESTDIR)/var/run/mandos.pid
618
513
        -rmdir $(CONFDIR)
619
514
 
620
 
.PHONY: purge-client
621
515
purge-client: uninstall-client
622
516
        -shred --remove $(KEYDIR)/seckey.txt $(KEYDIR)/tls-privkey.pem
623
517
        -rm --force $(CONFDIR)/plugin-runner.conf \