/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: 2024-09-09 03:16:17 UTC
  • Revision ID: teddy@recompile.se-20240909031617-wpvz0wvujlw6fnrp
Acknowledge NMUs in debian/changelog

* debian/changelog (1.8.16-1.1, 1.8.16-1.2): New entries.

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.16
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
 
372
375
 
373
376
# Used by run-server
374
377
confdir/mandos.conf: mandos.conf
375
 
        install --directory confdir
376
 
        install --mode=u=rw,go=r $^ $@
 
378
        install -D --mode=u=rw,go=r $^ $@
377
379
confdir/clients.conf: clients.conf keydir/seckey.txt keydir/tls-pubkey.pem
378
 
        install --directory confdir
379
 
        install --mode=u=rw $< $@
 
380
        install -D --mode=u=rw $< $@
380
381
# Add a client password
381
382
        ./mandos-keygen --dir keydir --password --no-ssh >> $@
382
383
statedir:
387
388
 
388
389
.PHONY: install-html
389
390
install-html: html
390
 
        install --directory $(htmldir)
391
 
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
 
391
        install -D --mode=u=rw,go=r --target-directory=$(htmldir) \
392
392
                $(htmldocs)
393
393
 
394
394
.PHONY: install-server
395
395
install-server: doc
396
 
        install --directory $(CONFDIR)
397
396
        if install --directory --mode=u=rwx --owner=$(USER) \
398
397
                --group=$(GROUP) $(STATEDIR); then \
399
398
                :; \
400
399
        elif install --directory --mode=u=rwx $(STATEDIR); then \
401
400
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
402
401
        fi
403
 
        if [ "$(TMPFILES)" != "$(DESTDIR)" \
404
 
                        -a -d "$(TMPFILES)" ]; then \
405
 
                install --mode=u=rw,go=r tmpfiles.d-mandos.conf \
 
402
        if [ "$(TMPFILES)" != "$(DESTDIR)" ]; then \
 
403
                install -D --mode=u=rw,go=r tmpfiles.d-mandos.conf \
406
404
                        $(TMPFILES)/mandos.conf; \
407
405
        fi
408
 
        if [ "$(SYSUSERS)" != "$(DESTDIR)" \
409
 
                        -a -d "$(SYSUSERS)" ]; then \
410
 
                install --mode=u=rw,go=r sysusers.d-mandos.conf \
 
406
        if [ "$(SYSUSERS)" != "$(DESTDIR)" ]; then \
 
407
                install -D --mode=u=rw,go=r sysusers.d-mandos.conf \
411
408
                        $(SYSUSERS)/mandos.conf; \
412
409
        fi
413
 
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
 
410
        install --directory $(PREFIX)/sbin
 
411
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
 
412
                mandos
414
413
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
415
414
                mandos-ctl
416
415
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
417
416
                mandos-monitor
 
417
        install --directory $(CONFDIR)
418
418
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
419
419
                mandos.conf
420
420
        install --mode=u=rw --target-directory=$(CONFDIR) \
421
421
                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 \
 
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 \
425
425
                $(DESTDIR)/etc/init.d/mandos
426
 
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
427
 
                install --mode=u=rw,go=r mandos.service $(SYSTEMD); \
 
426
        if [ "$(SYSTEMD)" != "$(DESTDIR)" ]; then \
 
427
                install -D --mode=u=rw,go=r mandos.service \
 
428
                        $(SYSTEMD); \
428
429
        fi
429
 
        install --mode=u=rw,go=r default-mandos \
 
430
        install -D --mode=u=rw,go=r default-mandos \
430
431
                $(DESTDIR)/etc/default/mandos
431
432
        if [ -z $(DESTDIR) ]; then \
432
433
                update-rc.d mandos defaults 25 15;\
433
434
        fi
 
435
        install --directory $(MANDIR)/man8 $(MANDIR)/man5
434
436
        gzip --best --to-stdout mandos.8 \
435
437
                > $(MANDIR)/man8/mandos.8.gz
436
438
        gzip --best --to-stdout mandos-monitor.8 \
446
448
 
447
449
.PHONY: install-client-nokey
448
450
install-client-nokey: all doc
449
 
        install --directory $(LIBDIR)/mandos $(CONFDIR)
