Version bump to 1.4.22, bug 436686.

Package-Manager: portage-2.1.11.9/cvs/Linux i686

4 files changed, 100 insertions, 18 deletions

diff --git a/net-proxy/haproxy/ChangeLog b/net-proxy/haproxy/ChangeLog
index b43351050fb8..308538e5f6ae 100644
--- a/net-proxy/haproxy/ChangeLog
+++ b/net-proxy/haproxy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/haproxy
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v 1.66 2012/06/08 18:06:38 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v 1.67 2012/09/30 22:07:40 idl0r Exp $
+
+*haproxy-1.4.22 (30 Sep 2012)
+
+  30 Sep 2012; Christian Ruppert <idl0r@gentoo.org> -haproxy-1.4.18-r1.ebuild,
+  +haproxy-1.4.22.ebuild, +files/haproxy.initd-r2:
+  Version bump to 1.4.22, bug 436686.
 
   08 Jun 2012; Brent Baude <ranger@gentoo.org> haproxy-1.4.21.ebuild:
   Marking haproxy-1.4.21 ppc for bug 417079
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 76868c7df779..5024374a68b5 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,7 +1,22 @@
-AUX haproxy.initd-r1 1157 RMD160 6703f6fa38f2fcabff9f3f68893ac8e17f007bbe SHA1 45f8015720ace59d6fa0c2a0e35c8255789238b0 SHA256 5412580888ae334974d6af99a137adb9abbbc8ecd807c45c906058160b570de1
-DIST haproxy-1.4.18.tar.gz 820427 RMD160 16729f0519a47123d88e849ae95d600c590c8583 SHA1 191dbcb5880c711580693bd081ca5fdd8dde3012 SHA256 ec2b6222a34d11f97cf7cf5cc696080dac34e94deb8e6cf3822b27442e0793fa
-DIST haproxy-1.4.21.tar.gz 827392 RMD160 78d2d81f4ffa03e57fedaf090c42479ceb669438 SHA1 31df0e8bd18350457a5d3432f367c6218ecc9042 SHA256 6e28575f0492def31c331faf9ead08225dd62153334880688f8a7c477c8c31a4
-EBUILD haproxy-1.4.18-r1.ebuild 2131 RMD160 d217ebccafd8567083e93a892338f4896f8781c8 SHA1 a37393bd2adbfe3f695db4f6ecef011b25984e92 SHA256 d555a5375df704234438742ae19d5f1b1ca148ea61755c505a7b15a39d985fa3
-EBUILD haproxy-1.4.21.ebuild 2129 RMD160 30ac53f6b0ad2f0b6d9fd1d08f0cc04813cf0952 SHA1 c2d26d9b4a70b568dba6b698d4d5703f68810088 SHA256 4b4e2bafcccad81fd41a064fb10c0adfd80535424d154696d3fc7df2ccbcef78
-MISC ChangeLog 12003 RMD160 a8ca43c5794a83746c0f17d11ec9886cc30a9af4 SHA1 ecff1e09fb7c4cc3f0c69239f8ab1d07e72f7b12 SHA256 a55cf175e9e29efc2baf5ebd4111a613417e5b787ab67d36c1508788255b0602
-MISC metadata.xml 1450 RMD160 1e354be32e3ed9cbd5cd2b1aadbb9dd7772cd526 SHA1 035780ecce98f5856301af6e1633e11ce2bb5e8c SHA256 0797818620feed90cb3481805f66448e3a32afa5f981a95e45e0b0535fbc1cf4
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX haproxy.initd-r1 1157 SHA256 5412580888ae334974d6af99a137adb9abbbc8ecd807c45c906058160b570de1 SHA512 83c5043dd894906f7363086ccb30e6eb159a91bb5f4c60535047f15cfda5b0c4d955701f0fe059a6edd9518a267ab5d98f977de5b65bd35436323527172f282a WHIRLPOOL 3bb1b51fe0f91e2c11a2edd48d02a98091b43c237ae71a3045190f2d92ecc38b987f906e6b6fe49370f168aa32c276c88e2eafa225a739800d2da87f1cd07a4f
+AUX haproxy.initd-r2 1095 SHA256 0136fbcbb9e7c77dfade5a4b0f28522a11f15c84fb0bb79f5f486f6baf00a0c4 SHA512 32c5a78a6545c7357ae4b81d8b236ae7569a6ca55171c7560089d345a7a8ba7d2df2083fc7c43b72031a0f8ad1e5151990530ce7b4d2c967dd959bd0ee542ee5 WHIRLPOOL e5c251617d938f07c9dcdb3008f8ec050bedd9c2dccdd63b4c83d8367795e24be79a1f394808f530f908f0147f72b7a6794a75a240d26d9d23285265f496f1b4
+DIST haproxy-1.4.21.tar.gz 827392 SHA256 6e28575f0492def31c331faf9ead08225dd62153334880688f8a7c477c8c31a4 SHA512 68dc0604a102b3848516511f8dcd6cf6f52e7de5e64437ab2b2f735b62ce35a476894a9accbec7e27682579a1d5ebc2896b12d67faa3e94e8786fbc2b37a111e WHIRLPOOL a67921ba843f1b2978b2b7adb3914d62858d60cec6ab776e253223ea8478e2609e888dd6e3d9ec11d362f6a65109da6027c2223989f9eb2821ee262b42024ba0
+DIST haproxy-1.4.22.tar.gz 831791 SHA256 ba221b3eaa4d71233230b156c3000f5c2bd4dace94d9266235517fe42f917fc6 SHA512 a436aeacbda4dcc3de09250187e22589c1c71dda7d77f5b2cf33bfdaaa443fc5b2d9ab6d57085296fde7581ea8cc1d04408569e70879f96687bc3151120a9afa WHIRLPOOL dbef99d77c122c889d95756f227f873c01b3052c3a4c9be57a311321bf36aaa39913a930bcdd2272a3baa3a1dec16e6afc87f52e15df57dd2888446e5a725b55
+EBUILD haproxy-1.4.21.ebuild 2129 SHA256 4b4e2bafcccad81fd41a064fb10c0adfd80535424d154696d3fc7df2ccbcef78 SHA512 188c1a0d078d9d56f8e57b2ba461243685dbe02f4e754ab118a7eb06cbe12250cc304d3e8a5e38f07555153f5a77e3d271f9e94c4a13410e0317be6cb902b77a WHIRLPOOL c72d0338dbf612261c84407b86adb5a975da919542d5a2e4fc709f6e2d18184f708e1836c096bbd25d17a7ae86d03d1aa7a1d46bb0879743378a21aa8a46f810
+EBUILD haproxy-1.4.22.ebuild 2321 SHA256 4acb8314751ec689dbec8a1500e98438654201fd851102093fed199d005feff8 SHA512 e46a9501b317da25f2e0421d856c9acf84c26df19bded145fc1bf45680919363c6e31fa9a4ec3838e8ce9487b069627d6f283b5d4e5db803de3eba45f72dba4a WHIRLPOOL bd356e4d68405a6ab8a93119d322eb2efa63d49eb21321b1b339d4b1d126f1fcb16d4e85a0c485392f4a629762acf2f97a9ab31960a8adef979335e0ce8b4536
+MISC ChangeLog 12202 SHA256 bb5bab3f3f23bda18a4c016cfbc6f8271551a565d91e1b9669b2a90a15dc3488 SHA512 d8e5986e2c97619b63ab9f03e75c2255d0fa311e96496785b59781e8f9eebb9f98a3c00172bc1a83ac8b8c6f72f4d3c6862d4098328858dabb7b0e67076f57f6 WHIRLPOOL d1c163f954e1d429ae29bf99502e6aa0f915b0b9a52e5252adad1e94234be64852fe03ae62304b7ee62da9e19ea9fac33b699f21f865dcf08155c10d94b4ddb8
+MISC metadata.xml 1450 SHA256 0797818620feed90cb3481805f66448e3a32afa5f981a95e45e0b0535fbc1cf4 SHA512 9e97e0524ea16e789883c739951ea017f66502574e5e5340ab6bfd3765239fc7ccf660a0a0cfee8dc8884247b588b02c11f63961efa7a05f32152ac32a157eba WHIRLPOOL 8b23ebe3a8f2e3c8e2bade35f777241514675337c6b30f6507341452c809b94d4df2a3f5ffb496e4f30293319fde2dd90666e701ac57c0b2f7d3522ff00540c9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQaMKyAAoJEMOx0zmdw4Z1WKQH/2KnYdJlHo9mSXyTYR2ZU326
+f2BEZn5V8RyIYQ8fWxyjNDudnbrD84Qt6ZibKPPycPe+1KIr21eaNL7ISyNKbxtX
+YRjNeCboSOG8a6U+yyy0WYj6GpjJcEAXlWdHGSQu0L2Jc8Pd+G/HDHvXtMZHvBrK
+oI93Vns/5AORZbMWB0oJsKfrBMOC8M0Z+LvuO1HXEhLviE5noB6LdpCQAmTsppN9
+AWoFcKpfORqcRSxoE01KtdB+TTFh//ehkPFWMVnhjGolyTIWYtB4o36D/hG93oA4
+3mibSZLFL+DuQovpo9aQMSStJAAKd4jrsEoywvIeP5EYPmIXWvV44OsFTn9YYqQ=
+=XlJR
+-----END PGP SIGNATURE-----
diff --git a/net-proxy/haproxy/files/haproxy.initd-r2 b/net-proxy/haproxy/files/haproxy.initd-r2
new file mode 100644
index 000000000000..79b12e8ccd11
--- /dev/null
+++ b/net-proxy/haproxy/files/haproxy.initd-r2
@@ -0,0 +1,47 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/files/haproxy.initd-r2,v 1.1 2012/09/30 22:07:40 idl0r Exp $
+
+extra_commands="checkconfig"
+extra_started_commands="reload"
+
+command="/usr/bin/haproxy"
+pidfile="/var/run/${SVCNAME}.pid"
+
+if [ -z "${CONFFILE}" -a -d "/etc/haproxy" -a -f "/etc/haproxy/${SVCNAME}.cfg" ]; then
+	CONFFILE=/etc/haproxy/${SVCNAME}.cfg
+else
+	CONFFILE=/etc/${SVCNAME}.cfg
+fi
+
+command_args="-D -p ${pidfile} -f ${CONFFILE}"
+
+depend() {
+	need net
+	use dns logger
+}
+
+checkconfig() {
+	if [ ! -f "${CONFFILE}" ]; then
+		eerror "${CONFFILE} does not exist!"
+		return 1
+	fi
+
+	ebegin "Checking ${CONFFILE}"
+	$command -q -c -f "${CONFFILE}"
+	eend $?
+}
+
+stop_pre() {
+	if [ "${RC_CMD}" = "restart" ]; then
+		checkconfig || return 1
+	fi
+}
+
+reload() {
+	ebegin "Reloading ${SVCNAME}"
+	checkconfig || { eerror "Reloading failed, please fix your ${CONFFILE} first"; return 1; }
+	$command -D -p "${pidfile}" -f "${CONFFILE}" -sf $(cat "${pidfile}")
+	eend $?
+}
diff --git a/net-proxy/haproxy/haproxy-1.4.18-r1.ebuild b/net-proxy/haproxy/haproxy-1.4.22.ebuild
index 059d934b5583..9ae5834200f6 100644
--- a/net-proxy/haproxy/haproxy-1.4.18-r1.ebuild
+++ b/net-proxy/haproxy/haproxy-1.4.22.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.4.18-r1.ebuild,v 1.4 2012/02/28 22:41:06 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.4.22.ebuild,v 1.1 2012/09/30 22:07:40 idl0r Exp $
 
