summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Ruppert <idl0r@gentoo.org>2012-12-29 03:01:49 +0000
committerChristian Ruppert <idl0r@gentoo.org>2012-12-29 03:01:49 +0000
commit4e9134cffdb1024cb3eddf66e409a2358881f071 (patch)
tree603c36fa5cefbaa5c02c1d2733da22da5f750054 /net-proxy
parentRevbump for last change. (diff)
downloadgentoo-2-4e9134cffdb1024cb3eddf66e409a2358881f071.tar.gz
gentoo-2-4e9134cffdb1024cb3eddf66e409a2358881f071.tar.bz2
gentoo-2-4e9134cffdb1024cb3eddf66e409a2358881f071.zip
Version bump
(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key B427ABC8)
Diffstat (limited to 'net-proxy')
-rw-r--r--net-proxy/haproxy/ChangeLog8
-rw-r--r--net-proxy/haproxy/files/haproxy-1.5_beta16-stats.patch13
-rw-r--r--net-proxy/haproxy/haproxy-1.5_beta17.ebuild (renamed from net-proxy/haproxy/haproxy-1.5_beta16.ebuild)12
3 files changed, 11 insertions, 22 deletions
diff --git a/net-proxy/haproxy/ChangeLog b/net-proxy/haproxy/ChangeLog
index be755eb8148b..84b7c614743a 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.72 2012/12/26 00:57:51 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v 1.73 2012/12/29 03:01:47 idl0r Exp $
+
+*haproxy-1.5_beta17 (29 Dec 2012)
+
+ 29 Dec 2012; Christian Ruppert <idl0r@gentoo.org> -haproxy-1.5_beta16.ebuild,
+ +haproxy-1.5_beta17.ebuild, -files/haproxy-1.5_beta16-stats.patch:
+ Version bump
*haproxy-1.5_beta16 (26 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
deleted file mode 100644
index dfe7b6e9da30..000000000000
--- a/net-proxy/haproxy/files/haproxy-1.5_beta16-stats.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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_beta17.ebuild
index be9f6677f799..b0616e6c0c4f 100644
--- a/net-proxy/haproxy/haproxy-1.5_beta16.ebuild
+++ b/net-proxy/haproxy/haproxy-1.5_beta17.ebuild
@@ -1,6 +1,6 @@
# 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.5_beta17.ebuild,v 1.1 2012/12/29 03:01:47 idl0r Exp $
EAPI="4"
@@ -24,13 +24,9 @@ RDEPEND="${DEPEND}"
S="${WORKDIR}/${MY_P}"
-#pkg_setup() {
-# enewgroup haproxy
-# enewuser haproxy -1 -1 -1 haproxy
-##}
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-stats.patch"
+pkg_setup() {
+ enewgroup haproxy
+ enewuser haproxy -1 -1 -1 haproxy
}
src_compile() {