/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-11-22 20:28:54 UTC
  • Revision ID: teddy@recompile.se-20241122202854-dycuf117byxhxl32
mandos-monitor: Avoid debug messages from urwid

Avoid debug messages from urwid.  Any logging output before the screen
has been set up will mangle the screen.

* mandos-monitor: When setting up logging, set urwid to only show log
  messages of level INFO or above.

(Thanks to an anonymous contributor for reporting this.)

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