version bump with Chainsaw wrt security bug #415393, rm deprecated -r100

(Portage version: 2.2.0_alpha108/cvs/Linux x86_64)

3 files changed, 11 insertions, 505 deletions

diff --git a/net-im/pidgin/ChangeLog b/net-im/pidgin/ChangeLog
index 4ca8b48d99d8..371758069ac8 100644
--- a/net-im/pidgin/ChangeLog
+++ b/net-im/pidgin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/pidgin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.277 2012/05/22 13:57:32 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.278 2012/05/28 18:04:05 hasufell Exp $
+
+*pidgin-2.10.4 (28 May 2012)
+
+  28 May 2012; Julian Ospald <hasufell@gentoo.org>
+  -files/port-to-farstream-v5.patch, -pidgin-2.10.3-r100.ebuild,
+  +pidgin-2.10.4.ebuild:
+  version bump with Chainsaw wrt security bug #415393, rm deprecated -r100
 
   22 May 2012; Jeremy Olexa <darkside@gentoo.org> pidgin-2.10.3.ebuild,
   pidgin-2.10.3-r100.ebuild:
diff --git a/net-im/pidgin/files/port-to-farstream-v5.patch b/net-im/pidgin/files/port-to-farstream-v5.patch
deleted file mode 100644
index 10b4a6d334e7..000000000000
--- a/net-im/pidgin/files/port-to-farstream-v5.patch
+++ /dev/null
@@ -1,499 +0,0 @@
-diff -aur pidgin-2.10.3-orig//configure.ac pidgin-2.10.3/configure.ac
---- pidgin-2.10.3-orig//configure.ac	2012-03-25 23:49:14.000000000 -0400
-+++ pidgin-2.10.3/configure.ac	2012-03-31 16:23:09.772818869 -0400
-@@ -786,18 +786,18 @@
- fi
- 
- dnl #######################################################################
--dnl # Check for Farsight
-+dnl # Check for Farstream
- dnl #######################################################################
--AC_ARG_ENABLE(farsight,
--	[AC_HELP_STRING([--disable-farsight], [compile without farsight support])],
--	enable_farsight="$enableval", enable_farsight="yes")
--if test "x$enable_farsight" != "xno"; then
--	PKG_CHECK_MODULES(FARSIGHT, [farsight2-0.10 >= 0.0.9], [
--		AC_DEFINE(USE_FARSIGHT, 1, [Use Farsight for voice and video])
--		AC_SUBST(FARSIGHT_CFLAGS)
--		AC_SUBST(FARSIGHT_LIBS)
-+AC_ARG_ENABLE(farstream,
-+	[AC_HELP_STRING([--disable-farstream], [compile without farstream support])],
-+	enable_farstream="$enableval", enable_farstream="yes")
-+if test "x$enable_farstream" != "xno"; then
-+	PKG_CHECK_MODULES(FARSTREAM, [farstream-0.1], [
-+		AC_DEFINE(USE_FARSTREAM, 1, [Use Farstream for voice and video])
-+		AC_SUBST(FARSTREAM_CFLAGS)
-+		AC_SUBST(FARSTREAM_LIBS)
- 	], [
--		enable_farsight="no"
-+		enable_farstream="no"
- 	])
- fi
- 
-@@ -808,20 +808,20 @@
- 	[AC_HELP_STRING([--disable-vv], [compile without voice and video support])],
- 	enable_vv="$enableval", enable_vv="yes")
- if test "x$enable_vv" != "xno"; then
--	if test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farsight" != "xno"; then
-+	if test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farstream" != "xno"; then
- 		AC_DEFINE(USE_VV, 1, [Use voice and video])
- 	else
- 		enable_vv="no"
- 		if test "x$force_deps" = "xyes"; then
- 			AC_MSG_ERROR([
- Dependencies for voice/video were not met.
--Install the necessary gstreamer and farsight packages first.
-+Install the necessary gstreamer and farstream packages first.
- Or use --disable-vv if you do not need voice/video support.
- 			])
- 		fi
- 	fi
- fi
--AM_CONDITIONAL(USE_VV, test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farsight" != "xno")
-+AM_CONDITIONAL(USE_VV, test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farstream" != "xno")
- 
- dnl #######################################################################
- dnl # Check for Internationalized Domain Name support
-Only in pidgin-2.10.3: configure.ac.orig
-diff -aur pidgin-2.10.3-orig//libpurple/Makefile.am pidgin-2.10.3/libpurple/Makefile.am
---- pidgin-2.10.3-orig//libpurple/Makefile.am	2012-03-25 23:49:15.000000000 -0400
-+++ pidgin-2.10.3/libpurple/Makefile.am	2012-03-31 16:23:09.776152155 -0400
-@@ -306,7 +306,7 @@
- 	$(LIBXML_LIBS) \
- 	$(NETWORKMANAGER_LIBS) \
- 	$(INTLLIBS) \
--	$(FARSIGHT_LIBS) \
-+	$(FARSTREAM_LIBS) \
- 	$(GSTREAMER_LIBS) \
- 	$(GSTINTERFACES_LIBS) \
- 	$(IDN_LIBS) \
-@@ -322,7 +322,7 @@
- 	$(DEBUG_CFLAGS) \
- 	$(DBUS_CFLAGS) \
- 	$(LIBXML_CFLAGS) \
--	$(FARSIGHT_CFLAGS) \
-+	$(FARSTREAM_CFLAGS) \
- 	$(GSTREAMER_CFLAGS) \
- 	$(GSTINTERFACES_CFLAGS) \
- 	$(IDN_CFLAGS) \
-diff -aur pidgin-2.10.3-orig//libpurple/media/backend-fs2.c pidgin-2.10.3/libpurple/media/backend-fs2.c
---- pidgin-2.10.3-orig//libpurple/media/backend-fs2.c	2012-03-25 23:49:16.000000000 -0400
-+++ pidgin-2.10.3/libpurple/media/backend-fs2.c	2012-03-31 16:41:52.840615660 -0400
-@@ -1,5 +1,5 @@
- /**
-- * @file backend-fs2.c Farsight 2 backend for media API
-+ * @file backend-fs2.c Farstream backend for media API
-  * @ingroup core
-  */
- 
-@@ -34,8 +34,9 @@
- #include "network.h"
- #include "media-gst.h"
- 
--#include <gst/farsight/fs-conference-iface.h>
--#include <gst/farsight/fs-element-added-notifier.h>
-+#include <farstream/fs-conference.h>
-+#include <farstream/fs-element-added-notifier.h>
-+#include <farstream/fs-utils.h>
- 
- /** @copydoc _PurpleMediaBackendFs2Class */
- typedef struct _PurpleMediaBackendFs2Class PurpleMediaBackendFs2Class;
-@@ -112,6 +113,8 @@
- 	gchar *participant;
- 	FsStream *stream;
- 
-+        gboolean supports_add;
-+
- 	GstElement *src;
- 	GstElement *tee;
- 	GstElement *volume;
-@@ -147,6 +150,8 @@
- 	FsConference *conference;
- 	gchar *conference_type;
- 
-+        FsElementAddedNotifier *notifier;
-+
- 	GHashTable *sessions;
- 	GHashTable *participants;
- 
-@@ -212,6 +217,11 @@
- 
- 	purple_debug_info("backend-fs2", "purple_media_backend_fs2_dispose\n");
- 
-+	if (priv->notifier) {
-+		g_object_unref(priv->notifier);
-+		priv->notifier = NULL;
-+	}
-+
- 	if (priv->confbin) {
- 		GstElement *pipeline;
- 
-@@ -846,7 +856,7 @@
- 			priv->conference != FS_CONFERENCE(src))
- 		return;
- 
--	if (gst_structure_has_name(msg->structure, "farsight-error")) {
-+	if (gst_structure_has_name(msg->structure, "farstream-error")) {
- 		FsError error_no;
- 		gst_structure_get_enum(msg->structure, "error-no",
- 				FS_TYPE_ERROR, (gint*)&error_no);
-@@ -859,24 +869,9 @@
- 						" packages."));
- 				purple_media_end(priv->media, NULL, NULL);
- 				break;
--			case FS_ERROR_NO_CODECS_LEFT:
--				purple_media_error(priv->media, _("No codecs"
--						" left. Your codec"
--						" preferences in"
--						" fs-codecs.conf are too"
--						" strict."));
--				purple_media_end(priv->media, NULL, NULL);
--				break;
--			case FS_ERROR_UNKNOWN_CNAME:
--			/*
--			 * Unknown CName is only a problem for the
--			 * multicast transmitter which isn't used.
--			 * It is also deprecated.
--			 */
--				break;
- 			default:
- 				purple_debug_error("backend-fs2",
--						"farsight-error: %i: %s\n",
-+						"farstream-error: %i: %s\n",
- 						error_no,
- 					  	gst_structure_get_string(
- 						msg->structure, "error-msg"));
-@@ -885,11 +880,11 @@
- 
- 		if (FS_ERROR_IS_FATAL(error_no)) {
- 			purple_media_error(priv->media, _("A non-recoverable "
--					"Farsight2 error has occurred."));
-+					"Farstream error has occurred."));
- 			purple_media_end(priv->media, NULL, NULL);
- 		}
- 	} else if (gst_structure_has_name(msg->structure,
--			"farsight-new-local-candidate")) {
-+			"farstream-new-local-candidate")) {
- 		const GValue *value;
- 		FsStream *stream;
- 		FsCandidate *local_candidate;
-@@ -924,7 +919,7 @@
- 				session->id, name, candidate);
- 		g_object_unref(candidate);
- 	} else if (gst_structure_has_name(msg->structure,
--			"farsight-local-candidates-prepared")) {
-+			"farstream-local-candidates-prepared")) {
- 		const GValue *value;
- 		FsStream *stream;
- 		FsParticipant *participant;
-@@ -942,7 +937,7 @@
- 		g_signal_emit_by_name(self, "candidates-prepared",
- 				session->id, name);
- 	} else if (gst_structure_has_name(msg->structure,
--			"farsight-new-active-candidate-pair")) {
-+			"farstream-new-active-candidate-pair")) {
- 		const GValue *value;
- 		FsStream *stream;
- 		FsCandidate *local_candidate;
-@@ -976,7 +971,7 @@
- 		g_object_unref(lcandidate);
- 		g_object_unref(rcandidate);
- 	} else if (gst_structure_has_name(msg->structure,
--			"farsight-recv-codecs-changed")) {
-+			"farstream-recv-codecs-changed")) {
- 		const GValue *value;
- 		GList *codecs;
- 		FsCodec *codec;
-@@ -986,10 +981,10 @@
- 		codec = codecs->data;
- 
- 		purple_debug_info("backend-fs2",
--				"farsight-recv-codecs-changed: %s\n",
-+				"farstream-recv-codecs-changed: %s\n",
- 				codec->encoding_name);
- 	} else if (gst_structure_has_name(msg->structure,
--			"farsight-component-state-changed")) {
-+			"farstream-component-state-changed")) {
- 		const GValue *value;
- 		FsStreamState fsstate;
- 		guint component;
-@@ -1025,11 +1020,11 @@
- 		}
- 
- 		purple_debug_info("backend-fs2",
--				"farsight-component-state-changed: "
-+				"farstream-component-state-changed: "
- 				"component: %u state: %s\n",
- 				component, state);
- 	} else if (gst_structure_has_name(msg->structure,
--			"farsight-send-codec-changed")) {
-+			"farstream-send-codec-changed")) {
- 		const GValue *value;
- 		FsCodec *codec;
- 		gchar *codec_str;
-@@ -1039,12 +1034,12 @@
- 		codec_str = fs_codec_to_string(codec);
- 
- 		purple_debug_info("backend-fs2",
--				"farsight-send-codec-changed: codec: %s\n",
-+				"farstream-send-codec-changed: codec: %s\n",
- 				codec_str);
- 
- 		g_free(codec_str);
- 	} else if (gst_structure_has_name(msg->structure,
--			"farsight-codecs-changed")) {
-+			"farstream-codecs-changed")) {
- 		const GValue *value;
- 		FsSession *fssession;
- 		GList *sessions;
-@@ -1220,8 +1215,12 @@
- 				purple_media_is_initiator(media, sid, name))
- 			return;
- 
--		fs_stream_set_remote_candidates(stream->stream,
--				stream->remote_candidates, &err);
-+		if (stream->supports_add)
-+		  fs_stream_add_remote_candidates(stream->stream,
-+			  	stream->remote_candidates, &err);
-+		else
-+		  fs_stream_force_remote_candidates(stream->stream,
-+			  	stream->remote_candidates, &err);
- 
- 		if (err == NULL)
- 			return;
-@@ -1301,6 +1300,7 @@
- 	GstElement *pipeline;
- 	GstBus *bus;
- 	gchar *name;
-+	GKeyFile *default_props;
- 
- 	priv->conference = FS_CONFERENCE(
- 			gst_element_factory_make(priv->conference_type, NULL));
-@@ -1343,6 +1343,14 @@
- 		return FALSE;
- 	}
- 
-+	default_props = fs_utils_get_default_element_properties(GST_ELEMENT(priv->conference));
-+	if (default_props != NULL) {
-+		priv->notifier = fs_element_added_notifier_new();
-+		fs_element_added_notifier_add(priv->notifier,
-+					      GST_BIN(priv->confbin));
-+		fs_element_added_notifier_set_properties_from_keyfile(priv->notifier, default_props);
-+	}
-+
- 	g_signal_connect(G_OBJECT(bus), "message",
- 			G_CALLBACK(gst_bus_cb), self);
- 	gst_object_unref(bus);
-@@ -1559,7 +1567,7 @@
- 	 * receiving the src-pad-added signal.
- 	 * Only works for non-multicast FsRtpSessions.
- 	 */
--	if (is_nice || !strcmp(transmitter, "rawudp"))
-+	if (!!strcmp(transmitter, "multicast"))
- 		g_object_set(G_OBJECT(session->session),
- 				"no-rtcp-timeout", 0, NULL);
- 
-@@ -1612,7 +1620,7 @@
- 	GError *err = NULL;
- 
- 	participant = fs_conference_new_participant(
--			priv->conference, name, &err);
-+			priv->conference, &err);
- 
- 	if (err) {
- 		purple_debug_error("backend-fs2",
-@@ -1622,6 +1630,12 @@
- 		return FALSE;
- 	}
- 
-+	if (g_object_class_find_property(G_OBJECT_GET_CLASS(participant),
-+					 "cname")) {
-+	  g_object_set(participant, "cname", name, NULL);
-+	}
-+
-+
- 	if (!priv->participants) {
- 		purple_debug_info("backend-fs2",
- 				"Creating hash table for participants\n");
-@@ -1786,6 +1800,40 @@
- 		}
- 	}
- 
-+
-+	session = get_session(self, sess_id);
-+
-+	if (session == NULL) {
-+		purple_debug_error("backend-fs2",
-+				"Couldn't find session to create stream.\n");
-+		return FALSE;
-+	}
-+
-+	participant = get_participant(self, who);
-+
-+	if (participant == NULL) {
-+		purple_debug_error("backend-fs2", "Couldn't find "
-+				"participant to create stream.\n");
-+		return FALSE;
-+	}
-+
-+	fsstream = fs_session_new_stream(session->session, participant,
-+			initiator == TRUE ? type_direction :
-+			(type_direction & FS_DIRECTION_RECV), &err);
-+
-+	if (fsstream == NULL) {
-+		if (err) {
-+			purple_debug_error("backend-fs2",
-+					"Error creating stream: %s\n",
-+					err && err->message ?
-+					err->message : "NULL");
-+			g_error_free(err);
-+		} else
-+			purple_debug_error("backend-fs2",
-+					"Error creating stream\n");
-+		return FALSE;
-+	}
-+
- 	memcpy(_params, params, sizeof(GParameter) * num_params);
- 
- 	/* set the controlling mode parameter */
-@@ -1840,45 +1888,22 @@
- 		_num_params++;
- 	}
- 
--	session = get_session(self, sess_id);
- 
--	if (session == NULL) {
--		purple_debug_error("backend-fs2",
--				"Couldn't find session to create stream.\n");
--		return FALSE;
--	}
--
--	participant = get_participant(self, who);
--
--	if (participant == NULL) {
--		purple_debug_error("backend-fs2", "Couldn't find "
--				"participant to create stream.\n");
--		return FALSE;
-+	if(!fs_stream_set_transmitter(fsstream, transmitter,
-+				      _params, _num_params, &err)) {
-+	     purple_debug_error("backend-fs2", "Could not set transmitter %s: %s.\n", transmitter, err->message);
-+	     g_clear_error(&err);
-+	     g_free(_params);
-+	     return FALSE;
- 	}
--
--	fsstream = fs_session_new_stream(session->session, participant,
--			initiator == TRUE ? type_direction :
--			(type_direction & FS_DIRECTION_RECV), transmitter,
--			_num_params, _params, &err);
- 	g_free(_params);
- 
--	if (fsstream == NULL) {
--		if (err) {
--			purple_debug_error("backend-fs2",
--					"Error creating stream: %s\n",
--					err && err->message ?
--					err->message : "NULL");
--			g_error_free(err);
--		} else
--			purple_debug_error("backend-fs2",
--					"Error creating stream\n");
--		return FALSE;
--	}
- 
- 	stream = g_new0(PurpleMediaBackendFs2Stream, 1);
- 	stream->participant = g_strdup(who);
- 	stream->session = session;
- 	stream->stream = fsstream;
-+	stream->supports_add = !strcmp(transmitter, "nice");
- 
- 	priv->streams =	g_list_append(priv->streams, stream);
- 
-@@ -1991,7 +2016,11 @@
- 	if (purple_media_is_initiator(priv->media, sess_id, participant) ||
- 			purple_media_accepted(
- 			priv->media, sess_id, participant)) {
--		fs_stream_set_remote_candidates(stream->stream,
-+  	        if (stream->supports_add)
-+		     fs_stream_add_remote_candidates(stream->stream,
-+				stream->remote_candidates, &err);
-+		else
-+		     fs_stream_force_remote_candidates(stream->stream,
- 				stream->remote_candidates, &err);
- 
- 		if (err) {
-@@ -2016,6 +2045,7 @@
- 	if (sess_id != NULL) {
- 		PurpleMediaBackendFs2Session *session = get_session(
- 				PURPLE_MEDIA_BACKEND_FS2(self), sess_id);
-+		GList *codecs = NULL;
- 
- 		if (session == NULL)
- 			return FALSE;
-@@ -2023,21 +2053,31 @@
- 		if (session->type & (PURPLE_MEDIA_SEND_AUDIO |
- 				PURPLE_MEDIA_SEND_VIDEO))
- 			g_object_get(session->session,
--					"codecs-ready", &ret, NULL);
-+					"codecs", &codecs, NULL);
- 		else
- 			ret = TRUE;
-+		if (codecs) {
-+			fs_codec_list_destroy (codecs);
-+			ret = TRUE;
-+		}
- 	} else {
- 		GList *values = g_hash_table_get_values(priv->sessions);
- 
- 		for (; values; values = g_list_delete_link(values, values)) {
- 			PurpleMediaBackendFs2Session *session = values->data;
-+			GList *codecs = NULL;
-+
- 			if (session->type & (PURPLE_MEDIA_SEND_AUDIO |
- 					PURPLE_MEDIA_SEND_VIDEO))
- 				g_object_get(session->session,
--						"codecs-ready", &ret, NULL);
-+						"codecs", &codecs, NULL);
- 			else
- 				ret = TRUE;
- 
-+			if (codecs) {
-+				fs_codec_list_destroy (codecs);
-+				ret = TRUE;
-+			}
- 			if (ret == FALSE)
- 				break;
- 		}
-Only in pidgin-2.10.3/libpurple/media: backend-fs2.c~
-diff -aur pidgin-2.10.3-orig//libpurple/media.c pidgin-2.10.3/libpurple/media.c
---- pidgin-2.10.3-orig//libpurple/media.c	2012-03-25 23:49:16.000000000 -0400
-+++ pidgin-2.10.3/libpurple/media.c	2012-03-31 16:23:09.789485312 -0400
-@@ -1067,7 +1067,6 @@
- {
- #ifdef USE_VV
- 	PurpleMediaSession *session;
--	PurpleMediaStream *stream = NULL;
- 
- 	g_return_val_if_fail(PURPLE_IS_MEDIA(media), FALSE);
- 
-@@ -1103,7 +1102,7 @@
- 	}
- 
- 	if (purple_media_get_stream(media, sess_id, who) == NULL) {
--		stream = purple_media_insert_stream(session, who, initiator);
-+		purple_media_insert_stream(session, who, initiator);
- 
- 		g_signal_emit(media, purple_media_signals[STATE_CHANGED],
- 				0, PURPLE_MEDIA_STATE_NEW,
-diff -aur pidgin-2.10.3-orig//libpurple/mediamanager.c pidgin-2.10.3/libpurple/mediamanager.c
---- pidgin-2.10.3-orig//libpurple/mediamanager.c	2012-03-25 23:49:16.000000000 -0400
-+++ pidgin-2.10.3/libpurple/mediamanager.c	2012-03-31 16:23:09.789485312 -0400
-@@ -39,7 +39,7 @@
- #ifdef USE_VV
- #include <media/backend-fs2.h>
- 
--#include <gst/farsight/fs-element-added-notifier.h>
-+#include <farstream/fs-element-added-notifier.h>
- #include <gst/interfaces/xoverlay.h>
- 
- /** @copydoc _PurpleMediaManagerPrivate */
diff --git a/net-im/pidgin/pidgin-2.10.3-r100.ebuild b/net-im/pidgin/pidgin-2.10.4.ebuild
index 0031ee875d17..5403fe60bc73 100644
--- a/net-im/pidgin/pidgin-2.10.3-r100.ebuild
+++ b/net-im/pidgin/pidgin-2.10.4.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.10.3-r100.ebuild,v 1.3 2012/05/22 13:57:32 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.10.4.ebuild,v 1.1 2012/05/28 18:04:05 hasufell Exp $
 
 EAPI=4
 
 GENTOO_DEPEND_ON_PERL=no
-inherit flag-o-matic eutils toolchain-funcs multilib perl-app gnome2 python autotools
+inherit flag-o-matic eutils toolchain-funcs multilib perl-app gnome2 python
 
 DESCRIPTION="GTK Instant Messenger client"
 HOMEPAGE="http://pidgin.im/"
@@ -40,7 +40,7 @@ RDEPEND="
 		prediction? ( >=dev-db/sqlite-3.3:3 ) )
 	gstreamer? ( =media-libs/gstreamer-0.10*
 		=media-libs/gst-plugins-good-0.10*
-		net-libs/farstream
+		|| ( net-libs/farstream net-libs/farsight2 )
 		media-plugins/gst-plugins-meta
 		media-plugins/gst-plugins-gconf )
 	zeroconf? ( net-dns/avahi[dbus] )
@@ -134,8 +134,6 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-2.10.0-gold.patch"
-	epatch "${FILESDIR}/port-to-farstream-v5.patch"
-	eautoreconf
 }
 
 src_configure() {