/mandos/release

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

« back to all changes in this revision

Viewing changes to Makefile

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

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

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

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

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
1
 
WARN:=-O -Wall -Wextra -Wdouble-promotion -Wformat=2 -Winit-self \
2
 
        -Wmissing-include-dirs -Wswitch-default -Wswitch-enum \
3
 
        -Wunused -Wuninitialized -Wstrict-overflow=5 \
4
 
        -Wsuggest-attribute=pure -Wsuggest-attribute=const \
5
 
        -Wsuggest-attribute=noreturn -Wfloat-equal -Wundef -Wshadow \
 
1
WARN=-O -Wall -Wformat=2 -Winit-self -Wmissing-include-dirs \
 
2
        -Wswitch-default -Wswitch-enum -Wunused-parameter \
 
3
        -Wstrict-aliasing=2 -Wextra -Wfloat-equal -Wundef -Wshadow \
6
4
        -Wunsafe-loop-optimizations -Wpointer-arith \
7
5
        -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings \
8
 
        -Wconversion -Wlogical-op -Waggregate-return \
9
 
        -Wstrict-prototypes -Wold-style-definition \
10
 
        -Wmissing-format-attribute -Wnormalized=nfc -Wpacked \
11
 
        -Wredundant-decls -Wnested-externs -Winline -Wvla \
12
 
        -Wvolatile-register-var -Woverlength-strings
13
 
#DEBUG:=-ggdb3 -fsanitize=address 
14
 
# For info about _FORTIFY_SOURCE, see feature_test_macros(7)
15
 
# and <https://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
16
 
FORTIFY:=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
17
 
# <https://developerblog.redhat.com/2014/10/16/gcc-undefined-behavior-sanitizer-ubsan/>
18
 
ALL_SANITIZE_OPTIONS:=-fsanitize=leak -fsanitize=undefined \
19
 
        -fsanitize=shift -fsanitize=integer-divide-by-zero \
20
 
        -fsanitize=unreachable -fsanitize=vla-bound -fsanitize=null \
21
 
        -fsanitize=return -fsanitize=signed-integer-overflow \
22
 
        -fsanitize=bounds -fsanitize=alignment \
23
 
        -fsanitize=object-size -fsanitize=float-divide-by-zero \
24
 
        -fsanitize=float-cast-overflow -fsanitize=nonnull-attribute \
25
 
        -fsanitize=returns-nonnull-attribute -fsanitize=bool \
26
 
        -fsanitize=enum
27
 
# Check which sanitizing options can be used
28
 
SANITIZE:=$(foreach option,$(ALL_SANITIZE_OPTIONS),$(shell \
29
 
        echo 'int main(){}' | $(CC) --language=c $(option) /dev/stdin \
30
 
        -o /dev/null >/dev/null 2>&1 && echo $(option)))
31
 
LINK_FORTIFY_LD:=-z relro -z now
32
 
LINK_FORTIFY:=
33
 
 
34
 
# If BROKEN_PIE is set, do not build with -pie
35
 
ifndef BROKEN_PIE
36
 
FORTIFY += -fPIE
37
 
LINK_FORTIFY += -pie
38
 
endif
 
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://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>
 
12
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIE -pie
 
13
LINK_FORTIFY=-z relro -pie
39
14
#COVERAGE=--coverage
40
 
OPTIMIZE:=-Os -fno-strict-aliasing
41
 
LANGUAGE:=-std=gnu11
42
 
htmldir:=man
43
 
version:=1.7.20
44
 
SED:=sed
45
 
 
46
 
USER:=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
47
 
GROUP:=$(firstword $(subst :, ,$(shell getent group _mandos || getent group nogroup || echo 65534)))
 
15
OPTIMIZE=-Os
 
16
LANGUAGE=-std=gnu99
 
17
htmldir=man
 
18
version=1.0.2
 
19
SED=sed
48
20
 
