/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: 2019-08-18 00:42:22 UTC
  • Revision ID: teddy@recompile.se-20190818004222-lfrgtnmqz766a08e
Client: Use the systemd sysusers.d mechanism, if present

* Makefile (install-client-nokey): Also install sysusers.d file, if
                                   $(SYSUSERS) exists.
* sysusers.d-mandos.conf: Adjust comment to match reality.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
29
29
 
30
30
# For info about _FORTIFY_SOURCE, see feature_test_macros(7)
31
31
# and <https://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
32
 
FORTIFY:=-fstack-protector-all -fPIC
33
 
CPPFLAGS+=-D_FORTIFY_SOURCE=3
 
32
FORTIFY:=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
34
33
LINK_FORTIFY_LD:=-z relro -z now
35
34
LINK_FORTIFY:=
36
35
 
42
41
#COVERAGE=--coverage
43
42
OPTIMIZE:=-Os -fno-strict-aliasing
44
43
LANGUAGE:=-std=gnu11
45
 
CPPFLAGS+=-D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64
 
44
FEATURES:=-D_FILE_OFFSET_BITS=64
46
45
htmldir:=man
47
 
version:=1.8.16
 
46
version:=1.8.7
48
47
SED:=sed
49
48
PKG_CONFIG?=pkg-config
50
49
 
64
63
# DRACUTMODULE:=$(DESTDIR)/usr/lib/dracut/modules.d/90mandos
65
64
# STATEDIR:=$(DESTDIR)/var/lib/mandos
66
65
# LIBDIR:=$(PREFIX)/lib
67
 
# DBUSPOLICYDIR:=$(DESTDIR)/etc/dbus-1/system.d
68
66
##
69
67
 
70
68
## These settings are for a package-type install
85
83
                        break; \
86
84
                fi; \
87
85
        done)
88
 
DBUSPOLICYDIR:=$(DESTDIR)/usr/share/dbus-1/system.d
89
86
##
90
87
 
91
88
SYSTEMD:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
99
96
GNUTLS_LIBS:=$(shell $(PKG_CONFIG) --libs gnutls)
100
97
AVAHI_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I avahi-core)
101
98
AVAHI_LIBS:=$(shell $(PKG_CONFIG) --libs avahi-core)
102
 
GPGME_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I gpgme 2>/dev/null \
103
 
        || gpgme-config --cflags; getconf LFS_CFLAGS)
104
 
GPGME_LIBS:=$(shell $(PKG_CONFIG) --libs gpgme 2>/dev/null \
105
 
        || gpgme-config --libs; getconf LFS_LIBS; \
 
99
GPGME_CFLAGS:=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
 
100
GPGME_LIBS:=$(shell gpgme-config --libs; getconf LFS_LIBS; \
106
101
        getconf LFS_LDFLAGS)
107
102
LIBNL3_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I libnl-route-3.0)
108
103
LIBNL3_LIBS:=$(shell $(PKG_CONFIG) --libs libnl-route-3.0)
111
106
 
112
107
# Do not change these two
113
108
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
114
 
        $(LANGUAGE) -DVERSION='"$(version)"'
 
109
        $(LANGUAGE) $(FEATURES) -DVERSION='"$(version)"'
115
110
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(strip \
116
111
        ) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
117
112
 
161
156
 
162
157
objects:=$(addsuffix .o,$(CPROGS))
163
158
 
164
 
.PHONY: all
165
159
all: $(PROGS) mandos.lsm
166
160
 
167
 
.PHONY: doc
168
161
doc: $(DOCS)
169
162
 
170
 
.PHONY: html
171
163
html: $(htmldocs)
172
164
 
173
165
%.5: %.xml common.ent legalnotice.xml
290
282
                $@)
291
283
 
292
284
# Need to add the GnuTLS, Avahi and GPGME libraries
293
 
plugins.d/mandos-client: CFLAGS += $(GNUTLS_CFLAGS) $(strip \
294
 
        ) $(AVAHI_CFLAGS) $(GPGME_CFLAGS)
295
 
plugins.d/mandos-client: LDLIBS += $(GNUTLS_LIBS) $(strip \
296
 
        ) $(AVAHI_LIBS) $(GPGME_LIBS)
 
285
plugins.d/mandos-client: plugins.d/mandos-client.c
 
286
        $(LINK.c) $^ $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(strip\
 
287
                ) $(GPGME_CFLAGS) $(GNUTLS_LIBS) $(strip\
 
288
                ) $(AVAHI_LIBS) $(GPGME_LIBS) $(LOADLIBES) $(strip\
 
289
                ) $(LDLIBS) -o $@
