/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-22 20:30:34 UTC
  • Revision ID: teddy@recompile.se-20241122203034-92q7483wxv29tqev
mandos-monitor: avoid deprecation warnings from urwid

The urwid.FlowWidget class is deprecated.  Replace it with inheriting
from urwid.Widget, and setting the appropriate class attribute.

* mandos-monitor: Replace any mentions of urwid.FlowWidget with
  urwid.Widget.
  (MandosClientWidget): Inherit from "urwid.Widget" instead of
  "urwid.FlowWidget".  Also, move MandosClientPropertyCache to first
  in inheritance list so that its __init__ method can absorb the
  "proxy_object" and "properties" keyword arguments.
  (MandosClientWidget._sizing): New class attribute; set to
  "frozenset(["flow"])".

(Thanks to an anonymous contributor for reporting this.)

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
 
56
57
 
57
58
## Use these settings for a traditional /usr/local install
58
59
# PREFIX:=$(DESTDIR)/usr/local
 
60
# BINDIR:=$(PREFIX)/sbin
59
61
# CONFDIR:=$(DESTDIR)/etc/mandos
60
62
# KEYDIR:=$(DESTDIR)/etc/mandos/keys
61
63
# MANDIR:=$(PREFIX)/man
63
65
# DRACUTMODULE:=$(DESTDIR)/usr/lib/dracut/modules.d/90mandos
64
66
# STATEDIR:=$(DESTDIR)/var/lib/mandos
65
67
# LIBDIR:=$(PREFIX)/lib
 
68
# DBUSPOLICYDIR:=$(DESTDIR)/etc/dbus-1/system.d
66
69
##
67
70
 
68
71
## These settings are for a package-type install
69
72
PREFIX:=$(DESTDIR)/usr
 
73
BINDIR:=$(PREFIX)/sbin
70
74
CONFDIR:=$(DESTDIR)/etc/mandos
71
75
KEYDIR:=$(DESTDIR)/etc/keys/mandos
72
76
MANDIR:=$(PREFIX)/share/man
83
87
                        break; \
84
88
                fi; \
85
89
        done)
 
90
DBUSPOLICYDIR:=$(DESTDIR)/usr/share/dbus-1/system.d
86
91
##
87
92
 
88
93
SYSTEMD:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
96
101
GNUTLS_LIBS:=$(shell $(PKG_CONFIG) --libs gnutls)
97
102
AVAHI_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I avahi-core)
98
103
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; \
 
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; \
101
108
        getconf LFS_LDFLAGS)
102
109
LIBNL3_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I libnl-route-3.0)
103
110
LIBNL3_LIBS:=$(shell $(PKG_CONFIG) --libs libnl-route-3.0)
106
113
 
107
114
# Do not change these two
108
115
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
109
 
        $(LANGUAGE) $(FEATURES) -DVERSION='"$(version)"'
 
116
        $(LANGUAGE) -DVERSION='"$(version)"'
110
117
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(strip \
111
118
        ) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
112
119
 
156
163
 
157
164
objects:=$(addsuffix .o,$(CPROGS))
158
165
 
 
166
.PHONY: all
159
167
all: $(PROGS) mandos.lsm
160
168
 
 
169
.PHONY: doc
161
170
doc: $(DOCS)
162
171
 
 
172
.PHONY: html
163
173
html: $(htmldocs)
164
174
 
165
175
%.5: %.xml common.ent legalnotice.xml
281
291
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
282
292
                $@)
283
293
 
 
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
 
284
304
# Need to add the GnuTLS, Avahi and GPGME libraries
285
 
plugins.d/mandos-client: plugins.d/mandos-client.c
286
 
        $(LINK.c) $^ $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(strip\
287
 
                ) $(GPGME_CFLAGS) $(GNUTLS_LIBS) $(strip\
288
 
                ) $(AVAHI_LIBS) $(GPGME_LIBS) $(LOADLIBES) $(strip\
289
 
                ) $(LDLIBS) -o $@
 
305
plugins.d/mandos-client: CFLAGS += $(GNUTLS_CFLAGS) $(strip \
 
306
        ) $(AVAHI_CFLAGS) $(GPGME_CFLAGS)
 
307
plugins.d/mandos-client: LDLIBS += $(GNUTLS_LIBS) $(strip \
 
308
        ) $(AVAHI_LIBS) $(GPGME_LIBS)
290
309
 
291
310
# Need to add the libnl-route library
292
 
plugin-helpers/mandos-client-iprouteadddel: plugin-helpers/mandos-client-iprouteadddel.c
293
 
        $(LINK.c) $(LIBNL3_CFLAGS) $^ $(LIBNL3_LIBS) $(strip\
294
 
                ) $(LOADLIBES) $(LDLIBS) -o $@
 
