/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

First version of a somewhat complete D-Bus server interface.  Also
change user/group name to "_mandos".

* debian/mandos.postinst: Rename old "mandos" user and group to
                          "_mandos"; create "_mandos" user and group
                          if none exist.
* debian/mandos-client.postinst: - '' -

* initramfs-tools-hook: Try "_mandos" before "mandos" as user and
                        group name.

* mandos (_datetime_to_dbus_struct): New; was previously local.
  (Client.started): Renamed to "last_started".  All users changed.
  (Client.started): New; boolean.
  (Client.dbus_object_path): New.
  (Client.check_command): Renamed to "checker_command".  All users
                          changed.
  (Client.__init__): Set and use "self.dbus_object_path".  Set
                     "self.started".
  (Client.start): Update "self.started".  Emit "self.PropertyChanged"
                  signals for both "started" and "last_started".
  (Client.stop): Update "self.started".  Emit "self.PropertyChanged"
                 signal for "started".
  (Client.checker_callback): Take additional "command" argument.  All
                             callers changed. Emit
                             "self.PropertyChanged" signal.
  (Client.bump_timeout): Emit "self.PropertyChanged" signal for
                         "last_checked_ok".
  (Client.start_checker): Emit "self.PropertyChanged" signal for
                          "checker_running".
  (Client.stop_checker): Emit "self.PropertyChanged" signal for
                         "checker_running".
  (Client.still_valid): Bug fix: use "getattr(self, started, False)"
                        instead of "self.started" in case this client
                        object is so new that the "started" attribute
                        has not been created yet.
  (Client.IntervalChanged, Client.CheckerIsRunning, Client.GetChecker,
  Client.GetCreated, Client.GetFingerprint, Client.GetHost,
  Client.GetInterval, Client.GetName, Client.GetStarted,
  Client.GetTimeout, Client.StateChanged, Client.TimeoutChanged):
  Removed; all callers changed.
  (Client.CheckerCompleted): Add "condition" and "command" arguments.
                             All callers changed.
  (Client.GetAllProperties, Client.PropertyChanged): New.
  (Client.StillValid): Renamed to "IsStillValid".
  (Client.StartChecker): Changed to its own function to avoid the
                         return value from "Client.start_checker()".
  (Client.Stop): Changed to its own function to avoid the return value
                 from "Client.stop()".
  (main): Try "_mandos" before "mandos" as user and group name.
          Removed inner function "remove_from_clients".  New inner
          class "MandosServer".

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