49
21
## Use these settings for a traditional /usr/local install
50
 
# PREFIX:=$(DESTDIR)/usr/local
51
 
# CONFDIR:=$(DESTDIR)/etc/mandos
52
 
# KEYDIR:=$(DESTDIR)/etc/mandos/keys
53
 
# MANDIR:=$(PREFIX)/man
54
 
# INITRAMFSTOOLS:=$(DESTDIR)/etc/initramfs-tools
55
 
# STATEDIR:=$(DESTDIR)/var/lib/mandos
56
 
# LIBDIR:=$(PREFIX)/lib
 
22
# PREFIX=$(DESTDIR)/usr/local
 
23
# CONFDIR=$(DESTDIR)/etc/mandos
 
24
# KEYDIR=$(DESTDIR)/etc/mandos/keys
 
25
# MANDIR=$(PREFIX)/man
 
26
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
57
27
##
58
28
 
59
29
## These settings are for a package-type install
60
 
PREFIX:=$(DESTDIR)/usr
61
 
CONFDIR:=$(DESTDIR)/etc/mandos
62
 
KEYDIR:=$(DESTDIR)/etc/keys/mandos
63
 
MANDIR:=$(PREFIX)/share/man
64
 
INITRAMFSTOOLS:=$(DESTDIR)/usr/share/initramfs-tools
65
 
STATEDIR:=$(DESTDIR)/var/lib/mandos
66
 
LIBDIR:=$(shell \
67
 
        for d in \
68
 
        "/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null`" \
69
 
        "`rpm --eval='%{_libdir}' 2>/dev/null`" /usr/lib; do \
70
 
                if [ -d "$$d" -a "$$d" = "$${d%/}" ]; then \
71
 
                        echo "$(DESTDIR)$$d"; \
72
 
                        break; \
73
 
                fi; \
74
 
        done)
 
30
PREFIX=$(DESTDIR)/usr
 
31
CONFDIR=$(DESTDIR)/etc/mandos
 
32
KEYDIR=$(DESTDIR)/etc/keys/mandos
 
33
MANDIR=$(PREFIX)/share/man
 
34
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
75
35
##
76
36
 
77
 
SYSTEMD:=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
78
 
TMPFILES:=$(DESTDIR)$(shell pkg-config systemd --variable=tmpfilesdir)
79
 
 
80
 
GNUTLS_CFLAGS:=$(shell pkg-config --cflags-only-I gnutls)
81
 
GNUTLS_LIBS:=$(shell pkg-config --libs gnutls)
82
 
AVAHI_CFLAGS:=$(shell pkg-config --cflags-only-I avahi-core)
83
 
AVAHI_LIBS:=$(shell pkg-config --libs avahi-core)
84
 
GPGME_CFLAGS:=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
85
 
GPGME_LIBS:=$(shell gpgme-config --libs; getconf LFS_LIBS; \
86
 
        getconf LFS_LDFLAGS)
87
 
LIBNL3_CFLAGS:=$(shell pkg-config --cflags-only-I libnl-route-3.0)
88
 
LIBNL3_LIBS:=$(shell pkg-config --libs libnl-route-3.0)
 
37
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
 
38
GNUTLS_LIBS=$(shell libgnutls-config --libs)
 
39
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
 
40
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
 
41
GPGME_CFLAGS=$(shell gpgme-config --cflags)
 
42
GPGME_LIBS=$(shell gpgme-config --libs)
89
43
 
90
44
# Do not change these two
91
 
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(SANITIZE) $(COVERAGE) \
92
 
        $(OPTIMIZE) $(LANGUAGE) -DVERSION='"$(version)"'
93
 
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
45
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
 
46
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
 
47
        -DVERSION='"$(version)"'
 
48
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY)
94
49
 
95
50
# Commands to format a DocBook <refentry> document into a manual page
96
 
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
 
51
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
97
52
        --param man.charmap.use.subset          0 \
