Version bump, CVE-2013-1912

Package-Manager: portage-2.1.11.55/cvs/Linux x86_64
Manifest-Sign-Key: 0xB427ABC8

4 files changed, 113 insertions, 15 deletions

diff --git a/net-proxy/haproxy/ChangeLog b/net-proxy/haproxy/ChangeLog
index 3aa77c51fe1c..45d29bb718f1 100644
--- a/net-proxy/haproxy/ChangeLog
+++ b/net-proxy/haproxy/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-proxy/haproxy
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v 1.75 2013/04/02 20:30:32 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v 1.76 2013/04/04 19:06:24 idl0r Exp $
+
+*haproxy-1.5_beta18 (04 Apr 2013)
+*haproxy-1.4.23 (04 Apr 2013)
+
+  04 Apr 2013; Christian Ruppert <idl0r@gentoo.org> +haproxy-1.4.23.ebuild,
+  -haproxy-1.5_beta17.ebuild, +haproxy-1.5_beta18.ebuild:
+  Version bump, CVE-2013-1912
 
   02 Apr 2013; Christian Ruppert <idl0r@gentoo.org> -haproxy-1.4.21.ebuild,
   -haproxy-1.5_beta15.ebuild, -files/haproxy.initd-r1:
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index f82b3020755b..f77f432fb443 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -3,19 +3,21 @@ Hash: SHA256
 
 AUX haproxy.initd-r2 1095 SHA256 0136fbcbb9e7c77dfade5a4b0f28522a11f15c84fb0bb79f5f486f6baf00a0c4 SHA512 32c5a78a6545c7357ae4b81d8b236ae7569a6ca55171c7560089d345a7a8ba7d2df2083fc7c43b72031a0f8ad1e5151990530ce7b4d2c967dd959bd0ee542ee5 WHIRLPOOL e5c251617d938f07c9dcdb3008f8ec050bedd9c2dccdd63b4c83d8367795e24be79a1f394808f530f908f0147f72b7a6794a75a240d26d9d23285265f496f1b4
 DIST haproxy-1.4.22.tar.gz 831791 SHA256 ba221b3eaa4d71233230b156c3000f5c2bd4dace94d9266235517fe42f917fc6 SHA512 a436aeacbda4dcc3de09250187e22589c1c71dda7d77f5b2cf33bfdaaa443fc5b2d9ab6d57085296fde7581ea8cc1d04408569e70879f96687bc3151120a9afa WHIRLPOOL dbef99d77c122c889d95756f227f873c01b3052c3a4c9be57a311321bf36aaa39913a930bcdd2272a3baa3a1dec16e6afc87f52e15df57dd2888446e5a725b55
-DIST haproxy-1.5-dev17.tar.gz 1104398 SHA256 d0371b2eb78dff419e2bf642ffab533c3f13e7216bdb92ba08f65a5e4652e7db SHA512 6aba040fc4ce88df880d791b88f6f9a6258838fee8609c9b08c4b3c47034a6809441822420f89e532f887b541333330e3ae79b7a44e256715b0f842956bd319e WHIRLPOOL cb6badb35c57fa60d53b4c8cdbfbe9b7ccbd87216b16c9dc0ef80e4ce18fd6b26bcf442e9de6848fddb1f37b577f30525740b2b62d91807d084361754dac8810
+DIST haproxy-1.4.23.tar.gz 835907 SHA256 ea5ad4166b394b4acc5065a013c78d3002fe4569dec5f919c09f2a28fb4438f1 SHA512 bba4895715ec210e8c871c9c932516823ae4b9f6d07a6641b5cbd6aee97315253236c541624d64e63356f79ffed8aaf573397631676791f8bc16ca50b49b4ff9 WHIRLPOOL 2da66b583dd11de6bdd98b890b77a632249597d0df62b09f72c2520968abfa83b2ae03674b5cacc0b2b63ec004da31b778b1acb1ee5b6073a630faa2691d8f4f
+DIST haproxy-1.5-dev18.tar.gz 1132317 SHA256 b18bf513585d36b9c4c8a74c3c7b4ad5ac6ebe86339d70894a1cdee74071629f SHA512 8e48d8fc97f94aebdb7db6558fdb4507c1c5ba18049accedd1b816813f037c84e05d60ab6b02e303d065efd169d4e5c792febd83642beb7d09e85ad77cb451a4 WHIRLPOOL 3cadb6c4297242bae1525cb0515cd36911d40641d79ed89693bb02215f1484f08937fdc71e893899d134e5ae36c4e9a66de4e22edbf233690b853e118253911f
 EBUILD haproxy-1.4.22.ebuild 2316 SHA256 a7b9619f36a701261d604c8534e3b41abb9a2fa64874f4df7af1c107dfdc6c3d SHA512 9ff059210ad9469711d7dfb36271da705ba621a0916834d23401d9b6fcff5f046e97849d0ab4ad3111da3a27c4c4d731e49df2b9084eb3ada7eca5d30433a003 WHIRLPOOL 95d1fcb00e32fcd092261bf064d43893c26cf1ecd4fe159248e2e237b6358a0febf2c0c147762968790bed2d3704f58c2001ef78768861a886535977d130763a
