/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: 2024-09-22 17:38:57 UTC
  • mto: This revision was merged to the branch mainline in revision 412.
  • Revision ID: teddy@recompile.se-20240922173857-rfhxneq4207tx9o0
Only use D-Bus when necessary

If *both* "use_dbus" and "zeroconf" are false, by either setting them
to False in mandos.conf or by using the --no-dbus and --no-zeroconf
options (and a port number or socket is specified), then we do not
need to connect to D-Bus at all.

From: Mike Klein <mike@kleinnet.com>
Signed-off-by: Teddy Hogeborn <teddy@recompile.se>

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:=-D_FORTIFY_SOURCE=3 -fstack-protector-all -fPIC
 
32
FORTIFY:=-fstack-protector-all -fPIC
 
33
CPPFLAGS+=-D_FORTIFY_SOURCE=3
33
34
LINK_FORTIFY_LD:=-z relro -z now
34
35
LINK_FORTIFY:=
35
36
 
41
42
#COVERAGE=--coverage
42
43
OPTIMIZE:=-Os -fno-strict-aliasing
43
44
LANGUAGE:=-std=gnu11
44
 
FEATURES:=-D_FILE_OFFSET_BITS=64
 
45
CPPFLAGS+=-D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64
45
46
htmldir:=man
46
 
version:=1.8.15
 
47
version:=1.8.17
47
48
SED:=sed
48
49
PKG_CONFIG?=pkg-config
49
50
 
63
64
# DRACUTMODULE:=$(DESTDIR)/usr/lib/dracut/modules.d/90mandos
64
65
# STATEDIR:=$(DESTDIR)/var/lib/mandos
65
66
# LIBDIR:=$(PREFIX)/lib
 
67
# DBUSPOLICYDIR:=$(DESTDIR)/etc/dbus-1/system.d
66
68
##
67
69
 
68
70
## These settings are for a package-type install
83
85
                        break; \
84
86
                fi; \
85
87
        done)
 
88
DBUSPOLICYDIR:=$(DESTDIR)/usr/share/dbus-1/system.d
86
89
##
87
90
 
88
91
SYSTEMD:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
108
111
 
109
112
# Do not change these two
110
113
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
111
 
        $(LANGUAGE) $(FEATURES) -DVERSION='"$(version)"'
 
114
        $(LANGUAGE) -DVERSION='"$(version)"'
112
115
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(strip \
113
116
        ) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
114
117
 
286
289
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
287
290
                $@)
288
291
 
 
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 >/dev/null 2>&1 && 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
 
289
302
# Need to add the GnuTLS, Avahi and GPGME libraries
290
303
plugins.d/mandos-client: CFLAGS += $(GNUTLS_CFLAGS) $(strip \
291
304
        ) $(AVAHI_CFLAGS) $(GPGME_CFLAGS)
372
385
 
373
386
# Used by run-server
374
387
confdir/mandos.conf: mandos.conf
375
 
        install --directory confdir
376
 
        install --mode=u=rw,go=r $^ $@
 
388
        install -D --mode=u=rw,go=r $^ $@
377
389
confdir/clients.conf: clients.conf keydir/seckey.txt keydir/tls-pubkey.pem
378
 
        install --directory confdir
379
 
        install --mode=u=rw $< $@
 
390
        install -D --mode=u=rw $< $@
380
391
# Add a client password
381
392
        ./mandos-keygen --dir keydir --password --no-ssh >> $@
382
393
statedir:
387
398
 
388
399
.PHONY: install-html
389
400
install-html: html
390
 
        install --directory $(htmldir)
391
 
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
 
401
        install -D --mode=u=rw,go=r --target-directory=$(htmldir) \
392
402
                $(htmldocs)
393
403
 
394
404
.PHONY: install-server
395
405
install-server: doc
396
 
        install --directory $(CONFDIR)
397
406
        if install --directory --mode=u=rwx --owner=$(USER) \
398
407
                --group=$(GROUP) $(STATEDIR); then \
399
408
                :; \
400
409
        elif install --directory --mode=u=rwx $(STATEDIR); then \
401
410
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
402
411
        fi
403
 
        if [ "$(TMPFILES)" != "$(DESTDIR)" \
404
 
                        -a -d "$(TMPFILES)" ]; then \
405
 
                install --mode=u=rw,go=r tmpfiles.d-mandos.conf \
 
412
        if [ "$(TMPFILES)" != "$(DESTDIR)" ]; then \
 
413
                install -D --mode=u=rw,go=r tmpfiles.d-mandos.conf \
406
414
                        $(TMPFILES)/mandos.conf; \
407
415
        fi
408
 
        if [ "$(SYSUSERS)" != "$(DESTDIR)" \
409
 
                        -a -d "$(SYSUSERS)" ]; then \
410
 
                install --mode=u=rw,go=r sysusers.d-mandos.conf \
 
416
        if [ "$(SYSUSERS)" != "$(DESTDIR)" ]; then \
 
417
                install -D --mode=u=rw,go=r sysusers.d-mandos.conf \
411
418
                        $(SYSUSERS)/mandos.conf; \
412
419
        fi
413
 
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
 
420
        install --directory $(PREFIX)/sbin
 
421
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
 
422
                mandos
414
423
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
415
424
                mandos-ctl
416
425
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
417
426
                mandos-monitor
 
427
        install --directory $(CONFDIR)
418
428
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
419
429
                mandos.conf
420
430
        install --mode=u=rw --target-directory=$(CONFDIR) \
