/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: 2016-03-13 00:37:02 UTC
  • Revision ID: teddy@recompile.se-20160313003702-dulwtwt8ilpojra9
Server: Fix bug where it did not exit timely on signals

Use GLib.unix_signal_add() instead of signal.signal() to catch
signals; this will allow GLib to do its internal magic with signal
file descriptors.  (GLib does not handle signals properly otherwise.)
The function unix_signal_add() requires GLib 2.30 or later, which was
not required by PyGobject until version 3.7.1, so depend on this.

* INSTALL (Mandos Server): Document dependency on PyGObject 3.7.1
* mandos (main): Use GLib.unix_signal_add instead of signal.signal.
* init.d-mandos (do_stop): Remove workaround.
* mandos.service ([Service]): - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
WARN=-O -Wall -Wformat=2 -Winit-self -Wmissing-include-dirs \
2
 
        -Wswitch-default -Wswitch-enum -Wunused-parameter \
3
 
        -Wstrict-aliasing=1 -Wextra -Wfloat-equal -Wundef -Wshadow \
 
1
WARN=-O -Wall -Wextra -Wdouble-promotion -Wformat=2 -Winit-self \
 
2
        -Wmissing-include-dirs -Wswitch-default -Wswitch-enum \
 
3
        -Wunused -Wuninitialized -Wstrict-overflow=5 \
 
4
        -Wsuggest-attribute=pure -Wsuggest-attribute=const \
 
5
        -Wsuggest-attribute=noreturn -Wfloat-equal -Wundef -Wshadow \
4
6
        -Wunsafe-loop-optimizations -Wpointer-arith \
5
7
        -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings \
6
 
        -Wconversion -Wstrict-prototypes -Wold-style-definition \
7
 
        -Wpacked -Wnested-externs -Winline -Wvolatile-register-var
8
 
#       -Wunreachable-code 
 
8
        -Wconversion -Wlogical-op -Waggregate-return \
 
9
        -Wstrict-prototypes -Wold-style-definition \
 
10
        -Wmissing-format-attribute -Wnormalized=nfc -Wpacked \
 
11
        -Wredundant-decls -Wnested-externs -Winline -Wvla \
 
12
        -Wvolatile-register-var -Woverlength-strings
9
13
#DEBUG=-ggdb3
10
 
# For info about _FORTIFY_SOURCE, see
11
 
# <http://www.kernel.org/doc/man-pages/online/pages/man7/feature_test_macros.7.html>
 
14
# For info about _FORTIFY_SOURCE, see feature_test_macros(7)
12
15
# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
13
16
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
 
17
# <https://developerblog.redhat.com/2014/10/16/gcc-undefined-behavior-sanitizer-ubsan/>
 
18
ALL_SANITIZE_OPTIONS:=-fsanitize=address -fsanitize=undefined \
 
19
        -fsanitize=shift -fsanitize=integer-divide-by-zero \
 
20
        -fsanitize=unreachable -fsanitize=vla-bound -fsanitize=null \
 
21
        -fsanitize=return -fsanitize=signed-integer-overflow \
 
22
        -fsanitize=bounds -fsanitize=alignment \
 
23
        -fsanitize=object-size -fsanitize=float-divide-by-zero \
 
24
        -fsanitize=float-cast-overflow -fsanitize=nonnull-attribute \
 
25
        -fsanitize=returns-nonnull-attribute -fsanitize=bool \
 
26
        -fsanitize=enum
 
27
# Check which sanitizing options can be used
 
28
SANITIZE:=$(foreach option,$(ALL_SANITIZE_OPTIONS),$(shell \
 
29
        echo 'int main(){}' | $(CC) --language=c $(option) /dev/stdin \
 
30
        -o /dev/null >/dev/null 2>&1 && echo $(option)))
14
31
LINK_FORTIFY_LD=-z relro -z now
15
32
LINK_FORTIFY=
 
33
 
 
34
# If BROKEN_PIE is set, do not build with -pie
16
35
ifndef BROKEN_PIE
17
36
FORTIFY += -fPIE
18
 
LINK_FORTIFY_LD += -fPIE
19
37
LINK_FORTIFY += -pie
20
38
endif
21
39
#COVERAGE=--coverage
22
 
OPTIMIZE=-Os
23
 
LANGUAGE=-std=gnu99
 
