/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: 2023-02-11 06:46:26 UTC
  • mto: This revision was merged to the branch mainline in revision 410.
  • 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.5
 
47
version:=1.8.16
46
48
SED:=sed
47
49
PKG_CONFIG?=pkg-config
48
50
 
88
90
                        --variable=systemdsystemunitdir)
89
91
TMPFILES:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
90
92
                        --variable=tmpfilesdir)
 
93
SYSUSERS:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
 
94
                        --variable=sysusersdir)
91
95
 
92
96
GNUTLS_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I gnutls)
93
97
GNUTLS_LIBS:=$(shell $(PKG_CONFIG) --libs gnutls)
94
98
AVAHI_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I avahi-core)
95
99
AVAHI_LIBS:=$(shell $(PKG_CONFIG) --libs avahi-core)
96
 
GPGME_CFLAGS:=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
97
 
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; \
98
104
        getconf LFS_LDFLAGS)
99
105
LIBNL3_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I libnl-route-3.0)
100
106
LIBNL3_LIBS:=$(shell $(PKG_CONFIG) --libs libnl-route-3.0)
102
108
GLIB_LIBS:=$(shell $(PKG_CONFIG) --libs glib-2.0)
103
109
 
104
110
# Do not change these two
105
 
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) \
106
 
        $(OPTIMIZE) $(LANGUAGE) -DVERSION='"$(version)"'
 
111
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
 
112
        $(LANGUAGE) -DVERSION='"$(version)"'
107
113
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(strip \
108
114
        ) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
109
115
 
153
159
 
154
160
objects:=$(addsuffix .o,$(CPROGS))
155
161
 
 
162
.PHONY: all
156
163
all: $(PROGS) mandos.lsm
157
164
 
 
165
.PHONY: doc
158
166
doc: $(DOCS)
159
167
 
 
168
.PHONY: html
160
169
html: $(htmldocs)
161
170
 
162
171
%.5: %.xml common.ent legalnotice.xml
279
288
                $@)
280
289
 
281
290
# Need to add the GnuTLS, Avahi and GPGME libraries
282
 
plugins.d/mandos-client: plugins.d/mandos-client.c
283
 
        $(LINK.c) $^ $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(strip\
284
 
                ) $(GPGME_CFLAGS) $(GNUTLS_LIBS) $(strip\
285
 
                ) $(AVAHI_LIBS) $(GPGME_LIBS) $(LOADLIBES) $(strip\
286
 
                ) $(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)
287
295
 
288
296
# Need to add the libnl-route library
289
 
plugin-helpers/mandos-client-iprouteadddel: plugin-helpers/mandos-client-iprouteadddel.c
290
 
        $(LINK.c) $(LIBNL3_CFLAGS) $^ $(LIBNL3_LIBS) $(strip\
291
 
                ) $(LOADLIBES) $(LDLIBS) -o $@
 
297
plugin-helpers/mandos-client-iprouteadddel: CFLAGS += $(LIBNL3_CFLAGS)
 
298
plugin-helpers/mandos-client-iprouteadddel: LDLIBS += $(LIBNL3_LIBS)
292
299
 
293
300
# Need to add the GLib and pthread libraries
294
 
dracut-module/password-agent: dracut-module/password-agent.c
295
 
        $(LINK.c) $(GLIB_CFLAGS) $^ $(GLIB_LIBS) -lpthread $(strip\
296
 
                ) $(LOADLIBES) $(LDLIBS) -o $@
297
 
 
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
 
 
 
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
304
306
clean:
305
307
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
306
308
 
 
309
.PHONY: distclean
307
310
distclean: clean
 
311
.PHONY: mostlyclean
308
312
mostlyclean: clean
 
313
.PHONY: maintainer-clean
309
314
maintainer-clean: clean
310
315
        -rm --force --recursive keydir confdir statedir
311
316
 
 
317
.PHONY: check
312
318
check: all
313
319
        ./mandos --check
314
320
        ./mandos-ctl --check
318
324
        ./dracut-module/password-agent --test
319
325
 
320
326
# Run the client with a local config and key
 
327
.PHONY: run-client
321
328
run-client: all keydir/seckey.txt keydir/pubkey.txt \
322
329
                        keydir/tls-privkey.pem keydir/tls-pubkey.pem
323
330
        @echo '######################################################'
351
358
keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem: mandos-keygen
352
359
        install --directory keydir
353
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
354
367
 
355
368
# Run the server with a local config
 
369
.PHONY: run-server
356
370
run-server: confdir/mandos.conf confdir/clients.conf statedir
357
371
        ./mandos --debug --no-dbus --configdir=confdir \
358
372
                --statedir=statedir $(SERVERARGS)
369
383
statedir:
370
384
        install --directory statedir
371
385
 
 
386
.PHONY: install
372
387
install: install-server install-client-nokey
373
388
 
 
389
.PHONY: install-html
374
390
install-html: html
375
391
        install --directory $(htmldir)
376
392
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
377
393
                $(htmldocs)
378
394
 
 
395
.PHONY: install-server
379
396
install-server: doc
380
397
        install --directory $(CONFDIR)
381
398
        if install --directory --mode=u=rwx --owner=$(USER) \
389
406
                install --mode=u=rw,go=r tmpfiles.d-mandos.conf \
390
407
                        $(TMPFILES)/mandos.conf; \
391
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
392
414
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
393
415
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
394
416
                mandos-ctl
423
445
        gzip --best --to-stdout intro.8mandos \
424
446
                > $(MANDIR)/man8/intro.8mandos.gz
425
447
 
 
448
.PHONY: install-client-nokey
426
449
install-client-nokey: all doc
427
450
        install --directory $(LIBDIR)/mandos $(CONFDIR)
428
451
        install --directory --mode=u=rwx $(KEYDIR) \
429
452
                $(LIBDIR)/mandos/plugins.d \
430
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
431
459
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
432
460
                install --mode=u=rwx \
433
461
                        --directory "$(CONFDIR)/plugins.d" \
502
530
        gzip --best --to-stdout dracut-module/password-agent.8mandos \
503
531
                > $(MANDIR)/man8/password-agent.8mandos.gz
504
532
 
 
533
.PHONY: install-client
505
534
install-client: install-client-nokey
506
535
# Post-installation stuff
507
536
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
517
546
        fi
518
547
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
519
548
 
 
549
.PHONY: uninstall
520
550
uninstall: uninstall-server uninstall-client
521
551
 
 
552
.PHONY: uninstall-server
522
553
uninstall-server:
523
554
        -rm --force $(PREFIX)/sbin/mandos \
524
555
                $(PREFIX)/sbin/mandos-ctl \
531
562
        update-rc.d -f mandos remove
532
563
        -rmdir $(CONFDIR)
533
564
 
 
565
.PHONY: uninstall-client
534
566
uninstall-client:
535
567
# Refuse to uninstall client if /etc/crypttab is explicitly configured
536
568
# to use it.
572
604
            done; \
573
605
        fi
574
606
 
 
607
.PHONY: purge
575
608
purge: purge-server purge-client
576
609
 
 
610
.PHONY: purge-server
577
611
purge-server: uninstall-server
578
612
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
579
613
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
584
618
                $(DESTDIR)/var/run/mandos.pid
585
619
        -rmdir $(CONFDIR)
586
620
 
 
621
.PHONY: purge-client
587
622
purge-client: uninstall-client
588
623
        -shred --remove $(KEYDIR)/seckey.txt $(KEYDIR)/tls-privkey.pem
589
624
        -rm --force $(CONFDIR)/plugin-runner.conf \