/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: 2023-02-11 06:46:26 UTC
  • mto: This revision was merged to the branch mainline in revision 410.
  • Revision ID: teddy@recompile.se-20230211064626-2aqhtdd46jbif6h6
Really enable FORTIFY_SOURCE=3

Use -DFORTIFY_SOURCE=3 by appending it to CPPFLAGS directly instead of
adding it indirectly to CFLAGS.

* Makefile (FORTIFY): Remove "-D_FORTIFY_SOURCE=3".
  (Fortify section/CPPFLAGS): New; append "-D_FORTIFY_SOURCE=3".
  (FEATURES): Remove.  Contents moved to CPPFLAGS.
  (CPPFLAGS): New; append "-D_FILE_OFFSET_BITS=64".
  (CFLAGS): Do not use "$(FEATURES)".

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
42
42
#COVERAGE=--coverage
43
43
OPTIMIZE:=-Os -fno-strict-aliasing
44
44
LANGUAGE:=-std=gnu11
45
 
CPPFLAGS+=-D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64
 
45
CPPFLAGS+=-D_FILE_OFFSET_BITS=64
46
46
htmldir:=man
47
 
version:=1.8.18
 
47
version:=1.8.16
48
48
SED:=sed
49
49
PKG_CONFIG?=pkg-config
50
50
 
57
57
 
58
58
## Use these settings for a traditional /usr/local install
59
59
# PREFIX:=$(DESTDIR)/usr/local
60
 
# BINDIR:=$(PREFIX)/sbin
61
60
# CONFDIR:=$(DESTDIR)/etc/mandos
62
61
# KEYDIR:=$(DESTDIR)/etc/mandos/keys
63
62
# MANDIR:=$(PREFIX)/man
65
64
# DRACUTMODULE:=$(DESTDIR)/usr/lib/dracut/modules.d/90mandos
66
65
# STATEDIR:=$(DESTDIR)/var/lib/mandos
67
66
# LIBDIR:=$(PREFIX)/lib
68
 
# DBUSPOLICYDIR:=$(DESTDIR)/etc/dbus-1/system.d
69
67
##
70
68
 
71
69
## These settings are for a package-type install
72
70
PREFIX:=$(DESTDIR)/usr
73
 
BINDIR:=$(PREFIX)/sbin
74
71
CONFDIR:=$(DESTDIR)/etc/mandos
75
72
KEYDIR:=$(DESTDIR)/etc/keys/mandos
76
73
MANDIR:=$(PREFIX)/share/man
87
84
                        break; \
88
85
                fi; \
89
86
        done)
90
 
DBUSPOLICYDIR:=$(DESTDIR)/usr/share/dbus-1/system.d
91
87
##
92
88
 
93
89
SYSTEMD:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
291
287
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
292
288
                $@)
293
289
 
294
 
# Does the linker support the --no-warn-execstack option?
295
 
ifeq ($(shell echo 'int main(){}'|$(CC) --language=c /dev/stdin -o /dev/null -Xlinker --no-warn-execstack >/dev/null 2>&1 && echo yes),yes)
296
 
# These programs use nested functions, which uses an executable stack
297
 
plugin-runner: LDFLAGS += -Xlinker --no-warn-execstack
298
 
dracut-module/password-agent: LDFLAGS += -Xlinker --no-warn-execstack
299
 
plugins.d/password-prompt: LDFLAGS += -Xlinker --no-warn-execstack
300
 
plugins.d/mandos-client: LDFLAGS += -Xlinker --no-warn-execstack
301
 
plugins.d/plymouth: LDFLAGS += -Xlinker --no-warn-execstack
302
 
endif
303
 
 
304
290
# Need to add the GnuTLS, Avahi and GPGME libraries
305
291
plugins.d/mandos-client: CFLAGS += $(GNUTLS_CFLAGS) $(strip \
306
292
        ) $(AVAHI_CFLAGS) $(GPGME_CFLAGS)
387
373
 
388
374
# Used by run-server
389
375
confdir/mandos.conf: mandos.conf
390
 
        install -D --mode=u=rw,go=r $^ $@
 
376
        install --directory confdir
 
377
        install --mode=u=rw,go=r $^ $@
391
378
confdir/clients.conf: clients.conf keydir/seckey.txt keydir/tls-pubkey.pem
392
 
        install -D --mode=u=rw $< $@
 
379
        install --directory confdir
 
380
        install --mode=u=rw $< $@
393
381
# Add a client password
394
382
        ./mandos-keygen --dir keydir --password --no-ssh >> $@
395
383
statedir:
400
388
 
401
389
.PHONY: install-html
402
390
install-html: html
403
 
        install -D --mode=u=rw,go=r --target-directory=$(htmldir) \
 
391
        install --directory $(htmldir)
 
