/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: 2024-09-11 22:44:07 UTC
  • mto: This revision was merged to the branch mainline in revision 410.
  • Revision ID: teddy@recompile.se-20240911224407-vv54nya8wo9eedxx
Hide warnings if --no-warn-execstack is not supported

* Makefile: When testing if "-Xlinker --no-warn-execstack" can be
  used by the C compiler, hide any error output.

Show diffs side-by-side

added added

removed removed

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