40
OPTIMIZE=-Os -fno-strict-aliasing
 
41
LANGUAGE=-std=gnu11
24
42
htmldir=man
25
 
version=1.0.14
 
43
version=1.7.5
26
44
SED=sed
27
45
 
 
46
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
 
47
GROUP=$(firstword $(subst :, ,$(shell getent group _mandos || getent group nogroup || echo 65534)))
 
48
 
28
49
## Use these settings for a traditional /usr/local install
29
50
# PREFIX=$(DESTDIR)/usr/local
30
51
# CONFDIR=$(DESTDIR)/etc/mandos
31
52
# KEYDIR=$(DESTDIR)/etc/mandos/keys
32
53
# MANDIR=$(PREFIX)/man
33
54
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
 
55
# STATEDIR=$(DESTDIR)/var/lib/mandos
 
56
# LIBDIR=$(PREFIX)/lib
34
57
##
35
58
 
36
59
## These settings are for a package-type install
39
62
KEYDIR=$(DESTDIR)/etc/keys/mandos
40
63
MANDIR=$(PREFIX)/share/man
41
64
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
 
65
STATEDIR=$(DESTDIR)/var/lib/mandos
 
66
LIBDIR=$(shell \
 
67
        for d in \
 
68
        "/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null`" \
 
69
        "`rpm --eval='%{_libdir}' 2>/dev/null`" /usr/lib; do \
 
70
                if [ -d "$$d" -a "$$d" = "$${d%/}" ]; then \
 
71
                        echo "$(DESTDIR)$$d"; \
 
72
                        break; \
 
73
                fi; \
 
74
        done)
42
75
##
43
76
 
 
77
SYSTEMD=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
 
78
 
44
79
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
45
80
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
46
81
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
48
83
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
49
84
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
50
85
        getconf LFS_LDFLAGS)
 
86
LIBNL3_CFLAGS=$(shell pkg-config --cflags-only-I libnl-route-3.0)
 
87
LIBNL3_LIBS=$(shell pkg-config --libs libnl-route-3.0)
51
88
 
52
89
# Do not change these two
53
 
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
54
 
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
55
 
        -DVERSION='"$(version)"'
56
 
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
90
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(SANITIZE) $(COVERAGE) \
 
91
        $(OPTIMIZE) $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) \
 
92
        $(GPGME_CFLAGS) -DVERSION='"$(version)"'
 
93
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
57
94
 
58
95
# Commands to format a DocBook <refentry> document into a manual page
59
96
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
62
99
        --param make.single.year.ranges         1 \
63
100
        --param man.output.quietly              1 \
64
101
        --param man.authors.section.enabled     0 \
65
 
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
 
102
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
66
103
        $(notdir $<); \
67
 
        $(MANPOST) $(notdir $@))
68
 
# DocBook-to-man post-processing to fix a '\n' escape bug
69
 
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
 
104
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
 
105
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
 
106
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
 
107
        fi >/dev/null)
70
108
 
71
109
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
72
110
        --param make.year.ranges                1 \
82
120
        --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
83
121
 
84
122
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
85
 
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
86
 
CPROGS=plugin-runner $(PLUGINS)
87
 
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
88
 
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
 
123
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
 
124
        plugins.d/plymouth
 
125
PLUGIN_HELPERS=plugin-helpers/mandos-client-iprouteadddel
 
126
CPROGS=plugin-runner $(PLUGINS) $(PLUGIN_HELPERS)
 
127
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
 
128
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
 
129
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
89
130
        plugins.d/mandos-client.8mandos \
90
 
        plugins.d/password-prompt.8mandos mandos.conf.5 \
91
 
        plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
92
 
        plugins.d/askpass-fifo.8mandos mandos-clients.conf.5
 
131
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
 
132
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
 
133
        plugins.d/plymouth.8mandos intro.8mandos
93
134
 
94
135
htmldocs=$(addsuffix .xhtml,$(DOCS))
95
136
 
116
157
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
117
158
        $(DOCBOOKTOHTML)
118
159
 
 
160
intro.8mandos: intro.xml common.ent legalnotice.xml
 
161
        $(DOCBOOKTOMAN)
 
162
intro.8mandos.xhtml: intro.xml common.ent legalnotice.xml
 
163
        $(DOCBOOKTOHTML)
 
164
 
119
165
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
120
166
                legalnotice.xml
