/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
 
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
13
39
#COVERAGE=--coverage
14
 
OPTIMIZE=-Os
15
 
LANGUAGE=-std=gnu99
 
40
OPTIMIZE=-Os -fno-strict-aliasing
 
41
LANGUAGE=-std=gnu11
 
42
htmldir=man
 
43
version=1.7.6
 
44
SED=sed
 
45
 
 
46
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
 
47
GROUP=$(firstword $(subst :, ,$(shell getent group _mandos || getent group nogroup || echo 65534)))
16
48
 
17
49
## Use these settings for a traditional /usr/local install
18
50
# PREFIX=$(DESTDIR)/usr/local
20
52
# KEYDIR=$(DESTDIR)/etc/mandos/keys
21
53
# MANDIR=$(PREFIX)/man
22
54
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
 
55
# STATEDIR=$(DESTDIR)/var/lib/mandos
 
56
# LIBDIR=$(PREFIX)/lib
23
57
##
24
58
 
25
59
## These settings are for a package-type install
28
62
KEYDIR=$(DESTDIR)/etc/keys/mandos
29
63
MANDIR=$(PREFIX)/share/man
30
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)
31
75
##
32
76
 
33
 
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
34
 
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)
35
81
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
36
82
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
37
 
GPGME_CFLAGS=$(shell gpgme-config --cflags)
38
 
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)
39
88
 
40
89
# Do not change these two
41
 
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
42
 
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS)
43
 
LDFLAGS=$(COVERAGE)
 
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))
44
94
 
45
95
# Commands to format a DocBook <refentry> document into a manual page
46
 
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
 
96
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
47
97
        --param man.charmap.use.subset          0 \
48
98
        --param make.year.ranges                1 \
49
99
        --param make.single.year.ranges         1 \
50
100
        --param man.output.quietly              1 \
51
101
        --param man.authors.section.enabled     0 \
52
 
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
 
102
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
53
103
        $(notdir $<); \
54
 
        $(MANPOST) $(notdir $@)
55
 
# DocBook-to-man post-processing to fix a '\n' escape bug
56
 
MANPOST=sed --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
57
 
 
58
 
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client
59
 
PROGS=plugin-runner $(PLUGINS)
60
 
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
 
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)
 
108
 
 
109
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
 
110
        --param make.year.ranges                1 \
 
111
        --param make.single.year.ranges         1 \
 
112
        --param man.output.quietly              1 \
 
113
        --param man.authors.section.enabled     0 \
 
114
        --param citerefentry.link               1 \
 
115
        --output $@ \
 
116
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
 
117
        $<; $(HTMLPOST) $@)
 
118
# Fix citerefentry links
 
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'
 
121
 
 
122
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
 
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 \
61
130
        plugins.d/mandos-client.8mandos \
62
 
        plugins.d/password-prompt.8mandos mandos.conf.5 \
63
 
        mandos-clients.conf.5
64
 
 
65
 
objects=$(addsuffix .o,$(PROGS))
66
 
 
67
 
all: $(PROGS)
 
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
 
134
 
 
135
htmldocs=$(addsuffix .xhtml,$(DOCS))
 
136
 
 
137
objects=$(addsuffix .o,$(CPROGS))
 
138
 
 
139
all: $(PROGS) mandos.lsm
68
140
 
69
141
doc: $(DOCS)
70
142
 
71
 
%.5: %.xml legalnotice.xml
72
 
        $(DOCBOOKTOMAN)
73
 
 
74
 
%.8: %.xml legalnotice.xml
75
 
        $(DOCBOOKTOMAN)
76
 
 
77
 
%.8mandos: %.xml legalnotice.xml
78
 
        $(DOCBOOKTOMAN)
79
 
 
80
 
mandos.8: mandos.xml mandos-options.xml overview.xml legalnotice.xml
81
 
        $(DOCBOOKTOMAN)
82
 
 
83
 
mandos-keygen.8: mandos-keygen.xml overview.xml legalnotice.xml
84
 
        $(DOCBOOKTOMAN)
85
 
 
86
 
