/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: Teddy Hogeborn
  • Date: 2014-03-23 19:24:40 UTC
  • mto: (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 311.
  • Revision ID: teddy@recompile.se-20140323192440-d71iiqxebsxf9u2v
Update GCC warning flags and function attributes to GCC 4.7.

* Makefile (WARN): Update to include almost all warning flags.
* plugin-runner.c (getplugin, add_to_char_array, add_argument,
                   add_environment, set_cloexec_flag,
                   print_out_password): Add attribute
                                        "warn_unused_result".
  (main/parse_opt): Bug fix: Add error checking to --global-env,
                    --env-for, --plugin-dir, and --config-file, and
                    make sure errno does not "leak" from unrelated
                    functions.
* plugins.d/mandos-client.c
  (fprintf_plus, debuggnutls, resolve_callback): Add "nonnull"
                                                 attribute.
  (incbuffer, add_server, init_gpgme): Add "nonnull" and
                                       "warn_unused_result"
                                       attributes.
  (pgp_packet_decrypt, init_gnutls_global): - '' -
  (init_gnutls_session start_mandos_communication, get_flags): - '' -
  (good_flags, good_interface, interface_is_up): - '' -
  (interface_is_running, runnable_hook): - '' -
  (avahi_loop_with_timeout, bring_up_interface): : - '' -
  (safer_gnutls_strerror): Add "warn_unused_result" attribute.
  (notdotentries): Set "nonnull", "pure", and "warn_unused_result"
                   attributes.
  (raise_privileges, raise_privileges_permanently, lower_privileges,
  lower_privileges_permanently): Set "warn_unused_result" attribute.
  (run_network_hooks): Exit child process if it fails to do anything
                       it needs to do.  Make explicit cast to double
                       when passing float value to asprintf().  Change
                       return type to void - all callers changed.
  (bring_up_interface): Move variables "sd", "ret_errno", and
                        "ret_setflags" to innermost scope.  Bug fix:
                        Fail if could not get interface flags also in
                        non-debug mode, and restore old errno
                        correctly.  Print message if could not raise
                        (or later lower) privileges.
  (take_down_interface): Bug fix: When failing because it could not
                         get interface flags, restore old errno
                         correctly.  Print message if it could not
                         raise (or later lower) privileges.
  (main): Complain if failed to raise or lower privileges.  Only run
          network hooks or lower privileges if raising privileges was
          successful.

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
 
# For info about _FORTIFY_SOURCE, see
11
 
# <http://www.kernel.org/doc/man-pages/online/pages/man7/feature_test_macros.7.html>
 
14
# For info about _FORTIFY_SOURCE, see feature_test_macros(7)
12
15
# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
13
16
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
14
17
LINK_FORTIFY_LD=-z relro -z now
20
23
LINK_FORTIFY += -pie
21
24
endif
22
25
#COVERAGE=--coverage
23
 
OPTIMIZE=-Os
 
26
OPTIMIZE=-Os -fno-strict-aliasing
24
27
LANGUAGE=-std=gnu99
25
28
htmldir=man
26
 
version=1.2
 
29
version=1.6.4
27
30
SED=sed
28
31
 
 
32
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
 
33
GROUP=$(firstword $(subst :, ,$(shell getent group _mandos || getent group nobody || echo 65534)))
 
34
 
29
35
## Use these settings for a traditional /usr/local install
30
36
# PREFIX=$(DESTDIR)/usr/local
31
37
# CONFDIR=$(DESTDIR)/etc/mandos
32
38
# KEYDIR=$(DESTDIR)/etc/mandos/keys
33
39
# MANDIR=$(PREFIX)/man
34
40
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
 
41
# STATEDIR=$(DESTDIR)/var/lib/mandos
 
42
# LIBDIR=$(PREFIX)/lib
35
43
##
36
44
 
37
45
## These settings are for a package-type install
40
48
KEYDIR=$(DESTDIR)/etc/keys/mandos
41
49
MANDIR=$(PREFIX)/share/man
42
50
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
 
51
STATEDIR=$(DESTDIR)/var/lib/mandos
 
52
LIBDIR=$(shell \
 
53
        for d in \
 
54
        "/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null`" \
 
55
        "`rpm --eval='%{_libdir}' 2>/dev/null`" /usr/lib; do \
 
56
                if [ -d "$$d" -a "$$d" = "$${d%/}" ]; then \
 
57
                        echo "$(DESTDIR)$$d"; \
 
58
                        break; \
 
59
                fi; \
 
60
        done)
43
61
##
44
62
 
 
63
SYSTEMD=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
 
64
 
45
65
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
46
66
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
47
67
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
51
71
        getconf LFS_LDFLAGS)
