/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 at recompile
  • Date: 2019-12-04 23:46:59 UTC
  • Revision ID: teddy@recompile.se-20191204234659-m4u7bxnjrns6d3fc
Simplification of Python 3 compatibility code

Apply previously-made change in mandos and mandos-ctl also to
mandos-monitor.

* mandos-monitor: Set "__metaclass__ = type" globally for Python 2,
  and remove inheriting from "object" in all places possible.

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:=-fstack-protector-all -fPIC
33
 
CPPFLAGS+=-D_FORTIFY_SOURCE=3
 
32
FORTIFY:=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
34
33
LINK_FORTIFY_LD:=-z relro -z now
35
34
LINK_FORTIFY:=
36
35
 
42
41
#COVERAGE=--coverage
43
42
OPTIMIZE:=-Os -fno-strict-aliasing
44
43
LANGUAGE:=-std=gnu11
45
 
CPPFLAGS+=-D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64
 
44
FEATURES:=-D_FILE_OFFSET_BITS=64
46
45
htmldir:=man
47
 
version:=1.8.17
 
46
version:=1.8.9
48
47
SED:=sed
49
48
PKG_CONFIG?=pkg-config
50
49
 
57
56
 
58
57
## Use these settings for a traditional /usr/local install
59
58
# PREFIX:=$(DESTDIR)/usr/local
60
 
# BINDIR:=$(PREFIX)/sbin
61
59
# CONFDIR:=$(DESTDIR)/etc/mandos
62
60
# KEYDIR:=$(DESTDIR)/etc/mandos/keys
63
61
# MANDIR:=$(PREFIX)/man
65
63
# DRACUTMODULE:=$(DESTDIR)/usr/lib/dracut/modules.d/90mandos
66
64
# STATEDIR:=$(DESTDIR)/var/lib/mandos
67
65
# LIBDIR:=$(PREFIX)/lib
68
 
# DBUSPOLICYDIR:=$(DESTDIR)/etc/dbus-1/system.d
69
66
##
70
67
 
71
68
## These settings are for a package-type install
72
69
PREFIX:=$(DESTDIR)/usr
73
 
BINDIR:=$(PREFIX)/sbin
74
70
CONFDIR:=$(DESTDIR)/etc/mandos
75
71
KEYDIR:=$(DESTDIR)/etc/keys/mandos
76
72
MANDIR:=$(PREFIX)/share/man
87
83
                        break; \
88
84
                fi; \
89
85
        done)
90
 
DBUSPOLICYDIR:=$(DESTDIR)/usr/share/dbus-1/system.d
91
86
##
92
87
 
93
88
SYSTEMD:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
101
96
GNUTLS_LIBS:=$(shell $(PKG_CONFIG) --libs gnutls)
102
97
AVAHI_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I avahi-core)
103
98
AVAHI_LIBS:=$(shell $(PKG_CONFIG) --libs avahi-core)
104
 
GPGME_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I gpgme 2>/dev/null \
105
 
        || gpgme-config --cflags; getconf LFS_CFLAGS)
106
 
GPGME_LIBS:=$(shell $(PKG_CONFIG) --libs gpgme 2>/dev/null \
107
 
        || gpgme-config --libs; getconf LFS_LIBS; \
 
99
GPGME_CFLAGS:=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
 
100
GPGME_LIBS:=$(shell gpgme-config --libs; getconf LFS_LIBS; \
108
101
        getconf LFS_LDFLAGS)
109
102
LIBNL3_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I libnl-route-3.0)
110
103
LIBNL3_LIBS:=$(shell $(PKG_CONFIG) --libs libnl-route-3.0)
113
106
 
114
107
# Do not change these two
115
108
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
116
 
        $(LANGUAGE) -DVERSION='"$(version)"'
 
109
        $(LANGUAGE) $(FEATURES) -DVERSION='"$(version)"'
117
110
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(strip \
118
111
        ) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
119
112
 
291
284
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
292
285
                $@)
293
286
 
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
287
# Need to add the GnuTLS, Avahi and GPGME libraries
305
288
plugins.d/mandos-client: CFLAGS += $(GNUTLS_CFLAGS) $(strip \
306
289
        ) $(AVAHI_CFLAGS) $(GPGME_CFLAGS)
313
296
 
314
297
# Need to add the GLib and pthread libraries
315
298
dracut-module/password-agent: CFLAGS += $(GLIB_CFLAGS)
316
 
# Note: -lpthread is unnecessary with the GNU C library 2.34 or later
317
299
dracut-module/password-agent: LDLIBS += $(GLIB_LIBS) -lpthread
318
300
 
319
301
.PHONY: clean
372
354
keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem: mandos-keygen
373
355
        install --directory keydir
374
356
        ./mandos-keygen --dir keydir --force
375
 
        if ! [ -e keydir/tls-privkey.pem ]; then \
376
 
                install --mode=u=rw /dev/null keydir/tls-privkey.pem; \
377
 
        fi
378
 
        if ! [ -e keydir/tls-pubkey.pem ]; then \
