/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

* initramfs-tools-hook: Also fix /lib<qual> and /usr/lib<qual>
                        directories.

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 -Wunreachable-code -Winline \
8
 
        -Wvolatile-register-var
9
 
DEBUG=-ggdb3
 
7
        -Wpacked -Wnested-externs -Winline -Wvolatile-register-var
 
8
#       -Wunreachable-code 
 
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
 
12
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC -fPIE
 
13
LINK_FORTIFY_LD=-z relro -fPIE
 
14
LINK_FORTIFY=-pie
13
15
#COVERAGE=--coverage
14
16
OPTIMIZE=-Os
15
17
LANGUAGE=-std=gnu99
16
 
# PREFIX=/usr/local
 
18
htmldir=man
 
19
version=1.0.5
 
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
17
31
PREFIX=$(DESTDIR)/usr
18
 
# CONFDIR=/usr/local/lib/mandos
19
32
CONFDIR=$(DESTDIR)/etc/mandos
20
 
# MANDIR=/usr/local/man
21
 
MANDIR=$(DESTDIR)/usr/share/man
 
33
KEYDIR=$(DESTDIR)/etc/keys/mandos
 
34
MANDIR=$(PREFIX)/share/man
 
35
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
 
36
##
22
37
 
23
38
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
24
39
GNUTLS_LIBS=$(shell libgnutls-config --libs)
29
44
 
30
45
# Do not change these two
31
46
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
32
 
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS)
33
 
LDFLAGS=$(COVERAGE)
 
47
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
 
48
        -DVERSION='"$(version)"'
 
49
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
34
50
 
35
 
# Commands to format a DocBook refentry document into a manual page
36
 
DOCBOOKTOMAN=cd $(dir $^); xsltproc --nonet --xinclude \
 
51
# Commands to format a DocBook <refentry> document into a manual page
 
52
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
37
53
        --param man.charmap.use.subset          0 \
38
54
        --param make.year.ranges                1 \
39
55
        --param make.single.year.ranges         1 \
42
58
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
43
59
        $(notdir $<); \
44
60
        $(MANPOST) $(notdir $@)
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)
 
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)
50
81
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
51
 
        plugins.d/password-request.8mandos \
 
82
        plugins.d/mandos-client.8mandos \
52
83
        plugins.d/password-prompt.8mandos mandos.conf.5 \
53
 
        mandos-clients.conf.5
54
 
 
55
 
objects=$(addsuffix .o,$(PROGS))
56
 
 
57
 
all: $(PROGS)
 
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
58
92
 
59
93
doc: $(DOCS)
60
94
 
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
 
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
77
184
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
78
185
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
79
186
 
80
 
.PHONY : all doc clean distclean run-client run-server install \
 
187
.PHONY : all doc html clean distclean run-client run-server install \
81
188
        install-server install-client uninstall uninstall-server \
82
189
        uninstall-client purge purge-server purge-client
83
190
 
84
191
clean:
85
 
        -rm --force $(PROGS) $(objects) $(DOCS) core
 
192
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
86
193
 
87
194
distclean: clean
88
195
mostlyclean: clean
89
196
maintainer-clean: clean
90
197
        -rm --force --recursive keydir confdir
91
198
 
92
 
check:
 
199
check:  all
93
200
        ./mandos --check
94
201
 
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
 
202
# Run the client with a local config and key
 
203
run-client: all keydir/seckey.txt keydir/pubkey.txt
98
204
        ./plugin-runner --plugin-dir=plugins.d \
99
 
                --options-for=password-request:--keydir=keydir
 
205
                --config-file=plugin-runner.conf \
 
206
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
 
207
                $(CLIENTARGS)
100
208
 
101
209
# 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 $^
106
210
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
107
211
        install --directory keydir
108
212
        ./mandos-keygen --dir keydir --force
109
213
 
110
214
# Run the server with a local config
111
215
run-server: confdir/mandos.conf confdir/clients.conf
112
 
        ./mandos --debug --configdir=confdir
 
216
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
113
217
 
114
218
# Used by run-server
115
219
confdir/mandos.conf: mandos.conf
116
220
        install --directory confdir
117
 
        install $^ $@
 
221
        install --mode=u=rw,go=r $^ $@
