/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-08 05:08:20 UTC
  • Revision ID: teddy@recompile.se-20240908050820-jpkid6ufjb9n107o
http://bugs.debian.org/1079588
Fix #1079588 by not outputting to stdout in maintainer scripts

From The Debconf Programmer's Tutorial: "Anything your maintainer
scripts output to standard output is passed into the frontend as a
command".  We must make sure to redirect stdout to stderr for every
command in the postinst and postrm scripts which might output to
stdout.

* debian/mandos-client.postinst (update_initramfs): Add "1>&2" to
  invocations of update-initramfs and /etc/kernel/postinst.d/dracut.
  (add_mandos_user): Add "1>&2" to invocations of usermod, groupmod,
  and adduser.
  (create_keys): Add "1>&2" to invocations of mandos-keygen,
  gpg-connect-agent, certtool, and openssl.
  (create_dh_params): Add "1>&2" to invocations of certtool and
  openssl.  Add "--force" option to "rm".
* debian/mandos-client.postrm (update_initramfs): Add "1>&2" to
  invocations of update-initramfs and /etc/kernel/postinst.d/dracut.

Closes: #1079588
Reported-By: Ben Hutchings <ben@decadent.org.uk>

Show diffs side-by-side

added added

removed removed

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