summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Hajdan <phajdan.jr@gentoo.org>2010-08-07 17:55:09 +0000
committerPaweł Hajdan <phajdan.jr@gentoo.org>2010-08-07 17:55:09 +0000
commita3e6a6ecaa8cb8d681c3a42e2c7cdca6ed925284 (patch)
treea318e66d51f0e01b4574f72f272c3e3513b72882
parentalpha/ia64/sh/sparc stable wrt #320247 (diff)
downloadgentoo-2-a3e6a6ecaa8cb8d681c3a42e2c7cdca6ed925284.tar.gz
gentoo-2-a3e6a6ecaa8cb8d681c3a42e2c7cdca6ed925284.tar.bz2
gentoo-2-a3e6a6ecaa8cb8d681c3a42e2c7cdca6ed925284.zip
x86 stable wrt security bug #301828
(Portage version: 2.1.8.3/cvs/Linux i686)
-rw-r--r--net-proxy/squid/ChangeLog6
-rw-r--r--net-proxy/squid/squid-2.7.9.ebuild4
-rw-r--r--net-proxy/squid/squid-3.1.6.ebuild4
3 files changed, 9 insertions, 5 deletions
diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index 93118ed973d1..d75d7a16d1e4 100644
--- a/net-proxy/squid/ChangeLog
+++ b/net-proxy/squid/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-proxy/squid
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.299 2010/08/07 06:37:27 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.300 2010/08/07 17:55:09 phajdan.jr Exp $
+
+ 07 Aug 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> squid-2.7.9.ebuild,
+ squid-3.1.6.ebuild:
+ x86 stable wrt security bug #301828
07 Aug 2010; Alin Năstac <mrness@gentoo.org> squid-3.1.6.ebuild:
Add sys-apps/ed DEPEND (#311927).
diff --git a/net-proxy/squid/squid-2.7.9.ebuild b/net-proxy/squid/squid-2.7.9.ebuild
index 6e87327e5a8b..78ee60aa1294 100644
--- a/net-proxy/squid/squid-2.7.9.ebuild
+++ b/net-proxy/squid/squid-2.7.9.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.7.9.ebuild,v 1.1 2010/08/07 06:18:01 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.7.9.ebuild,v 1.2 2010/08/07 17:55:09 phajdan.jr Exp $
EAPI="2"
@@ -19,7 +19,7 @@ SRC_URI="http://www.squid-cache.org/Versions/v${S_PMV}/${S_PV}/${S_PP}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
IUSE="caps pam ldap samba sasl kerberos nis ssl snmp selinux logrotate \
mysql postgres sqlite \
zero-penalty-hit \
diff --git a/net-proxy/squid/squid-3.1.6.ebuild b/net-proxy/squid/squid-3.1.6.ebuild
index 1d3fac6a5564..18261a81e1b4 100644
--- a/net-proxy/squid/squid-3.1.6.ebuild
+++ b/net-proxy/squid/squid-3.1.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.1.6.ebuild,v 1.2 2010/08/07 06:37:28 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.1.6.ebuild,v 1.3 2010/08/07 17:55:09 phajdan.jr Exp $
EAPI="2"
@@ -12,7 +12,7 @@ SRC_URI="http://www.squid-cache.org/Versions/v3/3.1/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \
ecap icap-client \
mysql postgres sqlite \