/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: 2015-05-23 20:18:34 UTC
  • mto: This revision was merged to the branch mainline in revision 756.
  • Revision ID: teddy@recompile.se-20150523201834-e89ex4ito93yni8x
mandos: Use multiprocessing module to run checkers.

For a long time, the Mandos server has occasionally logged the message
"ERROR: Child process vanished".  This was never a fatal error, but it
has been annoying and slightly worrying, since a definite cause was
not found.  One potential cause could be the "multiprocessing" and
"subprocess" modules conflicting w.r.t. SIGCHLD.  To avoid this,
change the running of checkers from using subprocess.Popen
asynchronously to instead first create a multiprocessing.Process()
(which is asynchronous) calling a function, and have that function
then call subprocess.call() (which is synchronous).  In this way, the
only thing using any asynchronous subprocesses is the multiprocessing
module.

This makes it necessary to change one small thing in the D-Bus API,
since the subprocesses.call() function does not expose the raw wait(2)
status value.

DBUS-API (CheckerCompleted): Change the second value provided by this
                             D-Bus signal from the raw wait(2) status
                             to the actual terminating signal number.
mandos (subprocess_call_pipe): New function to be called by
                               multiprocessing.Process (starting a
                               separate process).
(Client.last_checker signal): New attribute for signal which
                              terminated last checker.  Like
                              last_checker_status, only not accessible
                              via D-Bus.
(Client.checker_callback): Take new "connection" argument and use it
                           to get returncode; set last_checker_signal.
                           Return False so gobject does not call this
                           callback again.
(Client.start_checker): Start checker using a multiprocessing.Process
                        instead of a subprocess.Popen.
(ClientDBus.checker_callback): Take new "connection" argument.        Call
                               Client.checker_callback early to have
                               it set last_checker_status and
                               last_checker_signal; use those.  Change
                               second value provided to D-Bus signal
                               CheckerCompleted to use
                               last_checker_signal if checker was
                               terminated by signal.
mandos-monitor: Update to reflect DBus API change.
(MandosClientWidget.checker_completed): Take "signal" instead of
                                        "condition" argument.  Use it
                                        accordingly.  Remove dead code
                                        (os.WCOREDUMP case).

Show diffs side-by-side

added added

removed removed

Lines of Context:
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 -Wunreachable-code -Winline \
8
 
        -Wvolatile-register-var
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
 
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
 
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
16
 
# PREFIX=/usr/local
 
28
htmldir=man
 
29
version=1.6.9
 
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)))
 
34
 
 
35
## Use these settings for a traditional /usr/local install
 
36
# PREFIX=$(DESTDIR)/usr/local
 
37
# CONFDIR=$(DESTDIR)/etc/mandos
 
38
# KEYDIR=$(DESTDIR)/etc/mandos/keys
 
39
# MANDIR=$(PREFIX)/man
 
40
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
 
41
# STATEDIR=$(DESTDIR)/var/lib/mandos
 
42
# LIBDIR=$(PREFIX)/lib
 
43
##
 
44
 
 
45
## These settings are for a package-type install
17
46
PREFIX=$(DESTDIR)/usr
18
 
# CONFDIR=/usr/local/lib/mandos
19
47
CONFDIR=$(DESTDIR)/etc/mandos
20
 
# KEYDIR=/usr/local/lib/mandos/keys
21
48
KEYDIR=$(DESTDIR)/etc/keys/mandos
22
 
# MANDIR=/usr/local/man
23
 
MANDIR=$(DESTDIR)/usr/share/man
24
 
 
25
 
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
26
 
GNUTLS_LIBS=$(shell libgnutls-config --libs)
 
49
MANDIR=$(PREFIX)/share/man
 
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)
 
61
##
 
62
 
 
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)
27
67
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
28
68
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
29
 
GPGME_CFLAGS=$(shell gpgme-config --cflags)
30
 
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)
31
72
 
32
73
# Do not change these two
33
 
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
34
 
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS)
35
 
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))
36
78
 
37
 
# Commands to format a DocBook refentry document into a manual page
38
 
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
 
79
# Commands to format a DocBook <refentry> document into a manual page
 
80
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
39
81
        --param man.charmap.use.subset          0 \
40
82
        --param make.year.ranges                1 \
41
83
        --param make.single.year.ranges         1 \
42
84
        --param man.output.quietly              1 \
43
85
        --param man.authors.section.enabled     0 \
44
 
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
 
86
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
45
87
        $(notdir $<); \
46
 
        $(MANPOST) $(notdir $@)
47
 
# DocBook-to-man post-processing to fix a \n escape bug
48
 
MANPOST=sed --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
49
 
 
50
 
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client
51
 