98
53
        --param make.year.ranges                1 \
99
54
        --param make.single.year.ranges         1 \
100
55
        --param man.output.quietly              1 \
101
56
        --param man.authors.section.enabled     0 \
102
 
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
 
57
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
103
58
        $(notdir $<); \
104
 
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
105
 
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
106
 
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
107
 
        fi >/dev/null)
 
59
        $(MANPOST) $(notdir $@)
 
60
# DocBook-to-man post-processing to fix a '\n' escape bug
 
61
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
108
62
 
109
 
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
 
63
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
110
64
        --param make.year.ranges                1 \
111
65
        --param make.single.year.ranges         1 \
112
66
        --param man.output.quietly              1 \
114
68
        --param citerefentry.link               1 \
115
69
        --output $@ \
116
70
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
117
 
        $<; $(HTMLPOST) $@)
 
71
        $<; $(HTMLPOST) $@
118
72
# Fix citerefentry links
119
 
HTMLPOST:=$(SED) --in-place \
 
73
HTMLPOST=$(SED) --in-place \
120
74
        --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
121
75
 
122
 
PLUGINS:=plugins.d/password-prompt plugins.d/mandos-client \
123
 
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
124
 
        plugins.d/plymouth
125
 
PLUGIN_HELPERS:=plugin-helpers/mandos-client-iprouteadddel
126
 
CPROGS:=plugin-runner $(PLUGINS) $(PLUGIN_HELPERS)
127
 
PROGS:=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
128
 
DOCS:=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
129
 
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
 
76
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
 
77
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
 
78
CPROGS=plugin-runner $(PLUGINS)
 
79
PROGS=mandos mandos-keygen $(CPROGS)
 
80
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
130
81
        plugins.d/mandos-client.8mandos \
131
 
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
132
 
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
133
 
        plugins.d/plymouth.8mandos intro.8mandos
134
 
 
135
 
htmldocs:=$(addsuffix .xhtml,$(DOCS))
136
 
 
137
 
objects:=$(addsuffix .o,$(CPROGS))
 
82
        plugins.d/password-prompt.8mandos mandos.conf.5 \
 
83
        plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
 
84
        plugins.d/askpass-fifo.8mandos mandos-clients.conf.5
 
85
 
 
86
htmldocs=$(addsuffix .xhtml,$(DOCS))
 
87
 
 
88
objects=$(addsuffix .o,$(CPROGS))
138
89
 
139
90
all: $(PROGS) mandos.lsm
140
91
 
157
108
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
158
109
        $(DOCBOOKTOHTML)
159
110
 
160
 
intro.8mandos: intro.xml common.ent legalnotice.xml
161
 
        $(DOCBOOKTOMAN)
162
 
intro.8mandos.xhtml: intro.xml common.ent legalnotice.xml
163
 
        $(DOCBOOKTOHTML)
164
 
 
165
111
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
166
112
                legalnotice.xml
167
113
        $(DOCBOOKTOMAN)
176
122
                 legalnotice.xml
177
123
        $(DOCBOOKTOHTML)
178
124
 
179
 
mandos-monitor.8: mandos-monitor.xml common.ent overview.xml \
180
 
                legalnotice.xml
181
 
        $(DOCBOOKTOMAN)
182
 
mandos-monitor.8.xhtml: mandos-monitor.xml common.ent overview.xml \
183
 
                 legalnotice.xml
184
 
        $(DOCBOOKTOHTML)
185
 
 
186
 
mandos-ctl.8: mandos-ctl.xml common.ent overview.xml \
187
 
                legalnotice.xml
188
 
        $(DOCBOOKTOMAN)
189
 
mandos-ctl.8.xhtml: mandos-ctl.xml common.ent overview.xml \
190
 
                 legalnotice.xml
191
 
        $(DOCBOOKTOHTML)
192
 
 
193
125
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
194
126
                legalnotice.xml
