/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

* mandos (Client.runtime_expansions): New attribute containing the
                                      allowed runtime expansions.

* mandos-clients.conf.xml (OPTIONS): Reordered alphabetically.

* mandos-ctl: Bug fix: print timeout and interval values pretty again.

* mandos-ctl.xml (EXAMPLE): Added more examples.

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=1 -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>.
 
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>.
16
13
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
14
LINK_FORTIFY_LD=-z relro -z now
32
15
LINK_FORTIFY=
33
16
 
37
20
LINK_FORTIFY += -pie
38
21
endif
39
22
#COVERAGE=--coverage
40
 
OPTIMIZE=-Os -fno-strict-aliasing
41
 
LANGUAGE=-std=gnu11
 
23
OPTIMIZE=-Os
 
24
LANGUAGE=-std=gnu99
42
25
htmldir=man
43
 
version=1.7.10
 
26
version=1.0.14
44
27
SED=sed
45
28
 
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)))
48
 
 
49
29
## Use these settings for a traditional /usr/local install
50
30
# PREFIX=$(DESTDIR)/usr/local
51
31
# CONFDIR=$(DESTDIR)/etc/mandos
52
32
# KEYDIR=$(DESTDIR)/etc/mandos/keys
53
33
# MANDIR=$(PREFIX)/man
54
34
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
55
 
# STATEDIR=$(DESTDIR)/var/lib/mandos
56
 
# LIBDIR=$(PREFIX)/lib
57
35
##
58
36
 
59
37
## These settings are for a package-type install
62
40
KEYDIR=$(DESTDIR)/etc/keys/mandos
63
41
MANDIR=$(PREFIX)/share/man
64
42
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)
75
43
##
76
44
 
77
 
SYSTEMD=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
78
 
TMPFILES=$(DESTDIR)$(shell pkg-config systemd --variable=tmpfilesdir)
79
 
 
80
45
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
81
46
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
82
47
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
84
49
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
85
50
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
86
51
        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)
89
52
 
90
53
# Do not change these two
91
 
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(SANITIZE) $(COVERAGE) \
92
 
        $(OPTIMIZE) $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) \
93
 
        $(GPGME_CFLAGS) -DVERSION='"$(version)"'
94
 
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
54
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
 
55
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
 
56
        -DVERSION='"$(version)"'
 
57
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
95
58
 
96
59
# Commands to format a DocBook <refentry> document into a manual page
97
60
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
100
63
        --param make.single.year.ranges         1 \
101
64
        --param man.output.quietly              1 \
102
65
        --param man.authors.section.enabled     0 \
103
 
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
 
66
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
104
67
        $(notdir $<); \
105
 
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
106
 
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
107
 
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
108
 
        fi >/dev/null)
 
68
        $(MANPOST) $(notdir $@))
 
69
# DocBook-to-man post-processing to fix a '\n' escape bug
 
70
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
109
71
 
110
72
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
111
73
        --param make.year.ranges                1 \
123
85
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
124
86
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
125
87
        plugins.d/plymouth
126
 
PLUGIN_HELPERS=plugin-helpers/mandos-client-iprouteadddel
127
 
CPROGS=plugin-runner $(PLUGINS) $(PLUGIN_HELPERS)
 
88
CPROGS=plugin-runner $(PLUGINS)
128
89
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
129
90
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
130
91
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
131
92
        plugins.d/mandos-client.8mandos \
132
93
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
133
94
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
134
 
        plugins.d/plymouth.8mandos intro.8mandos
 
95
        plugins.d/plymouth.8mandos
135
96
 
136
97
htmldocs=$(addsuffix .xhtml,$(DOCS))
137
98
 
158
119
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
159
120
        $(DOCBOOKTOHTML)
160
121
 
161
 
intro.8mandos: intro.xml common.ent legalnotice.xml
162
 
        $(DOCBOOKTOMAN)
163
 
intro.8mandos.xhtml: intro.xml common.ent legalnotice.xml
164
 
        $(DOCBOOKTOHTML)
165
 
 
166
122
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
167
123
                legalnotice.xml
168
124
        $(DOCBOOKTOMAN)
254
210
                $@)
255
211
 
256
212
plugins.d/mandos-client: plugins.d/mandos-client.c
257
 
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
258
 
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
259
 
 
260
 
plugin-helpers/mandos-client-iprouteadddel: plugin-helpers/mandos-client-iprouteadddel.c
261
 
        $(LINK.c) $(LIBNL3_CFLAGS) $^ $(LIBNL3_LIBS) $(strip\
262
 
                ) $(LOADLIBES) $(LDLIBS) -o $@
