Fix a segfault which affected Empathy.

Package-Manager: portage-2.1.3.19

5 files changed, 97 insertions, 5 deletions

diff --git a/net-im/telepathy-mission-control/ChangeLog b/net-im/telepathy-mission-control/ChangeLog
index af09b1aef6ac..b996426aced7 100644
--- a/net-im/telepathy-mission-control/ChangeLog
+++ b/net-im/telepathy-mission-control/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/telepathy-mission-control
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/telepathy-mission-control/ChangeLog,v 1.9 2007/12/18 11:54:12 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/telepathy-mission-control/ChangeLog,v 1.10 2007/12/29 15:29:06 coldwind Exp $
+
+*telepathy-mission-control-4.51-r1 (29 Dec 2007)
+
+  29 Dec 2007; Santiago M. Mola <coldwind@gentoo.org>
+  +files/telepathy-mission-control-4.51-fix-segfault.patch,
+  +telepathy-mission-control-4.51-r1.ebuild:
+  Fix a segfault which affected Empathy.
 
 *telepathy-mission-control-4.51 (18 Dec 2007)
 
diff --git a/net-im/telepathy-mission-control/Manifest b/net-im/telepathy-mission-control/Manifest
index 0567a9ea9680..47c685547652 100644
--- a/net-im/telepathy-mission-control/Manifest
+++ b/net-im/telepathy-mission-control/Manifest
@@ -1,3 +1,7 @@
+AUX telepathy-mission-control-4.51-fix-segfault.patch 1008 RMD160 4594a9443fd6ed745d0ba9d5b3d98d5613b39b0f SHA1 6365bb826d9bc4355ed2a737168485a3acf24daa SHA256 ec903f6f47de0587e7fb54bae2cbb1b023df638d38787500144a1d4eb627b57a
+MD5 f229f46402814f8df213b64b1a71d0b2 files/telepathy-mission-control-4.51-fix-segfault.patch 1008
+RMD160 4594a9443fd6ed745d0ba9d5b3d98d5613b39b0f files/telepathy-mission-control-4.51-fix-segfault.patch 1008
+SHA256 ec903f6f47de0587e7fb54bae2cbb1b023df638d38787500144a1d4eb627b57a files/telepathy-mission-control-4.51-fix-segfault.patch 1008
 DIST telepathy-mission-control-4.42.tar.gz 582107 RMD160 94ed272b6d0e4c99d04c0f6cd2139bf0ccac0219 SHA1 864e0b27f921beb58f2b37a231e6c44dad14d993 SHA256 b78a3ea14542511243e3549c573f6eec08637f899f7fcc75ea4c675b6b689491
 DIST telepathy-mission-control-4.49.tar.gz 583584 RMD160 d3cdf19d3371940dd9084b45ebc2b0e68d7df2de SHA1 0da40d42c356a397d40e650c406b002723adb34d SHA256 c7cbaa8edec5c9be78aa954938c64b57e6c2c0f13de260c88fefdbf849e94d4d
 DIST telepathy-mission-control-4.51.tar.gz 584321 RMD160 7bf42c11f89a940426e23a636fd2d04964636070 SHA1 19d216013db73f540d1a44a69291b5e5b6b1cc11 SHA256 974d2cbece40307dd569378940d13cc3c57abdb3f5a1f0407da2512a3cd2b604
@@ -9,14 +13,18 @@ EBUILD telepathy-mission-control-4.49.ebuild 952 RMD160 c525a8c8870c8cfa74d66acf
 MD5 085fa9c42cd7fb8a04a0d344c403bb51 telepathy-mission-control-4.49.ebuild 952
 RMD160 c525a8c8870c8cfa74d66acf68f57c88bb4cc0e8 telepathy-mission-control-4.49.ebuild 952
 SHA256 b7d6a9295c8aa6a8adb3d1ab09bc4b88c5db5545bc5999ef18543d256bbf1fcb telepathy-mission-control-4.49.ebuild 952
