/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-02-28 20:30:21 UTC
  • Revision ID: teddy@recompile.se-20160228203021-4rvy27vm4mx4r575
Client: Remove an incorrect "nonnull" attribute

* plugins.d/mandos-client.c (init_gnutls_global): Remove "nonnull"
                           attribute from "dhparamsfilename" argument.

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