392
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
404
393
                $(htmldocs)
405
394
 
406
395
.PHONY: install-server
407
396
install-server: doc
 
397
        install --directory $(CONFDIR)
408
398
        if install --directory --mode=u=rwx --owner=$(USER) \
409
399
                --group=$(GROUP) $(STATEDIR); then \
410
400
                :; \
411
401
        elif install --directory --mode=u=rwx $(STATEDIR); then \
412
402
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
413
403
        fi
414
 
        if [ "$(TMPFILES)" != "$(DESTDIR)" ]; then \
415
 
                install -D --mode=u=rw,go=r tmpfiles.d-mandos.conf \
 
404
        if [ "$(TMPFILES)" != "$(DESTDIR)" \
 
405
                        -a -d "$(TMPFILES)" ]; then \
 
406
                install --mode=u=rw,go=r tmpfiles.d-mandos.conf \
416
407
                        $(TMPFILES)/mandos.conf; \
417
408
        fi
418
 
        if [ "$(SYSUSERS)" != "$(DESTDIR)" ]; then \
419
 
                install -D --mode=u=rw,go=r sysusers.d-mandos.conf \
 
409
        if [ "$(SYSUSERS)" != "$(DESTDIR)" \
 
410
                        -a -d "$(SYSUSERS)" ]; then \
 
411
                install --mode=u=rw,go=r sysusers.d-mandos.conf \
420
412
                        $(SYSUSERS)/mandos.conf; \
421
413
        fi
422
 
        install --directory $(BINDIR)
423
 
        install --mode=u=rwx,go=rx --target-directory=$(BINDIR) mandos
424
 
        install --mode=u=rwx,go=rx --target-directory=$(BINDIR) \
 
414
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
 
415
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
425
416
                mandos-ctl
426
 
        install --mode=u=rwx,go=rx --target-directory=$(BINDIR) \
 
417
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
427
418
                mandos-monitor
428
 
        install --directory $(CONFDIR)
429
419
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
430
420
                mandos.conf
431
421
        install --mode=u=rw --target-directory=$(CONFDIR) \
432
422
                clients.conf
433
 
        install -D --mode=u=rw,go=r dbus-mandos.conf \
434
 
                $(DBUSPOLICYDIR)/mandos.conf
435
 
        install -D --mode=u=rwx,go=rx init.d-mandos \
 
423
        install --mode=u=rw,go=r dbus-mandos.conf \
 
424
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
 
425
        install --mode=u=rwx,go=rx init.d-mandos \
436
426
                $(DESTDIR)/etc/init.d/mandos
437
 
        if [ "$(SYSTEMD)" != "$(DESTDIR)" ]; then \
438
 
                install -D --mode=u=rw,go=r mandos.service \
439
 
                        $(SYSTEMD); \
 
427
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
 
428
                install --mode=u=rw,go=r mandos.service $(SYSTEMD); \
440
429
        fi
441
 
        install -D --mode=u=rw,go=r default-mandos \
 
430
        install --mode=u=rw,go=r default-mandos \
442
431
                $(DESTDIR)/etc/default/mandos
443
432
        if [ -z $(DESTDIR) ]; then \
444
433
                update-rc.d mandos defaults 25 15;\
445
434
        fi
446
 
        install --directory $(MANDIR)/man8 $(MANDIR)/man5
447
435
        gzip --best --to-stdout mandos.8 \
448
436
                > $(MANDIR)/man8/mandos.8.gz
449
437
        gzip --best --to-stdout mandos-monitor.8 \
459
447
 
460
448
.PHONY: install-client-nokey
461
449
install-client-nokey: all doc
 
450
        install --directory $(LIBDIR)/mandos $(CONFDIR)
462
451
        install --directory --mode=u=rwx $(KEYDIR) \
463
452
                $(LIBDIR)/mandos/plugins.d \
464
453
                $(LIBDIR)/mandos/plugin-helpers
465
 
        if [ "$(SYSUSERS)" != "$(DESTDIR)" ]; then \
466
 
                install -D --mode=u=rw,go=r sysusers.d-mandos.conf \
 
454
        if [ "$(SYSUSERS)" != "$(DESTDIR)" \
 
455
                        -a -d "$(SYSUSERS)" ]; then \
 
456
                install --mode=u=rw,go=r sysusers.d-mandos.conf \
467
457
                        $(SYSUSERS)/mandos-client.conf; \
468
458
        fi
469
459
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
470
 
                install --directory \
471
 
                        --mode=u=rwx "$(CONFDIR)/plugins.d" \
 
460
                install --mode=u=rwx \
 
461
                        --directory "$(CONFDIR)/plugins.d" \
472
462
                        "$(CONFDIR)/plugin-helpers"; \
473
463
        fi
474
 
        install --directory --mode=u=rwx,go=rx \
 
