/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: 2019-07-18 00:02:43 UTC
  • Revision ID: teddy@recompile.se-20190718000243-okz4s9xao1r1tfnx
Document bug in mandos-keygen which strips white space from passwords

Passwords, as read by mandos-keygen when given the --password or -p
options, are stripped of white space from the start and from the end
of the password.  This is because mandos-keygen is a shell script, and
the Bourne Shell "read" builtin does not seem to have a way to avoid
this.  Document this bug.

* manods-keygen.xml (OPTIONS): Document the white space-stripping
                               nature of the --password/-p option, and
                               also note in the description of
                               --passfile and -F that they avoid this
                               behavior.
  (BUGS): Again mention the problem with the --password and -p
          options, and suggest --passfile as a possible workaround.

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