/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: 2011-11-26 22:22:20 UTC
  • mto: (237.12.8 mandos-persistent)
  • mto: This revision was merged to the branch mainline in revision 290.
  • Revision ID: teddy@recompile.se-20111126222220-1ubwjpb5ugqnrhec
Directory with persistent state can now be changed with the "statedir"
option.  The state directory /var/lib/mandos now gets created on
installation.  Added documentation about "restore" and "statedir"
options.

* Makefile (USER, GROUP, STATEDIR): New.
  (maintainer-clean): Also remove "statedir".
  (run-server): Replaced "--no-restore" with "--statedir=statedir".
  (statedir): New.
  (install-server): Make $(STATEDIR) directory.
* debian/mandos.dirs (var/lib/mandos): Added.
* debian/mandos.postinst: Fix ownership of /var/lib/mandos.
* mandos: New --statedir option.
  (stored_state_path): Not global anymore.
  (stored_state_file): New global.
* mandos.conf: Fix whitespace.
  (restore, statedir): Added.
* mandos.conf.xml (OPTIONS, EXAMPLE): Added "restore" and "statedir".
  mandos.xml (SYNOPSIS, OPTIONS): Added "--statedir".
  (FILES): Added "/var/lib/mandos".

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
7
        -Wpacked -Wnested-externs -Winline -Wvolatile-register-var
8
 
#       -Wunreachable-code 
 
8
#       -Wunreachable-code
9
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 += -pie
 
21
endif
13
22
#COVERAGE=--coverage
14
23
OPTIMIZE=-Os
15
24
LANGUAGE=-std=gnu99
 
25
htmldir=man
 
26
version=1.4.1
 
27
SED=sed
 
28
 
 
29
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
 
30
GROUP=$(firstword $(subst :, ,$(shell getent group _mandos || getent group nobody || echo 65534)))
16
31
 
17
32
## Use these settings for a traditional /usr/local install
18
33
# PREFIX=$(DESTDIR)/usr/local
20
35
# KEYDIR=$(DESTDIR)/etc/mandos/keys
21
36
# MANDIR=$(PREFIX)/man
22
37
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
 
38
# STATEDIR=$(DESTDIR)/var/lib/mandos
23
39
##
24
40
 
25
41
## These settings are for a package-type install
28
44
KEYDIR=$(DESTDIR)/etc/keys/mandos
29
45
MANDIR=$(PREFIX)/share/man
30
46
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
 
47
STATEDIR=$(DESTDIR)/var/lib/mandos
31
48
##
32
49
 
33
 
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
34
 
GNUTLS_LIBS=$(shell libgnutls-config --libs)
 
50
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
 
51
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
35
52
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
36
53
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
37
 
GPGME_CFLAGS=$(shell gpgme-config --cflags)
38
 
GPGME_LIBS=$(shell gpgme-config --libs)
 
54
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
 
55
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
 
56
        getconf LFS_LDFLAGS)
39
57
 
40
58
# Do not change these two
41
59
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
42
 
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS)
43
 
LDFLAGS=$(COVERAGE)
 
60
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
 
61
        -DVERSION='"$(version)"'
 
62
LDFLAGS=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
44
63
 
45
64
# Commands to format a DocBook <refentry> document into a manual page
46
 
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
 
65
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
47
66
        --param man.charmap.use.subset          0 \
48
67
        --param make.year.ranges                1 \
49
68
        --param make.single.year.ranges         1 \
51
70
        --param man.authors.section.enabled     0 \
52
71
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
53
72
        $(notdir $<); \
54
 
        $(MANPOST) $(notdir $@)
 
73
        $(MANPOST) $(notdir $@);\
 
74
        LANG=en_US.UTF-8 MANWIDTH=80 man --warnings --encoding=UTF-8 \
 
75
        --local-file $(notdir $@) >/dev/null)
55
76
# DocBook-to-man post-processing to fix a '\n' escape bug
56
 
MANPOST=sed --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
 
77
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
57
78
 
58
 
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
 
79
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
59
80
        --param make.year.ranges                1 \
