/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to Makefile

* mandos-clients.conf.xml (OPTIONS): Moved up "extended_timeout" to
                                     order options alphabetically.
* clients.conf: Language change in comment.

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.4
 
26
version=1.3.1
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=-Xlinker --as-needed $(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
 
249
228
distclean: clean
250
229
mostlyclean: clean
251
230
maintainer-clean: clean
252
 
        -rm --force --recursive keydir confdir statedir
 
231
        -rm --force --recursive keydir confdir
253
232
 
254
233
check:  all
255
234
        ./mandos --check
256
 
        ./mandos-ctl --check
257
235
 
258
236
# Run the client with a local config and key
259
237
run-client: all keydir/seckey.txt keydir/pubkey.txt
270
248
        @echo "###################################################################"
271
249
        ./plugin-runner --plugin-dir=plugins.d \
272
250
                --config-file=plugin-runner.conf \
273
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
 
251
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
274
252
                $(CLIENTARGS)
275
253
 
276
254
# Used by run-client
279
257
        ./mandos-keygen --dir keydir --force
280
258
 
281
259
# 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)
 
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)
285
268
 
286
269
# Used by run-server
287
270
confdir/mandos.conf: mandos.conf
292
275
        install --mode=u=rw $< $@
293
276
# Add a client password
294
277
        ./mandos-keygen --dir keydir --password >> $@
295
 
statedir:
296
 
        install --directory statedir
297
278
 
298
279
install: install-server install-client-nokey
299
280
 
304
285
 
305
286
install-server: doc
306
287
        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
288
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
314
289
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
315
290
                mandos-ctl
323
298
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
324
299
        install --mode=u=rwx,go=rx init.d-mandos \
325
300
                $(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
301
        install --mode=u=rw,go=r default-mandos \
330
302
                $(DESTDIR)/etc/default/mandos
331
303
        if [ -z $(DESTDIR) ]; then \
341
313
                > $(MANDIR)/man5/mandos.conf.5.gz
342
314
        gzip --best --to-stdout mandos-clients.conf.5 \
343
315
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
344
 
        gzip --best --to-stdout intro.8mandos \
345
 
                > $(MANDIR)/man8/intro.8mandos.gz
346
316
 
347
317
install-client-nokey: all doc
348
 
        install --directory $(LIBDIR)/mandos $(CONFDIR)
 
318
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
349
319
        install --directory --mode=u=rwx $(KEYDIR) \
350
 
                $(LIBDIR)/mandos/plugins.d
351
 
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
 
320
                $(PREFIX)/lib/mandos/plugins.d
 
321
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
352
322
                install --mode=u=rwx \
353
323
                        --directory "$(CONFDIR)/plugins.d"; \
354
324
        fi
355
 
        install --mode=u=rwx,go=rx --directory \
356
 
                "$(CONFDIR)/network-hooks.d"
357
325
        install --mode=u=rwx,go=rx \
358
 
                --target-directory=$(LIBDIR)/mandos plugin-runner
 
326
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
359
327
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
360
328
                mandos-keygen
361
329
        install --mode=u=rwx,go=rx \
362
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
330
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
363
331
                plugins.d/password-prompt
364
332
        install --mode=u=rwxs,go=rx \
365
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
333
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
366
334
                plugins.d/mandos-client
367
335
        install --mode=u=rwxs,go=rx \
368
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
336
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
369
337
                plugins.d/usplash
370
338
        install --mode=u=rwxs,go=rx \
371
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
339
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
372
340
                plugins.d/splashy
373
341
        install --mode=u=rwxs,go=rx \
374
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
342
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
375
343
                plugins.d/askpass-fifo
376
344
        install --mode=u=rwxs,go=rx \
377
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
345
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
378
346
                plugins.d/plymouth
379
347
        install initramfs-tools-hook \
380
348
                $(INITRAMFSTOOLS)/hooks/mandos
426
394
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
427
395
                $(DESTDIR)/etc/crypttab
428
396
        -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 \
 
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 \
436
404
                $(INITRAMFSTOOLS)/hooks/mandos \
437
405
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
438
406
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
444
412
                $(MANDIR)/man8/splashy.8mandos.gz \
445
413
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
446
414
                $(MANDIR)/man8/plymouth.8mandos.gz \
447
 
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
448
 
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
 
415
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
 
416
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
449
417
        update-initramfs -k all -u
450
418
 
451
419
purge: purge-server purge-client
455
423
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
456
424
                $(DESTDIR)/etc/default/mandos \
457
425
                $(DESTDIR)/etc/init.d/mandos \
458
 
                $(SYSTEMD)/mandos.service \
459
 
                $(DESTDIR)/run/mandos.pid \
460
426
                $(DESTDIR)/var/run/mandos.pid
461
427
        -rmdir $(CONFDIR)
462
428