450
451
        install --directory --mode=u=rwx $(KEYDIR) \
451
452
                $(LIBDIR)/mandos/plugins.d \
452
453
                $(LIBDIR)/mandos/plugin-helpers
453
 
        if [ "$(SYSUSERS)" != "$(DESTDIR)" \
454
 
                        -a -d "$(SYSUSERS)" ]; then \
455
 
                install --mode=u=rw,go=r sysusers.d-mandos.conf \
 
454
        if [ "$(SYSUSERS)" != "$(DESTDIR)" ]; then \
 
455
                install -D --mode=u=rw,go=r sysusers.d-mandos.conf \
456
456
                        $(SYSUSERS)/mandos-client.conf; \
457
457
        fi
458
458
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
459
 
                install --mode=u=rwx \
460
 
                        --directory "$(CONFDIR)/plugins.d" \
 
459
                install --directory \
 
460
                        --mode=u=rwx "$(CONFDIR)/plugins.d" \
461
461
                        "$(CONFDIR)/plugin-helpers"; \
462
462
        fi
463
 
        install --mode=u=rwx,go=rx --directory \
 
463
        install --directory --mode=u=rwx,go=rx \
464
464
                "$(CONFDIR)/network-hooks.d"
465
465
        install --mode=u=rwx,go=rx \
466
466
                --target-directory=$(LIBDIR)/mandos plugin-runner
467
467
        install --mode=u=rwx,go=rx \
468
468
                --target-directory=$(LIBDIR)/mandos \
469
469
                mandos-to-cryptroot-unlock
 
470
        install --directory $(PREFIX)/sbin
470
471
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
471
472
                mandos-keygen
472
473
        install --mode=u=rwx,go=rx \
490
491
        install --mode=u=rwx,go=rx \
491
492
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
492
493
                plugin-helpers/mandos-client-iprouteadddel
493
 
        install initramfs-tools-hook \
 
494
        install -D initramfs-tools-hook \
494
495
                $(INITRAMFSTOOLS)/hooks/mandos
495
 
        install --mode=u=rw,go=r initramfs-tools-conf \
 
496
        install -D --mode=u=rw,go=r initramfs-tools-conf \
496
497
                $(INITRAMFSTOOLS)/conf.d/mandos-conf
497
 
        install --mode=u=rw,go=r initramfs-tools-conf-hook \
 
498
        install -D --mode=u=rw,go=r initramfs-tools-conf-hook \
498
499
                $(INITRAMFSTOOLS)/conf-hooks.d/zz-mandos
499
 
        install initramfs-tools-script \
 
500
        install -D initramfs-tools-script \
500
501
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
501
 
        install initramfs-tools-script-stop \
 
502
        install -D initramfs-tools-script-stop \
502
503
                $(INITRAMFSTOOLS)/scripts/local-premount/mandos
503
 
        install --directory $(DRACUTMODULE)
504
 
        install --mode=u=rw,go=r --target-directory=$(DRACUTMODULE) \
 
504
        install -D --mode=u=rw,go=r \
 
505
                --target-directory=$(DRACUTMODULE) \
505
506
                dracut-module/ask-password-mandos.path \
506
507
                dracut-module/ask-password-mandos.service
507
508
        install --mode=u=rwxs,go=rx \
510
511
                dracut-module/cmdline-mandos.sh \
511
512
                dracut-module/password-agent
512
513
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
 
514
        install --directory $(MANDIR)/man8
513
515
        gzip --best --to-stdout mandos-keygen.8 \
514
516
                > $(MANDIR)/man8/mandos-keygen.8.gz
515
517
        gzip --best --to-stdout plugin-runner.8mandos \
612
614
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
613
615
                $(DESTDIR)/etc/default/mandos \
614
616
                $(DESTDIR)/etc/init.d/mandos \
615
 
                $(SYSTEMD)/mandos.service \
616
617
                $(DESTDIR)/run/mandos.pid \
617
618
                $(DESTDIR)/var/run/mandos.pid
 
619
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
 
620
                -rm --force -- $(SYSTEMD)/mandos.service; \
 
621
        fi
618
622
        -rmdir $(CONFDIR)
619
623
 
620
624
.PHONY: purge-client