379
 
                install --mode=u=rw /dev/null keydir/tls-pubkey.pem; \
380
 
        fi
381
357
 
382
358
# Run the server with a local config
383
359
.PHONY: run-server
387
363
 
388
364
# Used by run-server
389
365
confdir/mandos.conf: mandos.conf
390
 
        install -D --mode=u=rw,go=r $^ $@
 
366
        install --directory confdir
 
367
        install --mode=u=rw,go=r $^ $@
391
368
confdir/clients.conf: clients.conf keydir/seckey.txt keydir/tls-pubkey.pem
392
 
        install -D --mode=u=rw $< $@
 
369
        install --directory confdir
 
370
        install --mode=u=rw $< $@
393
371
# Add a client password
394
372
        ./mandos-keygen --dir keydir --password --no-ssh >> $@
395
373
statedir:
400
378
 
401
379
.PHONY: install-html
402
380
install-html: html
403
 
        install -D --mode=u=rw,go=r --target-directory=$(htmldir) \
 
381
        install --directory $(htmldir)
 
382
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
404
383
                $(htmldocs)
405
384
 
406
385
.PHONY: install-server
407
386
install-server: doc
 
387
        install --directory $(CONFDIR)
408
388
        if install --directory --mode=u=rwx --owner=$(USER) \
409
389
                --group=$(GROUP) $(STATEDIR); then \
410
390
                :; \
411
391
        elif install --directory --mode=u=rwx $(STATEDIR); then \
412
392
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
413
393
        fi
414
 
        if [ "$(TMPFILES)" != "$(DESTDIR)" ]; then \
415
 
                install -D --mode=u=rw,go=r tmpfiles.d-mandos.conf \
 
394
        if [ "$(TMPFILES)" != "$(DESTDIR)" \
 
395
                        -a -d "$(TMPFILES)" ]; then \
 
396
                install --mode=u=rw,go=r tmpfiles.d-mandos.conf \
416
397
                        $(TMPFILES)/mandos.conf; \
417
398
        fi
418
 
        if [ "$(SYSUSERS)" != "$(DESTDIR)" ]; then \
419
 
                install -D --mode=u=rw,go=r sysusers.d-mandos.conf \
 
399
        if [ "$(SYSUSERS)" != "$(DESTDIR)" \
 
400
                        -a -d "$(SYSUSERS)" ]; then \
 
401
                install --mode=u=rw,go=r sysusers.d-mandos.conf \
420
402
                        $(SYSUSERS)/mandos.conf; \
421
403
        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) \
 
404
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
 
405
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
425
406
                mandos-ctl
426
 
        install --mode=u=rwx,go=rx --target-directory=$(BINDIR) \
 
407
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
427
408
                mandos-monitor
428
 
        install --directory $(CONFDIR)
429
409
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
430
410
                mandos.conf
431
411
        install --mode=u=rw --target-directory=$(CONFDIR) \
432
412
                clients.conf
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 \
 
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 \
436
416
                $(DESTDIR)/etc/init.d/mandos
437
 
        if [ "$(SYSTEMD)" != "$(DESTDIR)" ]; then \
438
 
                install -D --mode=u=rw,go=r mandos.service \
439
 
                        $(SYSTEMD); \
 
417
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
 
418
                install --mode=u=rw,go=r mandos.service $(SYSTEMD); \
440
419
        fi
441
 
        install -D --mode=u=rw,go=r default-mandos \
 
420
        install --mode=u=rw,go=r default-mandos \
442
421
                $(DESTDIR)/etc/default/mandos
443
422
        if [ -z $(DESTDIR) ]; then \
444
423
                update-rc.d mandos defaults 25 15;\
445
424
        fi
446
 
        install --directory $(MANDIR)/man8 $(MANDIR)/man5
447
425
        gzip --best --to-stdout mandos.8 \
448
426
                > $(MANDIR)/man8/mandos.8.gz
449
427
        gzip --best --to-stdout mandos-monitor.8 \
459
437
 
460
438
.PHONY: install-client-nokey
461
439
install-client-nokey: all doc
 
440
        install --directory $(LIBDIR)/mandos $(CONFDIR)
462
441
        install --directory --mode=u=rwx $(KEYDIR) \
463
442
                $(LIBDIR)/mandos/plugins.d \
464
443
                $(LIBDIR)/mandos/plugin-helpers
465
 
        if [ "$(SYSUSERS)" != "$(DESTDIR)" ]; then \
466
 
                install -D --mode=u=rw,go=r sysusers.d-mandos.conf \
 
444
        if [ "$(SYSUSERS)" != "$(DESTDIR)" \
 
445
                        -a -d "$(SYSUSERS)" ]; then \
 
446
                install --mode=u=rw,go=r sysusers.d-mandos.conf \
467
447
                        $(SYSUSERS)/mandos-client.conf; \
468
448
        fi
469
449
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
470
 
                install --directory \
471
 
                        --mode=u=rwx "$(CONFDIR)/plugins.d" \
 
450
                install --mode=u=rwx \
 
