Fix system sqlite, ensure we use secure-delete of sqlite

Package-Manager: portage-2.1.7.17/cvs/Linux x86_64

4 files changed, 19 insertions, 282 deletions

diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog
index 1fac36091423..fc761f8e2b20 100644
--- a/www-client/mozilla-firefox/ChangeLog
+++ b/www-client/mozilla-firefox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/mozilla-firefox
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.592 2010/01/29 15:01:08 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.593 2010/02/12 20:51:53 anarchy Exp $
+
+*mozilla-firefox-3.6-r2 (12 Feb 2010)
+
+  12 Feb 2010; <anarchy@gentoo.org> -mozilla-firefox-3.6.ebuild,
+  -mozilla-firefox-3.6-r1.ebuild, +mozilla-firefox-3.6-r2.ebuild:
+  Fix system sqlite, ensure we use secure-delete of sqlite
 
 *mozilla-firefox-3.6-r1 (29 Jan 2010)
 
diff --git a/www-client/mozilla-firefox/Manifest b/www-client/mozilla-firefox/Manifest
index b47192bd91c6..3d4ca1913042 100644
--- a/www-client/mozilla-firefox/Manifest
+++ b/www-client/mozilla-firefox/Manifest
@@ -258,7 +258,6 @@ DIST mozilla-firefox-3.6-nn-NO.xpi 125112 RMD160 5fbf398699b43a514c2f82d051ffe71
 DIST mozilla-firefox-3.6-oc.xpi 108302 RMD160 fb83b8741a42d40014e71c4d5b1a06645fb6aafa SHA1 78450a862d7236cc89cecb35c6a24d86ffc90c3d SHA256 f81c861ede0d0d1523b5751e2b2da9faf6ced2bb960008f298e22b597998ed33
 DIST mozilla-firefox-3.6-or.xpi 142206 RMD160 ac7e899b9cd713c948a053436b4d6d1d8c420cbd SHA1 9eca326481a8db8ffdd9e2fd8c755b937e67ee36 SHA256 f0baf63c33fca905a6cdacb77d411749d20cc45b6129cfc6b07fb7e043713a6c
 DIST mozilla-firefox-3.6-pa-IN.xpi 141696 RMD160 d6e9248bd36c35bbe281562b47d8a84dcd2105dd SHA1 93d877296ec902bcc0de0b995fceb320f4a518df SHA256 b18594e488bb3b347f6472e71e73d91b1e90be527458c1ffe5934435daa5c045
-DIST mozilla-firefox-3.6-patches-0.5.tar.bz2 4867 RMD160 d765123119e78a21ec797433fc1b6a3c8eafad23 SHA1 59f147848626220190f680cdd93dcac064a0417e SHA256 acbddbb8ba259aa37323901f97b467ef8261c26d334a68c250164666a06af4fd
 DIST mozilla-firefox-3.6-patches-0.6.tar.bz2 5201 RMD160 d721f5b7070b978e61b27c1d138dd8f464cfa9a4 SHA1 00e9e6955fb405e462598e500f48b937d5085b41 SHA256 3ccc057da61bf6d174fe0e3fcb1f213c27813d78b09cc8526a86d95b043a5c64
 DIST mozilla-firefox-3.6-pl.xpi 130641 RMD160 cc10e25eac0f106a89132ff9718ee6d2fd73df0c SHA1 7d60c8383707eb4add111d1293bc24072dbd29a0 SHA256 0fd8b0e13eb1fb6426406496d00d635a8eff3c716587d88f7872475bd3058c56
 DIST mozilla-firefox-3.6-pt-BR.xpi 124959 RMD160 c54c3dbec25b70d12480cab8e0c0ed3744454028 SHA1 6f141ced69af431498d7d360ed4a898982b85224 SHA256 a155be8d97db70065ab6444e49ed278e45a87ed15e42209d9e930b2d01ecff1b
