/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: 2019-12-04 23:46:59 UTC
  • mto: This revision was merged to the branch mainline in revision 396.
  • Revision ID: teddy@recompile.se-20191204234659-m4u7bxnjrns6d3fc
Simplification of Python 3 compatibility code

Apply previously-made change in mandos and mandos-ctl also to
mandos-monitor.

* mandos-monitor: Set "__metaclass__ = type" globally for Python 2,
  and remove inheriting from "object" in all places possible.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
41
41
#COVERAGE=--coverage
42
42
OPTIMIZE:=-Os -fno-strict-aliasing
43
43
LANGUAGE:=-std=gnu11
 
44
FEATURES:=-D_FILE_OFFSET_BITS=64
44
45
htmldir:=man
45
 
version:=1.8.5
 
46
version:=1.8.9
46
47
SED:=sed
 
48
PKG_CONFIG?=pkg-config
47
49
 
48
50
USER:=$(firstword $(subst :, ,$(shell getent passwd _mandos \
49
51
        || getent passwd nobody || echo 65534)))
83
85
        done)
84
86
##
85
87
 
86
 
SYSTEMD:=$(DESTDIR)$(shell pkg-config systemd \
 
88
SYSTEMD:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
87
89
                        --variable=systemdsystemunitdir)
88
 
TMPFILES:=$(DESTDIR)$(shell pkg-config systemd --variable=tmpfilesdir)
 
90
TMPFILES:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
 
91
                        --variable=tmpfilesdir)
 
92
SYSUSERS:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
 
93
                        --variable=sysusersdir)
89
94
 
90
 
GNUTLS_CFLAGS:=$(shell pkg-config --cflags-only-I gnutls)
91
 
GNUTLS_LIBS:=$(shell pkg-config --libs gnutls)
92
 
AVAHI_CFLAGS:=$(shell pkg-config --cflags-only-I avahi-core)
93
 
AVAHI_LIBS:=$(shell pkg-config --libs avahi-core)
 
95
GNUTLS_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I gnutls)
 
96
GNUTLS_LIBS:=$(shell $(PKG_CONFIG) --libs gnutls)
 
97
AVAHI_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I avahi-core)
 
98
AVAHI_LIBS:=$(shell $(PKG_CONFIG) --libs avahi-core)
94
99
GPGME_CFLAGS:=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
95
100
GPGME_LIBS:=$(shell gpgme-config --libs; getconf LFS_LIBS; \
96
101
        getconf LFS_LDFLAGS)
97
 
LIBNL3_CFLAGS:=$(shell pkg-config --cflags-only-I libnl-route-3.0)
98
 
LIBNL3_LIBS:=$(shell pkg-config --libs libnl-route-3.0)
99
 
GLIB_CFLAGS:=$(shell pkg-config --cflags glib-2.0)
100
 
GLIB_LIBS:=$(shell pkg-config --libs glib-2.0)
 
102
LIBNL3_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I libnl-route-3.0)
 
103
LIBNL3_LIBS:=$(shell $(PKG_CONFIG) --libs libnl-route-3.0)
 
104
GLIB_CFLAGS:=$(shell $(PKG_CONFIG) --cflags glib-2.0)
 
105
GLIB_LIBS:=$(shell $(PKG_CONFIG) --libs glib-2.0)
101
106
 
102
107
# Do not change these two
103
 
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) \
104
 
        $(OPTIMIZE) $(LANGUAGE) -DVERSION='"$(version)"'
 
108
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
 
109
        $(LANGUAGE) $(FEATURES) -DVERSION='"$(version)"'
105
110
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(strip \
106
111
        ) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
107
112
 
151
156
 
152
157
objects:=$(addsuffix .o,$(CPROGS))
153
158
 
 
159
.PHONY: all
154
160
all: $(PROGS) mandos.lsm
155
161
 
 
162
.PHONY: doc
156
163
doc: $(DOCS)
157
164
 
 
165
.PHONY: html
158
166
html: $(htmldocs)
159
167
 
160
168
%.5: %.xml common.ent legalnotice.xml
277
285
                $@)
278
286
 
279
287
# Need to add the GnuTLS, Avahi and GPGME libraries
280
 
plugins.d/mandos-client: plugins.d/mandos-client.c
281
 
        $(LINK.c) $^ $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(strip\
282
 
                ) $(GPGME_CFLAGS) $(GNUTLS_LIBS) $(strip\
283
 
                ) $(AVAHI_LIBS) $(GPGME_LIBS) $(LOADLIBES) $(strip\
284
 
                ) $(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)
285
292
 
286
293
# Need to add the libnl-route library
287
 
plugin-helpers/mandos-client-iprouteadddel: plugin-helpers/mandos-client-iprouteadddel.c
288
 
        $(LINK.c) $(LIBNL3_CFLAGS) $^ $(LIBNL3_LIBS) $(strip\
289
 
                ) $(LOADLIBES) $(LDLIBS) -o $@
 
294
plugin-helpers/mandos-client-iprouteadddel: CFLAGS += $(LIBNL3_CFLAGS)
 
