From 27cefb83b43cac8e35fbc84842d54acc622d5e17 Mon Sep 17 00:00:00 2001
From: jvdias <jvdias@fedoraproject.org>
Date: Tue, 7 Feb 2006 23:17:44 +0000
Subject: [PATCH] Upgrade to 3.4.1; make it not dump core with one URL argument

---
 .cvsignore                 |  1 +
 lftp-3.4.1-dont_core.patch | 31 +++++++++++++++++++++++++++++++
 lftp.spec                  |  8 +++++++-
 sources                    |  3 +--
 4 files changed, 40 insertions(+), 3 deletions(-)
 create mode 100644 lftp-3.4.1-dont_core.patch

diff --git a/.cvsignore b/.cvsignore
index ea87564..2180daf 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -10,3 +10,4 @@ lftp-3.3.5.tar.bz2
 lftp-3.3.5.tar.bz2.asc
 lftp-3.4.0.tar.bz2
 lftp-3.4.0.tar.bz2.asc
+lftp-3.4.1.tar.bz2
diff --git a/lftp-3.4.1-dont_core.patch b/lftp-3.4.1-dont_core.patch
new file mode 100644
index 0000000..abf1ca3
--- /dev/null
+++ b/lftp-3.4.1-dont_core.patch
@@ -0,0 +1,31 @@
+--- lftp-3.4.1/src/commands.cc.dont_core	2006-02-06 05:57:29.000000000 -0500
++++ lftp-3.4.1/src/commands.cc	2006-02-07 17:53:14.000000000 -0500
+@@ -1508,15 +1508,19 @@
+    if(time_style && time_style[0]) {
+       if(time_style[0]=='+')
+ 	 time_fmt=xstrdup(time_style+1);
+-      else if(!strcmp(optarg,"full-iso"))
+-//	 time_fmt=xstrdup("%Y-%m-%d %H:%M:%S.%N %z"); // %N and %z are GNU extensions
+-	 time_fmt=xstrdup("%Y-%m-%d %H:%M:%S");
+-      else if(!strcmp(optarg,"long-iso"))
+-	 time_fmt=xstrdup("%Y-%m-%d %H:%M");
+-      else if(!strcmp(optarg,"iso"))
+-	 time_fmt=xstrdup("%Y-%m-%d \n%m-%d %H:%M");
+-      else
+-	 time_fmt=xstrdup(time_style);
++      if( optarg )
++      {
++	  if(!strcmp(optarg,"full-iso"))
++          //  time_fmt=xstrdup("%Y-%m-%d %H:%M:%S.%N %z"); // %N and %z are GNU extensions
++	      time_fmt=xstrdup("%Y-%m-%d %H:%M:%S");
++	  else if(!strcmp(optarg,"long-iso"))
++	      time_fmt=xstrdup("%Y-%m-%d %H:%M");
++	  else if(!strcmp(optarg,"iso"))
++	      time_fmt=xstrdup("%Y-%m-%d \n%m-%d %H:%M");
++	  else
++	      time_fmt=xstrdup(time_style);
++      }else
++	  time_fmt=xstrdup(time_style);
+       need_exact_time=false;
+       if(time_fmt) {
+ 	 static const char exact_fmts[][3]={"%H","%M","%S","%N",""};
diff --git a/lftp.spec b/lftp.spec
index a1dadb6..b8c8681 100644
--- a/lftp.spec
+++ b/lftp.spec
@@ -1,6 +1,6 @@
 Summary: 	A sophisticated file transfer program
 Name: 		lftp 
-Version: 	3.4.0
+Version: 	3.4.1
 Release: 	1
 License: 	GPL
 Group: 		Applications/Internet
@@ -10,6 +10,7 @@ BuildRoot: 	%{_tmppath}/%{name}-%{version}-root
 BuildPrereq: 	ncurses-devel, openssl-devel, pkgconfig, readline-devel
 Requires:    	perl-String-CRC32
 Patch173276: 	lftp-3.3.5-bz173276.patch
+Patch2:		lftp-3.4.1-dont_core.patch
 
 %description
 LFTP is a sophisticated ftp/http file transfer program. Like bash, it has job
@@ -21,6 +22,7 @@ reliability in mind.
 %setup -q
 #%patch173276 -p1 -b .bz173276
 #^- now fixed upstream
+%patch2 -p1 -b .dont_core
 
 %build
 if pkg-config openssl ; then
@@ -68,6 +70,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lftp/%{version}/proto-sftp.so
 
 %changelog
+* Tue Feb 07 2006 Jason Vas Dias<jvdias@redhat.com> - 3.4.1-1
+- Upgrade to upstream version 3.4.1
+- fix core dump
+
 * Fri Jan 13 2006 Jason Vas Dias<jvdias@redhat.com> - 3.4.0-1
 - Upgrade to upstream version 3.4.0
 
diff --git a/sources b/sources
index 12a6b9a..51937ba 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-5d39a8b250691a693470b1773b5c6bd4  lftp-3.4.0.tar.bz2
-5b942423a324da718ec42e30e2feed74  lftp-3.4.0.tar.bz2.asc
+4c73ad8e96c9ae1107b384fd59fcc009  lftp-3.4.1.tar.bz2