/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: 2015-07-02 18:22:22 UTC
  • mto: This revision was merged to the branch mainline in revision 759.
  • Revision ID: teddy@recompile.se-20150702182222-034v03mb8orwhezn
mandos-client: Minor changes to check for more error conditions.

* mandos-client.c (add_remove_local_route): Do TEMP_FAILURE_RETRY
                                            around closing of
                                            /dev/null.  Check return
                                            value when opening helper
                                            directory and helper
                                            executable.
  (run_network_hooks): Cast return value of TEMP_FAILURE_RETRY to int.
                       Do TEMP_FAILURE_RETRY around closing of
                       /dev/null.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
10
10
        -Wmissing-format-attribute -Wnormalized=nfc -Wpacked \
11
11
        -Wredundant-decls -Wnested-externs -Winline -Wvla \
12
12
        -Wvolatile-register-var -Woverlength-strings
13
 
#DEBUG=-ggdb3 -fsanitize=address 
 
13
#DEBUG=-ggdb3
14
14
# For info about _FORTIFY_SOURCE, see feature_test_macros(7)
15
 
# and <https://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
 
15
# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
16
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
17
LINK_FORTIFY_LD=-z relro -z now
32
18
LINK_FORTIFY=
33
19
 
38
24
endif
39
25
#COVERAGE=--coverage
40
26
OPTIMIZE=-Os -fno-strict-aliasing
41
 
LANGUAGE=-std=gnu11
 
27
LANGUAGE=-std=gnu99
42
28
htmldir=man
43
 
version=1.7.12
 
29
version=1.6.9
44
30
SED=sed
45
31
 
46
32
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)))
 
33
GROUP=$(firstword $(subst :, ,$(shell getent group _mandos || getent group nobody || echo 65534)))
48
34
 
49
35
## Use these settings for a traditional /usr/local install
50
36
# PREFIX=$(DESTDIR)/usr/local
75
61
##
76
62
 
77
63
SYSTEMD=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
78
 
TMPFILES=$(DESTDIR)$(shell pkg-config systemd --variable=tmpfilesdir)
79
64
 
80
65
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
81
66
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
84
69
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
85
70
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
86
71
        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
72
 
90
73
# Do not change these two
91
 
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(SANITIZE) $(COVERAGE) \
92
 
        $(OPTIMIZE) $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) \
93
 
        $(GPGME_CFLAGS) -DVERSION='"$(version)"'
 
74
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
 
75
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
 
76
        -DVERSION='"$(version)"'
94
77
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
95
78
 
96
79
# Commands to format a DocBook <refentry> document into a manual page
123
106
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
124
107
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
125
108
        plugins.d/plymouth
126
 
PLUGIN_HELPERS=plugin-helpers/mandos-client-iprouteadddel
 
109
PLUGIN_HELPERS=
127
110
CPROGS=plugin-runner $(PLUGINS) $(PLUGIN_HELPERS)
128
111
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
129
112
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
257
240
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
258
241
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
259
242
 
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
243
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
265
244
        check run-client run-server install install-html \
266
245
        install-server install-client-nokey install-client uninstall \
338
317
        elif install --directory --mode=u=rwx $(STATEDIR); then \
339
318
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
340
319
        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
320
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
346
321
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
347
322
                mandos-ctl
379
354
install-client-nokey: all doc
380
355
        install --directory $(LIBDIR)/mandos $(CONFDIR)
381
356
        install --directory --mode=u=rwx $(KEYDIR) \
382
 
                $(LIBDIR)/mandos/plugins.d \
383
 
                $(LIBDIR)/mandos/plugin-helpers
 
357
                $(LIBDIR)/mandos/plugins.d
384
358
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
385
359
                install --mode=u=rwx \
386
 
                        --directory "$(CONFDIR)/plugins.d" \
387
 
                        "$(CONFDIR)/plugin-helpers"; \
 
360
                        --directory "$(CONFDIR)/plugins.d"; \
 
361
                install --directory "$(CONFDIR)/plugin-helpers"; \
388
362
        fi
389
363
        install --mode=u=rwx,go=rx --directory \
390
364
                "$(CONFDIR)/network-hooks.d"
410
384
        install --mode=u=rwxs,go=rx \
411
385
                --target-directory=$(LIBDIR)/mandos/plugins.d \
412
386
                plugins.d/plymouth
413
 
        install --mode=u=rwx,go=rx \
414
 
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
415
 
                plugin-helpers/mandos-client-iprouteadddel
416
387
        install initramfs-tools-hook \
417
388
                $(INITRAMFSTOOLS)/hooks/mandos
418
389
        install --mode=u=rw,go=r initramfs-tools-hook-conf \