PROGS=plugin-runner $(PLUGINS)
52
 
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
 
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'
 
105
 
 
106
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
 
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 \
53
113
        plugins.d/mandos-client.8mandos \
54
 
        plugins.d/password-prompt.8mandos mandos.conf.5 \
55
 
        mandos-clients.conf.5
56
 
 
57
 
objects=$(addsuffix .o,$(PROGS))
58
 
 
59
 
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
60
123
 
61
124
doc: $(DOCS)
62
125
 
63
 
%.5: %.xml legalnotice.xml
64
 
        $(DOCBOOKTOMAN)
65
 
 
66
 
%.8: %.xml legalnotice.xml
67
 
        $(DOCBOOKTOMAN)
68
 
 
69
 
%.8mandos: %.xml legalnotice.xml
70
 
        $(DOCBOOKTOMAN)
71
 
 
72
 
mandos.8: mandos.xml mandos-options.xml overview.xml legalnotice.xml
73
 
        $(DOCBOOKTOMAN)
74
 
 
75
 
mandos-keygen.8: mandos-keygen.xml overview.xml legalnotice.xml
76
 
        $(DOCBOOKTOMAN)
77
 
 
78
 
mandos.conf.5: mandos.conf.xml mandos-options.xml legalnotice.xml
79
 
        $(DOCBOOKTOMAN)
80
 
 
81
 
plugin-runner.8mandos: plugin-runner.xml overview.xml legalnotice.xml
82
 
        $(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)
83
189
 
84
190
plugins.d/mandos-client.8mandos: plugins.d/mandos-client.xml \
 
191
                                        common.ent \
85
192
                                        mandos-options.xml \
86
193
                                        overview.xml legalnotice.xml
87
194
        $(DOCBOOKTOMAN)
88
 
 
89
 
plugins.d/mandos-client: plugins.d/mandos-client.o
90
 
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
91
 
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
92
 
 
93
 
.PHONY : all doc clean distclean run-client run-server install \
94
 
        install-server install-client uninstall uninstall-server \
95
 
        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
96
247
 
97
248
clean:
98
 
        -rm --force $(PROGS) $(objects) $(DOCS) core
 
249
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
99
250
 
100
251
distclean: clean
101
252
mostlyclean: clean
102
253
maintainer-clean: clean
103
 
        -rm --force --recursive keydir confdir
 
254
        -rm --force --recursive keydir confdir statedir
104
255
 
105
 
check:
 
256
check:  all
106
257
        ./mandos --check
 
258
        ./mandos-ctl --check
107
259
 
108
260
# Run the client with a local config and key
109
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: setgid: Operation not permitted             #"
 
268
        @echo "#                     setuid: Operation not permitted             #"
 
269
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
 
270
        @echo "# From mandos-client:                                             #"
 
271
        @echo "#             Failed to raise privileges: Operation not permitted #"
 
272
        @echo "#             Warning: network hook \"*\" exited with status *      #"
 
273
        @echo "###################################################################"
 
274
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
110
275
        ./plugin-runner --plugin-dir=plugins.d \
111
276
                --config-file=plugin-runner.conf \
112
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
 
277
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
 
278
                --env-for=mandos-client:GNOME_KEYRING_CONTROL= \
 
279
                $(CLIENTARGS)
113
280
 
114
281
# Used by run-client
115
282
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
117
284
        ./mandos-keygen --dir keydir --force
118
285
 
119
286
# Run the server with a local config
120
 
run-server: confdir/mandos.conf confdir/clients.conf
121
 
        ./mandos --debug --configdir=confdir
 
287
run-server: confdir/mandos.conf confdir/clients.conf statedir
 
288
        ./mandos --debug --no-dbus --configdir=confdir \
 
289
                --statedir=statedir $(SERVERARGS)
122
290
 
123
291
# Used by run-server
124
292
confdir/mandos.conf: mandos.conf
128
296
        install --directory confdir
129
297
        install --mode=u=rw $< $@
130
298
# Add a client password
131
 
        ./mandos-keygen --dir keydir --password >> $@
132
 
 
133
 
install: install-server install-client
 
299
        ./mandos-keygen --dir keydir --password --no-ssh >> $@
 
300
statedir:
 
301
        install --directory statedir
 
302
 
 
303
install: install-server install-client-nokey
 
304
 
 
305
install-html: html
 
306
        install --directory $(htmldir)
 
307
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
 
308
                $(htmldocs)
134
309
 
135
310
install-server: doc
136
 
        install --directory $(CONFDIR) $(MANDIR)/man5 \
137
 
                $(MANDIR)/man8
 
311
        install --directory $(CONFDIR)
 
312
        if install --directory --mode=u=rwx --owner=$(USER) \
 
