/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: 2008-10-03 09:32:30 UTC
  • Revision ID: teddy@fukt.bsnet.se-20081003093230-rshn19e0c19zz12i
* .bzrignore (plugins.d/askpass-fifo): Added.

* Makefile (FORTIFY): Added "-fstack-protector-all".
  (mandos, mandos-keygen): Use more strict regexps when updating the
                           version number.

* mandos (Client.__init__): Use os.path.expandvars() and
                            os.path.expanduser() on the "secfile"
                            config value.

* plugins.d/splashy.c: Update comments and order of #include's.
  (main): Check user and group when looking for running splashy
          process.  Do not ignore ENOENT from execl().  Use _exit()
          instead of "return" when an error happens in child
          processes.  Bug fix: Only wait for splashy_update
          completion if it was started.  Bug fix: detect failing
          waitpid().  Only kill splashy_update if it is running.  Do
          the killing of the old splashy process before the fork().
          Do setsid() and setuid(geteuid()) before starting the new
          splashy.  Report failing execl().

* plugins.d/usplash.c: Update comments and order of #include's.
  (main): Check user and group when looking for running usplash
          process.  Do not report execv() error if interrupted by a
          signal.

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