@@ -284,7 +283,6 @@ DIST mozilla-firefox-3.6-zh-TW.xpi 128260 RMD160 d80b9aad4a77e21e9a4b9324a2ff659
 EBUILD mozilla-firefox-2.0.0.19.ebuild 10225 RMD160 0012156030749abb2725f15cebb675ec3f36dc38 SHA1 f22da33a29436b90976cd425010d50b59c7d6aba SHA256 6570c61d01f56fce139572d53b57a46751aea917783c2350f1420b39a197bc1c
 EBUILD mozilla-firefox-3.5.6.ebuild 8549 RMD160 26b3de18f2ab361a6136a891c6861f2ccded746f SHA1 01a37203753043440d20a40f4dbae898ce1be371 SHA256 7e66f2385d442fdafefd81d68bbadcd05197225fc041e5a4d8c4b2239c93e2be
 EBUILD mozilla-firefox-3.5.7.ebuild 8557 RMD160 ad616c531742c4dce14e82eaf47309d9fe6f6ff0 SHA1 ef4cb762cb9bf259d0cbf1249c33d6e6e2838773 SHA256 ff13a0fe4a84f9a1c2982b73ebd32ab8b9dfd5aa2f80fb3aa2c1a49b30298cfd
-EBUILD mozilla-firefox-3.6-r1.ebuild 8372 RMD160 0260b27529ada0313acd33cecea89c063bf62dd4 SHA1 0c8c4c3bfe986016bca670aa22066afd27c87a98 SHA256 a9751a46a7b2b3debe9eed30bde1945b37a1bc8d67864660ee072beef2d2ea3f
-EBUILD mozilla-firefox-3.6.ebuild 8325 RMD160 15def1cf0a4925cf4bd8bcf69a63277bae2a116a SHA1 c957f1fbe129c74947e1a3dd8d6613de31dc4bfc SHA256 6fa3298b4dce21e601b3a591e6bc8848f87e178f63204d985b53eaef85780f6e
-MISC ChangeLog 110601 RMD160 5eb4fa7dafa04ca3cef62a48a9d15332681ae9dc SHA1 5136c89a1e001c8b6cdc8b662f01e97b4e0f936e SHA256 3e6eca07683878c79da5ffdc185e1918a1a7c2fc622f0645a48bc43e376f55b1
+EBUILD mozilla-firefox-3.6-r2.ebuild 8446 RMD160 75534b7eff469c92fc9954be7c0d874e4842debe SHA1 d38bf55c3349081279bfe656e6d06f8210ec6afa SHA256 ef6eb2f6992e70209f40c4e5f176f2016069d915d7fb2a0d52053763e7dd3269
+MISC ChangeLog 110831 RMD160 53a1dd29c81974fb09dbbd2b7235c99b5acc800f SHA1 dc64a1baeb584f1f13f7489ad26e236277e75a15 SHA256 1c73c2a4a44f059c5e148fe020cdefbabdb94a3031e6c09f7c6dc8a6be47c9c0
 MISC metadata.xml 860 RMD160 9dc7089f75140dda59a5ee9eaff41c35febd25bc SHA1 df2fae94e9f4a9fba7399aea0bfe0a38a1d01e89 SHA256 783b95078850c3b150069dcdead96113fe1a44036e61cae9d035f15c3bd1660e
diff --git a/www-client/mozilla-firefox/mozilla-firefox-3.6-r1.ebuild b/www-client/mozilla-firefox/mozilla-firefox-3.6-r2.ebuild
index 7028966a3c87..7dc2e69c891f 100644
--- a/www-client/mozilla-firefox/mozilla-firefox-3.6-r1.ebuild
+++ b/www-client/mozilla-firefox/mozilla-firefox-3.6-r2.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/www-client/mozilla-firefox/mozilla-firefox-3.6-r1.ebuild,v 1.1 2010/01/29 15:01:08 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-3.6-r2.ebuild,v 1.1 2010/02/12 20:51:53 anarchy Exp $
 EAPI="2"
 WANT_AUTOCONF="2.1"
 
@@ -52,7 +52,7 @@ RDEPEND="
 	>=dev-libs/nss-3.12.4
 	>=dev-libs/nspr-4.8
 	>=app-text/hunspell-1.2