311
plugin-helpers/mandos-client-iprouteadddel: CFLAGS += $(LIBNL3_CFLAGS)
 
312
plugin-helpers/mandos-client-iprouteadddel: LDLIBS += $(LIBNL3_LIBS)
295
313
 
296
314
# Need to add the GLib and pthread libraries
297
 
dracut-module/password-agent: dracut-module/password-agent.c
298
 
        $(LINK.c) $(GLIB_CFLAGS) $^ $(GLIB_LIBS) -lpthread $(strip\
299
 
                ) $(LOADLIBES) $(LDLIBS) -o $@
300
 
 
301
 
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
302
 
        check run-client run-server install install-html \
303
 
        install-server install-client-nokey install-client uninstall \
304
 
        uninstall-server uninstall-client purge purge-server \
305
 
        purge-client
306
 
 
 
315
dracut-module/password-agent: CFLAGS += $(GLIB_CFLAGS)
 
316
# Note: -lpthread is unnecessary with the GNU C library 2.34 or later
 
317
dracut-module/password-agent: LDLIBS += $(GLIB_LIBS) -lpthread
 
318
 
 
319
.PHONY: clean
307
320
clean:
308
321
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
309
322
 
 
323
.PHONY: distclean
310
324
distclean: clean
 
325
.PHONY: mostlyclean
311
326
mostlyclean: clean
 
327
.PHONY: maintainer-clean
312
328
maintainer-clean: clean
313
329
        -rm --force --recursive keydir confdir statedir
314
330
 
 
331
.PHONY: check
315
332
check: all
316
333
        ./mandos --check
317
334
        ./mandos-ctl --check
321
338
        ./dracut-module/password-agent --test
322
339
 
323
340
# Run the client with a local config and key
 
341
.PHONY: run-client
324
342
run-client: all keydir/seckey.txt keydir/pubkey.txt \
325
343
                        keydir/tls-privkey.pem keydir/tls-pubkey.pem
326
344
        @echo '######################################################'
354
372
keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem: mandos-keygen
355
373
        install --directory keydir
356
374
        ./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
357
381
 
358
382
# Run the server with a local config
 
383
.PHONY: run-server
359
384
run-server: confdir/mandos.conf confdir/clients.conf statedir
360
385
        ./mandos --debug --no-dbus --configdir=confdir \
361
386
                --statedir=statedir $(SERVERARGS)
362
387
 
363
388
# Used by run-server
364
389
confdir/mandos.conf: mandos.conf
365
 
        install --directory confdir
366
 
        install --mode=u=rw,go=r $^ $@
 
390
        install -D --mode=u=rw,go=r $^ $@
367
391
confdir/clients.conf: clients.conf keydir/seckey.txt keydir/tls-pubkey.pem
368
 
        install --directory confdir
369
 
        install --mode=u=rw $< $@
 
392
        install -D --mode=u=rw $< $@
370
393
# Add a client password
371
394
        ./mandos-keygen --dir keydir --password --no-ssh >> $@
372
395
statedir:
373
396
        install --directory statedir
374
397
 
 
398
.PHONY: install
375
399
install: install-server install-client-nokey
376
400
 
 
401
.PHONY: install-html
377
402
install-html: html
378
 
        install --directory $(htmldir)
379
 
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
 
403
        install -D --mode=u=rw,go=r --target-directory=$(htmldir) \
380
404
                $(htmldocs)
381
405
 
 
406
.PHONY: install-server
382
407
install-server: doc
383
 
        install --directory $(CONFDIR)
384
408
        if install --directory --mode=u=rwx --owner=$(USER) \
385
409
                --group=$(GROUP) $(STATEDIR); then \
386
410
                :; \
387
411
        elif install --directory --mode=u=rwx $(STATEDIR); then \
388
412
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
389
413
        fi
390
 
        if [ "$(TMPFILES)" != "$(DESTDIR)" \
391
 
                        -a -d "$(TMPFILES)" ]; then \
392
 
                install --mode=u=rw,go=r tmpfiles.d-mandos.conf \
 
414
        if [ "$(TMPFILES)" != "$(DESTDIR)" ]; then \
 
415
                install -D --mode=u=rw,go=r tmpfiles.d-mandos.conf \
393
416
                        $(TMPFILES)/mandos.conf; \
394
417
        fi
395
 
        if [ "$(SYSUSERS)" != "$(DESTDIR)" \
396
 
                        -a -d "$(SYSUSERS)" ]; then \
