/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: 2022-04-24 12:16:29 UTC
  • mto: This revision was merged to the branch mainline in revision 406.
  • Revision ID: teddy@recompile.se-20220424121629-rsabsoen8cjmsscd
mandos: Update logging code to more standard idioms

* mandos-monitor: Get logger using basename instead of full command.
  Also, eliminate last uses of .format() when logging.
  (logger): Rename to "log".

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:=-D_FORTIFY_SOURCE=3 -fstack-protector-all -fPIC
33
33
LINK_FORTIFY_LD:=-z relro -z now
34
34
LINK_FORTIFY:=
35
35
 
43
43
LANGUAGE:=-std=gnu11
44
44
FEATURES:=-D_FILE_OFFSET_BITS=64
45
45
htmldir:=man
46
 
version:=1.8.7
 
46
version:=1.8.14
47
47
SED:=sed
48
48
PKG_CONFIG?=pkg-config
49
49
 
89
89
                        --variable=systemdsystemunitdir)
90
90
TMPFILES:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
91
91
                        --variable=tmpfilesdir)
 
92
SYSUSERS:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
 
93
                        --variable=sysusersdir)
92
94
 
93
95
GNUTLS_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I gnutls)
94
96
GNUTLS_LIBS:=$(shell $(PKG_CONFIG) --libs gnutls)
154
156
 
155
157
objects:=$(addsuffix .o,$(CPROGS))
156
158
 
 
159
.PHONY: all
157
160
all: $(PROGS) mandos.lsm
158
161
 
 
162
.PHONY: doc
159
163
doc: $(DOCS)
160
164
 
 
165
.PHONY: html
161
166
html: $(htmldocs)
162
167
 
163
168
%.5: %.xml common.ent legalnotice.xml
280
285
                $@)
281
286
 
282
287
# Need to add the GnuTLS, Avahi and GPGME libraries
283
 
plugins.d/mandos-client: plugins.d/mandos-client.c
284
 
        $(LINK.c) $^ $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(strip\
285
 
                ) $(GPGME_CFLAGS) $(GNUTLS_LIBS) $(strip\
286
 
                ) $(AVAHI_LIBS) $(GPGME_LIBS) $(LOADLIBES) $(strip\
287
 
                ) $(LDLIBS) -o $@
 
288
plugins.d/mandos-client: CFLAGS += $(GNUTLS_CFLAGS) $(strip \
 
289
        ) $(AVAHI_CFLAGS) $(GPGME_CFLAGS)
 
290
plugins.d/mandos-client: LDLIBS += $(GNUTLS_LIBS) $(strip \
 
291
        ) $(AVAHI_LIBS) $(GPGME_LIBS)
288
292
 
289
293
# Need to add the libnl-route library
290
 
plugin-helpers/mandos-client-iprouteadddel: plugin-helpers/mandos-client-iprouteadddel.c
291
 
        $(LINK.c) $(LIBNL3_CFLAGS) $^ $(LIBNL3_LIBS) $(strip\
292
 
                ) $(LOADLIBES) $(LDLIBS) -o $@
 
294
plugin-helpers/mandos-client-iprouteadddel: CFLAGS += $(LIBNL3_CFLAGS)
 
295
plugin-helpers/mandos-client-iprouteadddel: LDLIBS += $(LIBNL3_LIBS)
293
296
 
294
297
# Need to add the GLib and pthread libraries
295
 
dracut-module/password-agent: dracut-module/password-agent.c
296
 
        $(LINK.c) $(GLIB_CFLAGS) $^ $(GLIB_LIBS) -lpthread $(strip\
297
 
                ) $(LOADLIBES) $(LDLIBS) -o $@
298
 
 
299
 
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
300
 
        check run-client run-server install install-html \
301
 
        install-server install-client-nokey install-client uninstall \
302
 
        uninstall-server uninstall-client purge purge-server \
303
 
        purge-client
304
 
 
 
298
dracut-module/password-agent: CFLAGS += $(GLIB_CFLAGS)
 
299
# Note: -lpthread is unnecessary with the GNU C library 2.34 or later
 
300
dracut-module/password-agent: LDLIBS += $(GLIB_LIBS) -lpthread
 
301
 
 
302
.PHONY: clean
305
303
clean:
306
304
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
307
305
 
 
306
.PHONY: distclean
308
307
distclean: clean
 
308
.PHONY: mostlyclean
309
309
mostlyclean: clean
 
310
.PHONY: maintainer-clean
310
311
maintainer-clean: clean
311
312
        -rm --force --recursive keydir confdir statedir
312
313
 
 
314
.PHONY: check
313
315
check: all
314
316
        ./mandos --check
315
317
        ./mandos-ctl --check
319
321
        ./dracut-module/password-agent --test
320
322
 
