/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

  • Committer: Teddy Hogeborn
  • Date: 2014-07-25 23:16:04 UTC
  • mto: (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 321.
  • Revision ID: teddy@recompile.se-20140725231604-f5c4f82rn2o5ll1k
Use the .items() method instead of .iteritems().

This is strictly not a Python 2.7 change, but Python 2.7 backported
the new .viewitems() from Python 3, and instead of changing .items()
to .viewitems() and later having to change them all into .items()
again in Python 3, I opted to just change all .iteritems() to .items()
so the code will work both now and with Python 3.  The slowdown with
Python 2 is not significant, and with Python 3 it will again be fast.

* mandos (Client.__init__): Use .items() instead of .iteritems().
  (DBusObjectWithProperties.Introspect): - '' -
  (alternate_dbus_interfaces/wrapper): - '' -
  (main): - '' -
* mandos-ctl (main): - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
WARN:=-O -Wall -Wextra -Wdouble-promotion -Wformat=2 -Winit-self \
 
1
WARN=-O -Wall -Wextra -Wdouble-promotion -Wformat=2 -Winit-self \
2
2
        -Wmissing-include-dirs -Wswitch-default -Wswitch-enum \
3
3
        -Wunused -Wuninitialized -Wstrict-overflow=5 \
4
4
        -Wsuggest-attribute=pure -Wsuggest-attribute=const \
10
10
        -Wmissing-format-attribute -Wnormalized=nfc -Wpacked \
11
11
        -Wredundant-decls -Wnested-externs -Winline -Wvla \
12
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
 
 
 
13
#DEBUG=-ggdb3
30
14
# 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:=-fstack-protector-all -fPIC
33
 
CPPFLAGS+=-D_FORTIFY_SOURCE=3
34
 
LINK_FORTIFY_LD:=-z relro -z now
35
 
LINK_FORTIFY:=
 
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=
36
19
 
37
20
# If BROKEN_PIE is set, do not build with -pie
38
21
ifndef BROKEN_PIE
40
23
LINK_FORTIFY += -pie
41
24
endif
42
25
#COVERAGE=--coverage
43
 
OPTIMIZE:=-Os -fno-strict-aliasing
44
 
LANGUAGE:=-std=gnu11
45
 
CPPFLAGS+=-D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64
46
 
htmldir:=man
47
 
version:=1.8.17
48
 
SED:=sed
49
 
PKG_CONFIG?=pkg-config
50
 
 
51
 
USER:=$(firstword $(subst :, ,$(shell getent passwd _mandos \
52
 
        || getent passwd nobody || echo 65534)))
53
 
GROUP:=$(firstword $(subst :, ,$(shell getent group _mandos \
54
 
        || getent group nogroup || echo 65534)))
55
 
 
56
 
LINUXVERSION:=$(shell uname --kernel-release)
 
26
OPTIMIZE=-Os -fno-strict-aliasing
 
27
LANGUAGE=-std=gnu99
 
28
htmldir=man
 
29
version=1.6.7
 
30
SED=sed
 
31
 
 
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)))
57
34
 
58
35
## Use these settings for a traditional /usr/local install
59
 
# PREFIX:=$(DESTDIR)/usr/local
60
 
# CONFDIR:=$(DESTDIR)/etc/mandos
61
 
# KEYDIR:=$(DESTDIR)/etc/mandos/keys
62
 
# MANDIR:=$(PREFIX)/man
63
 
# INITRAMFSTOOLS:=$(DESTDIR)/etc/initramfs-tools
64
 
# DRACUTMODULE:=$(DESTDIR)/usr/lib/dracut/modules.d/90mandos
65
 
# STATEDIR:=$(DESTDIR)/var/lib/mandos
66
 
# LIBDIR:=$(PREFIX)/lib
67
 
# DBUSPOLICYDIR:=$(DESTDIR)/etc/dbus-1/system.d
 
36
# PREFIX=$(DESTDIR)/usr/local
 
37
# CONFDIR=$(DESTDIR)/etc/mandos
 
38
# KEYDIR=$(DESTDIR)/etc/mandos/keys
 
