/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-03 15:32:05 UTC
  • Revision ID: teddy@recompile.se-20241103153205-qota5ic1c4m2nqh4
Detect GPGME version correctly

It seems that newer versions of dpkg-query can print an empty version.
Change the code to also parse this output.

Reported-By: Pablo Abelenda <pabelenda@igalia.com>

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.14
 
47
version:=1.8.17
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 \
96
99
GNUTLS_LIBS:=$(shell $(PKG_CONFIG) --libs gnutls)
97
100
AVAHI_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I avahi-core)
98
101
AVAHI_LIBS:=$(shell $(PKG_CONFIG) --libs avahi-core)
99
 
GPGME_CFLAGS:=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
100
 
GPGME_LIBS:=$(shell gpgme-config --libs; getconf LFS_LIBS; \
 
102
GPGME_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I gpgme 2>/dev/null \
 
103
        || gpgme-config --cflags; getconf LFS_CFLAGS)
 
104
GPGME_LIBS:=$(shell $(PKG_CONFIG) --libs gpgme 2>/dev/null \
 
105
        || gpgme-config --libs; getconf LFS_LIBS; \
101
106
        getconf LFS_LDFLAGS)
102
107
LIBNL3_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I libnl-route-3.0)
103
108
LIBNL3_LIBS:=$(shell $(PKG_CONFIG) --libs libnl-route-3.0)
106
111
 
107
112
# Do not change these two
108
113
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
109
 
        $(LANGUAGE) $(FEATURES) -DVERSION='"$(version)"'
 
114
        $(LANGUAGE) -DVERSION='"$(version)"'
110
115
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(strip \
111
116
        ) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
112
117
 
284
289
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
285
290
                $@)
286
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
 
287
302
# Need to add the GnuTLS, Avahi and GPGME libraries
288
303
plugins.d/mandos-client: CFLAGS += $(GNUTLS_CFLAGS) $(strip \
289
304
        ) $(AVAHI_CFLAGS) $(GPGME_CFLAGS)
370
385
 
371
386
# Used by run-server
372
387
confdir/mandos.conf: mandos.conf
373
 
        install --directory confdir
374
 
        install --mode=u=rw,go=r $^ $@
 
388
        install -D --mode=u=rw,go=r $^ $@
375
389
confdir/clients.conf: clients.conf keydir/seckey.txt keydir/tls-pubkey.pem
376
 
        install --directory confdir
377
 
        install --mode=u=rw $< $@
 
390
        install -D --mode=u=rw $< $@
378
391
# Add a client password
379
392
        ./mandos-keygen --dir keydir --password --no-ssh >> $@
380
393
statedir:
385
398
 
386
399
.PHONY: install-html
387
400
install-html: html
388
 
        install --directory $(htmldir)
389
 
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
 
401
        install -D --mode=u=rw,go=r --target-directory=$(htmldir) \
390
402
                $(htmldocs)
391
403
 
392
404
.PHONY: install-server
393
405
install-server: doc
394
 
        install --directory $(CONFDIR)
395
406
        if install --directory --mode=u=rwx --owner=$(USER) \
396
407
                --group=$(GROUP) $(STATEDIR); then \
397
408
                :; \
398
409
        elif install --directory --mode=u=rwx $(STATEDIR); then \
399
410
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
400
411
        fi
401
 
        if [ "$(TMPFILES)" != "$(DESTDIR)" \
402
 
                        -a -d "$(TMPFILES)" ]; then \
403
 
                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 \
404
414
                        $(TMPFILES)/mandos.conf; \
405
415
        fi
406
 
        if [ "$(SYSUSERS)" != "$(DESTDIR)" \
407
 
                        -a -d "$(SYSUSERS)" ]; then \
408
 
                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 \
409
418
                        $(SYSUSERS)/mandos.conf; \
410
419
        fi
411
 
        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
412
423
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
413
424
                mandos-ctl
414
425
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
415
426
                mandos-monitor
 
427
        install --directory $(CONFDIR)
416
428
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
417
429
                mandos.conf
418
430
        install --mode=u=rw --target-directory=$(CONFDIR) \
419
431
                clients.conf
420
 
        install --mode=u=rw,go=r dbus-mandos.conf \
421
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
422
 
        install --mode=u=rwx,go=rx init.d-mandos \
 
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
435
                $(DESTDIR)/etc/init.d/mandos
424
 
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
425
 
                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); \
426
439
        fi
427
 
        install --mode=u=rw,go=r default-mandos \
 
440
        install -D --mode=u=rw,go=r default-mandos \
428
441
                $(DESTDIR)/etc/default/mandos
