/mandos/trunk

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

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: Teddy Hogeborn
  • Date: 2014-06-08 02:31:50 UTC
  • Revision ID: teddy@recompile.se-20140608023150-eu8jxll7uddjxter
Bug fix for mandos-client: Run the network hook, not the directory.

* plugins.d/mandos-client.d (set_cloexec_flag): Removed.
  (run_network_hooks): Do not set O_CLOEXEC on "hookdir_fd".
                       Instead, open hook to new "hook_fd" and simply
                       close(hookdir_fd) before 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.5.3
 
29
version=1.6.5
27
30
SED=sed
28
31
 
29
32
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
36
39
# MANDIR=$(PREFIX)/man
37
40
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
38
41
# STATEDIR=$(DESTDIR)/var/lib/mandos
 
42
# LIBDIR=$(PREFIX)/lib
39
43
##
40
44
 
41
45
## These settings are for a package-type install
45
49
MANDIR=$(PREFIX)/share/man
46
50
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
47
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)
48
61
##
49
62
 
 
63
SYSTEMD=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
 
64
 
50
65
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
51
66
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
52
67
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
56
71
        getconf LFS_LDFLAGS)
57
72
 
58
73
# Do not change these two
59
 
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
 
74
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
60
75
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
61
76
        -DVERSION='"$(version)"'
62
 
LDFLAGS=-Xlinker --as-needed $(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))
63
78
 
64
79
# Commands to format a DocBook <refentry> document into a manual page
65
80
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
68
83
        --param make.single.year.ranges         1 \
69
84
        --param man.output.quietly              1 \
70
85
        --param man.authors.section.enabled     0 \
71
 
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
 
86
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
72
87
        $(notdir $<); \
73
 
        $(MANPOST) $(notdir $@);\
74
 
        LANG=en_US.UTF-8 MANWIDTH=80 man --warnings --encoding=UTF-8 \
75
 
        --local-file $(notdir $@) >/dev/null)
76
 
# DocBook-to-man post-processing to fix a '\n' escape bug
77
 
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)
78
92
 
79
93
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
80
94
        --param make.year.ranges                1 \
225
239
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
226
240
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
227
241
 
228
 
.PHONY : all doc html clean distclean run-client run-server install \
229
 
        install-server install-client uninstall uninstall-server \
230
 
        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
231
247
 
232
248
clean:
233
249
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
239
255
 
240
256
check:  all
241
257
        ./mandos --check
 
258
        ./mandos-ctl --check
242
259
 
243
260
# Run the client with a local config and key
244
261
run-client: all keydir/seckey.txt keydir/pubkey.txt
289
306
 
290
307
install-server: doc
291
308
        install --directory $(CONFDIR)
292
 
        install --directory --mode=u=rwx --owner=$(USER) \
293
 
                --group=$(GROUP) $(STATEDIR)
 
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
294
315
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
295
316
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
296
317
                mandos-ctl
304
325
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
305
326
        install --mode=u=rwx,go=rx init.d-mandos \
306
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
307
331
        install --mode=u=rw,go=r default-mandos \
308
332
                $(DESTDIR)/etc/default/mandos
309
333
        if [ -z $(DESTDIR) ]; then \
323
347
                > $(MANDIR)/man8/intro.8mandos.gz
324
348
 
325
349
install-client-nokey: all doc
326
 
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
 
350
        install --directory $(LIBDIR)/mandos $(CONFDIR)
327
351
        install --directory --mode=u=rwx $(KEYDIR) \
328
 
                $(PREFIX)/lib/mandos/plugins.d
329
 
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
 
352
                $(LIBDIR)/mandos/plugins.d
 
353
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
330
354
                install --mode=u=rwx \
331
355
                        --directory "$(CONFDIR)/plugins.d"; \
332
356
        fi
333
357
        install --mode=u=rwx,go=rx --directory \
334
358
                "$(CONFDIR)/network-hooks.d"
335
359
        install --mode=u=rwx,go=rx \
336
 
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
 
360
                --target-directory=$(LIBDIR)/mandos plugin-runner
337
361
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
338
362
                mandos-keygen
339
363
        install --mode=u=rwx,go=rx \
340
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
364
                --target-directory=$(LIBDIR)/mandos/plugins.d \
341
365
                plugins.d/password-prompt
342
366
        install --mode=u=rwxs,go=rx \
343
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
367
                --target-directory=$(LIBDIR)/mandos/plugins.d \
344
368
                plugins.d/mandos-client
345
369
        install --mode=u=rwxs,go=rx \
346
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
370
                --target-directory=$(LIBDIR)/mandos/plugins.d \
347
371
                plugins.d/usplash
348
372
        install --mode=u=rwxs,go=rx \
349
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
373
                --target-directory=$(LIBDIR)/mandos/plugins.d \
350
374
                plugins.d/splashy
351
375
        install --mode=u=rwxs,go=rx \
352
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
376
                --target-directory=$(LIBDIR)/mandos/plugins.d \
353
377
                plugins.d/askpass-fifo
354
378
        install --mode=u=rwxs,go=rx \
355
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
379
                --target-directory=$(LIBDIR)/mandos/plugins.d \
356
380
                plugins.d/plymouth
357
381
        install initramfs-tools-hook \
358
382
                $(INITRAMFSTOOLS)/hooks/mandos
404
428
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
405
429
                $(DESTDIR)/etc/crypttab
406
430
        -rm --force $(PREFIX)/sbin/mandos-keygen \
407
 
                $(PREFIX)/lib/mandos/plugin-runner \
408
 
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
409
 
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
410
 
                $(PREFIX)/lib/mandos/plugins.d/usplash \
411
 
                $(PREFIX)/lib/mandos/plugins.d/splashy \
412
 
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
413
 
                $(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 \
414
438
                $(INITRAMFSTOOLS)/hooks/mandos \
415
439
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
416
440
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
422
446
                $(MANDIR)/man8/splashy.8mandos.gz \
423
447
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
424
448
                $(MANDIR)/man8/plymouth.8mandos.gz \
425
 
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
426
 
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
 
449
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
 
450
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
427
451
        update-initramfs -k all -u
428
452
 
429
453
purge: purge-server purge-client
433
457
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
434
458
                $(DESTDIR)/etc/default/mandos \
435
459
                $(DESTDIR)/etc/init.d/mandos \
 
460
                $(SYSTEMD)/mandos.service \
 
461
                $(DESTDIR)/run/mandos.pid \
436
462
                $(DESTDIR)/var/run/mandos.pid
437
463
        -rmdir $(CONFDIR)
438
464