295
plugin-helpers/mandos-client-iprouteadddel: LDLIBS += $(LIBNL3_LIBS)
290
296
 
291
297
# Need to add the GLib and pthread libraries
292
 
dracut-module/password-agent: dracut-module/password-agent.c
293
 
        $(LINK.c) $(GLIB_CFLAGS) $^ $(GLIB_LIBS) -lpthread $(strip\
294
 
                ) $(LOADLIBES) $(LDLIBS) -o $@
295
 
 
296
 
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
297
 
        check run-client run-server install install-html \
298
 
        install-server install-client-nokey install-client uninstall \
299
 
        uninstall-server uninstall-client purge purge-server \
300
 
        purge-client
301
 
 
 
298
dracut-module/password-agent: CFLAGS += $(GLIB_CFLAGS)
 
299
dracut-module/password-agent: LDLIBS += $(GLIB_LIBS) -lpthread
 
300
 
 
301
.PHONY: clean
302
302
clean:
303
303
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
304
304
 
 
305
.PHONY: distclean
305
306
distclean: clean
 
307
.PHONY: mostlyclean
306
308
mostlyclean: clean
 
309
.PHONY: maintainer-clean
307
310
maintainer-clean: clean
308
311
        -rm --force --recursive keydir confdir statedir
309
312
 
 
313
.PHONY: check
310
314
check: all
311
315
        ./mandos --check
312
316
        ./mandos-ctl --check
316
320
        ./dracut-module/password-agent --test
317
321
 
318
322
# Run the client with a local config and key
 
323
.PHONY: run-client
319
324
run-client: all keydir/seckey.txt keydir/pubkey.txt \
320
325
                        keydir/tls-privkey.pem keydir/tls-pubkey.pem
321
326
        @echo '######################################################'
351
356
        ./mandos-keygen --dir keydir --force
352
357
 
353
358
# Run the server with a local config
 
359
.PHONY: run-server
354
360
run-server: confdir/mandos.conf confdir/clients.conf statedir
355
361
        ./mandos --debug --no-dbus --configdir=confdir \
356
362
                --statedir=statedir $(SERVERARGS)
367
373
statedir:
368
374
        install --directory statedir
369
375
 
 
376
.PHONY: install
370
377
install: install-server install-client-nokey
371
378
 
 
379
.PHONY: install-html
372
380
install-html: html
373
381
        install --directory $(htmldir)
374
382
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
375
383
                $(htmldocs)
376
384
 
 
385
.PHONY: install-server
377
386
install-server: doc
378
387
        install --directory $(CONFDIR)
379
388
        if install --directory --mode=u=rwx --owner=$(USER) \
387
396
                install --mode=u=rw,go=r tmpfiles.d-mandos.conf \
388
397
                        $(TMPFILES)/mandos.conf; \
389
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
390
404
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
391
405
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
392
406
                mandos-ctl
421
435
        gzip --best --to-stdout intro.8mandos \
422
436
                > $(MANDIR)/man8/intro.8mandos.gz
423
437
 
 
438
.PHONY: install-client-nokey
424
439
install-client-nokey: all doc
425
440
        install --directory $(LIBDIR)/mandos $(CONFDIR)
426
441
        install --directory --mode=u=rwx $(KEYDIR) \
427
442
                $(LIBDIR)/mandos/plugins.d \
428
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
429
449
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
430
450
                install --mode=u=rwx \
431
451
                        --directory "$(CONFDIR)/plugins.d" \
500
520
        gzip --best --to-stdout dracut-module/password-agent.8mandos \
501
521
                > $(MANDIR)/man8/password-agent.8mandos.gz
502
522
 
 
523
.PHONY: install-client
503
524
install-client: install-client-nokey
504
525
# Post-installation stuff
505
526
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
515
536
        fi
516
537
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
517
538
 
 
539
.PHONY: uninstall
518
540
uninstall: uninstall-server uninstall-client
519
541
 
 
542
.PHONY: uninstall-server
520
543
uninstall-server:
521
544
        -rm --force $(PREFIX)/sbin/mandos \
522
545
                $(PREFIX)/sbin/mandos-ctl \
529
552
        update-rc.d -f mandos remove
530
553
        -rmdir $(CONFDIR)
531
554
 
 
555
.PHONY: uninstall-client
532
556
uninstall-client:
533
557
# Refuse to uninstall client if /etc/crypttab is explicitly configured
534
558
# to use it.
570
594
            done; \
571
595
        fi
572
596
 
 
597
.PHONY: purge
573
598
purge: purge-server purge-client
574
599
 
 
600
.PHONY: purge-server
575
601
purge-server: uninstall-server
576
602
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
577
603
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
582
608
                $(DESTDIR)/var/run/mandos.pid
583
609
        -rmdir $(CONFDIR)
584
610
 
 
611
.PHONY: purge-client
585
612
purge-client: uninstall-client
586
613
        -shred --remove $(KEYDIR)/seckey.txt $(KEYDIR)/tls-privkey.pem
587
614
        -rm --force $(CONFDIR)/plugin-runner.conf \