263
 
 
264
 
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
265
 
        check run-client run-server install install-html \
266
 
        install-server install-client-nokey install-client uninstall \
267
 
        uninstall-server uninstall-client purge purge-server \
268
 
        purge-client
 
213
        $(LINK.c) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) $(strip\
 
214
                ) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
215
 
 
216
.PHONY : all doc html clean distclean run-client run-server install \
 
217
        install-server install-client uninstall uninstall-server \
 
218
        uninstall-client purge purge-server purge-client
269
219
 
270
220
clean:
271
221
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
273
223
distclean: clean
274
224
mostlyclean: clean
275
225
maintainer-clean: clean
276
 
        -rm --force --recursive keydir confdir statedir
 
226
        -rm --force --recursive keydir confdir
277
227
 
278
228
check:  all
279
229
        ./mandos --check
280
 
        ./mandos-ctl --check
281
230
 
282
231
# Run the client with a local config and key
283
232
run-client: all keydir/seckey.txt keydir/pubkey.txt
286
235
        @echo "# ignored.  The messages are caused by not running as root, but   #"
287
236
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
288
237
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
289
 
        @echo "# From plugin-runner: setgid: Operation not permitted             #"
290
 
        @echo "#                     setuid: Operation not permitted             #"
 
238
        @echo "# From plugin-runner: setuid: Operation not permitted             #"
291
239
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
292
 
        @echo "# From mandos-client:                                             #"
293
 
        @echo "#             Failed to raise privileges: Operation not permitted #"
294
 
        @echo "#             Warning: network hook \"*\" exited with status *      #"
 
240
        @echo "# From mandos-client: setuid: Operation not permitted             #"
 
241
        @echo "#                     seteuid: Operation not permitted            #"
 
242
        @echo "#                     klogctl: Operation not permitted            #"
295
243
        @echo "###################################################################"
296
 
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
297
244
        ./plugin-runner --plugin-dir=plugins.d \
298
 
                --plugin-helper-dir=plugin-helpers \
299
245
                --config-file=plugin-runner.conf \
300
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
301
 
                --env-for=mandos-client:GNOME_KEYRING_CONTROL= \
 
246
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
302
247
                $(CLIENTARGS)
303
248
 
304
249
# Used by run-client
307
252
        ./mandos-keygen --dir keydir --force
308
253
 
309
254
# Run the server with a local config
310
 
run-server: confdir/mandos.conf confdir/clients.conf statedir
311
 
        ./mandos --debug --no-dbus --configdir=confdir \
312
 
                --statedir=statedir $(SERVERARGS)
 
255
run-server: confdir/mandos.conf confdir/clients.conf
 
256
        @echo "#################################################################"
 
257
        @echo "# NOTE: Please IGNORE the error about \"Could not open file      #"
 
258
        @echo "# u'/var/run/mandos.pid'\" -  it is harmless and is caused by    #"
 
259
        @echo "# the server not running as root.  Do NOT run \"make run-server\" #"
 
260
        @echo "# server as root if you didn't also unpack and compile it thus. #"
 
261
        @echo "#################################################################"
 
262
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
313
263
 
314
264
# Used by run-server
315
265
confdir/mandos.conf: mandos.conf
319
269
        install --directory confdir
320
270
        install --mode=u=rw $< $@
321
271
# Add a client password
322
 
        ./mandos-keygen --dir keydir --password --no-ssh >> $@
323
 
statedir:
324
 
        install --directory statedir
 
272
        ./mandos-keygen --dir keydir --password >> $@
325
273
 
326
274
install: install-server install-client-nokey
327
275
 
332
280
 
333
281
install-server: doc
334
282
        install --directory $(CONFDIR)
335
 
        if install --directory --mode=u=rwx --owner=$(USER) \
336
 
                --group=$(GROUP) $(STATEDIR); then \
337
 
                :; \
338
 
        elif install --directory --mode=u=rwx $(STATEDIR); then \
339
 
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
340
 
        fi
341
 
        if [ "$(TMPFILES)" != "$(DESTDIR)" -a -d "$(TMPFILES)" ]; then \
342
 
                install --mode=u=rw,go=r tmpfiles.d-mandos.conf \
343
 
                        $(TMPFILES)/mandos.conf; \
344
 
        fi
345
283
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
346
284
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
347
285
                mandos-ctl
355
293
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
356
294
        install --mode=u=rwx,go=rx init.d-mandos \
