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

Package-Manager: portage-2.2.0_alpha23/cvs/Linux x86_64

6 files changed, 39 insertions, 70 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/Manifest b/net-proxy/haproxy/Manifest
index e20f1c31be33..dd5cd89e40ec 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,25 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX haproxy-1.4.11-fix-header-removal.diff 507 RMD160 8f24ece3a45e06a318e94cb2b832d9fe311a93e7 SHA1 4a266a3ebc673ca3c2224f068b39f3af64ec9590 SHA256 e876dc9e63e7b32c4205c827f6425063ca70efd4f07db8e2f10b214316b1dd1f
 AUX haproxy.initd 948 RMD160 a2be74ba6c0672544e4f90ff28b3671e3493a7d3 SHA1 3d003a7f2d1bbb078ca6e51d2588605f0c4700a7 SHA256 4ffccbd0e635ba89235561669cab9e9d4cd8f13e1d8028213c08e9123f092628
-DIST haproxy-1.3.20.tar.gz 648912 RMD160 5f16cd2862bc02b61be44682d591f689a36c964d SHA1 c017c2853ca0f20669abfb24c7f3b30630d86438 SHA256 a1e99fa00d69aa8d9f800d381a6ef1daa8797893e49a147f2fb963cfef56bd77
 DIST haproxy-1.3.25.tar.gz 662198 RMD160 54fac52224e5e1a32d19c4e8b5da92e1ee6ed6ff SHA1 08fcc1f881514cb8ded801890743af29b93d5d30 SHA256 50dbe7b515c32a643b7caaac32ec3152ba536e589242e4d50ff42618a85f5a78
 DIST haproxy-1.4.11.tar.gz 810710 RMD160 4ed6b7f8ec8e0528e3d0c286852be4da336b6bb6 SHA1 d6aef2052437fe8d89a5fc2ac0f03be43fa77b7e SHA256 2c84fc7e99e2045c4031d587832fd9289fac6c48156e067bf6ba05d5d9e559b7
 DIST haproxy-1.4.8.tar.gz 778220 RMD160 617f5674c44dbf14b7ff8118c508e889f06c2afc SHA1 3b7a982ba7fb01d43826f5af5e95c86080ae0ca3 SHA256 707487ade815cbd37492d91a014f9a5b3ac313e5b4cb31e2d7c4d2a16f4a23f1
-EBUILD haproxy-1.3.20-r1.ebuild 1703 RMD160 a3ca49d31d378f5eb7fa135062b87e6f2a454a8a SHA1 434557c5104bbd3fea819f01c4897edd92df0d8a SHA256 de00df0635a8594e47db66bc635852d301668198426b4c0d9847c65b37ffa631
 EBUILD haproxy-1.3.25.ebuild 1973 RMD160 2a1322e802d972b307c535c8709e2945ef5ebce2 SHA1 b4a35a1d7e488974a2178c766bd2f2922b7d196d SHA256 3b985ddc7d85990448d6a812f37eee88c1c9c0bc2ca685ff57e14a7c84fd8f4e
-EBUILD haproxy-1.4.11.ebuild 1975 RMD160 1360d08310090e3dff54efc0893b4aa162b5f1a7 SHA1 47b6896fd4026de8ff43a2f16222922840756c74 SHA256 c2f7ab2dd7b63f4de5a8bb4fbc1cbb546c45aa0d98bcb73926abe10f52f84e8c
+EBUILD haproxy-1.4.11-r1.ebuild 2048 RMD160 712ee03c5382d976f60aff0ce6a42c974cfc3cfa SHA1 1f82e560ffabd43ea14a5f3de726e2cdf3255612 SHA256 4e7198c3b9ecac361d607bd2ab015e802bb871761de3fa2f183b1887f72a141c
 EBUILD haproxy-1.4.8.ebuild 1972 RMD160 2021c2283cf339606695d819947d6e5756311a74 SHA1 d8f9f48620cb131e929e2424208d79c7f5c07e49 SHA256 5b5067907c18513b05039334b3676d22106428440d41d417005134d1918c3b60
-MISC ChangeLog 8448 RMD160 0cdac7fbebf0eb1dc1bedb70d55743d77b5a3df8 SHA1 f2dbf125509956ba6c24257b04d320b16c7236f9 SHA256 45054aaf4ff8dd835ceb9e5ea3bbc44465ce6fd0893626fc074b60a82a4b3d67
-MISC metadata.xml 1354 RMD160 ac6872987bd23662488dfc576325efc06812010d SHA1 346fee4729e8480a7b92fdcae35958bd25d0240b SHA256 d13717d25240c3aae5018d4735f22e421a3dba7b06e123efcb0bed2a4c023609
+MISC ChangeLog 8753 RMD160 579d037a7b336c87143aceef517cec4867845e84 SHA1 49c020545aa24402e9c92137571303ffa71ed1ef SHA256 a5818441f24dad7b419cb56acd1027be822a778ba788325f86eb05e322b2fd3e
+MISC metadata.xml 1450 RMD160 1e354be32e3ed9cbd5cd2b1aadbb9dd7772cd526 SHA1 035780ecce98f5856301af6e1633e11ce2bb5e8c SHA256 0797818620feed90cb3481805f66448e3a32afa5f981a95e45e0b0535fbc1cf4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQEcBAEBCAAGBQJNVI9sAAoJEMOx0zmdw4Z1mqYIAKD2MkEXRXVhCwn3q4sEVL51
-WvlJ/zJE5MJNYjyjj+aFoiX9l2g9l0Tz/lNOxYEuu69uEa1JczO/DqsJbhcwdqrn
-5fhi8S3rVeFHPR6V/FTnIOra781bbGqESK/WBjdpKK4pqDYTFIotwnzwYH86CO4y
-8IcgMeX6l0Awq2Wd0nd0KYpyjxYqaYQB/Z9jD2Mk1arMsLRUtqnd7p4CPsl0qwi5
-5ADoe1w87oVGrGSkwpTYy229aNMq0XXx1ttuRF/NGVGapRkpHY2XQu60hMPu2HAo
-GKKyy32z/1+PHiY2DC/7zn+oFH/Oi7Xc7VU2CSh8QaTPYS+6MpHkCy5n/eaJDTU=
-=CpRW
+iQEcBAEBCAAGBQJNWVP4AAoJEMOx0zmdw4Z1eloIAMBC3ILYnvmubt+f5UMzNHsv
+gB2jKLgCOX2s+0HfbAAKTOPe2tawcDV9kZ8No781GzIzBVe974y/t8rCZIyoXn98
+ZRsA68BBSCU3bRPOOYgsXctkDeKNaovbZWhCnRY9bSgcpPsK672NNkpz8Y7V9okL
+wB1gEuKJ/2NIg/42Lo67zj9DBjl7gU76Qmv/xiDlIW7VYUOXn6KADcBhZHMN35aL
+Y+ZTIF3I7yEymGaV9BgUCMoalE5nQYDu9SAIRuqP3oA+VtRPepZh7wB/zNNve1lg
+3oeLAplIU2C7PD6z2ATtlOOUMcJrcPbu8dVqHiutBqzpMhcWfwc5C1yfK768mik=
+=CF2A
 -----END PGP SIGNATURE-----
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.