+EBUILD telepathy-mission-control-4.51-r1.ebuild 1058 RMD160 af5e85dcdd36c7f1343e00b5a2e59e1b8a143cec SHA1 97b5c981d98cf8267ec27a6506707f3331650550 SHA256 7f868cdf2d12a8dc60941fc7e492dfa523ccfb1fb219ed5f4feacbb2dd021b91
+MD5 1812dfbc2301674bb916d138bb567dc8 telepathy-mission-control-4.51-r1.ebuild 1058
+RMD160 af5e85dcdd36c7f1343e00b5a2e59e1b8a143cec telepathy-mission-control-4.51-r1.ebuild 1058
+SHA256 7f868cdf2d12a8dc60941fc7e492dfa523ccfb1fb219ed5f4feacbb2dd021b91 telepathy-mission-control-4.51-r1.ebuild 1058
 EBUILD telepathy-mission-control-4.51.ebuild 951 RMD160 8763563a7589d89c191c9386572c3cbae1a35ebd SHA1 89dbab3efbef0d5fb8a395206b8a3e7c608bc73d SHA256 9a7f959d296634cf6a652095a4d0fc1d6a3b1cb74179d9ac1c2433acd3fe5d5c
 MD5 253daa5740238a82df2068625c1ab9ae telepathy-mission-control-4.51.ebuild 951
 RMD160 8763563a7589d89c191c9386572c3cbae1a35ebd telepathy-mission-control-4.51.ebuild 951
 SHA256 9a7f959d296634cf6a652095a4d0fc1d6a3b1cb74179d9ac1c2433acd3fe5d5c telepathy-mission-control-4.51.ebuild 951
-MISC ChangeLog 1910 RMD160 a20b3284a2b4212d0973dc61a7d607199bd7caa2 SHA1 535bf2a2856cc27011abec6210a14bd4c48d6678 SHA256 5760274057c8992bf865cd786fee9608a2bc6dc8651d12ac37afb11140d40fec
-MD5 509725f869e6f8f6fe52754c943e19f4 ChangeLog 1910
-RMD160 a20b3284a2b4212d0973dc61a7d607199bd7caa2 ChangeLog 1910
-SHA256 5760274057c8992bf865cd786fee9608a2bc6dc8651d12ac37afb11140d40fec ChangeLog 1910
+MISC ChangeLog 2162 RMD160 285805c7226fa6a184036f47e335ef7490b43840 SHA1 8db0a0346f2ceda89d2018818d0618696bef8bbd SHA256 b347af9241f63819b455e11745139748eb0aa691fdd3429b9b80ed572a9cd877
+MD5 89408ff448393023c4e12013ae39eee6 ChangeLog 2162
+RMD160 285805c7226fa6a184036f47e335ef7490b43840 ChangeLog 2162
+SHA256 b347af9241f63819b455e11745139748eb0aa691fdd3429b9b80ed572a9cd877 ChangeLog 2162
 MISC metadata.xml 615 RMD160 ccb0eda186e9473c348e0342c86d81a865724bbc SHA1 cfe761e7b665f9bffa79cdc3f03aecb32a4a6e17 SHA256 6deb597b809324c5e44000dd3e4397441c7786a4537790904029d3350bab60fc
 MD5 0c97a18c3db171dc6cb59dd2d251a117 metadata.xml 615
 RMD160 ccb0eda186e9473c348e0342c86d81a865724bbc metadata.xml 615
@@ -30,3 +38,6 @@ SHA256 987aee59054f76cf076322e11b6cd068dc3a81de0ed211d54dc5321988911c5d files/di
 MD5 ea1a564a76ad90d1aaf9d665aa1d9ddf files/digest-telepathy-mission-control-4.51 292
 RMD160 d38c18841106d4fb9e558aa80b1e0a2e86867eef files/digest-telepathy-mission-control-4.51 292
 SHA256 609d2b16aede89709990d001c956b50f038224e64fef265a6f3db37f5d5332c0 files/digest-telepathy-mission-control-4.51 292
