Version bump

(Portage version: 2.1.11.31/cvs/Linux i686, signed Manifest commit with key B427ABC8)

3 files changed, 131 insertions, 1 deletions

diff --git a/net-proxy/haproxy/ChangeLog b/net-proxy/haproxy/ChangeLog
index f3c6da71c87d..be755eb8148b 100644
--- a/net-proxy/haproxy/ChangeLog
+++ b/net-proxy/haproxy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/haproxy
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v 1.71 2012/12/22 17:06:21 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v 1.72 2012/12/26 00:57:51 idl0r Exp $
+
+*haproxy-1.5_beta16 (26 Dec 2012)
+
+  26 Dec 2012; Christian Ruppert <idl0r@gentoo.org> +haproxy-1.5_beta16.ebuild,
+  +files/haproxy-1.5_beta16-stats.patch:
+  Version bump
 
 *haproxy-1.5_beta15 (22 Dec 2012)
 
diff --git a/net-proxy/haproxy/files/haproxy-1.5_beta16-stats.patch b/net-proxy/haproxy/files/haproxy-1.5_beta16-stats.patch
new file mode 100644
index 000000000000..dfe7b6e9da30
--- /dev/null
+++ b/net-proxy/haproxy/files/haproxy-1.5_beta16-stats.patch
@@ -0,0 +1,13 @@
+diff --git a/src/proto_http.c b/src/proto_http.c
+index c715828..535c159 100644
+--- a/src/proto_http.c
++++ b/src/proto_http.c
+@@ -3117,7 +3117,7 @@ http_check_access_rule(struct proxy *px, struct list *rules, struct session *s,
+ 			}
+ 		}
+ 	}
+-	return rule;
++	return NULL;
+ }
+ 
+ /* This stream analyser runs all HTTP request processing which is common to
diff --git a/net-proxy/haproxy/haproxy-1.5_beta16.ebuild b/net-proxy/haproxy/haproxy-1.5_beta16.ebuild
new file mode 100644
index 000000000000..be9f6677f799
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-1.5_beta16.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.5_beta16.ebuild,v 1.1 2012/12/26 00:57:51 idl0r Exp $
+
+EAPI="4"
+
+inherit eutils versionator toolchain-funcs flag-o-matic
+
+MY_P="${PN}-${PV/_beta/-dev}"
+
+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/devel/${MY_P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+crypt examples +pcre ssl vim-syntax +zlib"
+
+DEPEND="pcre? ( dev-libs/libpcre )
+	ssl? ( dev-libs/openssl[zlib?] )
+	zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+#pkg_setup() {
+#	enewgroup haproxy
+#	enewuser haproxy -1 -1 -1 haproxy
+##}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-stats.patch"
+}
+
+src_compile() {
+	local args="TARGET=linux2628 USE_GETADDRINFO=1"
+
+	if use pcre; then
+		args="${args} USE_PCRE=1"
+	else
+		args="${args} USE_PCRE="
+	fi
+
+#	if use kernel_linux; then
+#		args="${args} USE_LINUX_SPLICE=1 USE_LINUX_TPROXY=1"
+#	else
+#		args="${args} USE_LINUX_SPLICE= USE_LINUX_TPROXY="
+#	fi
+
+	if use crypt; then
+		args="${args} USE_LIBCRYPT=1"
+	else
+		args="${args} USE_LIBCRYPT="
+	fi
+
+	if use ssl; then
+		args="${args} USE_OPENSSL=1"
+	else
+		args="${args} USE_OPENSSL="
+	fi
+
+	if use zlib; then
+		args="${args} USE_ZLIB=1"
+	else
+		args="${args} USE_ZLIB="
+	fi
+
+	# For now, until the strict-aliasing breakage will be fixed
+#	append-cflags -fno-strict-aliasing
+
+	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args} || die
+}
+
+src_install() {
+	dobin haproxy || die
+
+	newinitd "${FILESDIR}/haproxy.initd-r2" 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
+}