39
# MANDIR=$(PREFIX)/man
 
40
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
 
41
# STATEDIR=$(DESTDIR)/var/lib/mandos
 
42
# LIBDIR=$(PREFIX)/lib
68
43
##
69
44
 
70
45
## These settings are for a package-type install
71
 
PREFIX:=$(DESTDIR)/usr
72
 
CONFDIR:=$(DESTDIR)/etc/mandos
73
 
KEYDIR:=$(DESTDIR)/etc/keys/mandos
74
 
MANDIR:=$(PREFIX)/share/man
75
 
INITRAMFSTOOLS:=$(DESTDIR)/usr/share/initramfs-tools
76
 
DRACUTMODULE:=$(DESTDIR)/usr/lib/dracut/modules.d/90mandos
77
 
STATEDIR:=$(DESTDIR)/var/lib/mandos
78
 
LIBDIR:=$(shell \
 
46
PREFIX=$(DESTDIR)/usr
 
47
CONFDIR=$(DESTDIR)/etc/mandos
 
48
KEYDIR=$(DESTDIR)/etc/keys/mandos
 
49
MANDIR=$(PREFIX)/share/man
 
50
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
 
51
STATEDIR=$(DESTDIR)/var/lib/mandos
 
52
LIBDIR=$(shell \
79
53
        for d in \
80
 
        "/usr/lib/`dpkg-architecture \
81
 
                        -qDEB_HOST_MULTIARCH 2>/dev/null`" \
 
54
        "/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null`" \
82
55
        "`rpm --eval='%{_libdir}' 2>/dev/null`" /usr/lib; do \
83
56
                if [ -d "$$d" -a "$$d" = "$${d%/}" ]; then \
84
57
                        echo "$(DESTDIR)$$d"; \
85
58
                        break; \
86
59
                fi; \
87
60
        done)
88
 
DBUSPOLICYDIR:=$(DESTDIR)/usr/share/dbus-1/system.d
89
61
##
90
62
 
91
 
SYSTEMD:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
92
 
                        --variable=systemdsystemunitdir)
93
 
TMPFILES:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
94
 
                        --variable=tmpfilesdir)
95
 
SYSUSERS:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
96
 
                        --variable=sysusersdir)
 
63
SYSTEMD=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
97
64
 
98
 
GNUTLS_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I gnutls)
99
 
GNUTLS_LIBS:=$(shell $(PKG_CONFIG) --libs gnutls)
100
 
AVAHI_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I avahi-core)
101
 
AVAHI_LIBS:=$(shell $(PKG_CONFIG) --libs avahi-core)
102
 
GPGME_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I gpgme 2>/dev/null \
103
 
        || gpgme-config --cflags; getconf LFS_CFLAGS)
104
 
GPGME_LIBS:=$(shell $(PKG_CONFIG) --libs gpgme 2>/dev/null \
105
 
        || gpgme-config --libs; getconf LFS_LIBS; \
 
65
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
 
66
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
 
67
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
 
68
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; \
106
71
        getconf LFS_LDFLAGS)
107
 
LIBNL3_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I libnl-route-3.0)
108
 
LIBNL3_LIBS:=$(shell $(PKG_CONFIG) --libs libnl-route-3.0)
109
 
GLIB_CFLAGS:=$(shell $(PKG_CONFIG) --cflags glib-2.0)
110
 
GLIB_LIBS:=$(shell $(PKG_CONFIG) --libs glib-2.0)
111
72
 
112
73
# Do not change these two
113
74
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
114
 
        $(LANGUAGE) -DVERSION='"$(version)"'
115
 
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(strip \
116
 
        ) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
75
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
 
76
        -DVERSION='"$(version)"'
 
77
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
117
78
 
118
79
# Commands to format a DocBook <refentry> document into a manual page
119
80
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
125
86
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
126
87
        $(notdir $<); \
127
88
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
128
 
        && command -v man >/dev/null; then LANG=en_US.UTF-8 \
129
 
        MANWIDTH=80 man --warnings --encoding=UTF-8 --local-file \
130
 
        $(notdir $@); fi >/dev/null)
 
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)
131
92
 
