/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-02-22 21:45:35 UTC
  • Revision ID: teddy@recompile.se-20170222214535-milf6w0b1krwpaex
http://bugs.debian.org/855589
Server bug fix: Use the mandos.conf "zeroconf" and "restore" options

Allow the "zeroconf" and "restore" options to actually work from the
mandos.conf file, in addition to command line options.

Closes: 855589
Reported-by: Pablo Abelenda <pabelenda@igalia.com>
Suggested-by: Pablo Abelenda <pabelenda@igalia.com>

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
17
# <https://developerblog.redhat.com/2014/10/16/gcc-undefined-behavior-sanitizer-ubsan/>
18
 
ALL_SANITIZE_OPTIONS:=-fsanitize=address -fsanitize=undefined \
 
18
ALL_SANITIZE_OPTIONS:=-fsanitize=leak -fsanitize=undefined \
19
19
        -fsanitize=shift -fsanitize=integer-divide-by-zero \
20
20
        -fsanitize=unreachable -fsanitize=vla-bound -fsanitize=null \
21
21
        -fsanitize=return -fsanitize=signed-integer-overflow \
40
40
OPTIMIZE=-Os -fno-strict-aliasing
41
41
LANGUAGE=-std=gnu11
42
42
htmldir=man
43
 
version=1.7.3
 
43
version=1.7.14
44
44
SED=sed
45
45
 
46
46
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
75
75
##
76
76
 
77
77
SYSTEMD=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
 
78
TMPFILES=$(DESTDIR)$(shell pkg-config systemd --variable=tmpfilesdir)
78
79
 
79
80
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
80
81
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
282
283
run-client: all keydir/seckey.txt keydir/pubkey.txt
283
284
        @echo "###################################################################"
284
285
        @echo "# The following error messages are harmless and can be safely     #"
285
 
        @echo "# ignored.  The messages are caused by not running as root, but   #"
286
 
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
287
 
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
 
286
        @echo "# ignored:                                                        #"
288
287
        @echo "# From plugin-runner: setgid: Operation not permitted             #"
289
288
        @echo "#                     setuid: Operation not permitted             #"
290
289
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
291
290
        @echo "# From mandos-client:                                             #"
292
291
        @echo "#             Failed to raise privileges: Operation not permitted #"
293
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.)        #"
294
297
        @echo "###################################################################"
295
298
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
296
299
        ./plugin-runner --plugin-dir=plugins.d \
337
340
        elif install --directory --mode=u=rwx $(STATEDIR); then \
338
341
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
339
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
340
347
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
341
348
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
342
349
                mandos-ctl
378
385
                $(LIBDIR)/mandos/plugin-helpers
379
386
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
380
387
                install --mode=u=rwx \
381
 
                        --directory "$(CONFDIR)/plugins.d"; \
382
 
                install --directory "$(CONFDIR)/plugin-helpers"; \
 
388
                        --directory "$(CONFDIR)/plugins.d" \
 
389
                        "$(CONFDIR)/plugin-helpers"; \
383
390
        fi
384
391
        install --mode=u=rwx,go=rx --directory \
385
392
                "$(CONFDIR)/network-hooks.d"
405
412
        install --mode=u=rwxs,go=rx \
406
413
                --target-directory=$(LIBDIR)/mandos/plugins.d \
407
414
                plugins.d/plymouth
408
 
        install --mode=u=rwxs,go=rx \
 
415
        install --mode=u=rwx,go=rx \
409
416
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
410
417
                plugin-helpers/mandos-client-iprouteadddel
411
418
        install initramfs-tools-hook \