/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-04-14 03:36:05 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090414033605-ao45swlzyvmahc8y
Minor code cleanup, and a bug fix.

* mandos: Added blank second line in doc strings.
  (SO_BINDTODEVICE): New global constant.
  (TCP_handler): Renamed to "ClientHandler".  All users changed.
  (ClientHandler.handle): Get GnuTLS priority directly from
                          server.gnutls_priority instead of
                          server.settings["priority"].
  (IPv6_TCPServer): Do not use super() anywhere.
  (IPv6_TCPServer.__init__) Do not receive "settings" dict, get all
                            the relevant settings separately as
                            keyword arguments.  All callers changed.
  (IPv6_TCPServer.server_bind): Use global SO_BINDTODEVICE.  Bug fix:
                               add NUL character to interface name.
                               Use "self.interface" directly instead
                               of "self.settings['interface']".
  (IPv6_TCPServer.handle_ipc): Use "self.use_dbus" directly instead of
                               "self.settings['use_dbus']".

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/rules
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