121
167
        $(DOCBOOKTOMAN)
130
176
                 legalnotice.xml
131
177
        $(DOCBOOKTOHTML)
132
178
 
 
179
mandos-monitor.8: mandos-monitor.xml common.ent overview.xml \
 
180
                legalnotice.xml
 
181
        $(DOCBOOKTOMAN)
 
182
mandos-monitor.8.xhtml: mandos-monitor.xml common.ent overview.xml \
 
183
                 legalnotice.xml
 
184
        $(DOCBOOKTOHTML)
 
185
 
 
186
mandos-ctl.8: mandos-ctl.xml common.ent overview.xml \
 
187
                legalnotice.xml
 
188
        $(DOCBOOKTOMAN)
 
189
mandos-ctl.8.xhtml: mandos-ctl.xml common.ent overview.xml \
 
190
                 legalnotice.xml
 
191
        $(DOCBOOKTOHTML)
 
192
 
133
193
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
134
194
                legalnotice.xml
135
195
        $(DOCBOOKTOMAN)
176
236
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
177
237
                $@)
178
238
 
 
239
mandos-monitor: Makefile
 
240
        $(strip $(SED) --in-place \
 
241
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
242
                $@)
 
243
 
179
244
mandos.lsm: Makefile
180
245
        $(strip $(SED) --in-place \
181
246
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
188
253
                $@)
189
254
 
190
255
plugins.d/mandos-client: plugins.d/mandos-client.c
191
 
        $(LINK.c) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) $(strip\
192
 
                ) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
193
 
 
194
 
.PHONY : all doc html clean distclean run-client run-server install \
195
 
        install-server install-client uninstall uninstall-server \
196
 
        uninstall-client purge purge-server purge-client
 
256
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
 
257
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
 
258
 
 
259
plugin-helpers/mandos-client-iprouteadddel: plugin-helpers/mandos-client-iprouteadddel.c
 
260
        $(LINK.c) $(LIBNL3_CFLAGS) $^ $(LIBNL3_LIBS) $(strip\
 
261
                ) $(LOADLIBES) $(LDLIBS) -o $@
 
262
 
 
263
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
 
264
        check run-client run-server install install-html \
 
265
        install-server install-client-nokey install-client uninstall \
 
266
        uninstall-server uninstall-client purge purge-server \
 
267
        purge-client
197
268
 
198
269
clean:
199
270
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
201
272
distclean: clean
202
273
mostlyclean: clean
203
274
maintainer-clean: clean
204
 
        -rm --force --recursive keydir confdir
 
275
        -rm --force --recursive keydir confdir statedir
205
276
 
206
277
check:  all
207
278
        ./mandos --check
 
279
        ./mandos-ctl --check
208
280
 
209
281
# Run the client with a local config and key
210
282
run-client: all keydir/seckey.txt keydir/pubkey.txt
 
283
        @echo "###################################################################"
 
284
        @echo "# The following error messages are harmless and can be safely     #"
 
285
        @echo "# ignored.  The messages are caused by not running as root, but   #"
 
286
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
 
287
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
 
288
        @echo "# From plugin-runner: setgid: Operation not permitted             #"
 
289
        @echo "#                     setuid: Operation not permitted             #"
 
290
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
 
291
        @echo "# From mandos-client:                                             #"
 
292
        @echo "#             Failed to raise privileges: Operation not permitted #"
 
293
        @echo "#             Warning: network hook \"*\" exited with status *      #"
 
294
        @echo "###################################################################"
 
295
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
211
296
        ./plugin-runner --plugin-dir=plugins.d \
 
297
                --plugin-helper-dir=plugin-helpers \
212
298
                --config-file=plugin-runner.conf \
213
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
 
299
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
 
300
                --env-for=mandos-client:GNOME_KEYRING_CONTROL= \
214
301
                $(CLIENTARGS)
215
302
 
216
303
# Used by run-client
219
306
        ./mandos-keygen --dir keydir --force
220
307
 
221
308
# Run the server with a local config
222
 
run-server: confdir/mandos.conf confdir/clients.conf
223
 
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
 
309
run-server: confdir/mandos.conf confdir/clients.conf statedir
 
310
        ./mandos --debug --no-dbus --configdir=confdir \
 
311
                --statedir=statedir $(SERVERARGS)
224
312
 
