revision bump, security fixes included

(Portage version: 2.1_pre7-r5)

4 files changed, 259 insertions, 1 deletions

diff --git a/net-libs/gecko-sdk/ChangeLog b/net-libs/gecko-sdk/ChangeLog
index 002a6fc84ed3..436dbdd53b7f 100644
--- a/net-libs/gecko-sdk/ChangeLog
+++ b/net-libs/gecko-sdk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/gecko-sdk
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gecko-sdk/ChangeLog,v 1.26 2006/03/19 15:02:34 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gecko-sdk/ChangeLog,v 1.27 2006/04/24 02:03:01 anarchy Exp $
+
+*gecko-sdk-1.7.13 (24 Apr 2006)
+
+  24 Apr 2006; Jory A. Pratt <anarchy@gentoo.org> +gecko-sdk-1.7.13.ebuild:
+  revision bump, security fixes included
 
 *gecko-sdk-1.7.12-r2 (19 Mar 2006)
 
diff --git a/net-libs/gecko-sdk/Manifest b/net-libs/gecko-sdk/Manifest
index 3058ab1d1de5..1a7fd06e20d9 100644
--- a/net-libs/gecko-sdk/Manifest
+++ b/net-libs/gecko-sdk/Manifest
@@ -13,6 +13,9 @@ SHA256 2bc495d7b73234cb2e180bb7bf07af4f57a50dcc7c4367af40be6c9aee3c8197 files/di
 MD5 4b010bb51265549b21d5bc1d77c25874 files/digest-gecko-sdk-1.7.12-r2 834
 RMD160 25360bfb65da9da05596fcd0ad11b222fbec3827 files/digest-gecko-sdk-1.7.12-r2 834
 SHA256 162ccb84299c4e0d9cefe821d721b4e0a02c7580af6fdf9d02e5670281e4a499 files/digest-gecko-sdk-1.7.12-r2 834
+MD5 2227c6dae40cd0ec4f7f1ba0ac7caf44 files/digest-gecko-sdk-1.7.13 834
+RMD160 8b693711a061e61d76a991946e34b15aef07d90c files/digest-gecko-sdk-1.7.13 834
+SHA256 1c367cae1c8840a55e3c44b4e9f3a320df6c79f41f7070e092b70df03e5dd740 files/digest-gecko-sdk-1.7.13 834
 MD5 be67106b98a3cc1562eee877200e6ae0 files/digest-gecko-sdk-1.7.8 280
 RMD160 bf8286e8441d0694359c22795348cbc62e190e1e files/digest-gecko-sdk-1.7.8 280
 SHA256 57b69d55c578f785af5f1ecf5d1cfd2ec949eba4c1575fa58325d23e4a556ed5 files/digest-gecko-sdk-1.7.8 280
@@ -52,6 +55,9 @@ SHA256 b3dafccc3bac2f27125eaa2b4fc984943979add5d7b2ef97dfabce493cc77869 gecko-sd
 MD5 8b22525bd9a836743abec05930d9543f gecko-sdk-1.7.12.ebuild 6945
 RMD160 1d7ca89e0be020b543c6a1577b0272500d503254 gecko-sdk-1.7.12.ebuild 6945
 SHA256 51384ed3c455252d3aa17116378981e403740d13426b0a52cadac4165d92004d gecko-sdk-1.7.12.ebuild 6945
+MD5 002a2d9312d273fa7aa1c8e430154ade gecko-sdk-1.7.13.ebuild 8017
+RMD160 c44c3e324a697862c2461211f0a8ff18a1900d47 gecko-sdk-1.7.13.ebuild 8017
+SHA256 e94cde5d37a644b33a8cc99c869ddf5fcfcdd1afe637f4a0465791b040283544 gecko-sdk-1.7.13.ebuild 8017
 MD5 68e8f6854f38d88b6b6f0cd7ded9b721 gecko-sdk-1.7.8.ebuild 6838
 RMD160 b5fead0d34bc827981303460c644b5471f087d35 gecko-sdk-1.7.8.ebuild 6838
 SHA256 b90230af512768622e50b3004a602b1a1f6e2b6d158ab7df484526d7f52ee74a gecko-sdk-1.7.8.ebuild 6838
