/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:
Makefile
1
 
WARN=-O -Wall -Wformat=2 -Winit-self -Wmissing-include-dirs \
2
 
        -Wswitch-default -Wswitch-enum -Wunused-parameter \
3
 
        -Wstrict-aliasing=2 -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://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>
12
 
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC -fPIE
13
 
LINK_FORTIFY_LD=-z relro -fPIE
14
 
LINK_FORTIFY=-pie
 
14
# For info about _FORTIFY_SOURCE, see feature_test_macros(7)
 
15
# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
 
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
15
25
#COVERAGE=--coverage
16
 
OPTIMIZE=-Os
17
 
LANGUAGE=-std=gnu99
 
26
OPTIMIZE=-Os -fno-strict-aliasing
 
27
LANGUAGE=-std=gnu11
18
28
htmldir=man
19
 
version=1.0.5
 
29
version=1.6.9
20
30
SED=sed
21
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
 
22
35
## Use these settings for a traditional /usr/local install
23
36
# PREFIX=$(DESTDIR)/usr/local
24
37
# CONFDIR=$(DESTDIR)/etc/mandos
25
38
# KEYDIR=$(DESTDIR)/etc/mandos/keys
26
39
# MANDIR=$(PREFIX)/man
27
40
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
 
41
# STATEDIR=$(DESTDIR)/var/lib/mandos
 
42
# LIBDIR=$(PREFIX)/lib
28
43
##
29
44
 
30
45
## These settings are for a package-type install
33
48
KEYDIR=$(DESTDIR)/etc/keys/mandos
34
49
MANDIR=$(PREFIX)/share/man
35
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)
36
61
##
37
62
 
38
 
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
39
 
GNUTLS_LIBS=$(shell libgnutls-config --libs)
 
63
SYSTEMD=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
 
64
 
 
65
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
 
66
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
40
67
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
41
68
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
42
 
GPGME_CFLAGS=$(shell gpgme-config --cflags)
43
 
GPGME_LIBS=$(shell gpgme-config --libs)
 
69
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
 
70
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
 
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)
44
74
 
45
75
# Do not change these two
46
 
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
 
76
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
47
77
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
48
78
        -DVERSION='"$(version)"'
49
 
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))
50
80
 
51
81
# Commands to format a DocBook <refentry> document into a manual page
52
 
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
 
82
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
53
83
        --param man.charmap.use.subset          0 \
54
84
        --param make.year.ranges                1 \
55
85
        --param make.single.year.ranges         1 \
56
86
        --param man.output.quietly              1 \
57
87
        --param man.authors.section.enabled     0 \
58
 
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
 
88
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
59
89
        $(notdir $<); \
60
 
        $(MANPOST) $(notdir $@)
61
 
# DocBook-to-man post-processing to fix a '\n' escape bug
62
 
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)
63
94
 
64
 
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
 
95
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
65
96
        --param make.year.ranges                1 \
66
97
        --param make.single.year.ranges         1 \
67
98
        --param man.output.quietly              1 \
69
100
        --param citerefentry.link               1 \
70
101
        --output $@ \
71
102
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
72
 
        $<; $(HTMLPOST) $@
 
103
        $<; $(HTMLPOST) $@)
73
104
# Fix citerefentry links
74
105
HTMLPOST=$(SED) --in-place \
75
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'
76
107
 
77
108
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
78
 
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
79
 
CPROGS=plugin-runner $(PLUGINS)
80
 
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
81
 
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 \
82
116
        plugins.d/mandos-client.8mandos \
83
 
        plugins.d/password-prompt.8mandos mandos.conf.5 \
84
 
        plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
85
 
        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
86
120
 
87
121
htmldocs=$(addsuffix .xhtml,$(DOCS))
88
122
 
109
143
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
110
144
        $(DOCBOOKTOHTML)
111
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
 
112
151
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
113
152
                legalnotice.xml
114
153
        $(DOCBOOKTOMAN)
123
162
                 legalnotice.xml
124
163
        $(DOCBOOKTOHTML)
125
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
 
126
179
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
127
180
                legalnotice.xml
128
181
        $(DOCBOOKTOMAN)
150
203
 
151
204
# Update all these files with version number $(version)
152
205
common.ent: Makefile
153
 
        $(SED) --in-place \
154
 
                --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' \
155
 
                $@
 
206
        $(strip $(SED) --in-place \
 
207
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
 
208
                $@)
156
209
 
157
210
mandos: Makefile
158
 
        $(SED) --in-place \
 
211
        $(strip $(SED) --in-place \
159
212
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
160
 
                $@
 
213
                $@)
161
214
 