52
72
 
53
73
# Do not change these two
54
 
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
 
74
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
55
75
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
56
76
        -DVERSION='"$(version)"'
57
 
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
77
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
58
78
 
59
79
# Commands to format a DocBook <refentry> document into a manual page
60
80
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
63
83
        --param make.single.year.ranges         1 \
64
84
        --param man.output.quietly              1 \
65
85
        --param man.authors.section.enabled     0 \
66
 
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
 
86
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
67
87
        $(notdir $<); \
68
 
        $(MANPOST) $(notdir $@))
 
88
        $(MANPOST) $(notdir $@);\
 
89
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
 
90
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
 
91
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
 
92
        fi >/dev/null)
69
93
# DocBook-to-man post-processing to fix a '\n' escape bug
70
94
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
71
95
 
92
116
        plugins.d/mandos-client.8mandos \
93
117
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
94
118
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
95
 
        plugins.d/plymouth.8mandos
 
119
        plugins.d/plymouth.8mandos intro.8mandos
96
120
 
97
121
htmldocs=$(addsuffix .xhtml,$(DOCS))
98
122
 
119
143
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
120
144
        $(DOCBOOKTOHTML)
121
145
 
 
146
intro.8mandos: intro.xml common.ent legalnotice.xml
 
147
        $(DOCBOOKTOMAN)
 
148
intro.8mandos.xhtml: intro.xml common.ent legalnotice.xml
 
149
        $(DOCBOOKTOHTML)
 
150
 
122
151
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
123
152
                legalnotice.xml
124
153
        $(DOCBOOKTOMAN)
210
239
                $@)
211
240
 
212
241
plugins.d/mandos-client: plugins.d/mandos-client.c
213
 
        $(LINK.c) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) $(strip\
214
 
                ) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
242
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
 
243
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
215
244
 
216
 
.PHONY : all doc html clean distclean run-client run-server install \
217
 
        install-server install-client uninstall uninstall-server \
218
 
        uninstall-client purge purge-server purge-client
 
245
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
 
246
        check run-client run-server install install-html \
 
247
        install-server install-client-nokey install-client uninstall \
 
248
        uninstall-server uninstall-client purge purge-server \
 
249
        purge-client
219
250
 
220
251
clean:
221
252
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
223
254
distclean: clean
224
255
mostlyclean: clean
225
256
maintainer-clean: clean
226
 
        -rm --force --recursive keydir confdir
 
257
        -rm --force --recursive keydir confdir statedir
227
258
 
228
259
check:  all
229
260
        ./mandos --check
 
261
        ./mandos-ctl --check
230
262
 
231
263
# Run the client with a local config and key
232
264
run-client: all keydir/seckey.txt keydir/pubkey.txt
243
275
        @echo "###################################################################"
244
276
        ./plugin-runner --plugin-dir=plugins.d \
245
277
                --config-file=plugin-runner.conf \
246
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
 
278
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
247
279
                $(CLIENTARGS)
248
280
 
249
281
# Used by run-client
252
284
        ./mandos-keygen --dir keydir --force
253
285
 
254
286
# Run the server with a local config
255
 
run-server: confdir/mandos.conf confdir/clients.conf
256
 
        @echo "#################################################################"
257
 
        @echo "# NOTE: Please IGNORE the error about \"Could not open file      #"
258
 
        @echo "# u'/var/run/mandos.pid'\" -  it is harmless and is caused by    #"
259
 
        @echo "# the server not running as root.  Do NOT run \"make run-server\" #"
260
 
        @echo "# server as root if you didn't also unpack and compile it thus. #"
261
 
        @echo "#################################################################"
262
 
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
 
287
run-server: confdir/mandos.conf confdir/clients.conf statedir
 
288
        ./mandos --debug --no-dbus --configdir=confdir \
 
289
                --statedir=statedir $(SERVERARGS)
263
290
 
264
291
# Used by run-server
265
292
confdir/mandos.conf: mandos.conf
270
297
        install --mode=u=rw $< $@
271
298
# Add a client password
272
299
        ./mandos-keygen --dir keydir --password >> $@
 
300
statedir:
 
301
        install --directory statedir
273
302
 
274
303
install: install-server install-client-nokey
275
304
 
280
309
 
281
310
install-server: doc
282
311
        install --directory $(CONFDIR)
 
312
        if install --directory --mode=u=rwx --owner=$(USER) \
 
313
                --group=$(GROUP) $(STATEDIR); then \
 
314
                :; \
 
315
        elif install --directory --mode=u=rwx $(STATEDIR); then \
 
316
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
 
317
        fi
283
318
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
284
319
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
285
320
                mandos-ctl