-	>=dev-db/sqlite-3.6.20-r1[fts3]
+	>=dev-db/sqlite-3.6.22-r2[fts3,secure-delete]
 	alsa? ( media-libs/alsa-lib )
 	>=x11-libs/cairo-1.8.8[X]
 	x11-libs/pango[X]
@@ -93,6 +93,12 @@ linguas() {
 }
 
 pkg_setup() {
+	# Ensure we always build with C locale.
+	export LANG="C"
+	export LC_ALL="C"
+	export LC_MESSAGES="C"
+	export LC_CTYPE="C"
+
 	if ! use bindist ; then
 		einfo
 		elog "You are enabling official branding. You may not redistribute this build"
@@ -127,9 +133,6 @@ src_prepare() {
 
 	cd js/src
 	eautoreconf
-
-	# We need to re-patch this because autoreconf overwrites it
-	epatch "${FILESDIR}/000_flex-configure-LANG.patch"
 }
 
 src_configure() {
@@ -160,6 +163,7 @@ src_configure() {
 	mozconfig_annotate '' --enable-oji --enable-mathml
 	mozconfig_annotate 'places' --enable-storage --enable-places
 	mozconfig_annotate '' --enable-safe-browsing
+	mozconfig_annotate 'sqlite' --enable-system-sqlite
 
 	# Build mozdevelop permately
 	mozconfig_annotate ''  --enable-jsd --enable-xpctools
@@ -238,7 +242,7 @@ src_install() {
 		newicon "${S}"/browser/base/branding/icon48.png firefox-icon-unbranded.png
 		newmenu "${FILESDIR}"/icon/mozilla-firefox-1.5-unbranded.desktop \
 			${PN}-${DESKTOP_PV}.desktop
-		sed -i -e "s:Bon Echo:Shiretoko:" \
+		sed -i -e "s:Bon Echo:Namoroka:" \
 			"${D}"/usr/share/applications/${PN}-${DESKTOP_PV}.desktop || die "sed failed!"
 	fi
 
diff --git a/www-client/mozilla-firefox/mozilla-firefox-3.6.ebuild b/www-client/mozilla-firefox/mozilla-firefox-3.6.ebuild
deleted file mode 100644
index 0381234cf50b..000000000000
--- a/www-client/mozilla-firefox/mozilla-firefox-3.6.ebuild
+++ /dev/null
@@ -1,271 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-3.6.ebuild,v 1.2 2010/01/22 13:45:32 anarchy Exp $
-EAPI="2"
-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
-
-LANGS="af ar as 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-LK ta te th tr uk vi zh-CN zh-TW"
-NOSHORTLANGS="en-GB es-AR es-CL es-MX pt-BR zh-CN zh-TW"
-
-XUL_PV="1.9.2"
-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
-PATCH="${PN}-3.6-patches-0.5"
-
-DESCRIPTION="Firefox Web Browser"
-HOMEPAGE="http://www.mozilla.com/firefox"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-SLOT="0"
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="+alsa bindist java libnotify +networkmanager"
-
-REL_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases"
-SRC_URI="${REL_URI}/${MY_PV}/source/firefox-${MY_PV}.source.tar.bz2
-	http://dev.gentoo.org/~anarchy/dist/${PATCH}.tar.bz2"
-
-for X in ${LANGS} ; do
-	if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then
-		SRC_URI="${SRC_URI}
-			linguas_${X/-/_}? ( ${REL_URI}/${MY_PV}/linux-i686/xpi/${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%%-*}? ( ${REL_URI}/${PV}/linux-i686/xpi/${X}.xpi -> ${P}-${X}.xpi )"
-		fi
-		IUSE="${IUSE} linguas_${X%%-*}"
-	fi
-done
-
-RDEPEND="
-	>=sys-devel/binutils-2.16.1
-	>=dev-libs/nss-3.12.4
-	>=dev-libs/nspr-4.8
-	>=app-text/hunspell-1.2
-	>=dev-db/sqlite-3.6.20-r1[fts3]
-	alsa? ( media-libs/alsa-lib )
-	>=x11-libs/cairo-1.8.8[X]
-	x11-libs/pango[X]
-	networkmanager? ( net-wireless/wireless-tools )
-	libnotify? ( >=x11-libs/libnotify-0.4 )
-	~net-libs/xulrunner-${XUL_PV}[java=,networkmanager=,libnotify=]"
-
-DEPEND="${RDEPEND}
-	java? ( >=virtual/jdk-1.4 )
-	dev-util/pkgconfig"
-
-RDEPEND="${RDEPEND} java? ( >=virtual/jre-1.4 )"
-
-S="${WORKDIR}/mozilla-1.9.2"
-
-QA_PRESTRIPPED="usr/$(get_libdir)/${PN}/firefox"
-
-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() {
-	if ! use bindist ; then
-		einfo
-		elog "You are enabling official branding. You may not redistribute this build"
-		elog "to any users on your network or the internet. Doing so puts yourself into"
-		elog "a legal problem with Mozilla Foundation"
-		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
-	fi
-
-	java-pkg-opt-2_pkg_setup
-}
-
-src_unpack() {
-	unpack firefox-${MY_PV}.source.tar.bz2 ${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() {
-	# Apply our patches
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}"
-
-	eautoreconf
-
-	cd js/src
-	eautoreconf
-
-	# We need to re-patch this because autoreconf overwrites it
-	epatch "${FILESDIR}/000_flex-configure-LANG.patch"
-}
-
-src_configure() {
-	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"
-
-	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
-	mozconfig_annotate '' --with-system-nss
-	mozconfig_annotate '' --enable-system-lcms
-	mozconfig_annotate '' --with-system-bz2
-	mozconfig_annotate '' --with-system-libxul
-	mozconfig_annotate '' --with-libxul-sdk=/usr/$(get_libdir)/xulrunner-devel-${MAJ_XUL_PV}
-
-	mozconfig_use_enable libnotify
-	mozconfig_use_enable java javaxpcom
-	mozconfig_use_enable networkmanager necko-wifi
-	mozconfig_use_enable alsa ogg
-	mozconfig_use_enable alsa wave
-
-	# Other ff-specific settings
-	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
-
-	# Enable/Disable audio in firefox
-	mozconfig_use_enable alsa ogg
-	mozconfig_use_enable alsa wave
-
-	if ! use bindist ; then
-		mozconfig_annotate '' --enable-official-branding
-	fi
-
-	# 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)" 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
-	if ! use bindist ; then
-		newicon "${S}"/other-licenses/branding/firefox/content/icon48.png firefox-icon.png
-		newmenu "${FILESDIR}"/icon/mozilla-firefox-1.5.desktop \
-			${PN}-${DESKTOP_PV}.desktop
-	else
-		newicon "${S}"/browser/base/branding/icon48.png firefox-icon-unbranded.png
-		newmenu "${FILESDIR}"/icon/mozilla-firefox-1.5-unbranded.desktop \
-			${PN}-${DESKTOP_PV}.desktop
-		sed -i -e "s:Bon Echo:Shiretoko:" \
-			"${D}"/usr/share/applications/${PN}-${DESKTOP_PV}.desktop || die "sed failed!"
-	fi
-
-	# Add StartupNotify=true bug 237317
-	if use startup-notification ; then
-		echo "StartupNotify=true" >> "${D}"/usr/share/applications/${PN}-${DESKTOP_PV}.desktop
-	fi
-
-	pax-mark m "${D}"/${MOZILLA_FIVE_HOME}/firefox
-
-	# Enable very specific settings not inherited from xulrunner
-	cp "${FILESDIR}"/firefox-default-prefs.js \
-		"${D}/${MOZILLA_FIVE_HOME}/defaults/preferences/all-gentoo.js" || \
-		die "failed to cp firefox-default-prefs.js"
-
-	# Plugins dir
-	dosym ../nsbrowser/plugins "${MOZILLA_FIVE_HOME}"/plugins \
-		|| die "failed to symlink"
-
-	# very ugly hack to make firefox not sigbus on sparc
-	use sparc && { sed -e 's/Firefox/FirefoxGentoo/g' \
-					 -i "${D}/${MOZILLA_FIVE_HOME}/application.ini" || \
-					 die "sparc sed failed"; }
-}
-
-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
-}