/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-06-07 20:27:17 UTC
  • Revision ID: teddy@recompile.se-20140607202717-j5hiiinwg6osy9ss
Minor bug fix in mandos-client: Allow periods in network hook names.

* plugins.d/mandos-client.c (runnable_hook): Add "." to strspn() call
                                             to match documentation.

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.4.1
 
29
version=1.6.5
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=-Xlinker --as-needed $(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 $@);\
69
 
        LANG=en_US.UTF-8 MANWIDTH=80 man --warnings --encoding=UTF-8 \
70
 
        --local-file $(notdir $@) >/dev/null)
71
 
# DocBook-to-man post-processing to fix a '\n' escape bug
72
 
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
 
88
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
 
89
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
 
90
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
 
91
        fi >/dev/null)
73
92
 
74
93
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
75
94
        --param make.year.ranges                1 \
220
239
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
221
240
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
222
241
 
223
 
.PHONY : all doc html clean distclean run-client run-server install \
224
 
        install-server install-client uninstall uninstall-server \
225
 
        uninstall-client purge purge-server purge-client
 
242
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
 
243
        check run-client run-server install install-html \
 
244
        install-server install-client-nokey install-client uninstall \
 
245
        uninstall-server uninstall-client purge purge-server \
 
246
        purge-client
226
247
 
227
248
clean:
228
249
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
230
251
distclean: clean
231
252
mostlyclean: clean
232
253
maintainer-clean: clean
233
 
        -rm --force --recursive keydir confdir
 
254
        -rm --force --recursive keydir confdir statedir
234
255
 
235
256
check:  all
236
257
        ./mandos --check
 
258
        ./mandos-ctl --check
237
259
 
238
260
# Run the client with a local config and key
239
261
run-client: all keydir/seckey.txt keydir/pubkey.txt
259
281
        ./mandos-keygen --dir keydir --force
260
282
 
261
283
# Run the server with a local config
262
 
run-server: confdir/mandos.conf confdir/clients.conf
263
 
        @echo "#################################################################"
264
 
        @echo "# NOTE: Please IGNORE the error about \"Could not open file      #"
265
 
        @echo "# u'/var/run/mandos.pid'\" -  it is harmless and is caused by    #"
266
 
        @echo "# the server not running as root.  Do NOT run \"make run-server\" #"
267
 
        @echo "# server as root if you didn't also unpack and compile it thus. #"
268
 
        @echo "#################################################################"
269
 
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
 
284
run-server: confdir/mandos.conf confdir/clients.conf statedir
 
285
        ./mandos --debug --no-dbus --configdir=confdir \
 
286
                --statedir=statedir $(SERVERARGS)
270
287
 
271
288
# Used by run-server
272
289
confdir/mandos.conf: mandos.conf
277
294
        install --mode=u=rw $< $@
278
295
# Add a client password
279
296
        ./mandos-keygen --dir keydir --password >> $@
 
297
statedir:
 
298
        install --directory statedir
280
299
 
281
300
install: install-server install-client-nokey
282
301
 
287
306
 
288
307
install-server: doc
289
308
        install --directory $(CONFDIR)
 
309
        if install --directory --mode=u=rwx --owner=$(USER) \
 
310
                --group=$(GROUP) $(STATEDIR); then \
 
311
                :; \
 
312
        elif install --directory --mode=u=rwx $(STATEDIR); then \
 
313
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
 
314
        fi
290
315
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
291
316
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
292
317
                mandos-ctl
300
325
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
301
326
        install --mode=u=rwx,go=rx init.d-mandos \
302
327
                $(DESTDIR)/etc/init.d/mandos
 
328
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
 
329
                install --mode=u=rw,go=r mandos.service $(SYSTEMD); \
 
330
        fi
303
331
        install --mode=u=rw,go=r default-mandos \
304
332
                $(DESTDIR)/etc/default/mandos
305
333
        if [ -z $(DESTDIR) ]; then \
315
343
                > $(MANDIR)/man5/mandos.conf.5.gz
316
344
        gzip --best --to-stdout mandos-clients.conf.5 \