297
290
 
298
291
# Need to add the libnl-route library
299
 
plugin-helpers/mandos-client-iprouteadddel: CFLAGS += $(LIBNL3_CFLAGS)
300
 
plugin-helpers/mandos-client-iprouteadddel: LDLIBS += $(LIBNL3_LIBS)
 
292
plugin-helpers/mandos-client-iprouteadddel: plugin-helpers/mandos-client-iprouteadddel.c
 
293
        $(LINK.c) $(LIBNL3_CFLAGS) $^ $(LIBNL3_LIBS) $(strip\
 
294
                ) $(LOADLIBES) $(LDLIBS) -o $@
301
295
 
302
296
# Need to add the GLib and pthread libraries
303
 
dracut-module/password-agent: CFLAGS += $(GLIB_CFLAGS)
304
 
# Note: -lpthread is unnecessary with the GNU C library 2.34 or later
305
 
dracut-module/password-agent: LDLIBS += $(GLIB_LIBS) -lpthread
306
 
 
307
 
.PHONY: clean
 
297
dracut-module/password-agent: dracut-module/password-agent.c
 
298
        $(LINK.c) $(GLIB_CFLAGS) $^ $(GLIB_LIBS) -lpthread $(strip\
 
299
                ) $(LOADLIBES) $(LDLIBS) -o $@
 
300
 
 
301
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
 
302
        check run-client run-server install install-html \
 
303
        install-server install-client-nokey install-client uninstall \
 
304
        uninstall-server uninstall-client purge purge-server \
 
305
        purge-client
 
306
 
308
307
clean:
309
308
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
310
309
 
311
 
.PHONY: distclean
312
310
distclean: clean
313
 
.PHONY: mostlyclean
314
311
mostlyclean: clean
315
 
.PHONY: maintainer-clean
316
312
maintainer-clean: clean
317
313
        -rm --force --recursive keydir confdir statedir
318
314
 
319
 
.PHONY: check
320
315
check: all
321
316
        ./mandos --check
322
317
        ./mandos-ctl --check
326
321
        ./dracut-module/password-agent --test
327
322
 
328
323
# Run the client with a local config and key
329
 
.PHONY: run-client
330
324
run-client: all keydir/seckey.txt keydir/pubkey.txt \
331
325
                        keydir/tls-privkey.pem keydir/tls-pubkey.pem
332
326
        @echo '######################################################'
360
354
keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem: mandos-keygen
361
355
        install --directory keydir
362
356
        ./mandos-keygen --dir keydir --force
363
 
        if ! [ -e keydir/tls-privkey.pem ]; then \
364
 
                install --mode=u=rw /dev/null keydir/tls-privkey.pem; \
365
 
        fi
366
 
        if ! [ -e keydir/tls-pubkey.pem ]; then \
367
 
                install --mode=u=rw /dev/null keydir/tls-pubkey.pem; \
368
 
        fi
369
357
 
370
358
# Run the server with a local config
371
 
.PHONY: run-server
372
359
run-server: confdir/mandos.conf confdir/clients.conf statedir
373
360
        ./mandos --debug --no-dbus --configdir=confdir \
374
361
                --statedir=statedir $(SERVERARGS)
375
362
 
376
363
# Used by run-server
377
364
confdir/mandos.conf: mandos.conf
378
 
        install -D --mode=u=rw,go=r $^ $@
 
365
        install --directory confdir
 
366
        install --mode=u=rw,go=r $^ $@
379
367
confdir/clients.conf: clients.conf keydir/seckey.txt keydir/tls-pubkey.pem
380
 
        install -D --mode=u=rw $< $@
 
368
        install --directory confdir
 
369
        install --mode=u=rw $< $@
381
370
# Add a client password
382
371
        ./mandos-keygen --dir keydir --password --no-ssh >> $@
383
372
statedir:
384
373
        install --directory statedir
385
374
 
386
 
.PHONY: install
387
375
install: install-server install-client-nokey
388
376
 
389
 
.PHONY: install-html
390
377
install-html: html
391
 
        install -D --mode=u=rw,go=r --target-directory=$(htmldir) \
 
378
        install --directory $(htmldir)
 
379
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
392
380
                $(htmldocs)
393
381
 
394
 
.PHONY: install-server
395
382
install-server: doc
 
383
        install --directory $(CONFDIR)
396
384
        if install --directory --mode=u=rwx --owner=$(USER) \