mandos.conf.5: mandos.conf.xml mandos-options.xml legalnotice.xml
87
 
        $(DOCBOOKTOMAN)
88
 
 
89
 
plugin-runner.8mandos: plugin-runner.xml overview.xml legalnotice.xml
90
 
        $(DOCBOOKTOMAN)
 
143
html: $(htmldocs)
 
144
 
 
145
%.5: %.xml common.ent legalnotice.xml
 
146
        $(DOCBOOKTOMAN)
 
147
%.5.xhtml: %.xml common.ent legalnotice.xml
 
148
        $(DOCBOOKTOHTML)
 
149
 
 
150
%.8: %.xml common.ent legalnotice.xml
 
151
        $(DOCBOOKTOMAN)
 
152
%.8.xhtml: %.xml common.ent legalnotice.xml
 
153
        $(DOCBOOKTOHTML)
 
154
 
 
155
%.8mandos: %.xml common.ent legalnotice.xml
 
156
        $(DOCBOOKTOMAN)
 
157
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
 
158
        $(DOCBOOKTOHTML)
 
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
 
 
165
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
 
166
                legalnotice.xml
 
167
        $(DOCBOOKTOMAN)
 
168
mandos.8.xhtml: mandos.xml common.ent mandos-options.xml \
 
169
                overview.xml legalnotice.xml
 
170
        $(DOCBOOKTOHTML)
 
171
 
 
172
mandos-keygen.8: mandos-keygen.xml common.ent overview.xml \
 
173
                legalnotice.xml
 
174
        $(DOCBOOKTOMAN)
 
175
mandos-keygen.8.xhtml: mandos-keygen.xml common.ent overview.xml \
 
176
                 legalnotice.xml
 
177
        $(DOCBOOKTOHTML)
 
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
 
 
193
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
 
194
                legalnotice.xml
 
195
        $(DOCBOOKTOMAN)
 
196
mandos.conf.5.xhtml: mandos.conf.xml common.ent mandos-options.xml \
 
197
                legalnotice.xml
 
198
        $(DOCBOOKTOHTML)
 
199
 
 
200
plugin-runner.8mandos: plugin-runner.xml common.ent overview.xml \
 
201
                legalnotice.xml
 
202
        $(DOCBOOKTOMAN)
 
203
plugin-runner.8mandos.xhtml: plugin-runner.xml common.ent \
 
204
                overview.xml legalnotice.xml
 
205
        $(DOCBOOKTOHTML)
91
206
 
92
207
plugins.d/mandos-client.8mandos: plugins.d/mandos-client.xml \
 
208
                                        common.ent \
93
209
                                        mandos-options.xml \
94
210
                                        overview.xml legalnotice.xml
95
211
        $(DOCBOOKTOMAN)
96
 
 
97
 
plugins.d/mandos-client: plugins.d/mandos-client.o
98
 
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
99
 
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
100
 
 
101
 
.PHONY : all doc clean distclean run-client run-server install \
102
 
        install-server install-client uninstall uninstall-server \
103
 
        uninstall-client purge purge-server purge-client
 
212
plugins.d/mandos-client.8mandos.xhtml: plugins.d/mandos-client.xml \
 
213
                                        common.ent \
 
214
                                        mandos-options.xml \
 
215
                                        overview.xml legalnotice.xml
 
216
        $(DOCBOOKTOHTML)
 
217
 
 
218
# Update all these files with version number $(version)
 
219
common.ent: Makefile
 
220
        $(strip $(SED) --in-place \
 
221
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
 
222
                $@)
 
223
 
 
224
mandos: Makefile
 
225
        $(strip $(SED) --in-place \
 
226
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
227
                $@)
 
228
 
 
229
mandos-keygen: Makefile
 
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
                $@)
 
243
 
 
244
mandos.lsm: Makefile
 
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
104
268
 
105
269
clean:
106
 
        -rm --force $(PROGS) $(objects) $(DOCS) core
 
270
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
107
271
 
108
272
distclean: clean
109
273
mostlyclean: clean
110
274
maintainer-clean: clean
111
 
        -rm --force --recursive keydir confdir
 
275
        -rm --force --recursive keydir confdir statedir
