/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: 2019-08-03 11:39:38 UTC
  • Revision ID: teddy@recompile.se-20190803113938-httj8rqsnct08txx
dracut-module/password-agent.c: Bug fix: Ignore deleted files

If a question file ("ask.*") is opened, deleted, and then closed, we
still get an IN_CLOSE_WRITE ievent after the IN_DELETE ievent.  We
should pass the IN_EXCL_UNLINK flag to inotify_add_watch() to avoid
this.

* dracut-module/password-agent.c (add_inotify_dir_watch): Add
  "IN_EXCL_UNLINK" flag to inotify_add_watch().
  (test_add_inotify_dir_watch_IN_EXCL_UNLINK): New test.
  (run_tests): Add new test.

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:=-fstack-protector-all -fPIC
33
 
CPPFLAGS+=-D_FORTIFY_SOURCE=3
 
32
FORTIFY:=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
34
33
LINK_FORTIFY_LD:=-z relro -z now
35
34
LINK_FORTIFY:=
36
35
 
42
41
#COVERAGE=--coverage
43
42
OPTIMIZE:=-Os -fno-strict-aliasing
44
43
LANGUAGE:=-std=gnu11
45
 
CPPFLAGS+=-D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64
46
44
htmldir:=man
47
 
version:=1.8.17
 
45
version:=1.8.5
48
46
SED:=sed
49
47
PKG_CONFIG?=pkg-config
50
48
 
64
62
# DRACUTMODULE:=$(DESTDIR)/usr/lib/dracut/modules.d/90mandos
65
63
# STATEDIR:=$(DESTDIR)/var/lib/mandos
66
64
# LIBDIR:=$(PREFIX)/lib
67
 
# DBUSPOLICYDIR:=$(DESTDIR)/etc/dbus-1/system.d
68
65
##
69
66
 
70
67
## These settings are for a package-type install
85
82
                        break; \
86
83
                fi; \
87
84
        done)
88
 
DBUSPOLICYDIR:=$(DESTDIR)/usr/share/dbus-1/system.d
89
85
##
90
86
 
91
87
SYSTEMD:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
92
88
                        --variable=systemdsystemunitdir)
93
89
TMPFILES:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
94
90
                        --variable=tmpfilesdir)
95
 
SYSUSERS:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
96
 
                        --variable=sysusersdir)
97
91
 
98
92
GNUTLS_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I gnutls)
99
93
GNUTLS_LIBS:=$(shell $(PKG_CONFIG) --libs gnutls)
100
94
AVAHI_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I avahi-core)
101
95
AVAHI_LIBS:=$(shell $(PKG_CONFIG) --libs avahi-core)
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; \
 
96
GPGME_CFLAGS:=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
 
97
GPGME_LIBS:=$(shell gpgme-config --libs; getconf LFS_LIBS; \
106
98
        getconf LFS_LDFLAGS)
107
99
LIBNL3_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I libnl-route-3.0)
108
100
LIBNL3_LIBS:=$(shell $(PKG_CONFIG) --libs libnl-route-3.0)
110
102
GLIB_LIBS:=$(shell $(PKG_CONFIG) --libs glib-2.0)
111
103
 
112
104
# Do not change these two
113
 
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
114
 
        $(LANGUAGE) -DVERSION='"$(version)"'
 
105
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) \
 
106
        $(OPTIMIZE) $(LANGUAGE) -DVERSION='"$(version)"'
115
107
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(strip \
116
108
        ) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
117
109
 
161
153
 
162
154
objects:=$(addsuffix .o,$(CPROGS))
163
155
 
164
 
.PHONY: all
165
156
all: $(PROGS) mandos.lsm
166
157
 
167
 
.PHONY: doc
168
158
doc: $(DOCS)
169
159
 
170
 
.PHONY: html
171
160
html: $(htmldocs)
172
161
 
173
162
%.5: %.xml common.ent legalnotice.xml
289
278
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
290
279
                $@)
291
280
 
292
 
# Does the linker support the --no-warn-execstack option?
293
 
ifeq ($(shell echo 'int main(){}'|$(CC) --language=c /dev/stdin -o /dev/null -Xlinker --no-warn-execstack >/dev/null 2>&1 && echo yes),yes)
294
 
# These programs use nested functions, which uses an executable stack
295
 
plugin-runner: LDFLAGS += -Xlinker --no-warn-execstack
296
 