-EBUILD haproxy-1.5_beta17.ebuild 2650 SHA256 620bcf25a323b4f572305cca95c7c922f1f9a18a4c7ee778cd42fad2a45119a5 SHA512 3e76ac5798597d8ff6688a94b7febee1f0b285d61682f5f0b0a4647d68ef914911813876a4624b11c54bd7bf35b76b63892e508249abc35dba1ae252fc4ec439 WHIRLPOOL 850694f1e73d22652c40fc55f30d27852045fa5380ec106a47505862611916cc93a1fa343997ae378dfc93b3b4eb2acc8c2562df9f53f07c04272d0607aed097
-MISC ChangeLog 13351 SHA256 45ef2c56cace2f49e43b135f4bad8543dba4019cc8912060fff73f7f63c98344 SHA512 64ca706928d81d03cc20656ef43b58cfc51b87ab0f6148bbdc5c6b9c1a36a3e96cf81571748771c0bd5e51e9ae10810305943ad0fc1e65d3dfd9be1942f1bbb4 WHIRLPOOL 47502f56694f6b493f1b13870570604cecdb75ef8e1471221080d48cb0ca8bca36a2e88f6c3002a2b1baabc434332a45aafaf7926703774293002de24a66e105
+EBUILD haproxy-1.4.23.ebuild 2319 SHA256 88737ea484c9d01b085bb9aec91a1042cb8c307f1baac9e1d094f0532a0c2bd5 SHA512 0a82a879fc60bcddeae4f76e39bca8d02ade59e7b109c43e1ebde0cddb2ae729fe76f04c1ecd6f6ad1471822155a2fa3dda2ca4f4e11e42e314d43154844e622 WHIRLPOOL e4832aa24a9754e5fc40f15fa95a348e1e0c16a44e6dbcbaa287d97061f14e6e491d9fe3533b6a6c90427a474debd09c40cfda4294f840a5b18241e79a856560
+EBUILD haproxy-1.5_beta18.ebuild 2679 SHA256 5615b0d823b10917c16c736841c3920f20bb2bd801b81abd207718a20c8d95bf SHA512 15fdd824e18704e90a803bb8d18957d1d7ba952f82b91d91cba3b734da11f358474d7b3e3171502d44970b16a3e082038c101f986e574c1ee80f22ecc8d5071f WHIRLPOOL d6e43ec0162296cb558fc613822918580c17322aa1ce0ee857c1a474250d5545f47467ed87a18598a72c70c290aa3b188da8cbcb3c2d25c4d2c4a08064808224
+MISC ChangeLog 13581 SHA256 6728b779a3955069d5a3b52113cb62798b775cab8426cf53c4feba6e9161ec10 SHA512 e3942fd0efe93f5a252f75bc9f082c86a8aebddf39aba824dfc8c683da33378c7dcf8c1448572cd9c31b2998956ddebc9b5166385b51164596e3089a50514635 WHIRLPOOL 3f784d7f1701f42368175e5efcff894819f85639827362b95389182374a221ea7242232449486a069f4d38940adb9925632dedcf39bb8f0f19b0ce1ae9208adc
 MISC metadata.xml 1450 SHA256 0797818620feed90cb3481805f66448e3a32afa5f981a95e45e0b0535fbc1cf4 SHA512 9e97e0524ea16e789883c739951ea017f66502574e5e5340ab6bfd3765239fc7ccf660a0a0cfee8dc8884247b588b02c11f63961efa7a05f32152ac32a157eba WHIRLPOOL 8b23ebe3a8f2e3c8e2bade35f777241514675337c6b30f6507341452c809b94d4df2a3f5ffb496e4f30293319fde2dd90666e701ac57c0b2f7d3522ff00540c9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRWz/qAAoJEMOx0zmdw4Z1a9AH/3ORxSvQIi6gpRqwqQVy8XSd