132
93
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
133
94
        --param make.year.ranges                1 \
139
100
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
140
101
        $<; $(HTMLPOST) $@)
141
102
# Fix citerefentry links
142
 
HTMLPOST:=$(SED) --in-place \
 
103
HTMLPOST=$(SED) --in-place \
143
104
        --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
144
105
 
145
 
PLUGINS:=plugins.d/password-prompt plugins.d/mandos-client \
 
106
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
146
107
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
147
108
        plugins.d/plymouth
148
 
PLUGIN_HELPERS:=plugin-helpers/mandos-client-iprouteadddel
149
 
CPROGS:=plugin-runner dracut-module/password-agent $(PLUGINS) \
150
 
        $(PLUGIN_HELPERS)
151
 
PROGS:=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
152
 
DOCS:=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
 
109
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 \
153
112
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
154
 
        dracut-module/password-agent.8mandos \
155
113
        plugins.d/mandos-client.8mandos \
156
114
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
157
115
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
158
116
        plugins.d/plymouth.8mandos intro.8mandos
159
117
 
160
 
htmldocs:=$(addsuffix .xhtml,$(DOCS))
161
 
 
162
 
objects:=$(addsuffix .o,$(CPROGS))
163
 
 
164
 
.PHONY: all
 
118
htmldocs=$(addsuffix .xhtml,$(DOCS))
 
119
 
 
120
objects=$(addsuffix .o,$(CPROGS))
 
121
 
165
122
all: $(PROGS) mandos.lsm
166
123
 
167
 
.PHONY: doc
168
124
doc: $(DOCS)
169
125
 
170
 
.PHONY: html
171
126
html: $(htmldocs)
172
127
 
173
128
%.5: %.xml common.ent legalnotice.xml
232
187
                overview.xml legalnotice.xml
233
188
        $(DOCBOOKTOHTML)
234
189
 
235
 
dracut-module/password-agent.8mandos: \
236
 
                dracut-module/password-agent.xml common.ent \
237
 
                overview.xml legalnotice.xml
238
 
        $(DOCBOOKTOMAN)
239
 
dracut-module/password-agent.8mandos.xhtml: \
240
 
                dracut-module/password-agent.xml common.ent \
241
 
                overview.xml legalnotice.xml
242
 
        $(DOCBOOKTOHTML)
243
 
 
244
190
plugins.d/mandos-client.8mandos: plugins.d/mandos-client.xml \
245
191
                                        common.ent \
246
192
                                        mandos-options.xml \
289
235
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
290
236
                $@)
291
237
 
292
 
# Does the linker support the --no-warn-execstack option?
293
 
ifeq ($(shell echo 'int main(){}'|$(CC) --language=c /dev/stdin -o /dev/null -Xlinker --no-warn-execstack >/dev/null 2>&1 && echo yes),yes)
294
 
# These programs use nested functions, which uses an executable stack
295
 
plugin-runner: LDFLAGS += -Xlinker --no-warn-execstack
296
 
dracut-module/password-agent: LDFLAGS += -Xlinker --no-warn-execstack
297
 
plugins.d/password-prompt: LDFLAGS += -Xlinker --no-warn-execstack
298
 
plugins.d/mandos-client: LDFLAGS += -Xlinker --no-warn-execstack
299
 
plugins.d/plymouth: LDFLAGS += -Xlinker --no-warn-execstack
300
 
endif
301
 
 
302
 
# Need to add the GnuTLS, Avahi and GPGME libraries
303
 
plugins.d/mandos-client: CFLAGS += $(GNUTLS_CFLAGS) $(strip \
304
 
        ) $(AVAHI_CFLAGS) $(GPGME_CFLAGS)
305
 
plugins.d/mandos-client: LDLIBS += $(GNUTLS_LIBS) $(strip \
306
 
        ) $(AVAHI_LIBS) $(GPGME_LIBS)
307
 
 
308
 
# Need to add the libnl-route library
309
 
plugin-helpers/mandos-client-iprouteadddel: CFLAGS += $(LIBNL3_CFLAGS)
310
 
