version bump, security bug 165555

(Portage version: 2.1.2-r12)

5 files changed, 300 insertions, 7 deletions

diff --git a/www-client/seamonkey/ChangeLog b/www-client/seamonkey/ChangeLog
index 3517a7fd7ba0..54cf3ce9266f 100644
--- a/www-client/seamonkey/ChangeLog
+++ b/www-client/seamonkey/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/seamonkey
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.48 2007/01/30 21:42:28 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.49 2007/02/28 18:17:31 armin76 Exp $
+
+*seamonkey-1.1.1 (28 Feb 2007)
+*seamonkey-1.0.8 (28 Feb 2007)
+
+  28 Feb 2007; Raúl Porcel <armin76@gentoo.org> +seamonkey-1.0.8.ebuild,
+  -seamonkey-1.1.ebuild, +seamonkey-1.1.1.ebuild:
+  version bump, security bug 165555
 
   30 Jan 2007; Raúl Porcel <armin76@gentoo.org> seamonkey-1.1.ebuild:
   Add xforms USE-flag, thanks to James Cloos <cloos at jhcloos dot com> in bug
diff --git a/www-client/seamonkey/files/digest-seamonkey-1.0.8 b/www-client/seamonkey/files/digest-seamonkey-1.0.8
new file mode 100644
index 000000000000..f83aeb12f90a
--- /dev/null
+++ b/www-client/seamonkey/files/digest-seamonkey-1.0.8
@@ -0,0 +1,9 @@
+MD5 b255e7a77ecea435934bfa1872e99f6a enigmail-0.94.1.tar.gz 513084
+RMD160 1b8719c7669449f706bd3ff6964565e6ba9f8902 enigmail-0.94.1.tar.gz 513084
+SHA256 3584329e4f51e43fbb9028cf47101de8c74651e7607de80cb1f61349424133c1 enigmail-0.94.1.tar.gz 513084
+MD5 28ae0e8592ee525cc5762f80665846bc seamonkey-1.0.8-patches-0.1.tar.bz2 18525
+RMD160 6d3c4981d8b2ce4fe3727cb235324e4a283ebc1a seamonkey-1.0.8-patches-0.1.tar.bz2 18525
+SHA256 9f78f645e9b7aa50063b48275b7c89f585e81ce8aba139004125ef726ea3e600 seamonkey-1.0.8-patches-0.1.tar.bz2 18525
+MD5 05eacbcbaa8d7140706e99c604b1d966 seamonkey-1.0.8.source.tar.bz2 35887050
+RMD160 01f1b588a320392dfe874a9929846939cbabdde1 seamonkey-1.0.8.source.tar.bz2 35887050
+SHA256 f05b4cd92fc1d074592cfe585b5640314070fa8a49dec6d9f1a7cccdc621f39c seamonkey-1.0.8.source.tar.bz2 35887050
diff --git a/www-client/seamonkey/files/digest-seamonkey-1.1 b/www-client/seamonkey/files/digest-seamonkey-1.1.1
index e6a3e162457d..8c77f217d242 100644
--- a/www-client/seamonkey/files/digest-seamonkey-1.1
+++ b/www-client/seamonkey/files/digest-seamonkey-1.1.1
@@ -1,9 +1,8 @@
 MD5 b255e7a77ecea435934bfa1872e99f6a enigmail-0.94.1.tar.gz 513084
 RMD160 1b8719c7669449f706bd3ff6964565e6ba9f8902 enigmail-0.94.1.tar.gz 513084
 SHA256 3584329e4f51e43fbb9028cf47101de8c74651e7607de80cb1f61349424133c1 enigmail-0.94.1.tar.gz 513084
-MD5 a6ee6b2aa31ab5bdaa3ba985f8c065af seamonkey-1.1-patches-0.1.tar.bz2 14304
 RMD160 759f02b9b4d892341b9ee5fd0bcfd904e52057b7 seamonkey-1.1-patches-0.1.tar.bz2 14304
 SHA256 7a38eed9f04491f67b2dcdf3f00173df22ad088a11f44a7782860a3745ad11ea seamonkey-1.1-patches-0.1.tar.bz2 14304
