/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-12 17:49:24 UTC
  • Revision ID: teddy@recompile.se-20230212174924-y7fnckjje5xsd9lb
Move D-Bus policy file to /usr/share/dbus-1/session.d

According to dbus-daeemon(1), the correct place for D-Bus policy files
is not "/etc/dbus-1/session.d" but "/usr/share/dbus-1/session.d" (and
Lintian 2.116.0 warns about this).  Therefore, move the file.

* Makefile (DBUSPOLICYDIR): New; set to
  "$(DESTDIR)/usr/share/dbus-1/system.d".
  (install-server): Use $(DBUSPOLICYDIR).
* debian/mandos.dirs (etc/dbus-1/system.d): Remove.
  (usr/share/dbus-1/system.d): New.
* debian/mandos.maintscript: New.

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.7
 
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 \
89
92
                        --variable=systemdsystemunitdir)
90
93
TMPFILES:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
91
94
                        --variable=tmpfilesdir)
 
95
SYSUSERS:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
 
96
                        --variable=sysusersdir)
92
97
 
93
98
GNUTLS_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I gnutls)
94
99
GNUTLS_LIBS:=$(shell $(PKG_CONFIG) --libs gnutls)
95
100
AVAHI_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I avahi-core)
96
101
AVAHI_LIBS:=$(shell $(PKG_CONFIG) --libs avahi-core)
97
 
GPGME_CFLAGS:=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
98
 
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; \
99
106
        getconf LFS_LDFLAGS)
100
107
LIBNL3_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I libnl-route-3.0)
101
108
LIBNL3_LIBS:=$(shell $(PKG_CONFIG) --libs libnl-route-3.0)
104
111
 
105
112
# Do not change these two
106
113
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
107
 
        $(LANGUAGE) $(FEATURES) -DVERSION='"$(version)"'
 
114
        $(LANGUAGE) -DVERSION='"$(version)"'
108
115
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(strip \
109
116
        ) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
110
117
 
154
161
 
155
162
objects:=$(addsuffix .o,$(CPROGS))
156
163
 
 
164
.PHONY: all
157
165
all: $(PROGS) mandos.lsm
158
166
 
 
167
.PHONY: doc
159
168
doc: $(DOCS)
160
169
 
 
170
.PHONY: html
161
171
html: $(htmldocs)
162
172
 
163
173
%.5: %.xml common.ent legalnotice.xml
280
290
                $@)
281
291
 
282
292
# 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 $@
 
293
plugins.d/mandos-client: CFLAGS += $(GNUTLS_CFLAGS) $(strip \
 
294
        ) $(AVAHI_CFLAGS) $(GPGME_CFLAGS)
 
295
plugins.d/mandos-client: LDLIBS += $(GNUTLS_LIBS) $(strip \
 
296
        ) $(AVAHI_LIBS) $(GPGME_LIBS)
288
297
 
289
298
# 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 $@
 
299
plugin-helpers/mandos-client-iprouteadddel: CFLAGS += $(LIBNL3_CFLAGS)
 
300
plugin-helpers/mandos-client-iprouteadddel: LDLIBS += $(LIBNL3_LIBS)
293
301
 
294
302
# 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
 
 
 
303
dracut-module/password-agent: CFLAGS += $(GLIB_CFLAGS)
 
304
# Note: -lpthread is unnecessary with the GNU C library 2.34 or later
 
305
dracut-module/password-agent: LDLIBS += $(GLIB_LIBS) -lpthread
 
306
 
 
307
.PHONY: clean
305
308
clean:
306
309
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
307
310
 
 
311
.PHONY: distclean
308
312
distclean: clean
 
313
.PHONY: mostlyclean
309
314
mostlyclean: clean
 
315
.PHONY: maintainer-clean
310
316
maintainer-clean: clean
311
317
        -rm --force --recursive keydir confdir statedir
312
318
 
 
319
.PHONY: check
313
320
check: all
314
321
        ./mandos --check
315
322
        ./mandos-ctl --check
319
326
        ./dracut-module/password-agent --test
320
327
 
321
328
# Run the client with a local config and key
 
329
.PHONY: run-client
322
330
run-client: all keydir/seckey.txt keydir/pubkey.txt \
323
331
                        keydir/tls-privkey.pem keydir/tls-pubkey.pem
324
332
        @echo '######################################################'
352
360
keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem: mandos-keygen
353
361
        install --directory keydir
