/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: 2018-02-22 14:34:19 UTC
  • Revision ID: teddy@recompile.se-20180222143419-4uh4vcpgc9hv2fzx
Check return values from newly added close() calls

* plugins.d/mandos-client.c (init_gnutls_global): Check return
  values from newly added close() calls.

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