/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-06-23 15:13:06 UTC
  • Revision ID: teddy@recompile.se-20130623151306-3y4zwy76d95hcvpq
* mandos: Bug fix: Make boolean options work from the config file
          again.
          Bug fix: Make --no-ipv6 work again.
          Bug fix: Add extra magic to GnuTLS priority to make it work
          with current version of GnuTLS.
* mandos-options.xml (priority): Document new default value.
* mandos.conf (priority): - '' -
* plugins.d/mandos-client.xml (EXAMPLE): Minor grammar fix.

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.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
 
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
35
39
##
36
40
 
37
41
## These settings are for a package-type install
40
44
KEYDIR=$(DESTDIR)/etc/keys/mandos
41
45
MANDIR=$(PREFIX)/share/man
42
46
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
 
47
STATEDIR=$(DESTDIR)/var/lib/mandos
43
48
##
44
49
 
45
50
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
54
59
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
55
60
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
56
61
        -DVERSION='"$(version)"'
57
 
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
62
LDFLAGS=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
58
63
 
59
64
# Commands to format a DocBook <refentry> document into a manual page
60
65
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
63
68
        --param make.single.year.ranges         1 \
64
69
        --param man.output.quietly              1 \
65
70
        --param man.authors.section.enabled     0 \
66
 
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
 
71
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
67
72
        $(notdir $<); \
68
 
        $(MANPOST) $(notdir $@))
 
73
        $(MANPOST) $(notdir $@);\
 
74
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
 
75
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
 
76
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
 
77
        fi >/dev/null)
69
78
# DocBook-to-man post-processing to fix a '\n' escape bug
70
79
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
71
80
 
87
96
        plugins.d/plymouth
88
97
CPROGS=plugin-runner $(PLUGINS)
89
98
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
90
 
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
91
 
        mandos-monitor.8 \
 
99
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
 
100
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
92
101
        plugins.d/mandos-client.8mandos \
93
 
        plugins.d/password-prompt.8mandos mandos.conf.5 \
94
 
        plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
95
 
        plugins.d/askpass-fifo.8mandos mandos-clients.conf.5
 
102
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
 
103
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
 
104
        plugins.d/plymouth.8mandos intro.8mandos
96
105
 
97
106
htmldocs=$(addsuffix .xhtml,$(DOCS))
98
107
 
119
128
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
120
129
        $(DOCBOOKTOHTML)
121
130
 
 
131
intro.8mandos: intro.xml common.ent legalnotice.xml
 
132
        $(DOCBOOKTOMAN)
 
133
intro.8mandos.xhtml: intro.xml common.ent legalnotice.xml
 
134
        $(DOCBOOKTOHTML)
 
135
 
122
136
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
123
137
                legalnotice.xml
124
138
        $(DOCBOOKTOMAN)
140
154
                 legalnotice.xml
141
155
        $(DOCBOOKTOHTML)
142
156
 
 
157
mandos-ctl.8: mandos-ctl.xml common.ent overview.xml \
 
158
                legalnotice.xml
 
159
        $(DOCBOOKTOMAN)
 
160
mandos-ctl.8.xhtml: mandos-ctl.xml common.ent overview.xml \
 
161
                 legalnotice.xml
 
162
        $(DOCBOOKTOHTML)
 
163
 
143
164
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
144
165
                legalnotice.xml
145
166
        $(DOCBOOKTOMAN)
203
224
                $@)
204
225
 
205
226
plugins.d/mandos-client: plugins.d/mandos-client.c
206
 
        $(LINK.c) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) $(strip\
207
 
                ) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
227
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
 
228
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
208
229
 
209
230
.PHONY : all doc html clean distclean run-client run-server install \
210
231
        install-server install-client uninstall uninstall-server \
216
237
distclean: clean
217
238
mostlyclean: clean
218
239
maintainer-clean: clean
219
 
        -rm --force --recursive keydir confdir
 
240
        -rm --force --recursive keydir confdir statedir
220
241
 
221
242
check:  all
222
243
        ./mandos --check
 
244
        ./mandos-ctl --check
223
245
 
224
246
# Run the client with a local config and key
225
247
run-client: all keydir/seckey.txt keydir/pubkey.txt
236
258
        @echo "###################################################################"
237
259
        ./plugin-runner --plugin-dir=plugins.d \
238
260
                --config-file=plugin-runner.conf \
239
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
 
261
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
240
262
                $(CLIENTARGS)
241
263
 
242
264
# Used by run-client
245
267
        ./mandos-keygen --dir keydir --force
246
268
 
247
269
# Run the server with a local config
248
 
run-server: confdir/mandos.conf confdir/clients.conf
249
 
        @echo "#################################################################"
250
 
        @echo "# NOTE: Please IGNORE the error about \"Could not open file      #"
