main/ruby-net-ftp: upgrade to 0.1.4

This commit is contained in:
Jakub Jirutka 2024-04-25 13:56:01 +02:00
parent c80ddcb6fb
commit 783caebf0c
2 changed files with 34 additions and 2 deletions

View File

@ -4,7 +4,7 @@ pkgname=ruby-net-ftp
_gemname=net-ftp
# Keep version in sync with "Bundled gems" (https://stdgems.org) for the
# packaged Ruby version.
pkgver=0.1.3
pkgver=0.1.4
pkgrel=0
pkgdesc="Support for the File Transfer Protocol"
url="https://github.com/ruby/net-ftp"
@ -16,6 +16,7 @@ makedepends="ruby-rdoc"
subpackages="$pkgname-doc"
source="https://github.com/ruby/net-ftp/archive/v$pkgver/$_gemname-$pkgver.tar.gz
gemspec.patch
fix-test-socket-error.patch
"
builddir="$srcdir/$_gemname-$pkgver"
@ -55,6 +56,7 @@ doc() {
}
sha512sums="
73159513947e1574d15b4d73c87c6b7506e1ee8defc01fd5dfbd4dc7e9f4aa9e8a2a62ae397b3471d0276707d806c6f3252540e60d9b224d30a8cc23fe60b4d3 net-ftp-0.1.3.tar.gz
6555f61d0717ac6521ef9bf2d99c32d075aa14588a574cd068a6c0a2c15be0ba885074c02426c44dba9b3c4479d894c68d82cd7803ff1c4534ec74f8ca9be528 net-ftp-0.1.4.tar.gz
0ea5e32697eed985a45ee0b6da44013a226e4abd4a8b053ac4e7cacabe72e93b0bde54f2aec87d026b47a06301e06d301bad1347ce1746c5c1526959f624ea69 gemspec.patch
f9ca5de36d1d7ccba2b42091d7941f0a8a460b1b613b6b5ae8a451433f9a35a43498564edadea97ace7ab04ba76e18cf62204db3101c794e827daf5ff8529388 fix-test-socket-error.patch
"

View File

@ -0,0 +1,30 @@
Patch-Source: https://github.com/ruby/net-ftp/commit/54a9c289048c17e5037ea806e8d7896093f75263
--
From 54a9c289048c17e5037ea806e8d7896093f75263 Mon Sep 17 00:00:00 2001
From: Misaki Shioi <shioi.mm@gmail.com>
Date: Wed, 29 Nov 2023 18:09:39 +0900
Subject: [PATCH] Fall back to SocketError unless Socket::ResolutionError is
defined
The following PR changes cause Socket::ResolutionError, a subclass of SocketError, to be raised in this test case.
https://github.com/ruby/ruby/pull/9018
In this repository, make it fall back to SocketError if it is not defined.
---
test/net/ftp/test_ftp.rb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/test/net/ftp/test_ftp.rb b/test/net/ftp/test_ftp.rb
index a8c3f80..2d60592 100644
--- a/test/net/ftp/test_ftp.rb
+++ b/test/net/ftp/test_ftp.rb
@@ -2642,7 +2642,9 @@ def test_use_pasv_invalid_ip
assert_match(/\AUSER /, commands.shift)
assert_match(/\APASS /, commands.shift)
assert_equal("TYPE I\r\n", commands.shift)
- assert_raise(SocketError) do
+
+ error_klass = defined?(Socket::ResolutionError) ? Socket::ResolutionError : SocketError
+ assert_raise(error_klass) do
ftp.getbinaryfile("foo", nil)
end
ensure