summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2011-08-31 09:37:47 +0000
committerLars Wendler <polynomial-c@gentoo.org>2011-08-31 09:37:47 +0000
commitce4276f79387cdf57a3242fa0373a54f3572d64b (patch)
tree43e3acafa52eb0543a3cff97867028c388e0c9e6 /www-client
parentSecurity bump (diff)
downloadgentoo-2-ce4276f79387cdf57a3242fa0373a54f3572d64b.tar.gz
gentoo-2-ce4276f79387cdf57a3242fa0373a54f3572d64b.tar.bz2
gentoo-2-ce4276f79387cdf57a3242fa0373a54f3572d64b.zip
Security bump
(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)
Diffstat (limited to 'www-client')
-rw-r--r--www-client/icecat/ChangeLog8
-rw-r--r--www-client/icecat/icecat-3.6.16-r4.ebuild (renamed from www-client/icecat/icecat-3.6.16-r2.ebuild)15
2 files changed, 17 insertions, 6 deletions
diff --git a/www-client/icecat/ChangeLog b/www-client/icecat/ChangeLog
index a4f5106d8e47..6303bdf03dec 100644
--- a/www-client/icecat/ChangeLog
+++ b/www-client/icecat/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for www-client/icecat
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/ChangeLog,v 1.99 2011/08/29 21:37:22 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/ChangeLog,v 1.100 2011/08/31 09:37:47 polynomial-c Exp $
+
+*icecat-3.6.16-r4 (31 Aug 2011)
+
+ 31 Aug 2011; Lars Wendler <polynomial-c@gentoo.org> -icecat-3.6.16-r2.ebuild,
+ +icecat-3.6.16-r4.ebuild:
+ Security bump. Removed old.
29 Aug 2011; Markos Chandras <hwoarang@gentoo.org> icecat-3.6.16-r3.ebuild:
Stable on amd64 wrt bug #380913
diff --git a/www-client/icecat/icecat-3.6.16-r2.ebuild b/www-client/icecat/icecat-3.6.16-r4.ebuild
index e1f8096957b3..258f35827d26 100644
--- a/www-client/icecat/icecat-3.6.16-r2.ebuild
+++ b/www-client/icecat/icecat-3.6.16-r4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/icecat-3.6.16-r2.ebuild,v 1.5 2011/08/23 19:32:15 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/icecat-3.6.16-r4.ebuild,v 1.1 2011/08/31 09:37:47 polynomial-c Exp $
EAPI="3"
WANT_AUTOCONF="2.1"
@@ -19,7 +19,7 @@ MAJ_PV="${PV/_*/}" # Without the _rc and _beta stuff
DESKTOP_PV="3.6"
MY_PV="${PV/_rc/rc}" # Handle beta for SRC_URI
#XUL_PV="${MAJ_XUL_PV}${MAJ_PV/${DESKTOP_PV}/}" # Major + Minor version no.s
-XUL_PV="${MAJ_XUL_PV}.18"
+XUL_PV="${MAJ_XUL_PV}.21"
FIREFOX_PN="firefox"
FIREFOX_P="${FIREFOX_PN}-${PV}"
PATCH="${FIREFOX_PN}-3.6-patches-0.4"
@@ -35,7 +35,9 @@ IUSE="+alsa +ipc gnome java libnotify system-sqlite wifi"
SRC_URI="mirror://gnu/gnuzilla/${MY_PV}/${PN}-${MY_PV}.tar.bz2
http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2
http://dev.gentoo.org/~polynomial-c/mozilla/ff3617.diff.xz
- http://dev.gentoo.org/~polynomial-c/mozilla/ff3618.diff.xz"
+ http://dev.gentoo.org/~polynomial-c/mozilla/ff3618.diff.xz
+ http://dev.gentoo.org/~polynomial-c/mozilla/ff3620.diff.xz
+ http://dev.gentoo.org/~polynomial-c/mozilla/ff3621.diff.xz"
LANGPACK_URI="http://gnuzilla.gnu.org/download/langpacks/${MY_PV}"
for X in ${LANGS} ; do
@@ -127,8 +129,11 @@ src_unpack() {
}
src_prepare() {
- # Make this a 3.6.18 version
- epatch "${DISTDIR}"/ff3617.diff.xz "${DISTDIR}"/ff3618.diff.xz
+ # Make this a 3.6.21 version
+ epatch "${DISTDIR}"/ff3617.diff.xz \
+ "${DISTDIR}"/ff3618.diff.xz \
+ "${DISTDIR}"/ff3620.diff.xz \
+ "${DISTDIR}"/ff3621.diff.xz
epatch "${FILESDIR}"/${PN}-3.6.16-curl7217-includes-fix.patch