225
313
# Used by run-server
226
314
confdir/mandos.conf: mandos.conf
230
318
        install --directory confdir
231
319
        install --mode=u=rw $< $@
232
320
# Add a client password
233
 
        ./mandos-keygen --dir keydir --password >> $@
 
321
        ./mandos-keygen --dir keydir --password --no-ssh >> $@
 
322
statedir:
 
323
        install --directory statedir
234
324
 
235
325
install: install-server install-client-nokey
236
326
 
241
331
 
242
332
install-server: doc
243
333
        install --directory $(CONFDIR)
 
334
        if install --directory --mode=u=rwx --owner=$(USER) \
 
335
                --group=$(GROUP) $(STATEDIR); then \
 
336
                :; \
 
337
        elif install --directory --mode=u=rwx $(STATEDIR); then \
 
338
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
 
339
        fi
244
340
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
 
341
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
 
342
                mandos-ctl
 
343
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
 
344
                mandos-monitor
245
345
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
246
346
                mandos.conf
247
347
        install --mode=u=rw --target-directory=$(CONFDIR) \
248
348
                clients.conf
 
349
        install --mode=u=rw,go=r dbus-mandos.conf \
 
350
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
249
351
        install --mode=u=rwx,go=rx init.d-mandos \
250
352
                $(DESTDIR)/etc/init.d/mandos
 
353
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
 
354
                install --mode=u=rw,go=r mandos.service $(SYSTEMD); \
 
355
        fi
251
356
        install --mode=u=rw,go=r default-mandos \
252
357
                $(DESTDIR)/etc/default/mandos
253
358
        if [ -z $(DESTDIR) ]; then \
255
360
        fi
256
361
        gzip --best --to-stdout mandos.8 \
257
362
                > $(MANDIR)/man8/mandos.8.gz
 
363
        gzip --best --to-stdout mandos-monitor.8 \
 
364
                > $(MANDIR)/man8/mandos-monitor.8.gz
 
365
        gzip --best --to-stdout mandos-ctl.8 \
 
366
                > $(MANDIR)/man8/mandos-ctl.8.gz
258
367
        gzip --best --to-stdout mandos.conf.5 \
259
368
                > $(MANDIR)/man5/mandos.conf.5.gz
260
369
        gzip --best --to-stdout mandos-clients.conf.5 \
261
370
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
 
371
        gzip --best --to-stdout intro.8mandos \
 
372
                > $(MANDIR)/man8/intro.8mandos.gz
262
373
 
263
374
install-client-nokey: all doc
264
 
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
 
375
        install --directory $(LIBDIR)/mandos $(CONFDIR)
265
376
        install --directory --mode=u=rwx $(KEYDIR) \
266
 
                $(PREFIX)/lib/mandos/plugins.d
267
 
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
 
377
                $(LIBDIR)/mandos/plugins.d \
 
378
                $(LIBDIR)/mandos/plugin-helpers
 
379
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
268
380
                install --mode=u=rwx \
269
381
                        --directory "$(CONFDIR)/plugins.d"; \
 
382
                install --directory "$(CONFDIR)/plugin-helpers"; \
270
383
        fi
 
384
        install --mode=u=rwx,go=rx --directory \
 
385
                "$(CONFDIR)/network-hooks.d"
271
386
        install --mode=u=rwx,go=rx \
272
 
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
 
387
                --target-directory=$(LIBDIR)/mandos plugin-runner
273
388
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
274
389
                mandos-keygen
275
390
        install --mode=u=rwx,go=rx \
276
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
391
                --target-directory=$(LIBDIR)/mandos/plugins.d \
277
392
                plugins.d/password-prompt
278
393
        install --mode=u=rwxs,go=rx \
279
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
394
                --target-directory=$(LIBDIR)/mandos/plugins.d \
280
395
                plugins.d/mandos-client
281
396
        install --mode=u=rwxs,go=rx \
282
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
397
                --target-directory=$(LIBDIR)/mandos/plugins.d \
283
398
                plugins.d/usplash
284
399
        install --mode=u=rwxs,go=rx \
285
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
400
                --target-directory=$(LIBDIR)/mandos/plugins.d \
286
401
                plugins.d/splashy
287
402
        install --mode=u=rwxs,go=rx \
288
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
403
                --target-directory=$(LIBDIR)/mandos/plugins.d \
289
404
                plugins.d/askpass-fifo
 