-ZF+v/Q27FBB2G9Ke2GLP2waq09wi/PuchuOjQaqV9Kx7hpKBDaE0nwOrSKVarEAc
-YDydx8fs54eXj2Xa2II4jalMntSk09W6K7ZQi3NdKauehWDa57WNwwHDYGwHiYiX
-TGbxu54cS8u+kZpJ+nCnfXy6+wKKvKTSGmA02vPFR4XiPi8y/C/cK3+a09T1wib2
-6nUC5/bDZwlUxsUTr+hKEbNZvsu3WZcBBfw6e/RB9iw6ldXb8iVB5XUBK43FRsKw
-DNBWl+H5KombtLdvZkGxL4M7UMz5bty9IWT/QP26ZQDHNtprTfnPWWPyGf/SgRQ=
-=PXuM
+iQEcBAEBCAAGBQJRXc8xAAoJEMOx0zmdw4Z1n7gIALFnpZHlLXqsp6wpS5+FdTY1
+ggeVKnq4+YP+IhAM2KbZuRjVaDeZamfQVBtqsMKjCTLEEIEk57EEpvmrLXOt8VJT
+pV+qg2XqX7IsN4KkHyD4MUTlR0E4Issr+jQZILgbjR57VXHhWmPYYZc4UxzJoC2b
+zUwYy75DS0F32vKc4+VChnTa6yplguA/Ky/1Jw97Kiyo2LaSqpHR+qF5s0OuhLAG
+QJSIP4VbJwzjIM2GKy1Ga5Kkhq1Gj4BW/kHZfga70Ld4499tpK/S5CDOEPKcB9se
+wCusBvXus5P5Ds0eOiuKC4V0ql8Jt0nGaU90PeRyBdVmPjZYL3WsQMPnnV9hu5k=
+=it/f
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/haproxy/haproxy-1.4.23.ebuild b/net-proxy/haproxy/haproxy-1.4.23.ebuild
new file mode 100644
index 000000000000..68b22911832c
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-1.4.23.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.4.23.ebuild,v 1.1 2013/04/04 19:06:24 idl0r Exp $
+
+EAPI="5"
+
+inherit user versionator toolchain-funcs flag-o-matic
+
+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/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+crypt examples +pcre vim-syntax"
+
+DEPEND="pcre? ( dev-libs/libpcre )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	enewgroup haproxy
+	enewuser haproxy -1 -1 -1 haproxy
+}
+
+src_compile() {
+	local args="TARGET=linux2628"
+
+	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
+
+	# 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
+}
diff --git a/net-proxy/haproxy/haproxy-1.5_beta17.ebuild b/net-proxy/haproxy/haproxy-1.5_beta18.ebuild
index e729bdf56b5b..94bf06fef83c 100644
--- a/net-proxy/haproxy/haproxy-1.5_beta17.ebuild
+++ b/net-proxy/haproxy/haproxy-1.5_beta18.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.5_beta17.ebuild,v 1.2 2012/12/29 03:03:45 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.5_beta18.ebuild,v 1.1 2013/04/04 19:06:24 idl0r Exp $
 
 EAPI="4"
 
@@ -33,9 +33,9 @@ src_compile() {
 	local args="TARGET=linux2628 USE_GETADDRINFO=1"
 
 	if use pcre; then
-		args="${args} USE_PCRE=1"
+		args="${args} USE_PCRE=1 USE_PCRE_JIT=1"
 	else
-		args="${args} USE_PCRE="
+		args="${args} USE_PCRE= USE_PCRE_JIT="
 	fi
 
 #	if use kernel_linux; then