/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: Teddy Hogeborn
  • Date: 2024-09-08 02:18:57 UTC
  • mto: This revision was merged to the branch mainline in revision 410.
  • Revision ID: teddy@recompile.se-20240908021857-821e09dd4mp37h9k
Be more tolerant when a client is misconfigured in clients.conf

* mandos (Client/config_parser): If a client config section in
  clients.conf lacks both a fingerprint= and a key_id= setting, show
  an error and skip that client instead of crashing.

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.16
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
 
156
161
 
157
162
objects:=$(addsuffix .o,$(CPROGS))
158
163
 
 
164
.PHONY: all
159
165
all: $(PROGS) mandos.lsm
160
166
 
 
167
.PHONY: doc
161
168
doc: $(DOCS)
162
169
 
 
170
.PHONY: html
163
171
html: $(htmldocs)
164
172
 
165
173
%.5: %.xml common.ent legalnotice.xml
293
301
 
294
302
# Need to add the GLib and pthread libraries
295
303
dracut-module/password-agent: CFLAGS += $(GLIB_CFLAGS)
 
304
# Note: -lpthread is unnecessary with the GNU C library 2.34 or later
296
305
dracut-module/password-agent: LDLIBS += $(GLIB_LIBS) -lpthread
297
306
 
298
 
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
299
 
        check run-client run-server install install-html \
300
 
        install-server install-client-nokey install-client uninstall \
301
 
        uninstall-server uninstall-client purge purge-server \
302
 
        purge-client
303
 
 
 
307
.PHONY: clean
304
308
clean:
305
309
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
306
310
 
 
311
.PHONY: distclean
307
312
distclean: clean
 
313
.PHONY: mostlyclean
308
314
mostlyclean: clean
 
315
.PHONY: maintainer-clean
309
316
maintainer-clean: clean
310
317
        -rm --force --recursive keydir confdir statedir
311
318
 
 
319
.PHONY: check
312
320
check: all
313
321
        ./mandos --check
314
322
        ./mandos-ctl --check
318
326
        ./dracut-module/password-agent --test
319
327
 
320
328
# Run the client with a local config and key
 
329
.PHONY: run-client
321
330
run-client: all keydir/seckey.txt keydir/pubkey.txt \
322
331
                        keydir/tls-privkey.pem keydir/tls-pubkey.pem
323
332
        @echo '######################################################'
351
360
keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem: mandos-keygen
352
361
        install --directory keydir
353
362
        ./mandos-keygen --dir keydir --force
 
363
        if ! [ -e keydir/tls-privkey.pem ]; then \
 
364
                install --mode=u=rw /dev/null keydir/tls-privkey.pem; \
 
365
        fi
 
366
        if ! [ -e keydir/tls-pubkey.pem ]; then \
 
367
                install --mode=u=rw /dev/null keydir/tls-pubkey.pem; \
 
368
        fi
354
369
 
355
370
# Run the server with a local config
 
371
.PHONY: run-server
356
372
run-server: confdir/mandos.conf confdir/clients.conf statedir
357
373
        ./mandos --debug --no-dbus --configdir=confdir \
358
374
                --statedir=statedir $(SERVERARGS)
369
385
statedir:
370
386
        install --directory statedir
371
387
 
 
388
.PHONY: install
372
389
install: install-server install-client-nokey
373
390
 
 
391
.PHONY: install-html
374
392
install-html: html
375
393
        install --directory $(htmldir)
376
394
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
377
395
                $(htmldocs)
378
396
 
 
397
.PHONY: install-server
379
398
install-server: doc
380
399
        install --directory $(CONFDIR)
381
400
        if install --directory --mode=u=rwx --owner=$(USER) \
404
423
        install --mode=u=rw --target-directory=$(CONFDIR) \
405
424
                clients.conf
406
425
        install --mode=u=rw,go=r dbus-mandos.conf \
407
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
 
426
                $(DBUSPOLICYDIR)/mandos.conf
408
427
        install --mode=u=rwx,go=rx init.d-mandos \
409
428
                $(DESTDIR)/etc/init.d/mandos
410
429
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
428
447
        gzip --best --to-stdout intro.8mandos \
429
448
                > $(MANDIR)/man8/intro.8mandos.gz
430
449
 
 
450
.PHONY: install-client-nokey
431
451
install-client-nokey: all doc
432
452
        install --directory $(LIBDIR)/mandos $(CONFDIR)
433
453
        install --directory --mode=u=rwx $(KEYDIR) \
512
532
        gzip --best --to-stdout dracut-module/password-agent.8mandos \
513
533
                > $(MANDIR)/man8/password-agent.8mandos.gz
514
534
 
 
535
.PHONY: install-client
515
536
install-client: install-client-nokey
516
537
# Post-installation stuff
517
538
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
527
548
        fi
528
549
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
529
550
 
 
551
.PHONY: uninstall
530
552
uninstall: uninstall-server uninstall-client
531
553
 
 
554
.PHONY: uninstall-server
532
555
uninstall-server:
533
556
        -rm --force $(PREFIX)/sbin/mandos \
534
557
                $(PREFIX)/sbin/mandos-ctl \
541
564
        update-rc.d -f mandos remove
542
565
        -rmdir $(CONFDIR)
543
566
 
 
567
.PHONY: uninstall-client
544
568
uninstall-client:
545
569
# Refuse to uninstall client if /etc/crypttab is explicitly configured
546
570
# to use it.
582
606
            done; \
583
607
        fi
584
608
 
 
609
.PHONY: purge
585
610
purge: purge-server purge-client
586
611
 
 
612
.PHONY: purge-server
587
613
purge-server: uninstall-server
588
614
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
589
615
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
594
620
                $(DESTDIR)/var/run/mandos.pid
595
621
        -rmdir $(CONFDIR)
596
622
 
 
623
.PHONY: purge-client
597
624
purge-client: uninstall-client
598
625
        -shred --remove $(KEYDIR)/seckey.txt $(KEYDIR)/tls-privkey.pem
599
626
        -rm --force $(CONFDIR)/plugin-runner.conf \