112
276
 
113
 
check:
 
277
check:  all
114
278
        ./mandos --check
 
279
        ./mandos-ctl --check
115
280
 
116
281
# Run the client with a local config and key
117
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
118
296
        ./plugin-runner --plugin-dir=plugins.d \
 
297
                --plugin-helper-dir=plugin-helpers \
119
298
                --config-file=plugin-runner.conf \
120
 
                --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)
121
302
 
122
303
# Used by run-client
123
304
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
125
306
        ./mandos-keygen --dir keydir --force
126
307
 
127
308
# Run the server with a local config
128
 
run-server: confdir/mandos.conf confdir/clients.conf
129
 
        ./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)
130
312
 
131
313
# Used by run-server
132
314
confdir/mandos.conf: mandos.conf
136
318
        install --directory confdir
137
319
        install --mode=u=rw $< $@
138
320
# Add a client password
139
 
        ./mandos-keygen --dir keydir --password >> $@
 
321
        ./mandos-keygen --dir keydir --password --no-ssh >> $@
 
322
statedir:
 
323
        install --directory statedir
140
324
 
141
325
install: install-server install-client-nokey
142
326
 
 
327
install-html: html
 
328
        install --directory $(htmldir)
 
329
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
 
330
                $(htmldocs)
 
331
 
143
332
install-server: doc
144
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
145
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
146
345
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
147
346
                mandos.conf
148
347
        install --mode=u=rw --target-directory=$(CONFDIR) \
149
348
                clients.conf
 
349
        install --mode=u=rw,go=r dbus-mandos.conf \
 
350
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
150
351
        install --mode=u=rwx,go=rx init.d-mandos \
151
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
152
356
        install --mode=u=rw,go=r default-mandos \
153
357
                $(DESTDIR)/etc/default/mandos
154
 
        if [ -z $(DESTDIR) ]; then update-rc.d mandos defaults; fi
 
358
        if [ -z $(DESTDIR) ]; then \
 
359
                update-rc.d mandos defaults 25 15;\
 
360
        fi
155
361
        gzip --best --to-stdout mandos.8 \
156
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
157
367
        gzip --best --to-stdout mandos.conf.5 \
158
368
                > $(MANDIR)/man5/mandos.conf.5.gz
159
369
        gzip --best --to-stdout mandos-clients.conf.5 \
160
370
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
 
371
        gzip --best --to-stdout intro.8mandos \
 
372
                > $(MANDIR)/man8/intro.8mandos.gz
161
373
 
162
374
install-client-nokey: all doc
163
 
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
 
375
        install --directory $(LIBDIR)/mandos $(CONFDIR)
164
376
        install --directory --mode=u=rwx $(KEYDIR) \
165
 
                $(PREFIX)/lib/mandos/plugins.d
166
 
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
 
377
                $(LIBDIR)/mandos/plugins.d \
 
378
                $(LIBDIR)/mandos/plugin-helpers
 
379
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
167
380
                install --mode=u=rwx \
168
 
                        --directory "$(CONFDIR)/plugins.d" && \
169
 
                install --mode=u=rw,go=r etc-plugins.d-README \
170
 
                        $(CONFDIR)/plugins.d/README ; \
 
381
                        --directory "$(CONFDIR)/plugins.d"; \
 
382
                install --directory "$(CONFDIR)/plugin-helpers"; \
171
383
        fi
 
384
        install --mode=u=rwx,go=rx --directory \
 
385
                "$(CONFDIR)/network-hooks.d"
172
386
        install --mode=u=rwx,go=rx \
173
 
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
 
387
                --target-directory=$(LIBDIR)/mandos plugin-runner
174
388
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
175
389
                mandos-keygen
176
390
        install --mode=u=rwx,go=rx \
177
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
391
                --target-directory=$(LIBDIR)/mandos/plugins.d \
178
392
                plugins.d/password-prompt
179
393
        install --mode=u=rwxs,go=rx \
180
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
394
                --target-directory=$(LIBDIR)/mandos/plugins.d \
181
395
                plugins.d/mandos-client
182
 
        install --mode=u=rwx,go=rx \