313
                --group=$(GROUP) $(STATEDIR); then \
 
314
                :; \
 
315
        elif install --directory --mode=u=rwx $(STATEDIR); then \
 
316
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
 
317
        fi
138
318
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
 
319
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
 
320
                mandos-ctl
 
321
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
 
322
                mandos-monitor
139
323
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
140
324
                mandos.conf
141
325
        install --mode=u=rw --target-directory=$(CONFDIR) \
142
326
                clients.conf
143
 
        install --mode=u=rwx,go=rx init.d-mandos /etc/init.d/mandos
144
 
        install --mode=u=rw,go=r default-mandos /etc/default/mandos
145
 
        update-rc.d mandos defaults
 
327
        install --mode=u=rw,go=r dbus-mandos.conf \
 
328
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
 
329
        install --mode=u=rwx,go=rx init.d-mandos \
 
330
                $(DESTDIR)/etc/init.d/mandos
 
331
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
 
332
                install --mode=u=rw,go=r mandos.service $(SYSTEMD); \
 
333
        fi
 
334
        install --mode=u=rw,go=r default-mandos \
 
335
                $(DESTDIR)/etc/default/mandos
 
336
        if [ -z $(DESTDIR) ]; then \
 
337
                update-rc.d mandos defaults 25 15;\
 
338
        fi
146
339
        gzip --best --to-stdout mandos.8 \
147
340
                > $(MANDIR)/man8/mandos.8.gz
 
341
        gzip --best --to-stdout mandos-monitor.8 \
 
342
                > $(MANDIR)/man8/mandos-monitor.8.gz
 
343
        gzip --best --to-stdout mandos-ctl.8 \
 
344
                > $(MANDIR)/man8/mandos-ctl.8.gz
148
345
        gzip --best --to-stdout mandos.conf.5 \
149
346
                > $(MANDIR)/man5/mandos.conf.5.gz
150
347
        gzip --best --to-stdout mandos-clients.conf.5 \
151
348
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
 
349
        gzip --best --to-stdout intro.8mandos \
 
350
                > $(MANDIR)/man8/intro.8mandos.gz
152
351
 
153
 
install-client: all doc /usr/share/initramfs-tools/hooks/.
154
 
        install --directory $(PREFIX)/lib/mandos $(CONFDIR) \
155
 
                $(MANDIR)/man8
156
 
        install --directory --mode=u=rwx $(KEYDIR)
157
 
        install --directory --mode=u=rwx \
158
 
                $(PREFIX)/lib/mandos/plugins.d
159
 
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
 
352
install-client-nokey: all doc
 
353
        install --directory $(LIBDIR)/mandos $(CONFDIR)
 
354
        install --directory --mode=u=rwx $(KEYDIR) \
 
355
                $(LIBDIR)/mandos/plugins.d
 
356
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
160
357
                install --mode=u=rwx \
161
358
                        --directory "$(CONFDIR)/plugins.d"; \
162
 
                install --mode=u=rw,go=r etc-plugins.d-README \
163
 
                        $(CONFDIR)/plugins.d/README ; \
164
359
        fi
 
360
        install --mode=u=rwx,go=rx --directory \
 
361
                "$(CONFDIR)/network-hooks.d"
165
362
        install --mode=u=rwx,go=rx \
166
 
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
 
363
                --target-directory=$(LIBDIR)/mandos plugin-runner
167
364
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
168
365
                mandos-keygen
169
366
        install --mode=u=rwx,go=rx \
170
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
367
                --target-directory=$(LIBDIR)/mandos/plugins.d \
171
368
                plugins.d/password-prompt
172
369
        install --mode=u=rwxs,go=rx \
173
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
370
                --target-directory=$(LIBDIR)/mandos/plugins.d \
174
371
                plugins.d/mandos-client
175
 
        install --mode=u=rwx,go=rx \
176
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
372
        install --mode=u=rwxs,go=rx \
 
373
                --target-directory=$(LIBDIR)/mandos/plugins.d \
177
374
                plugins.d/usplash
 
375
        install --mode=u=rwxs,go=rx \
 
376
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
377
                plugins.d/splashy
 
378
        install --mode=u=rwxs,go=rx \
 
379
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
380
                plugins.d/askpass-fifo
 
381
        install --mode=u=rwxs,go=rx \
 
382
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
383
                plugins.d/plymouth
178
384
        install initramfs-tools-hook \
179
 
                /usr/share/initramfs-tools/hooks/mandos
180
 
        install initramfs-tools-hook-conf \
181
 
                /usr/share/initramfs-tools/conf-hooks.d/mandos
 
385
                $(INITRAMFSTOOLS)/hooks/mandos
 
386
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
 
387
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
182
388
        install initramfs-tools-script \