195
127
        $(DOCBOOKTOMAN)
217
149
 
218
150
# Update all these files with version number $(version)
219
151
common.ent: Makefile
220
 
        $(strip $(SED) --in-place \
221
 
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
222
 
                $@)
 
152
        $(SED) --in-place \
 
153
                --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' \
 
154
                $@
223
155
 
224
156
mandos: Makefile
225
 
        $(strip $(SED) --in-place \
 
157
        $(SED) --in-place \
226
158
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
227
 
                $@)
 
159
                $@
228
160
 
229
161
mandos-keygen: Makefile
230
 
        $(strip $(SED) --in-place \
 
162
        $(SED) --in-place \
231
163
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
232
 
                $@)
233
 
 
234
 
mandos-ctl: Makefile
235
 
        $(strip $(SED) --in-place \
236
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
237
 
                $@)
238
 
 
239
 
mandos-monitor: Makefile
240
 
        $(strip $(SED) --in-place \
241
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
242
 
                $@)
 
164
                $@
243
165
 
244
166
mandos.lsm: Makefile
245
 
        $(strip $(SED) --in-place \
 
167
        $(SED) --in-place \
246
168
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
247
 
                $@)
248
 
        $(strip $(SED) --in-place \
 
169
                $@
 
170
        $(SED) --in-place \
249
171
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
250
 
                $@)
251
 
        $(strip $(SED) --in-place \
252
 
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
253
 
                $@)
254
 
 
255
 
# Need to add the GnuTLS, Avahi and GPGME libraries, and can't use
256
 
# -fsanitize=leak because GnuTLS and GPGME both leak memory.
257
 
plugins.d/mandos-client: plugins.d/mandos-client.c
258
 
        $(CC) $(filter-out -fsanitize=leak,$(CFLAGS)) $(strip\
259
 
        ) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) $(strip\
260
 
                ) $(CPPFLAGS) $(LDFLAGS) $(TARGET_ARCH) $^ $(strip\
261
 
                ) -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
262
 
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
263
 
 
264
 
plugin-helpers/mandos-client-iprouteadddel: plugin-helpers/mandos-client-iprouteadddel.c
265
 
        $(LINK.c) $(LIBNL3_CFLAGS) $^ $(LIBNL3_LIBS) $(strip\
266
 
                ) $(LOADLIBES) $(LDLIBS) -o $@
267
 
 
268
 
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
269
 
        check run-client run-server install install-html \
270
 
        install-server install-client-nokey install-client uninstall \
271
 
        uninstall-server uninstall-client purge purge-server \
272
 
        purge-client
 
172
                $@
 
173
 
 
174
plugins.d/mandos-client: plugins.d/mandos-client.o
 
175
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
 
176
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
177
 
 
178
.PHONY : all doc html clean distclean run-client run-server install \
 
179
        install-server install-client uninstall uninstall-server \
 
180
        uninstall-client purge purge-server purge-client
273
181
 
274
182
clean:
275
183
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
277
185
distclean: clean
278
186
mostlyclean: clean
279
187
maintainer-clean: clean
280
 
        -rm --force --recursive keydir confdir statedir
 
188
        -rm --force --recursive keydir confdir
281
189
 
282
190
check:  all
283
191
        ./mandos --check
284
 
        ./mandos-ctl --check
285
192
 
286
193
# Run the client with a local config and key
287
 
run-client: all keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem
288
 
        @echo "###################################################################"
289
 
        @echo "# The following error messages are harmless and can be safely     #"
290
 
        @echo "# ignored:                                                        #"
291
 
        @echo "# From plugin-runner: setgid: Operation not permitted             #"
292
 
        @echo "#                     setuid: Operation not permitted             #"
293
 
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
294
 
        @echo "# From mandos-client:                                             #"
295
 
        @echo "#             Failed to raise privileges: Operation not permitted #"