plugin-helpers/mandos-client-iprouteadddel: LDLIBS += $(LIBNL3_LIBS)
311
 
 
312
 
# Need to add the GLib and pthread libraries
313
 
dracut-module/password-agent: CFLAGS += $(GLIB_CFLAGS)
314
 
# Note: -lpthread is unnecessary with the GNU C library 2.34 or later
315
 
dracut-module/password-agent: LDLIBS += $(GLIB_LIBS) -lpthread
316
 
 
317
 
.PHONY: clean
 
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
 
247
 
318
248
clean:
319
249
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
320
250
 
321
 
.PHONY: distclean
322
251
distclean: clean
323
 
.PHONY: mostlyclean
324
252
mostlyclean: clean
325
 
.PHONY: maintainer-clean
326
253
maintainer-clean: clean
327
254
        -rm --force --recursive keydir confdir statedir
328
255
 
329
 
.PHONY: check
330
 
check: all
 
256
check:  all
331
257
        ./mandos --check
332
258
        ./mandos-ctl --check
333
 
        ./mandos-keygen --version
334
 
        ./plugin-runner --version
335
 
        ./plugin-helpers/mandos-client-iprouteadddel --version
336
 
        ./dracut-module/password-agent --test
337
259
 
338
260
# Run the client with a local config and key
339
 
.PHONY: run-client
340
 
run-client: all keydir/seckey.txt keydir/pubkey.txt \
341
 
                        keydir/tls-privkey.pem keydir/tls-pubkey.pem
342
 
        @echo '######################################################'
343
 
        @echo '# The following error messages are harmless and can  #'
344
 
        @echo '#  be safely ignored:                                #'
345
 
        @echo '## From plugin-runner:                               #'
346
 
        @echo '# setgid: Operation not permitted                    #'
347
 
        @echo '# setuid: Operation not permitted                    #'
348
 
        @echo '## From askpass-fifo:                                #'
349
 
        @echo '# mkfifo: Permission denied                          #'
350
 
        @echo '## From mandos-client:                               #'
351
 
        @echo '# Failed to raise privileges: Operation not permi... #'
352
 
        @echo '# Warning: network hook "*" exited with status *     #'
353
 
        @echo '# ioctl SIOCSIFFLAGS +IFF_UP: Operation not permi... #'
354
 
        @echo '# Failed to bring up interface "*": Operation not... #'
355
 
        @echo '#                                                    #'
356
 
        @echo '# (The messages are caused by not running as root,   #'
357
 
        @echo '# but you should NOT run "make run-client" as root   #'
358
 
        @echo '# unless you also unpacked and compiled Mandos as    #'
359
 
        @echo '# root, which is also NOT recommended.)              #'
360
 
        @echo '######################################################'
 
261
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: setgid: Operation not permitted             #"
 
268
        @echo "#                     setuid: Operation not permitted             #"
 
269
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
 
270
        @echo "# From mandos-client:                                             #"
 
271
        @echo "#             Failed to raise privileges: Operation not permitted #"
 
272
        @echo "#             Warning: network hook \"*\" exited with status *      #"
 
273
        @echo "###################################################################"
361
274
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
362
275
        ./plugin-runner --plugin-dir=plugins.d \
363
 
                --plugin-helper-dir=plugin-helpers \
364
276
                --config-file=plugin-runner.conf \
365
 
                --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 \
 
277
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
366
278
                --env-for=mandos-client:GNOME_KEYRING_CONTROL= \
367
279
                $(CLIENTARGS)
368
280
 
369
281
# Used by run-client
370
 
keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem: mandos-keygen
 
282
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
371
283
        install --directory keydir
372
284
        ./mandos-keygen --dir keydir --force
373
 
        if ! [ -e keydir/tls-privkey.pem ]; then \
374
 
                install --mode=u=rw /dev/null keydir/tls-privkey.pem; \
375
 
        fi
376
 
        if ! [ -e keydir/tls-pubkey.pem ]; then \
377
 
                install --mode=u=rw /dev/null keydir/tls-pubkey.pem; \
378
 
        fi
379
285
 
