/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: 2016-02-28 20:34:59 UTC
  • Revision ID: teddy@recompile.se-20160228203459-81vtqvr96yukyrok
Client: Remove calls to gnutls_global_init and gnutls_global_deinit

* plugins.d/mandos-client.c (init_gnutls_global, main): Don't call
  gnutls_global_init or gnutls_global_deinit anymore; these are
  unnecessary in GnuTLS 3.3.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
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)))
 
18
# The sanitizing options are available in GCC 4.9 and above.
 
19
ifeq ($(shell test $(shell $(CC) -dumpversion) \> 4.9-; echo $$?),0)
 
20
SANITIZE:=-fsanitize=address -fsanitize=undefined -fsanitize=shift \
 
21
        -fsanitize=integer-divide-by-zero -fsanitize=unreachable \
 
22
        -fsanitize=vla-bound -fsanitize=null -fsanitize=return \
 
23
        -fsanitize=signed-integer-overflow
 
24
# GCC 5.3 has some more sanitizing options
 
25
ifeq ($(shell test $(shell $(CC) -dumpversion) \> 5.3-; echo $$?),0)
 
26
SANITIZE+=-fsanitize=bounds -fsanitize=alignment \
 
27
        -fsanitize=object-size -fsanitize=float-divide-by-zero \
 
28
        -fsanitize=float-cast-overflow -fsanitize=nonnull-attribute \
 
29
        -fsanitize=returns-nonnull-attribute -fsanitize=bool \
 
30
        -fsanitize=enum
 
31
endif
 
32
else
 
33
SANITIZE:=
 
34
endif
31
35
LINK_FORTIFY_LD=-z relro -z now
32
36
LINK_FORTIFY=
33
37
 
40
44
OPTIMIZE=-Os -fno-strict-aliasing
41
45
LANGUAGE=-std=gnu11
42
46
htmldir=man
43
 
version=1.7.15
 
47
version=1.7.2
44
48
SED=sed
45
49
 
46
50
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)))
 
51
GROUP=$(firstword $(subst :, ,$(shell getent group _mandos || getent group nobody || echo 65534)))
48
52
 
49
53
## Use these settings for a traditional /usr/local install
50
54
# PREFIX=$(DESTDIR)/usr/local
75
79
##
76
80
 
77
81
SYSTEMD=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
78
 
TMPFILES=$(DESTDIR)$(shell pkg-config systemd --variable=tmpfilesdir)
79
82
 
80
83
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
81
84
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
283
286
run-client: all keydir/seckey.txt keydir/pubkey.txt
284
287
        @echo "###################################################################"
285
288
        @echo "# The following error messages are harmless and can be safely     #"
286
 
        @echo "# ignored:                                                        #"
 
289
        @echo "# ignored.  The messages are caused by not running as root, but   #"
 
290
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
 
291
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
287
292
        @echo "# From plugin-runner: setgid: Operation not permitted             #"
288
293
        @echo "#                     setuid: Operation not permitted             #"
289
294
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
290
295
        @echo "# From mandos-client:                                             #"
291
296
        @echo "#             Failed to raise privileges: Operation not permitted #"
292
297
        @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.)        #"
297
298
        @echo "###################################################################"
298
299
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
299
300
        ./plugin-runner --plugin-dir=plugins.d \
340
341
        elif install --directory --mode=u=rwx $(STATEDIR); then \
341
342
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
342
343
        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
347
344
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
348
345
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
349
346
                mandos-ctl
385
382
                $(LIBDIR)/mandos/plugin-helpers
386
383
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
387
384
                install --mode=u=rwx \
388
 
                        --directory "$(CONFDIR)/plugins.d" \
389
 
                        "$(CONFDIR)/plugin-helpers"; \
 
385
                        --directory "$(CONFDIR)/plugins.d"; \
 
386
                install --directory "$(CONFDIR)/plugin-helpers"; \
390
387
        fi
391
388
        install --mode=u=rwx,go=rx --directory \
392
389
                "$(CONFDIR)/network-hooks.d"
412
409
        install --mode=u=rwxs,go=rx \
413
410
                --target-directory=$(LIBDIR)/mandos/plugins.d \
414
411
                plugins.d/plymouth
415
 
        install --mode=u=rwx,go=rx \
 
412
        install --mode=u=rwxs,go=rx \
416
413
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
417
414
                plugin-helpers/mandos-client-iprouteadddel
418
415
        install initramfs-tools-hook \