Fixing up segfaults

(Portage version: 2.1_pre3-r1)

4 files changed, 39 insertions, 4 deletions

diff --git a/net-misc/tsclient/ChangeLog b/net-misc/tsclient/ChangeLog
index 6ad6cd849844..bb19ce53b2c7 100644
--- a/net-misc/tsclient/ChangeLog
+++ b/net-misc/tsclient/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/tsclient
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tsclient/ChangeLog,v 1.18 2006/01/13 05:56:50 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tsclient/ChangeLog,v 1.19 2006/01/14 18:59:50 compnerd Exp $
+
+  14 Jan 2006; Saleem Abdulrasool <compnerd@gentoo.org>
+  +files/tsclient-0.140-connect-path-builder.patch, tsclient-0.140.ebuild:
+  Fixing segfaults on quit and connect.
 
 *tsclient-0.140 (13 Jan 2006)
 
diff --git a/net-misc/tsclient/Manifest b/net-misc/tsclient/Manifest
index dc0f458226e8..9e22ee9bb491 100644
--- a/net-misc/tsclient/Manifest
+++ b/net-misc/tsclient/Manifest
@@ -1,13 +1,14 @@
-MD5 a17bc00d48178b2131c07093092a7ed5 ChangeLog 2508
+MD5 b52061e6681108c01437ea8fd74abab3 ChangeLog 2680
 MD5 c4c8d589f3b68a9f794079a97adb9cf6 files/digest-tsclient-0.116 66
 MD5 4892c42265f06312c5e7a58b01a029b7 files/digest-tsclient-0.120 66
 MD5 c21884e87daa4b14b26f59b994536c2b files/digest-tsclient-0.124 66
 MD5 cdf0181fb9c19219f34ccd186a4d9074 files/digest-tsclient-0.132 66
 MD5 c5d48433a7208a21b511483893391a19 files/digest-tsclient-0.140 66
+MD5 28f796543aec1ed2f7f135b392d15585 files/tsclient-0.140-connect-path-builder.patch 708
 MD5 59e31cc311a4c1c31a6ace61a722e35d files/tsclient.desktop 226
 MD5 25263231f48056d59cbf1f1f6b180e5e metadata.xml 334
 MD5 f3efa41f0f0923e91c2aa8a1d673d797 tsclient-0.116.ebuild 851
 MD5 6ac2566cce8fc0d7b925e957dc22805b tsclient-0.120.ebuild 901
 MD5 8f6a41796ba49e9713b8b83f6b159044 tsclient-0.124.ebuild 856
 MD5 43e8d1ac341bfa88e65113aadd0e52af tsclient-0.132.ebuild 806
-MD5 cfb7116398662103cbce442f222c744a tsclient-0.140.ebuild 885
+MD5 0feb22f31142d2514f8549c60df8c364 tsclient-0.140.ebuild 1042
diff --git a/net-misc/tsclient/files/tsclient-0.140-connect-path-builder.patch b/net-misc/tsclient/files/tsclient-0.140-connect-path-builder.patch
new file mode 100644
index 000000000000..7fcbfd624b65
--- /dev/null
+++ b/net-misc/tsclient/files/tsclient-0.140-connect-path-builder.patch
@@ -0,0 +1,20 @@
+--- src/connect.c	2006-01-14 12:29:49.000000000 -0600
++++ src/connect.c	2006-01-14 12:30:08.000000000 -0600
+@@ -1288,7 +1288,7 @@
+   GtkWidget *main_window;
+   rdp_file *rdp = NULL;
+   gchar *home = tsc_home_path ();
+-  gchar *filename = g_build_path ("/", home, "last.tsc");
++  gchar *filename = g_build_path ("/", home, "last.tsc", NULL);
+ 
+   #ifdef TSCLIENT_DEBUG
+   printf ("on_btnConnect_clicked\n");
+@@ -1325,7 +1325,7 @@
+   GtkWidget *main_window;
+   rdp_file *rdp_last = NULL;
+   gchar *home = tsc_home_path ();
+-  gchar *filename = g_build_path ("/", home, "last.tsc");
++  gchar *filename = g_build_path ("/", home, "last.tsc", NULL);
+ 
+   #ifdef TSCLIENT_DEBUG
+   printf ("on_btnQuit_clicked\n");
diff --git a/net-misc/tsclient/tsclient-0.140.ebuild b/net-misc/tsclient/tsclient-0.140.ebuild
index 230ae06d0198..a644af25c75d 100644
--- a/net-misc/tsclient/tsclient-0.140.ebuild
+++ b/net-misc/tsclient/tsclient-0.140.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tsclient/tsclient-0.140.ebuild,v 1.1 2006/01/13 05:56:50 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tsclient/tsclient-0.140.ebuild,v 1.2 2006/01/14 18:59:50 compnerd Exp $
+
+inherit eutils
 
 DESCRIPTION="GTK2 frontend for rdesktop"
 HOMEPAGE="http://www.gnomepro.com/tsclient"
@@ -22,6 +24,14 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.27
 	dev-util/pkgconfig"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Patch for segfaults on connect and quit
+	epatch ${FILESDIR}/${PN}-0.140-connect-path-builder.patch
+}
+
 src_compile() {
 	econf $(use_enable debug) || die "configure failed"
 	emake || die "make failed"