/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: 2011-07-13 01:11:12 UTC
  • Revision ID: teddy@fukt.bsnet.se-20110713011112-bgf3tenqq60uoyyb
* Makefile (plugins.d/mandos-client): Bug fix: Put $^ before all
                                      libraries.  Remove "$(COMMON)".
                                      Thanks to Angel Abad
                                      <angelabad@ubuntu.com>.
* initramfs-tools-script: Work around change in initramfs-tools,
                          Debian bug #633582.
* plugins.d/mandos-client.c (init_gnutls_global): Bug fix: check for
                errors from gnutls_certificate_allocate_credentials().

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