/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: 2013-10-28 08:38:47 UTC
  • Revision ID: teddy@recompile.se-20131028083847-cper3srg5o29r2ge
Use architecture libdir.

Instead of always using /usr/lib/mandos, use whatever the architecture
specifies, like /usr/lib/x86_64-linux-gnu/mandos or /usr/lib64/mandos.
Still use /usr/lib/mandos as a fallback.

* Makefile (LIBDIR): New.
 (install-client-nokey, uninstall-client): Use LIBDIR instead of
                                           $(PREFIX)/lib.
* initramfs-tools-hook: Detect correct libdir and copy from there.

Reported-by: Nathanael D. Noblet <nathanael@gnat.ca>
Suggested-by: Nathanael D. Noblet <nathanael@gnat.ca>

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
WARN=-O -Wall -Wextra -Wdouble-promotion -Wformat=2 -Winit-self \
2
 
        -Wmissing-include-dirs -Wswitch-default -Wswitch-enum \
3
 
        -Wunused -Wuninitialized -Wstrict-overflow=5 \
4
 
        -Wsuggest-attribute=pure -Wsuggest-attribute=const \
5
 
        -Wsuggest-attribute=noreturn -Wfloat-equal -Wundef -Wshadow \
 
1
WARN=-O -Wall -Wformat=2 -Winit-self -Wmissing-include-dirs \
 
2
        -Wswitch-default -Wswitch-enum -Wunused-parameter \
 
3
        -Wstrict-aliasing=1 -Wextra -Wfloat-equal -Wundef -Wshadow \
6
4
        -Wunsafe-loop-optimizations -Wpointer-arith \
7
5
        -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings \
8
 
        -Wconversion -Wlogical-op -Waggregate-return \
9
 
        -Wstrict-prototypes -Wold-style-definition \
10
 
        -Wmissing-format-attribute -Wnormalized=nfc -Wpacked \
11
 
        -Wredundant-decls -Wnested-externs -Winline -Wvla \
12
 
        -Wvolatile-register-var -Woverlength-strings
 
6
        -Wconversion -Wstrict-prototypes -Wold-style-definition \
 
7
        -Wpacked -Wnested-externs -Winline -Wvolatile-register-var
 
8
#       -Wunreachable-code
13
9
#DEBUG=-ggdb3
14
 
# For info about _FORTIFY_SOURCE, see feature_test_macros(7)
 
10
# For info about _FORTIFY_SOURCE, see
 
11
# <http://www.kernel.org/doc/man-pages/online/pages/man7/feature_test_macros.7.html>
15
12
# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
16
13
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
17
 
# <https://developerblog.redhat.com/2014/10/16/gcc-undefined-behavior-sanitizer-ubsan/>
18
 
ALL_SANITIZE_OPTIONS:=-fsanitize=address -fsanitize=undefined \
19
 
        -fsanitize=shift -fsanitize=integer-divide-by-zero \
20
 
        -fsanitize=unreachable -fsanitize=vla-bound -fsanitize=null \
21
 
        -fsanitize=return -fsanitize=signed-integer-overflow \
22
 
        -fsanitize=bounds -fsanitize=alignment \
23
 
        -fsanitize=object-size -fsanitize=float-divide-by-zero \
24
 
        -fsanitize=float-cast-overflow -fsanitize=nonnull-attribute \
25
 
        -fsanitize=returns-nonnull-attribute -fsanitize=bool \
26
 
        -fsanitize=enum
27
 
# Check which sanitizing options can be used
28
 
SANITIZE:=$(foreach option,$(ALL_SANITIZE_OPTIONS),$(shell \
29
 
        echo 'int main(){}' | $(CC) --language=c $(option) /dev/stdin \
30
 
        -o /dev/null >/dev/null 2>&1 && echo $(option)))
31
14
LINK_FORTIFY_LD=-z relro -z now
32
15
LINK_FORTIFY=
33
16
 
37
20
LINK_FORTIFY += -pie
38
21
endif
39
22
#COVERAGE=--coverage
40
 
OPTIMIZE=-Os -fno-strict-aliasing
41
 
LANGUAGE=-std=gnu11
 
23
OPTIMIZE=-Os
 
24
LANGUAGE=-std=gnu99
42
25
htmldir=man
43
 
version=1.7.7
 
26
version=1.6.2
44
27
SED=sed
45
28
 
46
29
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
47
 
GROUP=$(firstword $(subst :, ,$(shell getent group _mandos || getent group nogroup || echo 65534)))
 
30
GROUP=$(firstword $(subst :, ,$(shell getent group _mandos || getent group nobody || echo 65534)))
48
31
 
49
32
## Use these settings for a traditional /usr/local install
50
33
# PREFIX=$(DESTDIR)/usr/local
75
58
##
76
59
 
77
60
SYSTEMD=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
78
 
TMPFILES=$(DESTDIR)$(shell pkg-config systemd --variable=tmpfilesdir)
79
61
 
80
62
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
81
63
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
84
66
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
85
67
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
86
68
        getconf LFS_LDFLAGS)
87
 
LIBNL3_CFLAGS=$(shell pkg-config --cflags-only-I libnl-route-3.0)
88
 
LIBNL3_LIBS=$(shell pkg-config --libs libnl-route-3.0)
89
69
 
90
70
# Do not change these two
91
 
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(SANITIZE) $(COVERAGE) \
92
 
        $(OPTIMIZE) $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) \
93
 
        $(GPGME_CFLAGS) -DVERSION='"$(version)"'
 
71
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
 
