Version bump to 1.4.13.

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

4 files changed, 21 insertions, 29 deletions

diff --git a/net-proxy/haproxy/ChangeLog b/net-proxy/haproxy/ChangeLog
index c8db2634919d..016ef443b72e 100644
--- a/net-proxy/haproxy/ChangeLog
+++ b/net-proxy/haproxy/ChangeLog
@@ -1,6 +1,12 @@
 # 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.46 2011/02/14 16:10:26 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v 1.47 2011/03/09 16:16:38 idl0r Exp $
+
+*haproxy-1.4.13 (09 Mar 2011)
+
+  09 Mar 2011; Christian Ruppert <idl0r@gentoo.org> -haproxy-1.4.11-r1.ebuild,
+  +haproxy-1.4.13.ebuild, -files/haproxy-1.4.11-fix-header-removal.diff:
+  Version bump to 1.4.13.
 
 *haproxy-1.4.11-r1 (14 Feb 2011)
 
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index dd5cd89e40ec..c7978d2bd1b8 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,24 +1,23 @@
 -----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.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.13.tar.gz 811771 RMD160 45a02812bc94ad81ac39d3a66898278bf75ed945 SHA1 e89316f5e5190301969fe1d4f4c2aca1c6b71377 SHA256 b78bbf2fb204321e3956edf46f8503843d550e2528f9bc73b71f3b0f3f37987d
 DIST haproxy-1.4.8.tar.gz 778220 RMD160 617f5674c44dbf14b7ff8118c508e889f06c2afc SHA1 3b7a982ba7fb01d43826f5af5e95c86080ae0ca3 SHA256 707487ade815cbd37492d91a014f9a5b3ac313e5b4cb31e2d7c4d2a16f4a23f1
 EBUILD haproxy-1.3.25.ebuild 1973 RMD160 2a1322e802d972b307c535c8709e2945ef5ebce2 SHA1 b4a35a1d7e488974a2178c766bd2f2922b7d196d SHA256 3b985ddc7d85990448d6a812f37eee88c1c9c0bc2ca685ff57e14a7c84fd8f4e
-EBUILD haproxy-1.4.11-r1.ebuild 2048 RMD160 712ee03c5382d976f60aff0ce6a42c974cfc3cfa SHA1 1f82e560ffabd43ea14a5f3de726e2cdf3255612 SHA256 4e7198c3b9ecac361d607bd2ab015e802bb871761de3fa2f183b1887f72a141c
+EBUILD haproxy-1.4.13.ebuild 1985 RMD160 afc88ba9b1fb065d452d1b60a8e4ef113755d623 SHA1 3f11d316eec03982c140a9e74357a01b302aa7a6 SHA256 28fce480279f728e44ba8f2b5875b944df7b509f5f82874f0a7bbac49fe0846e
 EBUILD haproxy-1.4.8.ebuild 1972 RMD160 2021c2283cf339606695d819947d6e5756311a74 SHA1 d8f9f48620cb131e929e2424208d79c7f5c07e49 SHA256 5b5067907c18513b05039334b3676d22106428440d41d417005134d1918c3b60
-MISC ChangeLog 8753 RMD160 579d037a7b336c87143aceef517cec4867845e84 SHA1 49c020545aa24402e9c92137571303ffa71ed1ef SHA256 a5818441f24dad7b419cb56acd1027be822a778ba788325f86eb05e322b2fd3e
+MISC ChangeLog 8963 RMD160 eec3ab6d1b3e9e64bc1865a2b5bd92f2ffda17e0 SHA1 d2bd55124b85cba2ec10635887d5f0e884172f0c SHA256 7740d6d47d02e000416b1677c407824eae9c81ecb1c949c35514a9b20276d901
 MISC metadata.xml 1450 RMD160 1e354be32e3ed9cbd5cd2b1aadbb9dd7772cd526 SHA1 035780ecce98f5856301af6e1633e11ce2bb5e8c SHA256 0797818620feed90cb3481805f66448e3a32afa5f981a95e45e0b0535fbc1cf4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCAAGBQJNWVP4AAoJEMOx0zmdw4Z1eloIAMBC3ILYnvmubt+f5UMzNHsv
-gB2jKLgCOX2s+0HfbAAKTOPe2tawcDV9kZ8No781GzIzBVe974y/t8rCZIyoXn98
-ZRsA68BBSCU3bRPOOYgsXctkDeKNaovbZWhCnRY9bSgcpPsK672NNkpz8Y7V9okL
-wB1gEuKJ/2NIg/42Lo67zj9DBjl7gU76Qmv/xiDlIW7VYUOXn6KADcBhZHMN35aL
-Y+ZTIF3I7yEymGaV9BgUCMoalE5nQYDu9SAIRuqP3oA+VtRPepZh7wB/zNNve1lg
-3oeLAplIU2C7PD6z2ATtlOOUMcJrcPbu8dVqHiutBqzpMhcWfwc5C1yfK768mik=
-=CF2A
+iQEcBAEBCAAGBQJNd6frAAoJEMOx0zmdw4Z1WqMH/2P6CtaH5Pbgc/j7gaLivY2M
+UM7wuxroYL5apuBMq/ZgwDJjMjL55jxPkNK93BXd82Xv1ZrH6Tf3cApUkKRBhu0a
+Nq1q4k+J+zbzcFXnChVFu9PzAvJcNbpvrDRweOvkdvcgGN4F6pI5Ta9Fk2XC+exM
+6oiXuHze1AUB2/CkeaijRU1ujqjZODUWNrjWptvbpcDXCR2sjFbnGzYLcA2atsM0
+WCBIpt/BpLPnX/sCXRLIeRJUly626ch9HSBme775ZVHRwm3lUPXvrWK8zQ5RYjBg
+6zko/VMWFEbVDAR7C49AufngqBi1Mu60NVwQ0fukIns1rBgXL3I+Ww6lM3UwnAc=
+=4Em+
 -----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
deleted file mode 100644
index 86c331f856ca..000000000000
--- a/net-proxy/haproxy/files/haproxy-1.4.11-fix-header-removal.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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.4.11-r1.ebuild b/net-proxy/haproxy/haproxy-1.4.13.ebuild
index 5f0af5759c73..b06fc6ddb937 100644
--- a/net-proxy/haproxy/haproxy-1.4.11-r1.ebuild
+++ b/net-proxy/haproxy/haproxy-1.4.13.ebuild
@@ -1,6 +1,8 @@
 # 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-r1.ebuild,v 1.1 2011/02/14 16:10:26 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.4.13.ebuild,v 1.1 2011/03/09 16:16:38 idl0r Exp $
+
+EAPI="3"
 
 inherit eutils versionator
 
@@ -21,10 +23,6 @@ pkg_setup() {
 	enewuser haproxy -1 -1 -1 haproxy
 }
 
-src_prepare() {
-	epatch "${FILESDIR}/${P}-fix-header-removal.diff"
-}
-
 src_compile() {
 	local args="TARGET=linux26"