summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Ruppert <idl0r@gentoo.org>2013-06-29 16:33:26 +0000
committerChristian Ruppert <idl0r@gentoo.org>2013-06-29 16:33:26 +0000
commit37d02c895a09eb114afe6a34fda1c746340e9334 (patch)
tree50328ced99358bc36678dacb656f1e746ef2c35e /net-proxy
parentStable for sparc, wrt bug #473338 (diff)
downloadgentoo-2-37d02c895a09eb114afe6a34fda1c746340e9334.tar.gz
gentoo-2-37d02c895a09eb114afe6a34fda1c746340e9334.tar.bz2
gentoo-2-37d02c895a09eb114afe6a34fda1c746340e9334.zip
Version bumps, cleanup. Fixes CVE-2013-2175, bug 473674
(Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key B427ABC8)
Diffstat (limited to 'net-proxy')
-rw-r--r--net-proxy/haproxy/ChangeLog10
-rw-r--r--net-proxy/haproxy/haproxy-1.4.24.ebuild (renamed from net-proxy/haproxy/haproxy-1.4.22.ebuild)8
-rw-r--r--net-proxy/haproxy/haproxy-1.5_beta19.ebuild (renamed from net-proxy/haproxy/haproxy-1.5_beta18.ebuild)2
3 files changed, 14 insertions, 6 deletions
diff --git a/net-proxy/haproxy/ChangeLog b/net-proxy/haproxy/ChangeLog
index 9610bfd93bb4..3ec976d10151 100644
--- a/net-proxy/haproxy/ChangeLog
+++ b/net-proxy/haproxy/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for net-proxy/haproxy
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v 1.80 2013/05/13 20:11:16 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v 1.81 2013/06/29 16:33:26 idl0r Exp $
+
+*haproxy-1.5_beta19 (29 Jun 2013)
+*haproxy-1.4.24 (29 Jun 2013)
+
+ 29 Jun 2013; Christian Ruppert <idl0r@gentoo.org> -haproxy-1.4.22.ebuild,
+ +haproxy-1.4.24.ebuild, -haproxy-1.5_beta18.ebuild,
+ +haproxy-1.5_beta19.ebuild:
+ Version bumps, cleanup. Fixes CVE-2013-2175, bug 473674
*haproxy-9999 (13 May 2013)
diff --git a/net-proxy/haproxy/haproxy-1.4.22.ebuild b/net-proxy/haproxy/haproxy-1.4.24.ebuild
index ba8682f01858..003e6bc10a48 100644
--- a/net-proxy/haproxy/haproxy-1.4.22.ebuild
+++ b/net-proxy/haproxy/haproxy-1.4.24.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.4.22.ebuild,v 1.5 2012/12/29 03:03:45 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.4.24.ebuild,v 1.1 2013/06/29 16:33:26 idl0r Exp $
-EAPI="4"
+EAPI="5"
inherit user versionator toolchain-funcs flag-o-matic
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="~amd64 ~ppc ~x86"
IUSE="+crypt examples +pcre vim-syntax"
DEPEND="pcre? ( dev-libs/libpcre )"
diff --git a/net-proxy/haproxy/haproxy-1.5_beta18.ebuild b/net-proxy/haproxy/haproxy-1.5_beta19.ebuild
index 94bf06fef83c..ab589adc5e0d 100644
--- a/net-proxy/haproxy/haproxy-1.5_beta18.ebuild
+++ b/net-proxy/haproxy/haproxy-1.5_beta19.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.5_beta18.ebuild,v 1.1 2013/04/04 19:06:24 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.5_beta19.ebuild,v 1.1 2013/06/29 16:33:26 idl0r Exp $
EAPI="4"