/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: 2019-08-03 11:39:38 UTC
  • Revision ID: teddy@recompile.se-20190803113938-httj8rqsnct08txx
dracut-module/password-agent.c: Bug fix: Ignore deleted files

If a question file ("ask.*") is opened, deleted, and then closed, we
still get an IN_CLOSE_WRITE ievent after the IN_DELETE ievent.  We
should pass the IN_EXCL_UNLINK flag to inotify_add_watch() to avoid
this.

* dracut-module/password-agent.c (add_inotify_dir_watch): Add
  "IN_EXCL_UNLINK" flag to inotify_add_watch().
  (test_add_inotify_dir_watch_IN_EXCL_UNLINK): New test.
  (run_tests): Add new test.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
WARN=-O -Wall -Wformat=2 -Winit-self -Wmissing-include-dirs \
2
 
        -Wswitch-default -Wswitch-enum -Wunused-parameter \
3
 
        -Wstrict-aliasing=1 -Wextra -Wfloat-equal -Wundef -Wshadow \
 
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 \
4
6
        -Wunsafe-loop-optimizations -Wpointer-arith \
5
7
        -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings \
6
 
        -Wconversion -Wstrict-prototypes -Wold-style-definition \
7
 
        -Wpacked -Wnested-externs -Winline -Wvolatile-register-var
8
 
#       -Wunreachable-code
9
 
#DEBUG=-ggdb3
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=
 
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
 
13
 
 
14
#DEBUG:=-ggdb3 -fsanitize=address $(SANITIZE)
 
15
## Check which sanitizing options can be used
 
16
#SANITIZE:=$(foreach option,$(ALL_SANITIZE_OPTIONS),$(shell \
 
17
#       echo 'int main(){}' | $(CC) --language=c $(option) \
 
18
#       /dev/stdin -o /dev/null >/dev/null 2>&1 && echo $(option)))
 
19
# <https://developerblog.redhat.com/2014/10/16/gcc-undefined-behavior-sanitizer-ubsan/>
 
20
ALL_SANITIZE_OPTIONS:=-fsanitize=leak -fsanitize=undefined \
 
21
        -fsanitize=shift -fsanitize=integer-divide-by-zero \
 
22
        -fsanitize=unreachable -fsanitize=vla-bound -fsanitize=null \
 
23
        -fsanitize=return -fsanitize=signed-integer-overflow \
 
24
        -fsanitize=bounds -fsanitize=alignment \
 
25
        -fsanitize=object-size -fsanitize=float-divide-by-zero \
 
26
        -fsanitize=float-cast-overflow -fsanitize=nonnull-attribute \
 
27
        -fsanitize=returns-nonnull-attribute -fsanitize=bool \
 
28
        -fsanitize=enum -fsanitize-address-use-after-scope
 
29
 
 
30
# For info about _FORTIFY_SOURCE, see feature_test_macros(7)
 
31
# and <https://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
 
32
FORTIFY:=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
 
33
LINK_FORTIFY_LD:=-z relro -z now
 
34
LINK_FORTIFY:=
16
35
 
17
36
# If BROKEN_PIE is set, do not build with -pie
18
37
ifndef BROKEN_PIE
20
39
LINK_FORTIFY += -pie
21
40
endif
22
41
#COVERAGE=--coverage
23
 
OPTIMIZE=-Os
24
 
LANGUAGE=-std=gnu99
25
 
htmldir=man
26
 
version=1.6.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)))
 
42
OPTIMIZE:=-Os -fno-strict-aliasing
 
43
LANGUAGE:=-std=gnu11
 
44
htmldir:=man
 
45
version:=1.8.5
 
46
SED:=sed
 
47
PKG_CONFIG?=pkg-config
 
48
 
 
49
USER:=$(firstword $(subst :, ,$(shell getent passwd _mandos \
 
50
        || getent passwd nobody || echo 65534)))
 
51
GROUP:=$(firstword $(subst :, ,$(shell getent group _mandos \
 
52
        || getent group nogroup || echo 65534)))
 
53
 
 
54
LINUXVERSION:=$(shell uname --kernel-release)
31
55
 
32
56
## 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
 
57
# PREFIX:=$(DESTDIR)/usr/local
 
58
# CONFDIR:=$(DESTDIR)/etc/mandos
 
59
# KEYDIR:=$(DESTDIR)/etc/mandos/keys
 
