/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: 2019-08-02 22:16:53 UTC
  • mto: This revision was merged to the branch mainline in revision 386.
  • Revision ID: teddy@recompile.se-20190802221653-ic1iko9hbefzwsk7
Fix bug in server Debian package: Fails to start on first install

There has been a very long-standing bug where installation of the
server (the "mandos" Debian package) would fail to start the server
properly right after installation.  It would work on manual (re)start
after installation, or after reboot, and even after package purge and
reinstall, it would then work the first time.  The problem, it turns
out, is when the new "_mandos" user (and corresponding group) is
created, the D-Bus server is not reloaded, and is therefore not aware
of that user, and does not recognize the user and group name in the
/etc/dbus-1/system.d/mandos.conf file.  The Mandos server, when it
tries to start and access the D-Bus, is then not permitted to connect
to its D-Bus bus name, and disables D-Bus use as a fallback measure;
i.e. the server works, but it is not controllable via D-Bus commands
(via mandos-ctl or mandos-monitor).  The next time the D-Bus daemon is
reloaded for any reason, the new user & group would become visible to
the D-Bus daemon and after that, any restart of the Mandos server
would succeed and it would bind to its D-Bus name properly, and
thereby be visible and controllable by mandos-ctl & mandos-monitor.
This was mostly invisible when using sysvinit, but systemd makes the
problem visible since the systemd service file for the Mandos server
is configured to not consider the Mandos server "started" until the
D-Bus name has been bound; this makes the starting of the service wait
for 90 seconds and then fail with a timeout error.

Fixing this should also make the Debian CI autopkgtest tests work.

* debian/mandos.postinst (configure): After creating (or renaming)
                                      user & group, reload D-Bus
                                      daemon (if present).

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
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:=
 
35
 
 
36
# If BROKEN_PIE is set, do not build with -pie
16
37
ifndef BROKEN_PIE
17
38
FORTIFY += -fPIE
18
 
LINK_FORTIFY_LD += -fPIE
19
39
LINK_FORTIFY += -pie
20
40
endif
21
41
#COVERAGE=--coverage
22
 
OPTIMIZE=-Os
23
 
LANGUAGE=-std=gnu99
24
 
htmldir=man
25
 
version=1.0.14
26
 
SED=sed
 
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)
27
55
 
28
56
## Use these settings for a traditional /usr/local install
29
 
# PREFIX=$(DESTDIR)/usr/local
30
 
# CONFDIR=$(DESTDIR)/etc/mandos
31
 
# KEYDIR=$(DESTDIR)/etc/mandos/keys
32
 
# MANDIR=$(PREFIX)/man
33
 
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
 
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
34
65
##
35
66
 
36
67
## These settings are for a package-type install
37
 
PREFIX=$(DESTDIR)/usr
38
 
CONFDIR=$(DESTDIR)/etc/mandos
39
 
KEYDIR=$(DESTDIR)/etc/keys/mandos
40
 
MANDIR=$(PREFIX)/share/man
41
 
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
 
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)
42
85
##
43
86
 
44
 
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
45
 
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
46
 
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
47
 
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
48
 
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
49
 
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; \
50
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)
51
103
 
52
104
# Do not change these two
53
 
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
54
 
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
55
 
        -DVERSION='"$(version)"'
56
 
LDFLAGS=$(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))
57
109
 
58
110
# Commands to format a DocBook <refentry> document into a manual page
59
 
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
 
111
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
60
112
        --param man.charmap.use.subset          0 \
61
113
        --param make.year.ranges                1 \
62
114
        --param make.single.year.ranges         1 \
63
115
        --param man.output.quietly              1 \
64
116
        --param man.authors.section.enabled     0 \
65
 
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
 
117
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
66
118
        $(notdir $<); \
67
 
        $(MANPOST) $(notdir $@)
68
 
# DocBook-to-man post-processing to fix a '\n' escape bug
69
 
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
 
119
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
 
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)
70
123
 
71
 
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
 
124
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
72
125
        --param make.year.ranges                1 \