296
 
        @echo "#             Warning: network hook \"*\" exited with status *      #"
297
 
        @echo "#                                                                 #"
298
 
        @echo "# (The messages are caused by not running as root, but you should #"
299
 
        @echo "# NOT run \"make run-client\" as root unless you also unpacked and  #"
300
 
        @echo "# compiled Mandos as root, which is also NOT recommended.)        #"
301
 
        @echo "###################################################################"
302
 
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
 
194
run-client: all keydir/seckey.txt keydir/pubkey.txt
303
195
        ./plugin-runner --plugin-dir=plugins.d \
304
 
                --plugin-helper-dir=plugin-helpers \
305
196
                --config-file=plugin-runner.conf \
306
 
                --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 \
307
 
                --env-for=mandos-client:GNOME_KEYRING_CONTROL= \
308
 
                $(CLIENTARGS)
 
197
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
309
198
 
310
199
# Used by run-client
311
 
keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem: mandos-keygen
 
200
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
312
201
        install --directory keydir
313
202
        ./mandos-keygen --dir keydir --force
314
203
 
315
204
# Run the server with a local config
316
 
run-server: confdir/mandos.conf confdir/clients.conf statedir
317
 
        ./mandos --debug --no-dbus --configdir=confdir \
318
 
                --statedir=statedir $(SERVERARGS)
 
205
run-server: confdir/mandos.conf confdir/clients.conf
 
206
        ./mandos --debug --configdir=confdir
319
207
 
320
208
# Used by run-server
321
209
confdir/mandos.conf: mandos.conf
322
210
        install --directory confdir
323
211
        install --mode=u=rw,go=r $^ $@
324
 
confdir/clients.conf: clients.conf keydir/seckey.txt keydir/tls-pubkey.pem
 
212
confdir/clients.conf: clients.conf keydir/seckey.txt
325
213
        install --directory confdir
326
214
        install --mode=u=rw $< $@
327
215
# Add a client password
328
 
        ./mandos-keygen --dir keydir --password --no-ssh >> $@
329
 
statedir:
330
 
        install --directory statedir
 
216
        ./mandos-keygen --dir keydir --password >> $@
331
217
 
332
218
install: install-server install-client-nokey
333
219
 
338
224
 
339
225
install-server: doc
340
226
        install --directory $(CONFDIR)
341
 
        if install --directory --mode=u=rwx --owner=$(USER) \
342
 
                --group=$(GROUP) $(STATEDIR); then \
343
 
                :; \
344
 
        elif install --directory --mode=u=rwx $(STATEDIR); then \
345
 
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
346
 
        fi
347
 
        if [ "$(TMPFILES)" != "$(DESTDIR)" -a -d "$(TMPFILES)" ]; then \
348
 
                install --mode=u=rw,go=r tmpfiles.d-mandos.conf \
349
 
                        $(TMPFILES)/mandos.conf; \
350
 
        fi
351
227
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
352
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
353
 
                mandos-ctl
354
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
355
 
                mandos-monitor
356
228
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
357
229
                mandos.conf
358
230
        install --mode=u=rw --target-directory=$(CONFDIR) \
359
231
                clients.conf
360
 
        install --mode=u=rw,go=r dbus-mandos.conf \
361
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
362
232
        install --mode=u=rwx,go=rx init.d-mandos \
363
233
                $(DESTDIR)/etc/init.d/mandos
364
 
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
365
 
                install --mode=u=rw,go=r mandos.service $(SYSTEMD); \
366
 
        fi
367
234
        install --mode=u=rw,go=r default-mandos \
368
235
                $(DESTDIR)/etc/default/mandos
369
236
        if [ -z $(DESTDIR) ]; then \
371
238
        fi
372
239
        gzip --best --to-stdout mandos.8 \
373
240
                > $(MANDIR)/man8/mandos.8.gz
374
 
        gzip --best --to-stdout mandos-monitor.8 \
