Fix SIGSEGV for gftp_expand_path function

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 73 insertions, 3 deletions

diff --git a/net-ftp/gftp/ChangeLog b/net-ftp/gftp/ChangeLog
index fcf04241b65f..7587a375f99d 100644
--- a/net-ftp/gftp/ChangeLog
+++ b/net-ftp/gftp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-ftp/gftp
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/gftp/ChangeLog,v 1.76 2009/02/07 21:12:17 armin76 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/gftp/ChangeLog,v 1.77 2009/07/04 13:41:43 mrpouet Exp $
+
+*gftp-2.0.19-r1 (04 Jul 2009)
+
+  04 Jul 2009; Romain Perier <mrpouet@gentoo.org>
+  +gftp-2.0.19-r1.ebuild, +files/gftp-2.0.19-gftp-expand-path-sigsegv.patch:
+  Fix SIGSEGV for gftp_expand_path function
 
   07 Feb 2009; Raúl Porcel <armin76@gentoo.org> gftp-2.0.19.ebuild:
   sparc stable wrt #255853
diff --git a/net-ftp/gftp/Manifest b/net-ftp/gftp/Manifest
index 4c34edc23500..36904e080dd1 100644
--- a/net-ftp/gftp/Manifest
+++ b/net-ftp/gftp/Manifest
@@ -2,10 +2,12 @@ AUX gftp-2.0.18-188252.patch 2499 RMD160 c62486bb65aa0cebec5a7aa051715f796448e87
 AUX gftp-2.0.18-ipv6.patch 1230 RMD160 069d90a5bba600c2aa36ab8a4338234221157137 SHA1 789275d36b6061e8eba3c5fd905080c8b8d2706b SHA256 b65b31580e9be9ba04e4435919c6e53de7bd8f830b4e382129cb74ee9ad77e33
 AUX gftp-2.0.18-ssh2-read.patch 326 RMD160 512c6ffb7b31588a63c8efa48c15f70c33854862 SHA1 78d2d8e1a7921a8cfb456f8e414b11a6a04d11f3 SHA256 3ae9e62999aef08911dcc374433fa1797d277494cb86fdbb54e969098230582d
 AUX gftp-2.0.18-ssl-wildcardcert.patch 1004 RMD160 10a192946d56d6c830e7afc1172892f544c44fad SHA1 838669715273a265c3207b825386b281c41b2d4a SHA256 9f7c483ad83f7e12b492c9227ba548e089a4af455af3e8ea2ceff2b8e515e0c9
+AUX gftp-2.0.19-gftp-expand-path-sigsegv.patch 640 RMD160 b763dd908273ad5ef13237b783a7f60da99a0adb SHA1 0f70c5f1be7f135c7bbb5aac90c6f5b0278c0bdb SHA256 79bbc67cf428dc323d6aedd8b047d8f8fdad42cf11a1e75fa5c118d358f85def
 DIST gftp-2.0.18.tar.bz2 1374850 RMD160 0e0daea8543ae822b25635647360193362a2648d SHA1 c2468f1ff1fe978a5fab3a198e513558f3b48f5a SHA256 8145e18d1edf13e8cb6cd7a69bb69de5c46307086997755654488fb8282d38a2
 DIST gftp-2.0.19.tar.bz2 1687167 RMD160 74c272b8cb2dfa6561bb9e0dc9ef0b81d079dc07 SHA1 a5516403edf199e31194806478d4d8ac00daf828 SHA256 5306a46be96d6f4d23906cb1836fb3d732039621a6c7fcfa921acc21ac110bfd
 EBUILD gftp-2.0.18-r6.ebuild 1382 RMD160 636c87a0ae1be0814ce05a1ef564a6cd97abc5dd SHA1 7e8751af8157d7875f5584d8dc5241f1bb40d936 SHA256 8f3ab1dd368b841087870acebf33a0140f0c47cd8edf02f6e2688859775b2038
