commit 89c89514090ebd76beba121fead6c798e2c4f349
Author: Arkadiusz Miśkiewicz <ar...@maven.pl>
Date: Sun Sep 11 21:46:23 2016 +0200
- up to 4.7.3
lftp-bug-250.patch | 22 ----------------------
lftp-bug-254.patch | 53 -----------------------------------------------------
lftp.spec | 12 ++++--------
3 files changed, 4 insertions(+), 83 deletions(-)
---
diff --git a/lftp.spec b/lftp.spec
index f0b5a0f..bfa04b2 100644
--- a/lftp.spec
+++ b/lftp.spec
@@ -23,12 +23,12 @@ Summary(pl.UTF-8): Zaawansowany klient FTP/HTTP
Summary(pt_BR.UTF-8): Sofisticado programa de transferência de arquivos
(cliente FTP/HTTP)
Summary(zh_CN.UTF-8): lftp 客户端程序
Name: lftp
-Version: 4.7.2
-Release: 3
+Version: 4.7.3
+Release: 1
License: GPL v3+
Group: Applications/Networking
Source0: http://lftp.yar.ru/ftp/%{name}-%{version}.tar.xz
-# Source0-md5: 24b64dcd74426803eb1e9bf75a5a590a
+# Source0-md5: 23deda16014412c802f095fbaa0bebee
Source1:
http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-man-pages.tar.bz2
# Source1-md5: cdad8fb5342eebd9916eccefc98a855b
Source2: %{name}.desktop
@@ -40,8 +40,6 @@ Patch2: aliases.patch
# when updated attach at https://github.com/lavv17/lftp/issues
Patch3: %{name}-pl.po-update.patch
Patch4: %{name}-am.patch
-Patch5: lftp-bug-250.patch
-Patch6: lftp-bug-254.patch
URL: http://lftp.yar.ru/
BuildRequires: autoconf >= 2.60
BuildRequires: automake
@@ -97,10 +95,8 @@ o arquivo FEATURES para uma lista mais detalhada.
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
+#%patch3 -p1
%patch4 -p1
-%patch5 -p1
-%patch6 -p1
%{__rm} po/stamp-po
diff --git a/lftp-bug-250.patch b/lftp-bug-250.patch
deleted file mode 100644
index 78d7277..0000000
--- a/lftp-bug-250.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From f94bf44ec4bbd5511302e8a0d76bde881c9f0211 Mon Sep 17 00:00:00 2001
-From: "Alexander V. Lukyanov" <lavv...@gmail.com>
-Date: Fri, 24 Jun 2016 18:26:28 +0300
-Subject: [PATCH] fish: fixed #250 - a segfault in ARRAY_INFO mode.
-
----
- src/Fish.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Fish.cc b/src/Fish.cc
-index a634927..0d8a91c 100644
---- a/src/Fish.cc
-+++ b/src/Fish.cc
-@@ -394,7 +394,7 @@ void Fish::SendArrayInfoRequests()
-
- void Fish::SendMethod()
- {
-- const char *e=alloca_strdup(shell_encode(file));
-+ const char *e=file?alloca_strdup(shell_encode(file)):0;
- const char *e1=shell_encode(file1);
- switch((open_mode)mode)
- {
diff --git a/lftp-bug-254.patch b/lftp-bug-254.patch
deleted file mode 100644
index 772f47a..0000000
--- a/lftp-bug-254.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 389ea5d8063b01d3bdbed117e7da7f80e312bc88 Mon Sep 17 00:00:00 2001
-From: "Alexander V. Lukyanov" <lavv...@gmail.com>
-Date: Fri, 8 Jul 2016 10:59:48 +0300
-Subject: [PATCH] GetJob: apply noclobber setting to plain files only.
-
----
- NEWS | 1 +
- src/GetJob.cc | 27 ++++++++++++++-------------
- 2 files changed, 15 insertions(+), 13 deletions(-)
-
-diff --git a/src/GetJob.cc b/src/GetJob.cc
-index 7afba0a..683b666 100644
---- a/src/GetJob.cc
-+++ b/src/GetJob.cc
-@@ -65,24 +65,25 @@ FileCopyPeer *GetJob::SrcLocal(const char *src)
- FileCopyPeer *GetJob::DstLocal(const char *dst)
- {
- bool clobber=(cont || QueryBool("xfer:clobber",0));
-- int
flags=O_WRONLY|O_CREAT|(truncate_target_first?O_TRUNC:0)|(clobber?0:O_EXCL);
-+ int flags=O_WRONLY|O_CREAT|(truncate_target_first?O_TRUNC:0);
- dst=expand_home_relative(dst);
- const char *f=(cwd && dst[0]!='/') ? dir_file(cwd,dst) : dst;
-- if(truncate_target_first && QueryBool("xfer:make-backup",0))
-+
-+ struct stat st;
-+ if(stat(f,&st)!=-1)
- {
-- /* rename old file if exists and size>0 */
-- struct stat st;
-- if(stat(f,&st)!=-1)
-+ if(st.st_size>0 && S_ISREG(st.st_mode))
- {
-- if(st.st_size>0 && S_ISREG(st.st_mode))
-+ if(!clobber)
-+ {
-+ eprintf(_("%s: %s: file already exists and xfer:clobber is
unset\n"),op,dst);
-+ errors++;
-+ count++;
-+ return 0;
-+ }
-+ if(truncate_target_first && QueryBool("xfer:make-backup",0))
- {
-- if(!clobber)
-- {
-- eprintf(_("%s: %s: file already exists and xfer:clobber is
unset\n"),op,dst);
-- errors++;
-- count++;
-- return 0;
-- }
-+ /* rename old file if exists and size>0 */
- xstring_ca suffix(xstrftime(Query("xfer:backup-suffix",0),now));
- backup_file.set(f).append(suffix);
- if(rename(f,backup_file)!=0)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/lftp.git/commitdiff/89c89514090ebd76beba121fead6c798e2c4f349
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
