Remove old vulnerable version of totem depending on vulnerable seamonkey-1. Fixes bug 300450

Package-Manager: portage-2.1.8.3/cvs/Linux i686

5 files changed, 8 insertions, 243 deletions

diff --git a/media-video/totem/ChangeLog b/media-video/totem/ChangeLog
index 2f4226b8b54e..9d8eefedc706 100644
--- a/media-video/totem/ChangeLog
+++ b/media-video/totem/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/totem
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.276 2010/03/16 18:58:09 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.277 2010/03/22 13:39:09 nirbheek Exp $
+
+  22 Mar 2010; Nirbheek Chauhan <nirbheek@gentoo.org>
+  -files/totem-2.20.1-startup-notification.patch,
+  -files/totem-2.20.1-xpcom-hack.patch, -totem-2.20.3.ebuild:
+  Remove old vulnerable version of totem depending on vulnerable
+  seamonkey-1. Fixes bug 300450
 
   16 Mar 2010; Christian Faulhammer <fauli@gentoo.org>
   totem-2.26.5-r1.ebuild:
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index 9ae50d1cf6ba..7ac8f10df818 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -1,26 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX totem-2.20.1-startup-notification.patch 1235 RMD160 2b2f1dc18a7910019adf1a831aa2ca3a1febb080 SHA1 1a26bd044901ef3969a042b621c59bd7c2bb86a9 SHA256 88ec75d7ad5d3e637592b91301e28d8241c652e576f1fade9c34e0d2016865e2
-AUX totem-2.20.1-xpcom-hack.patch 414 RMD160 11f8440cd1798c161ef7070dda90fa8c7abf5ccd SHA1 ccfb2c9e4f422454f3ee0ec97850d8e9a272ed4f SHA256 0db11c34b49c80c13e8385fc207a5fcd66f25d17aea1edca65f67a96ee663e71
 AUX totem-2.26.1-smclient-target-detection.patch 1420 RMD160 4808f108ff486f5dc992ce3ea7aa1ac5d0e463da SHA1 d56ea9d8bbe96cd2edf0c68607732d4a8345c29e SHA256 5270fdce107cf60566bcd3a3eac49edeb85307503cc5228bad8ddbfbfcb695b3
 AUX totem-2.26.3-youtube-plugin-404-error.patch 1050 RMD160 4c570c8d9a8479cb483826cee7e638cb857d6004 SHA1 038aa80f3ab24130987e8d329dca931147e931c9 SHA256 c9e3e054c3e220281e457c39e1a5b0a4f352b4bd9baac557c5c5d5f5c4e3cb6a
 AUX totem-2.26.4-youtube-plug-play-vids.patch 888 RMD160 b4e28b2818aa588e257cf5b6ddfb4955e22fad69 SHA1 18148eaaef258e57d7327a538bb3320cf530b09a SHA256 c123f6d9693ad2ace3154771e2e935b361ed7d43b5139a9748754f0782a118b7
 AUX totem-2.26.5-firefox-plugin-apple-trailers.patch 2690 RMD160 647f88df1373c20b1034caa746b456f910afd34f SHA1 a925115dcc1c33b397c0cb2ea561c5a48f402471 SHA256 e89197f6c20c6a525f3c60ade071b918efeaba4fb9178f859a733a72e8bd6e85
-DIST totem-2.20.3.tar.bz2 2194842 RMD160 4ccd9f7cca2a7380f2cc40bebf43ddf2c0678c6f SHA1 a3ae4b9f6cabf4e09b192840b92f02da42aea021 SHA256 9d51de9549c9913f91c34986f31edf55f7604e2f784e9ceea783f6102b140897
 DIST totem-2.26.3.tar.bz2 3193956 RMD160 f265ec3997c130f28bf5e5455c0aef6921e71ece SHA1 ea6fa7244eb993a3038bc76f5e561c8a0661466c SHA256 ae1bd6682385ad401effda4a856f4ba8150b5ef4eab113a288b29e9335170d70
 DIST totem-2.26.5.tar.bz2 3198042 RMD160 174e91dad2f51c908e4b777e93003c6888fd2829 SHA1 34c4a701f1cee440b397ead761de56e08ce97da1 SHA256 33c69497eff649d86b0a710aee7a3b3cbc7cb79c55267bac88a591d62a6ffb3c
 DIST totem-2.28.5.tar.bz2 3083946 RMD160 20fa09187a82380d7b7d19c2fb5e8a5a4475307e SHA1 1653528d66a1f11da4bc8f66746828c4a31343d6 SHA256 c788bb314addbeeb2b27a2af0f7448752db22dcfaf8b0a4e704463ba9a9dc063
