/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: 2008-08-29 05:53:59 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080829055359-wkdasnyxtylmnxus
* mandos.xml (EXAMPLE): Replaced all occurences of command name with
                        "&COMMANDNAME;".

* plugins.d/password-prompt.c (main): Improved some documentation
                                      strings.  Do perror() of
                                      tcgetattr() fails.  Add debug
                                      output if interrupted by signal.
                                      Loop over write() instead of
                                      using fwrite() when outputting
                                      password.  Add debug output if
                                      getline() returns 0, unless it
                                      was caused by a signal.  Add
                                      exit status code to debug
                                      output.

* plugins.d/password-prompt.xml: Changed all single quotes to double
                                 quotes for consistency.  Removed
                                 <?xml-stylesheet>.
  (ENTITY TIMESTAMP): New.  Automatically updated by Emacs time-stamp
                      by using Emacs local variables.
  (/refentry/refentryinfo/title): Changed to "Mandos Manual".
  (/refentry/refentryinfo/productname): Changed to "Mandos".
  (/refentry/refentryinfo/date): New; set to "&TIMESTAMP;".
  (/refentry/refentryinfo/copyright): Split copyright holders.
  (/refentry/refnamediv/refpurpose): Improved wording.
  (SYNOPSIS): Fix to use correct markup.  Add short options.
  (DESCRIPTION, OPTIONS): Improved wording.
  (OPTIONS): Improved wording.  Use more correct markup.  Document
             short options.
  (EXIT STATUS): Add text.
  (ENVIRONMENT): Document use of "cryptsource" and "crypttarget".
  (FILES): REMOVED.
  (BUGS): Add text.
  (EXAMPLE): Added some examples.
  (SECURITY): Added text.
  (SEE ALSO): Remove reference to mandos(8).  Add reference to
              crypttab(5).

Show diffs side-by-side

added added

removed removed

Lines of Context:
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 
9
 
#DEBUG=-ggdb3
 
7
        -Wpacked -Wnested-externs -Wunreachable-code -Winline \
 
8
        -Wvolatile-register-var
 
9
DEBUG=-ggdb3
10
10
# For info about _FORTIFY_SOURCE, see
11
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
 
12
FORTIFY=-D_FORTIFY_SOURCE=2 # -fstack-protector-all
15
13
#COVERAGE=--coverage
16
14
OPTIMIZE=-Os
17
15
LANGUAGE=-std=gnu99
18
 
htmldir=man
19
 
version=1.0.3
20
 
SED=sed
21
 
 
22
 
## Use these settings for a traditional /usr/local install
23
 
# PREFIX=$(DESTDIR)/usr/local
24
 
# CONFDIR=$(DESTDIR)/etc/mandos
25
 
# KEYDIR=$(DESTDIR)/etc/mandos/keys
26
 
# MANDIR=$(PREFIX)/man
27
 
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
28
 
##
29
 
 
30
 
## These settings are for a package-type install
 
16
# PREFIX=/usr/local
31
17
PREFIX=$(DESTDIR)/usr
 
18
# CONFDIR=/usr/local/lib/mandos
32
19
CONFDIR=$(DESTDIR)/etc/mandos
33
 
KEYDIR=$(DESTDIR)/etc/keys/mandos
34
 
MANDIR=$(PREFIX)/share/man
35
 
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
36
 
##
 
20
# MANDIR=/usr/local/man
 
21
MANDIR=$(DESTDIR)/usr/share/man
37
22
 
38
23
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
39
24
GNUTLS_LIBS=$(shell libgnutls-config --libs)
44
29
 
45
30
# Do not change these two
46
31
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
47
 
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
48
 
        -DVERSION='"$(version)"'
49
 
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
32
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS)
 
33
LDFLAGS=$(COVERAGE)
50
34
 
51
 
# Commands to format a DocBook <refentry> document into a manual page
 
35
# Commands to format a DocBook refentry document into a manual page
52
36
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
53
37
        --param man.charmap.use.subset          0 \
54
38
        --param make.year.ranges                1 \
58
42
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
59
43
        $(notdir $<); \