+MD5 ea1a564a76ad90d1aaf9d665aa1d9ddf files/digest-telepathy-mission-control-4.51-r1 292
+RMD160 d38c18841106d4fb9e558aa80b1e0a2e86867eef files/digest-telepathy-mission-control-4.51-r1 292
+SHA256 609d2b16aede89709990d001c956b50f038224e64fef265a6f3db37f5d5332c0 files/digest-telepathy-mission-control-4.51-r1 292
diff --git a/net-im/telepathy-mission-control/files/digest-telepathy-mission-control-4.51-r1 b/net-im/telepathy-mission-control/files/digest-telepathy-mission-control-4.51-r1
new file mode 100644
index 000000000000..1b36e6a1ad9b
--- /dev/null
+++ b/net-im/telepathy-mission-control/files/digest-telepathy-mission-control-4.51-r1
@@ -0,0 +1,3 @@
+MD5 7ca18503a7a64ddedf735659820142bf telepathy-mission-control-4.51.tar.gz 584321
+RMD160 7bf42c11f89a940426e23a636fd2d04964636070 telepathy-mission-control-4.51.tar.gz 584321
+SHA256 974d2cbece40307dd569378940d13cc3c57abdb3f5a1f0407da2512a3cd2b604 telepathy-mission-control-4.51.tar.gz 584321
diff --git a/net-im/telepathy-mission-control/files/telepathy-mission-control-4.51-fix-segfault.patch b/net-im/telepathy-mission-control/files/telepathy-mission-control-4.51-fix-segfault.patch
new file mode 100644
index 000000000000..ab4e62a1f56b
--- /dev/null
+++ b/net-im/telepathy-mission-control/files/telepathy-mission-control-4.51-fix-segfault.patch
@@ -0,0 +1,29 @@
+http://sourceforge.net/tracker/index.php?func=detail&aid=1849202&group_id=190214&atid=932444
+--- src/mcd-connection.c.orig	2007-12-29 16:16:33.000000000 +0100
++++ src/mcd-connection.c	2007-12-29 16:18:41.000000000 +0100
+@@ -662,6 +662,7 @@
+ pending_channel_free (McdPendingChannel *pc)
+ {
+     g_object_unref (pc->channel);
++    g_free (pc->type);
+     g_free (pc);
+ }
+ 
+@@ -2186,7 +2187,7 @@
+     pc = g_malloc (sizeof(McdPendingChannel));
+     pc->handle = chan_handle;
+     pc->handle_type = chan_handle_type;
+-    pc->type = chan_type;
++    pc->type = g_strdup(chan_type);
+     pc->channel = channel;
+     priv->pending_channels = g_list_prepend (priv->pending_channels, pc);
+     
+@@ -2234,7 +2235,7 @@
+ 	pc = g_malloc (sizeof(McdPendingChannel));
+ 	pc->handle = req->channel_handle;
+ 	pc->handle_type = req->channel_handle_type;
+-	pc->type = req->channel_type;
++	pc->type = g_strdup(req->channel_type);
+ 	pc->channel = channel;
+ 	priv->pending_channels = g_list_prepend (priv->pending_channels, pc);
+ 
diff --git a/net-im/telepathy-mission-control/telepathy-mission-control-4.51-r1.ebuild b/net-im/telepathy-mission-control/telepathy-mission-control-4.51-r1.ebuild
new file mode 100644
index 000000000000..412c77e812f8
--- /dev/null
+++ b/net-im/telepathy-mission-control/telepathy-mission-control-4.51-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/telepathy-mission-control/telepathy-mission-control-4.51-r1.ebuild,v 1.1 2007/12/29 15:29:06 coldwind Exp $
+
+inherit eutils
+
+DESCRIPTION="Nokia's implementation of a Telepathy Mission Control"
+HOMEPAGE="http://telepathy.freedesktop.org/wiki/Mission_Control"
+SRC_URI="mirror://sourceforge/mission-control/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND=">=net-libs/libtelepathy-0.3.0
+	>=dev-libs/dbus-glib-0.51
+	>=gnome-base/gconf-2
+	>=dev-util/pkgconfig-0.12.0
+	>=dev-libs/glib-2"
+
+DEPEND="${RDEPEND}
+	dev-libs/libxslt
+	doc? ( >=dev-util/gtk-doc-1.3 )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-fix-segfault.patch
+}
+
+src_compile() {
+	econf $(use_enable doc gtk-doc) \
+		--enable-server \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog
+}