162
215
mandos-keygen: Makefile
163
 
        $(SED) --in-place \
 
216
        $(strip $(SED) --in-place \
164
217
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
165
 
                $@
 
218
                $@)
166
219
 
167
220
mandos-ctl: Makefile
168
 
        $(SED) --in-place \
169
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
170
 
                $@
 
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
                $@)
171
229
 
172
230
mandos.lsm: Makefile
173
 
        $(SED) --in-place \
 
231
        $(strip $(SED) --in-place \
174
232
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
175
 
                $@
176
 
        $(SED) --in-place \
 
233
                $@)
 
234
        $(strip $(SED) --in-place \
177
235
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
178
 
                $@
179
 
        $(SED) --in-place \
 
236
                $@)
 
237
        $(strip $(SED) --in-place \
180
238
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
181
 
                $@
182
 
 
183
 
plugins.d/mandos-client: plugins.d/mandos-client.o
184
 
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
185
 
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
186
 
 
187
 
.PHONY : all doc html clean distclean run-client run-server install \
188
 
        install-server install-client uninstall uninstall-server \
189
 
        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
190
254
 
191
255
clean:
192
256
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
194
258
distclean: clean
195
259
mostlyclean: clean
196
260
maintainer-clean: clean
197
 
        -rm --force --recursive keydir confdir
 
261
        -rm --force --recursive keydir confdir statedir
198
262
 
199
263
check:  all
200
264
        ./mandos --check
 
265
        ./mandos-ctl --check
201
266
 
202
267
# Run the client with a local config and key
203
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
204
282
        ./plugin-runner --plugin-dir=plugins.d \
 
283
                --plugin-helper-dir=plugin-helpers \
205
284
                --config-file=plugin-runner.conf \
206
 
                --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= \
207
287
                $(CLIENTARGS)
208
288
 
209
289
# Used by run-client
212
292
        ./mandos-keygen --dir keydir --force
213
293
 
214
294
# Run the server with a local config
215
 
run-server: confdir/mandos.conf confdir/clients.conf
216
 
        ./mandos --debug --configdir=confdir $(SERVERARGS)
 
295
run-server: confdir/mandos.conf confdir/clients.conf statedir
 
296
        ./mandos --debug --no-dbus --configdir=confdir \
 
297
                --statedir=statedir $(SERVERARGS)
217
298
 
218
299
# Used by run-server
219
300
confdir/mandos.conf: mandos.conf
223
304
        install --directory confdir
224
305
        install --mode=u=rw $< $@
225
306
# Add a client password
226
 
        ./mandos-keygen --dir keydir --password >> $@
 
307
        ./mandos-keygen --dir keydir --password --no-ssh >> $@
 
308
statedir:
 
309
        install --directory statedir
227
310
 
228
311
install: install-server install-client-nokey
229
312
 
234
317
 
235
318
install-server: doc
236
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
237
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
238
331
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
239
332
                mandos.conf
240
333
        install --mode=u=rw --target-directory=$(CONFDIR) \
241
334
                clients.conf
 
335
        install --mode=u=rw,go=r dbus-mandos.conf \
 
336
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
242
337
        install --mode=u=rwx,go=rx init.d-mandos \
243
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
244
342
        install --mode=u=rw,go=r default-mandos \
245
343
                $(DESTDIR)/etc/default/mandos
246
344
        if [ -z $(DESTDIR) ]; then \
248
346
        fi
249
347
        gzip --best --to-stdout mandos.8 \
250
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
251
353
        gzip --best --to-stdout mandos.conf.5 \
252
354
                > $(MANDIR)/man5/mandos.conf.5.gz
253
355
        gzip --best --to-stdout mandos-clients.conf.5 \
254
356
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
 
357
        gzip --best --to-stdout intro.8mandos \
 
358
                > $(MANDIR)/man8/intro.8mandos.gz
255
359
 
256
360
install-client-nokey: all doc
257
 
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
 
361
        install --directory $(LIBDIR)/mandos $(CONFDIR)
258
362
        install --directory --mode=u=rwx $(KEYDIR) \
259
 
                $(PREFIX)/lib/mandos/plugins.d
260
 
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
 
363
                $(LIBDIR)/mandos/plugins.d \
 
364
                $(LIBDIR)/mandos/plugin-helpers
 
365
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
261
366
                install --mode=u=rwx \
262
367
                        --directory "$(CONFDIR)/plugins.d"; \
 
368
                install --directory "$(CONFDIR)/plugin-helpers"; \
263
369
        fi
 
370
        install --mode=u=rwx,go=rx --directory \
 
371
                "$(CONFDIR)/network-hooks.d"
264
372
        install --mode=u=rwx,go=rx \
265
 
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
 
373
                --target-directory=$(LIBDIR)/mandos plugin-runner
266
374
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
267
375
                mandos-keygen
268
376
        install --mode=u=rwx,go=rx \
269
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
377
                --target-directory=$(LIBDIR)/mandos/plugins.d \
270
378
                plugins.d/password-prompt
271
379
        install --mode=u=rwxs,go=rx \
272
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
380
                --target-directory=$(LIBDIR)/mandos/plugins.d \
273
381
                plugins.d/mandos-client
274
382
        install --mode=u=rwxs,go=rx \
275
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
383
                --target-directory=$(LIBDIR)/mandos/plugins.d \
276
384
                plugins.d/usplash
277
385
        install --mode=u=rwxs,go=rx \
278
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
386
                --target-directory=$(LIBDIR)/mandos/plugins.d \
279
387
                plugins.d/splashy
280
388
        install --mode=u=rwxs,go=rx \
281
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
389
                --target-directory=$(LIBDIR)/mandos/plugins.d \
282
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
283
397
        install initramfs-tools-hook \
284
398
                $(INITRAMFSTOOLS)/hooks/mandos
285
399
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
286
400
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
287
401
        install initramfs-tools-script \
288
 
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
 
402
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
289
403
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
290
404
        gzip --best --to-stdout mandos-keygen.8 \
291
405
                > $(MANDIR)/man8/mandos-keygen.8.gz
292
406
        gzip --best --to-stdout plugin-runner.8mandos \
293
407
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
408
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
 
409
                > $(MANDIR)/man8/mandos-client.8mandos.gz
294
410
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
295
411
                > $(MANDIR)/man8/password-prompt.8mandos.gz
296
 
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
297
 
                > $(MANDIR)/man8/mandos-client.8mandos.gz
298
412
        gzip --best --to-stdout plugins.d/usplash.8mandos \
299
413
                > $(MANDIR)/man8/usplash.8mandos.gz
300
414
        gzip --best --to-stdout plugins.d/splashy.8mandos \
301
415
                > $(MANDIR)/man8/splashy.8mandos.gz
302
416
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
303
417
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
 
418
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
 
419
                > $(MANDIR)/man8/plymouth.8mandos.gz
304
420
 
305
421
install-client: install-client-nokey
306
422
# Post-installation stuff
312
428
 
313
429
uninstall-server:
314
430
        -rm --force $(PREFIX)/sbin/mandos \
 
431
                $(PREFIX)/sbin/mandos-ctl \
 
432
                $(PREFIX)/sbin/mandos-monitor \
315
433
                $(MANDIR)/man8/mandos.8.gz \
 
434
                $(MANDIR)/man8/mandos-monitor.8.gz \
 
435
                $(MANDIR)/man8/mandos-ctl.8.gz \
316
436
                $(MANDIR)/man5/mandos.conf.5.gz \
317
437
                $(MANDIR)/man5/mandos-clients.conf.5.gz
318
438
        update-rc.d -f mandos remove
324
444
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
325
445
                $(DESTDIR)/etc/crypttab
326
446
        -rm --force $(PREFIX)/sbin/mandos-keygen \
327
 
                $(PREFIX)/lib/mandos/plugin-runner \
328
 
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
329
 
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
330
 
                $(PREFIX)/lib/mandos/plugins.d/usplash \
331
 
                $(PREFIX)/lib/mandos/plugins.d/splashy \
332
 
                $(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 \
333
454
                $(INITRAMFSTOOLS)/hooks/mandos \
334
455
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
335
 
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
 
456
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
457
                $(MANDIR)/man8/mandos-keygen.8.gz \
336
458
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
337
 
                $(MANDIR)/man8/mandos-keygen.8.gz \
 
459
                $(MANDIR)/man8/mandos-client.8mandos.gz
338
460
                $(MANDIR)/man8/password-prompt.8mandos.gz \
339
461
                $(MANDIR)/man8/usplash.8mandos.gz \
340
462
                $(MANDIR)/man8/splashy.8mandos.gz \
341
463
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
342
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
343
 
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
344
 
                 $(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)
345
467
        update-initramfs -k all -u
346
468
 
347
469
purge: purge-server purge-client
348
470
 
349
471
purge-server: uninstall-server
350
472
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
 
473
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
351
474
                $(DESTDIR)/etc/default/mandos \
352
475
                $(DESTDIR)/etc/init.d/mandos \
 
476
                $(SYSTEMD)/mandos.service \
 
477
                $(DESTDIR)/run/mandos.pid \
353
478
                $(DESTDIR)/var/run/mandos.pid
354
479
        -rmdir $(CONFDIR)
355
480