397
 
                install --mode=u=rw,go=r sysusers.d-mandos.conf \
 
418
        if [ "$(SYSUSERS)" != "$(DESTDIR)" ]; then \
 
419
                install -D --mode=u=rw,go=r sysusers.d-mandos.conf \
398
420
                        $(SYSUSERS)/mandos.conf; \
399
421
        fi
400
 
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
401
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
 
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) \
402
425
                mandos-ctl
403
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
 
426
        install --mode=u=rwx,go=rx --target-directory=$(BINDIR) \
404
427
                mandos-monitor
 
428
        install --directory $(CONFDIR)
405
429
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
406
430
                mandos.conf
407
431
        install --mode=u=rw --target-directory=$(CONFDIR) \
408
432
                clients.conf
409
 
        install --mode=u=rw,go=r dbus-mandos.conf \
410
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
411
 
        install --mode=u=rwx,go=rx init.d-mandos \
 
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 \
412
436
                $(DESTDIR)/etc/init.d/mandos
413
 
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
414
 
                install --mode=u=rw,go=r mandos.service $(SYSTEMD); \
 
437
        if [ "$(SYSTEMD)" != "$(DESTDIR)" ]; then \
 
438
                install -D --mode=u=rw,go=r mandos.service \
 
439
                        $(SYSTEMD); \
415
440
        fi
416
 
        install --mode=u=rw,go=r default-mandos \
 
441
        install -D --mode=u=rw,go=r default-mandos \
417
442
                $(DESTDIR)/etc/default/mandos
418
443
        if [ -z $(DESTDIR) ]; then \
419
444
                update-rc.d mandos defaults 25 15;\
420
445
        fi
 
446
        install --directory $(MANDIR)/man8 $(MANDIR)/man5
421
447
        gzip --best --to-stdout mandos.8 \
422
448
                > $(MANDIR)/man8/mandos.8.gz
423
449
        gzip --best --to-stdout mandos-monitor.8 \
431
457
        gzip --best --to-stdout intro.8mandos \
432
458
                > $(MANDIR)/man8/intro.8mandos.gz
433
459
 
 
460
.PHONY: install-client-nokey
434
461
install-client-nokey: all doc
435
 
        install --directory $(LIBDIR)/mandos $(CONFDIR)
436
462
        install --directory --mode=u=rwx $(KEYDIR) \
437
463
                $(LIBDIR)/mandos/plugins.d \
438
464
                $(LIBDIR)/mandos/plugin-helpers
439
 
        if [ "$(SYSUSERS)" != "$(DESTDIR)" \
440
 
                        -a -d "$(SYSUSERS)" ]; then \
441
 
                install --mode=u=rw,go=r sysusers.d-mandos.conf \
 
465
        if [ "$(SYSUSERS)" != "$(DESTDIR)" ]; then \
 
466
                install -D --mode=u=rw,go=r sysusers.d-mandos.conf \
442
467
                        $(SYSUSERS)/mandos-client.conf; \
443
468
        fi
444
469
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
445
 
                install --mode=u=rwx \
446
 
                        --directory "$(CONFDIR)/plugins.d" \
 
470
                install --directory \
 
471
                        --mode=u=rwx "$(CONFDIR)/plugins.d" \
447
472
                        "$(CONFDIR)/plugin-helpers"; \
448
473
        fi
449
 
        install --mode=u=rwx,go=rx --directory \
 
474
        install --directory --mode=u=rwx,go=rx \
450
475
                "$(CONFDIR)/network-hooks.d"
451
476
        install --mode=u=rwx,go=rx \
452
477
                --target-directory=$(LIBDIR)/mandos plugin-runner
453
478
        install --mode=u=rwx,go=rx \
454
479
                --target-directory=$(LIBDIR)/mandos \
455
480
                mandos-to-cryptroot-unlock
456
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
 
481
        install --directory $(BINDIR)
 
482
        install --mode=u=rwx,go=rx --target-directory=$(BINDIR) \
457
483
                mandos-keygen
458
484
        install --mode=u=rwx,go=rx \
459
485
                --target-directory=$(LIBDIR)/mandos/plugins.d \
476
502
        install --mode=u=rwx,go=rx \
477
503
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
478
504
                plugin-helpers/mandos-client-iprouteadddel
479
 
        install initramfs-tools-hook \
 
505
        install -D initramfs-tools-hook \
480
506
                $(INITRAMFSTOOLS)/hooks/mandos
481
 
        install --mode=u=rw,go=r initramfs-tools-conf \
 
507
        install -D --mode=u=rw,go=r initramfs-tools-conf \