60
81
        --param make.single.year.ranges         1 \
61
82
        --param man.output.quietly              1 \
63
84
        --param citerefentry.link               1 \
64
85
        --output $@ \
65
86
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
66
 
        $<; $(HTMLPOST) $@
 
87
        $<; $(HTMLPOST) $@)
67
88
# Fix citerefentry links
68
 
HTMLPOST=sed --in-place --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
 
89
HTMLPOST=$(SED) --in-place \
 
90
        --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
69
91
 
70
92
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
71
 
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
72
 
PROGS=plugin-runner $(PLUGINS)
73
 
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
 
93
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
 
94
        plugins.d/plymouth
 
95
CPROGS=plugin-runner $(PLUGINS)
 
96
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
 
97
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
 
98
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
74
99
        plugins.d/mandos-client.8mandos \
75
 
        plugins.d/password-prompt.8mandos mandos.conf.5 \
76
 
        mandos-clients.conf.5
 
100
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
 
101
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
 
102
        plugins.d/plymouth.8mandos intro.8mandos
77
103
 
78
104
htmldocs=$(addsuffix .xhtml,$(DOCS))
79
105
 
80
 
objects=$(addsuffix .o,$(PROGS))
 
106
objects=$(addsuffix .o,$(CPROGS))
81
107
 
82
 
all: $(PROGS)
 
108
all: $(PROGS) mandos.lsm
83
109
 
84
110
doc: $(DOCS)
85
111
 
86
112
html: $(htmldocs)
87
113
 
88
 
%.5: %.xml legalnotice.xml
89
 
        $(DOCBOOKTOMAN)
90
 
%.5.xhtml: %.xml legalnotice.xml
91
 
        $(DOCBOOKTOHTML)
92
 
 
93
 
%.8: %.xml legalnotice.xml
94
 
        $(DOCBOOKTOMAN)
95
 
%.8.xhtml: %.xml legalnotice.xml
96
 
        $(DOCBOOKTOHTML)
97
 
 
98
 
%.8mandos: %.xml legalnotice.xml
99
 
        $(DOCBOOKTOMAN)
100
 
%.8mandos.xhtml: %.xml legalnotice.xml
101
 
        $(DOCBOOKTOHTML)
102
 
 
103
 
mandos.8: mandos.xml mandos-options.xml overview.xml legalnotice.xml
104
 
        $(DOCBOOKTOMAN)
105
 
mandos.8.xhtml: mandos.xml mandos-options.xml overview.xml \
106
 
                legalnotice.xml
107
 
        $(DOCBOOKTOHTML)
108
 
 
109
 
mandos-keygen.8: mandos-keygen.xml overview.xml legalnotice.xml
110
 
        $(DOCBOOKTOMAN)
111
 
mandos-keygen.8.xhtml: mandos-keygen.xml overview.xml legalnotice.xml
112
 
        $(DOCBOOKTOHTML)
113
 
 
114
 
mandos.conf.5: mandos.conf.xml mandos-options.xml legalnotice.xml
115
 
        $(DOCBOOKTOMAN)
116
 
mandos.conf.5.xhtml: mandos.conf.xml mandos-options.xml legalnotice.xml
117
 
        $(DOCBOOKTOHTML)
118
 
 
119
 
plugin-runner.8mandos: plugin-runner.xml overview.xml legalnotice.xml
120
 
        $(DOCBOOKTOMAN)
121
 
plugin-runner.8mandos.xhtml: plugin-runner.xml overview.xml \
122
 
                legalnotice.xml
 
114
%.5: %.xml common.ent legalnotice.xml
 
115
        $(DOCBOOKTOMAN)
 
116
%.5.xhtml: %.xml common.ent legalnotice.xml
 
117
        $(DOCBOOKTOHTML)
 
118
 
 
119
%.8: %.xml common.ent legalnotice.xml
 
120
        $(DOCBOOKTOMAN)
 
121
%.8.xhtml: %.xml common.ent legalnotice.xml
 
122
        $(DOCBOOKTOHTML)
 
