/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: 2015-07-20 03:03:33 UTC
  • Revision ID: teddy@recompile.se-20150720030333-203m2aeblypcsfte
Bug fix for GnuTLS 3: be compatible with old 2048-bit DSA keys.

The mandos-keygen program in Mandos version 1.6.0 and older generated
2048-bit DSA keys, and when GnuTLS uses these it has trouble
connecting using the Mandos default priority string.  This was
previously fixed in Mandos 1.6.2, but the bug reappeared when using
GnuTLS 3, so the default priority string has to change again; this
time also the Mandos client has to change its default, so now the
server and the client should use the same default priority string:

SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA:+SIGN-DSA-SHA256

* mandos (main/server_defaults): Changed default priority string.
* mandos-options.xml (/section/para[id="priority_compat"]): Removed.
  (/section/para[id="priority"]): Changed default priority string.
* mandos.conf ([DEFAULT]/priority): - '' -
* mandos.conf.xml (OPTIONS/priority): Refer to the id "priority"
                                      instead of "priority_compat".
* mandos.xml (OPTIONS/--priority): - '' -
* plugins.d/mandos-client.c (main): Changed default priority string.

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