/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=2 -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.9
 
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)
296
311
 
297
312
# Need to add the GLib and pthread libraries
298
313
dracut-module/password-agent: CFLAGS += $(GLIB_CFLAGS)
 
314
# Note: -lpthread is unnecessary with the GNU C library 2.34 or later
299
315
dracut-module/password-agent: LDLIBS += $(GLIB_LIBS) -lpthread
300
316
 
301
317
.PHONY: clean
354
370
keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem: mandos-keygen
355
371
        install --directory keydir
356
372
        ./mandos-keygen --dir keydir --force
 
373
        if ! [ -e keydir/tls-privkey.pem ]; then \
 
374
                install --mode=u=rw /dev/null keydir/tls-privkey.pem; \
 
375
        fi
 
376
        if ! [ -e keydir/tls-pubkey.pem ]; then \
 
377
                install --mode=u=rw /dev/null keydir/tls-pubkey.pem; \
 
378
        fi
357
379
 
358
380
# Run the server with a local config
359
381
.PHONY: run-server
363
385
 
364
386
# Used by run-server
365
387
confdir/mandos.conf: mandos.conf
366
 
        install --directory confdir
367
 
        install --mode=u=rw,go=r $^ $@
 
388
        install -D --mode=u=rw,go=r $^ $@
368
389
confdir/clients.conf: clients.conf keydir/seckey.txt keydir/tls-pubkey.pem
369
 
        install --directory confdir
370
 
        install --mode=u=rw $< $@
 
390
        install -D --mode=u=rw $< $@
371
391
# Add a client password
372
392
        ./mandos-keygen --dir keydir --password --no-ssh >> $@
373
393
statedir:
378
398
 
379
399
.PHONY: install-html
380
400
install-html: html
381
 
        install --directory $(htmldir)
382
 
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
 
401
        install -D --mode=u=rw,go=r --target-directory=$(htmldir) \
383
402
                $(htmldocs)
384
403
 
385
404
.PHONY: install-server
386
405
install-server: doc
387
 
        install --directory $(CONFDIR)
388
406
        if install --directory --mode=u=rwx --owner=$(USER) \
389
407
                --group=$(GROUP) $(STATEDIR); then \
390
408
                :; \
391
409
        elif install --directory --mode=u=rwx $(STATEDIR); then \
392
410
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
393
411
        fi
394
 
        if [ "$(TMPFILES)" != "$(DESTDIR)" \
395
 
                        -a -d "$(TMPFILES)" ]; then \
396
 
                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 \
397
414
                        $(TMPFILES)/mandos.conf; \
398
415
        fi
399
 
        if [ "$(SYSUSERS)" != "$(DESTDIR)" \
400
 
                        -a -d "$(SYSUSERS)" ]; then \
401
 
                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 \
402
418
                        $(SYSUSERS)/mandos.conf; \
403
419
        fi
404
 
        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
405
423
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
406
424
                mandos-ctl
407
425
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
408
426
                mandos-monitor
 
427
        install --directory $(CONFDIR)
409
428
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
410
429
                mandos.conf
411
430
        install --mode=u=rw --target-directory=$(CONFDIR) \
412
431
                clients.conf
413
 
        install --mode=u=rw,go=r dbus-mandos.conf \
414
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
415
 
        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 \
416
435
                $(DESTDIR)/etc/init.d/mandos
417
 
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
418
 
                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); \
419
439
        fi
420
 
        install --mode=u=rw,go=r default-mandos \
 
440
        install -D --mode=u=rw,go=r default-mandos \
421
441
                $(DESTDIR)/etc/default/mandos
422
442
        if [ -z $(DESTDIR) ]; then \
423
443
                update-rc.d mandos defaults 25 15;\
424
444
        fi
 
445
        install --directory $(MANDIR)/man8 $(MANDIR)/man5
425
446
        gzip --best --to-stdout mandos.8 \
426
447
                > $(MANDIR)/man8/mandos.8.gz
427
448
        gzip --best --to-stdout mandos-monitor.8 \
437
458
 