dracut-module/password-agent: LDFLAGS += -Xlinker --no-warn-execstack
297
 
plugins.d/password-prompt: LDFLAGS += -Xlinker --no-warn-execstack
298
 
plugins.d/mandos-client: LDFLAGS += -Xlinker --no-warn-execstack
299
 
plugins.d/plymouth: LDFLAGS += -Xlinker --no-warn-execstack
300
 
endif
301
 
 
302
281
# Need to add the GnuTLS, Avahi and GPGME libraries
303
 
plugins.d/mandos-client: CFLAGS += $(GNUTLS_CFLAGS) $(strip \
304
 
        ) $(AVAHI_CFLAGS) $(GPGME_CFLAGS)
305
 
plugins.d/mandos-client: LDLIBS += $(GNUTLS_LIBS) $(strip \
306
 
        ) $(AVAHI_LIBS) $(GPGME_LIBS)
 
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 $@
307
287
 
308
288
# Need to add the libnl-route library
309
 
plugin-helpers/mandos-client-iprouteadddel: CFLAGS += $(LIBNL3_CFLAGS)
310
 
plugin-helpers/mandos-client-iprouteadddel: LDLIBS += $(LIBNL3_LIBS)
 
289
plugin-helpers/mandos-client-iprouteadddel: plugin-helpers/mandos-client-iprouteadddel.c
 
290
        $(LINK.c) $(LIBNL3_CFLAGS) $^ $(LIBNL3_LIBS) $(strip\
 
291
                ) $(LOADLIBES) $(LDLIBS) -o $@
311
292
 
312
293
# Need to add the GLib and pthread libraries
313
 
dracut-module/password-agent: CFLAGS += $(GLIB_CFLAGS)
314
 
# Note: -lpthread is unnecessary with the GNU C library 2.34 or later
315
 
dracut-module/password-agent: LDLIBS += $(GLIB_LIBS) -lpthread
316
 
 
317
 
.PHONY: clean
 
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
 
318
304
clean:
319
305
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
320
306
 
321
 
.PHONY: distclean
322
307
distclean: clean
323
 
.PHONY: mostlyclean
324
308
mostlyclean: clean
325
 
.PHONY: maintainer-clean
326
309
maintainer-clean: clean
327
310
        -rm --force --recursive keydir confdir statedir
328
311
 
329
 
.PHONY: check
330
312
check: all
331
313
        ./mandos --check
332
314
        ./mandos-ctl --check
336
318
        ./dracut-module/password-agent --test
337
319
 
338
320
# Run the client with a local config and key
339
 
.PHONY: run-client
340
321
run-client: all keydir/seckey.txt keydir/pubkey.txt \
341
322
                        keydir/tls-privkey.pem keydir/tls-pubkey.pem
342
323
        @echo '######################################################'
370
351
keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem: mandos-keygen
371
352
        install --directory keydir
372
353
        ./mandos-keygen --dir keydir --force
373
 
        if ! [ -e keydir/tls-privkey.pem ]; then \
374
 
                install --mode=u=rw /dev/null keydir/tls-privkey.pem; \
375
 
        fi
376
 
        if ! [ -e keydir/tls-pubkey.pem ]; then \
377
 
                install --mode=u=rw /dev/null keydir/tls-pubkey.pem; \
378
 
        fi
379
354
 
380
355
# Run the server with a local config
381
 
.PHONY: run-server
382
356
run-server: confdir/mandos.conf confdir/clients.conf statedir
383
357
        ./mandos --debug --no-dbus --configdir=confdir \
384
358
                --statedir=statedir $(SERVERARGS)
385
359
 
386
360
# Used by run-server
387
361
confdir/mandos.conf: mandos.conf
388
 
        install -D --mode=u=rw,go=r $^ $@
 
362
        install --directory confdir
 
363
        install --mode=u=rw,go=r $^ $@
389
364
confdir/clients.conf: clients.conf keydir/seckey.txt keydir/tls-pubkey.pem
390
 
        install -D --mode=u=rw $< $@
 
365
        install --directory confdir
 
366
        install --mode=u=rw $< $@
391
367
# Add a client password
392
368
        ./mandos-keygen --dir keydir --password --no-ssh >> $@
393
369
statedir:
394
370
        install --directory statedir
395
371
 
396
 
.PHONY: install
397
372
install: install-server install-client-nokey
398
373
 
399
 
.PHONY: install-html
400
374
install-html: html
401
 
        install -D --mode=u=rw,go=r --target-directory=$(htmldir) \
 