397
385
                --group=$(GROUP) $(STATEDIR); then \
398
386
                :; \
399
387
        elif install --directory --mode=u=rwx $(STATEDIR); then \
400
388
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
401
389
        fi
402
 
        if [ "$(TMPFILES)" != "$(DESTDIR)" ]; then \
403
 
                install -D --mode=u=rw,go=r tmpfiles.d-mandos.conf \
 
390
        if [ "$(TMPFILES)" != "$(DESTDIR)" \
 
391
                        -a -d "$(TMPFILES)" ]; then \
 
392
                install --mode=u=rw,go=r tmpfiles.d-mandos.conf \
404
393
                        $(TMPFILES)/mandos.conf; \
405
394
        fi
406
 
        if [ "$(SYSUSERS)" != "$(DESTDIR)" ]; then \
407
 
                install -D --mode=u=rw,go=r sysusers.d-mandos.conf \
 
395
        if [ "$(SYSUSERS)" != "$(DESTDIR)" \
 
396
                        -a -d "$(SYSUSERS)" ]; then \
 
397
                install --mode=u=rw,go=r sysusers.d-mandos.conf \
408
398
                        $(SYSUSERS)/mandos.conf; \
409
399
        fi
410
 
        install --directory $(PREFIX)/sbin
411
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
412
 
                mandos
 
400
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
413
401
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
414
402
                mandos-ctl
415
403
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
416
404
                mandos-monitor
417
 
        install --directory $(CONFDIR)
418
405
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
419
406
                mandos.conf
420
407
        install --mode=u=rw --target-directory=$(CONFDIR) \
421
408
                clients.conf
422
 
        install -D --mode=u=rw,go=r dbus-mandos.conf \
423
 
                $(DBUSPOLICYDIR)/mandos.conf
424
 
        install -D --mode=u=rwx,go=rx init.d-mandos \
 
409
        install --mode=u=rw,go=r dbus-mandos.conf \
 
410
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
 
411
        install --mode=u=rwx,go=rx init.d-mandos \
425
412
                $(DESTDIR)/etc/init.d/mandos
426
 
        if [ "$(SYSTEMD)" != "$(DESTDIR)" ]; then \
427
 
                install -D --mode=u=rw,go=r mandos.service \
428
 
                        $(SYSTEMD); \
 
413
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
 
414
                install --mode=u=rw,go=r mandos.service $(SYSTEMD); \
429
415
        fi
430
 
        install -D --mode=u=rw,go=r default-mandos \
 
416
        install --mode=u=rw,go=r default-mandos \
431
417
                $(DESTDIR)/etc/default/mandos
432
418
        if [ -z $(DESTDIR) ]; then \
433
419
                update-rc.d mandos defaults 25 15;\
434
420
        fi
435
 
        install --directory $(MANDIR)/man8 $(MANDIR)/man5
436
421
        gzip --best --to-stdout mandos.8 \
437
422
                > $(MANDIR)/man8/mandos.8.gz
438
423
        gzip --best --to-stdout mandos-monitor.8 \
446
431
        gzip --best --to-stdout intro.8mandos \
447
432
                > $(MANDIR)/man8/intro.8mandos.gz
448
433
 
449
 
.PHONY: install-client-nokey
450
434
install-client-nokey: all doc
 
435
        install --directory $(LIBDIR)/mandos $(CONFDIR)
451
436
        install --directory --mode=u=rwx $(KEYDIR) \
452
437
                $(LIBDIR)/mandos/plugins.d \
453
438
                $(LIBDIR)/mandos/plugin-helpers
454
 
        if [ "$(SYSUSERS)" != "$(DESTDIR)" ]; then \
455
 
                install -D --mode=u=rw,go=r sysusers.d-mandos.conf \
 
439
        if [ "$(SYSUSERS)" != "$(DESTDIR)" \
 
440
                        -a -d "$(SYSUSERS)" ]; then \
 
441
                install --mode=u=rw,go=r sysusers.d-mandos.conf \
456
442
                        $(SYSUSERS)/mandos-client.conf; \
457
443
        fi
458
444
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
459
 
                install --directory \
460
 
                        --mode=u=rwx "$(CONFDIR)/plugins.d" \
 
445
                install --mode=u=rwx \
 
446
                        --directory "$(CONFDIR)/plugins.d" \
461
447
                        "$(CONFDIR)/plugin-helpers"; \
462
448
        fi
463
 
        install --directory --mode=u=rwx,go=rx \
 