451
                        --directory "$(CONFDIR)/plugins.d" \
472
452
                        "$(CONFDIR)/plugin-helpers"; \
473
453
        fi
474
 
        install --directory --mode=u=rwx,go=rx \
 
454
        install --mode=u=rwx,go=rx --directory \
475
455
                "$(CONFDIR)/network-hooks.d"
476
456
        install --mode=u=rwx,go=rx \
477
457
                --target-directory=$(LIBDIR)/mandos plugin-runner
478
458
        install --mode=u=rwx,go=rx \
479
459
                --target-directory=$(LIBDIR)/mandos \
480
460
                mandos-to-cryptroot-unlock
481
 
        install --directory $(BINDIR)
482
 
        install --mode=u=rwx,go=rx --target-directory=$(BINDIR) \
 
461
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
483
462
                mandos-keygen
484
463
        install --mode=u=rwx,go=rx \
485
464
                --target-directory=$(LIBDIR)/mandos/plugins.d \
502
481
        install --mode=u=rwx,go=rx \
503
482
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
504
483
                plugin-helpers/mandos-client-iprouteadddel
505
 
        install -D initramfs-tools-hook \
 
484
        install initramfs-tools-hook \
506
485
                $(INITRAMFSTOOLS)/hooks/mandos
507
 
        install -D --mode=u=rw,go=r initramfs-tools-conf \
 
486
        install --mode=u=rw,go=r initramfs-tools-conf \
508
487
                $(INITRAMFSTOOLS)/conf.d/mandos-conf
509
 
        install -D --mode=u=rw,go=r initramfs-tools-conf-hook \
 
488
        install --mode=u=rw,go=r initramfs-tools-conf-hook \
510
489
                $(INITRAMFSTOOLS)/conf-hooks.d/zz-mandos
511
 
        install -D initramfs-tools-script \
 
490
        install initramfs-tools-script \
512
491
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
513
 
        install -D initramfs-tools-script-stop \
 
492
        install initramfs-tools-script-stop \
514
493
                $(INITRAMFSTOOLS)/scripts/local-premount/mandos
515
 
        install -D --mode=u=rw,go=r \
516
 
                --target-directory=$(DRACUTMODULE) \
 
494
        install --directory $(DRACUTMODULE)
 
495
        install --mode=u=rw,go=r --target-directory=$(DRACUTMODULE) \
517
496
                dracut-module/ask-password-mandos.path \
518
497
                dracut-module/ask-password-mandos.service
519
498
        install --mode=u=rwxs,go=rx \
522
501
                dracut-module/cmdline-mandos.sh \
523
502
                dracut-module/password-agent
524
503
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
525
 
        install --directory $(MANDIR)/man8
526
504
        gzip --best --to-stdout mandos-keygen.8 \
527
505
                > $(MANDIR)/man8/mandos-keygen.8.gz
528
506
        gzip --best --to-stdout plugin-runner.8mandos \
545
523
.PHONY: install-client
546
524
install-client: install-client-nokey
547
525
# Post-installation stuff
548
 
        -$(BINDIR)/mandos-keygen --dir "$(KEYDIR)"
 
526
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
549
527
        if command -v update-initramfs >/dev/null; then \
550
528
            update-initramfs -k all -u; \
551
529
        elif command -v dracut >/dev/null; then \
563
541
 
564
542
.PHONY: uninstall-server
565
543
uninstall-server:
566
 
        -rm --force $(BINDIR)/mandos \
567
 
                $(BINDIR)/mandos-ctl \
568
 
                $(BINDIR)/mandos-monitor \
 
544
        -rm --force $(PREFIX)/sbin/mandos \
 
545
                $(PREFIX)/sbin/mandos-ctl \
 
546
                $(PREFIX)/sbin/mandos-monitor \
569
547
                $(MANDIR)/man8/mandos.8.gz \
570
548
                $(MANDIR)/man8/mandos-monitor.8.gz \
571
549
                $(MANDIR)/man8/mandos-ctl.8.gz \
580
558
# to use it.
581
559
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
582
560
                $(DESTDIR)/etc/crypttab
583
 
        -rm --force $(BINDIR)/mandos-keygen \
 
561
        -rm --force $(PREFIX)/sbin/mandos-keygen \
584
562
                $(LIBDIR)/mandos/plugin-runner \
585
563
                $(LIBDIR)/mandos/plugins.d/password-prompt \
586
564
                $(LIBDIR)/mandos/plugins.d/mandos-client \
625
603
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
626
604
                $(DESTDIR)/etc/default/mandos \
627
605
                $(DESTDIR)/etc/init.d/mandos \
 
606
                $(SYSTEMD)/mandos.service \
628
607
                $(DESTDIR)/run/mandos.pid \
629
608
                $(DESTDIR)/var/run/mandos.pid
630
 
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
631
 
                -rm --force -- $(SYSTEMD)/mandos.service; \
632
 
        fi
633
609
        -rmdir $(CONFDIR)
634
610
 
635
611
.PHONY: purge-client