Version bump to 1.3.26 and 1.4.16.

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

4 files changed, 163 insertions, 6 deletions

diff --git a/net-proxy/haproxy/ChangeLog b/net-proxy/haproxy/ChangeLog
index b2e5e7a7dcfe..bde6e4e5fe72 100644
--- a/net-proxy/haproxy/ChangeLog
+++ b/net-proxy/haproxy/ChangeLog
@@ -1,6 +1,13 @@
 # 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.51 2011/07/23 11:26:44 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v 1.52 2011/09/04 16:12:21 idl0r Exp $
+
+*haproxy-1.4.16 (04 Sep 2011)
+*haproxy-1.3.26 (04 Sep 2011)
+
+  04 Sep 2011; Christian Ruppert <idl0r@gentoo.org> +haproxy-1.3.26.ebuild,
+  +haproxy-1.4.16.ebuild:
+  Version bump to 1.3.26 and 1.4.16.
 
   23 Jul 2011; Markus Meier <maekke@gentoo.org> haproxy-1.4.15.ebuild:
   x86 stable, bug #375111
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 7744e51a40aa..20abd2186a60 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,19 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 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.3.26.tar.gz 668337 RMD160 f11286cef16eb3c9e29d09da3293316957226843 SHA1 4a93bcf6bcd48969fa44ac8081ce7a8baf518e17 SHA256 ab97d7f524b8c816c2b42b99d63691c819a32fe593c22242dad3108c7f85f274
 DIST haproxy-1.4.15.tar.gz 812293 RMD160 1a5e3e5c4ea71e4d439ffc4b221e31ae90d04f88 SHA1 8c42bc8c7d3714061b6fb74b0e3565d1e672556f SHA256 4baebfe0a5a9220f77d9175b2e711dc8985bbb696d11c38033cc0e94e3cca93a
+DIST haproxy-1.4.16.tar.gz 813322 RMD160 1b832777c849f404bd74a49f802f84d64f9b058f SHA1 0118e74bc37f070d2cc98de66d5e2c98bdb82f29 SHA256 ab789ced19db1462a815ffdd436edd7a2eeaf7cc2908b9253b3b01f659a9e2db
 DIST haproxy-1.4.8.tar.gz 778220 RMD160 617f5674c44dbf14b7ff8118c508e889f06c2afc SHA1 3b7a982ba7fb01d43826f5af5e95c86080ae0ca3 SHA256 707487ade815cbd37492d91a014f9a5b3ac313e5b4cb31e2d7c4d2a16f4a23f1
 EBUILD haproxy-1.3.25.ebuild 2003 RMD160 247a4bfbe29c67f5be6558ce20a080b1a9aa3bb0 SHA1 bc5a43a6375460c4173307922502703e51425d76 SHA256 dd9df176e0d5dc11ec192e3ef3ef4abb71065b87666efed8423f25f937f21d2c
+EBUILD haproxy-1.3.26.ebuild 2006 RMD160 1647aeca4563e93c9be09a2ebd1f15801fca17ef SHA1 431aa2aab7d404513d34647307ec63e46b6b2326 SHA256 5362e22133c55359f03d1fac1f22662e470568af047fe822588a8acd9a7c9362
 EBUILD haproxy-1.4.15.ebuild 2015 RMD160 08dfed1cf5ec97f989c6a75f25c7556ca9df1b67 SHA1 e19c84bb1182a52faff8991c2e6e92040eab3e58 SHA256 a7a9311806e411dfd646cc1374529fa89327c734bdf2f9fe163c1a9c60c57533
+EBUILD haproxy-1.4.16.ebuild 2016 RMD160 8ecb20b5b672dbad5fbb5e246b3eb1f4813d4ab6 SHA1 89eb0ac7ec377d77bf345d6b7d2a0e85657fee49 SHA256 c9d8eb5ba884547848089e1d0c833cdac6f1cd3d16a7010dff29c562d03d9d28
 EBUILD haproxy-1.4.8.ebuild 2002 RMD160 fd6b5188bd5a8906a302faee5ad9d410dca78ebf SHA1 dec48db1e95787323c4ed4a60ccd41d919f4b289 SHA256 8168a8d4439411a981ff0789688cb9f71d1fc9e5f700e235bfa1184a1b2e9902
-MISC ChangeLog 9497 RMD160 55e4e0e40ee747536c1f758be382862e6357fb95 SHA1 c4af06d097ee80af99f2333c5558858347fe91f1 SHA256 22f5ebafedcf0422570e7c985749bf3306ea5314b01700cc85fc1cbe16daf902
+MISC ChangeLog 9697 RMD160 93a1a5cd52143cf9c29222da6feb5662480fdbdb SHA1 a1304c339518029fca08805d4225c2fb8ed62824 SHA256 00742b67dc4a430b17a5847f6d166cfefae644f8c635b24a18df4a6db28bebe4
 MISC metadata.xml 1450 RMD160 1e354be32e3ed9cbd5cd2b1aadbb9dd7772cd526 SHA1 035780ecce98f5856301af6e1633e11ce2bb5e8c SHA256 0797818620feed90cb3481805f66448e3a32afa5f981a95e45e0b0535fbc1cf4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4qsBoACgkQkKaRLQcq0GJJSQCeM+6Xdh9JFspPTNP1UR+yfb2T
-yAQAoLCpHAGad8shdFEl8Jm1R7eZd7CG
-=m1tj
+iQEcBAEBCAAGBQJOY6NrAAoJEMOx0zmdw4Z1vpsH/02e4xlFDnVvonqezMww1WBR
+lo7hAipJF/MMHSUERSKXeCDbEe+akjecHZcyLz44Gow7AUcku8m6lS6IdGB89Ovg
++e7dNSI/cVcNF1vgRB8DyejK7unh2OYR9OgF399gPlqQ5YWLUJTpE1woEyMbd+Kg
+q1tP6OrK5MOIB0AmKm34ayd3i9zYGT7Es2hO+utUWrU6VlzvZivYhS9+M7hCu7cg
+5nPqFp0gPdvImjjC7VD65KUk1//iKTmPMQxhdFsD21gelyQDbWmjQ+HG9/V54uZo
+bJIG9735t1PCHLzfXqFbyc2CER0dTKJVNSfvhmTJENU40R813/Rh3RSIvljW1n0=
+=mS4A
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/haproxy/haproxy-1.3.26.ebuild b/net-proxy/haproxy/haproxy-1.3.26.ebuild
new file mode 100644
index 000000000000..e51466682129
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-1.3.26.ebuild
@@ -0,0 +1,70 @@
+# 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.3.26.ebuild,v 1.1 2011/09/04 16:12:21 idl0r Exp $
+
+inherit eutils versionator toolchain-funcs
+
+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}" CC=$(tc-getCC) ${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.16.ebuild b/net-proxy/haproxy/haproxy-1.4.16.ebuild
new file mode 100644
index 000000000000..53441b658dee
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-1.4.16.ebuild
@@ -0,0 +1,72 @@
+# 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.16.ebuild,v 1.1 2011/09/04 16:12:21 idl0r Exp $
+
+EAPI="3"
+
+inherit eutils versionator toolchain-funcs
+
+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}" CC=$(tc-getCC) ${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
+}