/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 03:01:43 UTC
  • Revision ID: teddy@recompile.se-20160228030143-i6w90r7wzkvlx9kq
Stop using python-gnutls.  Use GnuTLS 3.3 or later directly.

* INSTALL: Document dependency on GnuTLS 3.3 and remove dependency on
          Python-GnuTLS.

* debian/control (Source: mandos/Build-Depends): Add (>= 3.3.0) to
                                                 "libgnutls28-dev" and
                                                 "gnutls-dev".
  (Source: mandos/Build-Depends-Indep): Remove "python2.7-gnutls".
  (Package: mandos/Depends): Remove "python-gnutls" and
                             "python2.7-gnutls", add "libgnutls28-dev
                             (>= 3.3.0) | libgnutls30 (>= 3.3.0)"
* mandos: Remove imports of "gnutls" and all submodules.
  (GnuTLS, gnutls): New; simulate a "gnutls" module.  Change all
                    callers to match new shorter names.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
1
 
WARN:=-O -Wall -Wextra -Wdouble-promotion -Wformat=2 -Winit-self \
 
1
WARN=-O -Wall -Wextra -Wdouble-promotion -Wformat=2 -Winit-self \
2
2
        -Wmissing-include-dirs -Wswitch-default -Wswitch-enum \
3
3
        -Wunused -Wuninitialized -Wstrict-overflow=5 \
4
4
        -Wsuggest-attribute=pure -Wsuggest-attribute=const \
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>.
16
 
FORTIFY:=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
 
15
# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
 
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)))
31
 
LINK_FORTIFY_LD:=-z relro -z now
32
 
LINK_FORTIFY:=
 
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
 
35
LINK_FORTIFY_LD=-z relro -z now
 
36
LINK_FORTIFY=
33
37
 
34
38
# If BROKEN_PIE is set, do not build with -pie
35
39
ifndef BROKEN_PIE
37
41
LINK_FORTIFY += -pie
38
42
endif
39
43
#COVERAGE=--coverage
40
 
OPTIMIZE:=-Os -fno-strict-aliasing
41
 
LANGUAGE:=-std=gnu11
42
 
htmldir:=man
43
 
version:=1.7.16
44
 
SED:=sed
 
44
OPTIMIZE=-Os -fno-strict-aliasing
 
45
LANGUAGE=-std=gnu11
 
46
htmldir=man
 
47
version=1.7.1
 
48
SED=sed
45
49
 
46
 
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)))
 
50
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || 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
 
# PREFIX:=$(DESTDIR)/usr/local
51
 
# CONFDIR:=$(DESTDIR)/etc/mandos
52
 
# KEYDIR:=$(DESTDIR)/etc/mandos/keys
53
 
# MANDIR:=$(PREFIX)/man
54
 
# INITRAMFSTOOLS:=$(DESTDIR)/etc/initramfs-tools
55
 
# STATEDIR:=$(DESTDIR)/var/lib/mandos
56
 
# LIBDIR:=$(PREFIX)/lib
 
54
# PREFIX=$(DESTDIR)/usr/local
 
55
# CONFDIR=$(DESTDIR)/etc/mandos
 
56
# KEYDIR=$(DESTDIR)/etc/mandos/keys
 
57
# MANDIR=$(PREFIX)/man
 
58
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
 
59
# STATEDIR=$(DESTDIR)/var/lib/mandos
 
60
# LIBDIR=$(PREFIX)/lib
57
61
##
58
62
 
59
63
## These settings are for a package-type install
60
 
PREFIX:=$(DESTDIR)/usr
61
 
CONFDIR:=$(DESTDIR)/etc/mandos
62
 
KEYDIR:=$(DESTDIR)/etc/keys/mandos
63
 
MANDIR:=$(PREFIX)/share/man
64
 
INITRAMFSTOOLS:=$(DESTDIR)/usr/share/initramfs-tools
65
 
STATEDIR:=$(DESTDIR)/var/lib/mandos
66
 
LIBDIR:=$(shell \
 
64
PREFIX=$(DESTDIR)/usr
 
65
CONFDIR=$(DESTDIR)/etc/mandos
 
66
KEYDIR=$(DESTDIR)/etc/keys/mandos
 
67
MANDIR=$(PREFIX)/share/man
 
68
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
 
69
STATEDIR=$(DESTDIR)/var/lib/mandos
 
70
LIBDIR=$(shell \
67
71
        for d in \
68
72
        "/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null`" \
69
73
        "`rpm --eval='%{_libdir}' 2>/dev/null`" /usr/lib; do \
74
78
        done)
75
79
##
76
80
 
77
 
SYSTEMD:=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
78
 
TMPFILES:=$(DESTDIR)$(shell pkg-config systemd --variable=tmpfilesdir)
 
81
SYSTEMD=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
79
82
 
80
 
GNUTLS_CFLAGS:=$(shell pkg-config --cflags-only-I gnutls)
81
 
GNUTLS_LIBS:=$(shell pkg-config --libs gnutls)
82
 
AVAHI_CFLAGS:=$(shell pkg-config --cflags-only-I avahi-core)
83
 
AVAHI_LIBS:=$(shell pkg-config --libs avahi-core)
84
 
GPGME_CFLAGS:=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
85
 
GPGME_LIBS:=$(shell gpgme-config --libs; getconf LFS_LIBS; \
 
83
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
 
84
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
 
85
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
 
86
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
 
87
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
 
88
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
86
89
        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)
 
90
LIBNL3_CFLAGS=$(shell pkg-config --cflags-only-I libnl-route-3.0)
 
91
LIBNL3_LIBS=$(shell pkg-config --libs libnl-route-3.0)
89
92
 
90
93
# Do not change these two
91
94
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(SANITIZE) $(COVERAGE) \
117
120
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
118
121
        $<; $(HTMLPOST) $@)
119
122
# Fix citerefentry links
120
 
HTMLPOST:=$(SED) --in-place \
 
123
HTMLPOST=$(SED) --in-place \
121
124
        --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
122
125
 
123
 
PLUGINS:=plugins.d/password-prompt plugins.d/mandos-client \
 
126
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
124
127
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
125
128
        plugins.d/plymouth
126
 
PLUGIN_HELPERS:=plugin-helpers/mandos-client-iprouteadddel
127
 
CPROGS:=plugin-runner $(PLUGINS) $(PLUGIN_HELPERS)
128
 
PROGS:=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
129
 
DOCS:=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
 
129
PLUGIN_HELPERS=plugin-helpers/mandos-client-iprouteadddel
 
130
CPROGS=plugin-runner $(PLUGINS) $(PLUGIN_HELPERS)
 
131
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
 
132
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
130
133
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
131
134
        plugins.d/mandos-client.8mandos \
132
135
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
133
136
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
134
137
        plugins.d/plymouth.8mandos intro.8mandos
135
138
 
136
 
htmldocs:=$(addsuffix .xhtml,$(DOCS))
 
139
htmldocs=$(addsuffix .xhtml,$(DOCS))
137
140
 
138
 
objects:=$(addsuffix .o,$(CPROGS))
 
141
objects=$(addsuffix .o,$(CPROGS))
139
142
 
140
143
all: $(PROGS) mandos.lsm
141
144
 
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 \