Version bump

Package-Manager: portage-2.1.11.31/cvs/Linux i686
Manifest-Sign-Key: 0xB427ABC8

4 files changed, 142 insertions, 9 deletions

diff --git a/net-proxy/haproxy/ChangeLog b/net-proxy/haproxy/ChangeLog
index f3c6da71c87d..be755eb8148b 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.71 2012/12/22 17:06:21 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v 1.72 2012/12/26 00:57:51 idl0r Exp $
+
+*haproxy-1.5_beta16 (26 Dec 2012)
+
+  26 Dec 2012; Christian Ruppert <idl0r@gentoo.org> +haproxy-1.5_beta16.ebuild,
+  +files/haproxy-1.5_beta16-stats.patch:
+  Version bump
 
 *haproxy-1.5_beta15 (22 Dec 2012)
 
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 3f40220e8b79..f2d4bf924cb8 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,24 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX haproxy-1.5_beta16-stats.patch 354 SHA256 d9cc67a0f1190b4700635c8ed209e32ebed839cbfe0131b7e92740b9ecc6d20b SHA512 aa99d659975ba67631b8bd1e878f1a8febc5275a98bc23697221eab4765ff2177d13b5df49d415fcc0d21494a5516e236b5b91566778b67025426b9f8bcb646d WHIRLPOOL dc35a0dcc7e3558bea04575e051842c338118b7462c75b7fdaa4ad0b0e3a84436e8e366551f26d03ce8ec7367ba378361666448d71cc8e3df3bb0b20a3f589dc
 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
 DIST haproxy-1.5-dev15.tar.gz 1095962 SHA256 417d746c6ff179b290410b8640b699a5f2b98cdb916ace4656d7d1ea79880047 SHA512 bde924a53c40b3a9624e94ca53da3c22963e7015441331868fe689559416470bf2d397e3af87e7f0bc8e34cbd5eec5d36f777fe6a6ec2ae020aee9f2b0fe33a8 WHIRLPOOL 0ece061ccb8483b3e09e4e00d68dee2e0fade282021e710c67ceab77671c8f53524e2b170bf3d74b3364a49d255b6f81c7d07c20a3f034871ba3d3ad42321455
+DIST haproxy-1.5-dev16.tar.gz 1102843 SHA256 41370ab485ac17d9ed088dd4f56e49f1991d39b74014b3e304543446aee5370c SHA512 524b1485dae7d5256fdef4ddd25ea1c84526c61dc2f45aeb228fcd7aed6e39f80fd4e9dc2edd9d6428ae2b804d3c6633f80167ab1e9d4d2df1a4ad0d3dfac845 WHIRLPOOL 1e20de00270aa6d892307a9e84098065e1bab86e80b4b2b526f643a032f1c19bb4ef5b45c282374890bdbd364412d137ea1d92c8baa49b27269f3b9af66a97be
 EBUILD haproxy-1.4.21.ebuild 2129 SHA256 4b4e2bafcccad81fd41a064fb10c0adfd80535424d154696d3fc7df2ccbcef78 SHA512 188c1a0d078d9d56f8e57b2ba461243685dbe02f4e754ab118a7eb06cbe12250cc304d3e8a5e38f07555153f5a77e3d271f9e94c4a13410e0317be6cb902b77a WHIRLPOOL c72d0338dbf612261c84407b86adb5a975da919542d5a2e4fc709f6e2d18184f708e1836c096bbd25d17a7ae86d03d1aa7a1d46bb0879743378a21aa8a46f810
 EBUILD haproxy-1.4.22.ebuild 2319 SHA256 2a12cfd5e5021f41f7789262d9b97a1945b3145fed496396b273f2cff84732fd SHA512 0920f7fbc71c539860782b51167f695d654495468798371b1478036e5d166746d68dccafdcb3fef13c0232f78f0704333d55d1278872a010ab0802bc9ada176c WHIRLPOOL 7eaeeab5255588b276bdd4f361ab96427d516a896b20d42184191bd5ffceed784bf27a1bb92d0fdfd5f32d2004d2c742d3b8ddffc97c59a9a2e9586bf8dc5f1f
 EBUILD haproxy-1.5_beta15.ebuild 2652 SHA256 a6cf969759083d5f82d7d1ada00454d3517cd1489b8dac5e581881580e8220b5 SHA512 156c3a65c3cae82c884656b0f7f58590b2048164f7a7556a41ccd793d77650271e19e4328633090b883c3c67582009611148c9e9789729fcfa70820c55b5c786 WHIRLPOOL 8650f2c50072bf1497a2fa142f094fec1a2d3e30ed997cd7921f1644666a9024e07b93dca0703d33ab6824a6b5c85f26aeca35f16a60f9fda83e4ed235cfd4a9
