/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-30 21:10:13 UTC
  • Revision ID: teddy@recompile.se-20190830211013-7bt0qseq97dpt7oy
Update Python 3 compatibility

* mandos (rfc3339_duration_to_delta): Change doctest string to not
                                      depend on exact repr() string
                                      representation of values and
                                      instead do value comparisons.
  (string_to_delta): - '' -

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.4
 
46
version:=1.8.8
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)))
50
52
GROUP:=$(firstword $(subst :, ,$(shell getent group _mandos \
51
53
        || getent group nogroup || echo 65534)))
52
54
 
 
55
LINUXVERSION:=$(shell uname --kernel-release)
 
56
 
53
57
## Use these settings for a traditional /usr/local install
54
58
# PREFIX:=$(DESTDIR)/usr/local
55
59
# CONFDIR:=$(DESTDIR)/etc/mandos
71
75
STATEDIR:=$(DESTDIR)/var/lib/mandos
72
76
LIBDIR:=$(shell \
73
77
        for d in \
74
 
        "/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null`" \
 
78
        "/usr/lib/`dpkg-architecture \
 
79
                        -qDEB_HOST_MULTIARCH 2>/dev/null`" \
75
80
        "`rpm --eval='%{_libdir}' 2>/dev/null`" /usr/lib; do \
76
81
                if [ -d "$$d" -a "$$d" = "$${d%/}" ]; then \
77
82
                        echo "$(DESTDIR)$$d"; \
80
85
        done)
81
86
##
82
87
 
83
 
SYSTEMD:=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
84
 
TMPFILES:=$(DESTDIR)$(shell pkg-config systemd --variable=tmpfilesdir)
 
88
SYSTEMD:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
 
89
                        --variable=systemdsystemunitdir)
 
90
TMPFILES:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
 
91
                        --variable=tmpfilesdir)
 
92
SYSUSERS:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
 
93
                        --variable=sysusersdir)
85
94
 
86
 
GNUTLS_CFLAGS:=$(shell pkg-config --cflags-only-I gnutls)
87
 
GNUTLS_LIBS:=$(shell pkg-config --libs gnutls)
88
 
AVAHI_CFLAGS:=$(shell pkg-config --cflags-only-I avahi-core)
89
 
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)
90
99
GPGME_CFLAGS:=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
91
100
GPGME_LIBS:=$(shell gpgme-config --libs; getconf LFS_LIBS; \
92
101
        getconf LFS_LDFLAGS)
93
 
LIBNL3_CFLAGS:=$(shell pkg-config --cflags-only-I libnl-route-3.0)
94
 
LIBNL3_LIBS:=$(shell pkg-config --libs libnl-route-3.0)
95
 
GLIB_CFLAGS:=$(shell pkg-config --cflags glib-2.0)
96
 
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)
97
106
 
98
107
# Do not change these two
99
 
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) \
100
 
        $(OPTIMIZE) $(LANGUAGE) -DVERSION='"$(version)"'
 
108
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
 
109
        $(LANGUAGE) $(FEATURES) -DVERSION='"$(version)"'
101
110
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(strip \
102
111
        ) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
103
112
 
312
321
        ./dracut-module/password-agent --test
313
322
 
314
323
# Run the client with a local config and key
315
 
run-client: all keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem
316
 
        @echo "###################################################################"
317
 
        @echo "# The following error messages are harmless and can be safely     #"
318
 
        @echo "# ignored:                                                        #"
319
 
        @echo "# From plugin-runner: setgid: Operation not permitted             #"
320
 
        @echo "#                     setuid: Operation not permitted             #"
321
 
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
322
 
        @echo "# From mandos-client:                                             #"
323
 
        @echo "#             Failed to raise privileges: Operation not permitted #"
324
 
        @echo "#             Warning: network hook \"*\" exited with status *      #"
325
 
        @echo "#                                                                 #"
326
 
        @echo "# (The messages are caused by not running as root, but you should #"
327
 
        @echo "# NOT run \"make run-client\" as root unless you also unpacked and  #"
328
 
        @echo "# compiled Mandos as root, which is also NOT recommended.)        #"
329
 
        @echo "###################################################################"
 
324
run-client: all keydir/seckey.txt keydir/pubkey.txt \
 
325
                        keydir/tls-privkey.pem keydir/tls-pubkey.pem
 
326
        @echo '######################################################'
 
327
        @echo '# The following error messages are harmless and can  #'
 
328
        @echo '#  be safely ignored:                                #'
 
329
        @echo '## From plugin-runner:                               #'
 
330
        @echo '# setgid: Operation not permitted                    #'
 
331
        @echo '# setuid: Operation not permitted                    #'
 
332
        @echo '## From askpass-fifo:                                #'
 
333
        @echo '# mkfifo: Permission denied                          #'
 
334
        @echo '## From mandos-client:                               #'
 
335
        @echo '# Failed to raise privileges: Operation not permi... #'
 
336
        @echo '# Warning: network hook "*" exited with status *     #'
 
337
        @echo '# ioctl SIOCSIFFLAGS +IFF_UP: Operation not permi... #'
 
338
        @echo '# Failed to bring up interface "*": Operation not... #'
 
339
        @echo '#                                                    #'
 
340
        @echo '# (The messages are caused by not running as root,   #'
 
341
        @echo '# but you should NOT run "make run-client" as root   #'
 
342
        @echo '# unless you also unpacked and compiled Mandos as    #'
 
343
        @echo '# root, which is also NOT recommended.)              #'
 
344
        @echo '######################################################'
330
345
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
331
346
        ./plugin-runner --plugin-dir=plugins.d \
332
347
                --plugin-helper-dir=plugin-helpers \
372
387
        elif install --directory --mode=u=rwx $(STATEDIR); then \
373
388
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
374
389
        fi
375
 
        if [ "$(TMPFILES)" != "$(DESTDIR)" -a -d "$(TMPFILES)" ]; then \
 
390
        if [ "$(TMPFILES)" != "$(DESTDIR)" \
 
391
                        -a -d "$(TMPFILES)" ]; then \
376
392
                install --mode=u=rw,go=r tmpfiles.d-mandos.conf \
377
393
                        $(TMPFILES)/mandos.conf; \
378
394
        fi
 
395
        if [ "$(SYSUSERS)" != "$(DESTDIR)" \
 
396
                        -a -d "$(SYSUSERS)" ]; then \
 
397
                install --mode=u=rw,go=r sysusers.d-mandos.conf \
 
398
                        $(SYSUSERS)/mandos.conf; \
 
399
        fi
379
400
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
380
401
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
381
402
                mandos-ctl
415
436
        install --directory --mode=u=rwx $(KEYDIR) \
416
437
                $(LIBDIR)/mandos/plugins.d \
417
438
                $(LIBDIR)/mandos/plugin-helpers
 
439
        if [ "$(SYSUSERS)" != "$(DESTDIR)" \
 
440
                        -a -d "$(SYSUSERS)" ]; then \
 
441
                install --mode=u=rw,go=r sysusers.d-mandos.conf \
 
442
                        $(SYSUSERS)/mandos-client.conf; \
 
443
        fi
418
444
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
419
445
                install --mode=u=rwx \
420
446
                        --directory "$(CONFDIR)/plugins.d" \
425
451
        install --mode=u=rwx,go=rx \
426
452
                --target-directory=$(LIBDIR)/mandos plugin-runner
427
453
        install --mode=u=rwx,go=rx \
428
 
                --target-directory=$(LIBDIR)/mandos mandos-to-cryptroot-unlock
 
454
                --target-directory=$(LIBDIR)/mandos \
 
455
                mandos-to-cryptroot-unlock
429
456
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
430
457
                mandos-keygen
431
458
        install --mode=u=rwx,go=rx \
494
521
        if command -v update-initramfs >/dev/null; then \
495
522
            update-initramfs -k all -u; \
496
523
        elif command -v dracut >/dev/null; then \
497
 
            for initrd in $(DESTDIR)/boot/initr*-$(shell uname --kernel-release); do \
 
524
            for initrd in $(DESTDIR)/boot/initr*-$(LINUXVERSION); do \
498
525
                if [ -w "$$initrd" ]; then \
499
526
                    chmod go-r "$$initrd"; \
500
527
                    dracut --force "$$initrd"; \
553
580
        if command -v update-initramfs >/dev/null; then \
554
581
            update-initramfs -k all -u; \
555
582
        elif command -v dracut >/dev/null; then \
556
 
            for initrd in $(DESTDIR)/boot/initr*-$(shell uname --kernel-release); do \
 
583
            for initrd in $(DESTDIR)/boot/initr*-$(LINUXVERSION); do \
557
584
                test -w "$$initrd" && dracut --force "$$initrd"; \
558
585
            done; \
559
586
        fi