/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 at recompile
  • Date: 2020-02-08 14:01:38 UTC
  • mto: This revision was merged to the branch mainline in revision 396.
  • Revision ID: teddy@recompile.se-20200208140138-h3ett0amdelfpt90
mandos: If possible, use shlex.quote() instead of re.escape()

* mandos: Make sure shlex.quote() exists (falling back to assigning
  re.escape to it).
  (Client.start_checker): Use shlex.quote() instead of re.escape().

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
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.9
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
dracut-module/password-agent: LDLIBS += $(GLIB_LIBS) -lpthread
 
300
 
 
301
.PHONY: clean
305
302
clean:
306
303
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
307
304
 
 
305
.PHONY: distclean
308
306
distclean: clean
 
307
.PHONY: mostlyclean
309
308
mostlyclean: clean
 
309
.PHONY: maintainer-clean
310
310
maintainer-clean: clean
311
311
        -rm --force --recursive keydir confdir statedir
312
312
 
 
313
.PHONY: check
313
314
check: all
314
315
        ./mandos --check
315
316
        ./mandos-ctl --check
319
320
        ./dracut-module/password-agent --test
320
321
 
321
322
# Run the client with a local config and key
 
323
.PHONY: run-client
322
324
run-client: all keydir/seckey.txt keydir/pubkey.txt \
323
325
                        keydir/tls-privkey.pem keydir/tls-pubkey.pem
324
326
        @echo '######################################################'
354
356
        ./mandos-keygen --dir keydir --force
355
357
 
356
358
# Run the server with a local config
 
359
.PHONY: run-server
357
360
run-server: confdir/mandos.conf confdir/clients.conf statedir
358
361
        ./mandos --debug --no-dbus --configdir=confdir \
359
362
                --statedir=statedir $(SERVERARGS)
370
373
statedir:
371
374
        install --directory statedir
372
375
 
 
376
.PHONY: install
373
377
install: install-server install-client-nokey
374
378
 
 
379
.PHONY: install-html
375
380
install-html: html
376
381
        install --directory $(htmldir)
377
382
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
378
383
                $(htmldocs)
379
384
 
 
385
.PHONY: install-server
380
386
install-server: doc
381
387
        install --directory $(CONFDIR)
382
388
        if install --directory --mode=u=rwx --owner=$(USER) \
390
396
                install --mode=u=rw,go=r tmpfiles.d-mandos.conf \
391
397
                        $(TMPFILES)/mandos.conf; \
392
398
        fi
 
399
        if [ "$(SYSUSERS)" != "$(DESTDIR)" \
 
400
                        -a -d "$(SYSUSERS)" ]; then \
 
401
                install --mode=u=rw,go=r sysusers.d-mandos.conf \
 
402
                        $(SYSUSERS)/mandos.conf; \
 
403
        fi
393
404
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
394
405
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
395
406
                mandos-ctl
424
435
        gzip --best --to-stdout intro.8mandos \
425
436
                > $(MANDIR)/man8/intro.8mandos.gz
426
437
 
 
438
.PHONY: install-client-nokey
427
439
install-client-nokey: all doc
428
440
        install --directory $(LIBDIR)/mandos $(CONFDIR)
429
441
        install --directory --mode=u=rwx $(KEYDIR) \
430
442
                $(LIBDIR)/mandos/plugins.d \
431
443
                $(LIBDIR)/mandos/plugin-helpers
 
444
        if [ "$(SYSUSERS)" != "$(DESTDIR)" \
 
445
                        -a -d "$(SYSUSERS)" ]; then \
 
446
                install --mode=u=rw,go=r sysusers.d-mandos.conf \
 
447
                        $(SYSUSERS)/mandos-client.conf; \
 
448
        fi
432
449
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
433
450
                install --mode=u=rwx \
434
451
                        --directory "$(CONFDIR)/plugins.d" \
503
520
        gzip --best --to-stdout dracut-module/password-agent.8mandos \
504
521
                > $(MANDIR)/man8/password-agent.8mandos.gz
505
522
 
 
523
.PHONY: install-client
506
524
install-client: install-client-nokey
507
525
# Post-installation stuff
508
526
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
518
536
        fi
519
537
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
520
538
 
 
539
.PHONY: uninstall
521
540
uninstall: uninstall-server uninstall-client
522
541
 
 
542
.PHONY: uninstall-server
523
543
uninstall-server:
524
544
        -rm --force $(PREFIX)/sbin/mandos \
525
545
                $(PREFIX)/sbin/mandos-ctl \
532
552
        update-rc.d -f mandos remove
533
553
        -rmdir $(CONFDIR)
534
554
 
 
555
.PHONY: uninstall-client
535
556
uninstall-client:
536
557
# Refuse to uninstall client if /etc/crypttab is explicitly configured
537
558
# to use it.
573
594
            done; \
574
595
        fi
575
596
 
 
597
.PHONY: purge
576
598
purge: purge-server purge-client
577
599
 
 
600
.PHONY: purge-server
578
601
purge-server: uninstall-server
579
602
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
580
603
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
585
608
                $(DESTDIR)/var/run/mandos.pid
586
609
        -rmdir $(CONFDIR)
587
610
 
 
611
.PHONY: purge-client
588
612
purge-client: uninstall-client
589
613
        -shred --remove $(KEYDIR)/seckey.txt $(KEYDIR)/tls-privkey.pem
590
614
        -rm --force $(CONFDIR)/plugin-runner.conf \