/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: 2010-09-12 03:00:40 UTC
  • Revision ID: teddy@fukt.bsnet.se-20100912030040-b0uopyennste9fdh
Documentation changes:

* DBUS-API: New file documenting the server D-Bus interface.

* clients.conf: Add examples of new approval settings.

* debian/mandos.docs: Added "DBUS-API".

* mandos-clients.conf.xml (OPTIONS): Added "approved_by_default",
                                     "approval_delay", and
                                     "approval_duration".
* mandos.xml (D-BUS INTERFACE): Refer to the "DBUS-API" file.
  (BUGS): Remove mention of lack of a remote query interface.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
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>
12
12
# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
13
 
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC -fPIE
14
 
LINK_FORTIFY_LD=-z relro -fPIE
15
 
LINK_FORTIFY=-pie
 
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
16
22
#COVERAGE=--coverage
17
23
OPTIMIZE=-Os
18
24
LANGUAGE=-std=gnu99
19
25
htmldir=man
20
 
version=1.0.13
 
26
version=1.0.14
21
27
SED=sed
22
28
 
23
29
## Use these settings for a traditional /usr/local install
51
57
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
52
58
 
53
59
# Commands to format a DocBook <refentry> document into a manual page
54
 
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
 
60
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
55
61
        --param man.charmap.use.subset          0 \
56
62
        --param make.year.ranges                1 \
57
63
        --param make.single.year.ranges         1 \
59
65
        --param man.authors.section.enabled     0 \
60
66
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
61
67
        $(notdir $<); \
62
 
        $(MANPOST) $(notdir $@)
 
68
        $(MANPOST) $(notdir $@))
63
69
# DocBook-to-man post-processing to fix a '\n' escape bug
64
70
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
65
71
 
66
 
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
 
72
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
67
73
        --param make.year.ranges                1 \
68
74
        --param make.single.year.ranges         1 \
69
75
        --param man.output.quietly              1 \
71
77
        --param citerefentry.link               1 \
72
78
        --output $@ \
73
79
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
74
 
        $<; $(HTMLPOST) $@
 
80
        $<; $(HTMLPOST) $@)
75
81
# Fix citerefentry links
76
82
HTMLPOST=$(SED) --in-place \
77
83
        --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
152
158
 
153
159
# Update all these files with version number $(version)
154
160
common.ent: Makefile
155
 
        $(SED) --in-place \
 
161
        $(strip $(SED) --in-place \
156
162
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
157
 
                $@
 
163
                $@)
158
164
 
159
165
mandos: Makefile
160
 
        $(SED) --in-place \
 
166
        $(strip $(SED) --in-place \
161
167
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
162
 
                $@
 
168
                $@)
163
169
 
164
170
mandos-keygen: Makefile
165
 
        $(SED) --in-place \
 
171
        $(strip $(SED) --in-place \
166
172
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
167
 
                $@
 
173
                $@)
168
174
 
169
175
mandos-ctl: Makefile
170
 
        $(SED) --in-place \
 
176
        $(strip $(SED) --in-place \
171
177
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
172
 
                $@
 
178
                $@)
173
179
 
174
180
mandos.lsm: Makefile
175
 
        $(SED) --in-place \
 
181
        $(strip $(SED) --in-place \
176
182
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
177
 
                $@
178
 
        $(SED) --in-place \
 
183
                $@)
 
184
        $(strip $(SED) --in-place \
179
185
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
180
 
                $@
181
 
        $(SED) --in-place \
 
186
                $@)
 
187
        $(strip $(SED) --in-place \
182
188
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
183
 
                $@
 
189
                $@)
184
190
 
185
 
plugins.d/mandos-client: plugins.d/mandos-client.o
186
 
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
187
 
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
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 $@
188
194
 
189
195
.PHONY : all doc html clean distclean run-client run-server install \
190
196
        install-server install-client uninstall uninstall-server \
203
209
 
204
210
# Run the client with a local config and key
205
211
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 "###################################################################"
206
223
        ./plugin-runner --plugin-dir=plugins.d \
207
224
                --config-file=plugin-runner.conf \
208
225
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
215
232
 
216
233
# Run the server with a local config
217
234
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 "#################################################################"
218
242
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
219
243
 
220
244
# Used by run-server