Version bump to 1.3.24 and 1.4.6, bug 305261.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 165 insertions, 12 deletions

diff --git a/net-proxy/haproxy/ChangeLog b/net-proxy/haproxy/ChangeLog
index 1d70e2a39309..9d457f6f683b 100644
--- a/net-proxy/haproxy/ChangeLog
+++ b/net-proxy/haproxy/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-proxy/haproxy
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v 1.35 2009/12/05 09:04:28 mrness Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v 1.36 2010/05/22 16:30:11 idl0r Exp $
+
+*haproxy-1.4.6 (22 May 2010)
+*haproxy-1.3.24 (22 May 2010)
+
+  22 May 2010; Christian Ruppert <idl0r@gentoo.org> +haproxy-1.3.24.ebuild,
+  +haproxy-1.4.6.ebuild, metadata.xml:
+  Version bump to 1.3.24 and 1.4.6, bug 305261.
 
 *haproxy-1.3.22-r1 (05 Dec 2009)
 
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 0e436a6fa2b4..2f691837846f 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -6,16 +6,20 @@ DIST haproxy-1.3.14.14.tar.gz 483645 RMD160 cb848fe08f240d4c5b15c093ff322e32892a
 DIST haproxy-1.3.15.10.tar.gz 521883 RMD160 bd7aa526ba44223dc8dd67403974305d785688a4 SHA1 68f7fd13a75f8605d55fea62b4d42619fa9053ee SHA256 75cd6fce0a1e959a100ecce7de05f0bc797c49e66b26f142c0d36605751eab6b
 DIST haproxy-1.3.20.tar.gz 648912 RMD160 5f16cd2862bc02b61be44682d591f689a36c964d SHA1 c017c2853ca0f20669abfb24c7f3b30630d86438 SHA256 a1e99fa00d69aa8d9f800d381a6ef1daa8797893e49a147f2fb963cfef56bd77
 DIST haproxy-1.3.22.tar.gz 655125 RMD160 2a4149fecc9a2f08c8b1d5af3ea29b67016a050e SHA1 4f927d810d89bd258aa8a262cebb217e2df2932f SHA256 6c8d38c68156c4ebcbf72aa423f682cbb414fbe11922a7173f324b58c9eb98f7
+DIST haproxy-1.3.24.tar.gz 661747 RMD160 f97a8bf1553cc97f001f132c95338f6e857a9395 SHA1 b7cf3f34bdbb393aeb19c51a16584c22e0ba6f7b SHA256 705781f9fec78bb8721f09ee67dcb7397e6782f7fbfce45c89d06e4fa425f721
+DIST haproxy-1.4.6.tar.gz 776321 RMD160 e30f41a208de743a08fb33de45972549666dc1c1 SHA1 5a95c14af738ccb40fa2b84ddaf6da23997cb0fb SHA256 975c4e63fbfdf60280207584f62aea635563a65cccc60df0f43af4a543b92c96
 EBUILD haproxy-1.3.14.14.ebuild 1679 RMD160 219aee748df5246c59d901d4d18989a57899d27d SHA1 801fe56562ffc992bbe0ef3e88e075a853038ea7 SHA256 5eb69e39b5b635f6fd4f83c07bdfce0e7663beee976d25eff8e0deb574e4cedb
 EBUILD haproxy-1.3.15.10.ebuild 1648 RMD160 8601d2565955a08e5bf1caec223b8ea7669d3b0d SHA1 980070ecd946dc7410867a2ee2436671877fee65 SHA256 272c02bdceb81f3e5ba02bf8ddd074501b55882161af00a5a38cd38e21bc67f8
 EBUILD haproxy-1.3.20-r1.ebuild 1703 RMD160 a3ca49d31d378f5eb7fa135062b87e6f2a454a8a SHA1 434557c5104bbd3fea819f01c4897edd92df0d8a SHA256 de00df0635a8594e47db66bc635852d301668198426b4c0d9847c65b37ffa631
 EBUILD haproxy-1.3.22-r1.ebuild 1761 RMD160 a0acc89b6959b9f91be840baf41d479b393408ce SHA1 1ff2748df9e7c1c19cda1f3391dec0ae8cfe4e4a SHA256 eacc6a77ba2bf88187d48ba9214f664bd0c21f73030b79422513e8523e43b6d2
