/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: 2009-03-27 13:33:17 UTC
  • mfrom: (288.1.2 mandos-pipe-ipc)
  • Revision ID: teddy@fukt.bsnet.se-20090327133317-riwt5s5orrisozuj
Merge from pipe IPC branch.

* mandos (AvahiService.rename, main): Include PID in log messages when
                                      using a different service name.
  (Client.ReceivedSecret, Client.Rejected): New D-Bus signals.
  (TCP_handler.handle): Send IPC to parent process.
  (ForkingMixInWithPipe): New mixin class.
  (IPv6_TCPServer): Inherit from ForkingMixInWithPipe instead of
                    SocketServer.ForkingMixIn.
  (IPv6_TCPServer.handle_ipc): New method.
  (main/mandos_server): Renamed to "mandos_dbus_service" and made
                        global.
  (main/MandosServer): Renamed to "MandosDBusService".
  (main/MandosDBusService.ClientNotFound): New D-Bus 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://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'
84
77
 
85
78
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
86
 
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
87
 
        plugins.d/plymouth
 
79
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
88
80
CPROGS=plugin-runner $(PLUGINS)
89
81
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
90
82
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
159
151
 
160
152
# Update all these files with version number $(version)
161
153
common.ent: Makefile
162
 
        $(strip $(SED) --in-place \
 
154
        $(SED) --in-place \
163
155
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
164
 
                $@)
 
156
                $@
165
157
 
166
158
mandos: Makefile
167
 
        $(strip $(SED) --in-place \
 
159
        $(SED) --in-place \
168
160
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
169
 
                $@)
 
161
                $@
170
162
 
171
163
mandos-keygen: Makefile
172
 
        $(strip $(SED) --in-place \
 
164
        $(SED) --in-place \
173
165
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
174
 
                $@)
 
166
                $@
175
167
 
176
168
mandos-ctl: Makefile
177
 
        $(strip $(SED) --in-place \
 
169
        $(SED) --in-place \
178
170
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
179
 
                $@)
 
171
                $@
180
172
 
181
173
mandos.lsm: Makefile
182
 
        $(strip $(SED) --in-place \
 
174
        $(SED) --in-place \
183
175
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
184
 
                $@)
185
 
        $(strip $(SED) --in-place \
 
176
                $@
 
177
        $(SED) --in-place \
186
178
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
187
 
                $@)
188
 
        $(strip $(SED) --in-place \
 
179
                $@
 
180
        $(SED) --in-place \
189
181
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
190
 
                $@)
 
182
                $@
191
183
 
192
 
plugins.d/mandos-client: plugins.d/mandos-client.c
193
 
        $(LINK.c) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) $(strip\
194
 
                ) $(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 $@
195
187
 
196
188
.PHONY : all doc html clean distclean run-client run-server install \
197
189
        install-server install-client uninstall uninstall-server \
210
202
 
211
203
# Run the client with a local config and key
212
204
run-client: all keydir/seckey.txt keydir/pubkey.txt
213
 
        @echo "###################################################################"
214
 
        @echo "# The following error messages are harmless and can be safely     #"
215
 
        @echo "# ignored.  The messages are caused by not running as root, but   #"
216
 
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
217
 
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
218
 
        @echo "# From plugin-runner: setuid: Operation not permitted             #"
219
 
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
220
 
        @echo "# From mandos-client: setuid: Operation not permitted             #"
221
 
        @echo "#                     seteuid: Operation not permitted            #"
222
 
        @echo "#                     klogctl: Operation not permitted            #"
223
 
        @echo "###################################################################"
224
205
        ./plugin-runner --plugin-dir=plugins.d \
225
206
                --config-file=plugin-runner.conf \
226
207
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
233
214
 
234
215
# Run the server with a local config
235
216
run-server: confdir/mandos.conf confdir/clients.conf
236
 
        @echo "#################################################################"
237
 
        @echo "# NOTE: Please IGNORE the error about \"Could not open file      #"
238
 
        @echo "# u'/var/run/mandos.pid'\" -  it is harmless and is caused by    #"
239
 
        @echo "# the server not running as root.  Do NOT run \"make run-server\" #"
240
 
        @echo "# server as root if you didn't also unpack and compile it thus. #"
241
 
        @echo "#################################################################"
242
217
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
243
218
 
244
219
# Used by run-server
306
281
        install --mode=u=rwxs,go=rx \
307
282
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
308
283
                plugins.d/askpass-fifo
309
 
        install --mode=u=rwxs,go=rx \
310
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
311
 
                plugins.d/plymouth
312
284
        install initramfs-tools-hook \
313
285
                $(INITRAMFSTOOLS)/hooks/mandos
314
286
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
359
331
                $(PREFIX)/lib/mandos/plugins.d/usplash \
360
332
                $(PREFIX)/lib/mandos/plugins.d/splashy \
361
333
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
362
 
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
363
334
                $(INITRAMFSTOOLS)/hooks/mandos \
364
335
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
365
336
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \