/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 debian/rules

  • Committer: Teddy Hogeborn
  • Date: 2009-02-09 02:01:13 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090209020113-726hq380zvp8zt97
Four new interrelated features:

1. Support using a different network interface via both initramfs.conf
   (the DEVICE setting) and the kernel command line (sixth field of
   the "ip=" option as in Linux' Documentation/nfsroot.txt).

2. Support connecting to a specified Mandos server directly using a
   kernel command line option ("mandos=connect:<ADDRESS>:<PORT>").

3. Support connecting directly to an IPv4 address (and port) using the
   "--connect" option of mandos-client.

4. Support an empty string to the --interface option to mandos-client.

* Makefile (WARN): Increase strictness by changing to
                   "-Wstrict-aliasing=1".

* debian/mandos-client.README.Debian (Use the Correct Network
  Interface): Changed to refer to initramfs.conf and nfsroot.txt.
  (Test the Server): Improve wording.
  (Non-local Connection): New section.
* initramfs-tools-script: Obey DEVICE environment variable and setting
                          from "/conf/initramfs.conf".  Also let any
                          "ip=" kernel command line option override
                          it.  Support new "mandos=connect" option.
                          Call "configure_networking" to set up IP
                          address on interface if necessary.
* plugin-runner.conf: Change example.
* plugins.d/mandos-client.c: Some whitespace and comment changes.
  (start_mandos_communication): Take an additional argument for
                                address family, all callers changed.
                                Connect to an IPv4 address if address
                                family is AF_INET.  Only set IPv6
                                scope_id for link-local addresses.
  (main): Accept empty interface name; this will not bring up any
         interface and leave the interface as unspecified.  Also do
         not restore kernel log level if lowering it failed.
* plugins.d/mandos-client.xml (OPTIONS): Document that the
                                         "--interface" option accepts
                                         an empty string.
  (EXAMPLE): Change example IPv6 address to a link-local address.

Show diffs side-by-side

added added

removed removed

Lines of Context:
15
15
# This has to be exported to make some magic below work.
16
16
export DH_OPTIONS
17
17
 
18
 
# -pie was broken briefly on the mips and mipsel architectures, see
19
 
# <http://bugs.debian.org/526961>
20
 
BINUTILS_V := $(shell dpkg-query --showformat='$${Version}' \
21
 
                        --show binutils)
22
 
ifeq (yes,$(shell dpkg --compare-versions $(BINUTILS_V) lt 2.20-3 \
23
 
                && dpkg --compare-versions $(BINUTILS_V) ge 2.19.1-1 \
24
 
                && echo yes))
25
 
  ifneq (,$(strip $(findstring :$(DEB_HOST_ARCH):,:mips:mipsel:) \
26
 
                $(findstring :$(DEB_BUILD_ARCH):,:mips:mipsel:)))
27
 
    BROKEN_PIE := yes
28
 
    export BROKEN_PIE
29
 
  endif
30
 
endif
31
 
 
32
18
configure: configure-stamp
33
19
configure-stamp:
34
20
        dh_testdir
38
24
 
39
25
build-arch: build-arch-stamp
40
26
build-arch-stamp: configure-stamp
41
 
        LC_ALL=en_US.utf8 dh_auto_build -- all doc
 
27
        dh_auto_build -- all doc
42
28
        touch $@
43
29
 
44
30
build-indep: build-indep-stamp
45
31
build-indep-stamp: configure-stamp
46
 
        LC_ALL=en_US.UTF-8 dh_auto_build -- doc
 
32
        dh_auto_build -- doc
47
33
        touch $@
48
34
 
49
35
clean:
79
65
        dh_testroot
80
66
        dh_installchangelogs
81
67
        dh_installdocs
82
 
        dh_installexamples
83
68
        dh_link
84
69
        dh_strip
85
70
        dh_compress
86
71
        dh_fixperms --exclude etc/keys/mandos \
87
72
                --exclude etc/mandos/clients.conf \
88
73
                --exclude etc/mandos/plugins.d \
89
 
                --exclude usr/lib/mandos/plugins.d \
90
 
                --exclude usr/share/doc/mandos-client/examples/network-hooks.d
 
74
                --exclude usr/lib/mandos/plugins.d
91
75
        dh_installdeb
92
76
        dh_shlibdeps
93
77
        dh_gencontrol