72
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
 
73
        -DVERSION='"$(version)"'
94
74
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
95
75
 
96
76
# Commands to format a DocBook <refentry> document into a manual page
102
82
        --param man.authors.section.enabled     0 \
103
83
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
104
84
        $(notdir $<); \
 
85
        $(MANPOST) $(notdir $@);\
105
86
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
106
87
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
107
88
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
108
89
        fi >/dev/null)
 
90
# DocBook-to-man post-processing to fix a '\n' escape bug
 
91
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
109
92
 
110
93
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
111
94
        --param make.year.ranges                1 \
123
106
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
124
107
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
125
108
        plugins.d/plymouth
126
 
PLUGIN_HELPERS=plugin-helpers/mandos-client-iprouteadddel
127
 
CPROGS=plugin-runner $(PLUGINS) $(PLUGIN_HELPERS)
 
109
CPROGS=plugin-runner $(PLUGINS)
128
110
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
129
111
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
130
112
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
257
239
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
258
240
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
259
241
 
260
 
plugin-helpers/mandos-client-iprouteadddel: plugin-helpers/mandos-client-iprouteadddel.c
261
 
        $(LINK.c) $(LIBNL3_CFLAGS) $^ $(LIBNL3_LIBS) $(strip\
262
 
                ) $(LOADLIBES) $(LDLIBS) -o $@
263
 
 
264
 
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
265
 
        check run-client run-server install install-html \
266
 
        install-server install-client-nokey install-client uninstall \
267
 
        uninstall-server uninstall-client purge purge-server \
268
 
        purge-client
 
242
.PHONY : all doc html clean distclean run-client run-server install \
 
243
        install-server install-client uninstall uninstall-server \
 
244
        uninstall-client purge purge-server purge-client
269
245
 
270
246
clean:
271
247
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
286
262
        @echo "# ignored.  The messages are caused by not running as root, but   #"
287
263
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
288
264
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
289
 
        @echo "# From plugin-runner: setgid: Operation not permitted             #"
290
 
        @echo "#                     setuid: Operation not permitted             #"
 
265
        @echo "# From plugin-runner: setuid: Operation not permitted             #"
291
266
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
292
 
        @echo "# From mandos-client:                                             #"
293
 
        @echo "#             Failed to raise privileges: Operation not permitted #"
294
 
        @echo "#             Warning: network hook \"*\" exited with status *      #"
 
267
        @echo "# From mandos-client: setuid: Operation not permitted             #"
 
268
        @echo "#                     seteuid: Operation not permitted            #"
 
269
        @echo "#                     klogctl: Operation not permitted            #"
295
270
        @echo "###################################################################"
296
 
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
297
271
        ./plugin-runner --plugin-dir=plugins.d \
298
 
                --plugin-helper-dir=plugin-helpers \
299
272
                --config-file=plugin-runner.conf \
300
273
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
301
 
                --env-for=mandos-client:GNOME_KEYRING_CONTROL= \
302
274
                $(CLIENTARGS)
303
275
 
304
276
# Used by run-client
319
291
        install --directory confdir
320
292
        install --mode=u=rw $< $@
321
293
# Add a client password
322
 
        ./mandos-keygen --dir keydir --password --no-ssh >> $@
 
294
        ./mandos-keygen --dir keydir --password >> $@
323
295
statedir:
324
296
        install --directory statedir
325
297
 
332
304
 
333
305
install-server: doc
334
306
        install --directory $(CONFDIR)
335
 
        if install --directory --mode=u=rwx --owner=$(USER) \
336
 
                --group=$(GROUP) $(STATEDIR); then \
337
 
                :; \
338
 
        elif install --directory --mode=u=rwx $(STATEDIR); then \
339
 
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
340
 
        fi
341
 
        if [ "$(TMPFILES)" != "$(DESTDIR)" -a -d "$(TMPFILES)" ]; then \
342
 
                install --mode=u=rw,go=r tmpfiles.d-mandos.conf \
343
 
                        $(TMPFILES)/mandos.conf; \
344
 
        fi
 
307
        install --directory --mode=u=rwx --owner=$(USER) \
 
308
                --group=$(GROUP) $(STATEDIR)
345
309
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
346
310
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
347
311
                mandos-ctl
379
343
install-client-nokey: all doc
380
344
        install --directory $(LIBDIR)/mandos $(CONFDIR)
381
345
        install --directory --mode=u=rwx $(KEYDIR) \
382
 
                $(LIBDIR)/mandos/plugins.d \
383
 
                $(LIBDIR)/mandos/plugin-helpers
 
346
                $(LIBDIR)/mandos/plugins.d
384
347
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
385
348
                install --mode=u=rwx \
386
 
                        --directory "$(CONFDIR)/plugins.d" \
387
 
                        "$(CONFDIR)/plugin-helpers"; \
 
349
                        --directory "$(CONFDIR)/plugins.d"; \
388
350
        fi
389
351
        install --mode=u=rwx,go=rx --directory \
390
352
                "$(CONFDIR)/network-hooks.d"
410
372
        install --mode=u=rwxs,go=rx \
411
373
                --target-directory=$(LIBDIR)/mandos/plugins.d \
412
374
                plugins.d/plymouth
413
 
        install --mode=u=rwx,go=rx \
414
 
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
415
 
                plugin-helpers/mandos-client-iprouteadddel
416
375
        install initramfs-tools-hook \
417
376
                $(INITRAMFSTOOLS)/hooks/mandos
418
377
        install --mode=u=rw,go=r initramfs-tools-hook-conf \