/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.9
 
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
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 \
 
77
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
 
78
CPROGS=plugin-runner $(PLUGINS)
 
79
PROGS=mandos mandos-keygen $(CPROGS)
 
80
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
114
81
        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
 
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
118
85
 
119
86
htmldocs=$(addsuffix .xhtml,$(DOCS))
120
87
 
141
108
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
142
109
        $(DOCBOOKTOHTML)
143
110
 
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
111
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
150
112
                legalnotice.xml
151
113
        $(DOCBOOKTOMAN)
160
122
                 legalnotice.xml
161
123
        $(DOCBOOKTOHTML)
162
124
 
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
125
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
178
126
                legalnotice.xml
179
127
        $(DOCBOOKTOMAN)
201
149
 
202
150
# Update all these files with version number $(version)
203
151
common.ent: Makefile
204
 
        $(strip $(SED) --in-place \
205
 
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
206
 
                $@)
 
152
        $(SED) --in-place \
 
153
                --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' \
 
154
                $@
207
155
 
208
156
mandos: Makefile
209
 
        $(strip $(SED) --in-place \
 
157
        $(SED) --in-place \
210
158
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
211
 
                $@)
 
159
                $@
212
160
 
213
161
mandos-keygen: Makefile
214
 
        $(strip $(SED) --in-place \
 
162
        $(SED) --in-place \
215
163
                --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
 
                $@)
 
164
                $@
227
165
 
228
166
mandos.lsm: Makefile
229
 
        $(strip $(SED) --in-place \
 
167
        $(SED) --in-place \
230
168
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
231
 
                $@)
232
 
        $(strip $(SED) --in-place \
 
169
                $@
 
170
        $(SED) --in-place \
233
171
                --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
 
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
248
181
 
249
182
clean:
250
183
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
252
185
distclean: clean
253
186
mostlyclean: clean
254
187
maintainer-clean: clean
255
 
        -rm --force --recursive keydir confdir statedir
 
188
        -rm --force --recursive keydir confdir
256
189
 
257
190
check:  all
258
191
        ./mandos --check
259
 
        ./mandos-ctl --check
260
192
 
261
193
# Run the client with a local config and key
262
194
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
195
        ./plugin-runner --plugin-dir=plugins.d \
277
 
                --plugin-helper-dir=plugin-helpers \
278
196
                --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)
 
197
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
282
198
 
283
199
# Used by run-client
284
200
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
286
202
        ./mandos-keygen --dir keydir --force
287
203
 
288
204
# 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)
 
205
run-server: confdir/mandos.conf confdir/clients.conf
 
206
        ./mandos --debug --configdir=confdir
292
207
 
293
208
# Used by run-server
294
209
confdir/mandos.conf: mandos.conf
298
213
        install --directory confdir
299
214
        install --mode=u=rw $< $@
300
215
# Add a client password
301
 
        ./mandos-keygen --dir keydir --password --no-ssh >> $@
302
 
statedir:
303
 
        install --directory statedir
 
216
        ./mandos-keygen --dir keydir --password >> $@
304
217
 
305
218
install: install-server install-client-nokey
306
219
 
311
224
 
312
225
install-server: doc
313
226
        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
227
        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
228
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
326
229
                mandos.conf
327
230
        install --mode=u=rw --target-directory=$(CONFDIR) \
328
231
                clients.conf
329
 
        install --mode=u=rw,go=r dbus-mandos.conf \
330
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
331
232
        install --mode=u=rwx,go=rx init.d-mandos \
