/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-02-13 05:38:21 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090213053821-03e696gckk4nbjps
Support not using IPv6 in server:

* mandos (AvahiService.__init__): Take new "protocol" parameter.  All
                                  callers changed.
  (IPv6_TCPServer.__init__): Take new "use_ipv6" parameter.  All
                             callers changed.
  (IPv6_TCPServer.server_bind): Create IPv4 socket if not using IPv6.
  (main): New "--no-ipv6" command line option.  New "use_ipv6" config
          option.
* mandos-options.xml ([@id="address"]): Document conditional IPv4
                                        address support.
  ([@id="ipv6"]): New paragraph.
* mandos.conf (use_ipv6): New config option.
* mandos.conf.xml (OPTIONS): Document new "use_dbus" option.
  (EXAMPLE): Changed to use IPv6 link-local address.  Added "use_ipv6"
             option.
* mandos.xml (SYNOPSIS): New "--no-ipv6" option.
  (OPTIONS): Document new "--no-ipv6" option.

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.5
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
 
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
50
 
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
51
 
        getconf LFS_LDFLAGS)
 
42
GPGME_CFLAGS=$(shell gpgme-config --cflags)
 
43
GPGME_LIBS=$(shell gpgme-config --libs)
52
44
 
53
45
# Do not change these two
54
46
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
57
49
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
58
50
 
59
51
# Commands to format a DocBook <refentry> document into a manual page
60
 
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
 
52
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
61
53
        --param man.charmap.use.subset          0 \
62
54
        --param make.year.ranges                1 \
63
55
        --param make.single.year.ranges         1 \
65
57
        --param man.authors.section.enabled     0 \
66
58
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
67
59
        $(notdir $<); \
68
 
        $(MANPOST) $(notdir $@))
 
60
        $(MANPOST) $(notdir $@)
69
61
# DocBook-to-man post-processing to fix a '\n' escape bug
70
62
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
71
63
 
72
 
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
 
64
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
73
65
        --param make.year.ranges                1 \
74
66
        --param make.single.year.ranges         1 \
75
67
        --param man.output.quietly              1 \
77
69
        --param citerefentry.link               1 \
78
70
        --output $@ \
79
71
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
80
 
        $<; $(HTMLPOST) $@)
 
72
        $<; $(HTMLPOST) $@
81
73
# Fix citerefentry links
82
74
HTMLPOST=$(SED) --in-place \
83
75
        --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
76
 
85
77
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
86
 
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
87
 
        plugins.d/plymouth
 
78
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
88
79
CPROGS=plugin-runner $(PLUGINS)
89
 
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
 
80
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
90
81
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
91
 
        mandos-monitor.8 \
92
82
        plugins.d/mandos-client.8mandos \
93
83
        plugins.d/password-prompt.8mandos mandos.conf.5 \
94
84
        plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
133
123
                 legalnotice.xml
134
124
        $(DOCBOOKTOHTML)
135
125
 
136
 
mandos-monitor.8: mandos-monitor.xml common.ent overview.xml \
137
 
                legalnotice.xml
138
 
        $(DOCBOOKTOMAN)
139
 
mandos-monitor.8.xhtml: mandos-monitor.xml common.ent overview.xml \
140
 
                 legalnotice.xml
141
 
        $(DOCBOOKTOHTML)
142
 
 
143
126
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
144
127
                legalnotice.xml
145
128
        $(DOCBOOKTOMAN)
167
150
 
168
151
# Update all these files with version number $(version)
169
152
common.ent: Makefile
170
 
        $(strip $(SED) --in-place \
171
 
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
172
 
                $@)
 
153
        $(SED) --in-place \
 
154
                --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' \
 
155
                $@
173
156
 
174
157
mandos: Makefile
175
 
        $(strip $(SED) --in-place \
 
158
        $(SED) --in-place \
176
159
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
177
 
                $@)
 
160
                $@
178
161
 
179
162
mandos-keygen: Makefile
180
 
        $(strip $(SED) --in-place \
 
163
        $(SED) --in-place \
181
164
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
182
 
                $@)
 
165
                $@
183
166
 
184
167
mandos-ctl: Makefile
185
 
        $(strip $(SED) --in-place \
186
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
187
 
                $@)
188
 
 
189
 
mandos-monitor: Makefile
190
 
        $(strip $(SED) --in-place \
191
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
192
 
                $@)
 
168
        $(SED) --in-place \
 
169
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
170
                $@
