rpms/lftp
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Upgrade to 3.4.1; make it not dump core with one URL argument

Browse Source
This commit is contained in:
jvdias 2006-02-07 23:17:44 +00:00
parent 08fdbfe180
commit 27cefb83b4
4 changed files with 40 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.cvsignore
View File

@ -10,3 +10,4 @@ lftp-3.3.5.tar.bz2
lftp-3.3.5.tar.bz2.asc lftp-3.3.5.tar.bz2.asc
lftp-3.4.0.tar.bz2 lftp-3.4.0.tar.bz2
lftp-3.4.0.tar.bz2.asc lftp-3.4.0.tar.bz2.asc
lftp-3.4.1.tar.bz2

31
lftp-3.4.1-dont_core.patch Normal file
View File

@ -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",""};

8
lftp.spec
View File

@ -1,6 +1,6 @@
Summary: A sophisticated file transfer program Summary: A sophisticated file transfer program
Name: lftp Name: lftp
Version: 3.4.0 Version: 3.4.1
Release: 1 Release: 1
License: GPL License: GPL
Group: Applications/Internet Group: Applications/Internet
@ -10,6 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildPrereq: ncurses-devel, openssl-devel, pkgconfig, readline-devel BuildPrereq: ncurses-devel, openssl-devel, pkgconfig, readline-devel
Requires: perl-String-CRC32 Requires: perl-String-CRC32
Patch173276: lftp-3.3.5-bz173276.patch Patch173276: lftp-3.3.5-bz173276.patch
Patch2: lftp-3.4.1-dont_core.patch
%description %description
LFTP is a sophisticated ftp/http file transfer program. Like bash, it has job LFTP is a sophisticated ftp/http file transfer program. Like bash, it has job
@ -21,6 +22,7 @@ reliability in mind.
%setup -q %setup -q
#%patch173276 -p1 -b .bz173276 #%patch173276 -p1 -b .bz173276
#^- now fixed upstream #^- now fixed upstream
%patch2 -p1 -b .dont_core
%build %build
if pkg-config openssl ; then if pkg-config openssl ; then
@ -68,6 +70,10 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/lftp/%{version}/proto-sftp.so %{_libdir}/lftp/%{version}/proto-sftp.so
%changelog %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 * Fri Jan 13 2006 Jason Vas Dias<jvdias@redhat.com> - 3.4.0-1
- Upgrade to upstream version 3.4.0 - Upgrade to upstream version 3.4.0

3
sources
View File

@ -1,2 +1 @@
5d39a8b250691a693470b1773b5c6bd4 lftp-3.4.0.tar.bz2 4c73ad8e96c9ae1107b384fd59fcc009 lftp-3.4.1.tar.bz2
5b942423a324da718ec42e30e2feed74 lftp-3.4.0.tar.bz2.asc