375
        install --directory $(htmldir)
 
376
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
402
377
                $(htmldocs)
403
378
 
404
 
.PHONY: install-server
405
379
install-server: doc
 
380
        install --directory $(CONFDIR)
406
381
        if install --directory --mode=u=rwx --owner=$(USER) \
407
382
                --group=$(GROUP) $(STATEDIR); then \
408
383
                :; \
409
384
        elif install --directory --mode=u=rwx $(STATEDIR); then \
410
385
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
411
386
        fi
412
 
        if [ "$(TMPFILES)" != "$(DESTDIR)" ]; then \
413
 
                install -D --mode=u=rw,go=r tmpfiles.d-mandos.conf \
 
387
        if [ "$(TMPFILES)" != "$(DESTDIR)" \
 
388
                        -a -d "$(TMPFILES)" ]; then \
 
389
                install --mode=u=rw,go=r tmpfiles.d-mandos.conf \
414
390
                        $(TMPFILES)/mandos.conf; \
415
391
        fi
416
 
        if [ "$(SYSUSERS)" != "$(DESTDIR)" ]; then \
417
 
                install -D --mode=u=rw,go=r sysusers.d-mandos.conf \
418
 
                        $(SYSUSERS)/mandos.conf; \
419
 
        fi
420
 
        install --directory $(PREFIX)/sbin
421
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
422
 
                mandos
 
392
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
423
393
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
424
394
                mandos-ctl
425
395
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
426
396
                mandos-monitor
427
 
        install --directory $(CONFDIR)
428
397
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
429
398
                mandos.conf
430
399
        install --mode=u=rw --target-directory=$(CONFDIR) \
431
400
                clients.conf
432
 
        install -D --mode=u=rw,go=r dbus-mandos.conf \
433
 
                $(DBUSPOLICYDIR)/mandos.conf
434
 
        install -D --mode=u=rwx,go=rx init.d-mandos \
 
401
        install --mode=u=rw,go=r dbus-mandos.conf \
 
402
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
 
403
        install --mode=u=rwx,go=rx init.d-mandos \
435
404
                $(DESTDIR)/etc/init.d/mandos
436
 
        if [ "$(SYSTEMD)" != "$(DESTDIR)" ]; then \
437
 
                install -D --mode=u=rw,go=r mandos.service \
438
 
                        $(SYSTEMD); \
 
405
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
 
406
                install --mode=u=rw,go=r mandos.service $(SYSTEMD); \
439
407
        fi
440
 
        install -D --mode=u=rw,go=r default-mandos \
 
408
        install --mode=u=rw,go=r default-mandos \
441
409
                $(DESTDIR)/etc/default/mandos
442
410
        if [ -z $(DESTDIR) ]; then \
443
411
                update-rc.d mandos defaults 25 15;\
444
412
        fi
445
 
        install --directory $(MANDIR)/man8 $(MANDIR)/man5
446
413
        gzip --best --to-stdout mandos.8 \
447
414
                > $(MANDIR)/man8/mandos.8.gz
448
415
        gzip --best --to-stdout mandos-monitor.8 \
456
423
        gzip --best --to-stdout intro.8mandos \
457
424
                > $(MANDIR)/man8/intro.8mandos.gz
458
425
 
459
 
.PHONY: install-client-nokey
460
426
install-client-nokey: all doc
 
427
        install --directory $(LIBDIR)/mandos $(CONFDIR)
461
428
        install --directory --mode=u=rwx $(KEYDIR) \
462
429
                $(LIBDIR)/mandos/plugins.d \
463
430
                $(LIBDIR)/mandos/plugin-helpers
464
 
        if [ "$(SYSUSERS)" != "$(DESTDIR)" ]; then \
465
 
                install -D --mode=u=rw,go=r sysusers.d-mandos.conf \
466
 
                        $(SYSUSERS)/mandos-client.conf; \
467
 
        fi
468
431
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
469
 
                install --directory \
470
 
                        --mode=u=rwx "$(CONFDIR)/plugins.d" \
 
432
                install --mode=u=rwx \
 
433
                        --directory "$(CONFDIR)/plugins.d" \
471
434
                        "$(CONFDIR)/plugin-helpers"; \
472
435
        fi
473
 
        install --directory --mode=u=rwx,go=rx \
 
436
        install --mode=u=rwx,go=rx --directory \
474
437
                "$(CONFDIR)/network-hooks.d"