60
# MANDIR:=$(PREFIX)/man
 
61
# INITRAMFSTOOLS:=$(DESTDIR)/etc/initramfs-tools
 
62
# DRACUTMODULE:=$(DESTDIR)/usr/lib/dracut/modules.d/90mandos
 
63
# STATEDIR:=$(DESTDIR)/var/lib/mandos
 
64
# LIBDIR:=$(PREFIX)/lib
39
65
##
40
66
 
41
67
## These settings are for a package-type install
42
 
PREFIX=$(DESTDIR)/usr
43
 
CONFDIR=$(DESTDIR)/etc/mandos
44
 
KEYDIR=$(DESTDIR)/etc/keys/mandos
45
 
MANDIR=$(PREFIX)/share/man
46
 
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
47
 
STATEDIR=$(DESTDIR)/var/lib/mandos
 
68
PREFIX:=$(DESTDIR)/usr
 
69
CONFDIR:=$(DESTDIR)/etc/mandos
 
70
KEYDIR:=$(DESTDIR)/etc/keys/mandos
 
71
MANDIR:=$(PREFIX)/share/man
 
72
INITRAMFSTOOLS:=$(DESTDIR)/usr/share/initramfs-tools
 
73
DRACUTMODULE:=$(DESTDIR)/usr/lib/dracut/modules.d/90mandos
 
74
STATEDIR:=$(DESTDIR)/var/lib/mandos
 