183
 
                /usr/share/initramfs-tools/scripts/local-top/mandos
 
389
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
184
390
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
185
391
        gzip --best --to-stdout mandos-keygen.8 \
186
392
                > $(MANDIR)/man8/mandos-keygen.8.gz
187
393
        gzip --best --to-stdout plugin-runner.8mandos \
188
394
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
395
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
 
396
                > $(MANDIR)/man8/mandos-client.8mandos.gz
189
397
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
190
398
                > $(MANDIR)/man8/password-prompt.8mandos.gz
191
 
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
192
 
                > $(MANDIR)/man8/mandos-client.8mandos.gz
 
399
        gzip --best --to-stdout plugins.d/usplash.8mandos \
 
400
                > $(MANDIR)/man8/usplash.8mandos.gz
 
401
        gzip --best --to-stdout plugins.d/splashy.8mandos \
 
402
                > $(MANDIR)/man8/splashy.8mandos.gz
 
403
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
 
404
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
 
405
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
 
406
                > $(MANDIR)/man8/plymouth.8mandos.gz
 
407
 
 
408
install-client: install-client-nokey
193
409
# Post-installation stuff
194
410
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
195
411
        update-initramfs -k all -u
199
415
 
200
416
uninstall-server:
201
417
        -rm --force $(PREFIX)/sbin/mandos \
 
418
                $(PREFIX)/sbin/mandos-ctl \
 
419
                $(PREFIX)/sbin/mandos-monitor \
202
420
                $(MANDIR)/man8/mandos.8.gz \
 
421
                $(MANDIR)/man8/mandos-monitor.8.gz \
 
422
                $(MANDIR)/man8/mandos-ctl.8.gz \
203
423
                $(MANDIR)/man5/mandos.conf.5.gz \
204
424
                $(MANDIR)/man5/mandos-clients.conf.5.gz
205
425
        update-rc.d -f mandos remove
209
429
# Refuse to uninstall client if /etc/crypttab is explicitly configured
210
430
# to use it.
211
431
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
212
 
                /etc/crypttab
 
432
                $(DESTDIR)/etc/crypttab
213
433
        -rm --force $(PREFIX)/sbin/mandos-keygen \
214
 
                $(PREFIX)/lib/mandos/plugin-runner \
215
 
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
216
 
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
217
 
                $(PREFIX)/lib/mandos/plugins.d/usplash \
218
 
                /usr/share/initramfs-tools/hooks/mandos \
219
 
                /usr/share/initramfs-tools/conf-hooks.d/mandos \
220
 
                /usr/share/initramfs-tools/scripts/local-top/mandos \
 
434
                $(LIBDIR)/mandos/plugin-runner \
 
435
                $(LIBDIR)/mandos/plugins.d/password-prompt \
 
436
                $(LIBDIR)/mandos/plugins.d/mandos-client \
 
437
                $(LIBDIR)/mandos/plugins.d/usplash \
 
438
                $(LIBDIR)/mandos/plugins.d/splashy \
 
439
                $(LIBDIR)/mandos/plugins.d/askpass-fifo \
 
440
                $(LIBDIR)/mandos/plugins.d/plymouth \
 
441
                $(INITRAMFSTOOLS)/hooks/mandos \
 
442
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
 
443
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
444
                $(MANDIR)/man8/mandos-keygen.8.gz \
221
445
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
222
 
                $(MANDIR)/man8/mandos-keygen.8.gz \
 
446
                $(MANDIR)/man8/mandos-client.8mandos.gz
223
447
                $(MANDIR)/man8/password-prompt.8mandos.gz \
224
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
225
 
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
226
 
                rm --force $(CONFDIR)/plugins.d/README; \
227
 
        fi
228
 
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
229
 
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
 
448
                $(MANDIR)/man8/usplash.8mandos.gz \
 
449
                $(MANDIR)/man8/splashy.8mandos.gz \
 
450
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
 
451
                $(MANDIR)/man8/plymouth.8mandos.gz \
 
452
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
 
453
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
230
454
        update-initramfs -k all -u
231
455
 
232
456
purge: purge-server purge-client
233
457
 
234
458
purge-server: uninstall-server
235
459
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
236
 
                /etc/default/mandos /etc/init.d/mandos \
237
 
                /var/run/mandos.pid
 
460
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
 
461
                $(DESTDIR)/etc/default/mandos \
 
462
                $(DESTDIR)/etc/init.d/mandos \
 
463
                $(SYSTEMD)/mandos.service \
 
464
                $(DESTDIR)/run/mandos.pid \
 
465
                $(DESTDIR)/var/run/mandos.pid
238
466
        -rmdir $(CONFDIR)
239
467
 
240
468
purge-client: uninstall-client