380
286
# Run the server with a local config
381
 
.PHONY: run-server
382
287
run-server: confdir/mandos.conf confdir/clients.conf statedir
383
288
        ./mandos --debug --no-dbus --configdir=confdir \
384
289
                --statedir=statedir $(SERVERARGS)
385
290
 
386
291
# Used by run-server
387
292
confdir/mandos.conf: mandos.conf
388
 
        install -D --mode=u=rw,go=r $^ $@
389
 
confdir/clients.conf: clients.conf keydir/seckey.txt keydir/tls-pubkey.pem
390
 
        install -D --mode=u=rw $< $@
 
293
        install --directory confdir
 
294
        install --mode=u=rw,go=r $^ $@
 
295
confdir/clients.conf: clients.conf keydir/seckey.txt
 
296
        install --directory confdir
 
297
        install --mode=u=rw $< $@
391
298
# Add a client password
392
299
        ./mandos-keygen --dir keydir --password --no-ssh >> $@
393
300
statedir:
394
301
        install --directory statedir
395
302
 
396
 
.PHONY: install
397
303
install: install-server install-client-nokey
398
304
 
399
 
.PHONY: install-html
400
305
install-html: html
401
 
        install -D --mode=u=rw,go=r --target-directory=$(htmldir) \
 
306
        install --directory $(htmldir)
 
307
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
402
308
                $(htmldocs)
403
309
 
404
 
.PHONY: install-server
405
310
install-server: doc
 
311
        install --directory $(CONFDIR)
406
312
        if install --directory --mode=u=rwx --owner=$(USER) \
407
313
                --group=$(GROUP) $(STATEDIR); then \
408
314
                :; \
409
315
        elif install --directory --mode=u=rwx $(STATEDIR); then \
410
316
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
411
317
        fi
412
 
        if [ "$(TMPFILES)" != "$(DESTDIR)" ]; then \
413
 
                install -D --mode=u=rw,go=r tmpfiles.d-mandos.conf \
414
 
                        $(TMPFILES)/mandos.conf; \
415
 
        fi
416
 
        if [ "$(SYSUSERS)" != "$(DESTDIR)" ]; then \
417
 
                install -D --mode=u=rw,go=r sysusers.d-mandos.conf \
418
 
                        $(SYSUSERS)/mandos.conf; \
419
 
        fi
420
 
        install --directory $(PREFIX)/sbin
421
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
422
 
                mandos
 
318
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
423
319
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
424
320
                mandos-ctl
425
321
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
426
322
                mandos-monitor
427
 
        install --directory $(CONFDIR)
428
323
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
429
324
                mandos.conf
430
325
        install --mode=u=rw --target-directory=$(CONFDIR) \
431
326
                clients.conf
432
 
        install -D --mode=u=rw,go=r dbus-mandos.conf \
433
 
                $(DBUSPOLICYDIR)/mandos.conf
434
 
        install -D --mode=u=rwx,go=rx init.d-mandos \
 
327
        install --mode=u=rw,go=r dbus-mandos.conf \
 
328
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
 
329
        install --mode=u=rwx,go=rx init.d-mandos \
435
330
                $(DESTDIR)/etc/init.d/mandos
436
 
        if [ "$(SYSTEMD)" != "$(DESTDIR)" ]; then \
437
 
                install -D --mode=u=rw,go=r mandos.service \
438
 
                        $(SYSTEMD); \
 
331
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
 
332
                install --mode=u=rw,go=r mandos.service $(SYSTEMD); \
439
333
        fi
440
 
        install -D --mode=u=rw,go=r default-mandos \
 
334
        install --mode=u=rw,go=r default-mandos \
441
335
                $(DESTDIR)/etc/default/mandos
442
336
        if [ -z $(DESTDIR) ]; then \
443
337
                update-rc.d mandos defaults 25 15;\
444
338
        fi
445
 
        install --directory $(MANDIR)/man8 $(MANDIR)/man5
446
339
        gzip --best --to-stdout mandos.8 \
447
340
                > $(MANDIR)/man8/mandos.8.gz
448
341
        gzip --best --to-stdout mandos-monitor.8 \