-EAPI="3"
+EAPI="4"
 
 inherit eutils versionator toolchain-funcs flag-o-matic
 
@@ -12,8 +12,8 @@ SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/$
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="examples pcre vim-syntax"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+crypt examples +pcre vim-syntax"
 
 DEPEND="pcre? ( dev-libs/libpcre )"
 RDEPEND="${DEPEND}"
@@ -24,22 +24,36 @@ pkg_setup() {
 }
 
 src_compile() {
-	local args="TARGET=linux26"
+	local args="TARGET=linux2628"
 
-	use pcre && args="${args} USE_PCRE=1"
+	if use pcre; then
+		args="${args} USE_PCRE=1"
+	else
+		args="${args} USE_PCRE="
+	fi
+
+#	if use kernel_linux; then
+#		args="${args} USE_LINUX_SPLICE=1 USE_LINUX_TPROXY=1"
+#	else
+#		args="${args} USE_LINUX_SPLICE= USE_LINUX_TPROXY="
+#	fi
 
-	use kernel_linux && args="${args} USE_LINUX_SPLICE=1"
-	use kernel_linux && args="${args} USE_LINUX_TPROXY=1"
+	if use crypt; then
+		args="${args} USE_LIBCRYPT=1"
+	else
+		args="${args} USE_LIBCRYPT="
+	fi
 
 	# For now, until the strict-aliasing breakage will be fixed
-	append-cflags -fno-strict-aliasing
+#	append-cflags -fno-strict-aliasing
 
 	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args} || die
 }
 
 src_install() {
 	dobin haproxy || die
-	newinitd "${FILESDIR}/haproxy.initd-r1" haproxy || die
+
+	newinitd "${FILESDIR}/haproxy.initd-r2" haproxy || die
 
 	# Don't install useless files
 	rm examples/build.cfg doc/*gpl.txt