183
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
396
        install --mode=u=rwxs,go=rx \
 
397
                --target-directory=$(LIBDIR)/mandos/plugins.d \
184
398
                plugins.d/usplash
 
399
        install --mode=u=rwxs,go=rx \
 
400
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
401
                plugins.d/splashy
 
402
        install --mode=u=rwxs,go=rx \
 
403
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
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
185
411
        install initramfs-tools-hook \
186
412
                $(INITRAMFSTOOLS)/hooks/mandos
187
413
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
188
414
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
189
415
        install initramfs-tools-script \
190
 
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
 
416
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
191
417
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
192
418
        gzip --best --to-stdout mandos-keygen.8 \
193
419
                > $(MANDIR)/man8/mandos-keygen.8.gz
194
420
        gzip --best --to-stdout plugin-runner.8mandos \
195
421
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
422
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
 
423
                > $(MANDIR)/man8/mandos-client.8mandos.gz
196
424
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
197
425
                > $(MANDIR)/man8/password-prompt.8mandos.gz
198
 
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
199
 
                > $(MANDIR)/man8/mandos-client.8mandos.gz
 
426
        gzip --best --to-stdout plugins.d/usplash.8mandos \
 
427
                > $(MANDIR)/man8/usplash.8mandos.gz
 
428
        gzip --best --to-stdout plugins.d/splashy.8mandos \
 
429
                > $(MANDIR)/man8/splashy.8mandos.gz
 
430
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
 
431
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
 
432
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
 
433
                > $(MANDIR)/man8/plymouth.8mandos.gz
200
434
 
201
435
install-client: install-client-nokey
202
436
# Post-installation stuff
208
442
 
209
443
uninstall-server:
210
444
        -rm --force $(PREFIX)/sbin/mandos \
 
445
                $(PREFIX)/sbin/mandos-ctl \
 
446
                $(PREFIX)/sbin/mandos-monitor \
211
447
                $(MANDIR)/man8/mandos.8.gz \
 
448
                $(MANDIR)/man8/mandos-monitor.8.gz \
 
449
                $(MANDIR)/man8/mandos-ctl.8.gz \
212
450
                $(MANDIR)/man5/mandos.conf.5.gz \
213
451
                $(MANDIR)/man5/mandos-clients.conf.5.gz
214
452
        update-rc.d -f mandos remove
220
458
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
221
459
                $(DESTDIR)/etc/crypttab
222
460
        -rm --force $(PREFIX)/sbin/mandos-keygen \
223
 
                $(PREFIX)/lib/mandos/plugin-runner \
224
 
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
225
 
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
226
 
                $(PREFIX)/lib/mandos/plugins.d/usplash \
 
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 \
227
468
                $(INITRAMFSTOOLS)/hooks/mandos \
228
469
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
229
 
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
 
470
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
471
                $(MANDIR)/man8/mandos-keygen.8.gz \
230
472
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
231
 
                $(MANDIR)/man8/mandos-keygen.8.gz \
 
473
                $(MANDIR)/man8/mandos-client.8mandos.gz
232
474
                $(MANDIR)/man8/password-prompt.8mandos.gz \
233
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
234
 
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
235
 
                rm --force $(CONFDIR)/plugins.d/README; \
236
 
        fi
237
 
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
238
 
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
 
475
                $(MANDIR)/man8/usplash.8mandos.gz \
 
476
                $(MANDIR)/man8/splashy.8mandos.gz \
 
477
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
 
478
                $(MANDIR)/man8/plymouth.8mandos.gz \
 
479
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
 
480
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
239
481
        update-initramfs -k all -u
240
482
 
241
483
purge: purge-server purge-client
242
484
 
243
485
purge-server: uninstall-server
244
486
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
 
487
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
245
488
                $(DESTDIR)/etc/default/mandos \
246
489
                $(DESTDIR)/etc/init.d/mandos \
 
490
                $(SYSTEMD)/mandos.service \
 
491
                $(DESTDIR)/run/mandos.pid \
247
492
                $(DESTDIR)/var/run/mandos.pid
248
493
        -rmdir $(CONFDIR)
249
494