/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

* mandos (Client.timeout, Client.interval): Changed from being a
                                            property to be a normal
                                            attribute.
  (Client._timeout, Client._interval): Removed.
  (Client._timeout_milliseconds): Changed from being an attribute to
                                  be a method "timeout_milliseconds".
                                  All users changed.
  (Client._interval_milliseconds): Changed from being an attribute to
                                   be method "interval_milliseconds".
                                   All users changed.
  (Client.__init__): Take additional "use_dbus" keyword argument.
                     Only provide D-Bus interface if "use_dbus" is
                     True.
  (Client.use_dbus): New attribute.
  (Client.dbus_object_path): Changed to only be set if "self.use_dbus"
                             is True.
  (Client.enable, Client.disable, Client.checker_callback,
  Client.bump_timeout, Client.start_checker, Client.stop_checker):
  Only emit D-Bus signals if "self.use_dbus".
  (Client.SetChecker, Client.SetHost, Client.Enable): Bug fix: Emit
                                                      D-Bus signals.
  (Client.SetInterval, Client.SetTimeout): Changed to emit D-Bus
                                           signals.

  (main): Remove deprecated "default" keyword argument to "--check"
          option.  Added new "--no-dbus" option.  Added corresponding
          "use_dbus" server configuration option.  Only provide D-Bus
          interface and emit D-Bus signals if "use_dbus".  Pass
          "use_dbus" on to Client constructor.

* mandos-options.xml ([@id="dbus"]): New option.

* mandos.conf (use_dbus): New option.

* mandos.conf.xml (OPTIONS): New option "use_dbus".
  (EXAMPLE): - '' -

* mandos.xml (SYNOPSIS): New option "--no-dbus".
  (D-BUS INTERFACE): New section.

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
27
 
LANGUAGE=-std=gnu11
 
15
OPTIMIZE=-Os
 
16
LANGUAGE=-std=gnu99
28
17
htmldir=man
29
 
