/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 13:09:43 UTC
  • Revision ID: teddy@recompile.se-20160228130943-6ofi0xgek1xd7qmy
Use GnuPG 2 if available

* debian/control (Package: mandos/Depends): Change "gnupg (<< 2)" to
                                            "gnupg".
  (Package: mandos-client/Depends): Remove "gnupg (<< 2)"; it will be
                                    depended on by libgpgme11, which
                                    will be added automatically by
                                    ${shlibs:Depends}.
* mandos (PGPEngine.__init__): Try to run "gpgconf" and set 'self.gpg'
                               to any binary found.  Also change
                               "--home" to "--homedir".
  (PGPEngine.encrypt, PGPEngine.decrypt): Use the 'self.gpg' attribute
                                          instead of "gpg".

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
14
14
# For info about _FORTIFY_SOURCE, see feature_test_macros(7)
15
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
# 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
17
35
LINK_FORTIFY_LD=-z relro -z now
18
36
LINK_FORTIFY=
19
37
 
24
42
endif
25
43
#COVERAGE=--coverage
26
44
OPTIMIZE=-Os -fno-strict-aliasing
27
 
LANGUAGE=-std=gnu99
 
45
LANGUAGE=-std=gnu11
28
46
htmldir=man
29
 
version=1.6.9
 
47
version=1.7.1
30
48
SED=sed
31
49
 
32
50
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
69
87
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
70
88
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
71
89
        getconf LFS_LDFLAGS)
 
90
LIBNL3_CFLAGS=$(shell pkg-config --cflags-only-I libnl-route-3.0)
 
91
LIBNL3_LIBS=$(shell pkg-config --libs libnl-route-3.0)
72
92
 
73
93
# Do not change these two
74
 
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
75
 
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
76
 
        -DVERSION='"$(version)"'
 
94
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(SANITIZE) $(COVERAGE) \
 
95
        $(OPTIMIZE) $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) \
 
96
        $(GPGME_CFLAGS) -DVERSION='"$(version)"'
77
97
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
78
98
 
79
99
# Commands to format a DocBook <refentry> document into a manual page
106
126
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
107
127
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
108
128
        plugins.d/plymouth
109
 
PLUGIN_HELPERS=
 
129
PLUGIN_HELPERS=plugin-helpers/mandos-client-iprouteadddel
110
130
CPROGS=plugin-runner $(PLUGINS) $(PLUGIN_HELPERS)
111
131
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
112
132
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
240
260
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
241
261
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
242
262
 
 
263
plugin-helpers/mandos-client-iprouteadddel: plugin-helpers/mandos-client-iprouteadddel.c
 
264
        $(LINK.c) $(LIBNL3_CFLAGS) $^ $(LIBNL3_LIBS) $(strip\
 
265
                ) $(LOADLIBES) $(LDLIBS) -o $@
 
266
 
243
267
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
244
268
        check run-client run-server install install-html \
245
269
        install-server install-client-nokey install-client uninstall \
354
378
install-client-nokey: all doc
355
379
        install --directory $(LIBDIR)/mandos $(CONFDIR)
356
380
        install --directory --mode=u=rwx $(KEYDIR) \
357
 
                $(LIBDIR)/mandos/plugins.d
 
381
                $(LIBDIR)/mandos/plugins.d \
 
382
                $(LIBDIR)/mandos/plugin-helpers
358
383
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
359
384
                install --mode=u=rwx \
360
385
                        --directory "$(CONFDIR)/plugins.d"; \
384
409
        install --mode=u=rwxs,go=rx \
385
410
                --target-directory=$(LIBDIR)/mandos/plugins.d \
386
411
                plugins.d/plymouth
 
412
        install --mode=u=rwxs,go=rx \
 
413
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
 
414
                plugin-helpers/mandos-client-iprouteadddel
387
415
        install initramfs-tools-hook \
388
416
                $(INITRAMFSTOOLS)/hooks/mandos
389
417
        install --mode=u=rw,go=r initramfs-tools-hook-conf \