Security bump

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

3 files changed, 312 insertions, 16 deletions

diff --git a/www-client/icecat/ChangeLog b/www-client/icecat/ChangeLog
index 2e538f928fb8..16120bab51a5 100644
--- a/www-client/icecat/ChangeLog
+++ b/www-client/icecat/ChangeLog
@@ -1,6 +1,11 @@
 # 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.94 2011/07/31 14:48:36 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/ChangeLog,v 1.95 2011/08/17 20:51:08 polynomial-c Exp $
+
+*icecat-3.6.16-r3 (17 Aug 2011)
+
+  17 Aug 2011; Lars Wendler <polynomial-c@gentoo.org> +icecat-3.6.16-r3.ebuild:
+  Security bump.
 
   31 Jul 2011; Lars Wendler <polynomial-c@gentoo.org> icecat-5.0-r1.ebuild:
   Removed hardened condition from pgo build as pgo is now masked on hardened.
diff --git a/www-client/icecat/Manifest b/www-client/icecat/Manifest
index 6f62b6312491..bd6a50818aae 100644
--- a/www-client/icecat/Manifest
+++ b/www-client/icecat/Manifest
@@ -12,6 +12,7 @@ AUX icecat-5.0-curl7217-includes-fix.patch 986 RMD160 e065aff5df8229c17c7cf67e78
 AUX icon/icecat.desktop 245 RMD160 3cef06f5a0280d91ce56b3d1e29ac931c88b9cc2 SHA1 245a7edffd6d3a78f0d4f90269adbfa1076f467c SHA256 3797d3c1ceafe3951a8cd0c1c06520efabb4b38b6da1e6977b470a4b971ac909
 DIST ff3617.diff.xz 255324 RMD160 0bb953b177d1fcc1e9083fe6b9495e2294183aa2 SHA1 c9c6f00424339454d092da28f233ddbb2722d556 SHA256 3078f25fa2745cbe03ab6e5661a03580645e2b2a77e392b2d0f8633b532b33b2
 DIST ff3618.diff.xz 20160 RMD160 7ed6b8d143b01e3998d867a2789e3116b541b472 SHA1 4a754fb15a10e5399f50f5eaef7fc4c3ac506ddd SHA256 1b2346f9bfde56a342e73a2a0c3a4f29a9873ea0b18137a60fd978fd11b62176
+DIST ff3620.diff.xz 10564 RMD160 28be395a11c49377b2110858334f8b3f499f344a SHA1 74bcd3dd30780355d683f904b380d4b1444c8379 SHA256 66150e1ec8d7735d356d49909a6990468ab19f2bcff8d72fe6f5efe244dea328
 DIST firefox-3.6-patches-0.4.tar.bz2 5791 RMD160 17944b3605138c3b651b31fcad306a432b73b80c SHA1 4ddff9a613cc703b34667aab3aea993187405920 SHA256 39bbbe412f70b50e8870e11dbd3f9e74ed7cbeaa23ed47dea1ea6ff72f48e54f
 DIST firefox-4.0-patches-1.0.tar.bz2 16462 RMD160 46755eac7eb04eb19f79c93af3fd2016289a62a4 SHA1 270afe97a49bc507bc0d1d3159ec23e69e9ec40f SHA256 db5e993bf309c316ca370186c7866a7505cb37ecc729a3449bd0f6538aa2eda0
 DIST firefox-5.0-patches-0.6.tar.bz2 7632 RMD160 96d8417c4212d9cee70e78ae4e446931eb7c9f9e SHA1 7e641526b87a9185d0994de876b22f39fe33cbfb SHA256 dc43801ea5a8a126d2d79d8f2d15061b316f0eacb933a464ae700be633f607b1
@@ -242,24 +243,25 @@ DIST icecat-5.0-zu.xpi 237169 RMD160 8b51c6ff36ec1e15ac5def94dc6c55478939755b SH
 DIST icecat-5.0.tar.bz2 66222560 RMD160 72bc9a591b807f4c5d5a4bd23567beaeab69c03e SHA1 0b529b152d470a13879dec0f85e3d0908edce3f8 SHA256 aa0ad89c680676e460ad9cf9ee239773c830720ef8b6d567b0341d126264b86e
 EBUILD icecat-3.6.16-r1.ebuild 8933 RMD160 6bafa2fbb7108579d3ce8f061fa667727e36a9f7 SHA1 379f36c025e5489bb177644f4b47340207610f27 SHA256 91bf9b4f6c1402a2563f84593ba3eb01d989b2a70397e90e2cf26ac309db4e9c
 EBUILD icecat-3.6.16-r2.ebuild 9025 RMD160 95f64de8ebf256546f70fb14057b5693d6f431c8 SHA1 939caa0b1cc4e24ee567f41a2e0e67209f664f30 SHA256 654f15a3fc820386dd0c574b7e99202f278b1b1ca7babc17469e88dddd29f9cb
