[apr] 01/01: Fix ipv6 address comparison in apr_mcast_*

[Stefan Fritsch]

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

sf pushed a commit to branch master
in repository apr.

commit 51bf9a23a18ffe38aa7b1084e865ddfd67476462
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Sun Aug 16 16:25:55 2015 +0200

    Fix ipv6 address comparison in apr_mcast_*
---
 debian/changelog                  |  3 +++
 debian/patches/apr_mcast_v6.patch | 11 +++++++++++
 debian/patches/series             |  1 +
 3 files changed, 15 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 683f692..ecdaebd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 apr (1.5.2-2) UNRELEASED; urgency=medium
 
   * Remove the buildhost's hostname from libtool for reproducible builds.
+  * Fix ipv6 address comparison in apr_mcast_interface/apr_mcast_join.
+    Thanks to Andre Naujoks <nautsch2 gmail com> for the patch.
+    Closes: #759534
 
  -- Stefan Fritsch <sf at debian.org>  Sun, 16 Aug 2015 09:28:50 +0200
 
diff --git a/debian/patches/apr_mcast_v6.patch b/debian/patches/apr_mcast_v6.patch
new file mode 100644
index 0000000..d54b531
--- /dev/null
+++ b/debian/patches/apr_mcast_v6.patch
@@ -0,0 +1,11 @@
+--- apr.orig/network_io/unix/multicast.c
++++ apr/network_io/unix/multicast.c
+@@ -62,7 +62,7 @@ static unsigned int find_if_index(const
+     for (ifp = ifs; ifp; ifp = ifp->ifa_next) {
+         if (ifp->ifa_addr != NULL && ifp->ifa_addr->sa_family == AF_INET6) {
+             if (memcmp(&iface->sa.sin6.sin6_addr,
+-                       &ifp->ifa_addr->sa_data[0],
++                       &((struct sockaddr_in6*)ifp->ifa_addr)->sin6_addr,
+                        sizeof(iface->sa.sin6.sin6_addr)) == 0) {
+                 index = if_nametoindex(ifp->ifa_name);
+                 break;
diff --git a/debian/patches/series b/debian/patches/series
index 4f509ad..9c6a281 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ omit_extra_libs.patch
 hurd_shm_flock.patch
 dont_override_external_buildflags
 libtoolize_check.patch
+apr_mcast_v6.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-apache/apr.git