/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

Code cleanup and one bug fix.

* mandos (Client.enable): Bug fix: Do not enable if already enabled.
  (MandosServer.__init__): Create empty set of clients if none passed.
  (main): Do not create clients set; do not pass a clients set to
          MandosServer.  Use tcp_server.clients throughout.

Show diffs side-by-side

added added

removed removed

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