/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
44
 
FEATURES:=-D_FILE_OFFSET_BITS=64
 
45
CPPFLAGS+=-D_FILE_OFFSET_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
 
96
97
GNUTLS_LIBS:=$(shell $(PKG_CONFIG) --libs gnutls)
97
98
AVAHI_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I avahi-core)
98
99
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; \
 
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; \
101
104
        getconf LFS_LDFLAGS)
102
105
LIBNL3_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I libnl-route-3.0)
103
106
LIBNL3_LIBS:=$(shell $(PKG_CONFIG) --libs libnl-route-3.0)
106
109
 
107
110
# Do not change these two
108
111
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
109
 
        $(LANGUAGE) $(FEATURES) -DVERSION='"$(version)"'
 
112
        $(LANGUAGE) -DVERSION='"$(version)"'
110
113
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(strip \
111
114
        ) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
112
115
 
156
159
 
157
160
objects:=$(addsuffix .o,$(CPROGS))
158
161
 
 
162
.PHONY: all
159
163
all: $(PROGS) mandos.lsm
160
164
 
 
165
.PHONY: doc
161
166
doc: $(DOCS)
162
167
 
 
168
.PHONY: html
163
169
html: $(htmldocs)
164
170
 
165
171
%.5: %.xml common.ent legalnotice.xml
282
288
                $@)
283
289
 
284
290
# 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 $@
 
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)
290
295
 
291
296
# 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 $@
 
297
plugin-helpers/mandos-client-iprouteadddel: CFLAGS += $(LIBNL3_CFLAGS)
 
298
plugin-helpers/mandos-client-iprouteadddel: LDLIBS += $(LIBNL3_LIBS)
295
299
 
296
300
# 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
 
 
 
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
307
306
clean:
308
307
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
309
308
 
 
309
.PHONY: distclean
310
310
distclean: clean
 
311
.PHONY: mostlyclean
311
312
mostlyclean: clean
 
313
.PHONY: maintainer-clean
312
314
maintainer-clean: clean
313
315
        -rm --force --recursive keydir confdir statedir
314
316
 
 
317
.PHONY: check
315
318
check: all
316
319
        ./mandos --check
317
320
        ./mandos-ctl --check
321
324
        ./dracut-module/password-agent --test
322
325
 
323
326
# Run the client with a local config and key
 
327
.PHONY: run-client
324
328
run-client: all keydir/seckey.txt keydir/pubkey.txt \
325
329
                        keydir/tls-privkey.pem keydir/tls-pubkey.pem
326
330
        @echo '######################################################'
354
358
keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem: mandos-keygen
355
359
        install --directory keydir
356
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
357
367
 
358
368
# Run the server with a local config
 
369
.PHONY: run-server
359
370
run-server: confdir/mandos.conf confdir/clients.conf statedir
360
371
        ./mandos --debug --no-dbus --configdir=confdir \
361
372
                --statedir=statedir $(SERVERARGS)
372
383
statedir:
373
384
        install --directory statedir
374
385
 
 
386
.PHONY: install
375
387
install: install-server install-client-nokey
376
388
 
 
389
.PHONY: install-html
377
390
install-html: html
378
391
        install --directory $(htmldir)
379
392
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
380
393
                $(htmldocs)
381
394
 
 
395
.PHONY: install-server
382
396
install-server: doc
383
397
        install --directory $(CONFDIR)
384
398
        if install --directory --mode=u=rwx --owner=$(USER) \
431
445
        gzip --best --to-stdout intro.8mandos \
432
446
                > $(MANDIR)/man8/intro.8mandos.gz
433
447
 
 
448
.PHONY: install-client-nokey
434
449
install-client-nokey: all doc
435
450
        install --directory $(LIBDIR)/mandos $(CONFDIR)
436
451
        install --directory --mode=u=rwx $(KEYDIR) \
515
530
        gzip --best --to-stdout dracut-module/password-agent.8mandos \
516
531
                > $(MANDIR)/man8/password-agent.8mandos.gz
517
532
 
 
533
.PHONY: install-client
518
534
install-client: install-client-nokey
519
535
# Post-installation stuff
520
536
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
530
546
        fi
531
547
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
532
548
 
 
549
.PHONY: uninstall
533
550
uninstall: uninstall-server uninstall-client
534
551
 
 
552
.PHONY: uninstall-server
535
553
uninstall-server:
536
554
        -rm --force $(PREFIX)/sbin/mandos \
537
555
                $(PREFIX)/sbin/mandos-ctl \
544
562
        update-rc.d -f mandos remove
545
563
        -rmdir $(CONFDIR)
546
564
 
 
565
.PHONY: uninstall-client
547
566
uninstall-client:
548
567
# Refuse to uninstall client if /etc/crypttab is explicitly configured
549
568
# to use it.
585
604
            done; \
586
605
        fi
587
606
 
 
607
.PHONY: purge
588
608
purge: purge-server purge-client
589
609
 
 
610
.PHONY: purge-server
590
611
purge-server: uninstall-server
591
612
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
592
613
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
597
618
                $(DESTDIR)/var/run/mandos.pid
598
619
        -rmdir $(CONFDIR)
599
620
 
 
621
.PHONY: purge-client
600
622
purge-client: uninstall-client
601
623
        -shred --remove $(KEYDIR)/seckey.txt $(KEYDIR)/tls-privkey.pem
602
624
        -rm --force $(CONFDIR)/plugin-runner.conf \