332
233
                $(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
234
        install --mode=u=rw,go=r default-mandos \
337
235
                $(DESTDIR)/etc/default/mandos
338
236
        if [ -z $(DESTDIR) ]; then \
340
238
        fi
341
239
        gzip --best --to-stdout mandos.8 \
342
240
                > $(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
241
        gzip --best --to-stdout mandos.conf.5 \
348
242
                > $(MANDIR)/man5/mandos.conf.5.gz
349
243
        gzip --best --to-stdout mandos-clients.conf.5 \
350
244
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
351
 
        gzip --best --to-stdout intro.8mandos \
352
 
                > $(MANDIR)/man8/intro.8mandos.gz
353
245
 
354
246
install-client-nokey: all doc
355
 
        install --directory $(LIBDIR)/mandos $(CONFDIR)
 
247
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
356
248
        install --directory --mode=u=rwx $(KEYDIR) \
357
 
                $(LIBDIR)/mandos/plugins.d
358
 
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
 
249
                $(PREFIX)/lib/mandos/plugins.d
 
250
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
359
251
                install --mode=u=rwx \
360
252
                        --directory "$(CONFDIR)/plugins.d"; \
361
 
                install --directory "$(CONFDIR)/plugin-helpers"; \
362
253
        fi
363
 
        install --mode=u=rwx,go=rx --directory \
364
 
                "$(CONFDIR)/network-hooks.d"
365
254
        install --mode=u=rwx,go=rx \
366
 
                --target-directory=$(LIBDIR)/mandos plugin-runner
 
255
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
367
256
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
368
257
                mandos-keygen
369
258
        install --mode=u=rwx,go=rx \
370
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
259
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
371
260
                plugins.d/password-prompt
372
261
        install --mode=u=rwxs,go=rx \
373
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
262
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
374
263
                plugins.d/mandos-client
375
264
        install --mode=u=rwxs,go=rx \
376
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
265
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
377
266
                plugins.d/usplash
378
267
        install --mode=u=rwxs,go=rx \
379
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
268
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
380
269
                plugins.d/splashy
381
270
        install --mode=u=rwxs,go=rx \
382
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
271
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
383
272
                plugins.d/askpass-fifo
384
 
        install --mode=u=rwxs,go=rx \
385
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
386
 
                plugins.d/plymouth
387
273
        install initramfs-tools-hook \
388
274
                $(INITRAMFSTOOLS)/hooks/mandos
389
275
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
390
276
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
391
277
        install initramfs-tools-script \
392
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
 
278
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
393
279
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
394
280
        gzip --best --to-stdout mandos-keygen.8 \
395
281
                > $(MANDIR)/man8/mandos-keygen.8.gz
396
282
        gzip --best --to-stdout plugin-runner.8mandos \
397
283
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
284
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
 
285
                > $(MANDIR)/man8/password-prompt.8mandos.gz
398
286
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
399
287
                > $(MANDIR)/man8/mandos-client.8mandos.gz
400
 
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
401
 
                > $(MANDIR)/man8/password-prompt.8mandos.gz
402
288
        gzip --best --to-stdout plugins.d/usplash.8mandos \
403
289
                > $(MANDIR)/man8/usplash.8mandos.gz
404
290
        gzip --best --to-stdout plugins.d/splashy.8mandos \
405
291
                > $(MANDIR)/man8/splashy.8mandos.gz
406
292
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
407
293
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
408
 
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
409
 
                > $(MANDIR)/man8/plymouth.8mandos.gz
410
294
 
411
295
install-client: install-client-nokey
412
296
# Post-installation stuff
418
302
 
419
303
uninstall-server:
420
304
        -rm --force $(PREFIX)/sbin/mandos \
421
 
                $(PREFIX)/sbin/mandos-ctl \
422
 
                $(PREFIX)/sbin/mandos-monitor \
423
305
                $(MANDIR)/man8/mandos.8.gz \
424
 
                $(MANDIR)/man8/mandos-monitor.8.gz \
425
 
                $(MANDIR)/man8/mandos-ctl.8.gz \
426
306
                $(MANDIR)/man5/mandos.conf.5.gz \
427
307
                $(MANDIR)/man5/mandos-clients.conf.5.gz
428
308
        update-rc.d -f mandos remove
434
314
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
435
315
                $(DESTDIR)/etc/crypttab
436
316
        -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 \
 
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 \
444
323
                $(INITRAMFSTOOLS)/hooks/mandos \
445
324
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
446
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
325
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
 
326
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
447
327
                $(MANDIR)/man8/mandos-keygen.8.gz \
448
 
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
449
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
450
328
                $(MANDIR)/man8/password-prompt.8mandos.gz \
451
329
                $(MANDIR)/man8/usplash.8mandos.gz \
452
330
                $(MANDIR)/man8/splashy.8mandos.gz \
453
331
                $(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)
 
332
                $(MANDIR)/man8/mandos-client.8mandos.gz
 
333
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
 
334
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
457
335
        update-initramfs -k all -u
458
336
 
459
337
purge: purge-server purge-client
460
338
 
461
339
purge-server: uninstall-server
462
340
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
463
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
464
341
                $(DESTDIR)/etc/default/mandos \
465
342
                $(DESTDIR)/etc/init.d/mandos \
466
 
                $(SYSTEMD)/mandos.service \
467
 
                $(DESTDIR)/run/mandos.pid \
468
343
                $(DESTDIR)/var/run/mandos.pid
469
344
        -rmdir $(CONFDIR)
470
345