73
126
        --param make.single.year.ranges         1 \
74
127
        --param man.output.quietly              1 \
76
129
        --param citerefentry.link               1 \
77
130
        --output $@ \
78
131
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
79
 
        $<; $(HTMLPOST) $@
 
132
        $<; $(HTMLPOST) $@)
80
133
# Fix citerefentry links
81
 
HTMLPOST=$(SED) --in-place \
 
134
HTMLPOST:=$(SED) --in-place \
82
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'
83
136
 
84
 
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
85
 
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
86
 
CPROGS=plugin-runner $(PLUGINS)
87
 
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
88
 
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
 
137
PLUGINS:=plugins.d/password-prompt plugins.d/mandos-client \
 
138
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
 
139
        plugins.d/plymouth
 
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 \
 
145
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
 
146
        dracut-module/password-agent.8mandos \
89
147
        plugins.d/mandos-client.8mandos \
90
 
        plugins.d/password-prompt.8mandos mandos.conf.5 \
91
 
        plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
92
 
        plugins.d/askpass-fifo.8mandos mandos-clients.conf.5
93
 
 
94
 
htmldocs=$(addsuffix .xhtml,$(DOCS))
95
 
 
96
 
objects=$(addsuffix .o,$(CPROGS))
 
148
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
 
149
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
 
150
        plugins.d/plymouth.8mandos intro.8mandos
 
151
 
 
152
htmldocs:=$(addsuffix .xhtml,$(DOCS))
 
153
 
 
154
objects:=$(addsuffix .o,$(CPROGS))
97
155
 
98
156
all: $(PROGS) mandos.lsm
99
157
 
116
174
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
117
175
        $(DOCBOOKTOHTML)
118
176
 
 
177
intro.8mandos: intro.xml common.ent legalnotice.xml
 
178
        $(DOCBOOKTOMAN)
 
179
intro.8mandos.xhtml: intro.xml common.ent legalnotice.xml
 
180
        $(DOCBOOKTOHTML)
 
181
 
119
182
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
120
183
                legalnotice.xml
121
184
        $(DOCBOOKTOMAN)
130
193
                 legalnotice.xml
131
194
        $(DOCBOOKTOHTML)
132
195
 
 
196
mandos-monitor.8: mandos-monitor.xml common.ent overview.xml \
 
197
                legalnotice.xml
 
198
        $(DOCBOOKTOMAN)
 
199
mandos-monitor.8.xhtml: mandos-monitor.xml common.ent overview.xml \
 
200
                 legalnotice.xml
 
201
        $(DOCBOOKTOHTML)
 
202
 
 
203
mandos-ctl.8: mandos-ctl.xml common.ent overview.xml \
 
204
                legalnotice.xml
 
205
        $(DOCBOOKTOMAN)
 
206
mandos-ctl.8.xhtml: mandos-ctl.xml common.ent overview.xml \
 
207
                 legalnotice.xml
 
208
        $(DOCBOOKTOHTML)
 
209
 
133
210
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
134
211
                legalnotice.xml
135
212
        $(DOCBOOKTOMAN)
144
221
                overview.xml legalnotice.xml
145
222
        $(DOCBOOKTOHTML)
146
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
 
147
233
plugins.d/mandos-client.8mandos: plugins.d/mandos-client.xml \
148
234
                                        common.ent \
149
235
                                        mandos-options.xml \
157
243
 
158
244
# Update all these files with version number $(version)
159
245
common.ent: Makefile
160
 
        $(SED) --in-place \
 
246
        $(strip $(SED) --in-place \
161
247
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
162
 
                $@
 
248
                $@)
163
249
 
164
250
mandos: Makefile
165
 
        $(SED) --in-place \
 
251
        $(strip $(SED) --in-place \
166
252
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
167
 
                $@
 
253
                $@)
168
254
 
169
255
mandos-keygen: Makefile
170
 
        $(SED) --in-place \
 
256
        $(strip $(SED) --in-place \
171
257
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
172
 
                $@
 
258
                $@)
