/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: 2014-01-20 20:54:47 UTC
  • Revision ID: teddy@recompile.se-20140120205447-z5fwrk7r2y9gkbfg
Documentation change to clarify support of --connect option.

* plugins.d/mandos.xml (OPTIONS): Clarify support of --connect option.

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
14
LINK_FORTIFY_LD=-z relro -z now
23
20
LINK_FORTIFY += -pie
24
21
endif
25
22
#COVERAGE=--coverage
26
 
OPTIMIZE=-Os -fno-strict-aliasing
27
 
LANGUAGE=-std=gnu11
 
23
OPTIMIZE=-Os
 
24
LANGUAGE=-std=gnu99
28
25
htmldir=man
29
 
version=1.7.1
 
26
version=1.6.2
30
27
SED=sed
31
28
 
32
29
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
69
66
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
70
67
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
71
68
        getconf LFS_LDFLAGS)
72
 
LIBNL3_CFLAGS=$(shell pkg-config --cflags-only-I libnl-route-3.0)
73
 
LIBNL3_LIBS=$(shell pkg-config --libs libnl-route-3.0)
74
69
 
75
70
# Do not change these two
76
71
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
87
82
        --param man.authors.section.enabled     0 \
88
83
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
89
84
        $(notdir $<); \
 
85
        $(MANPOST) $(notdir $@);\
90
86
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
91
87
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
92
88
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
93
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'
94
92
 
95
93
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
96
94
        --param make.year.ranges                1 \
108
106
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
109
107
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
110
108
        plugins.d/plymouth
111
 
PLUGIN_HELPERS=plugin-helpers/mandos-client-iprouteadddel
112
 
CPROGS=plugin-runner $(PLUGINS) $(PLUGIN_HELPERS)
 
109
CPROGS=plugin-runner $(PLUGINS)
113
110
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
114
111
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
115
112
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
242
239
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
243
240
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
244
241
 
245
 
plugin-helpers/mandos-client-iprouteadddel: plugin-helpers/mandos-client-iprouteadddel.c
246
 
        $(LINK.c) $(LIBNL3_CFLAGS) $^ $(LIBNL3_LIBS) $(strip\
247
 
                ) $(LOADLIBES) $(LDLIBS) -o $@
248
 
 
249
 
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
250
 
        check run-client run-server install install-html \
251
 
        install-server install-client-nokey install-client uninstall \
252
 
        uninstall-server uninstall-client purge purge-server \
253
 
        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
254
245
 
255
246
clean:
256
247
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
271
262
        @echo "# ignored.  The messages are caused by not running as root, but   #"
272
263
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
273
264
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
274
 
        @echo "# From plugin-runner: setgid: Operation not permitted             #"
275
 
        @echo "#                     setuid: Operation not permitted             #"
 
265
        @echo "# From plugin-runner: setuid: Operation not permitted             #"
276
266
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
277
 
        @echo "# From mandos-client:                                             #"
278
 
        @echo "#             Failed to raise privileges: Operation not permitted #"
279
 
        @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            #"
280
270
        @echo "###################################################################"
281
 
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
282
271
        ./plugin-runner --plugin-dir=plugins.d \
283
 
                --plugin-helper-dir=plugin-helpers \
284
272
                --config-file=plugin-runner.conf \
285
273
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
286
 
                --env-for=mandos-client:GNOME_KEYRING_CONTROL= \
287
274
                $(CLIENTARGS)
288
275
 
289
276
# Used by run-client
304
291
        install --directory confdir
305
292
        install --mode=u=rw $< $@
306
293
# Add a client password
307
 
        ./mandos-keygen --dir keydir --password --no-ssh >> $@
 
294
        ./mandos-keygen --dir keydir --password >> $@
308
295
statedir:
309
296
        install --directory statedir
310
297
 
360
347
install-client-nokey: all doc
361
348
        install --directory $(LIBDIR)/mandos $(CONFDIR)
362
349
        install --directory --mode=u=rwx $(KEYDIR) \
363
 
                $(LIBDIR)/mandos/plugins.d \
364
 
                $(LIBDIR)/mandos/plugin-helpers
 
350
                $(LIBDIR)/mandos/plugins.d
365
351
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
366
352
                install --mode=u=rwx \
367
353
                        --directory "$(CONFDIR)/plugins.d"; \
368
 
                install --directory "$(CONFDIR)/plugin-helpers"; \
369
354
        fi
370
355
        install --mode=u=rwx,go=rx --directory \
371
356
                "$(CONFDIR)/network-hooks.d"
391
376
        install --mode=u=rwxs,go=rx \
392
377
                --target-directory=$(LIBDIR)/mandos/plugins.d \
393
378
                plugins.d/plymouth
394
 
        install --mode=u=rwxs,go=rx \
395
 
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
396
 
                plugin-helpers/mandos-client-iprouteadddel
397
379
        install initramfs-tools-hook \
398
380
                $(INITRAMFSTOOLS)/hooks/mandos
399
381
        install --mode=u=rw,go=r initramfs-tools-hook-conf \