/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-06-07 21:59:20 UTC
  • mto: (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 317.
  • Revision ID: teddy@recompile.se-20140607215920-r4qkj7ktnjyqmrn5
Make mandos-client use fexecve().

* plugins.d/mandos-client.d (run_network_hooks): Use fexecve().

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 
 
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
9
13
#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>
 
14
# For info about _FORTIFY_SOURCE, see feature_test_macros(7)
12
15
# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
13
16
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
14
17
LINK_FORTIFY_LD=-z relro -z now
20
23
LINK_FORTIFY += -pie
21
24
endif
22
25
#COVERAGE=--coverage
23
 
OPTIMIZE=-Os
 
26
OPTIMIZE=-Os -fno-strict-aliasing
24
27
LANGUAGE=-std=gnu99
25
28
htmldir=man
26
 
version=1.0.14
 
29
version=1.6.5
27
30
SED=sed
28
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)))
 
34
 
29
35
## Use these settings for a traditional /usr/local install
30
36
# PREFIX=$(DESTDIR)/usr/local
31
37
# CONFDIR=$(DESTDIR)/etc/mandos
32
38
# KEYDIR=$(DESTDIR)/etc/mandos/keys
33
39
# MANDIR=$(PREFIX)/man
34
40
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
 
41
# STATEDIR=$(DESTDIR)/var/lib/mandos
 
42
# LIBDIR=$(PREFIX)/lib
35
43
##
36
44
 
37
45
## These settings are for a package-type install
40
48
KEYDIR=$(DESTDIR)/etc/keys/mandos
41
49
MANDIR=$(PREFIX)/share/man
42
50
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
 
51
STATEDIR=$(DESTDIR)/var/lib/mandos
 
52
LIBDIR=$(shell \
 
53
        for d in \
 
54
        "/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null`" \
 
55
        "`rpm --eval='%{_libdir}' 2>/dev/null`" /usr/lib; do \
 
56
                if [ -d "$$d" -a "$$d" = "$${d%/}" ]; then \
 
57
                        echo "$(DESTDIR)$$d"; \
 
58
                        break; \
 
59
                fi; \
 
60
        done)
43
61
##
44
62
 
 
63
SYSTEMD=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
 
64
 
45
65
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
46
66
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
47
67
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
51
71
        getconf LFS_LDFLAGS)
52
72
 
53
73
# Do not change these two
54
 
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
 
74
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
55
75
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
56
76
        -DVERSION='"$(version)"'
57
 
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
77
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
58
78
 
59
79
# Commands to format a DocBook <refentry> document into a manual page
60
80
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
63
83
        --param make.single.year.ranges         1 \
64
84
        --param man.output.quietly              1 \
65
85
        --param man.authors.section.enabled     0 \
66
 
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
 
86
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
67
87
        $(notdir $<); \
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'
 
88
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
 
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)
71
92
 
72
93
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
73
94
        --param make.year.ranges                1 \
87
108
        plugins.d/plymouth
88
109
CPROGS=plugin-runner $(PLUGINS)
89
110
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
90
 
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
91
 
        mandos-monitor.8 mandos-ctl.8 \
 
111
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
 
112
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
92
113
        plugins.d/mandos-client.8mandos \
93
 
        plugins.d/password-prompt.8mandos mandos.conf.5 \
94
 
        plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
95
 
        plugins.d/askpass-fifo.8mandos mandos-clients.conf.5
 
114
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
 
115
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
 
116
        plugins.d/plymouth.8mandos intro.8mandos
96
117
 
97
118
htmldocs=$(addsuffix .xhtml,$(DOCS))
98
119
 
119
140
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
120
141
        $(DOCBOOKTOHTML)
121
142
 
 
143
intro.8mandos: intro.xml common.ent legalnotice.xml
 
144
        $(DOCBOOKTOMAN)
 
145
intro.8mandos.xhtml: intro.xml common.ent legalnotice.xml
 
146
        $(DOCBOOKTOHTML)
 
147
 
122
148
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
123
149
                legalnotice.xml
124
150
        $(DOCBOOKTOMAN)
210
236
                $@)
211
237
 
212
238
plugins.d/mandos-client: plugins.d/mandos-client.c
213
 
        $(LINK.c) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) $(strip\
214
 
                ) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
239
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
 
240
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
215
241
 
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
 
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
219
247
 
220
248
clean:
221
249
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
223
251
distclean: clean
224
252
mostlyclean: clean
225
253
maintainer-clean: clean
226
 
        -rm --force --recursive keydir confdir
 