438
459
.PHONY: install-client-nokey
439
460
install-client-nokey: all doc
440
 
        install --directory $(LIBDIR)/mandos $(CONFDIR)
441
461
        install --directory --mode=u=rwx $(KEYDIR) \
442
462
                $(LIBDIR)/mandos/plugins.d \
443
463
                $(LIBDIR)/mandos/plugin-helpers
444
 
        if [ "$(SYSUSERS)" != "$(DESTDIR)" \
445
 
                        -a -d "$(SYSUSERS)" ]; then \
446
 
                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 \
447
466
                        $(SYSUSERS)/mandos-client.conf; \
448
467
        fi
449
468
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
450
 
                install --mode=u=rwx \
451
 
                        --directory "$(CONFDIR)/plugins.d" \
 
469
                install --directory \
 
470
                        --mode=u=rwx "$(CONFDIR)/plugins.d" \
452
471
                        "$(CONFDIR)/plugin-helpers"; \
453
472
        fi
454
 
        install --mode=u=rwx,go=rx --directory \
 
473
        install --directory --mode=u=rwx,go=rx \
455
474
                "$(CONFDIR)/network-hooks.d"
456
475
        install --mode=u=rwx,go=rx \
457
476
                --target-directory=$(LIBDIR)/mandos plugin-runner
458
477
        install --mode=u=rwx,go=rx \
459
478
                --target-directory=$(LIBDIR)/mandos \
460
479
                mandos-to-cryptroot-unlock
 
480
        install --directory $(PREFIX)/sbin
461
481
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
462
482
                mandos-keygen
463
483
        install --mode=u=rwx,go=rx \
481
501
        install --mode=u=rwx,go=rx \
482
502
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
483
503
                plugin-helpers/mandos-client-iprouteadddel
484
 
        install initramfs-tools-hook \
 
504
        install -D initramfs-tools-hook \
485
505
                $(INITRAMFSTOOLS)/hooks/mandos
486
 
        install --mode=u=rw,go=r initramfs-tools-conf \
 
506
        install -D --mode=u=rw,go=r initramfs-tools-conf \
487
507
                $(INITRAMFSTOOLS)/conf.d/mandos-conf
488
 
        install --mode=u=rw,go=r initramfs-tools-conf-hook \
 
508
        install -D --mode=u=rw,go=r initramfs-tools-conf-hook \
489
509
                $(INITRAMFSTOOLS)/conf-hooks.d/zz-mandos
490
 
        install initramfs-tools-script \
 
510
        install -D initramfs-tools-script \
491
511
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
492
 
        install initramfs-tools-script-stop \
 
512
        install -D initramfs-tools-script-stop \
493
513
                $(INITRAMFSTOOLS)/scripts/local-premount/mandos
494
 
        install --directory $(DRACUTMODULE)
495
 
        install --mode=u=rw,go=r --target-directory=$(DRACUTMODULE) \
 
514
        install -D --mode=u=rw,go=r \
 
515
                --target-directory=$(DRACUTMODULE) \
496
516
                dracut-module/ask-password-mandos.path \
497
517
                dracut-module/ask-password-mandos.service
498
518
        install --mode=u=rwxs,go=rx \
501
521
                dracut-module/cmdline-mandos.sh \
502
522
                dracut-module/password-agent
503
523
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
 
524
        install --directory $(MANDIR)/man8
504
525
        gzip --best --to-stdout mandos-keygen.8 \
505
526
                > $(MANDIR)/man8/mandos-keygen.8.gz
506
527
        gzip --best --to-stdout plugin-runner.8mandos \
603
624
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
604
625
                $(DESTDIR)/etc/default/mandos \
605
626
                $(DESTDIR)/etc/init.d/mandos \
606
 
                $(SYSTEMD)/mandos.service \
607
627
                $(DESTDIR)/run/mandos.pid \
608
628
                $(DESTDIR)/var/run/mandos.pid
 
629
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
 
630
                -rm --force -- $(SYSTEMD)/mandos.service; \
 
631
        fi
609
632
        -rmdir $(CONFDIR)
610
633
 
611
634
.PHONY: purge-client