/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

* mandos-monitor (MandosClientPropertyCache): Remove conversion of
                                              D-Bus types to native
                                              Python types.
  (MandosClientPropertyCache.type_map): Removed attribute.
  (MandosClientPropertyCache.conversion): Removed method.
  (ConstrainedListBox): New; a ListBox which will keep the focus.
  (UserInterface.__init__): Take new argument "max_log_length".
  (UserInterface.divider, UserInterface.log,
  UserInterface.max_log_length, UserInterface.logbox,
  UserInterface.log_visible, UserInterface.log_wrap): New attributes.
  (UserInterface.rebuild, UserInterface.log_message,
  UserInterface.toggle_log_display, UserInterface.change_log_display):
  New methods.
  (UserInterface.remove_client): Bug fix: Eliminate double client
                                 listing when an empty list gets a
                                 ClientAdded signal.
  (UserInterface.process_input): Add more key translations.

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