475
438
        install --mode=u=rwx,go=rx \
476
439
                --target-directory=$(LIBDIR)/mandos plugin-runner
477
440
        install --mode=u=rwx,go=rx \
478
441
                --target-directory=$(LIBDIR)/mandos \
479
442
                mandos-to-cryptroot-unlock
480
 
        install --directory $(PREFIX)/sbin
481
443
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
482
444
                mandos-keygen
483
445
        install --mode=u=rwx,go=rx \
501
463
        install --mode=u=rwx,go=rx \
502
464
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
503
465
                plugin-helpers/mandos-client-iprouteadddel
504
 
        install -D initramfs-tools-hook \
 
466
        install initramfs-tools-hook \
505
467
                $(INITRAMFSTOOLS)/hooks/mandos
506
 
        install -D --mode=u=rw,go=r initramfs-tools-conf \
 
468
        install --mode=u=rw,go=r initramfs-tools-conf \
507
469
                $(INITRAMFSTOOLS)/conf.d/mandos-conf
508
 
        install -D --mode=u=rw,go=r initramfs-tools-conf-hook \
 
470
        install --mode=u=rw,go=r initramfs-tools-conf-hook \
509
471
                $(INITRAMFSTOOLS)/conf-hooks.d/zz-mandos
510
 
        install -D initramfs-tools-script \
 
472
        install initramfs-tools-script \
511
473
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
512
 
        install -D initramfs-tools-script-stop \
 
474
        install initramfs-tools-script-stop \
513
475
                $(INITRAMFSTOOLS)/scripts/local-premount/mandos
514
 
        install -D --mode=u=rw,go=r \
515
 
                --target-directory=$(DRACUTMODULE) \
 
476
        install --directory $(DRACUTMODULE)
 
477
        install --mode=u=rw,go=r --target-directory=$(DRACUTMODULE) \
516
478
                dracut-module/ask-password-mandos.path \
517
479
                dracut-module/ask-password-mandos.service
518
480
        install --mode=u=rwxs,go=rx \
521
483
                dracut-module/cmdline-mandos.sh \
522
484
                dracut-module/password-agent
523
485
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
524
 
        install --directory $(MANDIR)/man8
525
486
        gzip --best --to-stdout mandos-keygen.8 \
526
487
                > $(MANDIR)/man8/mandos-keygen.8.gz
527
488
        gzip --best --to-stdout plugin-runner.8mandos \
541
502
        gzip --best --to-stdout dracut-module/password-agent.8mandos \
542
503
                > $(MANDIR)/man8/password-agent.8mandos.gz
543
504
 
544
 
.PHONY: install-client
545
505
install-client: install-client-nokey
546
506
# Post-installation stuff
547
507
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
557
517
        fi
558
518
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
559
519
 
560
 
.PHONY: uninstall
561
520
uninstall: uninstall-server uninstall-client
562
521
 
563
 
.PHONY: uninstall-server
564
522
uninstall-server:
565
523
        -rm --force $(PREFIX)/sbin/mandos \
566
524
                $(PREFIX)/sbin/mandos-ctl \
573
531
        update-rc.d -f mandos remove
574
532
        -rmdir $(CONFDIR)
575
533
 
576
 
.PHONY: uninstall-client
577
534
uninstall-client:
578
535
# Refuse to uninstall client if /etc/crypttab is explicitly configured
579
536
# to use it.
615
572
            done; \
616
573
        fi
617
574
 
618
 
.PHONY: purge
619
575
purge: purge-server purge-client
620
576
 
621
 
.PHONY: purge-server
622
577
purge-server: uninstall-server
623
578
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
624
579
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
625
580
                $(DESTDIR)/etc/default/mandos \
626
581
                $(DESTDIR)/etc/init.d/mandos \
 
582
                $(SYSTEMD)/mandos.service \
627
583
                $(DESTDIR)/run/mandos.pid \
628
584
                $(DESTDIR)/var/run/mandos.pid
629
 
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
630
 
                -rm --force -- $(SYSTEMD)/mandos.service; \
631
 
        fi
632
585
        -rmdir $(CONFDIR)
633
586
 
634
 
.PHONY: purge-client
635
587
purge-client: uninstall-client
636
588
        -shred --remove $(KEYDIR)/seckey.txt $(KEYDIR)/tls-privkey.pem
637
589
        -rm --force $(CONFDIR)/plugin-runner.conf \