317
345
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
 
346
        gzip --best --to-stdout intro.8mandos \
 
347
                > $(MANDIR)/man8/intro.8mandos.gz
318
348
 
319
349
install-client-nokey: all doc
320
 
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
 
350
        install --directory $(LIBDIR)/mandos $(CONFDIR)
321
351
        install --directory --mode=u=rwx $(KEYDIR) \
322
 
                $(PREFIX)/lib/mandos/plugins.d
323
 
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
 
352
                $(LIBDIR)/mandos/plugins.d
 
353
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
324
354
                install --mode=u=rwx \
325
355
                        --directory "$(CONFDIR)/plugins.d"; \
326
356
        fi
327
357
        install --mode=u=rwx,go=rx --directory \
328
358
                "$(CONFDIR)/network-hooks.d"
329
359
        install --mode=u=rwx,go=rx \
330
 
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
 
360
                --target-directory=$(LIBDIR)/mandos plugin-runner
331
361
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
332
362
                mandos-keygen
333
363
        install --mode=u=rwx,go=rx \
334
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
364
                --target-directory=$(LIBDIR)/mandos/plugins.d \
335
365
                plugins.d/password-prompt
336
366
        install --mode=u=rwxs,go=rx \
337
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
367
                --target-directory=$(LIBDIR)/mandos/plugins.d \
338
368
                plugins.d/mandos-client
339
369
        install --mode=u=rwxs,go=rx \
340
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
370
                --target-directory=$(LIBDIR)/mandos/plugins.d \
341
371
                plugins.d/usplash
342
372
        install --mode=u=rwxs,go=rx \
343
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
373
                --target-directory=$(LIBDIR)/mandos/plugins.d \
344
374
                plugins.d/splashy
345
375
        install --mode=u=rwxs,go=rx \
346
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
376
                --target-directory=$(LIBDIR)/mandos/plugins.d \
347
377
                plugins.d/askpass-fifo
348
378
        install --mode=u=rwxs,go=rx \
349
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
379
                --target-directory=$(LIBDIR)/mandos/plugins.d \
350
380
                plugins.d/plymouth
351
381
        install initramfs-tools-hook \
352
382
                $(INITRAMFSTOOLS)/hooks/mandos
398
428
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
399
429
                $(DESTDIR)/etc/crypttab
400
430
        -rm --force $(PREFIX)/sbin/mandos-keygen \
401
 
                $(PREFIX)/lib/mandos/plugin-runner \
402
 
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
403
 
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
404
 
                $(PREFIX)/lib/mandos/plugins.d/usplash \
405
 
                $(PREFIX)/lib/mandos/plugins.d/splashy \
406
 
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
407
 
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
 
431
                $(LIBDIR)/mandos/plugin-runner \
 
432
                $(LIBDIR)/mandos/plugins.d/password-prompt \
 
433
                $(LIBDIR)/mandos/plugins.d/mandos-client \
 
434
                $(LIBDIR)/mandos/plugins.d/usplash \
 
435
                $(LIBDIR)/mandos/plugins.d/splashy \
 
436
                $(LIBDIR)/mandos/plugins.d/askpass-fifo \
 
437
                $(LIBDIR)/mandos/plugins.d/plymouth \
408
438
                $(INITRAMFSTOOLS)/hooks/mandos \
409
439
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
410
440
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
416
446
                $(MANDIR)/man8/splashy.8mandos.gz \
417
447
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
418
448
                $(MANDIR)/man8/plymouth.8mandos.gz \
419
 
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
420
 
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
 
449
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
 
450
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
421
451
        update-initramfs -k all -u
422
452
 
423
453
purge: purge-server purge-client
427
457
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
428
458
                $(DESTDIR)/etc/default/mandos \
429
459
                $(DESTDIR)/etc/init.d/mandos \
 
460
                $(SYSTEMD)/mandos.service \
 
461
                $(DESTDIR)/run/mandos.pid \
430
462
                $(DESTDIR)/var/run/mandos.pid
431
463
        -rmdir $(CONFDIR)
432
464