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