173
259
 
174
260
mandos-ctl: Makefile
175
 
        $(SED) --in-place \
176
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
177
 
                $@
 
261
        $(strip $(SED) --in-place \
 
262
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
263
                $@)
 
264
 
 
265
mandos-monitor: Makefile
 
266
        $(strip $(SED) --in-place \
 
267
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
268
                $@)
178
269
 
179
270
mandos.lsm: Makefile
180
 
        $(SED) --in-place \
 
271
        $(strip $(SED) --in-place \
181
272
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
182
 
                $@
183
 
        $(SED) --in-place \
 
273
                $@)
 
274
        $(strip $(SED) --in-place \
184
275
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
185
 
                $@
186
 
        $(SED) --in-place \
 
276
                $@)
 
277
        $(strip $(SED) --in-place \
187
278
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
188
 
                $@
189
 
 
190
 
plugins.d/mandos-client: plugins.d/mandos-client.o
191
 
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
192
 
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
193
 
 
194
 
.PHONY : all doc html clean distclean run-client run-server install \
195
 
        install-server install-client uninstall uninstall-server \
196
 
        uninstall-client purge purge-server purge-client
 
279
                $@)
 
280
 
 
281
# Need to add the GnuTLS, Avahi and GPGME libraries
 
282
plugins.d/mandos-client: plugins.d/mandos-client.c
 
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
197
303
 
198
304
clean:
199
305
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
201
307
distclean: clean
202
308
mostlyclean: clean
203
309
maintainer-clean: clean
204
 
        -rm --force --recursive keydir confdir
 
310
        -rm --force --recursive keydir confdir statedir
205
311
 
206
 
check:  all
 
312
check: all
207
313
        ./mandos --check
 
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
208
319
 
209
320
# Run the client with a local config and key
210
 
run-client: all keydir/seckey.txt keydir/pubkey.txt
 
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
211
343
        ./plugin-runner --plugin-dir=plugins.d \
 
344
                --plugin-helper-dir=plugin-helpers \
212
345
                --config-file=plugin-runner.conf \
213
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
 
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= \
214
348
                $(CLIENTARGS)
215
349
 
216
350
# Used by run-client
217
 
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
218
352
        install --directory keydir
219
353
        ./mandos-keygen --dir keydir --force
220
354
 
221
355
# Run the server with a local config
222
 
run-server: confdir/mandos.conf confdir/clients.conf
223
 
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
 
356
run-server: confdir/mandos.conf confdir/clients.conf statedir
 
357
        ./mandos --debug --no-dbus --configdir=confdir \
 
358
                --statedir=statedir $(SERVERARGS)
224
359
 
225
360
# Used by run-server
226
361
confdir/mandos.conf: mandos.conf
227
362
        install --directory confdir
228
363
        install --mode=u=rw,go=r $^ $@
229
 
confdir/clients.conf: clients.conf keydir/seckey.txt
 
364
confdir/clients.conf: clients.conf keydir/seckey.txt keydir/tls-pubkey.pem
230
365
        install --directory confdir
231
366
        install --mode=u=rw $< $@
232
367
# Add a client password
233
 
        ./mandos-keygen --dir keydir --password >> $@
 
368
        ./mandos-keygen --dir keydir --password --no-ssh >> $@
 
369
statedir:
 
370
        install --directory statedir
234
371
 
235
372
install: install-server install-client-nokey
236
373
 
241
378
 
242
379
install-server: doc
243
380
        install --directory $(CONFDIR)
 
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
244
392
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
 
393
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
 
394
                mandos-ctl
 
395
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
 
396
                mandos-monitor
245
397
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
246
398
                mandos.conf
247
399
        install --mode=u=rw --target-directory=$(CONFDIR) \
248
400
                clients.conf
 
401
        install --mode=u=rw,go=r dbus-mandos.conf \
 
402
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
249
403
        install --mode=u=rwx,go=rx init.d-mandos \