251
 
        @echo "# u'/var/run/mandos.pid'\" -  it is harmless and is caused by    #"
252
 
        @echo "# the server not running as root.  Do NOT run \"make run-server\" #"
253
 
        @echo "# server as root if you didn't also unpack and compile it thus. #"
254
 
        @echo "#################################################################"
255
 
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
 
270
run-server: confdir/mandos.conf confdir/clients.conf statedir
 
271
        ./mandos --debug --no-dbus --configdir=confdir \
 
272
                --statedir=statedir $(SERVERARGS)
256
273
 
257
274
# Used by run-server
258
275
confdir/mandos.conf: mandos.conf
263
280
        install --mode=u=rw $< $@
264
281
# Add a client password
265
282
        ./mandos-keygen --dir keydir --password >> $@
 
283
statedir:
 
284
        install --directory statedir
266
285
 
267
286
install: install-server install-client-nokey
268
287
 
273
292
 
274
293
install-server: doc
275
294
        install --directory $(CONFDIR)
 
295
        install --directory --mode=u=rwx --owner=$(USER) \
 
296
                --group=$(GROUP) $(STATEDIR)
276
297
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
277
298
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
278
299
                mandos-ctl
293
314
        fi
294
315
        gzip --best --to-stdout mandos.8 \
295
316
                > $(MANDIR)/man8/mandos.8.gz
 
317
        gzip --best --to-stdout mandos-monitor.8 \
 
318
                > $(MANDIR)/man8/mandos-monitor.8.gz
 
319
        gzip --best --to-stdout mandos-ctl.8 \
 
320
                > $(MANDIR)/man8/mandos-ctl.8.gz
296
321
        gzip --best --to-stdout mandos.conf.5 \
297
322
                > $(MANDIR)/man5/mandos.conf.5.gz
298
323
        gzip --best --to-stdout mandos-clients.conf.5 \
299
324
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
 
325
        gzip --best --to-stdout intro.8mandos \
 
326
                > $(MANDIR)/man8/intro.8mandos.gz
300
327
 
301
328
install-client-nokey: all doc
302
329
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
306
333
                install --mode=u=rwx \
307
334
                        --directory "$(CONFDIR)/plugins.d"; \
308
335
        fi
 
336
        install --mode=u=rwx,go=rx --directory \
 
337
                "$(CONFDIR)/network-hooks.d"
309
338
        install --mode=u=rwx,go=rx \
310
339
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
311
340
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
339
368
                > $(MANDIR)/man8/mandos-keygen.8.gz
340
369
        gzip --best --to-stdout plugin-runner.8mandos \
341
370
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
371
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
 
372
                > $(MANDIR)/man8/mandos-client.8mandos.gz
342
373
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
343
374
                > $(MANDIR)/man8/password-prompt.8mandos.gz
344
 
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
345
 
                > $(MANDIR)/man8/mandos-client.8mandos.gz
346
375
        gzip --best --to-stdout plugins.d/usplash.8mandos \
347
376
                > $(MANDIR)/man8/usplash.8mandos.gz
348
377
        gzip --best --to-stdout plugins.d/splashy.8mandos \
349
378
                > $(MANDIR)/man8/splashy.8mandos.gz
350
379
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
351
380
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
 
381
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
 
382
                > $(MANDIR)/man8/plymouth.8mandos.gz
352
383
 
353
384
install-client: install-client-nokey
354
385
# Post-installation stuff
363
394
                $(PREFIX)/sbin/mandos-ctl \
364
395
                $(PREFIX)/sbin/mandos-monitor \
365
396
                $(MANDIR)/man8/mandos.8.gz \
 
397
                $(MANDIR)/man8/mandos-monitor.8.gz \
 
398
                $(MANDIR)/man8/mandos-ctl.8.gz \
366
399
                $(MANDIR)/man5/mandos.conf.5.gz \
367
400
                $(MANDIR)/man5/mandos-clients.conf.5.gz
368
401
        update-rc.d -f mandos remove
384
417
                $(INITRAMFSTOOLS)/hooks/mandos \
385
418
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
386
419
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
420
                $(MANDIR)/man8/mandos-keygen.8.gz \
387
421
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
388
 
                $(MANDIR)/man8/mandos-keygen.8.gz \
 
422
                $(MANDIR)/man8/mandos-client.8mandos.gz
389
423
                $(MANDIR)/man8/password-prompt.8mandos.gz \
390
424
                $(MANDIR)/man8/usplash.8mandos.gz \
391
425
                $(MANDIR)/man8/splashy.8mandos.gz \
392
426
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
393
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
 
427
                $(MANDIR)/man8/plymouth.8mandos.gz \
394
428
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
395
429
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
396
430
        update-initramfs -k all -u