+EBUILD icecat-3.6.16-r3.ebuild 9121 RMD160 3be68fdcb31d400742d6fd28b1ded8610cd1fd56 SHA1 b4decdd2921c8670eeb4097fe335647c69e60ce7 SHA256 62f003d1ec1da7c6d8e237c0ac3ff75d296965ee03490c1f013aec0c1c5cc687
 EBUILD icecat-4.0.1-r1.ebuild 7672 RMD160 05048132b09d3f7d80f786741686560a1dab4f2e SHA1 a67060813179a2ed21432e862e589a6919586e1a SHA256 63b8bf39beba5b920fde5762582b98006feedf8f42b7ea2adab201b52d63d94f
 EBUILD icecat-5.0-r1.ebuild 9530 RMD160 ddc714f9237c564f1342a46c7a05a39a5980a33c SHA1 2cdc60d034f59e4355691fb59ed8f6de208504b0 SHA256 32d28c39d51d8ba3f3e4efaee89d5295fa169908988213294ca737c2a6b56046
-MISC ChangeLog 14024 RMD160 ff572e1ccacf0c7573e9753e156e0a705ba1a581 SHA1 968c91c69329e8f759abbd9a4f19a7fdd94428e4 SHA256 1dc07197a0b9025e9753760cd3bac7279a4d18ba136f82cc7790a88dfb7ba992
+MISC ChangeLog 14155 RMD160 6bcf9ec97c87e88a032b253c95a7321db8a7a47b SHA1 e1c83451e90288c621d7b67a516e9478fc551c89 SHA256 be5af229c76875e0141019a2e87d09f22dca91715c5570a4e1396d12ea56ed6b
 MISC metadata.xml 974 RMD160 7532aab7831e78fc42ee499cab9f49d34ed159a3 SHA1 01cbca62b8574e05a11761a2bbe9756ead3f6f91 SHA256 7d43db1eab925b5a2499aac3ffda6b7e0d2933db44447760377119c30e7d8211
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJONWtKAAoJEPiazRVxLXTFREUP/jCFQnsNp+WGL14uQLQrHfP1
-6eHXdzdqQ6wuNBOVz2Kw1WtiqKORkR5mUgQ7O0Kr0SgMVgfZNeB0seiD2V/PslWM
-cxb3bSBC9sDT17gmKlqqGZjmxvJAYPLzh4onIRQksXNzFMPdyhu6gVi2bMn65gk1
-VGKneIAkzaEUEmfrTw1PQdryz0q0sbJJtTZr4gRFrd+g+TzdJbcYjiw054Ocw+JA
-WADoj4Qjmi2pGVAflTu9GxoD9Bazl5Sm1a8JUjT5t+ay9xywNgTzCsr9fPfCsMHR
-5XIAmL9inRvRPsO3FwJx2eopl5wjRQTSvUQ+HZ5XHwzTvquIvfjWwepUUtB96Tr0
-sQ8ZRfZqZCMQ264pkWl0uybEU0CCT3Wrn8GuN8y8BhRAgWZg8J7ZkheQkKjJfsC8
-jP+d+jE1ntpMXgFVdD9CSFFZ1Qg1pMsnHN28+3r7gaUDbTE+To4hFN9+YEtKxd15
-4TTFWNV8rFNdCFWCxUnfPenvIAc0fmZ6wbXvxwPLZ6C6tqqUgd6UoBjKLgDcH59n
-bga3B3asczvnj/4fOgZ4sOTPwMpPG+CCAUC6NZkrEaVU2VK77dPlnY087BQzzwEl
-fphy+NXxbmz811YXQFfFvOWy+Nuiz9V8oZlfPGYU5aOUbcw6v2DCepGUtZvAuW2h
-+l+Uk4UVLYl0VWyrFSRl
-=M8Uw
+iQIcBAEBCgAGBQJOTCnCAAoJEPiazRVxLXTFqgEP+wSs7P6J8hjx6LToKU/gqrsJ
+NlqzIrIkjNwb/egja2hPomiIx5SWli0zBmr4/nMJrMrBxK0EjAYlEhU513C8SqVY
+e0EQeThEDNY0SoWiURrlPz6SHxEzsJ4Ix3maJ4zysBvZvEAjTuXjAhwJqCf/AOEq
+G5n9NAHSo07/BjAZUkXGhBNhNhxBPO0pEzSLjYBAWYP+xvaFsrBk1mesBIjTa6ll
+EadTzMX3L26ml7U8vFnPIE/abA0E5UGLBJoZ92K5BF+yeW1LF3n81XLabcz9+hoK
+G+3B6WqmXvq5s6jhj1jt/kASnWigDq484qVKCJD334+lThSt3EhE9QIVFqlMnmXA
+eGUJK5m8IAlCr+RNO7P1tlUbffJflceZBiRI7HdyGKzl9aC0UeobfBwbufPzohnH
+R0WlDQkGVIqUgLxjvx6kqMOcEm7DNiEjXxVvdFgcCRaFCmsgzd4TrCHtiEcU2PwM
+pPyjBNXpBCbp82k/HLFK1nPOGOt6hTJcFTDbImwwBEF1RcixuTxWGGyA00x2YE2y
+TT3LZArTMR9QTpdt0M2/59Hs3ResmfSu34VsSl6RYdTWlsj3nE29hG/i82yb+Ojg
+zPqzFddu8heKhYUylMzCE+2pMDca3ljDVQGmjufKiM3JiHTUhxnNqKhUiTnAz2eD
+1TIkRBCOsFr0hSVQI/9h
+=Pv7o
 -----END PGP SIGNATURE-----
