/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

fixed two bugs:
      A overbuffer flow in enviro variables causing seg fault
      A incorrect use of strsep causing seg fault

Show diffs side-by-side

added added

removed removed

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