/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: 2016-10-05 19:56:40 UTC
  • Revision ID: teddy@recompile.se-20161005195640-yrjxv8kkx662usr0
Fix bug where Mandos client would crash on exit

* plugins.d/mandos-client.c (init_gnutls_global): Fix memory leak by
  doing free(params.data) after import.

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