/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

  • Committer: Teddy Hogeborn
  • Date: 2013-10-30 21:05:47 UTC
  • mto: (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 307.
  • Revision ID: teddy@recompile.se-20131030210547-f1hoaesur3p3m04z
Don't require /var/lib/mandos to be installed with user & group.

* Makefile (install-server): Don't fail if changing user & group fails.

Reported-by: Nathanael D. Noblet <nathanael@gnat.ca>
Suggested-by: Nathanael D. Noblet <nathanael@gnat.ca>

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