375
 
                > $(MANDIR)/man8/mandos-monitor.8.gz
376
 
        gzip --best --to-stdout mandos-ctl.8 \
377
 
                > $(MANDIR)/man8/mandos-ctl.8.gz
378
241
        gzip --best --to-stdout mandos.conf.5 \
379
242
                > $(MANDIR)/man5/mandos.conf.5.gz
380
243
        gzip --best --to-stdout mandos-clients.conf.5 \
381
244
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
382
 
        gzip --best --to-stdout intro.8mandos \
383
 
                > $(MANDIR)/man8/intro.8mandos.gz
384
245
 
385
246
install-client-nokey: all doc
386
 
        install --directory $(LIBDIR)/mandos $(CONFDIR)
 
247
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
387
248
        install --directory --mode=u=rwx $(KEYDIR) \
388
 
                $(LIBDIR)/mandos/plugins.d \
389
 
                $(LIBDIR)/mandos/plugin-helpers
390
 
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
 
249
                $(PREFIX)/lib/mandos/plugins.d
 
250
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
391
251
                install --mode=u=rwx \
392
 
                        --directory "$(CONFDIR)/plugins.d" \
393
 
                        "$(CONFDIR)/plugin-helpers"; \
 
252
                        --directory "$(CONFDIR)/plugins.d"; \
394
253
        fi
395
 
        install --mode=u=rwx,go=rx --directory \
396
 
                "$(CONFDIR)/network-hooks.d"
397
 
        install --mode=u=rwx,go=rx \
398
 
                --target-directory=$(LIBDIR)/mandos plugin-runner
399
 
        install --mode=u=rwx,go=rx \
400
 
                --target-directory=$(LIBDIR)/mandos mandos-to-cryptroot-unlock
 
254
        install --mode=u=rwx,go=rx \
 
255
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
401
256
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
402
257
                mandos-keygen
403
258
        install --mode=u=rwx,go=rx \
404
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
259
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
405
260
                plugins.d/password-prompt
406
261
        install --mode=u=rwxs,go=rx \
407
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
262
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
408
263
                plugins.d/mandos-client
409
264
        install --mode=u=rwxs,go=rx \
410
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
265
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
411
266
                plugins.d/usplash
412
267
        install --mode=u=rwxs,go=rx \
413
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
268
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
414
269
                plugins.d/splashy
415
270
        install --mode=u=rwxs,go=rx \
416
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
271
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
417
272
                plugins.d/askpass-fifo
418
 
        install --mode=u=rwxs,go=rx \
419
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
420
 
                plugins.d/plymouth
421
 
        install --mode=u=rwx,go=rx \
422
 
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
423
 
                plugin-helpers/mandos-client-iprouteadddel
424
273
        install initramfs-tools-hook \
425
274
                $(INITRAMFSTOOLS)/hooks/mandos
426
 
        install --mode=u=rw,go=r initramfs-tools-conf \
427
 
                $(INITRAMFSTOOLS)/conf.d/mandos-conf
 
275
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
 
276
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
428
277
        install initramfs-tools-script \
429
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
430
 
        install initramfs-tools-script-stop \
431
 
                $(INITRAMFSTOOLS)/scripts/local-premount/mandos
 
278
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
432
279
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
433
280
        gzip --best --to-stdout mandos-keygen.8 \
434
281
                > $(MANDIR)/man8/mandos-keygen.8.gz
435
282
        gzip --best --to-stdout plugin-runner.8mandos \
436
283
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
284
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
 
285
                > $(MANDIR)/man8/password-prompt.8mandos.gz
437
286
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
438
287
                > $(MANDIR)/man8/mandos-client.8mandos.gz
439
 
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
440
 
                > $(MANDIR)/man8/password-prompt.8mandos.gz
441
288
        gzip --best --to-stdout plugins.d/usplash.8mandos \
442
289
                > $(MANDIR)/man8/usplash.8mandos.gz