-MISC ChangeLog 6746 RMD160 c30812f9eb201d95da8b22d181593bbc320d788c SHA1 bea34d168477e48e09e4c8f5d832b11100008a42 SHA256 5c292c1918def1ffb2ae32e50e838860534ed407a081c7c468ce44a1f0cc3672
-MISC metadata.xml 929 RMD160 5165e64077d97077bfd334036f3a6c50defacfbe SHA1 1df1db8e4ded2e77dc7dc8b500c013e27bde027d SHA256 f59d153f4707b2195eb319ac40844a2c264a3231656fa75846a5d33422b9f6a4
+EBUILD haproxy-1.3.24.ebuild 1975 RMD160 8a232dc3c6f5271a61a2e006b462267caab33cd9 SHA1 bec8af5d8b12b62a086f7e9745c924b14646d4d1 SHA256 1f422403064c545432450777bea7481d4c2bb44c607c41b3bd8fb0eb7ff39a4f
+EBUILD haproxy-1.4.6.ebuild 1974 RMD160 854fed211034c06b21e2804c45a83b938861494e SHA1 75658ee75f38bcf68bcc79b07dd841322fad02e3 SHA256 d426bc9dda64685146d8ed7481862c99c55abb38536bc7eeed7266ee31cf3efc
+MISC ChangeLog 6969 RMD160 aa065df1fd5e525e7847556304cf18efc6d39e34 SHA1 38dee83ee025e5bef59a1949cee5bb51e3e866b4 SHA256 553d1f9fe5ecd61e61056e46896a82c11c036c079204e559af67695746c34b07
+MISC metadata.xml 1354 RMD160 ac6872987bd23662488dfc576325efc06812010d SHA1 346fee4729e8480a7b92fdcae35958bd25d0240b SHA256 d13717d25240c3aae5018d4735f22e421a3dba7b06e123efcb0bed2a4c023609
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAksaIiUACgkQ9A5kJBGSrsuLdwCfQLdDlTMs/0wlmnupMoKyo6Ct
-KTgAnidtlLmfRA3Y+pJJxYOa0a4LPlkC
-=FluR
+iEYEARECAAYFAkv4Bp0ACgkQixe2jn+ufTgMzwCfXMYXcxt/boIEIJbgYDxyRdHp
+W2cAn1I11OKfrTzpvtf22yhGLKGGhIwu
+=ykWD
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/haproxy/haproxy-1.3.24.ebuild b/net-proxy/haproxy/haproxy-1.3.24.ebuild
new file mode 100644
index 000000000000..f956017dd628
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-1.3.24.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.3.24.ebuild,v 1.1 2010/05/22 16:30:11 idl0r Exp $
+
+inherit eutils versionator
+
+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="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=linux26"
+
+	use pcre && args="${args} USE_PCRE=1"
+
+	use kernel_linux && args="${args} USE_LINUX_SPLICE=1"
+	use kernel_linux && args="${args} USE_LINUX_TPROXY=1"
+
+	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" ${args} || die
+}
+
+src_install() {
+	dobin haproxy || die
+	newinitd "${FILESDIR}/haproxy.initd" 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.4.6.ebuild b/net-proxy/haproxy/haproxy-1.4.6.ebuild
new file mode 100644
index 000000000000..d3f1b7c5864e
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-1.4.6.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.4.6.ebuild,v 1.1 2010/05/22 16:30:11 idl0r Exp $
+
+inherit eutils versionator
+
+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="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=linux26"
+
+	use pcre && args="${args} USE_PCRE=1"
+
+	use kernel_linux && args="${args} USE_LINUX_SPLICE=1"
+	use kernel_linux && args="${args} USE_LINUX_TPROXY=1"
+
+	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" ${args} || die
+}
+
+src_install() {
+	dobin haproxy || die
+	newinitd "${FILESDIR}/haproxy.initd" 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/metadata.xml b/net-proxy/haproxy/metadata.xml
index 52f0f9838a6a..f7137b977c69 100644
--- a/net-proxy/haproxy/metadata.xml
+++ b/net-proxy/haproxy/metadata.xml
@@ -1,8 +1,10 @@
-<?xml version = '1.0' encoding = 'UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-proxy</herd>
-  <longdescription>HA-Proxy is a TCP/HTTP reverse proxy which is particularly suited for high availability environments.
+	<herd>net-proxy</herd>
+	<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.
+
 It can:
  - route HTTP requests depending on statically assigned cookies
  - spread the load among several servers while assuring server persistence through the use of HTTP cookies
@@ -12,5 +14,5 @@ It can:
  - add/modify/delete HTTP headers both ways
  - block requests matching a particular pattern
 Its event-driven architecture allows it to easily handle thousands of simultaneous connections on hundreds of instances without risking the system's stability.
-</longdescription>
+	</longdescription>
 </pkgmetadata>