diff --git a/www-client/icecat/icecat-3.6.16-r3.ebuild b/www-client/icecat/icecat-3.6.16-r3.ebuild
new file mode 100644
index 000000000000..de1863a0fa2b
--- /dev/null
+++ b/www-client/icecat/icecat-3.6.16-r3.ebuild
@@ -0,0 +1,289 @@
+# 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-r3.ebuild,v 1.1 2011/08/17 20:51:08 polynomial-c Exp $
+EAPI="3"
+WANT_AUTOCONF="2.1"
+
+inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib pax-utils fdo-mime autotools mozextension java-pkg-opt-2 python
+
+LANGS="af ar as ast be bg bn-BD bn-IN ca cs cy da de el en en-GB en-US eo es-AR
+es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gl gu-IN he hi-IN hr hu id is it
+ja ka kk kn ko ku lt lv mk ml mr nb-NO nl nn-NO oc or pa-IN pl pt-BR pt-PT rm ro
+ru si sk sl sq sr sv-SE ta ta-LK te th tr uk vi zh-CN zh-TW"
+# Malformed install.rdf: ta-LK
+
+NOSHORTLANGS="en-GB es-AR es-CL es-MX pt-BR zh-CN zh-TW"
+
+MAJ_XUL_PV="1.9.2"
+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}.20"
+FIREFOX_PN="firefox"
+FIREFOX_P="${FIREFOX_PN}-${PV}"
+PATCH="${FIREFOX_PN}-3.6-patches-0.4"
+
+DESCRIPTION="GNU project's edition of Mozilla Firefox"
+HOMEPAGE="http://www.gnu.org/software/gnuzilla/"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+SLOT="0"
+LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
+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/ff3620.diff.xz"
+LANGPACK_URI="http://gnuzilla.gnu.org/download/langpacks/${MY_PV}"
+
+for X in ${LANGS} ; do
+	if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then
+		SRC_URI="${SRC_URI}
+			linguas_${X/-/_}? ( ${LANGPACK_URI}/${X}.xpi -> ${P}-${X}.xpi )"
+	fi
+	IUSE="${IUSE} linguas_${X/-/_}"
+	# english is handled internally
+	if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then
+		if [ "${X}" != "en-US" ]; then
+			SRC_URI="${SRC_URI}
+				linguas_${X%%-*}? ( ${LANGPACK_URI}/${X}.xpi -> ${P}-${X}.xpi )"
+		fi
+		IUSE="${IUSE} linguas_${X%%-*}"
+	fi
+done
+
+RDEPEND="
+	>=sys-devel/binutils-2.16.1
+	>=dev-libs/nss-3.12.8
+	>=dev-libs/nspr-4.8.6
+	>=app-text/hunspell-1.2
+	system-sqlite? ( >=dev-db/sqlite-3.7.1[fts3,secure-delete] )
+	alsa? ( media-libs/alsa-lib )
+	>=x11-libs/cairo-1.8.8[X]
+	gnome? ( >=gnome-base/gnome-vfs-2.16.3
+		>=gnome-base/libgnomeui-2.16.1
+		>=gnome-base/gconf-2.16.0
+		>=gnome-base/libgnome-2.16.0 )
+	wifi? ( net-wireless/wireless-tools )
+	libnotify? ( >=x11-libs/libnotify-0.4 )
+	~net-libs/xulrunner-${XUL_PV}[ipc=,java=,wifi=,libnotify=,system-sqlite=]"
+
+DEPEND="${RDEPEND}
+	java? ( >=virtual/jdk-1.4 )
+	=dev-lang/python-2*[threads]
+	dev-util/pkgconfig"
+
+RDEPEND="${RDEPEND} java? ( >=virtual/jre-1.4 )"
+
+# This is a copy of the launcher program installed as part of xulrunner, so has
+# already been stripped. Bug #332071 for details.
+QA_PRESTRIPPED="usr/$(get_libdir)/${PN}/${PN}"
+
+linguas() {
+	local LANG SLANG
+	for LANG in ${LINGUAS}; do
+		if has ${LANG} en en_US; then
+			has en ${linguas} || linguas="${linguas:+"${linguas} "}en"
+			continue
+		elif has ${LANG} ${LANGS//-/_}; then
+			has ${LANG//_/-} ${linguas} || linguas="${linguas:+"${linguas} "}${LANG//_/-}"
+			continue
+		elif [[ " ${LANGS} " == *" ${LANG}-"* ]]; then
+			for X in ${LANGS}; do
+				if [[ "${X}" == "${LANG}-"* ]] && \
+					[[ " ${NOSHORTLANGS} " != *" ${X} "* ]]; then
+					has ${X} ${linguas} || linguas="${linguas:+"${linguas} "}${X}"
+					continue 2
+				fi
+			done
+		fi
+		ewarn "Sorry, but ${PN} does not support the ${LANG} LINGUA"
+	done
+}
+
+pkg_setup() {
+	# Ensure we always build with C locale.
+	export LANG="C"
+	export LC_ALL="C"
+	export LC_MESSAGES="C"
+	export LC_CTYPE="C"
+
+	java-pkg-opt-2_pkg_setup
+
+	python_set_active_version 2
+}
+
+src_unpack() {
+	#xz -dc -- "${DISTDIR}/icecat-${MY_PV}.tar.xz" | tar xof - || die "failed to unpack"
+	unpack ${A} #${PATCH}.tar.bz2
+
+	linguas
+	for X in ${linguas}; do
+		# FIXME: Add support for unpacking xpis to portage
+		[[ ${X} != "en" ]] && xpi_unpack "${P}-${X}.xpi"
+	done
+}
+
+src_prepare() {
+	# Make this a 3.6.17 version
+	epatch "${DISTDIR}"/ff3617.diff.xz \
+		"${DISTDIR}"/ff3618.diff.xz \
+		"${DISTDIR}"/ff3620.diff.xz
+
+	epatch "${FILESDIR}"/${PN}-3.6.16-curl7217-includes-fix.patch
+
+	# Integrate rebranding
+	sed -i "s|/firefox|/icecat|" \
+		"${WORKDIR}"/001-firefox_gentoo_install_dirs.patch
+
+	# Fix preferences location
+	sed -i 's|defaults/pref/|defaults/preferences/|' browser/installer/packages-static || die "sed failed"
+
+	# Apply our patches
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}"
+
+	# Fix rebranding
+	sed -i 's|\$(DIST)/bin/firefox|\$(DIST)/bin/icecat|' browser/app/Makefile.in
+
+	eautoreconf
+
+	cd js/src
+	eautoreconf
+}
+
+src_configure() {
+	# We will build our own .mozconfig
+	rm "${S}"/.mozconfig
+
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	MEXTENSIONS="default"
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	mozconfig_config
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Specific settings for icecat
+	echo "export MOZ_PHOENIX=1" >> "${S}"/.mozconfig
+	echo "mk_add_options MOZ_PHOENIX=1" "${S}"/.mozconfig
+	mozconfig_annotate '' --with-branding=browser/branding/unofficial
+	mozconfig_annotate '' --disable-official-branding
+	mozconfig_annotate '' --with-user-appdir=.icecat
+
+	mozconfig_annotate '' --enable-crypto
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+	mozconfig_annotate '' --enable-application=browser
+	mozconfig_annotate '' --disable-mailnews
+	mozconfig_annotate 'broken' --disable-crashreporter
+	mozconfig_annotate '' --enable-image-encoder=all
+	mozconfig_annotate '' --enable-canvas
+	mozconfig_annotate 'gtk' --enable-default-toolkit=cairo-gtk2
+	# Bug 60668: Galeon doesn't build without oji enabled, so enable it
+	# regardless of java setting.
+	mozconfig_annotate '' --enable-oji --enable-mathml
+	mozconfig_annotate 'places' --enable-storage --enable-places
+	mozconfig_annotate '' --enable-safe-browsing
+
+	# Build mozdevelop permately
+	mozconfig_annotate ''  --enable-jsd --enable-xpctools
+
+	# System-wide install specs
+	mozconfig_annotate '' --disable-installer
+	mozconfig_annotate '' --disable-updater
+	mozconfig_annotate '' --disable-strip
+	mozconfig_annotate '' --disable-install-strip
+
+	# Use system libraries
+	mozconfig_annotate '' --enable-system-cairo
+	mozconfig_annotate '' --enable-system-hunspell
+	mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${EPREFIX}"/usr
+	mozconfig_annotate '' --with-system-nss --with-nss-prefix="${EPREFIX}"/usr
+	mozconfig_annotate '' --with-system-bz2
+	mozconfig_annotate '' --with-system-libxul
+	mozconfig_annotate '' --with-libxul-sdk="${EPREFIX}"/usr/$(get_libdir)/xulrunner-devel-${MAJ_XUL_PV}
+
+	mozconfig_use_enable gnome gnomevfs
+	mozconfig_use_enable gnome gnomeui
+	mozconfig_use_enable ipc # +ipc, upstream default
+	mozconfig_use_enable libnotify
+	mozconfig_use_enable java javaxpcom
+	mozconfig_use_enable wifi necko-wifi
+	mozconfig_use_enable alsa ogg
+	mozconfig_use_enable alsa wave
+	mozconfig_use_enable system-sqlite
+
+	# Other browser-specific settings
+	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+
+	# Finalize and report settings
+	mozconfig_final
+
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		append-cxxflags -fno-stack-protector
+	fi
+
+	####################################
+	#
+	#  Configure and build
+	#
+	####################################
+
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" PYTHON="$(PYTHON)" econf
+}
+
+src_compile() {
+	# Should the build use multiprocessing? Not enabled by default, as it tends to break
+	[ "${WANT_MP}" = "true" ] && jobs=${MAKEOPTS} || jobs="-j1"
+	emake ${jobs} || die
+}
+
+src_install() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	linguas
+	for X in ${linguas}; do
+		[[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${P}-${X}"
+	done
+
+	# Install icon and .desktop for menu entry
+	newicon "${S}"/browser/branding/unofficial/default48.png icecat-icon.png
+	newmenu "${FILESDIR}"/icon/icecat.desktop ${PN}-${DESKTOP_PV}.desktop
+
+	# Add StartupNotify=true bug 237317
+	if use startup-notification ; then
+		echo "StartupNotify=true" >> "${ED}"/usr/share/applications/${PN}-${DESKTOP_PV}.desktop
+	fi
+
+	pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/${PN}
+
+	# Enable very specific settings not inherited from xulrunner
+	cp "${FILESDIR}"/firefox-default-prefs.js \
+		"${ED}/${MOZILLA_FIVE_HOME}/defaults/preferences/all-gentoo.js" || \
+		die "failed to cp icecat-default-prefs.js"
+	# Plugins dir
+	dosym ../nsbrowser/plugins "${MOZILLA_FIVE_HOME}"/plugins \
+		|| die "failed to symlink"
+}
+
+pkg_postinst() {
+	ewarn "All the packages built against ${PN} won't compile,"
+	ewarn "any package that fails to build warrants a bug report."
+	elog
+
+	# Update mimedb for the new .desktop file
+	fdo-mime_desktop_database_update
+}