Version bump to 1.4.22, bug 436686.

(Portage version: 2.1.11.9/cvs/Linux i686)

3 files changed, 78 insertions, 11 deletions

diff --git a/net-proxy/haproxy/ChangeLog b/net-proxy/haproxy/ChangeLog
index b43351050fb8..308538e5f6ae 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.66 2012/06/08 18:06:38 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v 1.67 2012/09/30 22:07:40 idl0r Exp $
+
+*haproxy-1.4.22 (30 Sep 2012)
+
+  30 Sep 2012; Christian Ruppert <idl0r@gentoo.org> -haproxy-1.4.18-r1.ebuild,
+  +haproxy-1.4.22.ebuild, +files/haproxy.initd-r2:
+  Version bump to 1.4.22, bug 436686.
 
   08 Jun 2012; Brent Baude <ranger@gentoo.org> haproxy-1.4.21.ebuild:
   Marking haproxy-1.4.21 ppc for bug 417079
diff --git a/net-proxy/haproxy/files/haproxy.initd-r2 b/net-proxy/haproxy/files/haproxy.initd-r2
new file mode 100644
index 000000000000..79b12e8ccd11
--- /dev/null
+++ b/net-proxy/haproxy/files/haproxy.initd-r2
@@ -0,0 +1,47 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/files/haproxy.initd-r2,v 1.1 2012/09/30 22:07:40 idl0r Exp $
+
+extra_commands="checkconfig"
+extra_started_commands="reload"
+
+command="/usr/bin/haproxy"
+pidfile="/var/run/${SVCNAME}.pid"
+
+if [ -z "${CONFFILE}" -a -d "/etc/haproxy" -a -f "/etc/haproxy/${SVCNAME}.cfg" ]; then
+	CONFFILE=/etc/haproxy/${SVCNAME}.cfg
+else
+	CONFFILE=/etc/${SVCNAME}.cfg
+fi
+
+command_args="-D -p ${pidfile} -f ${CONFFILE}"
+
+depend() {
+	need net
+	use dns logger
+}
+
+checkconfig() {
+	if [ ! -f "${CONFFILE}" ]; then
+		eerror "${CONFFILE} does not exist!"
+		return 1
+	fi
+
+	ebegin "Checking ${CONFFILE}"
+	$command -q -c -f "${CONFFILE}"
+	eend $?
+}
+
+stop_pre() {
+	if [ "${RC_CMD}" = "restart" ]; then
+		checkconfig || return 1
+	fi
+}
+
+reload() {
+	ebegin "Reloading ${SVCNAME}"
+	checkconfig || { eerror "Reloading failed, please fix your ${CONFFILE} first"; return 1; }
+	$command -D -p "${pidfile}" -f "${CONFFILE}" -sf $(cat "${pidfile}")
+	eend $?
+}
diff --git a/net-proxy/haproxy/haproxy-1.4.18-r1.ebuild b/net-proxy/haproxy/haproxy-1.4.22.ebuild
index 059d934b5583..9ae5834200f6 100644
--- a/net-proxy/haproxy/haproxy-1.4.18-r1.ebuild
+++ b/net-proxy/haproxy/haproxy-1.4.22.ebuild
@@ -1,8 +1,8 @@
 # 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.4.18-r1.ebuild,v 1.4 2012/02/28 22:41:06 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.4.22.ebuild,v 1.1 2012/09/30 22:07:40 idl0r Exp $
 
-EAPI="3"
+EAPI="4"
 
 inherit eutils versionator toolchain-funcs flag-o-matic
 
@@ -12,8 +12,8 @@ SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/$
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="examples pcre vim-syntax"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+crypt examples +pcre vim-syntax"
 
 DEPEND="pcre? ( dev-libs/libpcre )"
 RDEPEND="${DEPEND}"
@@ -24,22 +24,36 @@ pkg_setup() {
 }
 
 src_compile() {
-	local args="TARGET=linux26"
+	local args="TARGET=linux2628"
 
-	use pcre && args="${args} USE_PCRE=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
 
-	use kernel_linux && args="${args} USE_LINUX_SPLICE=1"
-	use kernel_linux && args="${args} USE_LINUX_TPROXY=1"
+	if use crypt; then
+		args="${args} USE_LIBCRYPT=1"
+	else
+		args="${args} USE_LIBCRYPT="
+	fi
 
 	# For now, until the strict-aliasing breakage will be fixed
-	append-cflags -fno-strict-aliasing
+#	append-cflags -fno-strict-aliasing
 
 	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args} || die
 }
 
 src_install() {
 	dobin haproxy || die
-	newinitd "${FILESDIR}/haproxy.initd-r1" haproxy || die
+
+	newinitd "${FILESDIR}/haproxy.initd-r2" haproxy || die
 
 	# Don't install useless files
 	rm examples/build.cfg doc/*gpl.txt