464
        install --mode=u=rwx,go=rx --directory \
475
465
                "$(CONFDIR)/network-hooks.d"
476
466
        install --mode=u=rwx,go=rx \
477
467
                --target-directory=$(LIBDIR)/mandos plugin-runner
478
468
        install --mode=u=rwx,go=rx \
479
469
                --target-directory=$(LIBDIR)/mandos \
480
470
                mandos-to-cryptroot-unlock
481
 
        install --directory $(BINDIR)
482
 
        install --mode=u=rwx,go=rx --target-directory=$(BINDIR) \
 
471
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
483
472
                mandos-keygen
484
473
        install --mode=u=rwx,go=rx \
485
474
                --target-directory=$(LIBDIR)/mandos/plugins.d \
502
491
        install --mode=u=rwx,go=rx \
503
492
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
504
493
                plugin-helpers/mandos-client-iprouteadddel
505
 
        install -D initramfs-tools-hook \
 
494
        install initramfs-tools-hook \
506
495
                $(INITRAMFSTOOLS)/hooks/mandos
507
 
        install -D --mode=u=rw,go=r initramfs-tools-conf \
 
496
        install --mode=u=rw,go=r initramfs-tools-conf \
508
497
                $(INITRAMFSTOOLS)/conf.d/mandos-conf
509
 
        install -D --mode=u=rw,go=r initramfs-tools-conf-hook \
 
498
        install --mode=u=rw,go=r initramfs-tools-conf-hook \
510
499
                $(INITRAMFSTOOLS)/conf-hooks.d/zz-mandos
511
 
        install -D initramfs-tools-script \
 
500
        install initramfs-tools-script \
512
501
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
513
 
        install -D initramfs-tools-script-stop \
 
502
        install initramfs-tools-script-stop \
514
503
                $(INITRAMFSTOOLS)/scripts/local-premount/mandos
515
 
        install -D --mode=u=rw,go=r \
516
 
                --target-directory=$(DRACUTMODULE) \
 
504
        install --directory $(DRACUTMODULE)
 
505
        install --mode=u=rw,go=r --target-directory=$(DRACUTMODULE) \
517
506
                dracut-module/ask-password-mandos.path \
518
507
                dracut-module/ask-password-mandos.service
519
508
        install --mode=u=rwxs,go=rx \
522
511
                dracut-module/cmdline-mandos.sh \
523
512
                dracut-module/password-agent
524
513
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
525
 
        install --directory $(MANDIR)/man8
526
514
        gzip --best --to-stdout mandos-keygen.8 \
527
515
                > $(MANDIR)/man8/mandos-keygen.8.gz
528
516
        gzip --best --to-stdout plugin-runner.8mandos \
545
533
.PHONY: install-client
546
534
install-client: install-client-nokey
547
535
# Post-installation stuff
548
 
        -$(BINDIR)/mandos-keygen --dir "$(KEYDIR)"
 
536
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
549
537
        if command -v update-initramfs >/dev/null; then \
550
538
            update-initramfs -k all -u; \
551
539
        elif command -v dracut >/dev/null; then \
563
551
 
564
552
.PHONY: uninstall-server
565
553
uninstall-server:
566
 
        -rm --force $(BINDIR)/mandos \
567
 
                $(BINDIR)/mandos-ctl \
568
 
                $(BINDIR)/mandos-monitor \
 
554
        -rm --force $(PREFIX)/sbin/mandos \
 
555
                $(PREFIX)/sbin/mandos-ctl \
 
556
                $(PREFIX)/sbin/mandos-monitor \
569
557
                $(MANDIR)/man8/mandos.8.gz \
570
558
                $(MANDIR)/man8/mandos-monitor.8.gz \
571
559
                $(MANDIR)/man8/mandos-ctl.8.gz \
580
568
# to use it.
581
569
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
582
570
                $(DESTDIR)/etc/crypttab
583
 
        -rm --force $(BINDIR)/mandos-keygen \
 
571
        -rm --force $(PREFIX)/sbin/mandos-keygen \
584
572
                $(LIBDIR)/mandos/plugin-runner \
585
573
                $(LIBDIR)/mandos/plugins.d/password-prompt \
586
574
                $(LIBDIR)/mandos/plugins.d/mandos-client \
625
613
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
626
614
                $(DESTDIR)/etc/default/mandos \
627
615
                $(DESTDIR)/etc/init.d/mandos \
 
616
                $(SYSTEMD)/mandos.service \
628
617
                $(DESTDIR)/run/mandos.pid \
629
618
                $(DESTDIR)/var/run/mandos.pid
630
 
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
631
 
                -rm --force -- $(SYSTEMD)/mandos.service; \
632
 
        fi
633
619
        -rmdir $(CONFDIR)
634
620
 
635
621
.PHONY: purge-client