diff --git a/net-libs/gecko-sdk/files/digest-gecko-sdk-1.7.13 b/net-libs/gecko-sdk/files/digest-gecko-sdk-1.7.13
new file mode 100644
index 000000000000..71aa2239e905
--- /dev/null
+++ b/net-libs/gecko-sdk/files/digest-gecko-sdk-1.7.13
@@ -0,0 +1,9 @@
+MD5 b4355a5746dde47cf0a7981df1dff998 moz_libart_lgpl-2.3.10p1.tar.bz2 103063
+RMD160 c1ab4b41fe40e3f63dbf95476a1cc125d5537be7 moz_libart_lgpl-2.3.10p1.tar.bz2 103063
+SHA256 8cc868780a0763a5afaa36f92d7c5f9efe248b4e05440f645e4e91ddfdd6d1b5 moz_libart_lgpl-2.3.10p1.tar.bz2 103063
+MD5 cb679e4859326eede1c73ab83c273a97 mozilla-1.7.13-patches-1.0.tar.bz2 105494
+RMD160 33aae97e5260fc096caaffa3e7219201bbc0c421 mozilla-1.7.13-patches-1.0.tar.bz2 105494
+SHA256 87b73deab017ee85e588ebaf6292910d03ac8e95c5e49222be0d77477212dc5d mozilla-1.7.13-patches-1.0.tar.bz2 105494
+MD5 eb0683207f7668319c65e403d04bfc41 mozilla-1.7.13-source.tar.bz2 30525187
+RMD160 4360b48c8930dc427f6010c57abb8b2d0c855761 mozilla-1.7.13-source.tar.bz2 30525187
+SHA256 015018ffa88843563c8acbbcad16ffdc22a1e2d1a9e5a28972164ab86273b01e mozilla-1.7.13-source.tar.bz2 30525187
diff --git a/net-libs/gecko-sdk/gecko-sdk-1.7.13.ebuild b/net-libs/gecko-sdk/gecko-sdk-1.7.13.ebuild
new file mode 100644
index 000000000000..721b30790b65
--- /dev/null
+++ b/net-libs/gecko-sdk/gecko-sdk-1.7.13.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gecko-sdk/gecko-sdk-1.7.13.ebuild,v 1.1 2006/04/24 02:03:01 anarchy Exp $
+
+unset ALLOWED_FLAGS  # Stupid extra-functions.sh ... bug 49179
+MOZ_FREETYPE2="no"   # Need to disable for newer .. remove here and in mozconfig
+	                 # when older is removed from tree.
+MOZ_PANGO="yes"      # Need to enable for newer .. remove here and in mozconfig
+	                 # when older is removed from tree.
+inherit flag-o-matic toolchain-funcs eutils mozconfig mozilla-launcher makeedit multilib
+
+PVER="1.0"
+SVGVER="2.3.10p1"
+
+# handle _rc versions
+MY_PV=${PV/_alpha/a} 	# handle alpha
+MY_PV=${MY_PV/_beta/b}	# handle beta
+MY_PV=${MY_PV/_rc/rc}	# handle rc
+
+DESCRIPTION="Mozilla Application Suite - web browser, email, HTML editor, IRC"
+HOMEPAGE="http://www.mozilla.org"
+SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla${MY_PV}/source/mozilla-${MY_PV}-source.tar.bz2
+	mozsvg? (
+		mirror://gentoo/moz_libart_lgpl-${SVGVER}.tar.bz2
+		http://dev.gentoo.org/~azarah/mozilla/moz_libart_lgpl-${SVGVER}.tar.bz2
+	)
+	mirror://gentoo/mozilla-${PV}-patches-${PVER}.tar.bz2
+	http://dev.gentoo.org/~anarchy/dist/mozilla-${PV}-patches-${PVER}.tar.bz2"
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+LICENSE="MPL-1.1 NPL-1.1"
+IUSE="crypt gnome java ldap mozcalendar mozdevelop moznocompose moznoirc moznomail mozsvg postgres ssl"
+
+# xrender.pc appeared for the first time in xorg-x11-6.7.0-r2
+# and is required to build with support for cairo.  #71504
+RDEPEND="java? ( virtual/jre )
+	mozsvg? ( !<x11-base/xorg-x11-6.7.0-r2 )
+	crypt? ( !moznomail? ( >=app-crypt/gnupg-1.2.1 ) )
+	>=www-client/mozilla-launcher-1.42"
+
+DEPEND="${RDEPEND}
+	~sys-devel/autoconf-2.13
+	java? ( >=dev-java/java-config-0.2.0 )
+	dev-lang/perl
+	postgres? ( >=dev-db/postgresql-7.2.0 )"
+
+S=${WORKDIR}/mozilla
+
+
+src_unpack() {
+	unpack mozilla-${MY_PV}-source.tar.bz2 mozilla-${PV}-patches-${PVER}.tar.bz2
+	cd ${S} || die
+
+	if use mozsvg; then
+		cd ${S}/other-licenses
+		unpack moz_libart_lgpl-${SVGVER}.tar.bz2
+	fi
+	cd ${S}
+
+	####################################
+	#
+	# patch collection
+	#
+	####################################
+
+	# Firefox only patches
+	rm -f ${WORKDIR}/patch/{093,094,402,407}*
+	# Need pango-1.10.0 stable
+	rm -f ${WORKDIR}/patch/03[67]*
+	epatch ${WORKDIR}/patch
+
+	# Without 03[67]* patches, we need to link to pangoxft
+	epatch ${FILESDIR}/mozilla-1.7.12-gtk2xft-link-pangoxft.patch
+
+	# Fix scripts that call for /usr/local/bin/perl #51916
+	ebegin "Patching smime to call perl from /usr/bin"
+	sed -i -e '1s,usr/local/bin,usr/bin,' security/nss/cmd/smimetools/smime
+	eend $? || die "sed failed"
+
+	# Needed by some of the patches
+	WANT_AUTOCONF=2.1 autoconf || die "WANT_AUTOCONF failed"
+}
+
+src_compile() {
+	declare x
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/gecko-sdk"
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+
+	# Bug 60668: Galeon doesn't build without oji enabled, so enable it
+	# regardless of java setting.
+	mozconfig_annotate '' --enable-oji --enable-mathml
+
+	# Other moz-specific settings
+	mozconfig_use_enable mozdevelop jsd
+	mozconfig_use_enable mozdevelop xpctools
+	mozconfig_use_extension mozdevelop venkman
+	mozconfig_use_enable gnome gnomevfs
+	mozconfig_use_extension gnome gnomevfs
+	mozconfig_use_enable mozsvg svg
+	mozconfig_use_enable mozsvg svg-renderer-libart
+	use mozsvg && export MOZ_INTERNAL_LIBART_LGPL=1
+	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}/lib
+	mozconfig_annotate '' --with-user-appdir=.mozilla
+	mozconfig_annotate gentoo --disable-mailnews
+	mozconfig_annotate gentoo --disable-composer
+	mozconfig_annotate gentoo --disable-calendar
+	mozconfig_annotate gentoo --enable-extensions=-irc
+
+	# Finalize and report settings
+	mozconfig_final
+
+	# hardened GCC uses -fstack-protector-all by default, which breaks us
+	gcc-specs-ssp && append-flags -fno-stack-protector-all
+	replace-flags -fstack-protector-all -fstack-protector
+
+	####################################
+	#
+	#  Configure and build
+	#
+	####################################
+
+	CPPFLAGS="${CPPFLAGS} -DARON_WAS_HERE" \
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+	econf || die
+
+	# It would be great if we could pass these in via CPPFLAGS or CFLAGS prior
+	# to econf, but the quotes cause configure to fail.
+	sed -i -e \
+		's|-DARON_WAS_HERE|-DGENTOO_NSPLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsplugins\\\" -DGENTOO_NSBROWSER_PLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsbrowser/plugins\\\"|' \
+		${S}/config/autoconf.mk \
+		${S}/nsprpub/config/autoconf.mk \
+		${S}/xpfe/global/buildconfig.html
+
+	# Fixup the RPATH
+	sed -i -e \
+		's|#RPATH_FIXER|'"${MOZILLA_FIVE_HOME}/lib"'|' \
+		${S}/config/rules.mk \
+		${S}/nsprpub/config/rules.mk \
+		${S}/security/coreconf/rules.mk \
+		${S}/security/coreconf/rules.mk
+
+	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
+	# requirements while compiling
+	edit_makefiles
+
+	emake || die
+
+	####################################
+	#
+	#  Build SDK/GRE (we add all the components/chrome
+	#  to make sure that our its full-featured)
+	#
+	####################################
+
+	cd ${S}/embedding/config
+	# Add extra libs/components/chrome we might need
+	for x in libjsj.so \
+	         libgtkxtbin.so \
+	         components/\* \
+	         components/myspell/\* \
+	         chrome/\*.jar \
+	         chrome/icons/default/\*; do
+		echo "${x}" >> ${S}/embedding/config/basebrowser-unix
+	done
+	# Make sure we have all needed libs for our components
+	for x in $(LD_LIBRARY_PATH="${S}/dist/bin" ldd ${S}/dist/bin/components/*.so 2>&1 | \
+	               awk '$3 ~ "dist/bin" {print $1}' | sort -u) ; do
+		echo "${x}" >> ${S}/embedding/config/basebrowser-unix
+	done
+	# Update installed-chrome.txt
+	rm -f ${S}/embedding/config/installed-chrome.txt
+	cp -f ${S}/dist/bin/chrome/installed-chrome.txt ${S}/embedding/config/
+	# Build the embedded dist
+	emake || die
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/gecko-sdk"
+
+	dodir /usr/$(get_libdir)
+	cp -RL ${S}/dist/sdk ${D}/${MOZILLA_FIVE_HOME}
+	# Also install the embedded dist for galeon, epiphany, etc
+	cp -RL ${S}/dist/idl/* ${D}/${MOZILLA_FIVE_HOME}/idl/
+	cp -RL ${S}/dist/include/* ${D}/${MOZILLA_FIVE_HOME}/include/
+	cp -RL ${S}/dist/Embed/* ${D}/${MOZILLA_FIVE_HOME}/lib/
+	# Default plugin
+	cp -RL ${S}/dist/bin/plugins ${D}/${MOZILLA_FIVE_HOME}/lib/
+
+	exeinto ${MOZILLA_FIVE_HOME}/bin
+	doexe ${S}/dist/bin/regchrome
+	doexe ${FILESDIR}/mozilla-rebuild-databases.pl
+	dosed -e 's|/lib/gecko-sdk|/'"$(get_libdir)"'/gecko-sdk|g' \
+		${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl
+
+	# Fix mozilla-config and install it
+	sed -i -e "s|/usr/$(get_libdir)/mozilla-${MY_PV}|${MOZILLA_FIVE_HOME}/lib|g
+		s|/usr/include/mozilla-${MY_PV}|${MOZILLA_FIVE_HOME}/include|g
+		s|/usr/share/idl/mozilla-${MY_PV}|${MOZILLA_FIVE_HOME}/idl|g
+		s|\(echo -L.*\)\($\)|\1 -Wl,-rpath,${MOZILLA_FIVE_HOME}/lib\2|" \
+		${S}/build/unix/mozilla-config
+	exeinto /usr/bin
+	newexe ${S}/build/unix/mozilla-config gecko-sdk-config
+
+	# Fix pkgconfig files and install them
+	insinto /usr/$(get_libdir)/pkgconfig
+	for x in ${S}/build/unix/*.pc; do
+		sed -i -e "s|^libdir=.*|libdir=${MOZILLA_FIVE_HOME}/lib|
+			s|^includedir=.*|includedir=${MOZILLA_FIVE_HOME}/include|
+			s|^idldir=.*|idldir=${MOZILLA_FIVE_HOME}/idl|
+			s|\(Libs:.*\)\($\)|\1 -Wl,-rpath,\${libdir}\2|
+			s|mozilla|gecko-sdk|g" ${x}
+		newins ${x} $(echo "${x##*/}" | sed -e 's:mozilla:gecko-sdk:')
+	done
+
+	# Install docs
+	dodoc ${S}/{LEGAL,LICENSE}
+}
+
+pkg_postinst() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/gecko-sdk"
+
+	${MOZILLA_FIVE_HOME}/bin/mozilla-rebuild-databases.pl
+}
+
+pkg_postrm() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/gecko-sdk"
+
+	[[ -x ${MOZILLA_FIVE_HOME}/bin/mozilla-rebuild-databases.pl ]] && \
+		${MOZILLA_FIVE_HOME}/bin/mozilla-rebuild-databases.pl
+}