456
349
        gzip --best --to-stdout intro.8mandos \
457
350
                > $(MANDIR)/man8/intro.8mandos.gz
458
351
 
459
 
.PHONY: install-client-nokey
460
352
install-client-nokey: all doc
 
353
        install --directory $(LIBDIR)/mandos $(CONFDIR)
461
354
        install --directory --mode=u=rwx $(KEYDIR) \
462
 
                $(LIBDIR)/mandos/plugins.d \
463
 
                $(LIBDIR)/mandos/plugin-helpers
464
 
        if [ "$(SYSUSERS)" != "$(DESTDIR)" ]; then \
465
 
                install -D --mode=u=rw,go=r sysusers.d-mandos.conf \
466
 
                        $(SYSUSERS)/mandos-client.conf; \
467
 
        fi
 
355
                $(LIBDIR)/mandos/plugins.d
468
356
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
469
 
                install --directory \
470
 
                        --mode=u=rwx "$(CONFDIR)/plugins.d" \
471
 
                        "$(CONFDIR)/plugin-helpers"; \
 
357
                install --mode=u=rwx \
 
358
                        --directory "$(CONFDIR)/plugins.d"; \
472
359
        fi
473
 
        install --directory --mode=u=rwx,go=rx \
 
360
        install --mode=u=rwx,go=rx --directory \
474
361
                "$(CONFDIR)/network-hooks.d"
475
362
        install --mode=u=rwx,go=rx \
476
363
                --target-directory=$(LIBDIR)/mandos plugin-runner
477
 
        install --mode=u=rwx,go=rx \
478
 
                --target-directory=$(LIBDIR)/mandos \
479
 
                mandos-to-cryptroot-unlock
480
 
        install --directory $(PREFIX)/sbin
481
364
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
482
365
                mandos-keygen
483
366
        install --mode=u=rwx,go=rx \
498
381
        install --mode=u=rwxs,go=rx \
499
382
                --target-directory=$(LIBDIR)/mandos/plugins.d \
500
383
                plugins.d/plymouth
501
 
        install --mode=u=rwx,go=rx \
502
 
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
503
 
                plugin-helpers/mandos-client-iprouteadddel
504
 
        install -D initramfs-tools-hook \
 
384
        install initramfs-tools-hook \
505
385
                $(INITRAMFSTOOLS)/hooks/mandos
506
 
        install -D --mode=u=rw,go=r initramfs-tools-conf \
507
 
                $(INITRAMFSTOOLS)/conf.d/mandos-conf
508
 
        install -D --mode=u=rw,go=r initramfs-tools-conf-hook \
509
 
                $(INITRAMFSTOOLS)/conf-hooks.d/zz-mandos
510
 
        install -D initramfs-tools-script \
 
386
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
 
387
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
 
388
        install initramfs-tools-script \
511
389
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
512
 
        install -D initramfs-tools-script-stop \
513
 
                $(INITRAMFSTOOLS)/scripts/local-premount/mandos
514
 
        install -D --mode=u=rw,go=r \
515
 
                --target-directory=$(DRACUTMODULE) \
516
 
                dracut-module/ask-password-mandos.path \
517
 
                dracut-module/ask-password-mandos.service
518
 
        install --mode=u=rwxs,go=rx \
519
 
                --target-directory=$(DRACUTMODULE) \
520
 
                dracut-module/module-setup.sh \
521
 
                dracut-module/cmdline-mandos.sh \
522
 
                dracut-module/password-agent
523
390
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
524
 
        install --directory $(MANDIR)/man8
525
391
        gzip --best --to-stdout mandos-keygen.8 \
526
392
                > $(MANDIR)/man8/mandos-keygen.8.gz
527
393
        gzip --best --to-stdout plugin-runner.8mandos \
538
404
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
539
405
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
540
406
                > $(MANDIR)/man8/plymouth.8mandos.gz
541
 
        gzip --best --to-stdout dracut-module/password-agent.8mandos \
542
 
                > $(MANDIR)/man8/password-agent.8mandos.gz
543
407
 
544
 