250
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
251
408
        install --mode=u=rw,go=r default-mandos \
252
409
                $(DESTDIR)/etc/default/mandos
253
410
        if [ -z $(DESTDIR) ]; then \
255
412
        fi
256
413
        gzip --best --to-stdout mandos.8 \
257
414
                > $(MANDIR)/man8/mandos.8.gz
 
415
        gzip --best --to-stdout mandos-monitor.8 \
 
416
                > $(MANDIR)/man8/mandos-monitor.8.gz
 
417
        gzip --best --to-stdout mandos-ctl.8 \
 
418
                > $(MANDIR)/man8/mandos-ctl.8.gz
258
419
        gzip --best --to-stdout mandos.conf.5 \
259
420
                > $(MANDIR)/man5/mandos.conf.5.gz
260
421
        gzip --best --to-stdout mandos-clients.conf.5 \
261
422
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
 
423
        gzip --best --to-stdout intro.8mandos \
 
424
                > $(MANDIR)/man8/intro.8mandos.gz
262
425
 
263
426
install-client-nokey: all doc
264
 
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
 
427
        install --directory $(LIBDIR)/mandos $(CONFDIR)
265
428
        install --directory --mode=u=rwx $(KEYDIR) \
266
 
                $(PREFIX)/lib/mandos/plugins.d
267
 
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
 
429
                $(LIBDIR)/mandos/plugins.d \
 
430
                $(LIBDIR)/mandos/plugin-helpers
 
431
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
268
432
                install --mode=u=rwx \
269
 
                        --directory "$(CONFDIR)/plugins.d"; \
 
433
                        --directory "$(CONFDIR)/plugins.d" \
 
434
                        "$(CONFDIR)/plugin-helpers"; \
270
435
        fi
271
 
        install --mode=u=rwx,go=rx \
272
 
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
 
436
        install --mode=u=rwx,go=rx --directory \
 
437
                "$(CONFDIR)/network-hooks.d"
 
438
        install --mode=u=rwx,go=rx \
 
439
                --target-directory=$(LIBDIR)/mandos plugin-runner
 
440
        install --mode=u=rwx,go=rx \
 
441
                --target-directory=$(LIBDIR)/mandos \
 
442
                mandos-to-cryptroot-unlock
273
443
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
274
444
                mandos-keygen
275
445
        install --mode=u=rwx,go=rx \
276
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
446
                --target-directory=$(LIBDIR)/mandos/plugins.d \
277
447
                plugins.d/password-prompt
278
448
        install --mode=u=rwxs,go=rx \
279
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
449
                --target-directory=$(LIBDIR)/mandos/plugins.d \
280
450
                plugins.d/mandos-client
281
451
        install --mode=u=rwxs,go=rx \
282
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
452
                --target-directory=$(LIBDIR)/mandos/plugins.d \
283
453
                plugins.d/usplash
284
454
        install --mode=u=rwxs,go=rx \
285
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
455
                --target-directory=$(LIBDIR)/mandos/plugins.d \
286
456
                plugins.d/splashy
287
457
        install --mode=u=rwxs,go=rx \
288
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
458
                --target-directory=$(LIBDIR)/mandos/plugins.d \
289
459
                plugins.d/askpass-fifo
 
460
        install --mode=u=rwxs,go=rx \
 
461
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
462
                plugins.d/plymouth
 
463
        install --mode=u=rwx,go=rx \
 
464
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
 
465
                plugin-helpers/mandos-client-iprouteadddel
290
466
        install initramfs-tools-hook \
291
467
                $(INITRAMFSTOOLS)/hooks/mandos
