/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

* initramfs-tools-hook: Bug fix: Add "--userid" and "--groupid" to
                        start of "plugin-runner.conf" file instead of
                        appending, to allow any preexisting options to
                        override.
* plugin-runner.conf: Improved wording.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
8
8
#       -Wunreachable-code 
9
9
#DEBUG=-ggdb3
10
10
# For info about _FORTIFY_SOURCE, see
11
 
# <http://www.kernel.org/doc/man-pages/online/pages/man7/feature_test_macros.7.html>
12
 
# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
13
 
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
14
 
LINK_FORTIFY_LD=-z relro -z now
15
 
LINK_FORTIFY=
16
 
 
17
 
# If BROKEN_PIE is set, do not build with -pie
18
 
ifndef BROKEN_PIE
19
 
FORTIFY += -fPIE
20
 
LINK_FORTIFY += -pie
21
 
endif
 
11
# <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>
 
12
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC -fPIE
 
13
LINK_FORTIFY_LD=-z relro -fPIE
 
14
LINK_FORTIFY=-pie
22
15
#COVERAGE=--coverage
23
16
OPTIMIZE=-Os
24
17
LANGUAGE=-std=gnu99
25
18
htmldir=man
26
 
version=1.0.14
 
19
version=1.0.8
27
20
SED=sed
28
21
 
29
22
## Use these settings for a traditional /usr/local install
42
35
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
43
36
##
44
37
 
45
 
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
46
 
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
 
38
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
 
39
GNUTLS_LIBS=$(shell libgnutls-config --libs)
47
40
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
48
41
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
49
42
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
57
50
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
58
51
 
59
52
# Commands to format a DocBook <refentry> document into a manual page
60
 
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
 
53
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
61
54
        --param man.charmap.use.subset          0 \
62
55
        --param make.year.ranges                1 \
63
56
        --param make.single.year.ranges         1 \
65
58
        --param man.authors.section.enabled     0 \
66
59
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
67
60
        $(notdir $<); \
68
 
        $(MANPOST) $(notdir $@))
 
61
        $(MANPOST) $(notdir $@)
69
62
# DocBook-to-man post-processing to fix a '\n' escape bug
70
63
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
71
64
 
72
 
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
 
65
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
73
66
        --param make.year.ranges                1 \
74
67
        --param make.single.year.ranges         1 \
75
68
        --param man.output.quietly              1 \
77
70
        --param citerefentry.link               1 \
78
71
        --output $@ \
79
72
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
80
 
        $<; $(HTMLPOST) $@)
 
73
        $<; $(HTMLPOST) $@
81
74
# Fix citerefentry links
82
75
HTMLPOST=$(SED) --in-place \
83
76
        --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
158
151
 
159
152
# Update all these files with version number $(version)
160
153
common.ent: Makefile
161
 
        $(strip $(SED) --in-place \
 
154
        $(SED) --in-place \
162
155
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
163
 
                $@)
 
156
                $@
164
157
 
165
158
mandos: Makefile
166
 
        $(strip $(SED) --in-place \
 
159
        $(SED) --in-place \
167
160
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
168
 
                $@)
 
161
                $@
169
162
 
170
163
mandos-keygen: Makefile
171
 
        $(strip $(SED) --in-place \
 
164
        $(SED) --in-place \
172
165
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
173
 
                $@)
 
166
                $@
174
167
 
175
168
mandos-ctl: Makefile
176
 
        $(strip $(SED) --in-place \
 
169
        $(SED) --in-place \
177
170
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
178
 
                $@)
 
171
                $@
179
172
 
180
173
mandos.lsm: Makefile
181
 
        $(strip $(SED) --in-place \
 
174
        $(SED) --in-place \
182
175
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
183
 
                $@)
184
 
        $(strip $(SED) --in-place \
 
176
                $@
 
177
        $(SED) --in-place \
185
178
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
186
 
                $@)
187
 
        $(strip $(SED) --in-place \
 
179
                $@
 
180
        $(SED) --in-place \
188
181
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
189
 
                $@)
 
182
                $@
190
183
 
191
 
plugins.d/mandos-client: plugins.d/mandos-client.c
192
 
        $(LINK.c) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) $(strip\
193
 
                ) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
184
plugins.d/mandos-client: plugins.d/mandos-client.o
 
185
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
 
186
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
194
187
 
195
188
.PHONY : all doc html clean distclean run-client run-server install \
196
189
        install-server install-client uninstall uninstall-server \
209
202
 
210
203
# Run the client with a local config and key
211
204
run-client: all keydir/seckey.txt keydir/pubkey.txt
212
 
        @echo "###################################################################"
213
 
        @echo "# The following error messages are harmless and can be safely     #"
214
 
        @echo "# ignored.  The messages are caused by not running as root, but   #"
215
 
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
216
 
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
217
 
        @echo "# From plugin-runner: setuid: Operation not permitted             #"
218
 
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
219
 
        @echo "# From mandos-client: setuid: Operation not permitted             #"
220
 
        @echo "#                     seteuid: Operation not permitted            #"
221
 
        @echo "#                     klogctl: Operation not permitted            #"
222
 
        @echo "###################################################################"
223
205
        ./plugin-runner --plugin-dir=plugins.d \
224
206
                --config-file=plugin-runner.conf \
225
207
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
232
214
 
233
215
# Run the server with a local config
234
216
run-server: confdir/mandos.conf confdir/clients.conf
235
 
        @echo "#################################################################"
236
 
        @echo "# NOTE: Please IGNORE errors about \"No permission to bind to    #"
237
 
        @echo "# interface\" or \"Could not open file u'/var/run/mandos.pid'\" -  #"
238
 
        @echo "# they are harmless and are caused by the server not running as #"
239
 
        @echo "# root.  Do NOT run \"make run-server\" server as root if you did #"
240
 
        @echo "# not also unpack and compile it as root.                       #"
241
 
        @echo "#################################################################"
242
217
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
243
218
 
244
219
# Used by run-server