From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Thu, 4 Jul 2013 10:55:48 +0000 (+0200)
Subject: - rel 2; fixes from git
X-Git-Tag: auto/th/lftp-4.4.8-2
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=a80c2086deb9211d68ebb202f7466126b201c27a;hp=64c7ad049761b26921ef703dcc66d50a5e9961b2;p=packages%2Flftp.git

- rel 2; fixes from git
---

diff --git a/lftp-git.patch b/lftp-git.patch
new file mode 100644
index 0000000..30cedcd
--- /dev/null
+++ b/lftp-git.patch
@@ -0,0 +1,94 @@
+diff --git a/src/ChangeLog b/src/ChangeLog
+index 7d65003..e804bc4 100644
+--- a/src/ChangeLog
++++ b/src/ChangeLog
+@@ -1,3 +1,18 @@
++2013-07-04  Alexander V. Lukyanov <lav@yars.free.net>
++
++	* network.cc: don't use IPV6_V6ONLY if not defined.
++	  (from y-iida@secom.co.jp).
++	* FileSet.cc: (FileInfo::Merge) copy size properly.
++
++2013-07-04  Alexander V. Lukyanov <lav@yars.free.net>
++
++	* FileSet.cc: recognize and ignore human readable sizes.
++
++2013-05-30  Alexander V. Lukyanov <lav@yars.free.net>
++
++	* lftp_tinfo.cc: fixed segfault when there is no TERM env var.
++	* buffer_zlib.cc: fixed compilation with older zlib.
++
+ 2013-05-28  Alexander V. Lukyanov <lav@yars.free.net>
+ 
+ 	* buffer_zlib.cc, buffer_zlib.h: implement inflator.
+diff --git a/src/FileSet.cc b/src/FileSet.cc
+index 49c9df4..4c93ea1 100644
+--- a/src/FileSet.cc
++++ b/src/FileSet.cc
+@@ -56,6 +56,8 @@ void  FileInfo::Merge(const FileInfo& f)
+       SetMode(f.mode);
+    if(dif&DATE || (defined&DATE && f.defined&DATE && f.date.ts_prec<date.ts_prec))
+       SetDate(f.date,f.date.ts_prec);
++   if(dif&SIZE)
++      SetSize(f.size);
+    if(dif&TYPE)
+       SetType(f.filetype);
+    if(dif&SYMLINK)
+@@ -792,7 +794,8 @@ FileInfo *FileInfo::parse_ls_line(const char *line_c,const char *tz)
+       // it's size, so the previous was group:
+       fi->SetGroup(group_or_size);
+       long long size;
+-      if(sscanf(t,"%lld",&size)==1)
++      int n;
++      if(sscanf(t,"%lld%n",&size,&n)==1 && t[n]==0)
+ 	 fi->SetSize(size);
+       t = NEXT_TOKEN;
+       if(!t)
+@@ -802,7 +805,8 @@ FileInfo *FileInfo::parse_ls_line(const char *line_c,const char *tz)
+    {
+       // it was month, so the previous was size:
+       long long size;
+-      if(sscanf(group_or_size,"%lld",&size)==1)
++      int n;
++      if(sscanf(group_or_size,"%lld%n",&size,&n)==1 && group_or_size[n]==0)
+ 	 fi->SetSize(size);
+    }
+ 
+diff --git a/src/buffer_zlib.cc b/src/buffer_zlib.cc
+index 2ceaee9..ef79e6f 100644
+--- a/src/buffer_zlib.cc
++++ b/src/buffer_zlib.cc
+@@ -87,5 +87,5 @@ DataInflator::~DataInflator()
+ }
+ void DataInflator::ResetTranslation()
+ {
+-   z_err = inflateReset2(&z, 16+MAX_WBITS);
++   z_err = inflateReset(&z);
+ }
+diff --git a/src/lftp_tinfo.cc b/src/lftp_tinfo.cc
+index 714d50d..0368497 100644
+--- a/src/lftp_tinfo.cc
++++ b/src/lftp_tinfo.cc
+@@ -54,7 +54,8 @@ static void init_terminfo()
+       terminfo_ok = false;
+ #elif defined(HAVE_TGETSTR)
+    static char buf[2048];
+-   if(tgetent(buf,getenv("TERM")) == -1)
++   const char *term=getenv("TERM");
++   if(!term || tgetent(buf,term) == -1)
+       terminfo_ok = false;
+ #endif
+ }
+diff --git a/src/network.cc b/src/network.cc
+index cbffaac..36fe88e 100644
+--- a/src/network.cc
++++ b/src/network.cc
+@@ -362,7 +362,7 @@ int Networker::SocketAccept(int fd,sockaddr_u *u,const char *hostname)
+ 
+ void Networker::SocketSinglePF(int s,int pf)
+ {
+-#if INET6
++#if INET6 && defined(IPV6_V6ONLY)
+    if(pf==PF_INET6) {
+       int on = 1;
+       if(-1==setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, (char *)&on, sizeof(on)))
diff --git a/lftp.spec b/lftp.spec
index 397017c..3a32bc8 100644
--- a/lftp.spec
+++ b/lftp.spec
@@ -23,7 +23,7 @@ Summary(pt_BR.UTF-8):	Sofisticado programa de transferência de arquivos (client
 Summary(zh_CN.UTF-8):	lftp 客户端程序
 Name:		lftp
 Version:	4.4.8
-Release:	1
+Release:	2
 License:	GPL v3+
 Group:		Applications/Networking
 Source0:	ftp://ftp.yar.ru/pub/source/lftp/%{name}-%{version}.tar.xz
@@ -39,6 +39,7 @@ Patch2:		aliases.patch
 Patch3:		%{name}-pl.po-update.patch
 Patch4:		lftp-4.3.8-gets.patch
 Patch5:		%{name}-am.patch
+Patch6:		%{name}-git.patch
 URL:		http://lftp.yar.ru/
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake
@@ -96,6 +97,7 @@ o arquivo FEATURES para uma lista mais detalhada.
 #%patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %{__rm} po/stamp-po