/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: 2023-02-11 06:46:26 UTC
  • Revision ID: teddy@recompile.se-20230211064626-2aqhtdd46jbif6h6
Really enable FORTIFY_SOURCE=3

Use -DFORTIFY_SOURCE=3 by appending it to CPPFLAGS directly instead of
adding it indirectly to CFLAGS.

* Makefile (FORTIFY): Remove "-D_FORTIFY_SOURCE=3".
  (Fortify section/CPPFLAGS): New; append "-D_FORTIFY_SOURCE=3".
  (FEATURES): Remove.  Contents moved to CPPFLAGS.
  (CPPFLAGS): New; append "-D_FILE_OFFSET_BITS=64".
  (CFLAGS): Do not use "$(FEATURES)".

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
 
45
CPPFLAGS+=-D_FILE_OFFSET_BITS=64
44
46
htmldir:=man
45
 
version:=1.8.4
 
47
version:=1.8.16
46
48
SED:=sed
 
49
PKG_CONFIG?=pkg-config
47
50
 
48
51
USER:=$(firstword $(subst :, ,$(shell getent passwd _mandos \
49
52
        || getent passwd nobody || echo 65534)))
50
53
GROUP:=$(firstword $(subst :, ,$(shell getent group _mandos \
51
54
        || getent group nogroup || echo 65534)))
52
55
 
 
56
LINUXVERSION:=$(shell uname --kernel-release)
 
57
 
