Enable support for the Linux kernel splice() feature to massively boost some performance (being used for forums.g.o).

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

3 files changed, 66 insertions, 12 deletions

diff --git a/net-proxy/haproxy/ChangeLog b/net-proxy/haproxy/ChangeLog
index b35f5d446608..d3d2ce822a2e 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.30 2009/08/15 22:59:49 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v 1.31 2009/08/18 03:08:27 robbat2 Exp $
+
+*haproxy-1.3.20-r1 (18 Aug 2009)
+
+  18 Aug 2009; Robin H. Johnson <robbat2@gentoo.org>
+  +haproxy-1.3.20-r1.ebuild:
+  Enable support for the Linux kernel splice() feature to massively boost
+  some performance (being used for forums.g.o).
 
 *haproxy-1.3.20 (15 Aug 2009)
 
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index d5a9f932164d..a8751fd0bc52 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX haproxy.initd 948 RMD160 a2be74ba6c0672544e4f90ff28b3671e3493a7d3 SHA1 3d003a7f2d1bbb078ca6e51d2588605f0c4700a7 SHA256 4ffccbd0e635ba89235561669cab9e9d4cd8f13e1d8028213c08e9123f092628
 DIST haproxy-1.3.14.13.tar.gz 483537 RMD160 068bea2c6dca6eb511ab97024af83a254c986bb2 SHA1 86e3bf24a7effe76db81838325e7f6d2458aed76 SHA256 d2ebd28b9bb1f6b31e86a1cfb1b9ddc18d3d18ae297f0597438c47289014b2d9
 DIST haproxy-1.3.14.14.tar.gz 483645 RMD160 cb848fe08f240d4c5b15c093ff322e32892a981e SHA1 2e15337dbcd6e442cb3a0a0f96b90b136e52a262 SHA256 5fd44c5f3ea817a7d505e8cb0df46405a3204ca79b100dc9af6323e7cc55579e
@@ -15,13 +12,7 @@ EBUILD haproxy-1.3.15.10.ebuild 1651 RMD160 35c545f704664eb201d203947572c29b3c29
 EBUILD haproxy-1.3.15.9.ebuild 1649 RMD160 cc0d120947e53c05b49ec92cbba38e8a963f26e9 SHA1 c85ce8f612f1708bd0544272f8c17bf959730a0c SHA256 f173614b4584ae425c078465389cffad707f128717b892e837e1d3d9252cd0eb
 EBUILD haproxy-1.3.18.ebuild 1647 RMD160 8a6ccd2e4686686f61d15aa82b2dbd86096c715e SHA1 cb32b3aa4c53a83396a9c785e37acb2d43b1cf73 SHA256 4cd09cf62949363f5f2b492a0705d55b6314145d145a1b24a6e214d3ad4b7da9
 EBUILD haproxy-1.3.19.ebuild 1648 RMD160 4d95f09527409527c30e1930392f7c4ce99d1c8d SHA1 f8093daa6f652d4b168fba9e6f8289d268310051 SHA256 4f1dbda481492cd02ebe5696df669d78088b012be82be2a2a19a9a9497f3aff9
+EBUILD haproxy-1.3.20-r1.ebuild 1707 RMD160 e90c44f1c09f0af2ff6154f8c2ac5b14b13fe7a5 SHA1 65d8b8f250e5f163697ee0c1a1c346d069d26b42 SHA256 a8a30fc519b5bae8963f6b83adf02b2b6ba478646e5f21217ff0187e5c103246
 EBUILD haproxy-1.3.20.ebuild 1648 RMD160 7c81d2286219c5cd23ec6f4086a1dc7e5ce28922 SHA1 a44afa42d68eef994f06bccd5d78a99fc54ee0d8 SHA256 44faff0e4010869c02fd6f129f84179ccf71ebb192cca1d17ca0e63900bad4aa
-MISC ChangeLog 5764 RMD160 7de8e27e1fc7c84edfae008e1394bb3c31a37dd6 SHA1 f507958cb6ab285868b7d27e80ebea2c26994a1f SHA256 11830a347fe8160fc616eb116a556bb8c42ed3861a724535b77c8deba6174c6b
+MISC ChangeLog 6004 RMD160 4e4ee15c862089b8a049a5d81f6796bd959bfe84 SHA1 847599c0650e60e63ab148fc0bdab0c7b3be85a5 SHA256 283fd9450f5172b1e752b016df5d87779dddc702b1da2c931b11c0109b1620d0
 MISC metadata.xml 929 RMD160 5165e64077d97077bfd334036f3a6c50defacfbe SHA1 1df1db8e4ded2e77dc7dc8b500c013e27bde027d SHA256 f59d153f4707b2195eb319ac40844a2c264a3231656fa75846a5d33422b9f6a4
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkqHPfMACgkQ9A5kJBGSrsvKcACgi5qbGd9xcTvxHqDsHc9+hRF5
-z70Ani7fc+p85/fJqwqdfYbzHAzQCt19
-=y8Io
------END PGP SIGNATURE-----
diff --git a/net-proxy/haproxy/haproxy-1.3.20-r1.ebuild b/net-proxy/haproxy/haproxy-1.3.20-r1.ebuild
new file mode 100644
index 000000000000..f44b12e7e89b
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-1.3.20-r1.ebuild
@@ -0,0 +1,56 @@
+# 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.1 2009/08/18 03:08:27 robbat2 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
+}