Version bump to 1.3.24 and 1.4.6, bug 305261.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 155 insertions, 6 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/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>