/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:30:21 UTC
  • Revision ID: teddy@recompile.se-20160228203021-4rvy27vm4mx4r575
Client: Remove an incorrect "nonnull" attribute

* plugins.d/mandos-client.c (init_gnutls_global): Remove "nonnull"
                           attribute from "dhparamsfilename" argument.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
1
 
WARN=-O -Wall -Wformat=2 -Winit-self -Wmissing-include-dirs \
2
 
        -Wswitch-default -Wswitch-enum -Wunused-parameter \
3
 
        -Wstrict-aliasing=1 -Wextra -Wfloat-equal -Wundef -Wshadow \
 
1
WARN=-O -Wall -Wextra -Wdouble-promotion -Wformat=2 -Winit-self \
 
2
        -Wmissing-include-dirs -Wswitch-default -Wswitch-enum \
 
3
        -Wunused -Wuninitialized -Wstrict-overflow=5 \
 
4
        -Wsuggest-attribute=pure -Wsuggest-attribute=const \
 
5
        -Wsuggest-attribute=noreturn -Wfloat-equal -Wundef -Wshadow \
4
6
        -Wunsafe-loop-optimizations -Wpointer-arith \
5
7
        -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings \
6
 
        -Wconversion -Wstrict-prototypes -Wold-style-definition \
7
 
        -Wpacked -Wnested-externs -Winline -Wvolatile-register-var \
8
 
        -Wunreachable-code
 
8
        -Wconversion -Wlogical-op -Waggregate-return \
 
9
        -Wstrict-prototypes -Wold-style-definition \
 
10
        -Wmissing-format-attribute -Wnormalized=nfc -Wpacked \
 
11
        -Wredundant-decls -Wnested-externs -Winline -Wvla \
 
12
        -Wvolatile-register-var -Woverlength-strings
9
13
#DEBUG=-ggdb3
10
14
# For info about _FORTIFY_SOURCE, see feature_test_macros(7)
11
15
# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
12
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
13
35
LINK_FORTIFY_LD=-z relro -z now
14
36
LINK_FORTIFY=
15
37
 
20
42
endif
21
43
#COVERAGE=--coverage
22
44
OPTIMIZE=-Os -fno-strict-aliasing
23
 
LANGUAGE=-std=gnu99
 
45
LANGUAGE=-std=gnu11
24
46
htmldir=man
25
 
version=1.6.4
 
47
version=1.7.2
26
48
SED=sed
27
49
 
28
50
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
65
87
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
66
88
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
67
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)
68
92
 
69
93
# Do not change these two
70
 
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
71
 
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
72
 
        -DVERSION='"$(version)"'
 
94
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(SANITIZE) $(COVERAGE) \
 
95
        $(OPTIMIZE) $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) \
 
96
        $(GPGME_CFLAGS) -DVERSION='"$(version)"'
73
97
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
74
98
 
75
99
# Commands to format a DocBook <refentry> document into a manual page
81
105
        --param man.authors.section.enabled     0 \
82
106
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
83
107
        $(notdir $<); \
84
 
        $(MANPOST) $(notdir $@);\
85
108
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
86
109
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
87
110
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
88
111
        fi >/dev/null)
89
 
# DocBook-to-man post-processing to fix a '\n' escape bug
90
 
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
91
112
 
92
113
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
93
114
        --param make.year.ranges                1 \
105
126
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
106
127
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
107
128
        plugins.d/plymouth
108
 
CPROGS=plugin-runner $(PLUGINS)
 
129
PLUGIN_HELPERS=plugin-helpers/mandos-client-iprouteadddel
 
130
CPROGS=plugin-runner $(PLUGINS) $(PLUGIN_HELPERS)
109
131
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
110
132
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
111
133
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
238
260
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
239
261
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
240
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
 
241
267
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
242
268
        check run-client run-server install install-html \
243
269
        install-server install-client-nokey install-client uninstall \
263
289
        @echo "# ignored.  The messages are caused by not running as root, but   #"
264
290
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
265
291
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
266
 
        @echo "# From plugin-runner: setuid: Operation not permitted             #"
 
292
        @echo "# From plugin-runner: setgid: Operation not permitted             #"
 
293
        @echo "#                     setuid: Operation not permitted             #"
267
294
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
268
 
        @echo "# From mandos-client: setuid: Operation not permitted             #"
269
 
        @echo "#                     seteuid: Operation not permitted            #"
270
 
        @echo "#                     klogctl: Operation not permitted            #"
 
295
        @echo "# From mandos-client:                                             #"
 
296
        @echo "#             Failed to raise privileges: Operation not permitted #"
 
297
        @echo "#             Warning: network hook \"*\" exited with status *      #"
271
298
        @echo "###################################################################"
 
299
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
272
300
        ./plugin-runner --plugin-dir=plugins.d \
 
301
                --plugin-helper-dir=plugin-helpers \
273
302
                --config-file=plugin-runner.conf \
274
303
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
 
304
                --env-for=mandos-client:GNOME_KEYRING_CONTROL= \
275
305
                $(CLIENTARGS)
276
306
 
277
307
# Used by run-client
292
322
        install --directory confdir
293
323
        install --mode=u=rw $< $@
294
324
# Add a client password
295
 
        ./mandos-keygen --dir keydir --password >> $@
 
325
        ./mandos-keygen --dir keydir --password --no-ssh >> $@
296
326
statedir:
297
327
        install --directory statedir
298
328
 
348
378
install-client-nokey: all doc
349
379
        install --directory $(LIBDIR)/mandos $(CONFDIR)
350
380
        install --directory --mode=u=rwx $(KEYDIR) \
351
 
                $(LIBDIR)/mandos/plugins.d
 
381
                $(LIBDIR)/mandos/plugins.d \
 
382
                $(LIBDIR)/mandos/plugin-helpers
352
383
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
353
384
                install --mode=u=rwx \
354
385
                        --directory "$(CONFDIR)/plugins.d"; \
 
386
                install --directory "$(CONFDIR)/plugin-helpers"; \
355
387
        fi
356
388
        install --mode=u=rwx,go=rx --directory \
357
389
                "$(CONFDIR)/network-hooks.d"
377
409
        install --mode=u=rwxs,go=rx \
378
410
                --target-directory=$(LIBDIR)/mandos/plugins.d \
379
411
                plugins.d/plymouth
 
412
        install --mode=u=rwxs,go=rx \
 
413
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
 
414
                plugin-helpers/mandos-client-iprouteadddel
380
415
        install initramfs-tools-hook \
381
416
                $(INITRAMFSTOOLS)/hooks/mandos
382
417
        install --mode=u=rw,go=r initramfs-tools-hook-conf \