Bug #394257: Add patch needed for correct functioning on 3.x kernels where binding to AF_UNSPEC sockets fails.

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

4 files changed, 79 insertions, 12 deletions

diff --git a/sys-cluster/keepalived/ChangeLog b/sys-cluster/keepalived/ChangeLog
index 559dcb2f406d..d3d836a16ce8 100644
--- a/sys-cluster/keepalived/ChangeLog
+++ b/sys-cluster/keepalived/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/keepalived
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/ChangeLog,v 1.82 2011/10/27 16:18:50 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/ChangeLog,v 1.83 2011/12/10 23:51:00 robbat2 Exp $
+
+*keepalived-1.2.2-r2 (10 Dec 2011)
+
+  10 Dec 2011; Robin H. Johnson <robbat2@gentoo.org>
+  +keepalived-1.2.2-r2.ebuild, +files/keepalived-1.2.2-bind-afunspec.patch:
+  Bug #394257: Add patch needed for correct functioning on 3.x kernels where
+  binding to AF_UNSPEC sockets fails.
 
   27 Oct 2011; Jeroen Roovers <jer@gentoo.org> keepalived-1.2.2.ebuild,
   keepalived-1.2.2-r1.ebuild:
diff --git a/sys-cluster/keepalived/Manifest b/sys-cluster/keepalived/Manifest
index d980f9f5df0a..7f8743774058 100644
--- a/sys-cluster/keepalived/Manifest
+++ b/sys-cluster/keepalived/Manifest
@@ -1,18 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX init-keepalived 741 RMD160 7c01c24d94758cc93fe1c13f89dbc566187ee444 SHA1 90287f22be2a60af28d166481ce21ee497abf06b SHA256 eaae345df0c529fdfe5cf70e2a2626c280ecb483cfe8953b992fda29b5c7e063
 AUX keepalived-1.1.13-linux-2.6.21-ip_vs.h 7549 RMD160 e6407ca157a3d7bcc810841b6f5937cd7d477b0e SHA1 42386dd7a767704d0af9987578185d3fc8ccfd30 SHA256 67cb638f17e1189aedc0f464622744867549c91d637d38cdfd8d824aae841aea
 AUX keepalived-1.1.20-do-not-need-kernel-sources.patch 3277 RMD160 975f2a7aed51f3c538e158f6097e2c0663ccb82d SHA1 5f7cd816e6e5752315da06ffd762c9aed200a962 SHA256 b4a38f12714717016a7588dae8bd5d3717de0cc9a8d72f08b089e6ff0bd88bf4
+AUX keepalived-1.2.2-bind-afunspec.patch 534 RMD160 dcdb7cbaad708511ae69c4449804e80c3c1fef1a SHA1 7334bd67c15ebc6272ac9906042c9bdbe25ca4d1 SHA256 df6d427a6bd1e8fbd20f79f6879c7f09f81bfd1e28739c4dcca34d1621ae316e
 DIST keepalived-1.2.2.tar.gz 249557 RMD160 a24f2fd97007c331daf9f2c2b1608eb727780552 SHA1 52a6d46823d29791d10f8869face64b6c6df5616 SHA256 4c05dbd149af120506b4f3a66b4016e30d9ad112e4c26a602e28c366705de8c0
 EBUILD keepalived-1.2.2-r1.ebuild 1431 RMD160 abc0f468630f8d5482cfdee36ca1e938a1163c0a SHA1 a3a6db5df03c44251991e57a60387fb80b259792 SHA256 e9ddb0415c6082b3a7f9b528e4b653ab67290f1947e93fa7abb6d82f347f5e09
+EBUILD keepalived-1.2.2-r2.ebuild 1481 RMD160 28f93db7c788abc4ec032b6724a59affdb2c665d SHA1 c2ab7a8b64a8a9b631f0dbd764b5ef7841e18ad0 SHA256 31b42c2b13fdf6ebae2224ea00f3725719c289d9cd60a91cb0927059d594e701
 EBUILD keepalived-1.2.2.ebuild 1864 RMD160 3b31c3d031abbe8b5cac3c3a48bb4d86c4e55594 SHA1 98974a93a70185fc860d4614c4aeb9db41f49833 SHA256 c1984e86b4d3c2c43f02d2b781d80a43759fe4358a572a3bc9129a81da6cdc7e
