/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to Makefile

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

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

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

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

Show diffs side-by-side

added added

removed removed

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