321
323
# Run the client with a local config and key
 
324
.PHONY: run-client
322
325
run-client: all keydir/seckey.txt keydir/pubkey.txt \
323
326
                        keydir/tls-privkey.pem keydir/tls-pubkey.pem
324
327
        @echo '######################################################'
352
355
keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem: mandos-keygen
353
356
        install --directory keydir
354
357
        ./mandos-keygen --dir keydir --force
 
358
        if ! [ -e keydir/tls-privkey.pem ]; then \
 
359
                install --mode=u=rw /dev/null keydir/tls-privkey.pem; \
 
360
        fi
 
361
        if ! [ -e keydir/tls-pubkey.pem ]; then \
 
362
                install --mode=u=rw /dev/null keydir/tls-pubkey.pem; \
 
363
        fi
355
364
 
356
365
# Run the server with a local config
 
366
.PHONY: run-server
357
367
run-server: confdir/mandos.conf confdir/clients.conf statedir
358
368
        ./mandos --debug --no-dbus --configdir=confdir \
359
369
                --statedir=statedir $(SERVERARGS)
370
380
statedir:
371
381
        install --directory statedir
372
382
 
 
383
.PHONY: install
373
384
install: install-server install-client-nokey
374
385
 
 
386
.PHONY: install-html
375
387
install-html: html
376
388
        install --directory $(htmldir)
377
389
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
378
390
                $(htmldocs)
379
391
 
 
392
.PHONY: install-server
380
393
install-server: doc
381
394
        install --directory $(CONFDIR)
382
395
        if install --directory --mode=u=rwx --owner=$(USER) \
390
403
                install --mode=u=rw,go=r tmpfiles.d-mandos.conf \
391
404
                        $(TMPFILES)/mandos.conf; \
392
405
        fi
 
406
        if [ "$(SYSUSERS)" != "$(DESTDIR)" \
 
407
                        -a -d "$(SYSUSERS)" ]; then \
 
408
                install --mode=u=rw,go=r sysusers.d-mandos.conf \
 
409
                        $(SYSUSERS)/mandos.conf; \
 
410
        fi
393
411
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
394
412
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
395
413
                mandos-ctl
424
442
        gzip --best --to-stdout intro.8mandos \
425
443
                > $(MANDIR)/man8/intro.8mandos.gz
426
444
 
 
445
.PHONY: install-client-nokey
427
446
install-client-nokey: all doc
428
447
        install --directory $(LIBDIR)/mandos $(CONFDIR)
429
448
        install --directory --mode=u=rwx $(KEYDIR) \
430
449
                $(LIBDIR)/mandos/plugins.d \
431
450
                $(LIBDIR)/mandos/plugin-helpers
 
451
        if [ "$(SYSUSERS)" != "$(DESTDIR)" \
 
452
                        -a -d "$(SYSUSERS)" ]; then \
 
453
                install --mode=u=rw,go=r sysusers.d-mandos.conf \
 
454
                        $(SYSUSERS)/mandos-client.conf; \
 
455
        fi
432
456
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
433
457
                install --mode=u=rwx \
434
458
                        --directory "$(CONFDIR)/plugins.d" \
503
527
        gzip --best --to-stdout dracut-module/password-agent.8mandos \
504
528
                > $(MANDIR)/man8/password-agent.8mandos.gz
505
529
 
 
530
.PHONY: install-client
506
531
install-client: install-client-nokey
507
532
# Post-installation stuff
508
533
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
518
543
        fi
519
544
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
520
545
 
 
546
.PHONY: uninstall
521
547
uninstall: uninstall-server uninstall-client
522
548
 
 
549
.PHONY: uninstall-server
523
550
uninstall-server:
524
551
        -rm --force $(PREFIX)/sbin/mandos \
525
552
                $(PREFIX)/sbin/mandos-ctl \
532
559
        update-rc.d -f mandos remove
533
560
        -rmdir $(CONFDIR)
534
561
 
 
562
.PHONY: uninstall-client
535
563
uninstall-client:
536
564
# Refuse to uninstall client if /etc/crypttab is explicitly configured
537
565
# to use it.
573
601
            done; \
574
602
        fi
575
603
 
 
604
.PHONY: purge
576
605
purge: purge-server purge-client
577
606
 
 
607
.PHONY: purge-server
578
608
purge-server: uninstall-server
579
609
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
580
610
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
585
615
                $(DESTDIR)/var/run/mandos.pid
586
616
        -rmdir $(CONFDIR)
587
617
 
 
618
.PHONY: purge-client
588
619
purge-client: uninstall-client
589
620
        -shred --remove $(KEYDIR)/seckey.txt $(KEYDIR)/tls-privkey.pem
590
621
        -rm --force $(CONFDIR)/plugin-runner.conf \