/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-06-03 17:27:03 UTC
  • Revision ID: teddy@recompile.se-20160603172703-mc6tjor6rhq4xy74
mandos: Bug fix: Do multiprocessing cleanup correctly on exit

* mandos (main): Save module "multiprocessing" and open file "wnull"
                 as scope variables accessible by function cleanup(),
                 since the module and global variable may not be
                 accessible when the cleanup() function is run as
                 scheduled by atexit().

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 -fPIE -pie
13
 
LINK_FORTIFY=-z relro -pie
 
14
# For info about _FORTIFY_SOURCE, see feature_test_macros(7)
 
15
# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
 
16
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
 
17
# <https://developerblog.redhat.com/2014/10/16/gcc-undefined-behavior-sanitizer-ubsan/>
 
18
ALL_SANITIZE_OPTIONS:=-fsanitize=address -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
14
39
#COVERAGE=--coverage
15
 
OPTIMIZE=-Os
16
 
LANGUAGE=-std=gnu99
 
40
OPTIMIZE=-Os -fno-strict-aliasing
 
41
LANGUAGE=-std=gnu11
17
42
htmldir=man
18
 
version=1.0.1
 
43
version=1.7.7
19
44
SED=sed
20
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
 
21
49
## Use these settings for a traditional /usr/local install
22
50
# PREFIX=$(DESTDIR)/usr/local
23
51
# CONFDIR=$(DESTDIR)/etc/mandos
24
52
# KEYDIR=$(DESTDIR)/etc/mandos/keys
25
53
# MANDIR=$(PREFIX)/man
26
54
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
 
55
# STATEDIR=$(DESTDIR)/var/lib/mandos
 
56
# LIBDIR=$(PREFIX)/lib
27
57
##
28
58
 
29
59
## These settings are for a package-type install
32
62
KEYDIR=$(DESTDIR)/etc/keys/mandos
33
63
MANDIR=$(PREFIX)/share/man
34
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)
35
75
##
36
76
 
37
 
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
38
 
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)
39
82
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
40
83
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
41
 
GPGME_CFLAGS=$(shell gpgme-config --cflags)
42
 
GPGME_LIBS=$(shell gpgme-config --libs)
 
84
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
 
85
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
 
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)
43
89
 
44
90
# Do not change these two
45
 
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
46
 
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
47
 
        -DVERSION='"$(version)"'
48
 
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY)
 
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))
49
95
 
50
96
# Commands to format a DocBook <refentry> document into a manual page
51
 
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
 
97
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
52
98
        --param man.charmap.use.subset          0 \
53
99
        --param make.year.ranges                1 \
54
100
        --param make.single.year.ranges         1 \
55
101
        --param man.output.quietly              1 \
56
102
        --param man.authors.section.enabled     0 \
57
 
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
 
103
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
58
104
        $(notdir $<); \
59
 
        $(MANPOST) $(notdir $@)
60
 
# DocBook-to-man post-processing to fix a '\n' escape bug
61
 
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)
62
109
 
63
 
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
 
110
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
64
111
        --param make.year.ranges                1 \
65
112
        --param make.single.year.ranges         1 \
66
113
        --param man.output.quietly              1 \
68
115
        --param citerefentry.link               1 \
69
116
        --output $@ \
70
117
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
71
 
        $<; $(HTMLPOST) $@
 
118
        $<; $(HTMLPOST) $@)
72
119
# Fix citerefentry links
73
 
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'
 
120
HTMLPOST=$(SED) --in-place \
 
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'
74
122
 
75
123
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
76
 
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
77
 
CPROGS=plugin-runner $(PLUGINS)
78
 
PROGS=mandos mandos-keygen $(CPROGS)
79
 
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 \
80
131
        plugins.d/mandos-client.8mandos \
81
 
        plugins.d/password-prompt.8mandos mandos.conf.5 \
82
 
        plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
83
 
        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
84
135
 
85
136
htmldocs=$(addsuffix .xhtml,$(DOCS))
86
137
 
87
138
objects=$(addsuffix .o,$(CPROGS))
88
139
 
89
 
all: $(PROGS)
 
140
all: $(PROGS) mandos.lsm
90
141
 
91
142
doc: $(DOCS)
92
143
 
107
158
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
108
159
        $(DOCBOOKTOHTML)
109
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
 
110
166
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
111
167
                legalnotice.xml
112
168
        $(DOCBOOKTOMAN)
121
177
                 legalnotice.xml
122
178
        $(DOCBOOKTOHTML)
123
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
 
124
194
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
125
195
                legalnotice.xml
126
196
        $(DOCBOOKTOMAN)
148
218
 
149
219
# Update all these files with version number $(version)
150
220
common.ent: Makefile
151
 
        $(SED) --in-place --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' $@
 
221
        $(strip $(SED) --in-place \
 
222
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
 
223
                $@)
152
224
 
153
225
mandos: Makefile
154
 
        $(SED) --in-place --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' $@
 
226
        $(strip $(SED) --in-place \
 
227
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
228
                $@)
155
229
 
