From: Dietmar Maurer <dietmar@proxmox.com>
Date: Thu, 3 Dec 2015 13:51:43 +0000 (+0100)
Subject: update to latest versions from branch needle
X-Git-Url: https://git.proxmox.com/?p=corosync-pve.git;a=commitdiff_plain;h=df03257c142da25c78d36aa0d2b8d9b79f5002cf

update to latest versions from branch needle
---

diff --git a/Makefile b/Makefile
index e288a2e..cef203a 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ RELEASE=4.0
 # source from http://www.corosync.org
 
 CSVERSION=2.3.5
-CSRELEASE=1
+CSRELEASE=2
 CSDIR=corosync-${CSVERSION}
 CSSRC=corosync-${CSVERSION}.tar.gz
 
@@ -29,10 +29,10 @@ ${DEBS}: ${CSSRC}
 
 .PHONY: download
 download:
-	rm -f ${CSSRC} ${CSSRC}.tmp ${CSDIR}
+	rm -rf ${CSSRC} ${CSSRC}.tmp ${CSDIR}
 	# wget http://build.clusterlabs.org/corosync/releases/${CSSRC}
-	git clone https://github.com/corosync/corosync.git ${CSDIR}
-	cd ${CSDIR}; git checkout v${CSVERSION}
+	git clone https://github.com/corosync/corosync.git  -b needle ${CSDIR}
+	#cd ${CSDIR}; git checkout v${CSVERSION}
 	cd ${CSDIR}; ./autogen.sh
 	tar czf ${CSSRC}.tmp ${CSDIR}
 	mv ${CSSRC}.tmp ${CSSRC}
diff --git a/corosync-2.3.5.tar.gz b/corosync-2.3.5.tar.gz
index 729b023..597762c 100644
Binary files a/corosync-2.3.5.tar.gz and b/corosync-2.3.5.tar.gz differ
diff --git a/debian/changelog b/debian/changelog
index 0d552b2..f4a2790 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+corosync-pve (2.3.5-2) unstable; urgency=medium
+
+  * update to latest versions from branch needle
+    (commit e2b6b25126a3e8f2caefcb8ccde67788c63fbeb5)
+
+  * remove patch 0001-totem-swap-unicast-and-multicast-bind-order.patch (upstream)
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 03 Dec 2015 14:49:43 +0100
+
 corosync-pve (2.3.5-1) unstable; urgency=medium
 
   * update to v2.3.5
diff --git a/debian/patches/0001-totem-swap-unicast-and-multicast-bind-order.patch b/debian/patches/0001-totem-swap-unicast-and-multicast-bind-order.patch
deleted file mode 100644
index c75a4cd..0000000
--- a/debian/patches/0001-totem-swap-unicast-and-multicast-bind-order.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 59e09c68f75807d99ebcde84aa3cbfaf4d15d0d4 Mon Sep 17 00:00:00 2001
-From: Wolfgang Bumiller <w.bumiller@proxmox.com>
-Date: Tue, 19 May 2015 13:57:54 +0200
-Subject: [PATCH] totem: swap unicast and multicast bind order
-
-For some reason binding the unicast socket after the multicast socket
-renders the former inert when using ipv6 on older kernels (tested on
-3.10). This is a workaround for this issue.
----
- exec/totemudp.c | 25 +++++++++++++------------
- 1 file changed, 13 insertions(+), 12 deletions(-)
-
-diff --git a/exec/totemudp.c b/exec/totemudp.c
-index 8ed87ce..86cb330 100644
---- a/exec/totemudp.c
-+++ b/exec/totemudp.c
-@@ -761,18 +761,6 @@ static int totemudp_build_sockets_ip (
- 	}
- 
- 	/*
--	 * Bind to multicast socket used for multicast receives
--	 */
--	totemip_totemip_to_sockaddr_convert(mcast_address,
--		instance->totem_interface->ip_port, &sockaddr, &addrlen);
--	res = bind (sockets->mcast_recv, (struct sockaddr *)&sockaddr, addrlen);
--	if (res == -1) {
--		LOGSYS_PERROR (errno, instance->totemudp_log_level_warning,
--				"Unable to bind the socket to receive multicast packets");
--		return (-1);
--	}
--
--	/*
- 	 * Create local multicast loop socket
- 	 */
- 	if (socketpair(AF_UNIX, SOCK_DGRAM, 0, sockets->local_mcast_loop) == -1) {
-@@ -870,6 +858,19 @@ static int totemudp_build_sockets_ip (
- 		return (-1);
- 	}
- 
-+	/*
-+	 * Bind to multicast socket used for multicast receives
-+	 */
-+	totemip_totemip_to_sockaddr_convert(mcast_address,
-+		instance->totem_interface->ip_port, &sockaddr, &addrlen);
-+	res = bind (sockets->mcast_recv, (struct sockaddr *)&sockaddr, addrlen);
-+	if (res == -1) {
-+		LOGSYS_PERROR (errno, instance->totemudp_log_level_warning,
-+				"Unable to bind the socket to receive multicast packets");
-+		return (-1);
-+	}
-+
-+
- 	recvbuf_size = MCAST_SOCKET_BUFFER_SIZE;
- 	sendbuf_size = MCAST_SOCKET_BUFFER_SIZE;
- 	/*
--- 
-2.1.4
-
diff --git a/debian/patches/series b/debian/patches/series
index 16025af..1196261 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,3 @@
 #corosync-keygen.diff
 #cpg-join-fix.diff
 #disable-sched-rr.patch
-0001-totem-swap-unicast-and-multicast-bind-order.patch