-MISC ChangeLog 12649 SHA256 7ec3c5c8d236a4b3009db8597f7498d049fd82ff76c9e2f1eb493a3dfc6ec32e SHA512 571a9cea5f6d6bfd8fb10ae9b8079eabcc8b82b1cad820e841187488b0810b1153c602763668e4b19eada3168a2c4c9d33e08d567f62e441470d9dd14918307b WHIRLPOOL bda860f2e289384c8eba40ddec49527c23d7c5512853e3764b7712df88508cc1375b4de9ddb30ed20640aeab39b96bf6ba80539835c572e9ff224edbda4f9ac1
+EBUILD haproxy-1.5_beta16.ebuild 2715 SHA256 e56340f63177437567c72331cf983b947e0feb0038d2b76b71c1b5c6caef8bd9 SHA512 db44791320c6a76dbd7631efd6feb919fba7f60ad886c942d96db98c7ba698f7da1070258454b9a497c8d70ef95e3e840f42d1b261d9037b8f3172f4c83926ee WHIRLPOOL 8902325711488ddc9261de0fd76a113d8cd86ee3617ea8d9a2bf9e8d6ef7a39fa6a7741ba931716a73263a3bb1cfc639fdc7408e3cf8867cbbb9c7acdb28467a
+MISC ChangeLog 12821 SHA256 aa318a5008d00ecda823b5cdd4856ab0c52954c8419649e363b1f773b1fcb5c4 SHA512 9e1e251a5da9f1a6c71cc3ac14099b3001d290f69f20b55912a9aadf03db0b5bbb17d81f36e1e182b060277830798953f2c0a814128b68712696531303afd59e WHIRLPOOL 0d42e1191bcac33dfb13e502d6f89642b3e0fb8273a0a76af3e418437013622519ae2855e5ff804d6152cfb71cc24ef7fb87020f94476b55d12fa1bc5ac505c1
 MISC metadata.xml 1450 SHA256 0797818620feed90cb3481805f66448e3a32afa5f981a95e45e0b0535fbc1cf4 SHA512 9e97e0524ea16e789883c739951ea017f66502574e5e5340ab6bfd3765239fc7ccf660a0a0cfee8dc8884247b588b02c11f63961efa7a05f32152ac32a157eba WHIRLPOOL 8b23ebe3a8f2e3c8e2bade35f777241514675337c6b30f6507341452c809b94d4df2a3f5ffb496e4f30293319fde2dd90666e701ac57c0b2f7d3522ff00540c9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ1eiPAAoJEMOx0zmdw4Z14/cH+wQN+O3wxPgPcHQ57FA8rhqx