449
        install --mode=u=rwx,go=rx --directory \
464
450
                "$(CONFDIR)/network-hooks.d"
465
451
        install --mode=u=rwx,go=rx \
466
452
                --target-directory=$(LIBDIR)/mandos plugin-runner
467
453
        install --mode=u=rwx,go=rx \
468
454
                --target-directory=$(LIBDIR)/mandos \
469
455
                mandos-to-cryptroot-unlock
470
 
        install --directory $(PREFIX)/sbin
471
456
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
472
457
                mandos-keygen
473
458
        install --mode=u=rwx,go=rx \
491
476
        install --mode=u=rwx,go=rx \
492
477
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
493
478
                plugin-helpers/mandos-client-iprouteadddel
494
 
        install -D initramfs-tools-hook \
 
479
        install initramfs-tools-hook \
495
480
                $(INITRAMFSTOOLS)/hooks/mandos
496
 
        install -D --mode=u=rw,go=r initramfs-tools-conf \
 
481
        install --mode=u=rw,go=r initramfs-tools-conf \
497
482
                $(INITRAMFSTOOLS)/conf.d/mandos-conf
498
 
        install -D --mode=u=rw,go=r initramfs-tools-conf-hook \
 
483
        install --mode=u=rw,go=r initramfs-tools-conf-hook \
499
484
                $(INITRAMFSTOOLS)/conf-hooks.d/zz-mandos
500
 
        install -D initramfs-tools-script \
 
485
        install initramfs-tools-script \
501
486
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
502
 
        install -D initramfs-tools-script-stop \
 
487
        install initramfs-tools-script-stop \
503
488
                $(INITRAMFSTOOLS)/scripts/local-premount/mandos
504
 
        install -D --mode=u=rw,go=r \
505
 
                --target-directory=$(DRACUTMODULE) \
 
489
        install --directory $(DRACUTMODULE)
 
490
        install --mode=u=rw,go=r --target-directory=$(DRACUTMODULE) \
506
491
                dracut-module/ask-password-mandos.path \
507
492
                dracut-module/ask-password-mandos.service
508
493
        install --mode=u=rwxs,go=rx \
511
496
                dracut-module/cmdline-mandos.sh \
512
497
                dracut-module/password-agent
513
498
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
514
 
        install --directory $(MANDIR)/man8
515
499
        gzip --best --to-stdout mandos-keygen.8 \
516
500
                > $(MANDIR)/man8/mandos-keygen.8.gz
517
501
        gzip --best --to-stdout plugin-runner.8mandos \
531
515
        gzip --best --to-stdout dracut-module/password-agent.8mandos \
532
516
                > $(MANDIR)/man8/password-agent.8mandos.gz
533
517
 
534
 
.PHONY: install-client
535
518
install-client: install-client-nokey
536
519
# Post-installation stuff
537
520
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
547
530
        fi
548
531
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
549
532
 
550
 
.PHONY: uninstall
551
533
uninstall: uninstall-server uninstall-client
552
534
 
553
 
.PHONY: uninstall-server
554
535
uninstall-server:
555
536
        -rm --force $(PREFIX)/sbin/mandos \
556
537
                $(PREFIX)/sbin/mandos-ctl \
563
544
        update-rc.d -f mandos remove
564
545
        -rmdir $(CONFDIR)
565
546
 
566
 
.PHONY: uninstall-client
567
547
uninstall-client:
568
548
# Refuse to uninstall client if /etc/crypttab is explicitly configured
569
549
# to use it.
605
585
            done; \
606
586
        fi
607
587
 
608
 
.PHONY: purge
609
588
purge: purge-server purge-client
610
589
 
611
 
.PHONY: purge-server
612
590
purge-server: uninstall-server
613
591
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
614
592
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
615
593
                $(DESTDIR)/etc/default/mandos \
616
594
                $(DESTDIR)/etc/init.d/mandos \
 
595
                $(SYSTEMD)/mandos.service \
617
596
                $(DESTDIR)/run/mandos.pid \
618
597
                $(DESTDIR)/var/run/mandos.pid
619
 
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
620
 
                -rm --force -- $(SYSTEMD)/mandos.service; \
621
 
        fi
622
598
        -rmdir $(CONFDIR)
623
599
 
624
 
.PHONY: purge-client
625
600
purge-client: uninstall-client
626
601
        -shred --remove $(KEYDIR)/seckey.txt $(KEYDIR)/tls-privkey.pem
627
602
        -rm --force $(CONFDIR)/plugin-runner.conf \