-EBUILD totem-2.20.3.ebuild 5032 RMD160 2b784ab3e1fe07fc5846e3f0e241c34a1de2a3d0 SHA1 df543761b7eb778820057231ed5adac85231fca3 SHA256 ff7ffe9233c8c168288118d3c55e520c0d6f955804a0a3c13ad292d580392320
 EBUILD totem-2.26.3-r1.ebuild 4609 RMD160 e41975bcac1ea766ef7f629ba4b55df615fe76da SHA1 a9e50062bc439695eefe24001b85c354ea36ee0f SHA256 03eb45c8edc15ff1e0ea5c49038f20eb395f7187f8789eeb726de90e57b45f03
 EBUILD totem-2.26.5-r1.ebuild 4698 RMD160 e13555ef35978b4a84d27d15abdf013fe95e45ca SHA1 a1e5b55fce1cee0c7b2d9e045a8310bba223c41a SHA256 60321b77081cb8ffbe5bac735126bfc2bde1e80df392d3628c3759dcd9b5ea17
 EBUILD totem-2.28.5.ebuild 4689 RMD160 7f901a7dba891c92e7e176a0d80e97e804e3c2b6 SHA1 b3911abf37237d16d95e5d9971d7c50a57a50705 SHA256 01aca97df144f899fc3b9c2de82df51de261c62ed82f93c69b35b7b82faaccdd