292
 
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
293
 
                $(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
294
472
        install initramfs-tools-script \
295
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
296
485
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
297
486
        gzip --best --to-stdout mandos-keygen.8 \
298
487
                > $(MANDIR)/man8/mandos-keygen.8.gz
299
488
        gzip --best --to-stdout plugin-runner.8mandos \
300
489
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
490
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
 
491
                > $(MANDIR)/man8/mandos-client.8mandos.gz
301
492
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
302
493
                > $(MANDIR)/man8/password-prompt.8mandos.gz
303
 
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
304
 
                > $(MANDIR)/man8/mandos-client.8mandos.gz
305
494
        gzip --best --to-stdout plugins.d/usplash.8mandos \
306
495
                > $(MANDIR)/man8/usplash.8mandos.gz
307
496
        gzip --best --to-stdout plugins.d/splashy.8mandos \
308
497
                > $(MANDIR)/man8/splashy.8mandos.gz
309
498
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
310
499
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
 
500
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
 
501
                > $(MANDIR)/man8/plymouth.8mandos.gz
 
502
        gzip --best --to-stdout dracut-module/password-agent.8mandos \
 
503
                > $(MANDIR)/man8/password-agent.8mandos.gz
311
504
 
312
505
install-client: install-client-nokey
313
506
# Post-installation stuff
314
507
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
315
 
        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
316
518
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
317
519
 
318
520
uninstall: uninstall-server uninstall-client
319
521
 
320
522
uninstall-server:
321
523
        -rm --force $(PREFIX)/sbin/mandos \
 
524
                $(PREFIX)/sbin/mandos-ctl \
 
525
                $(PREFIX)/sbin/mandos-monitor \
322
526
                $(MANDIR)/man8/mandos.8.gz \
 
527
                $(MANDIR)/man8/mandos-monitor.8.gz \
 
528
                $(MANDIR)/man8/mandos-ctl.8.gz \
323
529
                $(MANDIR)/man5/mandos.conf.5.gz \
324
530
                $(MANDIR)/man5/mandos-clients.conf.5.gz
325
531
        update-rc.d -f mandos remove
331
537
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
332
538
                $(DESTDIR)/etc/crypttab
333
539
        -rm --force $(PREFIX)/sbin/mandos-keygen \
334
 
                $(PREFIX)/lib/mandos/plugin-runner \
335
 
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
336
 
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
337
 
                $(PREFIX)/lib/mandos/plugins.d/usplash \
338
 
                $(PREFIX)/lib/mandos/plugins.d/splashy \
339
 
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
 
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 \
340
547
                $(INITRAMFSTOOLS)/hooks/mandos \
341
548
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
342
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 \
 
556
                $(MANDIR)/man8/mandos-keygen.8.gz \
343
557
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
344
 
                $(MANDIR)/man8/mandos-keygen.8.gz \
 
558
                $(MANDIR)/man8/mandos-client.8mandos.gz
345
559
                $(MANDIR)/man8/password-prompt.8mandos.gz \
346
560
                $(MANDIR)/man8/usplash.8mandos.gz \
347
561
                $(MANDIR)/man8/splashy.8mandos.gz \
348
562
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
349
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
350
 
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
351
 
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
352
 
        update-initramfs -k all -u
 
563
                $(MANDIR)/man8/plymouth.8mandos.gz \
 
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
353
574
 
354
575
purge: purge-server purge-client
355
576
 
356
577
purge-server: uninstall-server
357
578
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
 
579
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
358
580
                $(DESTDIR)/etc/default/mandos \
359
581
                $(DESTDIR)/etc/init.d/mandos \
 
582
                $(SYSTEMD)/mandos.service \
 
583
                $(DESTDIR)/run/mandos.pid \
360
584
                $(DESTDIR)/var/run/mandos.pid
361
585
        -rmdir $(CONFDIR)
362
586
 
363
587
purge-client: uninstall-client
364
 
        -shred --remove $(KEYDIR)/seckey.txt
 
588
        -shred --remove $(KEYDIR)/seckey.txt $(KEYDIR)/tls-privkey.pem
365
589
        -rm --force $(CONFDIR)/plugin-runner.conf \
366
 
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt
 
590
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt \
 
591
                $(KEYDIR)/tls-pubkey.txt $(KEYDIR)/tls-privkey.txt
367
592
        -rmdir $(KEYDIR) $(CONFDIR)/plugins.d $(CONFDIR)