/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
1
1
WARN=-O -Wall -Wformat=2 -Winit-self -Wmissing-include-dirs \
2
2
        -Wswitch-default -Wswitch-enum -Wunused-parameter \
3
 
        -Wstrict-aliasing=2 -Wextra -Wfloat-equal -Wundef -Wshadow \
 
3
        -Wstrict-aliasing=1 -Wextra -Wfloat-equal -Wundef -Wshadow \
4
4
        -Wunsafe-loop-optimizations -Wpointer-arith \
5
5
        -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings \
6
6
        -Wconversion -Wstrict-prototypes -Wold-style-definition \
9
9
#DEBUG=-ggdb3
10
10
# For info about _FORTIFY_SOURCE, see
11
11
# <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>
12
 
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all
 
12
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC -fPIE
 
13
LINK_FORTIFY_LD=-z relro -fPIE
 
14
LINK_FORTIFY=-pie
13
15
#COVERAGE=--coverage
14
16
OPTIMIZE=-Os
15
17
LANGUAGE=-std=gnu99
16
18
htmldir=man
17
 
version=1.0
 
19
version=1.0.5
18
20
SED=sed
19
21
 
20
22
## Use these settings for a traditional /usr/local install
44
46
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
45
47
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
46
48
        -DVERSION='"$(version)"'
47
 
LDFLAGS=$(COVERAGE)
 
49
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
48
50
 
49
51
# Commands to format a DocBook <refentry> document into a manual page
50
52
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
69
71
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
70
72
        $<; $(HTMLPOST) $@
71
73
# Fix citerefentry links
72
 
HTMLPOST=$(SED) --in-place --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
 
74
HTMLPOST=$(SED) --in-place \
 
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'
73
76
 
74
77
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
75
78
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
76
79
CPROGS=plugin-runner $(PLUGINS)
77
 
PROGS=mandos mandos-keygen $(CPROGS)
 
80
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
78
81
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
79
82
        plugins.d/mandos-client.8mandos \
80
83
        plugins.d/password-prompt.8mandos mandos.conf.5 \
81
84
        plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
82
 
        mandos-clients.conf.5
 
85
        plugins.d/askpass-fifo.8mandos mandos-clients.conf.5
83
86
 
84
87
htmldocs=$(addsuffix .xhtml,$(DOCS))
85
88
 
86
89
objects=$(addsuffix .o,$(CPROGS))
87
90
 
88
 
all: $(PROGS)
 
91
all: $(PROGS) mandos.lsm
89
92
 
90
93
doc: $(DOCS)
91
94
 
147
150
 
148
151
# Update all these files with version number $(version)
149
152
common.ent: Makefile
150
 
        $(SED) --in-place --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' $@
 
153
        $(SED) --in-place \
 
154
                --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' \
 
155
                $@
151
156
 
152
157
mandos: Makefile
153
 
        $(SED) --in-place --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' $@
 
158
        $(SED) --in-place \
 
159
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
160
                $@
154
161
 
155
162
mandos-keygen: Makefile
156
 
        $(SED) --in-place --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' $@
 
163
        $(SED) --in-place \
 
164
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
 
165
                $@
 
166
 
 
167
mandos-ctl: Makefile
 
168
        $(SED) --in-place \
 
169
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
170
                $@
 
171
 
 
172
mandos.lsm: Makefile
 
173
        $(SED) --in-place \
 
174
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
 
175
                $@
 
176
        $(SED) --in-place \
 
177
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
 
178
                $@
 
179
        $(SED) --in-place \
 
180
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
 
181
                $@
157
182
 
158
183
plugins.d/mandos-client: plugins.d/mandos-client.o
159
184
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
178
203
run-client: all keydir/seckey.txt keydir/pubkey.txt
179
204
        ./plugin-runner --plugin-dir=plugins.d \
180
205
                --config-file=plugin-runner.conf \
181
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
 
206
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
 
207
                $(CLIENTARGS)
182
208
 
183
209
# Used by run-client
184
210
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
187
213
 
188
214
# Run the server with a local config
189
215
run-server: confdir/mandos.conf confdir/clients.conf
190
 
        ./mandos --debug --configdir=confdir
 
216
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
191
217
 
192
218
# Used by run-server
193
219
confdir/mandos.conf: mandos.conf
201
227
 
202
228
install: install-server install-client-nokey
203
229
 
204
 
install-html: $(htmldocs)
 
230
install-html: html
205
231
        install --directory $(htmldir)
206
232
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
207
233
                $(htmldocs)
259
285
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
260
286
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
261
287
        install initramfs-tools-script \
262
 
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
 
288
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
263
289
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
264
290
        gzip --best --to-stdout mandos-keygen.8 \
265
291
                > $(MANDIR)/man8/mandos-keygen.8.gz
273
299
                > $(MANDIR)/man8/usplash.8mandos.gz
274
300
        gzip --best --to-stdout plugins.d/splashy.8mandos \
275
301
                > $(MANDIR)/man8/splashy.8mandos.gz
 
302
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
 
303
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
276
304
 
277
305
install-client: install-client-nokey
278
306
# Post-installation stuff
301
329
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
302
330
                $(PREFIX)/lib/mandos/plugins.d/usplash \
303
331
                $(PREFIX)/lib/mandos/plugins.d/splashy \
 
332
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
304
333
                $(INITRAMFSTOOLS)/hooks/mandos \
305
334
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
306
 
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
 
335
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
307
336
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
308
337
                $(MANDIR)/man8/mandos-keygen.8.gz \
309
338
                $(MANDIR)/man8/password-prompt.8mandos.gz \
310
339
                $(MANDIR)/man8/usplash.8mandos.gz \
311
340
                $(MANDIR)/man8/splashy.8mandos.gz \
 
341
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
312
342
                $(MANDIR)/man8/mandos-client.8mandos.gz
313
343
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
314
344
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)