/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: 2017-08-20 14:14:14 UTC
  • Revision ID: teddy@recompile.se-20170820141414-m034xuebg7ccaeui
Add some more restrictions to the systemd service file.

* mandos.service ([Service]/ProtectKernelTunables): New; set to "yes".
  ([Service]/ProtectControlGroups): - '' -

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
 
13
#DEBUG=-ggdb3 -fsanitize=address 
14
14
# For info about _FORTIFY_SOURCE, see feature_test_macros(7)
15
 
# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
 
15
# and <https://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)))
17
31
LINK_FORTIFY_LD=-z relro -z now
18
32
LINK_FORTIFY=
19
33
 
26
40
OPTIMIZE=-Os -fno-strict-aliasing
27
41
LANGUAGE=-std=gnu11
28
42
htmldir=man
29
 
version=1.6.9
 
43
version=1.7.15
30
44
SED=sed
31
45
 
32
46
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)))
 
47
GROUP=$(firstword $(subst :, ,$(shell getent group _mandos || getent group nogroup || echo 65534)))
34
48
 
35
49
## Use these settings for a traditional /usr/local install
36
50
# PREFIX=$(DESTDIR)/usr/local
61
75
##
62
76
 
63
77
SYSTEMD=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
 
78
TMPFILES=$(DESTDIR)$(shell pkg-config systemd --variable=tmpfilesdir)
64
79
 
65
80
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
66
81
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
73
88
LIBNL3_LIBS=$(shell pkg-config --libs libnl-route-3.0)
74
89
 
75
90
# Do not change these two
76
 
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
77
 
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
78
 
        -DVERSION='"$(version)"'
 
91
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(SANITIZE) $(COVERAGE) \
 
92
        $(OPTIMIZE) $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) \
 
93
        $(GPGME_CFLAGS) -DVERSION='"$(version)"'
79
94
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
80
95
 
81
96
# Commands to format a DocBook <refentry> document into a manual page
268
283
run-client: all keydir/seckey.txt keydir/pubkey.txt
269
284
        @echo "###################################################################"
270
285
        @echo "# The following error messages are harmless and can be safely     #"
271
 
        @echo "# ignored.  The messages are caused by not running as root, but   #"
272
 
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
273
 
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
 
286
        @echo "# ignored:                                                        #"
274
287
        @echo "# From plugin-runner: setgid: Operation not permitted             #"
275
288
        @echo "#                     setuid: Operation not permitted             #"
276
289
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
277
290
        @echo "# From mandos-client:                                             #"
278
291
        @echo "#             Failed to raise privileges: Operation not permitted #"
279
292
        @echo "#             Warning: network hook \"*\" exited with status *      #"
 
293
        @echo "#                                                                 #"
 
294
        @echo "# (The messages are caused by not running as root, but you should #"
 
295
        @echo "# NOT run \"make run-client\" as root unless you also unpacked and  #"
 
296
        @echo "# compiled Mandos as root, which is also NOT recommended.)        #"
280
297
        @echo "###################################################################"
281
298
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
282
299
        ./plugin-runner --plugin-dir=plugins.d \
323
340
        elif install --directory --mode=u=rwx $(STATEDIR); then \
324
341
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
325
342
        fi
 
343
        if [ "$(TMPFILES)" != "$(DESTDIR)" -a -d "$(TMPFILES)" ]; then \
 
344
                install --mode=u=rw,go=r tmpfiles.d-mandos.conf \
 
345
                        $(TMPFILES)/mandos.conf; \
 
346
        fi
326
347
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
327
348
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
328
349
                mandos-ctl
364
385
                $(LIBDIR)/mandos/plugin-helpers
365
386
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
366
387
                install --mode=u=rwx \
367
 
                        --directory "$(CONFDIR)/plugins.d"; \
368
 
                install --directory "$(CONFDIR)/plugin-helpers"; \
 
388
                        --directory "$(CONFDIR)/plugins.d" \
 
389
                        "$(CONFDIR)/plugin-helpers"; \
369
390
        fi
370
391
        install --mode=u=rwx,go=rx --directory \
371
392
                "$(CONFDIR)/network-hooks.d"
391
412
        install --mode=u=rwxs,go=rx \
392
413
                --target-directory=$(LIBDIR)/mandos/plugins.d \
393
414
                plugins.d/plymouth
394
 
        install --mode=u=rwxs,go=rx \
 
415
        install --mode=u=rwx,go=rx \
395
416
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
396
417
                plugin-helpers/mandos-client-iprouteadddel
397
418
        install initramfs-tools-hook \