/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: Teddy Hogeborn
  • Date: 2014-06-08 03:10:08 UTC
  • mto: (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 317.
  • Revision ID: teddy@recompile.se-20140608031008-mc9bd7b024a3q0y0
Address a very theoretical possible security issue in mandos-client.

If there were to run some sort of "cleaner" process for /run/tmp (or
/tmp), and mandos-client were to run for long enough for that cleaner
process to remove the temporary directory for GPGME, there was a
possibility that another unprivileged process could trick the (also
unprivileged) mandos-client process to remove other files or symlinks
which the unprivileged mandos-client process was allowed to remove.
This is not currently known to have been exploitable, since there are
no known initramfs environments running such cleaner processes.

* plugins.d/mandos-client.c (main): Use O_NOFOLLOW when opening
                                    tempdir for cleaning.

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