156
230
mandos-keygen: Makefile
157
 
        $(SED) --in-place --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' $@
158
 
 
159
 
plugins.d/mandos-client: plugins.d/mandos-client.o
160
 
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
161
 
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
162
 
 
163
 
.PHONY : all doc html clean distclean run-client run-server install \
164
 
        install-server install-client uninstall uninstall-server \
165
 
        uninstall-client purge purge-server purge-client
 
231
        $(strip $(SED) --in-place \
 
232
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
 
233
                $@)
 
234
 
 
235
mandos-ctl: Makefile
 
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
                $@)
 
244
 
 
245
mandos.lsm: Makefile
 
246
        $(strip $(SED) --in-place \
 
247
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
 
248
                $@)
 
249
        $(strip $(SED) --in-place \
 
250
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
 
251
                $@)
 
252
        $(strip $(SED) --in-place \
 
253
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
 
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
166
269
 
167
270
clean:
168
271
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
170
273
distclean: clean
171
274
mostlyclean: clean
172
275
maintainer-clean: clean
173
 
        -rm --force --recursive keydir confdir
 
276
        -rm --force --recursive keydir confdir statedir
174
277
 
175
278
check:  all
176
279
        ./mandos --check
 
280
        ./mandos-ctl --check
177
281
 
178
282
# Run the client with a local config and key
179
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
180
297
        ./plugin-runner --plugin-dir=plugins.d \
 
298
                --plugin-helper-dir=plugin-helpers \
181
299
                --config-file=plugin-runner.conf \
182
 
                --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= \
 
302
                $(CLIENTARGS)
183
303
 
184
304
# Used by run-client
185
305
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
187
307
        ./mandos-keygen --dir keydir --force
188
308
 
189
309
# Run the server with a local config
190
 
run-server: confdir/mandos.conf confdir/clients.conf
191
 
        ./mandos --debug --configdir=confdir
 
310
run-server: confdir/mandos.conf confdir/clients.conf statedir
 
311
        ./mandos --debug --no-dbus --configdir=confdir \
 
312
                --statedir=statedir $(SERVERARGS)
192
313
 
193
314
# Used by run-server
194
315
confdir/mandos.conf: mandos.conf
198
319
        install --directory confdir
199
320
        install --mode=u=rw $< $@
200
321
# Add a client password
201
 
        ./mandos-keygen --dir keydir --password >> $@
 
322
        ./mandos-keygen --dir keydir --password --no-ssh >> $@
 
323
statedir:
 
324
        install --directory statedir
202
325
 
203
326
install: install-server install-client-nokey
204
327
 
205
 
install-html: $(htmldocs)
 
328
install-html: html
206
329
        install --directory $(htmldir)
207
330
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
208
331
                $(htmldocs)
209
332
 
210
333
install-server: doc
211
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
212
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
213
350
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
214
351
                mandos.conf
215
352
        install --mode=u=rw --target-directory=$(CONFDIR) \
216
353
                clients.conf
 
354
        install --mode=u=rw,go=r dbus-mandos.conf \
 
355
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
217
356
        install --mode=u=rwx,go=rx init.d-mandos \
218
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
219
361
        install --mode=u=rw,go=r default-mandos \
220
362
                $(DESTDIR)/etc/default/mandos
221
363
        if [ -z $(DESTDIR) ]; then \
223
365
        fi
224
366
        gzip --best --to-stdout mandos.8 \
225
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
226
372
        gzip --best --to-stdout mandos.conf.5 \
227
373
                > $(MANDIR)/man5/mandos.conf.5.gz
228
374
        gzip --best --to-stdout mandos-clients.conf.5 \
229
375
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
 
376
        gzip --best --to-stdout intro.8mandos \
 
377
                > $(MANDIR)/man8/intro.8mandos.gz
230
378
 
231
379
install-client-nokey: all doc
232
 
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
 
380
        install --directory $(LIBDIR)/mandos $(CONFDIR)
233
381
        install --directory --mode=u=rwx $(KEYDIR) \
234
 
                $(PREFIX)/lib/mandos/plugins.d
235
 
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
 
382
                $(LIBDIR)/mandos/plugins.d \
 
383
                $(LIBDIR)/mandos/plugin-helpers
 
384
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
236
385
                install --mode=u=rwx \
237
 
                        --directory "$(CONFDIR)/plugins.d"; \
 
386
                        --directory "$(CONFDIR)/plugins.d" \
 
387
                        "$(CONFDIR)/plugin-helpers"; \
238
388
        fi
 
389
        install --mode=u=rwx,go=rx --directory \
 
390
                "$(CONFDIR)/network-hooks.d"
239
391
        install --mode=u=rwx,go=rx \
240
 
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
 
392
                --target-directory=$(LIBDIR)/mandos plugin-runner
241
393
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
242
394
                mandos-keygen
243
395
        install --mode=u=rwx,go=rx \
244
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
396
                --target-directory=$(LIBDIR)/mandos/plugins.d \
245
397
                plugins.d/password-prompt
246
398
        install --mode=u=rwxs,go=rx \
247
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
399
                --target-directory=$(LIBDIR)/mandos/plugins.d \
248
400
                plugins.d/mandos-client
249
401
        install --mode=u=rwxs,go=rx \
250
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
402
                --target-directory=$(LIBDIR)/mandos/plugins.d \
251
403
                plugins.d/usplash
252
404
        install --mode=u=rwxs,go=rx \
253
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
405
                --target-directory=$(LIBDIR)/mandos/plugins.d \
254
406
                plugins.d/splashy
255
407
        install --mode=u=rwxs,go=rx \
256
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
408
                --target-directory=$(LIBDIR)/mandos/plugins.d \
257
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
258
416
        install initramfs-tools-hook \
259
417
                $(INITRAMFSTOOLS)/hooks/mandos
260
418
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
261
419
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
262
420
        install initramfs-tools-script \
263
 
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
 
421
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
264
422
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
265
423
        gzip --best --to-stdout mandos-keygen.8 \
266
424
                > $(MANDIR)/man8/mandos-keygen.8.gz
267
425
        gzip --best --to-stdout plugin-runner.8mandos \
268
426
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
427
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
 
428
                > $(MANDIR)/man8/mandos-client.8mandos.gz
269
429
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
270
430
                > $(MANDIR)/man8/password-prompt.8mandos.gz
271
 
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
272
 
                > $(MANDIR)/man8/mandos-client.8mandos.gz
273
431
        gzip --best --to-stdout plugins.d/usplash.8mandos \
274
432
                > $(MANDIR)/man8/usplash.8mandos.gz
275
433
        gzip --best --to-stdout plugins.d/splashy.8mandos \
276
434
                > $(MANDIR)/man8/splashy.8mandos.gz
277
435
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
278
436
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
 
437
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
 
438
                > $(MANDIR)/man8/plymouth.8mandos.gz
 
439
        gzip --best --to-stdout intro.8mandos \
 
440
                > $(MANDIR)/man8/intro.8mandos.gz
279
441
 
280
442
install-client: install-client-nokey
281
443
# Post-installation stuff
287
449
 
288
450
uninstall-server:
289
451
        -rm --force $(PREFIX)/sbin/mandos \
 
452
                $(PREFIX)/sbin/mandos-ctl \
 
453
                $(PREFIX)/sbin/mandos-monitor \
290
454
                $(MANDIR)/man8/mandos.8.gz \
 
455
                $(MANDIR)/man8/mandos-monitor.8.gz \
 
456
                $(MANDIR)/man8/mandos-ctl.8.gz \
291
457
                $(MANDIR)/man5/mandos.conf.5.gz \
292
458
                $(MANDIR)/man5/mandos-clients.conf.5.gz
293
459
        update-rc.d -f mandos remove
299
465
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
300
466
                $(DESTDIR)/etc/crypttab
301
467
        -rm --force $(PREFIX)/sbin/mandos-keygen \
302
 
                $(PREFIX)/lib/mandos/plugin-runner \
303
 
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
304
 
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
305
 
                $(PREFIX)/lib/mandos/plugins.d/usplash \
306
 
                $(PREFIX)/lib/mandos/plugins.d/splashy \
307
 
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
 
468
                $(LIBDIR)/mandos/plugin-runner \
 
469
                $(LIBDIR)/mandos/plugins.d/password-prompt \
 
470
                $(LIBDIR)/mandos/plugins.d/mandos-client \
 
471
                $(LIBDIR)/mandos/plugins.d/usplash \
 
472
                $(LIBDIR)/mandos/plugins.d/splashy \
 
473
                $(LIBDIR)/mandos/plugins.d/askpass-fifo \
 
474
                $(LIBDIR)/mandos/plugins.d/plymouth \
308
475
                $(INITRAMFSTOOLS)/hooks/mandos \
309
476
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
310
 
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
 
477
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
478
                $(MANDIR)/man8/mandos-keygen.8.gz \
311
479
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
312
 
                $(MANDIR)/man8/mandos-keygen.8.gz \
 
480
                $(MANDIR)/man8/mandos-client.8mandos.gz
313
481
                $(MANDIR)/man8/password-prompt.8mandos.gz \
314
482
                $(MANDIR)/man8/usplash.8mandos.gz \
315
483
                $(MANDIR)/man8/splashy.8mandos.gz \
316
484
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
317
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
318
 
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
319
 
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
 
485
                $(MANDIR)/man8/plymouth.8mandos.gz \
 
486
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
 
487
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
320
488
        update-initramfs -k all -u
321
489
 
322
490
purge: purge-server purge-client
323
491
 
324
492
purge-server: uninstall-server
325
493
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
 
494
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
326
495
                $(DESTDIR)/etc/default/mandos \
327
496
                $(DESTDIR)/etc/init.d/mandos \
 
497
                $(SYSTEMD)/mandos.service \
 
498
                $(DESTDIR)/run/mandos.pid \
328
499
                $(DESTDIR)/var/run/mandos.pid
329
500
        -rmdir $(CONFDIR)
330
501