123
 
 
124
%.8mandos: %.xml common.ent legalnotice.xml
 
125
        $(DOCBOOKTOMAN)
 
126
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
 
127
        $(DOCBOOKTOHTML)
 
128
 
 
129
intro.8mandos: intro.xml common.ent legalnotice.xml
 
130
        $(DOCBOOKTOMAN)
 
131
intro.8mandos.xhtml: intro.xml common.ent legalnotice.xml
 
132
        $(DOCBOOKTOHTML)
 
133
 
 
134
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
 
135
                legalnotice.xml
 
136
        $(DOCBOOKTOMAN)
 
137
mandos.8.xhtml: mandos.xml common.ent mandos-options.xml \
 
138
                overview.xml legalnotice.xml
 
139
        $(DOCBOOKTOHTML)
 
140
 
 
141
mandos-keygen.8: mandos-keygen.xml common.ent overview.xml \
 
142
                legalnotice.xml
 
143
        $(DOCBOOKTOMAN)
 
144
mandos-keygen.8.xhtml: mandos-keygen.xml common.ent overview.xml \
 
145
                 legalnotice.xml
 
146
        $(DOCBOOKTOHTML)
 
147
 
 
148
mandos-monitor.8: mandos-monitor.xml common.ent overview.xml \
 
149
                legalnotice.xml
 
150
        $(DOCBOOKTOMAN)
 
151
mandos-monitor.8.xhtml: mandos-monitor.xml common.ent overview.xml \
 
152
                 legalnotice.xml
 
153
        $(DOCBOOKTOHTML)
 
154
 
 
155
mandos-ctl.8: mandos-ctl.xml common.ent overview.xml \
 
156
                legalnotice.xml
 
157
        $(DOCBOOKTOMAN)
 
158
mandos-ctl.8.xhtml: mandos-ctl.xml common.ent overview.xml \
 
159
                 legalnotice.xml
 
160
        $(DOCBOOKTOHTML)
 
161
 
 
162
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
 
163
                legalnotice.xml
 
164
        $(DOCBOOKTOMAN)
 
165
mandos.conf.5.xhtml: mandos.conf.xml common.ent mandos-options.xml \
 
166
                legalnotice.xml
 
167
        $(DOCBOOKTOHTML)
 
168
 
 
169
plugin-runner.8mandos: plugin-runner.xml common.ent overview.xml \
 
170
                legalnotice.xml
 
171
        $(DOCBOOKTOMAN)
 
172
plugin-runner.8mandos.xhtml: plugin-runner.xml common.ent \
 
173
                overview.xml legalnotice.xml
123
174
        $(DOCBOOKTOHTML)
124
175
 
125
176
plugins.d/mandos-client.8mandos: plugins.d/mandos-client.xml \
 
177
                                        common.ent \
126
178
                                        mandos-options.xml \
127
179
                                        overview.xml legalnotice.xml
128
180
        $(DOCBOOKTOMAN)
129
181
plugins.d/mandos-client.8mandos.xhtml: plugins.d/mandos-client.xml \
 
182
                                        common.ent \
130
183
                                        mandos-options.xml \
131
184
                                        overview.xml legalnotice.xml
132
185
        $(DOCBOOKTOHTML)
133
186
 
134
 
plugins.d/mandos-client: plugins.d/mandos-client.o
135
 
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
136
 
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
187
# Update all these files with version number $(version)
 
188
common.ent: Makefile
 
189
        $(strip $(SED) --in-place \
 
190
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
 
191
                $@)
 
192
 
 
193
mandos: Makefile
 
194
        $(strip $(SED) --in-place \
 
195
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
196
                $@)
 
197
 
 
198
mandos-keygen: Makefile
 
199
        $(strip $(SED) --in-place \
 
200
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
 
201
                $@)
 
202
 
 
203
mandos-ctl: Makefile
 
204
        $(strip $(SED) --in-place \
 
205
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
206
                $@)
 
207
 
 
208
mandos-monitor: Makefile
 
209
        $(strip $(SED) --in-place \
 
210
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
211
                $@)
 
