/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-03-17 20:40:55 UTC
  • Revision ID: teddy@recompile.se-20160317204055-bhsh5xsidq7w5cxu
Client: Fix plymouth agent; broken since 1.7.2.

Fix an very old memory bug in the plymouth agent (which has been
present since its apperance in version 1.2), but which was only
recently detected at run time due to the new -fsanitize=address
compile- time flag, which has been used since version 1.7.2.  This
detection of a memory access violation causes the program to abort,
making the Plymouth graphical boot system unable to accept interactive
input of passwords when using the Mandos client.

* plugins.d/plymouth.c (exec_and_wait): Fix memory allocation bug when
  allocating new_argv.  Also tolerate a zero-length argv.

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