-MISC ChangeLog 12610 RMD160 b6f5e99aac466b8451803a1e29df22125598f57c SHA1 eea0bb43a472e24c90be247ce1bd60d80e9bc7ea SHA256 90c1ea9af088d77f1a6ab390b0011cf504efe77af853664497d40abadcf2c771
+MISC ChangeLog 12895 RMD160 12db9fcd6199242e49581e77fbc1a46553566925 SHA1 e063a8344ce06c3f3633bdd32cbd6379cdc2def3 SHA256 dfa1ea53734cfd15bc71895038de61e041c18aa03c154c6ae2665721ecdd2bf0
 MISC metadata.xml 280 RMD160 1869468fd0838a95533ab1a68f8d50f63ee2f0ac SHA1 2d837eb6e9478ffb08e1c597a3f8a9e456f6be12 SHA256 0924e43f049ea2f507b4f5dfa973fa4cedf4e967c19aa9cb5afb6f4ccdef6cf8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk6phHEACgkQVWmRsqeSphPckgCeOl2Diy3FVVp9QgZeBiDjizSc
-0XYAn0SPfnXW3Dl3O00GikIX5rk3wu0h
-=g/d4
------END PGP SIGNATURE-----
diff --git a/sys-cluster/keepalived/files/keepalived-1.2.2-bind-afunspec.patch b/sys-cluster/keepalived/files/keepalived-1.2.2-bind-afunspec.patch
new file mode 100644
index 000000000000..1f365d26e517
--- /dev/null
+++ b/sys-cluster/keepalived/files/keepalived-1.2.2-bind-afunspec.patch
@@ -0,0 +1,13 @@
+diff --git a/keepalived/core/layer4.c b/keepalived/core/layer4.c
+index 5725500..5b33417 100644
+--- a/keepalived/core/layer4.c
++++ b/keepalived/core/layer4.c
+@@ -43,7 +43,7 @@ tcp_bind_connect(int fd, struct sockaddr_storage *addr, struct sockaddr_storage
+ 	fcntl(fd, F_SETFL, val | O_NONBLOCK);
+ 
+ 	/* Bind socket */
+-	if (bind_addr) {
++	if (bind_addr && ((struct sockaddr *) bind_addr)->sa_family != AF_UNSPEC) {
+ 		addrlen = sizeof(*bind_addr);
+ 		if (bind(fd, (struct sockaddr *) bind_addr, addrlen) != 0)
+ 			return connect_error;
\ No newline at end of file
diff --git a/sys-cluster/keepalived/keepalived-1.2.2-r2.ebuild b/sys-cluster/keepalived/keepalived-1.2.2-r2.ebuild
new file mode 100644
index 000000000000..51414c731c07
--- /dev/null
+++ b/sys-cluster/keepalived/keepalived-1.2.2-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/keepalived-1.2.2-r2.ebuild,v 1.1 2011/12/10 23:51:01 robbat2 Exp $
+
+EAPI=4
+
+inherit autotools base
+
+DESCRIPTION="A strong & robust keepalive facility to the Linux Virtual Server project"
+HOMEPAGE="http://www.keepalived.org/"
+SRC_URI="http://www.keepalived.org/software/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="debug"
+
+RDEPEND="dev-libs/popt
+	sys-apps/iproute2
+	dev-libs/libnl:1.1
+	dev-libs/openssl"
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-2.6.30"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.1.20-do-not-need-kernel-sources.patch "${FILESDIR}"/${PN}-1.2.2-bind-afunspec.patch )
+
+DOCS=( README CONTRIBUTORS INSTALL VERSION ChangeLog AUTHOR TODO doc/keepalived.conf.SYNOPSIS )
+
+src_prepare() {
+	base_src_prepare
+	eautoreconf
+}
+
+src_configure() {
+	STRIP=/bin/true \
+	econf \
+		--enable-vrrp \
+		$(use_enable debug)
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/init-keepalived keepalived
+
+	docinto genhash
+	dodoc genhash/README genhash/AUTHOR genhash/ChangeLog genhash/VERSION || die
+	# This was badly named by upstream, it's more HOWTO than anything else.
+	newdoc INSTALL INSTALL+HOWTO
+
+	# Security risk to bundle SSL certs
+	rm -f "${ED}"/etc/keepalived/samples/*.pem
+	# Clean up sysvinit files
+	rm -rf "${ED}"/etc/sysconfig "${ED}"/etc/rc.d/
+}