/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: 2013-05-22 20:00:18 UTC
  • Revision ID: teddy@recompile.se-20130522200018-xtbddz21pl7c69kw
* mandos: Bug fix: Don't print output from checkers when running in
          foreground.
          Bug fix: Do not fail when client is removed from
          clients.conf but saved settings remain.
  (Client.server_settings): New attribute.
  (Client.__init__): Take new "server_settings" keyword argument.  All
                     callers changed.
  (Client.start_checker): Redirect stdout and stderr for checkers when
                          running in foreground.
  (main): New "wnull" global variable for a writable /dev/null file.
          Do not restore settings for clients no longer in config file.
  (main/cleanup): Close wnull file object.  Do not save client
                  attribute "server_settings"
* mandos-monitor: Update to work in Urwid 1.0.1.
                  Adapt to work in both Python 3 and Python 2.

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
 
ifneq (,$(findstring :$(DEB_HOST_ARCH):,:mips:mipsel:))
19
 
  BROKEN_PIE := yes
20
 
  export BROKEN_PIE
21
 
endif
22
 
ifneq (,$(findstring :$(DEB_BUILD_ARCH):,:mips:mipsel:))
23
 
  BROKEN_PIE := yes
24
 
  export BROKEN_PIE
 
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
25
30
endif
26
31
 
27
32
configure: configure-stamp
33
38
 
34
39
build-arch: build-arch-stamp
35
40
build-arch-stamp: configure-stamp
36
 
        dh_auto_build -- all doc
 
41
        LC_ALL=en_US.utf8 dh_auto_build -- all doc
37
42
        touch $@
38
43
 
39
44
build-indep: build-indep-stamp
40
45
build-indep-stamp: configure-stamp
41
 
        dh_auto_build -- doc
 
46
        LC_ALL=en_US.UTF-8 dh_auto_build -- doc
42
47
        touch $@
43
48
 
44
49
clean:
74
79
        dh_testroot
75
80
        dh_installchangelogs
76
81
        dh_installdocs
 
82
        dh_installexamples
77
83
        dh_link
78
84
        dh_strip
79
85
        dh_compress
80
86
        dh_fixperms --exclude etc/keys/mandos \
81
87
                --exclude etc/mandos/clients.conf \
82
88
                --exclude etc/mandos/plugins.d \
83
 
                --exclude usr/lib/mandos/plugins.d
 
89
                --exclude usr/lib/mandos/plugins.d \
 
90
                --exclude usr/share/doc/mandos-client/examples/network-hooks.d
84
91
        dh_installdeb
85
92
        dh_shlibdeps
86
93
        dh_gencontrol