482
508
                $(INITRAMFSTOOLS)/conf.d/mandos-conf
483
 
        install --mode=u=rw,go=r initramfs-tools-conf-hook \
 
509
        install -D --mode=u=rw,go=r initramfs-tools-conf-hook \
484
510
                $(INITRAMFSTOOLS)/conf-hooks.d/zz-mandos
485
 
        install initramfs-tools-script \
 
511
        install -D initramfs-tools-script \
486
512
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
487
 
        install initramfs-tools-script-stop \
 
513
        install -D initramfs-tools-script-stop \
488
514
                $(INITRAMFSTOOLS)/scripts/local-premount/mandos
489
 
        install --directory $(DRACUTMODULE)
490
 
        install --mode=u=rw,go=r --target-directory=$(DRACUTMODULE) \
 
515
        install -D --mode=u=rw,go=r \
 
516
                --target-directory=$(DRACUTMODULE) \
491
517
                dracut-module/ask-password-mandos.path \
492
518
                dracut-module/ask-password-mandos.service
493
519
        install --mode=u=rwxs,go=rx \
496
522
                dracut-module/cmdline-mandos.sh \
497
523
                dracut-module/password-agent
498
524
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
 
525
        install --directory $(MANDIR)/man8
499
526
        gzip --best --to-stdout mandos-keygen.8 \
500
527
                > $(MANDIR)/man8/mandos-keygen.8.gz
501
528
        gzip --best --to-stdout plugin-runner.8mandos \
515
542
        gzip --best --to-stdout dracut-module/password-agent.8mandos \
516
543
                > $(MANDIR)/man8/password-agent.8mandos.gz
517
544
 
 
545
.PHONY: install-client
518
546
install-client: install-client-nokey
519
547
# Post-installation stuff
520
 
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
 
548
        -$(BINDIR)/mandos-keygen --dir "$(KEYDIR)"
521
549
        if command -v update-initramfs >/dev/null; then \
522
550
            update-initramfs -k all -u; \
523
551
        elif command -v dracut >/dev/null; then \
530
558
        fi
531
559
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
532
560
 
 
561
.PHONY: uninstall
533
562
uninstall: uninstall-server uninstall-client
534
563
 
 
564
.PHONY: uninstall-server
535
565
uninstall-server:
536
 
        -rm --force $(PREFIX)/sbin/mandos \
537
 
                $(PREFIX)/sbin/mandos-ctl \
538
 
                $(PREFIX)/sbin/mandos-monitor \
 
566
        -rm --force $(BINDIR)/mandos \
 
567
                $(BINDIR)/mandos-ctl \
 
568
                $(BINDIR)/mandos-monitor \
539
569
                $(MANDIR)/man8/mandos.8.gz \
540
570
                $(MANDIR)/man8/mandos-monitor.8.gz \
541
571
                $(MANDIR)/man8/mandos-ctl.8.gz \
544
574
        update-rc.d -f mandos remove
545
575
        -rmdir $(CONFDIR)
546
576
 
 
577
.PHONY: uninstall-client
547
578
uninstall-client:
548
579
# Refuse to uninstall client if /etc/crypttab is explicitly configured
549
580
# to use it.
550
581
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
551
582
                $(DESTDIR)/etc/crypttab
552
 
        -rm --force $(PREFIX)/sbin/mandos-keygen \
 
583
        -rm --force $(BINDIR)/mandos-keygen \
553
584
                $(LIBDIR)/mandos/plugin-runner \
554
585
                $(LIBDIR)/mandos/plugins.d/password-prompt \
555
586
                $(LIBDIR)/mandos/plugins.d/mandos-client \
585
616
            done; \
586
617
        fi
587
618
 
 
619
.PHONY: purge
588
620
purge: purge-server purge-client
589
621
 
 
622
.PHONY: purge-server
590
623
purge-server: uninstall-server
591
624
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
592
625
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
593
626
                $(DESTDIR)/etc/default/mandos \
594
627
                $(DESTDIR)/etc/init.d/mandos \
595
 
                $(SYSTEMD)/mandos.service \
596
628
                $(DESTDIR)/run/mandos.pid \
597
629
                $(DESTDIR)/var/run/mandos.pid
 
630
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
 
631
                -rm --force -- $(SYSTEMD)/mandos.service; \
 
632
        fi
598
633
        -rmdir $(CONFDIR)
599
634
 
 
635
.PHONY: purge-client
600
636
purge-client: uninstall-client
601
637
        -shred --remove $(KEYDIR)/seckey.txt $(KEYDIR)/tls-privkey.pem
602
638
        -rm --force $(CONFDIR)/plugin-runner.conf \