From 2b4830d6352a074eaf6308f0e5421f1939de7a4b Mon Sep 17 00:00:00 2001 From: Jiri Skala Date: Jul 23 2012 06:48:39 +0000 Subject: updated to latest upstream 4.3.8 --- diff --git a/.gitignore b/.gitignore index d564050..91692f6 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ lftp-4.0.10.tar.xz /lftp-4.3.3.tar.xz /lftp-4.3.4.tar.xz /lftp-4.3.6.tar.xz +/lftp-4.3.8.tar.xz diff --git a/lftp-4.2.0-man.patch b/lftp-4.2.0-man.patch index e5cdb91..d3432d2 100644 --- a/lftp-4.2.0-man.patch +++ b/lftp-4.2.0-man.patch @@ -9,7 +9,7 @@ diff -up lftp-4.3.3/doc/lftp.1.man lftp-4.3.3/doc/lftp.1 .\" This file is part of lftp. .\" @@ -61,28 +61,28 @@ lftp \- Sophisticated file transfer prog - This man page documents lftp version 4.3.6. + This man page documents lftp version 4.3.8. .SH "DESCRIPTION" -\fBlftp\fR is a file transfer program that allows sophisticated ftp, http @@ -276,7 +276,7 @@ diff -up lftp-4.3.3/doc/lftp.1.man lftp-4.3.3/doc/lftp.1 +environment variable \fBhttp_proxy\fP. If your FTP proxy requires authentication, specify user name and password in the URL. .TP - .BR hftp:use-authorization \ (boolean) + .BR hftp:use-allprop \ (boolean) @@ -1583,23 +1583,23 @@ send this cookie to server. A closure is set cookie/www.somehost.com "param=value" .TP diff --git a/lftp-4.3.3-tmprec.patch b/lftp-4.3.3-tmprec.patch deleted file mode 100644 index 88b4475..0000000 --- a/lftp-4.3.3-tmprec.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -up lftp-4.3.3/src/commands.cc.tmprec lftp-4.3.3/src/commands.cc ---- lftp-4.3.3/src/commands.cc.tmprec 2011-11-16 12:50:49.885538761 +0100 -+++ lftp-4.3.3/src/commands.cc 2011-11-16 12:59:34.008576204 +0100 -@@ -1542,20 +1542,7 @@ const char *FileSetOutput::parse_argv(co - time_fmt.set("%Y-%m-%d \n%m-%d %H:%M"); - else - time_fmt.set(time_style); -- need_exact_time=false; -- if(time_fmt) { -- static const char exact_fmts[][3]={"%H","%M","%S","%N",""}; -- int sep=strcspn(time_fmt,"\n|"); -- for(int i=0; exact_fmts[i][0]; i++) { -- const char *f=strstr(time_fmt,exact_fmts[i]); -- if(!f) -- continue; -- if(i>1 || sep>f-time_fmt) { -- need_exact_time=true; -- break; -- } -- } -- } -+ need_exact_time = time_fmt && strpbrk(time_fmt, "TrSs"); - } - - // remove parsed options. diff --git a/lftp.spec b/lftp.spec index 2695429..1ad2b8f 100644 --- a/lftp.spec +++ b/lftp.spec @@ -1,6 +1,6 @@ Summary: A sophisticated file transfer program Name: lftp -Version: 4.3.6 +Version: 4.3.8 Release: 1%{?dist} License: GPLv3+ Group: Applications/Internet @@ -11,7 +11,6 @@ BuildRequires: ncurses-devel, gnutls-devel, pkgconfig, readline-devel, gettext Patch1: lftp-4.0.9-date_fmt.patch Patch2: lftp-4.2.0-man.patch -Patch3: lftp-4.3.3-tmprec.patch %description LFTP is a sophisticated ftp/http file transfer program. Like bash, it has job @@ -33,7 +32,6 @@ Utility scripts for use with lftp. %patch1 -p1 -b .date_fmt %patch2 -p1 -b .man -%patch3 -p1 -b .tmprec #sed -i.rpath -e '/lftp_cv_openssl/s|-R.*lib||' configure sed -i.norpath -e \ @@ -96,6 +94,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jul 23 2012 Jiri Skala - 4.3.8-1 +- updated to latest upstream 4.3.8 + * Thu Apr 19 2012 Jiri Skala - 4.3.6-1 - updated to latest upstream 4.3.6 diff --git a/sources b/sources index 738fe79..3e5dfc9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ffcdbaec5d1416cb6dd754efd43fa61a lftp-4.3.6.tar.xz +a8a7629913fe635f35dc37f753f12db6 lftp-4.3.8.tar.xz