254
        -rm --force --recursive keydir confdir statedir
227
255
 
228
256
check:  all
229
257
        ./mandos --check
 
258
        ./mandos-ctl --check
230
259
 
231
260
# Run the client with a local config and key
232
261
run-client: all keydir/seckey.txt keydir/pubkey.txt
243
272
        @echo "###################################################################"
244
273
        ./plugin-runner --plugin-dir=plugins.d \
245
274
                --config-file=plugin-runner.conf \
246
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
 
275
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
247
276
                $(CLIENTARGS)
248
277
 
249
278
# Used by run-client
252
281
        ./mandos-keygen --dir keydir --force
253
282
 
254
283
# Run the server with a local config
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)
 
284
run-server: confdir/mandos.conf confdir/clients.conf statedir
 
285
        ./mandos --debug --no-dbus --configdir=confdir \
 
286
                --statedir=statedir $(SERVERARGS)
263
287
 
264
288
# Used by run-server
265
289
confdir/mandos.conf: mandos.conf
270
294
        install --mode=u=rw $< $@
271
295
# Add a client password
272
296
        ./mandos-keygen --dir keydir --password >> $@
 
297
statedir:
 
298
        install --directory statedir
273
299
 
274
300
install: install-server install-client-nokey
275
301
 
280
306
 
281
307
install-server: doc
282
308
        install --directory $(CONFDIR)
 
309
        if install --directory --mode=u=rwx --owner=$(USER) \
 
310
                --group=$(GROUP) $(STATEDIR); then \
 
311
                :; \
 
312
        elif install --directory --mode=u=rwx $(STATEDIR); then \
 
313
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
 
314
        fi
283
315
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
284
316
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
285
317
                mandos-ctl
293
325
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
294
326
        install --mode=u=rwx,go=rx init.d-mandos \
295
327
                $(DESTDIR)/etc/init.d/mandos
 
328
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
 
329
                install --mode=u=rw,go=r mandos.service $(SYSTEMD); \
 
330
        fi
296
331
        install --mode=u=rw,go=r default-mandos \
297
332
                $(DESTDIR)/etc/default/mandos
298
333
        if [ -z $(DESTDIR) ]; then \
300
335
        fi
301
336
        gzip --best --to-stdout mandos.8 \
302
337
                > $(MANDIR)/man8/mandos.8.gz
 
338
        gzip --best --to-stdout mandos-monitor.8 \
 
339
                > $(MANDIR)/man8/mandos-monitor.8.gz
 
340
        gzip --best --to-stdout mandos-ctl.8 \
 
341
                > $(MANDIR)/man8/mandos-ctl.8.gz
303
342
        gzip --best --to-stdout mandos.conf.5 \
304
343
                > $(MANDIR)/man5/mandos.conf.5.gz
305
344
        gzip --best --to-stdout mandos-clients.conf.5 \
306
345
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
 
346
        gzip --best --to-stdout intro.8mandos \
 
347
                > $(MANDIR)/man8/intro.8mandos.gz
307
348
 
308
349
install-client-nokey: all doc
309
 
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
 
350
        install --directory $(LIBDIR)/mandos $(CONFDIR)
310
351
        install --directory --mode=u=rwx $(KEYDIR) \
311
 
                $(PREFIX)/lib/mandos/plugins.d
312
 
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
 
352
                $(LIBDIR)/mandos/plugins.d
 
353
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
313
354
                install --mode=u=rwx \
314
355
                        --directory "$(CONFDIR)/plugins.d"; \
315
356
        fi
 
357
        install --mode=u=rwx,go=rx --directory \
 
358
                "$(CONFDIR)/network-hooks.d"
316
359
        install --mode=u=rwx,go=rx \
317
 
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
 
360
                --target-directory=$(LIBDIR)/mandos plugin-runner
318
361
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
319
362
                mandos-keygen
320
363
        install --mode=u=rwx,go=rx \
321
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
364
                --target-directory=$(LIBDIR)/mandos/plugins.d \
322
365
                plugins.d/password-prompt
323
366
        install --mode=u=rwxs,go=rx \
324
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
367
                --target-directory=$(LIBDIR)/mandos/plugins.d \
325
368
                plugins.d/mandos-client
326
369
        install --mode=u=rwxs,go=rx \
327
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
370
                --target-directory=$(LIBDIR)/mandos/plugins.d \
328
371
                plugins.d/usplash