-MD5 2d78434affe9e4499e3cfceae2d8522f seamonkey-1.1.source.tar.bz2 34965668
-RMD160 ffb85d9871f52527c571d6d7ec9f1f9a262ae7d6 seamonkey-1.1.source.tar.bz2 34965668
-SHA256 8999843cf0f42e824d026a863cc58e4be5fcf7eed20f5eb14a3246197b22bfca seamonkey-1.1.source.tar.bz2 34965668
+MD5 4409ad62738d403719a62d00c0276e08 seamonkey-1.1.1.source.tar.bz2 34995363
+RMD160 65f029523e9e44d1fb6c3308c8caa90ab321792f seamonkey-1.1.1.source.tar.bz2 34995363
+SHA256 4bb0102018a55adeddab6b9852d255184d558727786f4fd4064a683bd5d88bab seamonkey-1.1.1.source.tar.bz2 34995363
diff --git a/www-client/seamonkey/seamonkey-1.0.8.ebuild b/www-client/seamonkey/seamonkey-1.0.8.ebuild
new file mode 100644
index 000000000000..743ee8389136
--- /dev/null
+++ b/www-client/seamonkey/seamonkey-1.0.8.ebuild
@@ -0,0 +1,278 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-1.0.8.ebuild,v 1.1 2007/02/28 18:17:31 armin76 Exp $
+
+unset ALLOWED_FLAGS  # Stupid extra-functions.sh ... bug 49179
+inherit flag-o-matic toolchain-funcs eutils mozcoreconf mozconfig-2 mozilla-launcher makeedit multilib autotools
+
+PATCH="${P}-patches-0.1"
+EMVER="0.94.1"
+
+DESCRIPTION="Mozilla Application Suite - web browser, email, HTML editor, IRC"
+HOMEPAGE="http://www.mozilla.org"
+SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/${PN}/releases/${PV}/${P}.source.tar.bz2
+	mirror://gentoo/${PATCH}.tar.bz2
+	http://dev.gentoo.org/~kloeri/dist/${PATCH}.tar.bz2
+	crypt? ( !moznomail? ( http://www.mozilla-enigmail.org/downloads/src/enigmail-${EMVER}.tar.gz ) )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+SLOT="0"
+LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
+IUSE="java ldap mozcalendar mozdevelop moznocompose moznoirc moznomail moznoroaming postgres crypt"
+
+RDEPEND="java? ( virtual/jre )
+	>=www-client/mozilla-launcher-1.47
+	>=dev-libs/nss-3.10
+	>=dev-libs/nspr-4.6.1
+	crypt? ( !moznomail? ( >=app-crypt/gnupg-1.4 ) )"
+
+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 )
+	!www-client/mozilla"
+
+S=${WORKDIR}/mozilla
+
+pkg_setup() {
+	use moznopango && warn_mozilla_launcher_stub
+}
+
+src_unpack() {
+	unpack ${P}.source.tar.bz2 ${PATCH}.tar.bz2
+
+	cd ${S} || die "cd failed"
+	EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch ${WORKDIR}/patch
+
+	# Unpack the enigmail plugin
+	if use crypt && ! use moznomail; then
+		cd ${S}/mailnews/extensions || die
+		unpack enigmail-${EMVER}.tar.gz
+		cd ${S}/mailnews/extensions/enigmail || die "cd failed"
+		makemake2
+	fi
+
+	# 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,' ${S}/security/nss/cmd/smimetools/smime
+	eend $? || die "sed failed"
+
+	# Fix a compilation issue using the 32-bit userland with 64-bit kernel on
+	# PowerPC, because with that configuration, mozilla detects a ppc64 system.
+	# -- hansmi, 2005-10-02
+	if use ppc && [[ "${PROFILE_ARCH}" == ppc64 ]]; then
+		sed -i -e "s#OS_TEST=\`uname -m\`\$#OS_TEST=${ARCH}#" \
+			${S}/configure.in
+		sed -i -e "s#OS_TEST :=.*uname -m.*\$#OS_TEST:=${ARCH}#" \
+			${S}/security/coreconf/arch.mk
+	fi
+
+	cd ${S}
+	# Needed by some of the patches
+	WANT_AUTOCONF=2.1 eautoreconf || die "Failed running eautoreconf"
+}
+
+src_compile() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+	mozconfig_init
+	mozconfig_config
+
+	mozconfig_annotate 'gentoo' --enable-canvas
+	mozconfig_annotate 'gentoo' --with-system-nspr
+	mozconfig_annotate 'gentoo' --with-system-nss
+
+	# Bug 60668: Galeon doesn't build without oji enabled, so enable it
+	# regardless of java setting.
+	mozconfig_annotate 'galeon' --enable-oji --enable-mathml
+
+	# Other moz-specific settings
+	mozconfig_use_enable mozdevelop jsd
+	mozconfig_use_enable mozdevelop xpctools
+	mozconfig_use_extension mozdevelop venkman
+
+	if use moznoirc; then
+		mozconfig_annotate '+moznocompose +moznoirc' --enable-extensions=-irc
+	fi
+
+	if use moznoroaming ; then
+		mozconfig_annotate '+moznoroaming' --enable-extensions=-sroaming
+	fi
+
+	if use postgres ; then
+		mozconfig_annotate '+postgres' --enable-extensions=sql
+		export MOZ_ENABLE_PGSQL=1
+		export MOZ_PGSQL_INCLUDES=/usr/include
+		export MOZ_PGSQL_LIBS=/usr/$(get_libdir)
+	fi
+
+	mozconfig_use_enable mozcalendar calendar
+	mozconfig_use_enable ldap
+	mozconfig_use_enable ldap ldap-experimental
+	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+	mozconfig_annotate '' --with-user-appdir=.mozilla
+
+	if use moznomail && ! use mozcalendar; then
+		mozconfig_annotate "+moznomail -mozcalendar" --disable-mailnews
+	fi
+
+	if use moznocompose && ! use mozcalendar; then
+		if use moznoirc && use moznomail; then
+			mozconfig_annotate "+moznocompose" --disable-composer
+		fi
+	fi
+
+	# 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
+
+	append-flags -freorder-blocks -fno-reorder-functions
+
+	####################################
+	#
+	#  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}/xpfe/global/buildconfig.html
+
+	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
+	# requirements while compiling
+	edit_makefiles
+
+	emake -j1 || die
+
+	####################################
+	#
+	#  Build Enigmail extension
+	#
+	####################################
+
+	if use crypt && ! use moznomail; then
+		emake -C  ${S}/mailnews/extensions/enigmail || die "make enigmail failed"
+	fi
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+	# Most of the installation happens here
+	dodir ${MOZILLA_FIVE_HOME}
+	cp -RL ${S}/dist/bin/* ${D}${MOZILLA_FIVE_HOME}
+
+	# Create directory structure to support portage-installed extensions.
+	# See update_chrome() in mozilla-launcher
+	keepdir ${MOZILLA_FIVE_HOME}/chrome.d
+	keepdir ${MOZILLA_FIVE_HOME}/extensions.d
+	cp ${D}${MOZILLA_FIVE_HOME}/chrome/installed-chrome.txt \
+		${D}${MOZILLA_FIVE_HOME}/chrome.d/0_base-chrome.txt
+
+	# Create /usr/bin/mozilla
+	install_mozilla_launcher_stub seamonkey ${MOZILLA_FIVE_HOME}
+
+	# Install icon and .desktop for menu entry
+	insinto /usr/share/pixmaps
+	doins ${FILESDIR}/icon/${PN}.png
+
+	# Fix bug 54179: Install .desktop file into /usr/share/applications
+	# instead of /usr/share/gnome/apps/Internet (18 Jun 2004 agriffis)
+	insinto /usr/share/applications
+	doins ${FILESDIR}/icon/${PN}.desktop
+
+	# Fix icons to look the same everywhere
+	insinto ${MOZILLA_FIVE_HOME}/icons
+	doins ${S}/widget/src/gtk/mozicon16.xpm
+	doins ${S}/widget/src/gtk/mozicon50.xpm
+
+	####################################
+	#
+	# Install files necessary for applications to build against mozilla
+	#
+	####################################
+
+	einfo "Installing includes and idl files..."
+	dodir ${MOZILLA_FIVE_HOME}/{include,idl} /usr/include
+	cd ${S}/dist
+	cp -LfR include/* ${D}${MOZILLA_FIVE_HOME}/include
+	cp -LfR idl/* ${D}${MOZILLA_FIVE_HOME}/idl
+
+	# Fix mozilla-config and install it
+	exeinto ${MOZILLA_FIVE_HOME}
+	doexe ${S}/build/unix/${PN}-config
+
+	# Fix pkgconfig files and install them
+	insinto /usr/$(get_libdir)/pkgconfig
+	for x in ${S}/build/unix/*.pc; do
+		doins ${x}
+	done
+
+	# Install env.d snippet, which isn't necessary for running mozilla, but
+	# might be necessary for programs linked against firefox
+	insinto /etc/env.d
+	doins ${FILESDIR}/10${PN}
+	dosed "s|/usr/lib|/usr/$(get_libdir)|" /etc/env.d/10${PN}
+
+	# Install rebuild script since mozilla-bin doesn't support registration yet
+	exeinto ${MOZILLA_FIVE_HOME}
+	doexe ${FILESDIR}/${PN}-rebuild-databases.pl
+	dosed -e 's|/lib/|/'"$(get_libdir)"'/|g' \
+		${MOZILLA_FIVE_HOME}/${PN}-rebuild-databases.pl
+
+	# Install docs
+	dodoc ${S}/{LEGAL,LICENSE}
+
+	# Update Google search plugin to use UTF8 charset ...
+	insinto ${MOZILLA_FIVE_HOME}/searchplugins
+	doins ${FILESDIR}/google.src
+}
+
+pkg_preinst() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+	# Remove entire installed instance to solve various problems,
+	# for example see bug 27719
+	rm -rf ${ROOT}${MOZILLA_FIVE_HOME}
+}
+
+pkg_postinst() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+	# Update the component registry
+	MOZILLA_LIBDIR=${ROOT}${MOZILLA_FIVE_HOME} MOZILLA_LAUNCHER=${PN} \
+		/usr/libexec/mozilla-launcher -register
+
+	# This should be called in the postinst and postrm of all the
+	# mozilla, mozilla-bin, firefox, firefox-bin, thunderbird and
+	# thunderbird-bin ebuilds.
+	update_mozilla_launcher_symlinks
+}
+
+pkg_postrm() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+	# Update the component registry
+	if [[ -x ${MOZILLA_FIVE_HOME}/${PN}-bin ]]; then
+		MOZILLA_LIBDIR=${ROOT}${MOZILLA_FIVE_HOME} MOZILLA_LAUNCHER=${PN} \
+			/usr/libexec/mozilla-launcher -register
+	fi
+
+	update_mozilla_launcher_symlinks
+}
diff --git a/www-client/seamonkey/seamonkey-1.1.ebuild b/www-client/seamonkey/seamonkey-1.1.1.ebuild
index b73b6bfeadbd..c326460fe231 100644
--- a/www-client/seamonkey/seamonkey-1.1.ebuild
+++ b/www-client/seamonkey/seamonkey-1.1.1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-1.1.ebuild,v 1.3 2007/01/30 21:42:28 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-1.1.1.ebuild,v 1.1 2007/02/28 18:17:31 armin76 Exp $
 
 unset ALLOWED_FLAGS  # Stupid extra-functions.sh ... bug 49179
 inherit flag-o-matic toolchain-funcs eutils mozcoreconf mozconfig-2 mozilla-launcher makeedit multilib autotools
 
-PATCH="${P}-patches-0.1"
+PATCH="${PN}-1.1-patches-0.1"
 EMVER="0.94.1"
 
 DESCRIPTION="Mozilla Application Suite - web browser, email, HTML editor, IRC"