[Debian-ha-commits] [resource-agents] 01/03: Disable IPv6addr and send_ua on non-Linux, they need SIOCSIFADDR and SIOGIFINDEX.

[Christoph Berg]

This is an automated email from the git hooks/post-receive script.

myon pushed a commit to branch master
in repository resource-agents.

commit 9cd485630aeb7c2c7c93b23a6b62feb37c94cb86
Author: Christoph Berg <myon at debian.org>
Date:   Fri Apr 8 21:23:10 2016 +0200

    Disable IPv6addr and send_ua on non-Linux, they need SIOCSIFADDR and SIOGIFINDEX.
---
 debian/changelog               |  7 +++++++
 debian/patches/ipv6-linux-only | 13 +++++++++++++
 debian/patches/series          |  1 +
 3 files changed, 21 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a0d95b8..9857c16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+resource-agents (1:3.9.7-3) UNRELEASED; urgency=medium
+
+  * Disable IPv6addr and send_ua on non-Linux, they need SIOCSIFADDR and
+    SIOGIFINDEX.
+
+ -- Christoph Berg <myon at debian.org>  Fri, 08 Apr 2016 21:19:58 +0200
+
 resource-agents (1:3.9.7-2) unstable; urgency=medium
 
   [ Adrian Vondendriesch ]
diff --git a/debian/patches/ipv6-linux-only b/debian/patches/ipv6-linux-only
new file mode 100644
index 0000000..d8c6a80
--- /dev/null
+++ b/debian/patches/ipv6-linux-only
@@ -0,0 +1,13 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -731,8 +731,8 @@ AM_CONDITIONAL(USE_LIBNET, test "x$libne
+ dnl ************************************************************************
+ dnl * Check for netinet/icmp6.h to enable the IPv6addr resource agent
+ AC_CHECK_HEADERS(netinet/icmp6.h,[],[],[#include <sys/types.h>])
+-AM_CONDITIONAL(USE_IPV6ADDR_AGENT, test "$ac_cv_header_netinet_icmp6_h" = yes && test "$ac_cv_header_heartbeat_glue_config_h" = yes)
+-AM_CONDITIONAL(IPV6ADDR_COMPATIBLE, test "$ac_cv_header_netinet_icmp6_h" = yes)
++AM_CONDITIONAL(USE_IPV6ADDR_AGENT, test "$ac_cv_header_netinet_icmp6_h" = yes && test "$ac_cv_header_heartbeat_glue_config_h" = yes && test $(uname) = Linux)
++AM_CONDITIONAL(IPV6ADDR_COMPATIBLE, test "$ac_cv_header_netinet_icmp6_h" = yes && test $(uname) = Linux)
+ 
+ dnl ========================================================================
+ dnl Compiler flags
diff --git a/debian/patches/series b/debian/patches/series
index a467edb..4fdd3e5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 mysql-path.patch
 no-dirty-version
 runocft
+ipv6-linux-only

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/resource-agents.git