329
372
        install --mode=u=rwxs,go=rx \
330
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
373
                --target-directory=$(LIBDIR)/mandos/plugins.d \
331
374
                plugins.d/splashy
332
375
        install --mode=u=rwxs,go=rx \
333
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
376
                --target-directory=$(LIBDIR)/mandos/plugins.d \
334
377
                plugins.d/askpass-fifo
335
378
        install --mode=u=rwxs,go=rx \
336
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
379
                --target-directory=$(LIBDIR)/mandos/plugins.d \
337
380
                plugins.d/plymouth
338
381
        install initramfs-tools-hook \
339
382
                $(INITRAMFSTOOLS)/hooks/mandos
346
389
                > $(MANDIR)/man8/mandos-keygen.8.gz
347
390
        gzip --best --to-stdout plugin-runner.8mandos \
348
391
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
392
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
 
393
                > $(MANDIR)/man8/mandos-client.8mandos.gz
349
394
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
350
395
                > $(MANDIR)/man8/password-prompt.8mandos.gz
351
 
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
352
 
                > $(MANDIR)/man8/mandos-client.8mandos.gz
353
396
        gzip --best --to-stdout plugins.d/usplash.8mandos \
354
397
                > $(MANDIR)/man8/usplash.8mandos.gz
355
398
        gzip --best --to-stdout plugins.d/splashy.8mandos \
356
399
                > $(MANDIR)/man8/splashy.8mandos.gz
357
400
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
358
401
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
 
402
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
 
403
                > $(MANDIR)/man8/plymouth.8mandos.gz
359
404
 
360
405
install-client: install-client-nokey
361
406
# Post-installation stuff
370
415
                $(PREFIX)/sbin/mandos-ctl \
371
416
                $(PREFIX)/sbin/mandos-monitor \
372
417
                $(MANDIR)/man8/mandos.8.gz \
 
418
                $(MANDIR)/man8/mandos-monitor.8.gz \
 
419
                $(MANDIR)/man8/mandos-ctl.8.gz \
373
420
                $(MANDIR)/man5/mandos.conf.5.gz \
374
421
                $(MANDIR)/man5/mandos-clients.conf.5.gz
375
422
        update-rc.d -f mandos remove
381
428
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
382
429
                $(DESTDIR)/etc/crypttab
383
430
        -rm --force $(PREFIX)/sbin/mandos-keygen \
384
 
                $(PREFIX)/lib/mandos/plugin-runner \
385
 
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
386
 
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
387
 
                $(PREFIX)/lib/mandos/plugins.d/usplash \
388
 
                $(PREFIX)/lib/mandos/plugins.d/splashy \
389
 
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
390
 
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
 
431
                $(LIBDIR)/mandos/plugin-runner \
 
432
                $(LIBDIR)/mandos/plugins.d/password-prompt \
 
433
                $(LIBDIR)/mandos/plugins.d/mandos-client \
 
434
                $(LIBDIR)/mandos/plugins.d/usplash \
 
435
                $(LIBDIR)/mandos/plugins.d/splashy \
 
436
                $(LIBDIR)/mandos/plugins.d/askpass-fifo \
 
437
                $(LIBDIR)/mandos/plugins.d/plymouth \
391
438
                $(INITRAMFSTOOLS)/hooks/mandos \
392
439
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
393
440
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
441
                $(MANDIR)/man8/mandos-keygen.8.gz \
394
442
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
395
 
                $(MANDIR)/man8/mandos-keygen.8.gz \
 
443
                $(MANDIR)/man8/mandos-client.8mandos.gz
396
444
                $(MANDIR)/man8/password-prompt.8mandos.gz \
397
445
                $(MANDIR)/man8/usplash.8mandos.gz \
398
446
                $(MANDIR)/man8/splashy.8mandos.gz \
399
447
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
400
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
401
 
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
402
 
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
 
448
                $(MANDIR)/man8/plymouth.8mandos.gz \
 
449
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
 
450
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
403
451
        update-initramfs -k all -u
404
452
 
405
453
purge: purge-server purge-client
409
457
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
410
458
                $(DESTDIR)/etc/default/mandos \
411
459
                $(DESTDIR)/etc/init.d/mandos \
 
460
                $(SYSTEMD)/mandos.service \
 
461
                $(DESTDIR)/run/mandos.pid \
412
462
                $(DESTDIR)/var/run/mandos.pid
413
463
        -rmdir $(CONFDIR)
414
464