/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-09-06 15:34:21 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080906153421-605ydhwyo404krh9
* initramfs-tools-hook: Use long options where available.  Use only
                        one "test" invocation instead of several.

* mandos-keygen: Use only one "test" invocation instead of several.
                 Use long options where available.  Strip newline from
                 entered password.

* plugin-runner.c (print_out_password): Do not strip trailing newline.
  (fallback): Strip trailing newline from getpass().

* plugin-runner.xml (PLUGINS): Plugins should not print trailing
                               newlines.

* plugins.d/password-prompt.c (main): Strip trailing newline.

* plugins.d/password-request.c (main): Bug fix: Read "pubkey.txt", not
                                       "pupkey.txt".

Show diffs side-by-side

added added

removed removed

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