118
222
confdir/clients.conf: clients.conf keydir/seckey.txt
119
223
        install --directory confdir
120
 
        install clients.conf $@
 
224
        install --mode=u=rw $< $@
121
225
# Add a client password
122
226
        ./mandos-keygen --dir keydir --password >> $@
123
227
 
124
 
install: install-server install-client
 
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)
125
234
 
126
235
install-server: doc
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) \
 
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) \
132
241
                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
133
249
        gzip --best --to-stdout mandos.8 \
134
250
                > $(MANDIR)/man8/mandos.8.gz
135
251
        gzip --best --to-stdout mandos.conf.5 \
137
253
        gzip --best --to-stdout mandos-clients.conf.5 \
138
254
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
139
255
 
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 \
 
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 \
148
267
                mandos-keygen
149
 
        install --mode=0755 \
 
268
        install --mode=u=rwx,go=rx \
150
269
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
151
270
                plugins.d/password-prompt
152
 
        install --mode=4755 \
153
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
154
 
                plugins.d/password-request
 
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
155
283
        install initramfs-tools-hook \
156
 
                /usr/share/initramfs-tools/hooks/mandos
157
 
        install initramfs-tools-hook-conf \
158
 
                /usr/share/initramfs-tools/conf-hooks.d/mandos
 
284
                $(INITRAMFSTOOLS)/hooks/mandos
 
285
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
 
286
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
159
287
        install initramfs-tools-script \
160
 
                /usr/share/initramfs-tools/scripts/local-top/mandos
 
288
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
 
289
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
161
290
        gzip --best --to-stdout mandos-keygen.8 \
162
291
                > $(MANDIR)/man8/mandos-keygen.8.gz
163
292
        gzip --best --to-stdout plugin-runner.8mandos \
164
293
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
165
294
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
166
295
                > $(MANDIR)/man8/password-prompt.8mandos.gz
167
 
        gzip --best --to-stdout plugins.d/password-request.8mandos \
168
 
                > $(MANDIR)/man8/password-request.8mandos.gz
169
 
        -$(PREFIX)/sbin/mandos-keygen
 
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)"
170
308
        update-initramfs -k all -u
 
309
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
171
310
 
172
311
uninstall: uninstall-server uninstall-client
173
312
 
174
 
uninstall-server: $(PREFIX)/sbin/mandos
 
313
uninstall-server:
175
314
        -rm --force $(PREFIX)/sbin/mandos \
176
315
                $(MANDIR)/man8/mandos.8.gz \
177
316
                $(MANDIR)/man5/mandos.conf.5.gz \
178
317
                $(MANDIR)/man5/mandos-clients.conf.5.gz
 
318
        update-rc.d -f mandos remove
179
319
        -rmdir $(CONFDIR)
180
320
 
181
321
uninstall-client:
182
322
# Refuse to uninstall client if /etc/crypttab is explicitly configured
183
323
# to use it.
184
324
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
185
 
                /etc/crypttab
 
325
                $(DESTDIR)/etc/crypttab
186
326
        -rm --force $(PREFIX)/sbin/mandos-keygen \
187
327
                $(PREFIX)/lib/mandos/plugin-runner \
188
328
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
189
 
                $(PREFIX)/lib/mandos/plugins.d/password-request \
190
 
                /usr/share/initramfs-tools/hooks/mandos \
191
 
                /usr/share/initramfs-tools/conf-hooks.d/mandos \
 
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 \
192
336
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
193
337
                $(MANDIR)/man8/mandos-keygen.8.gz \
194
338
                $(MANDIR)/man8/password-prompt.8mandos.gz \
195
 
                $(MANDIR)/man8/password-request.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
196
343
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
197
 
                 $(PREFIX)/lib/mandos $(CONFDIR)
 
344
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
198
345
        update-initramfs -k all -u
199
346
 
200
347
purge: purge-server purge-client
201
348
 
202
349
purge-server: uninstall-server
203
 
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf
 
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
204
354
        -rmdir $(CONFDIR)
205
355
 
206
356
purge-client: uninstall-client
207
 
        -rm --force $(CONFDIR)/seckey.txt $(CONFDIR)/pubkey.txt
208
 
        -rmdir $(CONFDIR) $(CONFDIR)/plugins.d
 
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)