212
 
 
213
mandos.lsm: Makefile
 
214
        $(strip $(SED) --in-place \
 
215
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
 
216
                $@)
 
217
        $(strip $(SED) --in-place \
 
218
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
 
219
                $@)
 
220
        $(strip $(SED) --in-place \
 
221
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
 
222
                $@)
 
223
 
 
224
plugins.d/mandos-client: plugins.d/mandos-client.c
 
225
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
 
226
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
137
227
 
138
228
.PHONY : all doc html clean distclean run-client run-server install \
139
229
        install-server install-client uninstall uninstall-server \
140
230
        uninstall-client purge purge-server purge-client
141
231
 
142
232
clean:
143
 
        -rm --force $(PROGS) $(objects) $(htmldocs) $(DOCS) core
 
233
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
144
234
 
145
235
distclean: clean
146
236
mostlyclean: clean
147
237
maintainer-clean: clean
148
 
        -rm --force --recursive keydir confdir
 
238
        -rm --force --recursive keydir confdir statedir
149
239
 
150
 
check:
 
240
check:  all
151
241
        ./mandos --check
152
242
 
153
243
# Run the client with a local config and key
154
244
run-client: all keydir/seckey.txt keydir/pubkey.txt
 
245
        @echo "###################################################################"
 
246
        @echo "# The following error messages are harmless and can be safely     #"
 
247
        @echo "# ignored.  The messages are caused by not running as root, but   #"
 
248
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
 
249
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
 
250
        @echo "# From plugin-runner: setuid: Operation not permitted             #"
 
251
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
 
252
        @echo "# From mandos-client: setuid: Operation not permitted             #"
 
253
        @echo "#                     seteuid: Operation not permitted            #"
 
254
        @echo "#                     klogctl: Operation not permitted            #"
 
255
        @echo "###################################################################"
155
256
        ./plugin-runner --plugin-dir=plugins.d \
156
257
                --config-file=plugin-runner.conf \
157
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
 
258
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
 
259
                $(CLIENTARGS)
158
260
 
159
261
# Used by run-client
160
262
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
163
265
 
164
266
# Run the server with a local config
165
267
run-server: confdir/mandos.conf confdir/clients.conf
166
 
        ./mandos --debug --configdir=confdir
 
268
        ./mandos --debug --no-dbus --configdir=confdir \
 
269
                --statedir=statedir $(SERVERARGS)
167
270
 
168
271
# Used by run-server
169
272
confdir/mandos.conf: mandos.conf
174
277
        install --mode=u=rw $< $@
175
278
# Add a client password
176
279
        ./mandos-keygen --dir keydir --password >> $@
 
280
statedir:
 
281
        install --directory statedir
177
282
 
178
283
install: install-server install-client-nokey
179
284
 
180
 
install-html: $(htmldocs)
181
 
        install --directory man
182
 
        install --mode=u=rw,go=r --target-directory=man $(htmldocs)
 
285
install-html: html
 
286
        install --directory $(htmldir)
 
287
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
 
288
                $(htmldocs)
183
289
 
184
290
install-server: doc
185
291
        install --directory $(CONFDIR)
 
292
        install --directory --mode=u=rwx --owner=$(USER) \
 
293
                --group=$(GROUP) $(STATEDIR)
186
294
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
 
295
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
 
296
                mandos-ctl
 
297
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
 
298
                mandos-monitor
187
299
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
188
300
                mandos.conf
189
301
        install --mode=u=rw --target-directory=$(CONFDIR) \
190
302
                clients.conf
 
303
        install --mode=u=rw,go=r dbus-mandos.conf \
 
304
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
191
305
        install --mode=u=rwx,go=rx init.d-mandos \
192
306
                $(DESTDIR)/etc/init.d/mandos
193
307
        install --mode=u=rw,go=r default-mandos \
197
311
        fi
198
312
        gzip --best --to-stdout mandos.8 \
199
313
                > $(MANDIR)/man8/mandos.8.gz
 
314
        gzip --best --to-stdout mandos-monitor.8 \
 
