/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: 2013-10-28 20:08:32 UTC
  • Revision ID: teddy@recompile.se-20131028200832-80d1k8c5e8mugpkx
Syntax fix; use "raise" better in Mandos server.

* mandos: Syntax fix; use "raise" better in Mandos server; Always
          raise instances, not classes, skip argument when re-raising,
          etc.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
5
5
        -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings \
6
6
        -Wconversion -Wstrict-prototypes -Wold-style-definition \
7
7
        -Wpacked -Wnested-externs -Winline -Wvolatile-register-var
8
 
#       -Wunreachable-code 
 
8
#       -Wunreachable-code
9
9
#DEBUG=-ggdb3
10
10
# For info about _FORTIFY_SOURCE, see
11
11
# <http://www.kernel.org/doc/man-pages/online/pages/man7/feature_test_macros.7.html>
23
23
OPTIMIZE=-Os
24
24
LANGUAGE=-std=gnu99
25
25
htmldir=man
26
 
version=1.0.14
 
26
version=1.6.2
27
27
SED=sed
28
28
 
 
29
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
 
30
GROUP=$(firstword $(subst :, ,$(shell getent group _mandos || getent group nobody || echo 65534)))
 
31
 
29
32
## Use these settings for a traditional /usr/local install
30
33
# PREFIX=$(DESTDIR)/usr/local
31
34
# CONFDIR=$(DESTDIR)/etc/mandos
32
35
# KEYDIR=$(DESTDIR)/etc/mandos/keys
33
36
# MANDIR=$(PREFIX)/man
34
37
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
 
38
# STATEDIR=$(DESTDIR)/var/lib/mandos
 
39
# LIBDIR=$(PREFIX)/lib
35
40
##
36
41
 
37
42
## These settings are for a package-type install
40
45
KEYDIR=$(DESTDIR)/etc/keys/mandos
41
46
MANDIR=$(PREFIX)/share/man
42
47
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
 
48
STATEDIR=$(DESTDIR)/var/lib/mandos
 
49
LIBDIR=$(shell \
 
50
        for d in \
 
51
        "/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null`" \
 
52
        "`rpm --eval='%{_libdir}' 2>/dev/null`" /usr/lib; do \
 
53
                if [ -d "$$d" -a "$$d" = "$${d%/}" ]; then \
 
54
                        echo "$(DESTDIR)$$d"; \
 
55
                        break; \
 
56
                fi; \
 
57
        done)
43
58
##
44
59
 
 
60
SYSTEMD=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
 
61
 
45
62
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
46
63
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
47
64
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
51
68
        getconf LFS_LDFLAGS)
52
69
 
53
70
# Do not change these two
54
 
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
 
71
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
55
72
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
56
73
        -DVERSION='"$(version)"'
57
 
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
74
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
58
75
 
59
76
# Commands to format a DocBook <refentry> document into a manual page
60
77
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
63
80
        --param make.single.year.ranges         1 \
64
81
        --param man.output.quietly              1 \
65
82
        --param man.authors.section.enabled     0 \
66
 
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
 
83
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
67
84
        $(notdir $<); \
68
 
        $(MANPOST) $(notdir $@))
 
85
        $(MANPOST) $(notdir $@);\
 
86
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
 
87
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
 
88
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
 
89
        fi >/dev/null)
69
90
# DocBook-to-man post-processing to fix a '\n' escape bug
70
91
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
71
92
 
92
113
        plugins.d/mandos-client.8mandos \
93
114
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
94
115
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
95
 
        plugins.d/plymouth.8mandos
 
116
        plugins.d/plymouth.8mandos intro.8mandos
96
117
 
97
118
htmldocs=$(addsuffix .xhtml,$(DOCS))
98
119
 
119
140
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
120
141
        $(DOCBOOKTOHTML)
121
142
 
 
143
intro.8mandos: intro.xml common.ent legalnotice.xml
 
144
        $(DOCBOOKTOMAN)
 
145
intro.8mandos.xhtml: intro.xml common.ent legalnotice.xml
 
146
        $(DOCBOOKTOHTML)
 
147
 
122
148
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
123
149
                legalnotice.xml
124
150
        $(DOCBOOKTOMAN)
210
236
                $@)
211
237
 
212
238
plugins.d/mandos-client: plugins.d/mandos-client.c
213
 
        $(LINK.c) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) $(strip\
214
 
                ) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
239
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
 
240
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
215
241
 
216
242
.PHONY : all doc html clean distclean run-client run-server install \
217
243
        install-server install-client uninstall uninstall-server \
223
249
distclean: clean
224
250
mostlyclean: clean
225
251
maintainer-clean: clean
226
 
        -rm --force --recursive keydir confdir
 
252
        -rm --force --recursive keydir confdir statedir
227
253
 
228
254
check:  all
229
255
        ./mandos --check
 
256
        ./mandos-ctl --check
230
257
 
231
258
# Run the client with a local config and key
232
259
run-client: all keydir/seckey.txt keydir/pubkey.txt
243
270
        @echo "###################################################################"
244
271
        ./plugin-runner --plugin-dir=plugins.d \
245
272
                --config-file=plugin-runner.conf \
246
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
 
273
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
247
274
                $(CLIENTARGS)
248
275
 
