/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 02:51:19 UTC
  • Revision ID: teddy@fukt.bsnet.se-20100912025119-7vvpqofpnbxf7i22
Rename all D-Bus properties to conform to D-Bus naming conventions;
all programs changed.

Also rename client setting "approved_delay" to "approval_delay", and
"approved_duration" to "approval_duration"; all programs changed.

* mandos (ClientDBus.NeedApproval): Bug fix: send an UInt64, not a
                                    float.
  (ClientDBus.ApprovedByDefault_dbus_property,
  ClientDBus.ApprovalDelay_dbus_property,
  ClientDBus.ApprovalDuration_dbus_property): Bug fix: send
                                              PropertyChanged signal.

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