405
        install --mode=u=rwxs,go=rx \
 
406
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
407
                plugins.d/plymouth
 
408
        install --mode=u=rwxs,go=rx \
 
409
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
 
410
                plugin-helpers/mandos-client-iprouteadddel
290
411
        install initramfs-tools-hook \
291
412
                $(INITRAMFSTOOLS)/hooks/mandos
292
413
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
298
419
                > $(MANDIR)/man8/mandos-keygen.8.gz
299
420
        gzip --best --to-stdout plugin-runner.8mandos \
300
421
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
422
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
 
423
                > $(MANDIR)/man8/mandos-client.8mandos.gz
301
424
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
302
425
                > $(MANDIR)/man8/password-prompt.8mandos.gz
303
 
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
304
 
                > $(MANDIR)/man8/mandos-client.8mandos.gz
305
426
        gzip --best --to-stdout plugins.d/usplash.8mandos \
306
427
                > $(MANDIR)/man8/usplash.8mandos.gz
307
428
        gzip --best --to-stdout plugins.d/splashy.8mandos \
308
429
                > $(MANDIR)/man8/splashy.8mandos.gz
309
430
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
310
431
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
 
432
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
 
433
                > $(MANDIR)/man8/plymouth.8mandos.gz
311
434
 
312
435
install-client: install-client-nokey
313
436
# Post-installation stuff
319
442
 
320
443
uninstall-server:
321
444
        -rm --force $(PREFIX)/sbin/mandos \
 
445
                $(PREFIX)/sbin/mandos-ctl \
 
446
                $(PREFIX)/sbin/mandos-monitor \
322
447
                $(MANDIR)/man8/mandos.8.gz \
 
448
                $(MANDIR)/man8/mandos-monitor.8.gz \
 
449
                $(MANDIR)/man8/mandos-ctl.8.gz \
323
450
                $(MANDIR)/man5/mandos.conf.5.gz \
324
451
                $(MANDIR)/man5/mandos-clients.conf.5.gz
325
452
        update-rc.d -f mandos remove
331
458
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
332
459
                $(DESTDIR)/etc/crypttab
333
460
        -rm --force $(PREFIX)/sbin/mandos-keygen \
334
 
                $(PREFIX)/lib/mandos/plugin-runner \
335
 
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
336
 
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
337
 
                $(PREFIX)/lib/mandos/plugins.d/usplash \
338
 
                $(PREFIX)/lib/mandos/plugins.d/splashy \
339
 
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
 
461
                $(LIBDIR)/mandos/plugin-runner \
 
462
                $(LIBDIR)/mandos/plugins.d/password-prompt \
 
463
                $(LIBDIR)/mandos/plugins.d/mandos-client \
 
464
                $(LIBDIR)/mandos/plugins.d/usplash \
 
465
                $(LIBDIR)/mandos/plugins.d/splashy \
 
466
                $(LIBDIR)/mandos/plugins.d/askpass-fifo \
 
467
                $(LIBDIR)/mandos/plugins.d/plymouth \
340
468
                $(INITRAMFSTOOLS)/hooks/mandos \
341
469
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
342
470
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
471
                $(MANDIR)/man8/mandos-keygen.8.gz \
343
472
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
344
 
                $(MANDIR)/man8/mandos-keygen.8.gz \
 
473
                $(MANDIR)/man8/mandos-client.8mandos.gz
345
474
                $(MANDIR)/man8/password-prompt.8mandos.gz \
346
475
                $(MANDIR)/man8/usplash.8mandos.gz \
347
476
                $(MANDIR)/man8/splashy.8mandos.gz \
348
477
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
349
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
350
 
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
351
 
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
 
478
                $(MANDIR)/man8/plymouth.8mandos.gz \
 
479
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
 
480
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
352
481
        update-initramfs -k all -u
353
482
 
354
483
purge: purge-server purge-client
355
484
 
356
485
purge-server: uninstall-server
357
486
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
 
487
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
358
488
                $(DESTDIR)/etc/default/mandos \
359
489
                $(DESTDIR)/etc/init.d/mandos \
 
490
                $(SYSTEMD)/mandos.service \
 
491
                $(DESTDIR)/run/mandos.pid \
360
492
                $(DESTDIR)/var/run/mandos.pid
361
493
        -rmdir $(CONFDIR)
362
494