421
431
                clients.conf
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 \
 
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 \
425
435
                $(DESTDIR)/etc/init.d/mandos
426
 
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
427
 
                install --mode=u=rw,go=r mandos.service $(SYSTEMD); \
 
436
        if [ "$(SYSTEMD)" != "$(DESTDIR)" ]; then \
 
437
                install -D --mode=u=rw,go=r mandos.service \
 
438
                        $(SYSTEMD); \
428
439
        fi
429
 
        install --mode=u=rw,go=r default-mandos \
 
440
        install -D --mode=u=rw,go=r default-mandos \
430
441
                $(DESTDIR)/etc/default/mandos
431
442
        if [ -z $(DESTDIR) ]; then \
432
443
                update-rc.d mandos defaults 25 15;\
433
444
        fi
 
445
        install --directory $(MANDIR)/man8 $(MANDIR)/man5
434
446
        gzip --best --to-stdout mandos.8 \
435
447
                > $(MANDIR)/man8/mandos.8.gz
436
448
        gzip --best --to-stdout mandos-monitor.8 \
446
458
 
447
459
.PHONY: install-client-nokey
448
460
install-client-nokey: all doc
449
 
        install --directory $(LIBDIR)/mandos $(CONFDIR)
450
461
        install --directory --mode=u=rwx $(KEYDIR) \
451
462
                $(LIBDIR)/mandos/plugins.d \
452
463
                $(LIBDIR)/mandos/plugin-helpers
453
 
        if [ "$(SYSUSERS)" != "$(DESTDIR)" \
454
 
                        -a -d "$(SYSUSERS)" ]; then \
455
 
                install --mode=u=rw,go=r sysusers.d-mandos.conf \
 
464
        if [ "$(SYSUSERS)" != "$(DESTDIR)" ]; then \
 
465
                install -D --mode=u=rw,go=r sysusers.d-mandos.conf \
456
466
                        $(SYSUSERS)/mandos-client.conf; \
457
467
        fi
458
468
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
459
 
                install --mode=u=rwx \
460
 
                        --directory "$(CONFDIR)/plugins.d" \
 
469
                install --directory \
 
470
                        --mode=u=rwx "$(CONFDIR)/plugins.d" \
461
471
                        "$(CONFDIR)/plugin-helpers"; \
462
472
        fi
463
 
        install --mode=u=rwx,go=rx --directory \
 
473
        install --directory --mode=u=rwx,go=rx \
464
474
                "$(CONFDIR)/network-hooks.d"
465
475
        install --mode=u=rwx,go=rx \
466
476
                --target-directory=$(LIBDIR)/mandos plugin-runner
467
477
        install --mode=u=rwx,go=rx \
468
478
                --target-directory=$(LIBDIR)/mandos \
469
479
                mandos-to-cryptroot-unlock
 
480
        install --directory $(PREFIX)/sbin
470
481
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
471
482
                mandos-keygen
472
483
        install --mode=u=rwx,go=rx \
490
501
        install --mode=u=rwx,go=rx \
491
502
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
492
503
                plugin-helpers/mandos-client-iprouteadddel
493
 
        install initramfs-tools-hook \
 
504
        install -D initramfs-tools-hook \
494
505
                $(INITRAMFSTOOLS)/hooks/mandos
495
 
        install --mode=u=rw,go=r initramfs-tools-conf \
 
506
        install -D --mode=u=rw,go=r initramfs-tools-conf \
496
507
                $(INITRAMFSTOOLS)/conf.d/mandos-conf
497
 
        install --mode=u=rw,go=r initramfs-tools-conf-hook \
 
508
        install -D --mode=u=rw,go=r initramfs-tools-conf-hook \
498
509
                $(INITRAMFSTOOLS)/conf-hooks.d/zz-mandos
499
 
        install initramfs-tools-script \
 
510
        install -D initramfs-tools-script \
500
511
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
501
 
        install initramfs-tools-script-stop \
 
512
        install -D initramfs-tools-script-stop \
502
513
                $(INITRAMFSTOOLS)/scripts/local-premount/mandos
503
 
        install --directory $(DRACUTMODULE)
504
 
        install --mode=u=rw,go=r --target-directory=$(DRACUTMODULE) \
 
514
        install -D --mode=u=rw,go=r \
 
515
                --target-directory=$(DRACUTMODULE) \
505
516
                dracut-module/ask-password-mandos.path \
506
517
                dracut-module/ask-password-mandos.service
507
518
        install --mode=u=rwxs,go=rx \
510
521
                dracut-module/cmdline-mandos.sh \
511
522
                dracut-module/password-agent
512
523
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
 
524
        install --directory $(MANDIR)/man8
513
525
        gzip --best --to-stdout mandos-keygen.8 \
514
526
                > $(MANDIR)/man8/mandos-keygen.8.gz
515
527
        gzip --best --to-stdout plugin-runner.8mandos \
612
624
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
613
625
                $(DESTDIR)/etc/default/mandos \
614
626
                $(DESTDIR)/etc/init.d/mandos \
615
 
                $(SYSTEMD)/mandos.service \
616
627
                $(DESTDIR)/run/mandos.pid \
617
628
                $(DESTDIR)/var/run/mandos.pid
 
629
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
 
630
                -rm --force -- $(SYSTEMD)/mandos.service; \
 
631
        fi
618
632
        -rmdir $(CONFDIR)
619
633
 
620
634
.PHONY: purge-client