-MISC ChangeLog 39093 RMD160 8092c9417c6c1d8cca4971b8cb67b1a1f2476c9c SHA1 ca81334970c9ba285ed7974c3c5acce71ad262c7 SHA256 47f01a838f40b4fb0e9de251aec01c31837cd53432b322fc99d01f754cde2587
+MISC ChangeLog 39360 RMD160 b69fefad142e3024acde9fae71986a55e5e0eafe SHA1 dbe8bb44e4f36dc191a7b2b2b3c6dbda08b76938 SHA256 4503477b048150fa85e1829ddbf19549b69e04d79b6629067e6c13082e23a4d1
 MISC metadata.xml 1872 RMD160 0678604a8be6f8432186df7ce003b9e4be9e0fc4 SHA1 63b76103e6b7c2c5aec965a5610643f4a25df37e SHA256 31b4e571c11c47e62c7f7e66698ac12e79159d59bad01de42461cf308d31f833
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkuf1McACgkQNQqtfCuFneO4ZgCfUZAmHiD/icrwUTdM6CAeh1Na
-FsAAn1p3FxTqS5jPKESRUO0JQ4KY1gvO
-=C1ax
------END PGP SIGNATURE-----
diff --git a/media-video/totem/files/totem-2.20.1-startup-notification.patch b/media-video/totem/files/totem-2.20.1-startup-notification.patch
deleted file mode 100644
index 97d253a6e100..000000000000
--- a/media-video/totem/files/totem-2.20.1-startup-notification.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Index: browser-plugin/Makefile.am
-===================================================================
---- browser-plugin/Makefile.am	(revision 4827)
-+++ browser-plugin/Makefile.am	(working copy)
-@@ -109,6 +109,7 @@
- 	$(WARN_CFLAGS)		\
- 	$(DBUS_CFLAGS)		\
- 	$(NVTV_CFLAGS)		\
-+	$(SN_CFLAGS)		\
- 	$(AM_CFLAGS)
- 
- totem_plugin_viewer_LDADD =						\
-@@ -122,6 +123,7 @@
- 	$(DBUS_LIBS)		\
- 	$(NVTV_LIBS) 		\
- 	$(XTEST_LIBS)		\
-+	$(SN_LIBS)		\
- 	$(X_LIBS)
- 
- BUILT_SOURCES += \
-Index: configure.in
-===================================================================
---- configure.in	(revision 4827)
-+++ configure.in	(working copy)
-@@ -685,6 +686,18 @@
- AM_CONDITIONAL([ENABLE_MULLY_PLUGIN],[test "$enable_mully_plugin" = "yes"])
- AM_CONDITIONAL([ENABLE_CONE_PLUGIN],[test "$enable_cone_plugin" = "yes"])
- 
-+if test "$enable_basic_plugin" = "yes" ||
-+   test "$enable_gmp_plugin" = "yes" ||
-+   test "$enable_complex_plugin" = "yes" ||
-+   test "$enable_narrowspace_plugin" = "yes" ||
-+   test "$enable_mully_plugin" = "yes" ||
-+   test "$enable_cone_plugin" = "yes" ; then
-+
-+   PKG_CHECK_MODULES([SN], [ libstartup-notification-1.0 >= 0.8 ])
-+   AC_SUBST([SN_CFLAGS])
-+   AC_SUBST([SN_LIBS])
-+fi
-+
- dnl ********
- dnl Nautilus
- dnl ********
diff --git a/media-video/totem/files/totem-2.20.1-xpcom-hack.patch b/media-video/totem/files/totem-2.20.1-xpcom-hack.patch
deleted file mode 100644
index feeff2abbec4..000000000000
--- a/media-video/totem/files/totem-2.20.1-xpcom-hack.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: configure.in
-===================================================================
---- configure.in	(revision 4827)
-+++ configure.in	(working copy)
-@@ -585,6 +588,7 @@
- 	if test "$have_libxpcomglue_s" = "yes"; then
- 		LIBXPCOMGLUE_S="-L$MOZILLA_LIBDIR -lxpcomglue_s"
- 	else
-+      LIBXPCOMGLUE_S="-L$MOZILLA_LIBDIR -lxpcom"
- 		AC_MSG_WARN([libxpcomglue_s not available; plugins may not be portable])
- 	fi
- fi
diff --git a/media-video/totem/totem-2.20.3.ebuild b/media-video/totem/totem-2.20.3.ebuild
deleted file mode 100644
index 693eb9f8ef91..000000000000
--- a/media-video/totem/totem-2.20.3.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.20.3.ebuild,v 1.13 2009/05/23 21:41:40 eva Exp $
-
-inherit autotools eutils gnome2 multilib
-
-DESCRIPTION="Media player for GNOME"
-HOMEPAGE="http://gnome.org/projects/totem/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="hppa sh"
-
-# No 0.10.0 release for gst-plugins-pitdfdll yet
-# IUSE="win32codecs"
-
-IUSE="a52 bluetooth debug dvd ffmpeg flac galago gnome hal lirc mad mpeg nsplugin nvtv ogg python seamonkey theora vorbis xulrunner xv"
-
-RDEPEND=">=dev-libs/glib-2.13.4
-	 >=x11-libs/gtk+-2.12.1
-	 >=gnome-base/gconf-2.0
-	 >=gnome-base/libglade-2.0
-	 >=gnome-base/gnome-vfs-2.16
-	 >=x11-themes/gnome-icon-theme-2.16
-	 >=x11-libs/startup-notification-0.8
-	   app-text/iso-codes
-	   dev-libs/libxml2
-	 >=dev-libs/dbus-glib-0.71
-	 >=media-libs/gstreamer-0.10.12
-	 >=media-libs/gst-plugins-good-0.10
-	 >=media-libs/gst-plugins-base-0.10.12
-	 >=media-plugins/gst-plugins-pango-0.10
-	 >=media-plugins/gst-plugins-gconf-0.10
-	 >=media-plugins/gst-plugins-gnomevfs-0.10
-
-	 x11-libs/libX11
-	 x11-libs/libXtst
-	 >=x11-libs/libXrandr-1.1.1
-	 >=x11-libs/libXxf86vm-1.0.1
-
-	 bluetooth? ( net-wireless/bluez-libs )
-	 galago? ( >=dev-libs/libgalago-0.5.2 )
-	 gnome? (
-				>=gnome-base/libgnome-2.14
-				>=gnome-base/libgnomeui-2.4
-				>=gnome-base/gnome-desktop-2.2
-				>=gnome-base/nautilus-2.10
-	 			>=gnome-base/gnome-control-center-2.18
-			)
-	 hal? ( =sys-apps/hal-0.5* )
-	 lirc? ( app-misc/lirc )
-	 nsplugin?	(
-	 			xulrunner? ( =net-libs/xulrunner-1.8* )
-				!xulrunner? ( seamonkey? ( =www-client/seamonkey-1* ) )
-				!xulrunner? ( !seamonkey? ( =www-client/mozilla-firefox-2* ) )
-				>=x11-misc/shared-mime-info-0.22
-				>=x11-libs/startup-notification-0.8
-			)
-	 python? ( >=dev-python/pygtk-2.8 )
-	 nvtv? ( >=media-tv/nvtv-0.4.5 )
-
-	 a52? ( >=media-plugins/gst-plugins-a52dec-0.10 )
-	 !sparc? ( dvd? (
-						>=media-libs/gst-plugins-ugly-0.10
-						>=media-plugins/gst-plugins-a52dec-0.10
-						>=media-plugins/gst-plugins-dvdread-0.10
-						>=media-plugins/gst-plugins-mpeg2dec-0.10
-					)
-			 )
-	 !sparc? ( ffmpeg? ( >=media-plugins/gst-plugins-ffmpeg-0.10 ) )
-	 flac? ( >=media-plugins/gst-plugins-flac-0.10 )
-	 mad? ( >=media-plugins/gst-plugins-mad-0.10 )
-	 !sparc? ( mpeg? ( >=media-plugins/gst-plugins-mpeg2dec-0.10 ) )
-	 ogg? ( >=media-plugins/gst-plugins-ogg-0.10 )
-	 theora? (
-				>=media-plugins/gst-plugins-ogg-0.10
-				>=media-plugins/gst-plugins-theora-0.10
-			 )
-	 vorbis? (
-				>=media-plugins/gst-plugins-ogg-0.10
-				>=media-plugins/gst-plugins-vorbis-0.10
-			 )
-	 xv? ( >=media-plugins/gst-plugins-xvideo-0.10 )
-	>=media-plugins/gst-plugins-x-0.10"
-
-# this belongs above xv? above.
-# win32codecs? ( >=media-plugins/gst-plugins-pitfdll-0.10 )
-
-DEPEND="${RDEPEND}
-	  x11-proto/xproto
-	  x11-proto/xextproto
-	  x11-proto/xf86vidmodeproto
-	  app-text/scrollkeeper
-	  gnome-base/gnome-common
-	  app-text/gnome-doc-utils
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.20"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-pkg_setup() {
-	# use global mozilla plugin dir
-	G2CONF="${G2CONF} MOZILLA_PLUGINDIR=/usr/$(get_libdir)/nsbrowser/plugins"
-
-	G2CONF="${G2CONF} --disable-vala --disable-vanity --enable-gstreamer --with-dbus"
-
-	if use gnome ; then
-	    G2CONF="${G2CONF} --disable-gtk --enable-nautilus"
-	else
-	    G2CONF="${G2CONF} --enable-gtk --disable-nautilus"
-	fi
-
-	if use nsplugin ; then
-	    G2CONF="${G2CONF} --enable-browser-plugins"
-		if use xulrunner ; then
-			G2CONF="${G2CONF} --with-gecko=xulrunner"
-		elif use seamonkey ; then
-			G2CONF="${G2CONF} --with-gecko=seamonkey"
-		else
-			G2CONF="${G2CONF} --with-gecko=firefox"
-		fi
-	else
-	    G2CONF="${G2CONF} --disable-browser-plugins"
-	fi
-
-	# Plugin Configuration
-	G2CONF="${G2CONF} PLUGINDIR=/usr/$(get_libdir)/totem/plugins"
-	local plugins="screensaver,ontop,gromit,skipto"
-	use bluetooth && plugins="${plugins},bemused"
-	use galago && plugins="${plugins},galago"
-	use gnome && plugins="${plugins},media-player-keys,properties"
-	use lirc && plugins="${plugins},lirc"
-
-	G2CONF="${G2CONF} --with-plugins=${plugins}"
-
-	G2CONF="${G2CONF}		\
-		$(use_enable debug)	\
-		$(use_with hal)		\
-		$(use_enable lirc)	\
-		$(use_enable nvtv)	\
-		$(use_enable python)"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	if use nsplugin ; then
-		epatch "${FILESDIR}/${PN}-2.20.1-startup-notification.patch"
-		if ! use xulrunner && ! use seamonkey ; then
-			epatch "${FILESDIR}/${PN}-2.20.1-xpcom-hack.patch"
-		fi
-		eautoreconf
-	fi
-
-	sed -i -e 's:mozilla/plugins:nsbrowser/plugins:' browser-plugin/Makefile* || die "sed failed"
-
-	sed -i -e 's:.totem-plugin.desktop.in:.totem-plugin.in:' \
-		src/plugins/{galago,lirc,media-player-keys,ontop,screensaver}/Makefile* \
-	|| die "sed failed"
-
-}
-
-src_compile() {
-	#fixme: why does it need write access here, probably need to set up a fake
-	#home in /var/tmp like other pkgs do
-
-	addpredict "/root/.gconfd"
-	addpredict "/root/.gconf"
-	addpredict "/root/.gnome2"
-
-	gnome2_src_compile
-}