/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: 2009-02-09 02:01:13 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090209020113-726hq380zvp8zt97
Four new interrelated features:

1. Support using a different network interface via both initramfs.conf
   (the DEVICE setting) and the kernel command line (sixth field of
   the "ip=" option as in Linux' Documentation/nfsroot.txt).

2. Support connecting to a specified Mandos server directly using a
   kernel command line option ("mandos=connect:<ADDRESS>:<PORT>").

3. Support connecting directly to an IPv4 address (and port) using the
   "--connect" option of mandos-client.

4. Support an empty string to the --interface option to mandos-client.

* Makefile (WARN): Increase strictness by changing to
                   "-Wstrict-aliasing=1".

* debian/mandos-client.README.Debian (Use the Correct Network
  Interface): Changed to refer to initramfs.conf and nfsroot.txt.
  (Test the Server): Improve wording.
  (Non-local Connection): New section.
* initramfs-tools-script: Obey DEVICE environment variable and setting
                          from "/conf/initramfs.conf".  Also let any
                          "ip=" kernel command line option override
                          it.  Support new "mandos=connect" option.
                          Call "configure_networking" to set up IP
                          address on interface if necessary.
* plugin-runner.conf: Change example.
* plugins.d/mandos-client.c: Some whitespace and comment changes.
  (start_mandos_communication): Take an additional argument for
                                address family, all callers changed.
                                Connect to an IPv4 address if address
                                family is AF_INET.  Only set IPv6
                                scope_id for link-local addresses.
  (main): Accept empty interface name; this will not bring up any
         interface and leave the interface as unspecified.  Also do
         not restore kernel log level if lowering it failed.
* plugins.d/mandos-client.xml (OPTIONS): Document that the
                                         "--interface" option accepts
                                         an empty string.
  (EXAMPLE): Change example IPv6 address to a link-local address.

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