/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

Hooks take new "modules" argument, and hook names can contain periods.

* debian/mandos-client.README.Debian: Adjust wording.
* debian/rules (binary-common): Exclude nework-hooks.d directory from
                                dh_fixperms.
* initramfs-tools-hook: Also create network hook directory.  Allow
                        periods in hook names.  Only run executable
                        files in hook directory.  Copy needed modules.
* network-hooks.d/bridge: Fix "/usr/bin/brctl" to "/usr/sbin/brctl".
                          Also take "modules" argument.
* plugins.d/mandos-client.xml (NETWORK HOOKS/REQUIREMENTS): Document
                                                            the
                                                            allowing
                                                            of periods
                                                            in hook
                                                            names.
  (NETWORK HOOKS/REQUIREMENTS/files): Adjust wording.
  (NETWORK HOOKS/REQUIREMENTS/modules): New.
  (NETWORK HOOKS/REQUIREMENTS/MANDOSNETHOOKDIR): Clarify.
  (NETWORK HOOKS/REQUIREMENTS/MODE): Add "modules".

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
5
5
        -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings \
6
6
        -Wconversion -Wstrict-prototypes -Wold-style-definition \
7
7
        -Wpacked -Wnested-externs -Winline -Wvolatile-register-var
8
 
#       -Wunreachable-code 
 
8
#       -Wunreachable-code
9
9
#DEBUG=-ggdb3
10
10
# For info about _FORTIFY_SOURCE, see
11
11
# <http://www.kernel.org/doc/man-pages/online/pages/man7/feature_test_macros.7.html>
23
23
OPTIMIZE=-Os
24
24
LANGUAGE=-std=gnu99
25
25
htmldir=man
26
 
version=1.2.3
 
26
version=1.4.1
27
27
SED=sed
28
28
 
29
29
## Use these settings for a traditional /usr/local install
54
54
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
55
55
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
56
56
        -DVERSION='"$(version)"'
57
 
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
57
LDFLAGS=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
58
58
 
59
59
# Commands to format a DocBook <refentry> document into a manual page
60
60
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
65
65
        --param man.authors.section.enabled     0 \
66
66
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
67
67
        $(notdir $<); \
68
 
        $(MANPOST) $(notdir $@))
 
68
        $(MANPOST) $(notdir $@);\
 
69
        LANG=en_US.UTF-8 MANWIDTH=80 man --warnings --encoding=UTF-8 \
 
70
        --local-file $(notdir $@) >/dev/null)
69
71
# DocBook-to-man post-processing to fix a '\n' escape bug
70
72
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
71
73
 
92
94
        plugins.d/mandos-client.8mandos \
93
95
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
94
96
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
95
 
        plugins.d/plymouth.8mandos
 
97
        plugins.d/plymouth.8mandos intro.8mandos
96
98
 
97
99
htmldocs=$(addsuffix .xhtml,$(DOCS))
98
100
 
119
121
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
120
122
        $(DOCBOOKTOHTML)
121
123
 
 
124
intro.8mandos: intro.xml common.ent legalnotice.xml
 
125
        $(DOCBOOKTOMAN)
 
126
intro.8mandos.xhtml: intro.xml common.ent legalnotice.xml
 
127
        $(DOCBOOKTOHTML)
 
128
 
122
129
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
123
130
                legalnotice.xml
124
131
        $(DOCBOOKTOMAN)
210
217
                $@)
211
218
 
212
219
plugins.d/mandos-client: plugins.d/mandos-client.c
213
 
        $(LINK.c) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) $(strip\
214
 
                ) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
220
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
 
221
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
215
222
 
216
223
.PHONY : all doc html clean distclean run-client run-server install \
217
224
        install-server install-client uninstall uninstall-server \
243
250
        @echo "###################################################################"
244
251
        ./plugin-runner --plugin-dir=plugins.d \
245
252
                --config-file=plugin-runner.conf \
246
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
 
253
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
247
254
                $(CLIENTARGS)
248
255
 
249
256
# Used by run-client