/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.16
 
46
version:=1.8.9
48
47
SED:=sed
49
48
PKG_CONFIG?=pkg-config
50
49
 
64
63
# DRACUTMODULE:=$(DESTDIR)/usr/lib/dracut/modules.d/90mandos
65
64
# STATEDIR:=$(DESTDIR)/var/lib/mandos
66
65
# LIBDIR:=$(PREFIX)/lib
67
 
# DBUSPOLICYDIR:=$(DESTDIR)/etc/dbus-1/system.d
68
66
##
69
67
 
70
68
## These settings are for a package-type install
85
83
                        break; \
86
84
                fi; \
87
85
        done)
88
 
DBUSPOLICYDIR:=$(DESTDIR)/usr/share/dbus-1/system.d
89
86
##
90
87
 
91
88
SYSTEMD:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
99
96
GNUTLS_LIBS:=$(shell $(PKG_CONFIG) --libs gnutls)
100
97
AVAHI_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I avahi-core)
101
98
AVAHI_LIBS:=$(shell $(PKG_CONFIG) --libs avahi-core)
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; \
 
99
GPGME_CFLAGS:=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
 
100
GPGME_LIBS:=$(shell gpgme-config --libs; getconf LFS_LIBS; \
106
101
        getconf LFS_LDFLAGS)
107
102
LIBNL3_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I libnl-route-3.0)
108
103
LIBNL3_LIBS:=$(shell $(PKG_CONFIG) --libs libnl-route-3.0)
111
106
 
112
107
# Do not change these two
113
108
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
114
 
        $(LANGUAGE) -DVERSION='"$(version)"'
 
109
        $(LANGUAGE) $(FEATURES) -DVERSION='"$(version)"'
115
110
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(strip \
116
111
        ) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
117
112
 
289
284
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
290
285
                $@)
291
286
 
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 && 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
 
 
302
287
# Need to add the GnuTLS, Avahi and GPGME libraries
303
288
plugins.d/mandos-client: CFLAGS += $(GNUTLS_CFLAGS) $(strip \
304
289
        ) $(AVAHI_CFLAGS) $(GPGME_CFLAGS)
311
296
 
312
297
# Need to add the GLib and pthread libraries
313
298
dracut-module/password-agent: CFLAGS += $(GLIB_CFLAGS)
314
 
# Note: -lpthread is unnecessary with the GNU C library 2.34 or later
315
299
dracut-module/password-agent: LDLIBS += $(GLIB_LIBS) -lpthread
316
300
 
317
301
.PHONY: clean
370
354
keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem: mandos-keygen
371
355
        install --directory keydir
372
356
        ./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
379
357
 
380
358
# Run the server with a local config
381
359
.PHONY: run-server
385
363
 
386
364
# Used by run-server
387
365
confdir/mandos.conf: mandos.conf
388
 
        install -D --mode=u=rw,go=r $^ $@
 
366
        install --directory confdir
 
367
        install --mode=u=rw,go=r $^ $@
389
368
confdir/clients.conf: clients.conf keydir/seckey.txt keydir/tls-pubkey.pem
390
 
        install -D --mode=u=rw $< $@
 
369
        install --directory confdir
 
370
        install --mode=u=rw $< $@
391
371
# Add a client password
392
372
        ./mandos-keygen --dir keydir --password --no-ssh >> $@
393
373
statedir:
398
378
 
399
379
.PHONY: install-html
400
380
install-html: html
401
 
        install -D --mode=u=rw,go=r --target-directory=$(htmldir) \
 
381
        install --directory $(htmldir)
 
382
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
402
383
                $(htmldocs)
403
384
 
404
385
.PHONY: install-server
405
386
install-server: doc
 
387
        install --directory $(CONFDIR)
406
388
        if install --directory --mode=u=rwx --owner=$(USER) \
407
389
                --group=$(GROUP) $(STATEDIR); then \
408
390
                :; \
409
391
        elif install --directory --mode=u=rwx $(STATEDIR); then \
410
392
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
411
393
        fi
412
 
        if [ "$(TMPFILES)" != "$(DESTDIR)" ]; then \
413
 
                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 \
414
397
                        $(TMPFILES)/mandos.conf; \
415
398
        fi
416
 
        if [ "$(SYSUSERS)" != "$(DESTDIR)" ]; then \
417
 
                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 \
418
402
                        $(SYSUSERS)/mandos.conf; \
419
403
        fi
420
 
        install --directory $(PREFIX)/sbin
421
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
422
 
                mandos
 
404
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
423
405
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
424
406
                mandos-ctl
425
407
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
426
408
                mandos-monitor
427
 
        install --directory $(CONFDIR)
428
409
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
429
410
                mandos.conf
430
411
        install --mode=u=rw --target-directory=$(CONFDIR) \
431
412
                clients.conf
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 \
 
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 \
435
416
                $(DESTDIR)/etc/init.d/mandos
436
 
        if [ "$(SYSTEMD)" != "$(DESTDIR)" ]; then \
