/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 \
16
16
OPTIMIZE=-Os
17
17
LANGUAGE=-std=gnu99
18
18
htmldir=man
19
 
version=1.0.3
 
19
version=1.0.5
20
20
SED=sed
21
21
 
22
22
## Use these settings for a traditional /usr/local install
77
77
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
78
78
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
79
79
CPROGS=plugin-runner $(PLUGINS)
80
 
PROGS=mandos mandos-keygen mandos-list $(CPROGS)
 
80
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
81
81
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
82
82
        plugins.d/mandos-client.8mandos \
83
83
        plugins.d/password-prompt.8mandos mandos.conf.5 \
164
164
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
165
165
                $@
166
166
 
167
 
mandos-list: Makefile
 
167
mandos-ctl: Makefile
168
168
        $(SED) --in-place \
169
169
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
170
170
                $@
203
203
run-client: all keydir/seckey.txt keydir/pubkey.txt
204
204
        ./plugin-runner --plugin-dir=plugins.d \
205
205
                --config-file=plugin-runner.conf \
206
 
                --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)
207
208
 
208
209
# Used by run-client
209
210
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
212
213
 
213
214
# Run the server with a local config
214
215
run-server: confdir/mandos.conf confdir/clients.conf
215
 
        ./mandos --debug --configdir=confdir
 
216
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
216
217
 
217
218
# Used by run-server
218
219
confdir/mandos.conf: mandos.conf
284
285
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
285
286
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
286
287
        install initramfs-tools-script \
287
 
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
 
288
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
288
289
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
289
290
        gzip --best --to-stdout mandos-keygen.8 \
290
291
                > $(MANDIR)/man8/mandos-keygen.8.gz
331
332
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
332
333
                $(INITRAMFSTOOLS)/hooks/mandos \
333
334
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
334
 
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
 
335
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
335
336
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
336
337
                $(MANDIR)/man8/mandos-keygen.8.gz \
337
338
                $(MANDIR)/man8/password-prompt.8mandos.gz \