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