60
44
        $(MANPOST) $(notdir $@)
61
 
# DocBook-to-man post-processing to fix a '\n' escape bug
62
 
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
63
 
 
64
 
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
65
 
        --param make.year.ranges                1 \
66
 
        --param make.single.year.ranges         1 \
67
 
        --param man.output.quietly              1 \
68
 
        --param man.authors.section.enabled     0 \
69
 
        --param citerefentry.link               1 \
70
 
        --output $@ \
71
 
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
72
 
        $<; $(HTMLPOST) $@
73
 
# Fix citerefentry links
74
 
HTMLPOST=$(SED) --in-place \
75
 
        --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
 
 
77
 
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
78
 
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
79
 
CPROGS=plugin-runner $(PLUGINS)
80
 
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
 
45
# DocBook-to-man post-processing to fix a \n escape bug
 
46
MANPOST=sed --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
 
47
 
 
48
PLUGINS=plugins.d/password-prompt plugins.d/password-request
 
49
PROGS=plugin-runner $(PLUGINS)
81
50
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
82
 
        plugins.d/mandos-client.8mandos \
 
51
        plugins.d/password-request.8mandos \
83
52
        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
86
 
 
87
 
htmldocs=$(addsuffix .xhtml,$(DOCS))
88
 
 
89
 
objects=$(addsuffix .o,$(CPROGS))
90
 
 
91
 
all: $(PROGS) mandos.lsm
 
53
        mandos-clients.conf.5
 
54
 
 
55
objects=$(addsuffix .o,$(PROGS))
 
56
 
 
57
all: $(PROGS)
92
58
 
93
59
doc: $(DOCS)
94
60
 
95
 
html: $(htmldocs)
96
 
 
97
 
%.5: %.xml common.ent legalnotice.xml
98
 
        $(DOCBOOKTOMAN)
99
 
%.5.xhtml: %.xml common.ent legalnotice.xml
100
 
        $(DOCBOOKTOHTML)
101
 
 
102
 
%.8: %.xml common.ent legalnotice.xml
103
 
        $(DOCBOOKTOMAN)
104
 
%.8.xhtml: %.xml common.ent legalnotice.xml
105
 
        $(DOCBOOKTOHTML)
106
 
 
107
 
%.8mandos: %.xml common.ent legalnotice.xml
108
 
        $(DOCBOOKTOMAN)
109
 
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
110
 
        $(DOCBOOKTOHTML)
111
 
 
112
 
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
113
 
                legalnotice.xml
114
 
        $(DOCBOOKTOMAN)
115
 
mandos.8.xhtml: mandos.xml common.ent mandos-options.xml \
116
 
                overview.xml legalnotice.xml
117
 
        $(DOCBOOKTOHTML)
118
 
 
119
 
mandos-keygen.8: mandos-keygen.xml common.ent overview.xml \
120
 
                legalnotice.xml
121
 
        $(DOCBOOKTOMAN)
122
 
mandos-keygen.8.xhtml: mandos-keygen.xml common.ent overview.xml \
123
 
                 legalnotice.xml
124
 
        $(DOCBOOKTOHTML)
125
 
 
126
 
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
127
 
                legalnotice.xml
128
 
        $(DOCBOOKTOMAN)
129
 
mandos.conf.5.xhtml: mandos.conf.xml common.ent mandos-options.xml \
130
 
                legalnotice.xml
131
 
        $(DOCBOOKTOHTML)
132
 
 
133
 
plugin-runner.8mandos: plugin-runner.xml common.ent overview.xml \
134
 
                legalnotice.xml
135
 
        $(DOCBOOKTOMAN)
136
 
plugin-runner.8mandos.xhtml: plugin-runner.xml common.ent \
137
 
                overview.xml legalnotice.xml
138
 
        $(DOCBOOKTOHTML)
139
 
 
140
 
plugins.d/mandos-client.8mandos: plugins.d/mandos-client.xml \
141
 
                                        common.ent \
142
 
                                        mandos-options.xml \
143
 
                                        overview.xml legalnotice.xml