+EBUILD gftp-2.0.19-r1.ebuild 1063 RMD160 1f30a849ac0d51299ec03ffa13336902c715ab4a SHA1 61837c56a12dcf05a62693dd0558979e0ddd9b2c SHA256 c688b9a50ac3a5e53cb27d6ca59ab7191944505bc74918aca032b77a7f85ec7c
 EBUILD gftp-2.0.19.ebuild 885 RMD160 2871f370f0de63d30b2edda07ad8299448d195f6 SHA1 ace1189795c11c41337e4a6ef364370f71f3d6e0 SHA256 9dd3947cb74d477d4bda142cfcf7f7e59eee07d8e33fc5dc9fa18a7bca01b70d
 EBUILD gftp-9999.ebuild 1604 RMD160 4912b5dbac117d156d594e905a8104ede59b2552 SHA1 dc6e59e40c3f185a91f3a2881602fe05da07cd4f SHA256 43d2bf2a8ffb9282de555c290fdf11a9cf5c095a1e8d9c8d8bc87b5cc4aa8987
-MISC ChangeLog 10025 RMD160 303c8fdb7b6a5bf1a10335e86e19b9ac35a1a7b5 SHA1 5be1d6a76abf993f697843afc71155c03e3bbd48 SHA256 d33d28e1977e5dc5832c60916f6f25b392943be10c24a4935c316fc003694ffe
+MISC ChangeLog 10228 RMD160 70c5ebf541a60458dc35ff90a714bdcbf74d9ad3 SHA1 aa51f0abbfa589fa446a45704da69c72f65593ea SHA256 c265f486074d86b29406b0c50be74f12dff7a378da20a0a97495263c3ed7c172
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
diff --git a/net-ftp/gftp/files/gftp-2.0.19-gftp-expand-path-sigsegv.patch b/net-ftp/gftp/files/gftp-2.0.19-gftp-expand-path-sigsegv.patch
new file mode 100644
index 000000000000..f3e029dea0ca
--- /dev/null
+++ b/net-ftp/gftp/files/gftp-2.0.19-gftp-expand-path-sigsegv.patch
@@ -0,0 +1,21 @@
+Fix segmentation fault, when gftpui_run_chdir is called with directory=0x0,
+and then calls gftp_expand_path (src=0x0), 
+the NULL string was cloned using g_strdup, which returns NULL if 
+its only argument is NULL, then this returned string was unreferenced.
+
+ lib/misc.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/lib/misc.c b/lib/misc.c
+index 16c019b..2791466 100644
+--- a/lib/misc.c
++++ b/lib/misc.c
+@@ -143,6 +143,8 @@ gftp_expand_path (gftp_request * request, const char *src)
+        tempchar;
+   struct passwd *pw;
+ 
++  g_return_val_if_fail(src != NULL, NULL);
++
+   pw = NULL;
+   str = g_strdup (src);
+ 
diff --git a/net-ftp/gftp/gftp-2.0.19-r1.ebuild b/net-ftp/gftp/gftp-2.0.19-r1.ebuild
new file mode 100644
index 000000000000..27b5d3d88543
--- /dev/null
+++ b/net-ftp/gftp/gftp-2.0.19-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/gftp/gftp-2.0.19-r1.ebuild,v 1.1 2009/07/04 13:41:43 mrpouet Exp $
+
+inherit eutils
+
+DESCRIPTION="Gnome based FTP Client"
+SRC_URI="http://www.gftp.org/${P}.tar.bz2"
+HOMEPAGE="http://www.gftp.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="gtk ssl"
+
+RDEPEND=">=dev-libs/glib-2
+		 sys-devel/gettext
+		 sys-libs/ncurses
+		 sys-libs/readline
+		 gtk? ( >=x11-libs/gtk+-2 )
+		 ssl? ( dev-libs/openssl )"
+DEPEND="${RDEPEND}
+		>=dev-util/pkgconfig-0.9"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Fix SIGSEGV for gftp_expand_path function
+	epatch "${FILESDIR}/${P}-${PN}-expand-path-sigsegv.patch"
+}
+
+src_compile() {
+	econf $(use_enable gtk gtkport) $(use_enable ssl) || die "configure failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+	dodoc ChangeLog* README* THANKS TODO docs/USERS-GUIDE || die "dodoc failed"
+}