293
328
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
294
329
        install --mode=u=rwx,go=rx init.d-mandos \
295
330
                $(DESTDIR)/etc/init.d/mandos
 
331
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
 
332
                install --mode=u=rw,go=r mandos.service $(SYSTEMD); \
 
333
        fi
296
334
        install --mode=u=rw,go=r default-mandos \
297
335
                $(DESTDIR)/etc/default/mandos
298
336
        if [ -z $(DESTDIR) ]; then \
308
346
                > $(MANDIR)/man5/mandos.conf.5.gz
309
347
        gzip --best --to-stdout mandos-clients.conf.5 \
310
348
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
 
349
        gzip --best --to-stdout intro.8mandos \
 
350
                > $(MANDIR)/man8/intro.8mandos.gz
311
351
 
312
352
install-client-nokey: all doc
313
 
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
 
353
        install --directory $(LIBDIR)/mandos $(CONFDIR)
314
354
        install --directory --mode=u=rwx $(KEYDIR) \
315
 
                $(PREFIX)/lib/mandos/plugins.d
316
 
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
 
355
                $(LIBDIR)/mandos/plugins.d
 
356
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
317
357
                install --mode=u=rwx \
318
358
                        --directory "$(CONFDIR)/plugins.d"; \
319
359
        fi
 
360
        install --mode=u=rwx,go=rx --directory \
 
361
                "$(CONFDIR)/network-hooks.d"
320
362
        install --mode=u=rwx,go=rx \
321
 
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
 
363
                --target-directory=$(LIBDIR)/mandos plugin-runner
322
364
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
323
365
                mandos-keygen
324
366
        install --mode=u=rwx,go=rx \
325
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
367
                --target-directory=$(LIBDIR)/mandos/plugins.d \
326
368
                plugins.d/password-prompt
327
369
        install --mode=u=rwxs,go=rx \
328
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
370
                --target-directory=$(LIBDIR)/mandos/plugins.d \
329
371
                plugins.d/mandos-client
330
372
        install --mode=u=rwxs,go=rx \
331
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
373
                --target-directory=$(LIBDIR)/mandos/plugins.d \
332
374
                plugins.d/usplash
333
375
        install --mode=u=rwxs,go=rx \
334
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
376
                --target-directory=$(LIBDIR)/mandos/plugins.d \
335
377
                plugins.d/splashy
336
378
        install --mode=u=rwxs,go=rx \
337
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
379
                --target-directory=$(LIBDIR)/mandos/plugins.d \
338
380
                plugins.d/askpass-fifo
339
381
        install --mode=u=rwxs,go=rx \
340
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
382
                --target-directory=$(LIBDIR)/mandos/plugins.d \
341
383
                plugins.d/plymouth
342
384
        install initramfs-tools-hook \
343
385
                $(INITRAMFSTOOLS)/hooks/mandos
389
431
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
390
432
                $(DESTDIR)/etc/crypttab
391
433
        -rm --force $(PREFIX)/sbin/mandos-keygen \
392
 
                $(PREFIX)/lib/mandos/plugin-runner \
393
 
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
394
 
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
395
 
                $(PREFIX)/lib/mandos/plugins.d/usplash \
396
 
                $(PREFIX)/lib/mandos/plugins.d/splashy \
397
 
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
398
 
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
 
434
                $(LIBDIR)/mandos/plugin-runner \
 
435
                $(LIBDIR)/mandos/plugins.d/password-prompt \
 
436
                $(LIBDIR)/mandos/plugins.d/mandos-client \
 
437
                $(LIBDIR)/mandos/plugins.d/usplash \
 
438
                $(LIBDIR)/mandos/plugins.d/splashy \
 
439
                $(LIBDIR)/mandos/plugins.d/askpass-fifo \
 
440
                $(LIBDIR)/mandos/plugins.d/plymouth \
399
441
                $(INITRAMFSTOOLS)/hooks/mandos \
400
442
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
401
443
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
407
449
                $(MANDIR)/man8/splashy.8mandos.gz \
408
450
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
409
451
                $(MANDIR)/man8/plymouth.8mandos.gz \
410
 
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
411
 
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
 
452
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
 
453
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
412
454
        update-initramfs -k all -u
413
455
 
414
456
purge: purge-server purge-client
418
460
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
419
461
                $(DESTDIR)/etc/default/mandos \
420
462
                $(DESTDIR)/etc/init.d/mandos \
 
463
                $(SYSTEMD)/mandos.service \
 
464
                $(DESTDIR)/run/mandos.pid \
421
465
                $(DESTDIR)/var/run/mandos.pid
422
466
        -rmdir $(CONFDIR)
423
467