53
58
## Use these settings for a traditional /usr/local install
54
59
# PREFIX:=$(DESTDIR)/usr/local
55
60
# CONFDIR:=$(DESTDIR)/etc/mandos
71
76
STATEDIR:=$(DESTDIR)/var/lib/mandos
72
77
LIBDIR:=$(shell \
73
78
        for d in \
74
 
        "/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null`" \
 
79
        "/usr/lib/`dpkg-architecture \
 
80
                        -qDEB_HOST_MULTIARCH 2>/dev/null`" \
75
81
        "`rpm --eval='%{_libdir}' 2>/dev/null`" /usr/lib; do \
76
82
                if [ -d "$$d" -a "$$d" = "$${d%/}" ]; then \
77
83
                        echo "$(DESTDIR)$$d"; \
80
86
        done)
81
87
##
82
88
 
83
 
SYSTEMD:=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
84
 
TMPFILES:=$(DESTDIR)$(shell pkg-config systemd --variable=tmpfilesdir)
 
89
SYSTEMD:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
 
90
                        --variable=systemdsystemunitdir)
 
91
TMPFILES:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
 
92
                        --variable=tmpfilesdir)
 
93
SYSUSERS:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
 
94
                        --variable=sysusersdir)
85
95
 
86
 
GNUTLS_CFLAGS:=$(shell pkg-config --cflags-only-I gnutls)
87
 
GNUTLS_LIBS:=$(shell pkg-config --libs gnutls)
88
 
AVAHI_CFLAGS:=$(shell pkg-config --cflags-only-I avahi-core)
89
 
AVAHI_LIBS:=$(shell pkg-config --libs avahi-core)
90
 
GPGME_CFLAGS:=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
91
 
GPGME_LIBS:=$(shell gpgme-config --libs; getconf LFS_LIBS; \
 
96
GNUTLS_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I gnutls)
 
97
GNUTLS_LIBS:=$(shell $(PKG_CONFIG) --libs gnutls)
 
98
AVAHI_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I avahi-core)
 
99
AVAHI_LIBS:=$(shell $(PKG_CONFIG) --libs avahi-core)
 
100
GPGME_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I gpgme 2>/dev/null \
 
101
        || gpgme-config --cflags; getconf LFS_CFLAGS)
 
102
GPGME_LIBS:=$(shell $(PKG_CONFIG) --libs gpgme 2>/dev/null \
 
103
        || gpgme-config --libs; getconf LFS_LIBS; \
92
104
        getconf LFS_LDFLAGS)
93
 
LIBNL3_CFLAGS:=$(shell pkg-config --cflags-only-I libnl-route-3.0)
94
 
LIBNL3_LIBS:=$(shell pkg-config --libs libnl-route-3.0)
95
 
GLIB_CFLAGS:=$(shell pkg-config --cflags glib-2.0)
96
 
GLIB_LIBS:=$(shell pkg-config --libs glib-2.0)
 
105
LIBNL3_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I libnl-route-3.0)
 
106
LIBNL3_LIBS:=$(shell $(PKG_CONFIG) --libs libnl-route-3.0)
 
107
GLIB_CFLAGS:=$(shell $(PKG_CONFIG) --cflags glib-2.0)
 
108
GLIB_LIBS:=$(shell $(PKG_CONFIG) --libs glib-2.0)
97
109
 
98
110
# Do not change these two
99
 
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) \
100
 
        $(OPTIMIZE) $(LANGUAGE) -DVERSION='"$(version)"'
 
111
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
 
112
        $(LANGUAGE) -DVERSION='"$(version)"'
101
113
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(strip \
102
114
        ) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
103
115
 
147
159
 
148
160
objects:=$(addsuffix .o,$(CPROGS))
149
161
 
 
162
.PHONY: all
150
163
all: $(PROGS) mandos.lsm
151
164
 
 
165
.PHONY: doc
152
166
doc: $(DOCS)
153
167
 
 
168
.PHONY: html
154
169
html: $(htmldocs)
155
170
 
156
171
%.5: %.xml common.ent legalnotice.xml
273
288
                $@)
274
289
 
275
290
# Need to add the GnuTLS, Avahi and GPGME libraries
276
 
plugins.d/mandos-client: plugins.d/mandos-client.c
277
 
        $(LINK.c) $^ $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(strip\
278
 
                ) $(GPGME_CFLAGS) $(GNUTLS_LIBS) $(strip\
279
 
                ) $(AVAHI_LIBS) $(GPGME_LIBS) $(LOADLIBES) $(strip\
280
 
                ) $(LDLIBS) -o $@
 
291
plugins.d/mandos-client: CFLAGS += $(GNUTLS_CFLAGS) $(strip \
 
292
        ) $(AVAHI_CFLAGS) $(GPGME_CFLAGS)
 
293
plugins.d/mandos-client: LDLIBS += $(GNUTLS_LIBS) $(strip \
 
294
        ) $(AVAHI_LIBS) $(GPGME_LIBS)
281
295
 
282
296
# Need to add the libnl-route library
283
 
plugin-helpers/mandos-client-iprouteadddel: plugin-helpers/mandos-client-iprouteadddel.c
284
 
        $(LINK.c) $(LIBNL3_CFLAGS) $^ $(LIBNL3_LIBS) $(strip\
285
 
                ) $(LOADLIBES) $(LDLIBS) -o $@
 
297
plugin-helpers/mandos-client-iprouteadddel: CFLAGS += $(LIBNL3_CFLAGS)
 
298
plugin-helpers/mandos-client-iprouteadddel: LDLIBS += $(LIBNL3_LIBS)
286
299
 
287
300
# Need to add the GLib and pthread libraries
288
 
dracut-module/password-agent: dracut-module/password-agent.c
289
 
        $(LINK.c) $(GLIB_CFLAGS) $^ $(GLIB_LIBS) -lpthread $(strip\
290
 
                ) $(LOADLIBES) $(LDLIBS) -o $@
291
 
 
292
 
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
293
 
        check run-client run-server install install-html \
294
 
        install-server install-client-nokey install-client uninstall \
295
 
        uninstall-server uninstall-client purge purge-server \
296
 
        purge-client
297
 
 
 
301
dracut-module/password-agent: CFLAGS += $(GLIB_CFLAGS)
 
302
# Note: -lpthread is unnecessary with the GNU C library 2.34 or later
 
303
dracut-module/password-agent: LDLIBS += $(GLIB_LIBS) -lpthread
 
304
 
 
305
.PHONY: clean
298
306
clean:
299
307
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
300
308
 
 
309
.PHONY: distclean
301
310
distclean: clean
 
311
.PHONY: mostlyclean
302
312
mostlyclean: clean
 
313
.PHONY: maintainer-clean
303
314
maintainer-clean: clean
304
315
        -rm --force --recursive keydir confdir statedir
305
316
 
 
317
.PHONY: check
306
318
check: all
307
319
        ./mandos --check
308
320
        ./mandos-ctl --check
312
324
        ./dracut-module/password-agent --test
313
325
 
314
326
# Run the client with a local config and key
315
 
run-client: all keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem
316
 
        @echo "###################################################################"
317
 
        @echo "# The following error messages are harmless and can be safely     #"
318
 
        @echo "# ignored:                                                        #"
319
 
        @echo "# From plugin-runner: setgid: Operation not permitted             #"
320
 
        @echo "#                     setuid: Operation not permitted             #"
321
 
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
322
 
        @echo "# From mandos-client:                                             #"
323
 
        @echo "#             Failed to raise privileges: Operation not permitted #"
324
 
        @echo "#             Warning: network hook \"*\" exited with status *      #"
325
 
        @echo "#                                                                 #"
326
 
        @echo "# (The messages are caused by not running as root, but you should #"
327
 
        @echo "# NOT run \"make run-client\" as root unless you also unpacked and  #"
328
 
        @echo "# compiled Mandos as root, which is also NOT recommended.)        #"
329
 
        @echo "###################################################################"
 
327
.PHONY: run-client
 
328
run-client: all keydir/seckey.txt keydir/pubkey.txt \
 
329
                        keydir/tls-privkey.pem keydir/tls-pubkey.pem
 
330
        @echo '######################################################'
 
331
        @echo '# The following error messages are harmless and can  #'
 
332
        @echo '#  be safely ignored:                                #'
 
333
        @echo '## From plugin-runner:                               #'
 
334
        @echo '# setgid: Operation not permitted                    #'
 
335
        @echo '# setuid: Operation not permitted                    #'
 
336
        @echo '## From askpass-fifo:                                #'
 
337
        @echo '# mkfifo: Permission denied                          #'
 
338
        @echo '## From mandos-client:                               #'
 
339
        @echo '# Failed to raise privileges: Operation not permi... #'
 
340
        @echo '# Warning: network hook "*" exited with status *     #'
 
341
        @echo '# ioctl SIOCSIFFLAGS +IFF_UP: Operation not permi... #'
 
342
        @echo '# Failed to bring up interface "*": Operation not... #'
 
343
        @echo '#                                                    #'
 
344
        @echo '# (The messages are caused by not running as root,   #'
 
345
        @echo '# but you should NOT run "make run-client" as root   #'
 
346
        @echo '# unless you also unpacked and compiled Mandos as    #'
 
347
        @echo '# root, which is also NOT recommended.)              #'
 
348
        @echo '######################################################'
330
349
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
331
350
        ./plugin-runner --plugin-dir=plugins.d \
332
351
                --plugin-helper-dir=plugin-helpers \
339
358
keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem: mandos-keygen
340
359
        install --directory keydir
341
360
        ./mandos-keygen --dir keydir --force
 
361
        if ! [ -e keydir/tls-privkey.pem ]; then \
 
362
                install --mode=u=rw /dev/null keydir/tls-privkey.pem; \
 
363
        fi
 
364
        if ! [ -e keydir/tls-pubkey.pem ]; then \
 
365
                install --mode=u=rw /dev/null keydir/tls-pubkey.pem; \
 
366
        fi
342
367
 
343
368
# Run the server with a local config
 
369
.PHONY: run-server
344
370
run-server: confdir/mandos.conf confdir/clients.conf statedir
345
371
        ./mandos --debug --no-dbus --configdir=confdir \
346
372
                --statedir=statedir $(SERVERARGS)
357
383
statedir:
358
384
        install --directory statedir
359
385
 
 
386
.PHONY: install
360
387
install: install-server install-client-nokey
361
388
 
 
389
.PHONY: install-html
362
390
install-html: html
363
391
        install --directory $(htmldir)
364
392
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
365
393
                $(htmldocs)
366
394
 
 
395
.PHONY: install-server
367
396
install-server: doc
368
397
        install --directory $(CONFDIR)
369
398
        if install --directory --mode=u=rwx --owner=$(USER) \
372
401
        elif install --directory --mode=u=rwx $(STATEDIR); then \
373
402
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
374
403
        fi
375
 
        if [ "$(TMPFILES)" != "$(DESTDIR)" -a -d "$(TMPFILES)" ]; then \
 
404
        if [ "$(TMPFILES)" != "$(DESTDIR)" \
 
405
                        -a -d "$(TMPFILES)" ]; then \
376
406
                install --mode=u=rw,go=r tmpfiles.d-mandos.conf \
377
407
                        $(TMPFILES)/mandos.conf; \
378
408
        fi
 
409
        if [ "$(SYSUSERS)" != "$(DESTDIR)" \
 
410
                        -a -d "$(SYSUSERS)" ]; then \
 
411
                install --mode=u=rw,go=r sysusers.d-mandos.conf \
 
412
                        $(SYSUSERS)/mandos.conf; \
 
413
        fi
379
414
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
380
415
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
381
416
                mandos-ctl
410
445
        gzip --best --to-stdout intro.8mandos \
411
446
                > $(MANDIR)/man8/intro.8mandos.gz
412
447
 
 
448
.PHONY: install-client-nokey
413
449
install-client-nokey: all doc
414
450
        install --directory $(LIBDIR)/mandos $(CONFDIR)
415
451
        install --directory --mode=u=rwx $(KEYDIR) \
416
452
                $(LIBDIR)/mandos/plugins.d \
417
453
                $(LIBDIR)/mandos/plugin-helpers
 
454
        if [ "$(SYSUSERS)" != "$(DESTDIR)" \
 
455
                        -a -d "$(SYSUSERS)" ]; then \
 
456
                install --mode=u=rw,go=r sysusers.d-mandos.conf \
 
457
                        $(SYSUSERS)/mandos-client.conf; \
 
458
        fi
418
459
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
419
460
                install --mode=u=rwx \
420
461
                        --directory "$(CONFDIR)/plugins.d" \
425
466
        install --mode=u=rwx,go=rx \
426
467
                --target-directory=$(LIBDIR)/mandos plugin-runner
427
468
        install --mode=u=rwx,go=rx \
428
 
                --target-directory=$(LIBDIR)/mandos mandos-to-cryptroot-unlock
 
469
                --target-directory=$(LIBDIR)/mandos \
 
470
                mandos-to-cryptroot-unlock
429
471
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
430
472
                mandos-keygen
431
473
        install --mode=u=rwx,go=rx \
488
530
        gzip --best --to-stdout dracut-module/password-agent.8mandos \
489
531
                > $(MANDIR)/man8/password-agent.8mandos.gz
490
532
 
 
533
.PHONY: install-client
491
534
install-client: install-client-nokey
492
535
# Post-installation stuff
493
536
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
494
537
        if command -v update-initramfs >/dev/null; then \
495
538
            update-initramfs -k all -u; \
496
539
        elif command -v dracut >/dev/null; then \
497
 
            for initrd in $(DESTDIR)/boot/initr*-$(shell uname --kernel-release); do \
 
540
            for initrd in $(DESTDIR)/boot/initr*-$(LINUXVERSION); do \
498
541
                if [ -w "$$initrd" ]; then \
499
542
                    chmod go-r "$$initrd"; \
500
543
                    dracut --force "$$initrd"; \
503
546
        fi
504
547
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
505
548
 
 
549
.PHONY: uninstall
506
550
uninstall: uninstall-server uninstall-client
507
551
 
 
552
.PHONY: uninstall-server
508
553
uninstall-server:
509
554
        -rm --force $(PREFIX)/sbin/mandos \
510
555
                $(PREFIX)/sbin/mandos-ctl \
517
562
        update-rc.d -f mandos remove
518
563
        -rmdir $(CONFDIR)
519
564
 
 
565
.PHONY: uninstall-client
520
566
uninstall-client:
521
567
# Refuse to uninstall client if /etc/crypttab is explicitly configured
522
568
# to use it.
553
599
        if command -v update-initramfs >/dev/null; then \
554
600
            update-initramfs -k all -u; \
555
601
        elif command -v dracut >/dev/null; then \
556
 
            for initrd in $(DESTDIR)/boot/initr*-$(shell uname --kernel-release); do \
 
602
            for initrd in $(DESTDIR)/boot/initr*-$(LINUXVERSION); do \
557
603
                test -w "$$initrd" && dracut --force "$$initrd"; \
558
604
            done; \
559
605
        fi
560
606
 
 
607
.PHONY: purge
561
608
purge: purge-server purge-client
562
609
 
 
610
.PHONY: purge-server
563
611
purge-server: uninstall-server
564
612
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
565
613
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
570
618
                $(DESTDIR)/var/run/mandos.pid
571
619
        -rmdir $(CONFDIR)
572
620
 
 
621
.PHONY: purge-client
573
622
purge-client: uninstall-client
574
623
        -shred --remove $(KEYDIR)/seckey.txt $(KEYDIR)/tls-privkey.pem
575
624
        -rm --force $(CONFDIR)/plugin-runner.conf \