Version bump, CVE-2013-1912

(Portage version: 2.1.11.55/cvs/Linux x86_64, signed Manifest commit with key B427ABC8)

3 files changed, 101 insertions, 5 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/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