/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to debian/rules

Hooks take new "modules" argument, and hook names can contain periods.

* debian/mandos-client.README.Debian: Adjust wording.
* debian/rules (binary-common): Exclude nework-hooks.d directory from
                                dh_fixperms.
* initramfs-tools-hook: Also create network hook directory.  Allow
                        periods in hook names.  Only run executable
                        files in hook directory.  Copy needed modules.
* network-hooks.d/bridge: Fix "/usr/bin/brctl" to "/usr/sbin/brctl".
                          Also take "modules" argument.
* plugins.d/mandos-client.xml (NETWORK HOOKS/REQUIREMENTS): Document
                                                            the
                                                            allowing
                                                            of periods
                                                            in hook
                                                            names.
  (NETWORK HOOKS/REQUIREMENTS/files): Adjust wording.
  (NETWORK HOOKS/REQUIREMENTS/modules): New.
  (NETWORK HOOKS/REQUIREMENTS/MANDOSNETHOOKDIR): Clarify.
  (NETWORK HOOKS/REQUIREMENTS/MODE): Add "modules".

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
80
85
        dh_fixperms --exclude etc/keys/mandos \
81
86
                --exclude etc/mandos/clients.conf \
82
87
                --exclude etc/mandos/plugins.d \
83
 
                --exclude usr/lib/mandos/plugins.d
 
88
                --exclude usr/lib/mandos/plugins.d \
 
89
                --exclude /usr/share/doc/mandos-client/network-hooks.d
84
90
        dh_installdeb
85
91
        dh_shlibdeps
86
92
        dh_gencontrol