Fix segfault when running `local' command without arguments by Marcin Mirosław (bug #398513).

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

4 files changed, 53 insertions, 6 deletions

diff --git a/net-ftp/lftp/ChangeLog b/net-ftp/lftp/ChangeLog
index 508902ff865c..1dc2f111ab01 100644
--- a/net-ftp/lftp/ChangeLog
+++ b/net-ftp/lftp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-ftp/lftp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.337 2012/01/09 17:11:42 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.338 2012/01/20 17:21:28 jer Exp $
+
+*lftp-4.3.4-r1 (20 Jan 2012)
+
+  20 Jan 2012; Jeroen Roovers <jer@gentoo.org> -lftp-4.3.4.ebuild,
+  +lftp-4.3.4-r1.ebuild, +files/lftp-4.3.4-empty-local.patch:
+  Fix segfault when running `local' command without arguments by Marcin
+  Mirosław (bug #398513).
 
   09 Jan 2012; Brent Baude <ranger@gentoo.org> lftp-4.3.3.ebuild:
   Marking lftp-4.3.3 ppc for bug 393513
diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index aa0dde7c3a62..03ed61ee4fd0 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -1,10 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX lftp-4.0.2.91-lafile.patch 976 RMD160 1a866fa1340bfc3d1f634cabadf44883e9a01d93 SHA1 e5e646839a6e48f0b504a2720947462410f76710 SHA256 b54aac35c297657290a2d9571c38bdc4bf51548f826b4ec958a768c398c0cd0b
 AUX lftp-4.0.3-autoconf-2.64.patch 582 RMD160 74f242cb445a790e6bd6987eef32db1cd59c0ef9 SHA1 58289a37b786b39ec23dfeabf52bc6b73802e1fb SHA256 f8e6e1d4e114d7e122b1762f9382027541357c39f129f9d2aad9edd93659f53e
+AUX lftp-4.3.4-empty-local.patch 757 RMD160 64b6c36dcd4610441469accd7f417f7426c122be SHA1 498c5bff4c712de91c74b789868e333cab5d8a03 SHA256 9998e639389dda85fc3afe80e7d403c9be99e89551e1d5faa85be9c50f9a9af3
 DIST lftp-4.3.1.tar.xz 1346972 RMD160 dba6492ab198b040912969aed92acfa7f3e0dbdb SHA1 b6220a2ea3e8ddbe06d6e429a7ea4ff902ffde84 SHA256 dd47908aacef45bd8b09303711f964ee3bd63a0695c5327f5635563b5d48656c
 DIST lftp-4.3.3.tar.xz 1382904 RMD160 5fab0c8d045b103064fa3724a86b25330fe169bb SHA1 3950fc6f1a003bcf363bfbf222fda8353782677e SHA256 71b0943193e72ea7321eeb326714082cea921de5f6f6f5d43bca414933780356
 DIST lftp-4.3.4.tar.xz 1386836 RMD160 b642e97b026a5adf4abfa6ed1c8d1f0fe6fccddd SHA1 9d08eb0341afa5b050a02e411aa713910508ee80 SHA256 f9d7a2fbba0837649191969ebb453a2f2afa142f9d816329d0897e6ea79b5592
 EBUILD lftp-4.3.1.ebuild 1614 RMD160 859e8401f7d6f61073cdab040ef92072a50895fa SHA1 75ebd1b6ad5e7abc99d72640ff7ef7cd1c039ceb SHA256 5d9be68ed1c3e60322ae2c4038778441fdbb40c5b6f438707484bab5e243015d
 EBUILD lftp-4.3.3.ebuild 1833 RMD160 7591020ce2ca04ed90b531fd8190ee1f399e464b SHA1 bf4616a64b4eff5ed6213027bd89d811a2b644f7 SHA256 b322b8bea61ed8d13f7577da0d3ab278623a39d57f878ddaa8622dfe42ceeafb
-EBUILD lftp-4.3.4.ebuild 1820 RMD160 546dd8eac411755072e9cd3d27206b8c3766eb03 SHA1 4e26ab91839da5036f829c5910db49601a7f6262 SHA256 cafcc4f8b54a00c8fe427de19a5cfe679dd490e9ca5dafd757f0f02cb70fce0f
-MISC ChangeLog 43825 RMD160 41bccb3fce7631f1f03d9ae97b4ef3308c4caed1 SHA1 352b8ef5204d76f017df78dd003d5c39edd7958a SHA256 ef527554d773c934baed05911fab3ac0b84fefd51eec6e1a7d24bf912c2867e1
+EBUILD lftp-4.3.4-r1.ebuild 1871 RMD160 349363f8d02287ac6d3d87049a57c4c0413ea2df SHA1 b60ea5f6be19a03c983b096a8d3d272caed195fa SHA256 82a1bd02cb2886f4566dd14bcfdcc60a4d25831954b378809d90b6fe3fba12e4
+MISC ChangeLog 44081 RMD160 e452cae866496024ad7581657e956f14edb2078d SHA1 5d1efd160a7cf52145b77a87279b701c40264987 SHA256 e62f1a677cf1f109f39365f1f0c3dd842b2a130aaf84f1044d5a0a415e95b065
 MISC metadata.xml 228 RMD160 8cae9a76060d0e86296c88ea3502a4b3332785e9 SHA1 2de5cb3b0c34ae32a689804ca7524b7a71f86493 SHA256 766b4854103b92707706451db11bd895a0f63036677fdcbff2bccb8de5d6d289
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk8Zop0ACgkQVWmRsqeSphNBvACfXfRyRDtVzE+CpOiHIPAowRhP
+8LIAn12oAI901/NW5YDaTLc6XNWCz1OP
+=5lPy
+-----END PGP SIGNATURE-----
diff --git a/net-ftp/lftp/files/lftp-4.3.4-empty-local.patch b/net-ftp/lftp/files/lftp-4.3.4-empty-local.patch
new file mode 100644
index 000000000000..928d459b3870
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-4.3.4-empty-local.patch
@@ -0,0 +1,27 @@
+--- a/src/CmdExec.cc
++++ b/src/CmdExec.cc
+@@ -197,6 +197,8 @@ restart:
+
+    const struct cmd_rec *c;
+    const char *cmd_name=args->getarg(0);
++   if(!cmd_name)
++      return;
+    int part=find_cmd(cmd_name,&c);
+    if(part<=0)
+       eprintf(_("Unknown command `%s'.\n"),cmd_name);
+@@ -1223,10 +1225,14 @@ Job *CmdExec::default_cmd()
+ }
+ Job *CmdExec::builtin_local()
+ {
++   if(args->count()<2) {
++      eprintf(_("Usage: %s cmd [args...]\n"),args->a0());
++      return 0;
++   }
+    saved_session=session.borrow();
+    session=FileAccess::New("file");
+    if(!session) {
+-      eprintf("%s: cannot create local session\n",args->a0());
++      eprintf(_("%s: cannot create local session\n"),args->a0());
+       RevertToSavedSession();
+       return 0;
+    }
diff --git a/net-ftp/lftp/lftp-4.3.4.ebuild b/net-ftp/lftp/lftp-4.3.4-r1.ebuild
index 1e6f52f1d4e5..53912f08dfdd 100644
--- a/net-ftp/lftp/lftp-4.3.4.ebuild
+++ b/net-ftp/lftp/lftp-4.3.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-4.3.4.ebuild,v 1.3 2012/01/02 23:01:56 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-4.3.4-r1.ebuild,v 1.1 2012/01/20 17:21:28 jer Exp $
 
 EAPI="4"
 
@@ -49,8 +49,10 @@ DOCS=(
 )
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-4.0.2.91-lafile.patch"
-	epatch "${FILESDIR}/${PN}-4.0.3-autoconf-2.64.patch"
+	epatch \
+		"${FILESDIR}/${PN}-4.0.2.91-lafile.patch" \
+		"${FILESDIR}/${PN}-4.0.3-autoconf-2.64.patch" \
+		"${FILESDIR}/${PN}-4.3.4-empty-local.patch"
 	eautoreconf
 }