/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: 2023-02-07 19:29:28 UTC
  • Revision ID: teddy@recompile.se-20230207192928-ueasjbsufb92o6ud
Clarify documentation and a comment about GnuTLS versions

* clients.conf ([foo]/secret): In the comment for the example client's
  "secret" setting, clarify GnuTLS version conditions.
* mandos-clients.conf.xml (OPTIONS/fingerprint, OPTIONS/key_id):
  Clarify required/optional status under different GnuTLS versions.

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=3 -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.15
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 \
111
108
 
112
109
# Do not change these two
113
110
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
114
 
        $(LANGUAGE) -DVERSION='"$(version)"'
 
111
        $(LANGUAGE) $(FEATURES) -DVERSION='"$(version)"'
115
112
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(strip \
116
113
        ) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
117
114
 
289
286
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
290
287
                $@)
291
288
 
292
 
# Does the linker support the --no-warn-execstack option?
293
 
ifeq ($(shell echo 'int main(){}'|$(CC) --language=c /dev/stdin -o /dev/null -Xlinker --no-warn-execstack && echo yes),yes)
294
 
# These programs use nested functions, which uses an executable stack
295
 
plugin-runner: LDFLAGS += -Xlinker --no-warn-execstack
296
 
dracut-module/password-agent: LDFLAGS += -Xlinker --no-warn-execstack
297
 
plugins.d/password-prompt: LDFLAGS += -Xlinker --no-warn-execstack
298
 
plugins.d/mandos-client: LDFLAGS += -Xlinker --no-warn-execstack
299
 
plugins.d/plymouth: LDFLAGS += -Xlinker --no-warn-execstack
300
 
endif
301
 
 
302
289
# Need to add the GnuTLS, Avahi and GPGME libraries
303
290
plugins.d/mandos-client: CFLAGS += $(GNUTLS_CFLAGS) $(strip \
304
291
        ) $(AVAHI_CFLAGS) $(GPGME_CFLAGS)
385
372
 
386
373
# Used by run-server
387
374
confdir/mandos.conf: mandos.conf
388
 
        install -D --mode=u=rw,go=r $^ $@
 
375
        install --directory confdir
 
376
        install --mode=u=rw,go=r $^ $@
389
377
confdir/clients.conf: clients.conf keydir/seckey.txt keydir/tls-pubkey.pem
390
 
        install -D --mode=u=rw $< $@
 
378
        install --directory confdir
 
379
        install --mode=u=rw $< $@
391
380
# Add a client password
392
381
        ./mandos-keygen --dir keydir --password --no-ssh >> $@
393
382
statedir:
398
387
 
399
388
.PHONY: install-html
400
389
install-html: html
401
 
        install -D --mode=u=rw,go=r --target-directory=$(htmldir) \
 
390
        install --directory $(htmldir)
 
391
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
402
392
                $(htmldocs)
403
393
 
404
394
.PHONY: install-server
405
395
install-server: doc
 
396
        install --directory $(CONFDIR)
406
397
        if install --directory --mode=u=rwx --owner=$(USER) \
407
398
                --group=$(GROUP) $(STATEDIR); then \
408
399
                :; \
409
400
        elif install --directory --mode=u=rwx $(STATEDIR); then \
410
401
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
411
402
        fi
412
 
        if [ "$(TMPFILES)" != "$(DESTDIR)" ]; then \
413
 
                install -D --mode=u=rw,go=r tmpfiles.d-mandos.conf \
 
403
        if [ "$(TMPFILES)" != "$(DESTDIR)" \
 
404
                        -a -d "$(TMPFILES)" ]; then \
 
405
                install --mode=u=rw,go=r tmpfiles.d-mandos.conf \
414
406
                        $(TMPFILES)/mandos.conf; \
415
407
        fi
416
 
        if [ "$(SYSUSERS)" != "$(DESTDIR)" ]; then \
417
 
                install -D --mode=u=rw,go=r sysusers.d-mandos.conf \
 
408
        if [ "$(SYSUSERS)" != "$(DESTDIR)" \
 
409
                        -a -d "$(SYSUSERS)" ]; then \
 
410
                install --mode=u=rw,go=r sysusers.d-mandos.conf \
418
411
                        $(SYSUSERS)/mandos.conf; \
419
412
        fi
420
 
        install --directory $(PREFIX)/sbin
421
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
422
 
                mandos
 
413
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
423
414
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
424
415
                mandos-ctl
425
416
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
426
417
                mandos-monitor
427
 
        install --directory $(CONFDIR)
428
418
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
429
419
                mandos.conf
430
420
        install --mode=u=rw --target-directory=$(CONFDIR) \
431
421
                clients.conf
432
 
        install -D --mode=u=rw,go=r dbus-mandos.conf \
433
 
                $(DBUSPOLICYDIR)/mandos.conf
434
 
        install -D --mode=u=rwx,go=rx init.d-mandos \
 
422
        install --mode=u=rw,go=r dbus-mandos.conf \
 
423
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
 
424
        install --mode=u=rwx,go=rx init.d-mandos \
435
425
                $(DESTDIR)/etc/init.d/mandos
436
 
        if [ "$(SYSTEMD)" != "$(DESTDIR)" ]; then \