357
295
                $(DESTDIR)/etc/init.d/mandos
358
 
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
359
 
                install --mode=u=rw,go=r mandos.service $(SYSTEMD); \
360
 
        fi
361
296
        install --mode=u=rw,go=r default-mandos \
362
297
                $(DESTDIR)/etc/default/mandos
363
298
        if [ -z $(DESTDIR) ]; then \
373
308
                > $(MANDIR)/man5/mandos.conf.5.gz
374
309
        gzip --best --to-stdout mandos-clients.conf.5 \
375
310
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
376
 
        gzip --best --to-stdout intro.8mandos \
377
 
                > $(MANDIR)/man8/intro.8mandos.gz
378
311
 
379
312
install-client-nokey: all doc
380
 
        install --directory $(LIBDIR)/mandos $(CONFDIR)
 
313
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
381
314
        install --directory --mode=u=rwx $(KEYDIR) \
382
 
                $(LIBDIR)/mandos/plugins.d \
383
 
                $(LIBDIR)/mandos/plugin-helpers
384
 
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
 
315
                $(PREFIX)/lib/mandos/plugins.d
 
316
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
385
317
                install --mode=u=rwx \
386
 
                        --directory "$(CONFDIR)/plugins.d" \
387
 
                        "$(CONFDIR)/plugin-helpers"; \
 
318
                        --directory "$(CONFDIR)/plugins.d"; \
388
319
        fi
389
 
        install --mode=u=rwx,go=rx --directory \
390
 
                "$(CONFDIR)/network-hooks.d"
391
320
        install --mode=u=rwx,go=rx \
392
 
                --target-directory=$(LIBDIR)/mandos plugin-runner
 
321
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
393
322
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
394
323
                mandos-keygen
395
324
        install --mode=u=rwx,go=rx \
396
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
325
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
397
326
                plugins.d/password-prompt
398
327
        install --mode=u=rwxs,go=rx \
399
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
328
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
400
329
                plugins.d/mandos-client
401
330
        install --mode=u=rwxs,go=rx \
402
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
331
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
403
332
                plugins.d/usplash
404
333
        install --mode=u=rwxs,go=rx \
405
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
334
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
406
335
                plugins.d/splashy
407
336
        install --mode=u=rwxs,go=rx \
408
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
337
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
409
338
                plugins.d/askpass-fifo
410
339
        install --mode=u=rwxs,go=rx \
411
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
340
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
412
341
                plugins.d/plymouth
413
 
        install --mode=u=rwx,go=rx \
414
 
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
415
 
                plugin-helpers/mandos-client-iprouteadddel
416
342
        install initramfs-tools-hook \
417
343
                $(INITRAMFSTOOLS)/hooks/mandos
418
344
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
463
389
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
464
390
                $(DESTDIR)/etc/crypttab
465
391
        -rm --force $(PREFIX)/sbin/mandos-keygen \
466
 
                $(LIBDIR)/mandos/plugin-runner \
467
 
                $(LIBDIR)/mandos/plugins.d/password-prompt \
468
 
                $(LIBDIR)/mandos/plugins.d/mandos-client \
469
 
                $(LIBDIR)/mandos/plugins.d/usplash \
470
 
                $(LIBDIR)/mandos/plugins.d/splashy \
471
 
                $(LIBDIR)/mandos/plugins.d/askpass-fifo \
472
 
                $(LIBDIR)/mandos/plugins.d/plymouth \
 
392
                $(PREFIX)/lib/mandos/plugin-runner \
 
393
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
 
394
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
 
395
                $(PREFIX)/lib/mandos/plugins.d/usplash \
 
396
                $(PREFIX)/lib/mandos/plugins.d/splashy \
 
397
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
 
398
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
473
399
                $(INITRAMFSTOOLS)/hooks/mandos \
474
400
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
475
401
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
481
407
                $(MANDIR)/man8/splashy.8mandos.gz \
482
408
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
483
409
                $(MANDIR)/man8/plymouth.8mandos.gz \
484
 
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
485
 
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
 
410
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
 
411
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
486
412
        update-initramfs -k all -u
487
413
 
488
414
purge: purge-server purge-client
492
418
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
493
419
                $(DESTDIR)/etc/default/mandos \
494
420
                $(DESTDIR)/etc/init.d/mandos \
495
 
                $(SYSTEMD)/mandos.service \
496
 
                $(DESTDIR)/run/mandos.pid \
497
421
                $(DESTDIR)/var/run/mandos.pid
498
422
        -rmdir $(CONFDIR)
499
423