249
276
# Used by run-client
252
279
        ./mandos-keygen --dir keydir --force
253
280
 
254
281
# 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)
 
282
run-server: confdir/mandos.conf confdir/clients.conf statedir
 
283
        ./mandos --debug --no-dbus --configdir=confdir \
 
284
                --statedir=statedir $(SERVERARGS)
263
285
 
264
286
# Used by run-server
265
287
confdir/mandos.conf: mandos.conf
270
292
        install --mode=u=rw $< $@
271
293
# Add a client password
272
294
        ./mandos-keygen --dir keydir --password >> $@
 
295
statedir:
 
296
        install --directory statedir
273
297
 
274
298
install: install-server install-client-nokey
275
299
 
280
304
 
281
305
install-server: doc
282
306
        install --directory $(CONFDIR)
 
307
        install --directory --mode=u=rwx --owner=$(USER) \
 
308
                --group=$(GROUP) $(STATEDIR)
283
309
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
284
310
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
285
311
                mandos-ctl
293
319
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
294
320
        install --mode=u=rwx,go=rx init.d-mandos \
295
321
                $(DESTDIR)/etc/init.d/mandos
 
322
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
 
323
                install --mode=u=rw,go=r mandos.service $(SYSTEMD); \
 
324
        fi
296
325
        install --mode=u=rw,go=r default-mandos \
297
326
                $(DESTDIR)/etc/default/mandos
298
327
        if [ -z $(DESTDIR) ]; then \
308
337
                > $(MANDIR)/man5/mandos.conf.5.gz
309
338
        gzip --best --to-stdout mandos-clients.conf.5 \
310
339
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
 
340
        gzip --best --to-stdout intro.8mandos \
 
341
                > $(MANDIR)/man8/intro.8mandos.gz
311
342
 
312
343
install-client-nokey: all doc
313
 
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
 
344
        install --directory $(LIBDIR)/mandos $(CONFDIR)
314
345
        install --directory --mode=u=rwx $(KEYDIR) \
315
 
                $(PREFIX)/lib/mandos/plugins.d
316
 
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
 
346
                $(LIBDIR)/mandos/plugins.d
 
347
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
317
348
                install --mode=u=rwx \
318
349
                        --directory "$(CONFDIR)/plugins.d"; \
319
350
        fi
 
351
        install --mode=u=rwx,go=rx --directory \
 
352
                "$(CONFDIR)/network-hooks.d"
320
353
        install --mode=u=rwx,go=rx \
321
 
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
 
354
                --target-directory=$(LIBDIR)/mandos plugin-runner
322
355
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
323
356
                mandos-keygen
324
357
        install --mode=u=rwx,go=rx \
325
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
358
                --target-directory=$(LIBDIR)/mandos/plugins.d \
326
359
                plugins.d/password-prompt
327
360
        install --mode=u=rwxs,go=rx \
328
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
361
                --target-directory=$(LIBDIR)/mandos/plugins.d \
329
362
                plugins.d/mandos-client
330
363
        install --mode=u=rwxs,go=rx \
331
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
364
                --target-directory=$(LIBDIR)/mandos/plugins.d \
332
365
                plugins.d/usplash
333
366
        install --mode=u=rwxs,go=rx \
334
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
367
                --target-directory=$(LIBDIR)/mandos/plugins.d \
335
368
                plugins.d/splashy
336
369
        install --mode=u=rwxs,go=rx \
337
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
370
                --target-directory=$(LIBDIR)/mandos/plugins.d \
338
371
                plugins.d/askpass-fifo
339
372
        install --mode=u=rwxs,go=rx \
340
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
373
                --target-directory=$(LIBDIR)/mandos/plugins.d \
341
374
                plugins.d/plymouth
342
375
        install initramfs-tools-hook \
343
376
                $(INITRAMFSTOOLS)/hooks/mandos
389
422
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
390
423
                $(DESTDIR)/etc/crypttab
391
424
        -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 \
 
425
                $(LIBDIR)/mandos/plugin-runner \
 
426
                $(LIBDIR)/mandos/plugins.d/password-prompt \
 
427
                $(LIBDIR)/mandos/plugins.d/mandos-client \
 
428
                $(LIBDIR)/mandos/plugins.d/usplash \
 
429
                $(LIBDIR)/mandos/plugins.d/splashy \
 
430
                $(LIBDIR)/mandos/plugins.d/askpass-fifo \
 
431
                $(LIBDIR)/mandos/plugins.d/plymouth \
399
432
                $(INITRAMFSTOOLS)/hooks/mandos \
400
433
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
401
434
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
407
440
                $(MANDIR)/man8/splashy.8mandos.gz \
408
441
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
409
442
                $(MANDIR)/man8/plymouth.8mandos.gz \
410
 
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
411
 
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
 
443
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
 
444
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
412
445
        update-initramfs -k all -u
413
446
 
414
447
purge: purge-server purge-client
418
451
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
419
452
                $(DESTDIR)/etc/default/mandos \
420
453
                $(DESTDIR)/etc/init.d/mandos \
 
454
                $(SYSTEMD)/mandos.service \
 
455
                $(DESTDIR)/run/mandos.pid \
421
456
                $(DESTDIR)/var/run/mandos.pid
422
457
        -rmdir $(CONFDIR)
423
458