437
 
                install -D --mode=u=rw,go=r mandos.service \
438
 
                        $(SYSTEMD); \
 
426
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
 
427
                install --mode=u=rw,go=r mandos.service $(SYSTEMD); \
439
428
        fi
440
 
        install -D --mode=u=rw,go=r default-mandos \
 
429
        install --mode=u=rw,go=r default-mandos \
441
430
                $(DESTDIR)/etc/default/mandos
442
431
        if [ -z $(DESTDIR) ]; then \
443
432
                update-rc.d mandos defaults 25 15;\
444
433
        fi
445
 
        install --directory $(MANDIR)/man8 $(MANDIR)/man5
446
434
        gzip --best --to-stdout mandos.8 \
447
435
                > $(MANDIR)/man8/mandos.8.gz
448
436
        gzip --best --to-stdout mandos-monitor.8 \
458
446
 
459
447
.PHONY: install-client-nokey
460
448
install-client-nokey: all doc
 
449
        install --directory $(LIBDIR)/mandos $(CONFDIR)
461
450
        install --directory --mode=u=rwx $(KEYDIR) \
462
451
                $(LIBDIR)/mandos/plugins.d \
463
452
                $(LIBDIR)/mandos/plugin-helpers
464
 
        if [ "$(SYSUSERS)" != "$(DESTDIR)" ]; then \
465
 
                install -D --mode=u=rw,go=r sysusers.d-mandos.conf \
 
453
        if [ "$(SYSUSERS)" != "$(DESTDIR)" \
 
454
                        -a -d "$(SYSUSERS)" ]; then \
 
455
                install --mode=u=rw,go=r sysusers.d-mandos.conf \
466
456
                        $(SYSUSERS)/mandos-client.conf; \
467
457
        fi
468
458
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
469
 
                install --directory \
470
 
                        --mode=u=rwx "$(CONFDIR)/plugins.d" \
 
459
                install --mode=u=rwx \
 
460
                        --directory "$(CONFDIR)/plugins.d" \
471
461
                        "$(CONFDIR)/plugin-helpers"; \
472
462
        fi
473
 
        install --directory --mode=u=rwx,go=rx \
 
463
        install --mode=u=rwx,go=rx --directory \
474
464
                "$(CONFDIR)/network-hooks.d"
475
465
        install --mode=u=rwx,go=rx \
476
466
                --target-directory=$(LIBDIR)/mandos plugin-runner
477
467
        install --mode=u=rwx,go=rx \
478
468
                --target-directory=$(LIBDIR)/mandos \
479
469
                mandos-to-cryptroot-unlock
480
 
        install --directory $(PREFIX)/sbin
481
470
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
482
471
                mandos-keygen
483
472
        install --mode=u=rwx,go=rx \
501
490
        install --mode=u=rwx,go=rx \
502
491
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
503
492
                plugin-helpers/mandos-client-iprouteadddel
504
 
        install -D initramfs-tools-hook \
 
493
        install initramfs-tools-hook \
505
494
                $(INITRAMFSTOOLS)/hooks/mandos
506
 
        install -D --mode=u=rw,go=r initramfs-tools-conf \
 
495
        install --mode=u=rw,go=r initramfs-tools-conf \
507
496
                $(INITRAMFSTOOLS)/conf.d/mandos-conf
508
 
        install -D --mode=u=rw,go=r initramfs-tools-conf-hook \
 
497
        install --mode=u=rw,go=r initramfs-tools-conf-hook \
509
498
                $(INITRAMFSTOOLS)/conf-hooks.d/zz-mandos
510
 
        install -D initramfs-tools-script \
 
499
        install initramfs-tools-script \
511
500
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
512
 
        install -D initramfs-tools-script-stop \
 
501
        install initramfs-tools-script-stop \
513
502
                $(INITRAMFSTOOLS)/scripts/local-premount/mandos
514
 
        install -D --mode=u=rw,go=r \
515
 
                --target-directory=$(DRACUTMODULE) \
 
503
        install --directory $(DRACUTMODULE)
 
504
        install --mode=u=rw,go=r --target-directory=$(DRACUTMODULE) \
516
505
                dracut-module/ask-password-mandos.path \
517
506
                dracut-module/ask-password-mandos.service
518
507
        install --mode=u=rwxs,go=rx \
521
510
                dracut-module/cmdline-mandos.sh \
522
511
                dracut-module/password-agent
523
512
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
524
 
        install --directory $(MANDIR)/man8
525
513
        gzip --best --to-stdout mandos-keygen.8 \
526
514
                > $(MANDIR)/man8/mandos-keygen.8.gz
527
515
        gzip --best --to-stdout plugin-runner.8mandos \
624
612
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
625
613
                $(DESTDIR)/etc/default/mandos \
626
614
                $(DESTDIR)/etc/init.d/mandos \
 
615
                $(SYSTEMD)/mandos.service \
627
616
                $(DESTDIR)/run/mandos.pid \
628
617
                $(DESTDIR)/var/run/mandos.pid
629
 
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
630
 
                -rm --force -- $(SYSTEMD)/mandos.service; \
631
 
        fi
632
618
        -rmdir $(CONFDIR)
633
619
 
634
620
.PHONY: purge-client