354
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
355
369
 
356
370
# Run the server with a local config
 
371
.PHONY: run-server
357
372
run-server: confdir/mandos.conf confdir/clients.conf statedir
358
373
        ./mandos --debug --no-dbus --configdir=confdir \
359
374
                --statedir=statedir $(SERVERARGS)
370
385
statedir:
371
386
        install --directory statedir
372
387
 
 
388
.PHONY: install
373
389
install: install-server install-client-nokey
374
390
 
 
391
.PHONY: install-html
375
392
install-html: html
376
393
        install --directory $(htmldir)
377
394
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
378
395
                $(htmldocs)
379
396
 
 
397
.PHONY: install-server
380
398
install-server: doc
381
399
        install --directory $(CONFDIR)
382
400
        if install --directory --mode=u=rwx --owner=$(USER) \
390
408
                install --mode=u=rw,go=r tmpfiles.d-mandos.conf \
391
409
                        $(TMPFILES)/mandos.conf; \
392
410
        fi
 
411
        if [ "$(SYSUSERS)" != "$(DESTDIR)" \
 
412
                        -a -d "$(SYSUSERS)" ]; then \
 
413
                install --mode=u=rw,go=r sysusers.d-mandos.conf \
 
414
                        $(SYSUSERS)/mandos.conf; \
 
415
        fi
393
416
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
394
417
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
395
418
                mandos-ctl
400
423
        install --mode=u=rw --target-directory=$(CONFDIR) \
401
424
                clients.conf
402
425
        install --mode=u=rw,go=r dbus-mandos.conf \
403
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
 
426
                $(DBUSPOLICYDIR)/mandos.conf
404
427
        install --mode=u=rwx,go=rx init.d-mandos \
405
428
                $(DESTDIR)/etc/init.d/mandos
406
429
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
424
447
        gzip --best --to-stdout intro.8mandos \
425
448
                > $(MANDIR)/man8/intro.8mandos.gz
426
449
 
 
450
.PHONY: install-client-nokey
427
451
install-client-nokey: all doc
428
452
        install --directory $(LIBDIR)/mandos $(CONFDIR)
429
453
        install --directory --mode=u=rwx $(KEYDIR) \
430
454
                $(LIBDIR)/mandos/plugins.d \
431
455
                $(LIBDIR)/mandos/plugin-helpers
 
456
        if [ "$(SYSUSERS)" != "$(DESTDIR)" \
 
457
                        -a -d "$(SYSUSERS)" ]; then \
 
458
                install --mode=u=rw,go=r sysusers.d-mandos.conf \
 
459
                        $(SYSUSERS)/mandos-client.conf; \
 
460
        fi
432
461
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
433
462
                install --mode=u=rwx \
434
463
                        --directory "$(CONFDIR)/plugins.d" \
503
532
        gzip --best --to-stdout dracut-module/password-agent.8mandos \
504
533
                > $(MANDIR)/man8/password-agent.8mandos.gz
505
534
 
 
535
.PHONY: install-client
506
536
install-client: install-client-nokey
507
537
# Post-installation stuff
508
538
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
518
548
        fi
519
549
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
520
550
 
 
551
.PHONY: uninstall
521
552
uninstall: uninstall-server uninstall-client
522
553
 
 
554
.PHONY: uninstall-server
523
555
uninstall-server:
524
556
        -rm --force $(PREFIX)/sbin/mandos \
525
557
                $(PREFIX)/sbin/mandos-ctl \
532
564
        update-rc.d -f mandos remove
533
565
        -rmdir $(CONFDIR)
534
566
 
 
567
.PHONY: uninstall-client
535
568
uninstall-client:
536
569
# Refuse to uninstall client if /etc/crypttab is explicitly configured
537
570
# to use it.
573
606
            done; \
574
607
        fi
575
608
 
 
609
.PHONY: purge
576
610
purge: purge-server purge-client
577
611
 
 
612
.PHONY: purge-server
578
613
purge-server: uninstall-server
579
614
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
580
615
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
585
620
                $(DESTDIR)/var/run/mandos.pid
586
621
        -rmdir $(CONFDIR)
587
622
 
 
623
.PHONY: purge-client
588
624
purge-client: uninstall-client
589
625
        -shred --remove $(KEYDIR)/seckey.txt $(KEYDIR)/tls-privkey.pem
590
626
        -rm --force $(CONFDIR)/plugin-runner.conf \