193
171
 
194
172
mandos.lsm: Makefile
195
 
        $(strip $(SED) --in-place \
 
173
        $(SED) --in-place \
196
174
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
197
 
                $@)
198
 
        $(strip $(SED) --in-place \
 
175
                $@
 
176
        $(SED) --in-place \
199
177
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
200
 
                $@)
201
 
        $(strip $(SED) --in-place \
 
178
                $@
 
179
        $(SED) --in-place \
202
180
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
203
 
                $@)
 
181
                $@
204
182
 
205
 
plugins.d/mandos-client: plugins.d/mandos-client.c
206
 
        $(LINK.c) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) $(strip\
207
 
                ) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
183
plugins.d/mandos-client: plugins.d/mandos-client.o
 
184
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
 
185
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
208
186
 
209
187
.PHONY : all doc html clean distclean run-client run-server install \
210
188
        install-server install-client uninstall uninstall-server \
223
201
 
224
202
# Run the client with a local config and key
225
203
run-client: all keydir/seckey.txt keydir/pubkey.txt
226
 
        @echo "###################################################################"
227
 
        @echo "# The following error messages are harmless and can be safely     #"
228
 
        @echo "# ignored.  The messages are caused by not running as root, but   #"
229
 
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
230
 
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
231
 
        @echo "# From plugin-runner: setuid: Operation not permitted             #"
232
 
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
233
 
        @echo "# From mandos-client: setuid: Operation not permitted             #"
234
 
        @echo "#                     seteuid: Operation not permitted            #"
235
 
        @echo "#                     klogctl: Operation not permitted            #"
236
 
        @echo "###################################################################"
237
204
        ./plugin-runner --plugin-dir=plugins.d \
238
205
                --config-file=plugin-runner.conf \
239
206
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
246
213
 
247
214
# Run the server with a local config
248
215
run-server: confdir/mandos.conf confdir/clients.conf
249
 
        @echo "#################################################################"
250
 
        @echo "# NOTE: Please IGNORE the error about \"Could not open file      #"
251
 
        @echo "# u'/var/run/mandos.pid'\" -  it is harmless and is caused by    #"
252
 
        @echo "# the server not running as root.  Do NOT run \"make run-server\" #"
253
 
        @echo "# server as root if you didn't also unpack and compile it thus. #"
254
 
        @echo "#################################################################"
255
216
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
256
217
 
257
218
# Used by run-server
274
235
install-server: doc
275
236
        install --directory $(CONFDIR)
276
237
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
277
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
278
 
                mandos-ctl
279
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
280
 
                mandos-monitor
281
238
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
282
239
                mandos.conf
283
240
        install --mode=u=rw --target-directory=$(CONFDIR) \
284
241
                clients.conf
285
 
        install --mode=u=rw,go=r dbus-mandos.conf \
286
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
287
242
        install --mode=u=rwx,go=rx init.d-mandos \
288
243
                $(DESTDIR)/etc/init.d/mandos
289
244
        install --mode=u=rw,go=r default-mandos \
325
280
        install --mode=u=rwxs,go=rx \
326
281
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
327
282
                plugins.d/askpass-fifo
328
 
        install --mode=u=rwxs,go=rx \
329
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
330
 
                plugins.d/plymouth
331
283
        install initramfs-tools-hook \
332
284
                $(INITRAMFSTOOLS)/hooks/mandos
333
285
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
360
312
 
361
313
uninstall-server:
362
314
        -rm --force $(PREFIX)/sbin/mandos \
363
 
                $(PREFIX)/sbin/mandos-ctl \
364
 
                $(PREFIX)/sbin/mandos-monitor \
365
315
                $(MANDIR)/man8/mandos.8.gz \
366
316
                $(MANDIR)/man5/mandos.conf.5.gz \
367
317
                $(MANDIR)/man5/mandos-clients.conf.5.gz
380
330
                $(PREFIX)/lib/mandos/plugins.d/usplash \
381
331
                $(PREFIX)/lib/mandos/plugins.d/splashy \
382
332
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
383
 
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
384
333
                $(INITRAMFSTOOLS)/hooks/mandos \
385
334
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
386
335
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
399
348
 
400
349
purge-server: uninstall-server
401
350
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
402
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
403
351
                $(DESTDIR)/etc/default/mandos \
404
352
                $(DESTDIR)/etc/init.d/mandos \
405
353
                $(DESTDIR)/var/run/mandos.pid