144
 
        $(DOCBOOKTOMAN)
145
 
plugins.d/mandos-client.8mandos.xhtml: plugins.d/mandos-client.xml \
146
 
                                        common.ent \
147
 
                                        mandos-options.xml \
148
 
                                        overview.xml legalnotice.xml
149
 
        $(DOCBOOKTOHTML)
150
 
 
151
 
# Update all these files with version number $(version)
152
 
common.ent: Makefile
153
 
        $(SED) --in-place \
154
 
                --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' \
155
 
                $@
156
 
 
157
 
mandos: Makefile
158
 
        $(SED) --in-place \
159
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
160
 
                $@
161
 
 
162
 
mandos-keygen: Makefile
163
 
        $(SED) --in-place \
164
 
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
165
 
                $@
166
 
 
167
 
mandos-ctl: Makefile
168
 
        $(SED) --in-place \
169
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
170
 
                $@
171
 
 
172
 
mandos.lsm: Makefile
173
 
        $(SED) --in-place \
174
 
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
175
 
                $@
176
 
        $(SED) --in-place \
177
 
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
178
 
                $@
179
 
        $(SED) --in-place \
180
 
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
181
 
                $@
182
 
 
183
 
plugins.d/mandos-client: plugins.d/mandos-client.o
 
61
%.5: %.xml
 
62
        $(DOCBOOKTOMAN)
 
63
 
 
64
%.8: %.xml
 
65
        $(DOCBOOKTOMAN)
 
66
 
 
67
%.8mandos: %.xml
 
68
        $(DOCBOOKTOMAN)
 
69
 
 
70
mandos.8: mandos.xml mandos-options.xml
 
71
        $(DOCBOOKTOMAN)
 
72
 
 
73
mandos.conf.5: mandos.conf.xml mandos-options.xml
 
74
        $(DOCBOOKTOMAN)
 
75
 
 
76
plugins.d/password-request: plugins.d/password-request.o
184
77
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
185
78
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
186
79
 
187
 
.PHONY : all doc html clean distclean run-client run-server install \
 
80
.PHONY : all doc clean distclean run-client run-server install \
188
81
        install-server install-client uninstall uninstall-server \
189
82
        uninstall-client purge purge-server purge-client
190
83
 
191
84
clean:
192
 
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
 
85
        -rm --force $(PROGS) $(objects) $(DOCS) core
193
86
 
194
87
distclean: clean
195
88
mostlyclean: clean
196
89
maintainer-clean: clean
197
90
        -rm --force --recursive keydir confdir
198
91
 
199
 
check:  all
 
92
check:
200
93
        ./mandos --check
201
94
 
202
 
# Run the client with a local config and key
203
 
run-client: all keydir/seckey.txt keydir/pubkey.txt
 
95
# Run the server with a local key
 
96
run-client: all keydir/seckey.txt keydir/pubkey.txt \
 
97
        keydir/secring.gpg keydir/pubring.gpg
204
98
        ./plugin-runner --plugin-dir=plugins.d \
205
 
                --config-file=plugin-runner.conf \
206
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
207
 
                $(CLIENTARGS)
 
99
                --options-for=password-request:--keydir=keydir
208
100
 
209
101
# Used by run-client
 
102
keydir/secring.gpg: keydir/seckey.txt
 
103
        gpg --homedir $(dir $<) --import $^
 
104
keydir/pubring.gpg: keydir/pubkey.txt
 
105
        gpg --homedir $(dir $<) --import $^
210
106
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
211
107
        install --directory keydir
212
108
        ./mandos-keygen --dir keydir --force
213
109
 
214
110
# Run the server with a local config
215
111
run-server: confdir/mandos.conf confdir/clients.conf
216
 
        ./mandos --debug --configdir=confdir $(SERVERARGS)
 
112
        ./mandos --debug --configdir=confdir
217
113
 
218
114
# Used by run-server
219
115
confdir/mandos.conf: mandos.conf
220
116
        install --directory confdir
221
 
        install --mode=u=rw,go=r $^ $@
 
117
        install $^ $@
222
118
confdir/clients.conf: clients.conf keydir/seckey.txt
223
119
        install --directory confdir
224
 
        install --mode=u=rw $< $@
 
120
        install clients.conf $@
225
121
# Add a client password
226
122
        ./mandos-keygen --dir keydir --password >> $@
227
123
 
228
 
install: install-server install-client-nokey
229
 
 
230
 
install-html: html
231
 
        install --directory $(htmldir)
232
 
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
233
 
                $(htmldocs)
 
124
install: install-server install-client
234
125
 
235
126
install-server: doc
236
 
        install --directory $(CONFDIR)
237
 
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
238
 
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
239
 
                mandos.conf
240
 
        install --mode=u=rw --target-directory=$(CONFDIR) \
 
127
        install --directory --parents $(CONFDIR) $(MANDIR)/man5 \
 
128
                $(MANDIR)/man8
 
129
        install --mode=0755 mandos $(PREFIX)/sbin/mandos
 
130
        install --mode=0644 --target-directory=$(CONFDIR) mandos.conf
 
131
        install --mode=0640 --target-directory=$(CONFDIR) \
241
132
                clients.conf
242
 
        install --mode=u=rwx,go=rx init.d-mandos \
243
 
                $(DESTDIR)/etc/init.d/mandos
244
 
        install --mode=u=rw,go=r default-mandos \
245
 
                $(DESTDIR)/etc/default/mandos
246
 
        if [ -z $(DESTDIR) ]; then \
247
 
                update-rc.d mandos defaults 25 15;\
248
 
        fi
249
133
        gzip --best --to-stdout mandos.8 \
250
134
                > $(MANDIR)/man8/mandos.8.gz
251
135
        gzip --best --to-stdout mandos.conf.5 \
253
137
        gzip --best --to-stdout mandos-clients.conf.5 \
254
138
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
255
139
 
256
 
install-client-nokey: all doc
257
 
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
258
 
        install --directory --mode=u=rwx $(KEYDIR) \
259
 
                $(PREFIX)/lib/mandos/plugins.d
260
 
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
261
 
                install --mode=u=rwx \
262
 
                        --directory "$(CONFDIR)/plugins.d"; \
263
 
        fi
264
 
        install --mode=u=rwx,go=rx \
265
 
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
266
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
 
140
install-client: all doc /usr/share/initramfs-tools/hooks/.
 
141
        install --directory --parents $(PREFIX)/lib/mandos \
 
142
                $(CONFDIR) $(MANDIR)/man8
 
143
        install --directory --mode=0700 $(PREFIX)/lib/mandos/plugins.d
 
144
        chmod u=rwx,g=,o= $(PREFIX)/lib/mandos/plugins.d
 
145
        install --mode=0755 --target-directory=$(PREFIX)/lib/mandos \
 
146
                plugin-runner
 
147
        install --mode=0755 --target-directory=$(PREFIX)/sbin \
267
148
                mandos-keygen
268
 
        install --mode=u=rwx,go=rx \
 
149
        install --mode=0755 \
269
150
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
270
151
                plugins.d/password-prompt
271
 
        install --mode=u=rwxs,go=rx \
272
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
273
 
                plugins.d/mandos-client
274
 
        install --mode=u=rwxs,go=rx \
275
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
276
 
                plugins.d/usplash
277
 
        install --mode=u=rwxs,go=rx \
278
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
279
 
                plugins.d/splashy
280
 
        install --mode=u=rwxs,go=rx \
281
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
282
 
                plugins.d/askpass-fifo
 
152
        install --mode=4755 \
 
153
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
154
                plugins.d/password-request
283
155
        install initramfs-tools-hook \
284
 
                $(INITRAMFSTOOLS)/hooks/mandos
285
 
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
286
 
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
 
156
                /usr/share/initramfs-tools/hooks/mandos
 
157
        install initramfs-tools-hook-conf \
 
158
                /usr/share/initramfs-tools/conf-hooks.d/mandos
287
159
        install initramfs-tools-script \
288
 
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
289
 
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
 