437
 
                install -D --mode=u=rw,go=r mandos.service \
438
 
                        $(SYSTEMD); \
 
417
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
 
418
                install --mode=u=rw,go=r mandos.service $(SYSTEMD); \
439
419
        fi
440
 
        install -D --mode=u=rw,go=r default-mandos \
 
420
        install --mode=u=rw,go=r default-mandos \
441
421
                $(DESTDIR)/etc/default/mandos
442
422
        if [ -z $(DESTDIR) ]; then \
443
423
                update-rc.d mandos defaults 25 15;\
444
424
        fi
445
 
        install --directory $(MANDIR)/man8 $(MANDIR)/man5
446
425
        gzip --best --to-stdout mandos.8 \
447
426
                > $(MANDIR)/man8/mandos.8.gz
448
427
        gzip --best --to-stdout mandos-monitor.8 \
458
437
 
459
438
.PHONY: install-client-nokey
460
439
install-client-nokey: all doc
 
440
        install --directory $(LIBDIR)/mandos $(CONFDIR)
461
441
        install --directory --mode=u=rwx $(KEYDIR) \
462
442
                $(LIBDIR)/mandos/plugins.d \
463
443
                $(LIBDIR)/mandos/plugin-helpers
464
 
        if [ "$(SYSUSERS)" != "$(DESTDIR)" ]; then \
465
 
                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 \
466
447
                        $(SYSUSERS)/mandos-client.conf; \
467
448
        fi
468
449
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
469
 
                install --directory \
470
 
                        --mode=u=rwx "$(CONFDIR)/plugins.d" \
 
450
                install --mode=u=rwx \
 
451
                        --directory "$(CONFDIR)/plugins.d" \
471
452
                        "$(CONFDIR)/plugin-helpers"; \
472
453
        fi
473
 
        install --directory --mode=u=rwx,go=rx \
 
454
        install --mode=u=rwx,go=rx --directory \
474
455
                "$(CONFDIR)/network-hooks.d"
475
456
        install --mode=u=rwx,go=rx \
476
457
                --target-directory=$(LIBDIR)/mandos plugin-runner
477
458
        install --mode=u=rwx,go=rx \
478
459
                --target-directory=$(LIBDIR)/mandos \
479
460
                mandos-to-cryptroot-unlock
480
 
        install --directory $(PREFIX)/sbin
481
461
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
482
462
                mandos-keygen
483
463
        install --mode=u=rwx,go=rx \
501
481
        install --mode=u=rwx,go=rx \
502
482
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
503
483
                plugin-helpers/mandos-client-iprouteadddel
504
 
        install -D initramfs-tools-hook \
 
484
        install initramfs-tools-hook \
505
485
                $(INITRAMFSTOOLS)/hooks/mandos
506
 
        install -D --mode=u=rw,go=r initramfs-tools-conf \
 
486
        install --mode=u=rw,go=r initramfs-tools-conf \
507
487
                $(INITRAMFSTOOLS)/conf.d/mandos-conf
508
 
        install -D --mode=u=rw,go=r initramfs-tools-conf-hook \
 
488
        install --mode=u=rw,go=r initramfs-tools-conf-hook \
509
489
                $(INITRAMFSTOOLS)/conf-hooks.d/zz-mandos
510
 
        install -D initramfs-tools-script \
 
490
        install initramfs-tools-script \
511
491
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
512
 
        install -D initramfs-tools-script-stop \
 
492
        install initramfs-tools-script-stop \
513
493
                $(INITRAMFSTOOLS)/scripts/local-premount/mandos
514
 
        install -D --mode=u=rw,go=r \
515
 
                --target-directory=$(DRACUTMODULE) \
 
494
        install --directory $(DRACUTMODULE)
 
495
        install --mode=u=rw,go=r --target-directory=$(DRACUTMODULE) \
516
496
                dracut-module/ask-password-mandos.path \
517
497
                dracut-module/ask-password-mandos.service
518
498
        install --mode=u=rwxs,go=rx \
521
501
                dracut-module/cmdline-mandos.sh \
522
502
                dracut-module/password-agent
523
503
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
524
 
        install --directory $(MANDIR)/man8
525
504
        gzip --best --to-stdout mandos-keygen.8 \
526
505
                > $(MANDIR)/man8/mandos-keygen.8.gz
527
506
        gzip --best --to-stdout plugin-runner.8mandos \
624
603
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
625
604
                $(DESTDIR)/etc/default/mandos \
626
605
                $(DESTDIR)/etc/init.d/mandos \
 
606
                $(SYSTEMD)/mandos.service \
627
607
                $(DESTDIR)/run/mandos.pid \
628
608
                $(DESTDIR)/var/run/mandos.pid
629
 
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
630
 
                -rm --force -- $(SYSTEMD)/mandos.service; \
631
 
        fi
632
609
        -rmdir $(CONFDIR)
633
610
 
634
611
.PHONY: purge-client