From 687cf453bb527cc56629a855b0ebce09d4c0212b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar(a)redhat.com>
Date: Thu, 20 Oct 2016 16:19:22 +0200
Subject: 1.86 bump
---
.gitignore | 1 +
.rpmlint | 2 ++
...Search-sftp-server-in-usr-libexec-openssh.patch | 31 ++++++++++++++++++++++
perl-Net-SFTP-Foreign.spec | 18 ++++++++++---
sources | 2 +-
5 files changed, 50 insertions(+), 4 deletions(-)
create mode 100644 .rpmlint
create mode 100644 Net-SFTP-Foreign-1.86-Search-sftp-server-in-usr-libexec-openssh.patch
diff --git a/.gitignore b/.gitignore
index bbd797c..c91fbf0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/Net-SFTP-Foreign-1.75.tar.gz
/Net-SFTP-Foreign-1.77.tar.gz
/Net-SFTP-Foreign-1.81.tar.gz
+/Net-SFTP-Foreign-1.86.tar.gz
diff --git a/.rpmlint b/.rpmlint
new file mode 100644
index 0000000..0bc0e85
--- /dev/null
+++ b/.rpmlint
@@ -0,0 +1,2 @@
+from Config import *
+addFilter("spelling-error .* (Compat|filexfer|ietf|rfc|secsh|txt)");
diff --git a/Net-SFTP-Foreign-1.86-Search-sftp-server-in-usr-libexec-openssh.patch
b/Net-SFTP-Foreign-1.86-Search-sftp-server-in-usr-libexec-openssh.patch
new file mode 100644
index 0000000..b5cc963
--- /dev/null
+++ b/Net-SFTP-Foreign-1.86-Search-sftp-server-in-usr-libexec-openssh.patch
@@ -0,0 +1,31 @@
+From 1b12ee0fd9e7fc34ceefa4d5dd8186552ef7dd32 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar(a)redhat.com>
+Date: Thu, 20 Oct 2016 16:28:58 +0200
+Subject: [PATCH] Search sftp-server in /usr/libexec/openssh
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fedora Linux distribution places sftp-server into /usr/libexec/openssh
+directory. This allows tests to find it.
+
+Signed-off-by: Petr Písař <ppisar(a)redhat.com>
+---
+ t/common.pm | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/t/common.pm b/t/common.pm
+index ff50f5f..74f20a9 100644
+--- a/t/common.pm
++++ b/t/common.pm
+@@ -62,6 +62,7 @@ sub sftp_server {
+ File::Spec->catfile($up, 'lib', $ssname),
+ File::Spec->catfile($up, 'lib64', $ssname),
+ File::Spec->catfile($up, 'libexec', $ssname),
++ File::Spec->catfile($up, 'libexec', 'openssh', $ssname),
+ File::Spec->catfile($up, 'sbin', $ssname),
+ File::Spec->catfile($up, 'lib', 'openssh', $ssname),
+ File::Spec->catfile($up, 'lib64', 'openssh', $ssname),
+--
+2.7.4
+
diff --git a/perl-Net-SFTP-Foreign.spec b/perl-Net-SFTP-Foreign.spec
index 5cf4b22..c0c8e59 100644
--- a/perl-Net-SFTP-Foreign.spec
+++ b/perl-Net-SFTP-Foreign.spec
@@ -1,12 +1,14 @@
Name: perl-Net-SFTP-Foreign
-Version: 1.81
-Release: 3%{?dist}
+Version: 1.86
+Release: 1%{?dist}
Summary: SSH File Transfer Protocol client
Group: Development/Libraries
License: GPL+ or Artistic
URL:
http://search.cpan.org/dist/Net-SFTP-Foreign
Source0:
http://cpan.metacpan.org/authors/id/S/SA/SALVA/Net-SFTP-Foreign-%{version...
+# Find sftp-server not to skip some tests, CPAN RT#118446
+Patch0: Net-SFTP-Foreign-1.86-Search-sftp-server-in-usr-libexec-openssh.patch
BuildArch: noarch
BuildRequires: coreutils
@@ -66,7 +68,14 @@ with Net::SFTP.
%prep
%setup -q -n Net-SFTP-Foreign-%{version}
+%patch0 -p1
rm lib/Net/SFTP/Foreign/Backend/Windows.pm
+# Normalize end-of-lines
+for F in rfc/draft-ietf-secsh-scp-sftp-ssh-uri-04.txt; do
+ tr -d "\r" < "$F" > "${F}.new"
+ touch -r "$F" "${F}.new"
+ mv "${F}.new" "$F"
+done
%build
@@ -76,7 +85,7 @@ make %{?_smp_mflags}
%install
make pure_install DESTDIR=%{buildroot}
-find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
+find %{buildroot} -type f -name .packlist -delete
%{_fixperms} %{buildroot}/*
@@ -92,6 +101,9 @@ make test
%changelog
+* Thu Oct 20 2016 Petr Pisar <ppisar(a)redhat.com> - 1.86-1
+- 1.86 bump
+
* Mon May 16 2016 Jitka Plesnikova <jplesnik(a)redhat.com> - 1.81-3
- Perl 5.24 rebuild
diff --git a/sources b/sources
index 514d548..38dbff4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-74c8c84cd41236db730715b79cd82219 Net-SFTP-Foreign-1.81.tar.gz
+098d071c30f949ba93a3d3b072dcc264 Net-SFTP-Foreign-1.86.tar.gz
--
cgit v0.12
http://pkgs.fedoraproject.org/cgit/perl-Net-SFTP-Foreign.git/commit/?h=ma...