315
                > $(MANDIR)/man8/mandos-monitor.8.gz
 
316
        gzip --best --to-stdout mandos-ctl.8 \
 
317
                > $(MANDIR)/man8/mandos-ctl.8.gz
200
318
        gzip --best --to-stdout mandos.conf.5 \
201
319
                > $(MANDIR)/man5/mandos.conf.5.gz
202
320
        gzip --best --to-stdout mandos-clients.conf.5 \
229
347
        install --mode=u=rwxs,go=rx \
230
348
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
231
349
                plugins.d/askpass-fifo
 
350
        install --mode=u=rwxs,go=rx \
 
351
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
352
                plugins.d/plymouth
232
353
        install initramfs-tools-hook \
233
354
                $(INITRAMFSTOOLS)/hooks/mandos
234
355
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
235
356
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
236
357
        install initramfs-tools-script \
237
 
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
 
358
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
238
359
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
239
360
        gzip --best --to-stdout mandos-keygen.8 \
240
361
                > $(MANDIR)/man8/mandos-keygen.8.gz
241
362
        gzip --best --to-stdout plugin-runner.8mandos \
242
363
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
364
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
 
365
                > $(MANDIR)/man8/mandos-client.8mandos.gz
243
366
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
244
367
                > $(MANDIR)/man8/password-prompt.8mandos.gz
245
 
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
246
 
                > $(MANDIR)/man8/mandos-client.8mandos.gz
 
368
        gzip --best --to-stdout plugins.d/usplash.8mandos \
 
369
                > $(MANDIR)/man8/usplash.8mandos.gz
 
370
        gzip --best --to-stdout plugins.d/splashy.8mandos \
 
371
                > $(MANDIR)/man8/splashy.8mandos.gz
 
372
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
 
373
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
 
374
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
 
375
                > $(MANDIR)/man8/plymouth.8mandos.gz
247
376
 
248
377
install-client: install-client-nokey
249
378
# Post-installation stuff
255
384
 
256
385
uninstall-server:
257
386
        -rm --force $(PREFIX)/sbin/mandos \
 
387
                $(PREFIX)/sbin/mandos-ctl \
 
388
                $(PREFIX)/sbin/mandos-monitor \
258
389
                $(MANDIR)/man8/mandos.8.gz \
 
390
                $(MANDIR)/man8/mandos-monitor.8.gz \
 
391
                $(MANDIR)/man8/mandos-ctl.8.gz \
259
392
                $(MANDIR)/man5/mandos.conf.5.gz \
260
393
                $(MANDIR)/man5/mandos-clients.conf.5.gz
261
394
        update-rc.d -f mandos remove
272
405
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
273
406
                $(PREFIX)/lib/mandos/plugins.d/usplash \
274
407
                $(PREFIX)/lib/mandos/plugins.d/splashy \
 
408
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
 
409
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
275
410
                $(INITRAMFSTOOLS)/hooks/mandos \
276
411
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
277
 
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
 
412
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
413
                $(MANDIR)/man8/mandos-keygen.8.gz \
278
414
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
279
 
                $(MANDIR)/man8/mandos-keygen.8.gz \
 
415
                $(MANDIR)/man8/mandos-client.8mandos.gz
280
416
                $(MANDIR)/man8/password-prompt.8mandos.gz \
281
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
282
 
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
283
 
                rm --force $(CONFDIR)/plugins.d/README; \
284
 
        fi
 
417
                $(MANDIR)/man8/usplash.8mandos.gz \
 
418
                $(MANDIR)/man8/splashy.8mandos.gz \
 
419
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
 
420
                $(MANDIR)/man8/plymouth.8mandos.gz \
285
421
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
286
422
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
287
423
        update-initramfs -k all -u
290
426
 
291
427
purge-server: uninstall-server
292
428
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
 
429
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
293
430
                $(DESTDIR)/etc/default/mandos \
294
431
                $(DESTDIR)/etc/init.d/mandos \
295
432
                $(DESTDIR)/var/run/mandos.pid