160
                /usr/share/initramfs-tools/scripts/local-top/mandos
290
161
        gzip --best --to-stdout mandos-keygen.8 \
291
162
                > $(MANDIR)/man8/mandos-keygen.8.gz
292
163
        gzip --best --to-stdout plugin-runner.8mandos \
293
164
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
294
165
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
295
166
                > $(MANDIR)/man8/password-prompt.8mandos.gz
296
 
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
297
 
                > $(MANDIR)/man8/mandos-client.8mandos.gz
298
 
        gzip --best --to-stdout plugins.d/usplash.8mandos \
299
 
                > $(MANDIR)/man8/usplash.8mandos.gz
300
 
        gzip --best --to-stdout plugins.d/splashy.8mandos \
301
 
                > $(MANDIR)/man8/splashy.8mandos.gz
302
 
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
303
 
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
304
 
 
305
 
install-client: install-client-nokey
306
 
# Post-installation stuff
307
 
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
 
167
        gzip --best --to-stdout plugins.d/password-request.8mandos \
 
168
                > $(MANDIR)/man8/password-request.8mandos.gz
 
169
        -$(PREFIX)/sbin/mandos-keygen
308
170
        update-initramfs -k all -u
309
 
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
310
171
 
311
172
uninstall: uninstall-server uninstall-client
312
173
 
313
 
uninstall-server:
 
174
uninstall-server: $(PREFIX)/sbin/mandos
314
175
        -rm --force $(PREFIX)/sbin/mandos \
315
176
                $(MANDIR)/man8/mandos.8.gz \
316
177
                $(MANDIR)/man5/mandos.conf.5.gz \
317
178
                $(MANDIR)/man5/mandos-clients.conf.5.gz
318
 
        update-rc.d -f mandos remove
319
179
        -rmdir $(CONFDIR)
320
180
 
321
181
uninstall-client:
322
182
# Refuse to uninstall client if /etc/crypttab is explicitly configured
323
183
# to use it.
324
184
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
325
 
                $(DESTDIR)/etc/crypttab
 
185
                /etc/crypttab
326
186
        -rm --force $(PREFIX)/sbin/mandos-keygen \
327
187
                $(PREFIX)/lib/mandos/plugin-runner \
328
188
                $(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 \
333
 
                $(INITRAMFSTOOLS)/hooks/mandos \
334
 
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
335
 
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
 
189
                $(PREFIX)/lib/mandos/plugins.d/password-request \
 
190
                /usr/share/initramfs-tools/hooks/mandos \
 
191
                /usr/share/initramfs-tools/conf-hooks.d/mandos \
336
192
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
337
193
                $(MANDIR)/man8/mandos-keygen.8.gz \
338
194
                $(MANDIR)/man8/password-prompt.8mandos.gz \
339
 
                $(MANDIR)/man8/usplash.8mandos.gz \
340
 
                $(MANDIR)/man8/splashy.8mandos.gz \
341
 
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
342
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
 
195
                $(MANDIR)/man8/password-request.8mandos.gz
343
196
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
344
 
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
 
197
                 $(PREFIX)/lib/mandos $(CONFDIR)
345
198
        update-initramfs -k all -u
346
199
 
347
200
purge: purge-server purge-client
348
201
 
349
202
purge-server: uninstall-server
350
 
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
351
 
                $(DESTDIR)/etc/default/mandos \
352
 
                $(DESTDIR)/etc/init.d/mandos \
353
 
                $(DESTDIR)/var/run/mandos.pid
 
203
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf
354
204
        -rmdir $(CONFDIR)
355
205
 
356
206
purge-client: uninstall-client
357
 
        -shred --remove $(KEYDIR)/seckey.txt
358
 
        -rm --force $(CONFDIR)/plugin-runner.conf \
359
 
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt
360
 
        -rmdir $(KEYDIR) $(CONFDIR)/plugins.d $(CONFDIR)
 
207
        -rm --force $(CONFDIR)/seckey.txt $(CONFDIR)/pubkey.txt
 
208
        -rmdir $(CONFDIR) $(CONFDIR)/plugins.d