/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

  • Committer: Teddy Hogeborn
  • Date: 2014-03-06 02:26:04 UTC
  • Revision ID: teddy@recompile.se-20140306022604-4uc43taz25cflgi3
Bug fix: Free all memory and give better messages when memory is full.

* plugin-runner.c (add_to_char_array): Bug fix: If realloc fails, do
                                       not change old array pointer.
  (add_environment): Bug fix: If realloc fails, do not change old
                     environment pointer.  Also rename "e" to "envdef"
                     for clarity.
  (main): Bug fix: If realloc fails, do not change old pointers.  Also
          wrap "#pragma GCC" with "#ifdef ___GNUC___".
* plugins.d/mandos-client.c (incbuffer): Bug fix: if realloc fails,
                                         free old buffer.
  (run_network_hooks): Moved variables "directory" and "ret" to their
                       innermost possible scope.
  (take_down_interface): Moved variables "sd", "ret_errno", and
                         "ret_setflags" to their innermost possible
                         scope.
  (main): Removed variable "interfaces_hooks_size".  Also, if argz_add
          fails when adding all found interfaces, the error message
          will now be correct.  Also print error message if, after
          having taken up an interface, argz_add fails to add
          interface to list of interfaces to be taken down.
* plugins.d/mandos-client.xml (OPTIONS): Explain better what "none"
                                         means as argument to
                                         "--interface" by negating
                                         sense.
* plugins.d/password-prompt.c (fprintf_plus): Removed (unused).

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