.PHONY: install-client
545
408
install-client: install-client-nokey
546
409
# Post-installation stuff
547
410
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
548
 
        if command -v update-initramfs >/dev/null; then \
549
 
            update-initramfs -k all -u; \
550
 
        elif command -v dracut >/dev/null; then \
551
 
            for initrd in $(DESTDIR)/boot/initr*-$(LINUXVERSION); do \
552
 
                if [ -w "$$initrd" ]; then \
553
 
                    chmod go-r "$$initrd"; \
554
 
                    dracut --force "$$initrd"; \
555
 
                fi; \
556
 
            done; \
557
 
        fi
 
411
        update-initramfs -k all -u
558
412
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
559
413
 
560
 
.PHONY: uninstall
561
414
uninstall: uninstall-server uninstall-client
562
415
 
563
 
.PHONY: uninstall-server
564
416
uninstall-server:
565
417
        -rm --force $(PREFIX)/sbin/mandos \
566
418
                $(PREFIX)/sbin/mandos-ctl \
573
425
        update-rc.d -f mandos remove
574
426
        -rmdir $(CONFDIR)
575
427
 
576
 
.PHONY: uninstall-client
577
428
uninstall-client:
578
429
# Refuse to uninstall client if /etc/crypttab is explicitly configured
579
430
# to use it.
590
441
                $(INITRAMFSTOOLS)/hooks/mandos \
591
442
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
592
443
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
593
 
                $(INITRAMFSTOOLS)/scripts/local-premount/mandos \
594
 
                $(DRACUTMODULE)/ask-password-mandos.path \
595
 
                $(DRACUTMODULE)/ask-password-mandos.service \
596
 
                $(DRACUTMODULE)/module-setup.sh \
597
 
                $(DRACUTMODULE)/cmdline-mandos.sh \
598
 
                $(DRACUTMODULE)/password-agent \
599
444
                $(MANDIR)/man8/mandos-keygen.8.gz \
600
445
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
601
446
                $(MANDIR)/man8/mandos-client.8mandos.gz
604
449
                $(MANDIR)/man8/splashy.8mandos.gz \
605
450
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
606
451
                $(MANDIR)/man8/plymouth.8mandos.gz \
607
 
                $(MANDIR)/man8/password-agent.8mandos.gz \
608
452
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
609
 
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR) $(DRACUTMODULE)
610
 
        if command -v update-initramfs >/dev/null; then \
611
 
            update-initramfs -k all -u; \
612
 
        elif command -v dracut >/dev/null; then \
613
 
            for initrd in $(DESTDIR)/boot/initr*-$(LINUXVERSION); do \
614
 
                test -w "$$initrd" && dracut --force "$$initrd"; \
615
 
            done; \
616
 
        fi
 
453
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
 
454
        update-initramfs -k all -u
617
455
 
618
 
.PHONY: purge
619
456
purge: purge-server purge-client
620
457
 
621
 
.PHONY: purge-server
622
458
purge-server: uninstall-server
623
459
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
624
460
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
625
461
                $(DESTDIR)/etc/default/mandos \
626
462
                $(DESTDIR)/etc/init.d/mandos \
 
463
                $(SYSTEMD)/mandos.service \
627
464
                $(DESTDIR)/run/mandos.pid \
628
465
                $(DESTDIR)/var/run/mandos.pid
629
 
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
630
 
                -rm --force -- $(SYSTEMD)/mandos.service; \
631
 
        fi
632
466
        -rmdir $(CONFDIR)
633
467
 
634
 
.PHONY: purge-client
635
468
purge-client: uninstall-client
636
 
        -shred --remove $(KEYDIR)/seckey.txt $(KEYDIR)/tls-privkey.pem
 
469
        -shred --remove $(KEYDIR)/seckey.txt
637
470
        -rm --force $(CONFDIR)/plugin-runner.conf \
638
 
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt \
639
 
                $(KEYDIR)/tls-pubkey.txt $(KEYDIR)/tls-privkey.txt
 
471
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt
640
472
        -rmdir $(KEYDIR) $(CONFDIR)/plugins.d $(CONFDIR)