version=1.7.0
 
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) $(foreach flag,$(LINK_FORTIFY),-Xlinker $(flag))
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 mandos-list $(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
                $@
 
165
 
 
166
mandos-list: Makefile
 
167
        $(SED) --in-place \
 
168
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
169
                $@
229
170
 
230
171
mandos.lsm: Makefile
231
 
        $(strip $(SED) --in-place \
 
172
        $(SED) --in-place \
232
173
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
233
 
                $@)
234
 
        $(strip $(SED) --in-place \
 
174
                $@
 
175
        $(SED) --in-place \
235
176
                --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
 
177
                $@
 
178
 
 
179
plugins.d/mandos-client: plugins.d/mandos-client.o
 
180
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
 
181
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
182
 
 
183
.PHONY : all doc html clean distclean run-client run-server install \
 
184
        install-server install-client uninstall uninstall-server \
 
185
        uninstall-client purge purge-server purge-client
254
186
 
255
187
clean:
256
188
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
258
190
distclean: clean
259
191
mostlyclean: clean
260
192
maintainer-clean: clean
261
 
        -rm --force --recursive keydir confdir statedir
 
193
        -rm --force --recursive keydir confdir
262
194
 
263
195
check:  all
264
196
        ./mandos --check
265
 
        ./mandos-ctl --check
266
197
 
267
198
# Run the client with a local config and key
268
199
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
200
        ./plugin-runner --plugin-dir=plugins.d \
283
 
                --plugin-helper-dir=plugin-helpers \
284
201
                --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)
 
202
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
288
203
 
289
204
# Used by run-client
290
205
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
292
207
        ./mandos-keygen --dir keydir --force
293
208
 
294
209
# 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)
 
210
run-server: confdir/mandos.conf confdir/clients.conf
 
211
        ./mandos --debug --configdir=confdir
298
212
 
299
213
# Used by run-server
300
214
confdir/mandos.conf: mandos.conf
304
218
        install --directory confdir
305
219
        install --mode=u=rw $< $@
306
220
# Add a client password
307
 
        ./mandos-keygen --dir keydir --password --no-ssh >> $@
308
 
statedir:
309
 
        install --directory statedir
 
221
        ./mandos-keygen --dir keydir --password >> $@
310
222
 
311
223
install: install-server install-client-nokey
312
224
 
317
229
 
318
230
install-server: doc
319
231
        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
232
        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
233
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
332
234
                mandos.conf
333
235
        install --mode=u=rw --target-directory=$(CONFDIR) \
334
236
                clients.conf
335
 
        install --mode=u=rw,go=r dbus-mandos.conf \
336
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
337
237
        install --mode=u=rwx,go=rx init.d-mandos \
338
238
                $(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
239
        install --mode=u=rw,go=r default-mandos \
343
240
                $(DESTDIR)/etc/default/mandos
344
241
        if [ -z $(DESTDIR) ]; then \
346
243
        fi
347
244
        gzip --best --to-stdout mandos.8 \
348
245
                > $(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
246
        gzip --best --to-stdout mandos.conf.5 \
354
247
                > $(MANDIR)/man5/mandos.conf.5.gz
355
248
        gzip --best --to-stdout mandos-clients.conf.5 \
356
249
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
357
 
        gzip --best --to-stdout intro.8mandos \
358
 
                > $(MANDIR)/man8/intro.8mandos.gz
359
250
 
360
251
install-client-nokey: all doc
361
 
        install --directory $(LIBDIR)/mandos $(CONFDIR)
 
252
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
362
253
        install --directory --mode=u=rwx $(KEYDIR) \
363
 
                $(LIBDIR)/mandos/plugins.d \
364
 
                $(LIBDIR)/mandos/plugin-helpers
365
 
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
 
254
                $(PREFIX)/lib/mandos/plugins.d
 
255
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
366
256
                install --mode=u=rwx \
367
257
                        --directory "$(CONFDIR)/plugins.d"; \
368
 
                install --directory "$(CONFDIR)/plugin-helpers"; \
369
258
        fi
370
 
        install --mode=u=rwx,go=rx --directory \
371
 
                "$(CONFDIR)/network-hooks.d"
372
259
        install --mode=u=rwx,go=rx \
373
 
                --target-directory=$(LIBDIR)/mandos plugin-runner
 
260
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
374
261
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
375
262
                mandos-keygen
376
263
        install --mode=u=rwx,go=rx \
377
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
264
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
378
265
                plugins.d/password-prompt
379
266
        install --mode=u=rwxs,go=rx \
380
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
267
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
381
268
                plugins.d/mandos-client
382
269
        install --mode=u=rwxs,go=rx \
383
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
270
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
384
271
                plugins.d/usplash
385
272
        install --mode=u=rwxs,go=rx \
386
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
273
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
387
274
                plugins.d/splashy
388
275
        install --mode=u=rwxs,go=rx \
389
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
276
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
390
277
                plugins.d/askpass-fifo
391
 
        install --mode=u=rwxs,go=rx \
392
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
393
 
                plugins.d/plymouth
394
 
        install --mode=u=rwxs,go=rx \
395
 
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
396
 
                plugin-helpers/mandos-client-iprouteadddel
397
278
        install initramfs-tools-hook \
398
279
                $(INITRAMFSTOOLS)/hooks/mandos
399
280
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
400
281
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
401
282
        install initramfs-tools-script \
402
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
 
283
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
403
284
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
404
285
        gzip --best --to-stdout mandos-keygen.8 \
405
286
                > $(MANDIR)/man8/mandos-keygen.8.gz
406
287
        gzip --best --to-stdout plugin-runner.8mandos \
407
288
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
289
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
 
290
                > $(MANDIR)/man8/password-prompt.8mandos.gz
408
291
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
409
292
                > $(MANDIR)/man8/mandos-client.8mandos.gz
410
 
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
411
 
                > $(MANDIR)/man8/password-prompt.8mandos.gz
412
293
        gzip --best --to-stdout plugins.d/usplash.8mandos \
413
294
                > $(MANDIR)/man8/usplash.8mandos.gz
414
295
        gzip --best --to-stdout plugins.d/splashy.8mandos \
415
296
                > $(MANDIR)/man8/splashy.8mandos.gz
416
297
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
417
298
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
418
 
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
419
 
                > $(MANDIR)/man8/plymouth.8mandos.gz
420
299
 
421
300
install-client: install-client-nokey
422
301
# Post-installation stuff
428
307
 
429
308
uninstall-server:
430
309
        -rm --force $(PREFIX)/sbin/mandos \
431
 
                $(PREFIX)/sbin/mandos-ctl \
432
 
                $(PREFIX)/sbin/mandos-monitor \
433
310
                $(MANDIR)/man8/mandos.8.gz \
434
 
                $(MANDIR)/man8/mandos-monitor.8.gz \
435
 
                $(MANDIR)/man8/mandos-ctl.8.gz \
436
311
                $(MANDIR)/man5/mandos.conf.5.gz \
437
312
                $(MANDIR)/man5/mandos-clients.conf.5.gz
438
313
        update-rc.d -f mandos remove
444
319
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
445
320
                $(DESTDIR)/etc/crypttab
446
321
        -rm --force $(PREFIX)/sbin/mandos-keygen \
447
 
                $(LIBDIR)/mandos/plugin-runner \
448
 
                $(LIBDIR)/mandos/plugins.d/password-prompt \
449
 
                $(LIBDIR)/mandos/plugins.d/mandos-client \
450
 
                $(LIBDIR)/mandos/plugins.d/usplash \
451
 
                $(LIBDIR)/mandos/plugins.d/splashy \
452
 
                $(LIBDIR)/mandos/plugins.d/askpass-fifo \
453
 
                $(LIBDIR)/mandos/plugins.d/plymouth \
 
322
                $(PREFIX)/lib/mandos/plugin-runner \
 
323
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
 
324
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
 
325
                $(PREFIX)/lib/mandos/plugins.d/usplash \
 
326
                $(PREFIX)/lib/mandos/plugins.d/splashy \
 
327
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
454
328
                $(INITRAMFSTOOLS)/hooks/mandos \
455
329
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
456
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
330
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
 
331
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
457
332
                $(MANDIR)/man8/mandos-keygen.8.gz \
458
 
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
459
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
460
333
                $(MANDIR)/man8/password-prompt.8mandos.gz \
461
334
                $(MANDIR)/man8/usplash.8mandos.gz \
462
335
                $(MANDIR)/man8/splashy.8mandos.gz \
463
336
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
464
 
                $(MANDIR)/man8/plymouth.8mandos.gz \
465
 
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
466
 
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
 
337
                $(MANDIR)/man8/mandos-client.8mandos.gz
 
338
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
 
339
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
467
340
        update-initramfs -k all -u
468
341
 
469
342
purge: purge-server purge-client
470
343
 
471
344
purge-server: uninstall-server
472
345
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
473
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
474
346
                $(DESTDIR)/etc/default/mandos \
475
347
                $(DESTDIR)/etc/init.d/mandos \
476
 
                $(SYSTEMD)/mandos.service \
477
 
                $(DESTDIR)/run/mandos.pid \
478
348
                $(DESTDIR)/var/run/mandos.pid
479
349
        -rmdir $(CONFDIR)
480
350