429
442
        if [ -z $(DESTDIR) ]; then \
430
443
                update-rc.d mandos defaults 25 15;\
431
444
        fi
 
445
        install --directory $(MANDIR)/man8 $(MANDIR)/man5
432
446
        gzip --best --to-stdout mandos.8 \
433
447
                > $(MANDIR)/man8/mandos.8.gz
434
448
        gzip --best --to-stdout mandos-monitor.8 \
444
458
 
445
459
.PHONY: install-client-nokey
446
460
install-client-nokey: all doc
447
 
        install --directory $(LIBDIR)/mandos $(CONFDIR)
448
461
        install --directory --mode=u=rwx $(KEYDIR) \
449
462
                $(LIBDIR)/mandos/plugins.d \
450
463
                $(LIBDIR)/mandos/plugin-helpers
451
 
        if [ "$(SYSUSERS)" != "$(DESTDIR)" \
452
 
                        -a -d "$(SYSUSERS)" ]; then \
453
 
                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 \
454
466
                        $(SYSUSERS)/mandos-client.conf; \
455
467
        fi
456
468
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
457
 
                install --mode=u=rwx \
458
 
                        --directory "$(CONFDIR)/plugins.d" \
 
469
                install --directory \
 
470
                        --mode=u=rwx "$(CONFDIR)/plugins.d" \
459
471
                        "$(CONFDIR)/plugin-helpers"; \
460
472
        fi
461
 
        install --mode=u=rwx,go=rx --directory \
 
473
        install --directory --mode=u=rwx,go=rx \
462
474
                "$(CONFDIR)/network-hooks.d"
463
475
        install --mode=u=rwx,go=rx \
464
476
                --target-directory=$(LIBDIR)/mandos plugin-runner
465
477
        install --mode=u=rwx,go=rx \
466
478
                --target-directory=$(LIBDIR)/mandos \
467
479
                mandos-to-cryptroot-unlock
 
480
        install --directory $(PREFIX)/sbin
468
481
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
469
482
                mandos-keygen
470
483
        install --mode=u=rwx,go=rx \
488
501
        install --mode=u=rwx,go=rx \
489
502
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
490
503
                plugin-helpers/mandos-client-iprouteadddel
491
 
        install initramfs-tools-hook \
 
504
        install -D initramfs-tools-hook \
492
505
                $(INITRAMFSTOOLS)/hooks/mandos
493
 
        install --mode=u=rw,go=r initramfs-tools-conf \
 
506
        install -D --mode=u=rw,go=r initramfs-tools-conf \
494
507
                $(INITRAMFSTOOLS)/conf.d/mandos-conf
495
 
        install --mode=u=rw,go=r initramfs-tools-conf-hook \
 
508
        install -D --mode=u=rw,go=r initramfs-tools-conf-hook \
496
509
                $(INITRAMFSTOOLS)/conf-hooks.d/zz-mandos
497
 
        install initramfs-tools-script \
 
510
        install -D initramfs-tools-script \
498
511
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
499
 
        install initramfs-tools-script-stop \
 
512
        install -D initramfs-tools-script-stop \
500
513
                $(INITRAMFSTOOLS)/scripts/local-premount/mandos
501
 
        install --directory $(DRACUTMODULE)
502
 
        install --mode=u=rw,go=r --target-directory=$(DRACUTMODULE) \
 
514
        install -D --mode=u=rw,go=r \
 
515
                --target-directory=$(DRACUTMODULE) \
503
516
                dracut-module/ask-password-mandos.path \
504
517
                dracut-module/ask-password-mandos.service
505
518
        install --mode=u=rwxs,go=rx \
508
521
                dracut-module/cmdline-mandos.sh \
509
522
                dracut-module/password-agent
510
523
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
 
524
        install --directory $(MANDIR)/man8
511
525
        gzip --best --to-stdout mandos-keygen.8 \
512
526
                > $(MANDIR)/man8/mandos-keygen.8.gz
513
527
        gzip --best --to-stdout plugin-runner.8mandos \
610
624
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
611
625
                $(DESTDIR)/etc/default/mandos \
612
626
                $(DESTDIR)/etc/init.d/mandos \
613
 
                $(SYSTEMD)/mandos.service \
614
627
                $(DESTDIR)/run/mandos.pid \
615
628
                $(DESTDIR)/var/run/mandos.pid
 
629
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
 
630
                -rm --force -- $(SYSTEMD)/mandos.service; \
 
631
        fi
616
632
        -rmdir $(CONFDIR)
617
633
 
618
634
.PHONY: purge-client