75
LIBDIR:=$(shell \
 
76
        for d in \
 
77
        "/usr/lib/`dpkg-architecture \
 
78
                        -qDEB_HOST_MULTIARCH 2>/dev/null`" \
 
79
        "`rpm --eval='%{_libdir}' 2>/dev/null`" /usr/lib; do \
 
80
                if [ -d "$$d" -a "$$d" = "$${d%/}" ]; then \
 
81
                        echo "$(DESTDIR)$$d"; \
 
82
                        break; \
 
83
                fi; \
 
84
        done)
48
85
##
49
86
 
50
 
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
51
 
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
52
 
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
53
 
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; \
 
87
SYSTEMD:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
 
88
                        --variable=systemdsystemunitdir)
 
89
TMPFILES:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
 
90
                        --variable=tmpfilesdir)
 
91
 
 
92
GNUTLS_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I gnutls)
 
93
GNUTLS_LIBS:=$(shell $(PKG_CONFIG) --libs gnutls)
 
94
AVAHI_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I avahi-core)
 
95
AVAHI_LIBS:=$(shell $(PKG_CONFIG) --libs avahi-core)
 
96
GPGME_CFLAGS:=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
 
97
GPGME_LIBS:=$(shell gpgme-config --libs; getconf LFS_LIBS; \
56
98
        getconf LFS_LDFLAGS)
 
99
LIBNL3_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I libnl-route-3.0)
 
100
LIBNL3_LIBS:=$(shell $(PKG_CONFIG) --libs libnl-route-3.0)
 
101
GLIB_CFLAGS:=$(shell $(PKG_CONFIG) --cflags glib-2.0)
 
102
GLIB_LIBS:=$(shell $(PKG_CONFIG) --libs glib-2.0)
57
103
 
58
104
# Do not change these two
59
 
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))
 
105
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) \
 
106
        $(OPTIMIZE) $(LANGUAGE) -DVERSION='"$(version)"'
 
107
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(strip \
 
108
        ) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
63
109
 
64
110
# Commands to format a DocBook <refentry> document into a manual page
65
111
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
70
116
        --param man.authors.section.enabled     0 \
71
117
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
72
118
        $(notdir $<); \
73
 
        $(MANPOST) $(notdir $@);\
74
119
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
75
 
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
76
 
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
77
 
        fi >/dev/null)
78
 
# DocBook-to-man post-processing to fix a '\n' escape bug
79
 
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
 
120
        && command -v man >/dev/null; then LANG=en_US.UTF-8 \
 
121
        MANWIDTH=80 man --warnings --encoding=UTF-8 --local-file \
 
122
        $(notdir $@); fi >/dev/null)
80
123
 
81
124
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
82
125
        --param make.year.ranges                1 \
88
131
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
89
132
        $<; $(HTMLPOST) $@)
90
133
# Fix citerefentry links
91
 
HTMLPOST=$(SED) --in-place \
 
134
HTMLPOST:=$(SED) --in-place \
92
135
        --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
93
136
 
94
 
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
 
137
PLUGINS:=plugins.d/password-prompt plugins.d/mandos-client \
95
138
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
96
139
        plugins.d/plymouth
97
 
CPROGS=plugin-runner $(PLUGINS)
98
 
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
99
 
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
 
140
PLUGIN_HELPERS:=plugin-helpers/mandos-client-iprouteadddel
 
141
CPROGS:=plugin-runner dracut-module/password-agent $(PLUGINS) \
 
142
        $(PLUGIN_HELPERS)
 
143
PROGS:=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
 
144
DOCS:=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
100
145
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
 
146
        dracut-module/password-agent.8mandos \
101
147
        plugins.d/mandos-client.8mandos \
102
148
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
103
149
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
104
150
        plugins.d/plymouth.8mandos intro.8mandos
105
151
 
106
 
htmldocs=$(addsuffix .xhtml,$(DOCS))
 
152
htmldocs:=$(addsuffix .xhtml,$(DOCS))
107
153
 
108
 
objects=$(addsuffix .o,$(CPROGS))
 
154
objects:=$(addsuffix .o,$(CPROGS))
109
155
 
110
156
all: $(PROGS) mandos.lsm
111
157
 
175
221
                overview.xml legalnotice.xml
176
222
        $(DOCBOOKTOHTML)
177
223
 
 
224
dracut-module/password-agent.8mandos: \
 
225
                dracut-module/password-agent.xml common.ent \
 
226
                overview.xml legalnotice.xml
 
227
        $(DOCBOOKTOMAN)
 
228
dracut-module/password-agent.8mandos.xhtml: \
 
229
                dracut-module/password-agent.xml common.ent \
 
230
                overview.xml legalnotice.xml
 
231
        $(DOCBOOKTOHTML)
 
232
 
178
233
plugins.d/mandos-client.8mandos: plugins.d/mandos-client.xml \
179
234
                                        common.ent \
180
235
                                        mandos-options.xml \
223
278
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
224
279
                $@)
225
280
 
 
281
# Need to add the GnuTLS, Avahi and GPGME libraries
226
282
plugins.d/mandos-client: plugins.d/mandos-client.c
227
 
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
228
 
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
229
 
 
230
 
.PHONY : all doc html clean distclean run-client run-server install \
231
 
        install-server install-client uninstall uninstall-server \
232
 
        uninstall-client purge purge-server purge-client
 
283
        $(LINK.c) $^ $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(strip\
 
284
                ) $(GPGME_CFLAGS) $(GNUTLS_LIBS) $(strip\
 
285
                ) $(AVAHI_LIBS) $(GPGME_LIBS) $(LOADLIBES) $(strip\
 
286
                ) $(LDLIBS) -o $@
 
287
 
 
288
# Need to add the libnl-route library
 
289
plugin-helpers/mandos-client-iprouteadddel: plugin-helpers/mandos-client-iprouteadddel.c
 
290
        $(LINK.c) $(LIBNL3_CFLAGS) $^ $(LIBNL3_LIBS) $(strip\
 
291
                ) $(LOADLIBES) $(LDLIBS) -o $@
 
292
 
 
293
# Need to add the GLib and pthread libraries
 
294
dracut-module/password-agent: dracut-module/password-agent.c
 
295
        $(LINK.c) $(GLIB_CFLAGS) $^ $(GLIB_LIBS) -lpthread $(strip\
 
296
                ) $(LOADLIBES) $(LDLIBS) -o $@
 
297
 
 
298
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
 
299
        check run-client run-server install install-html \
 
300
        install-server install-client-nokey install-client uninstall \
 
301
        uninstall-server uninstall-client purge purge-server \
 
302
        purge-client
233
303
 
234
304
clean:
235
305
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
239
309
maintainer-clean: clean
240
310
        -rm --force --recursive keydir confdir statedir
241
311
 
242
 
check:  all
 
312
check: all
243
313
        ./mandos --check
244
314
        ./mandos-ctl --check
 
315
        ./mandos-keygen --version
 
316
        ./plugin-runner --version
 
317
        ./plugin-helpers/mandos-client-iprouteadddel --version
 
318
        ./dracut-module/password-agent --test
245
319
 
246
320
# Run the client with a local config and key
247
 
run-client: all keydir/seckey.txt keydir/pubkey.txt
248
 
        @echo "###################################################################"
249
 
        @echo "# The following error messages are harmless and can be safely     #"
250
 
        @echo "# ignored.  The messages are caused by not running as root, but   #"
251
 
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
252
 
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
253
 
        @echo "# From plugin-runner: setuid: Operation not permitted             #"
254
 
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
255
 
        @echo "# From mandos-client: setuid: Operation not permitted             #"
256
 
        @echo "#                     seteuid: Operation not permitted            #"
257
 
        @echo "#                     klogctl: Operation not permitted            #"
258
 
        @echo "###################################################################"
 
321
run-client: all keydir/seckey.txt keydir/pubkey.txt \
 
322
                        keydir/tls-privkey.pem keydir/tls-pubkey.pem
 
323
        @echo '######################################################'
 
324
        @echo '# The following error messages are harmless and can  #'
 
325
        @echo '#  be safely ignored:                                #'
 
326
        @echo '## From plugin-runner:                               #'
 
327
        @echo '# setgid: Operation not permitted                    #'
 
328
        @echo '# setuid: Operation not permitted                    #'
 
329
        @echo '## From askpass-fifo:                                #'
 
330
        @echo '# mkfifo: Permission denied                          #'
 
331
        @echo '## From mandos-client:                               #'
 
332
        @echo '# Failed to raise privileges: Operation not permi... #'
 
333
        @echo '# Warning: network hook "*" exited with status *     #'
 
334
        @echo '# ioctl SIOCSIFFLAGS +IFF_UP: Operation not permi... #'
 
335
        @echo '# Failed to bring up interface "*": Operation not... #'
 
336
        @echo '#                                                    #'
 
337
        @echo '# (The messages are caused by not running as root,   #'
 
338
        @echo '# but you should NOT run "make run-client" as root   #'
 
339
        @echo '# unless you also unpacked and compiled Mandos as    #'
 
340
        @echo '# root, which is also NOT recommended.)              #'
 
341
        @echo '######################################################'
 
342
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
259
343
        ./plugin-runner --plugin-dir=plugins.d \
 
344
                --plugin-helper-dir=plugin-helpers \
260
345
                --config-file=plugin-runner.conf \
261
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
 
346
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--tls-privkey=keydir/tls-privkey.pem,--tls-pubkey=keydir/tls-pubkey.pem,--network-hook-dir=network-hooks.d \
 
347
                --env-for=mandos-client:GNOME_KEYRING_CONTROL= \
262
348
                $(CLIENTARGS)
263
349
 
264
350
# Used by run-client
265
 
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
 
351
keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem: mandos-keygen
266
352
        install --directory keydir
267
353
        ./mandos-keygen --dir keydir --force
268
354
 
275
361
confdir/mandos.conf: mandos.conf
276
362
        install --directory confdir
277
363
        install --mode=u=rw,go=r $^ $@
278
 
confdir/clients.conf: clients.conf keydir/seckey.txt
 
364
confdir/clients.conf: clients.conf keydir/seckey.txt keydir/tls-pubkey.pem
279
365
        install --directory confdir
280
366
        install --mode=u=rw $< $@
281
367
# Add a client password
282
 
        ./mandos-keygen --dir keydir --password >> $@
 
368
        ./mandos-keygen --dir keydir --password --no-ssh >> $@
283
369
statedir:
284
370
        install --directory statedir
285
371
 
292
378
 
293
379
install-server: doc
294
380
        install --directory $(CONFDIR)
295
 
        install --directory --mode=u=rwx --owner=$(USER) \
296
 
                --group=$(GROUP) $(STATEDIR)
 
381
        if install --directory --mode=u=rwx --owner=$(USER) \
 
382
                --group=$(GROUP) $(STATEDIR); then \
 
383
                :; \
 
384
        elif install --directory --mode=u=rwx $(STATEDIR); then \
 
385
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
 
386
        fi
 
387
        if [ "$(TMPFILES)" != "$(DESTDIR)" \
 
388
                        -a -d "$(TMPFILES)" ]; then \
 
389
                install --mode=u=rw,go=r tmpfiles.d-mandos.conf \
 
390
                        $(TMPFILES)/mandos.conf; \
 
391
        fi
297
392
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
298
393
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
299
394
                mandos-ctl
307
402
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
308
403
        install --mode=u=rwx,go=rx init.d-mandos \
309
404
                $(DESTDIR)/etc/init.d/mandos
 
405
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
 
406
                install --mode=u=rw,go=r mandos.service $(SYSTEMD); \
 
407
        fi
310
408
        install --mode=u=rw,go=r default-mandos \
311
409
                $(DESTDIR)/etc/default/mandos
312
410
        if [ -z $(DESTDIR) ]; then \
326
424
                > $(MANDIR)/man8/intro.8mandos.gz
327
425
 
328
426
install-client-nokey: all doc
329
 
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
 
427
        install --directory $(LIBDIR)/mandos $(CONFDIR)
330
428
        install --directory --mode=u=rwx $(KEYDIR) \
331
 
                $(PREFIX)/lib/mandos/plugins.d
332
 
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
 
429
                $(LIBDIR)/mandos/plugins.d \
 
430
                $(LIBDIR)/mandos/plugin-helpers
 
431
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
333
432
                install --mode=u=rwx \
334
 
                        --directory "$(CONFDIR)/plugins.d"; \
 
433
                        --directory "$(CONFDIR)/plugins.d" \
 
434
                        "$(CONFDIR)/plugin-helpers"; \
335
435
        fi
336
436
        install --mode=u=rwx,go=rx --directory \
337
437
                "$(CONFDIR)/network-hooks.d"
338
438
        install --mode=u=rwx,go=rx \
339
 
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
 
439
                --target-directory=$(LIBDIR)/mandos plugin-runner
 
440
        install --mode=u=rwx,go=rx \
 
441
                --target-directory=$(LIBDIR)/mandos \
 
442
                mandos-to-cryptroot-unlock
340
443
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
341
444
                mandos-keygen
342
445
        install --mode=u=rwx,go=rx \
343
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
446
                --target-directory=$(LIBDIR)/mandos/plugins.d \
344
447
                plugins.d/password-prompt
345
448
        install --mode=u=rwxs,go=rx \
346
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
449
                --target-directory=$(LIBDIR)/mandos/plugins.d \
347
450
                plugins.d/mandos-client
348
451
        install --mode=u=rwxs,go=rx \
349
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
452
                --target-directory=$(LIBDIR)/mandos/plugins.d \
350
453
                plugins.d/usplash
351
454
        install --mode=u=rwxs,go=rx \
352
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
455
                --target-directory=$(LIBDIR)/mandos/plugins.d \
353
456
                plugins.d/splashy
354
457
        install --mode=u=rwxs,go=rx \
355
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
458
                --target-directory=$(LIBDIR)/mandos/plugins.d \
356
459
                plugins.d/askpass-fifo
357
460
        install --mode=u=rwxs,go=rx \
358
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
461
                --target-directory=$(LIBDIR)/mandos/plugins.d \
359
462
                plugins.d/plymouth
 
463
        install --mode=u=rwx,go=rx \
 
464
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
 
465
                plugin-helpers/mandos-client-iprouteadddel
360
466
        install initramfs-tools-hook \
361
467
                $(INITRAMFSTOOLS)/hooks/mandos
362
 
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
363
 
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
 
468
        install --mode=u=rw,go=r initramfs-tools-conf \
 
469
                $(INITRAMFSTOOLS)/conf.d/mandos-conf
 
470
        install --mode=u=rw,go=r initramfs-tools-conf-hook \
 
471
                $(INITRAMFSTOOLS)/conf-hooks.d/zz-mandos
364
472
        install initramfs-tools-script \
365
473
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
 
474
        install initramfs-tools-script-stop \
 
475
                $(INITRAMFSTOOLS)/scripts/local-premount/mandos
 
476
        install --directory $(DRACUTMODULE)
 
477
        install --mode=u=rw,go=r --target-directory=$(DRACUTMODULE) \
 
478
                dracut-module/ask-password-mandos.path \
 
479
                dracut-module/ask-password-mandos.service
 
480
        install --mode=u=rwxs,go=rx \
 
481
                --target-directory=$(DRACUTMODULE) \
 
482
                dracut-module/module-setup.sh \
 
483
                dracut-module/cmdline-mandos.sh \
 
484
                dracut-module/password-agent
366
485
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
367
486
        gzip --best --to-stdout mandos-keygen.8 \
368
487
                > $(MANDIR)/man8/mandos-keygen.8.gz
380
499
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
381
500
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
382
501
                > $(MANDIR)/man8/plymouth.8mandos.gz
 
502
        gzip --best --to-stdout dracut-module/password-agent.8mandos \
 
503
                > $(MANDIR)/man8/password-agent.8mandos.gz
383
504
 
384
505
install-client: install-client-nokey
385
506
# Post-installation stuff
386
507
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
387
 
        update-initramfs -k all -u
 
508
        if command -v update-initramfs >/dev/null; then \
 
509
            update-initramfs -k all -u; \
 
510
        elif command -v dracut >/dev/null; then \
 
511
            for initrd in $(DESTDIR)/boot/initr*-$(LINUXVERSION); do \
 
512
                if [ -w "$$initrd" ]; then \
 
513
                    chmod go-r "$$initrd"; \
 
514
                    dracut --force "$$initrd"; \
 
515
                fi; \
 
516
            done; \
 
517
        fi
388
518
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
389
519
 
390
520
uninstall: uninstall-server uninstall-client
407
537
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
408
538
                $(DESTDIR)/etc/crypttab
409
539
        -rm --force $(PREFIX)/sbin/mandos-keygen \
410
 
                $(PREFIX)/lib/mandos/plugin-runner \
411
 
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
412
 
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
413
 
                $(PREFIX)/lib/mandos/plugins.d/usplash \
414
 
                $(PREFIX)/lib/mandos/plugins.d/splashy \
415
 
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
416
 
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
 
540
                $(LIBDIR)/mandos/plugin-runner \
 
541
                $(LIBDIR)/mandos/plugins.d/password-prompt \
 
542
                $(LIBDIR)/mandos/plugins.d/mandos-client \
 
543
                $(LIBDIR)/mandos/plugins.d/usplash \
 
544
                $(LIBDIR)/mandos/plugins.d/splashy \
 
545
                $(LIBDIR)/mandos/plugins.d/askpass-fifo \
 
546
                $(LIBDIR)/mandos/plugins.d/plymouth \
417
547
                $(INITRAMFSTOOLS)/hooks/mandos \
418
548
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
419
549
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
550
                $(INITRAMFSTOOLS)/scripts/local-premount/mandos \
 
551
                $(DRACUTMODULE)/ask-password-mandos.path \
 
552
                $(DRACUTMODULE)/ask-password-mandos.service \
 
553
                $(DRACUTMODULE)/module-setup.sh \
 
554
                $(DRACUTMODULE)/cmdline-mandos.sh \
 
555
                $(DRACUTMODULE)/password-agent \
420
556
                $(MANDIR)/man8/mandos-keygen.8.gz \
421
557
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
422
558
                $(MANDIR)/man8/mandos-client.8mandos.gz
425
561
                $(MANDIR)/man8/splashy.8mandos.gz \
426
562
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
427
563
                $(MANDIR)/man8/plymouth.8mandos.gz \
428
 
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
429
 
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
430
 
        update-initramfs -k all -u
 
564
                $(MANDIR)/man8/password-agent.8mandos.gz \
 
565
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
 
566
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR) $(DRACUTMODULE)
 
567
        if command -v update-initramfs >/dev/null; then \
 
568
            update-initramfs -k all -u; \
 
569
        elif command -v dracut >/dev/null; then \
 
570
            for initrd in $(DESTDIR)/boot/initr*-$(LINUXVERSION); do \
 
571
                test -w "$$initrd" && dracut --force "$$initrd"; \
 
572
            done; \
 
573
        fi
431
574
 
432
575
purge: purge-server purge-client
433
576
 
436
579
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
437
580
                $(DESTDIR)/etc/default/mandos \
438
581
                $(DESTDIR)/etc/init.d/mandos \
 
582
                $(SYSTEMD)/mandos.service \
 
583
                $(DESTDIR)/run/mandos.pid \
439
584
                $(DESTDIR)/var/run/mandos.pid
440
585
        -rmdir $(CONFDIR)
441
586
 
442
587
purge-client: uninstall-client
443
 
        -shred --remove $(KEYDIR)/seckey.txt
 
588
        -shred --remove $(KEYDIR)/seckey.txt $(KEYDIR)/tls-privkey.pem
444
589
        -rm --force $(CONFDIR)/plugin-runner.conf \
445
 
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt
 
590
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt \
 
591
                $(KEYDIR)/tls-pubkey.txt $(KEYDIR)/tls-privkey.txt
446
592
        -rmdir $(KEYDIR) $(CONFDIR)/plugins.d $(CONFDIR)