/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: 2014-03-23 22:12:57 UTC
  • Revision ID: teddy@recompile.se-20140323221257-9lkufevfdn4kwoq6
Use openat() etc. in plugin-runner.  Also one less useless warning.

* plugin-runner.c (main): Only print warning about failure to work
                          around Debian bug #633582 if the plugin
                          directory actually exists.  Use openat(),
                          fstat(), faccessat(), and eliminate
                          asprintf().

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.3.1
 
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
 
218
242
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
219
243
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
220
244
 
221
 
.PHONY : all doc html clean distclean run-client run-server install \
222
 
        install-server install-client uninstall uninstall-server \
223
 
        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
224
250
 
225
251
clean:
226
252
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
228
254
distclean: clean
229
255
mostlyclean: clean
230
256
maintainer-clean: clean
231
 
        -rm --force --recursive keydir confdir
 
257
        -rm --force --recursive keydir confdir statedir
232
258
 
233
259
check:  all
234
260
        ./mandos --check
 
261
        ./mandos-ctl --check
235
262
 
236
263
# Run the client with a local config and key
237
264
run-client: all keydir/seckey.txt keydir/pubkey.txt
248
275
        @echo "###################################################################"
249
276
        ./plugin-runner --plugin-dir=plugins.d \
250
277
                --config-file=plugin-runner.conf \
251
 
                --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 \
252
279
                $(CLIENTARGS)
253
280
 
254
281
# Used by run-client
257
284
        ./mandos-keygen --dir keydir --force
258
285
 
259
286
# Run the server with a local config
260
 
run-server: confdir/mandos.conf confdir/clients.conf
261
 
        @echo "#################################################################"
262
 
        @echo "# NOTE: Please IGNORE the error about \"Could not open file      #"
263
 
        @echo "# u'/var/run/mandos.pid'\" -  it is harmless and is caused by    #"
264
 
        @echo "# the server not running as root.  Do NOT run \"make run-server\" #"
265
 
        @echo "# server as root if you didn't also unpack and compile it thus. #"
266
 
        @echo "#################################################################"
267
 
        ./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)
268
290
 
269
291
# Used by run-server
270
292
confdir/mandos.conf: mandos.conf
275
297
        install --mode=u=rw $< $@
276
298
# Add a client password
277
299
        ./mandos-keygen --dir keydir --password >> $@
 
300
statedir:
 
301
        install --directory statedir
278
302
 
279
303
install: install-server install-client-nokey
280
304
 
285
309
 
286
310
install-server: doc
287
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
288
318
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
289
319
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
290
320
                mandos-ctl
298
328
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
299
329
        install --mode=u=rwx,go=rx init.d-mandos \
300
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
301
334
        install --mode=u=rw,go=r default-mandos \
302
335
                $(DESTDIR)/etc/default/mandos
303
336
        if [ -z $(DESTDIR) ]; then \
313
346
                > $(MANDIR)/man5/mandos.conf.5.gz
314
347
        gzip --best --to-stdout mandos-clients.conf.5 \
315
348
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
 
349
        gzip --best --to-stdout intro.8mandos \
 
350
                > $(MANDIR)/man8/intro.8mandos.gz
316
351
 
317
352
install-client-nokey: all doc
318
 
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
 
353
        install --directory $(LIBDIR)/mandos $(CONFDIR)
319
354
        install --directory --mode=u=rwx $(KEYDIR) \
320
 
                $(PREFIX)/lib/mandos/plugins.d
321
 
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
 
355
                $(LIBDIR)/mandos/plugins.d
 
356
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
322
357
                install --mode=u=rwx \
323
358
                        --directory "$(CONFDIR)/plugins.d"; \
324
359
        fi
 
360
        install --mode=u=rwx,go=rx --directory \
 
361
                "$(CONFDIR)/network-hooks.d"
325
362
        install --mode=u=rwx,go=rx \
326
 
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
 
363
                --target-directory=$(LIBDIR)/mandos plugin-runner
327
364
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
328
365
                mandos-keygen
329
366
        install --mode=u=rwx,go=rx \
330
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
367
                --target-directory=$(LIBDIR)/mandos/plugins.d \
331
368
                plugins.d/password-prompt
332
369
        install --mode=u=rwxs,go=rx \
333
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
370
                --target-directory=$(LIBDIR)/mandos/plugins.d \
334
371
                plugins.d/mandos-client
335
372
        install --mode=u=rwxs,go=rx \
336
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
373
                --target-directory=$(LIBDIR)/mandos/plugins.d \
337
374
                plugins.d/usplash
338
375
        install --mode=u=rwxs,go=rx \
339
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
376
                --target-directory=$(LIBDIR)/mandos/plugins.d \
340
377
                plugins.d/splashy
341
378
        install --mode=u=rwxs,go=rx \
342
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
379
                --target-directory=$(LIBDIR)/mandos/plugins.d \
343
380
                plugins.d/askpass-fifo
344
381
        install --mode=u=rwxs,go=rx \
345
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
382
                --target-directory=$(LIBDIR)/mandos/plugins.d \
346
383
                plugins.d/plymouth
347
384
        install initramfs-tools-hook \
348
385
                $(INITRAMFSTOOLS)/hooks/mandos
394
431
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
395
432
                $(DESTDIR)/etc/crypttab
396
433
        -rm --force $(PREFIX)/sbin/mandos-keygen \
397
 
                $(PREFIX)/lib/mandos/plugin-runner \
398
 
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
399
 
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
400
 
                $(PREFIX)/lib/mandos/plugins.d/usplash \
401
 
                $(PREFIX)/lib/mandos/plugins.d/splashy \
402
 
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
403
 
                $(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 \
404
441
                $(INITRAMFSTOOLS)/hooks/mandos \
405
442
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
406
443
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
412
449
                $(MANDIR)/man8/splashy.8mandos.gz \
413
450
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
414
451
                $(MANDIR)/man8/plymouth.8mandos.gz \
415
 
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
416
 
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
 
452
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
 
453
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
417
454
        update-initramfs -k all -u
418
455
 
419
456
purge: purge-server purge-client
423
460
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
424
461
                $(DESTDIR)/etc/default/mandos \
425
462
                $(DESTDIR)/etc/init.d/mandos \
 
463
                $(SYSTEMD)/mandos.service \
 
464
                $(DESTDIR)/run/mandos.pid \
426
465
                $(DESTDIR)/var/run/mandos.pid
427
466
        -rmdir $(CONFDIR)
428
467