Remove old ebuild. Revision bump, fixes bug 354713. Take maintainership.

(Portage version: 2.2.0_alpha23/cvs/Linux x86_64)

5 files changed, 28 insertions, 58 deletions

diff --git a/net-proxy/haproxy/ChangeLog b/net-proxy/haproxy/ChangeLog
index 01d3ed49035d..c8db2634919d 100644
--- a/net-proxy/haproxy/ChangeLog
+++ b/net-proxy/haproxy/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-proxy/haproxy
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v 1.45 2011/02/11 01:22:47 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v 1.46 2011/02/14 16:10:26 idl0r Exp $
+
+*haproxy-1.4.11-r1 (14 Feb 2011)
+
+  14 Feb 2011; Christian Ruppert <idl0r@gentoo.org> -haproxy-1.3.20-r1.ebuild,
+  -haproxy-1.4.11.ebuild, +haproxy-1.4.11-r1.ebuild,
+  +files/haproxy-1.4.11-fix-header-removal.diff, metadata.xml:
+  Remove old ebuild. Revision bump, fixes bug 354713. Take maintainership.
 
 *haproxy-1.4.11 (11 Feb 2011)
 
diff --git a/net-proxy/haproxy/files/haproxy-1.4.11-fix-header-removal.diff b/net-proxy/haproxy/files/haproxy-1.4.11-fix-header-removal.diff
new file mode 100644
index 000000000000..86c331f856ca
--- /dev/null
+++ b/net-proxy/haproxy/files/haproxy-1.4.11-fix-header-removal.diff
@@ -0,0 +1,11 @@
+--- src/proto_http.c	2011-02-13 10:43:01.374957366 +0100
++++ src/proto_http.c	2011-02-13 10:45:02.150573292 +0100
+@@ -601,6 +601,8 @@
+ 		idx->used--;
+ 		hdr->len = 0;   /* unused entry */
+ 		idx->v[ctx->prev].next = idx->v[ctx->idx].next;
++		if (idx->tail == ctx->idx)
++			idx->tail = ctx->prev;
+ 		ctx->idx = ctx->prev;    /* walk back to the end of previous header */
+ 		ctx->line -= idx->v[ctx->idx].len + idx->v[cur_idx].cr + 1;
+ 		ctx->val = idx->v[ctx->idx].len; /* point to end of previous header */
diff --git a/net-proxy/haproxy/haproxy-1.3.20-r1.ebuild b/net-proxy/haproxy/haproxy-1.3.20-r1.ebuild
deleted file mode 100644
index 07ab4e720acf..000000000000
--- a/net-proxy/haproxy/haproxy-1.3.20-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.3.20-r1.ebuild,v 1.3 2009/11/01 16:34:44 nixnut Exp $
-
-inherit versionator eutils
-
-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="pcre"
-
-DEPEND="pcre? ( dev-libs/libpcre )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup haproxy
-	enewuser haproxy -1 -1 -1 haproxy
-}
-
-src_compile() {
-	local ARGS="TARGET=linux26"
-	use pcre && ARGS="${ARGS} USE_PCRE=1"
-	use kernel_linux && ARGS="${ARGS} USE_LINUX_SPLICE=1"
-	emake ADDINC="${CFLAGS}" LDFLAGS="${LDFLAGS}" ${ARGS}
-}
-
-src_install() {
-	exeinto /usr/bin
-	doexe haproxy
-	newinitd "${FILESDIR}/haproxy.initd" haproxy
-
-	# Don't install useless files
-	rm examples/build.cfg doc/*gpl.txt
-
-	dodoc CHANGELOG ROADMAP TODO doc/*.txt
-	docinto examples
-	dodoc examples/*.cfg
-}
-
-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.4.11.ebuild b/net-proxy/haproxy/haproxy-1.4.11-r1.ebuild
index da0276703060..5f0af5759c73 100644
--- a/net-proxy/haproxy/haproxy-1.4.11.ebuild
+++ b/net-proxy/haproxy/haproxy-1.4.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.4.11.ebuild,v 1.1 2011/02/11 01:22:47 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.4.11-r1.ebuild,v 1.1 2011/02/14 16:10:26 idl0r Exp $
 
 inherit eutils versionator
 
@@ -21,6 +21,10 @@ pkg_setup() {
 	enewuser haproxy -1 -1 -1 haproxy
 }
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}-fix-header-removal.diff"
+}
+
 src_compile() {
 	local args="TARGET=linux26"
 
diff --git a/net-proxy/haproxy/metadata.xml b/net-proxy/haproxy/metadata.xml
index f7137b977c69..d9588385b79a 100644
--- a/net-proxy/haproxy/metadata.xml
+++ b/net-proxy/haproxy/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>net-proxy</herd>
+	<maintainer>
+		<email>idl0r@gentoo.org</email>
+		<name>Christian Ruppert</name>
+	</maintainer>
 	<longdescription>
 HAProxy is a free, very fast and reliable solution offering high availability, load balancing, and proxying for TCP and HTTP-based applications. It is particularly suited for web sites crawling under very high loads while needing persistence or Layer7 processing. Supporting tens of thousands of connections is clearly realistic with todays hardware. Its mode of operation makes its integration into existing architectures very easy and riskless, while still offering the possibility not to expose fragile web servers to the Net.