443
290
        gzip --best --to-stdout plugins.d/splashy.8mandos \
444
291
                > $(MANDIR)/man8/splashy.8mandos.gz
445
292
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
446
293
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
447
 
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
448
 
                > $(MANDIR)/man8/plymouth.8mandos.gz
449
294
 
450
295
install-client: install-client-nokey
451
296
# Post-installation stuff
457
302
 
458
303
uninstall-server:
459
304
        -rm --force $(PREFIX)/sbin/mandos \
460
 
                $(PREFIX)/sbin/mandos-ctl \
461
 
                $(PREFIX)/sbin/mandos-monitor \
462
305
                $(MANDIR)/man8/mandos.8.gz \
463
 
                $(MANDIR)/man8/mandos-monitor.8.gz \
464
 
                $(MANDIR)/man8/mandos-ctl.8.gz \
465
306
                $(MANDIR)/man5/mandos.conf.5.gz \
466
307
                $(MANDIR)/man5/mandos-clients.conf.5.gz
467
308
        update-rc.d -f mandos remove
473
314
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
474
315
                $(DESTDIR)/etc/crypttab
475
316
        -rm --force $(PREFIX)/sbin/mandos-keygen \
476
 
                $(LIBDIR)/mandos/plugin-runner \
477
 
                $(LIBDIR)/mandos/plugins.d/password-prompt \
478
 
                $(LIBDIR)/mandos/plugins.d/mandos-client \
479
 
                $(LIBDIR)/mandos/plugins.d/usplash \
480
 
                $(LIBDIR)/mandos/plugins.d/splashy \
481
 
                $(LIBDIR)/mandos/plugins.d/askpass-fifo \
482
 
                $(LIBDIR)/mandos/plugins.d/plymouth \
 
317
                $(PREFIX)/lib/mandos/plugin-runner \
 
318
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
 
319
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
 
320
                $(PREFIX)/lib/mandos/plugins.d/usplash \
 
321
                $(PREFIX)/lib/mandos/plugins.d/splashy \
 
322
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
483
323
                $(INITRAMFSTOOLS)/hooks/mandos \
484
324
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
485
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
325
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
 
326
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
486
327
                $(MANDIR)/man8/mandos-keygen.8.gz \
487
 
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
488
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
489
328
                $(MANDIR)/man8/password-prompt.8mandos.gz \
490
329
                $(MANDIR)/man8/usplash.8mandos.gz \
491
330
                $(MANDIR)/man8/splashy.8mandos.gz \
492
331
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
493
 
                $(MANDIR)/man8/plymouth.8mandos.gz \
494
 
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
495
 
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
 
332
                $(MANDIR)/man8/mandos-client.8mandos.gz
 
333
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
 
334
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
496
335
        update-initramfs -k all -u
497
336
 
498
337
purge: purge-server purge-client
499
338
 
500
339
purge-server: uninstall-server
501
340
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
502
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
503
341
                $(DESTDIR)/etc/default/mandos \
504
342
                $(DESTDIR)/etc/init.d/mandos \
505
 
                $(SYSTEMD)/mandos.service \
506
 
                $(DESTDIR)/run/mandos.pid \
507
343
                $(DESTDIR)/var/run/mandos.pid
508
344
        -rmdir $(CONFDIR)
509
345
 
510
346
purge-client: uninstall-client
511
 
        -shred --remove $(KEYDIR)/seckey.txt $(KEYDIR)/tls-privkey.pem
 
347
        -shred --remove $(KEYDIR)/seckey.txt
512
348
        -rm --force $(CONFDIR)/plugin-runner.conf \
513
 
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt \
514
 
                $(KEYDIR)/tls-pubkey.txt $(KEYDIR)/tls-privkey.txt
 
349
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt
515
350
        -rmdir $(KEYDIR) $(CONFDIR)/plugins.d $(CONFDIR)