-lyG6+jwhzPx/7xTaTvvgupvmQ4T+zzQEXYzQMNKSn+8UoerryO9nvV7NX06yRX44
-n8kYiOI1aLrNYSg0iKkIUrW5OXzFyJJ9Umwy/2nY5MsnbmJOjfPps+K5BpL3kJY7
-9MPsWSOdH5YNpBWVREPt8hahf62UDe8KiRhG9Rc+t244sr7NgKbg1Bx/fGO4fBDk
-lUBt64qWDKai+pgfITQeBzZ0zSeS/75EJ2mfqZRITpOZfvn0PfmszYz/CjUU868o
-KzYPhkoIcGy6xTfIagUGXbOq/p8hVWPGnEqy8nId+PydKXj0RMFVQmsfjmzKcjA=
-=UBRK
+iQEcBAEBCAAGBQJQ2kuRAAoJEMOx0zmdw4Z1ShcIAIhQhdJ30vKbavUDNJvYfzqf
+LPE1GgbMti8JpyGUfDpKhcfDgPU565n85+ZQwWJoGKTvw/+k9xQ/HaoHIbYEmnP4
+3qoH/QS1T0wnqwV66xpcVlcIShxOaJtY9lAh8CfNVGHv0jgdYhG5fGQn7FyrnHVd
+12phbpID5NNPcChYWAEi8cDahLlvvr9AzsVznmuNP84e7sIMh6OjaSD7UVdnbk1t
+TuK7PaxPb0OjOoQj9IZXLxtP0u6xZWlS+r8+F+QWdfF9FEcl3K0Kbx+qfmLd8hWV
+F0e3fnJU2QfvQtP+aAao2tAQgIAyi6067eeCP5vjwYL/RMeVNhCh23n66SoyZJM=
+=BcY5
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/haproxy/files/haproxy-1.5_beta16-stats.patch b/net-proxy/haproxy/files/haproxy-1.5_beta16-stats.patch
new file mode 100644
index 000000000000..dfe7b6e9da30
--- /dev/null
+++ b/net-proxy/haproxy/files/haproxy-1.5_beta16-stats.patch
@@ -0,0 +1,13 @@
+diff --git a/src/proto_http.c b/src/proto_http.c
+index c715828..535c159 100644
+--- a/src/proto_http.c
++++ b/src/proto_http.c
+@@ -3117,7 +3117,7 @@ http_check_access_rule(struct proxy *px, struct list *rules, struct session *s,
+ 			}
+ 		}
+ 	}
+-	return rule;
++	return NULL;
+ }
+ 
+ /* This stream analyser runs all HTTP request processing which is common to
diff --git a/net-proxy/haproxy/haproxy-1.5_beta16.ebuild b/net-proxy/haproxy/haproxy-1.5_beta16.ebuild
new file mode 100644
index 000000000000..be9f6677f799
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-1.5_beta16.ebuild
@@ -0,0 +1,111 @@
+# 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.5_beta16.ebuild,v 1.1 2012/12/26 00:57:51 idl0r Exp $
+
+EAPI="4"
+
+inherit eutils versionator toolchain-funcs flag-o-matic
+
+MY_P="${PN}-${PV/_beta/-dev}"
+
+DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
+HOMEPAGE="http://haproxy.1wt.eu"
+SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/devel/${MY_P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+crypt examples +pcre ssl vim-syntax +zlib"
+
+DEPEND="pcre? ( dev-libs/libpcre )
+	ssl? ( dev-libs/openssl[zlib?] )
+	zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+#pkg_setup() {
+#	enewgroup haproxy
+#	enewuser haproxy -1 -1 -1 haproxy
+##}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-stats.patch"
+}
+
+src_compile() {
+	local args="TARGET=linux2628 USE_GETADDRINFO=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
+
+	if use crypt; then
+		args="${args} USE_LIBCRYPT=1"
+	else
+		args="${args} USE_LIBCRYPT="
+	fi
+
+	if use ssl; then
+		args="${args} USE_OPENSSL=1"
+	else
+		args="${args} USE_OPENSSL="
+	fi
+
+	if use zlib; then
+		args="${args} USE_ZLIB=1"
+	else
+		args="${args} USE_ZLIB="
+	fi
+
+	# For now, until the strict-aliasing breakage will be fixed
+#	append-cflags -fno-strict-aliasing
+
+	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args} || die
+}
+
+src_install() {
+	dobin haproxy || die
+
+	newinitd "${FILESDIR}/haproxy.initd-r2" haproxy || die
+
+	# Don't install useless files
+#	rm examples/build.cfg doc/*gpl.txt
+
+	dodoc CHANGELOG ROADMAP TODO doc/{configuration,haproxy-en}.txt
+	doman doc/haproxy.1
+
+	if use examples;
+	then
+		docinto examples
+		dodoc examples/*.cfg || die
+	fi
+
+	if use vim-syntax;
+	then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins examples/haproxy.vim || die
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -f "${ROOT}/etc/haproxy.cfg" ]] ; then
+		ewarn "You need to create /etc/haproxy.cfg before you start the haproxy service."
+		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
+		ewarn "Make use of them with the \"user\" and \"group\" directives."
+
+		if [[ -d "${ROOT}/usr/share/doc/${PF}" ]]; then
+			einfo "Please consult the installed documentation for learning the configuration file's syntax."
+			einfo "The documentation and sample configuration files are installed here:"
+			einfo "   ${ROOT}usr/share/doc/${PF}"
+		fi
+	fi
+}