Date: Wednesday, November 2, 2022 @ 11:13:26
Author: foutrelis
Revision: 1341012
upgpkg: ruby-puma 5.6.5-2: OpenSSL 3.0 rebuild
Modified:
ruby-puma/trunk/PKGBUILD
ruby-puma/trunk/ruby-puma_fix_tests.patch
---------------------------+
PKGBUILD | 4 ++--
ruby-puma_fix_tests.patch | 19 ++++++++++++++++---
2 files changed, 18 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-11-02 11:07:14 UTC (rev 1341011)
+++ PKGBUILD 2022-11-02 11:13:26 UTC (rev 1341012)
@@ -3,7 +3,7 @@
_gemname='puma'
pkgname="ruby-$_gemname"
pkgver=5.6.5
-pkgrel=1
+pkgrel=2
pkgdesc='A Ruby/Rack web server built for concurrency'
arch=('x86_64')
url='https://puma.io/'
@@ -14,7 +14,7 @@
source=("https://github.com/puma/puma/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz";
"${pkgname}_fix_tests.patch")
sha512sums=('0ad41f3372732bdea6594a20b116ec4fc03a8a1d2ff807b3c315e7769aef4e5361ff775975575125002fbfc83315e6906fa8691ce666161bd8beee8c469289d8'
-
'b41bf9682d34747c30b82fc151df57a3f4d93dcfc1b0f883f37adf23471be49d9748746cf5862c2f899e5eac72d46dc7d8c7fa194a9eefb49e9bc8738e46b3a3')
+
'da06b0dafb1ff45d79b3dff05c53334ba1ef2f4f8f8edd904d6418961da51e78f1dff5e1aee19154699651a8ea5c1241b8018eab3f1769fb163a3609b1ac5df0')
prepare() {
cd "${_gemname}-${pkgver}"
Modified: ruby-puma_fix_tests.patch
===================================================================
--- ruby-puma_fix_tests.patch 2022-11-02 11:07:14 UTC (rev 1341011)
+++ ruby-puma_fix_tests.patch 2022-11-02 11:13:26 UTC (rev 1341012)
@@ -12,7 +12,7 @@
- [200, {}, ["self-signed certificate app"]]
-end
diff --git a/test/test_config.rb b/test/test_config.rb
-index d2ced63f..90ace92c 100644
+index 56f31ca0..a8497190 100644
--- a/test/test_config.rb
+++ b/test/test_config.rb
@@ -58,22 +58,6 @@ class TestConfigFile < TestConfigFileBase
@@ -38,11 +38,24 @@
def test_ssl_bind
skip_if :jruby
skip_unless :ssl
+diff --git a/test/test_integration_single.rb b/test/test_integration_single.rb
+index fd930fe6..cb5e202c 100644
+--- a/test/test_integration_single.rb
++++ b/test/test_integration_single.rb
+@@ -85,7 +85,7 @@ class TestIntegrationSingle < TestIntegration
+ rejected_curl_wait_thread.join
+
+ assert_match(/Slept 10/, curl_stdout.read)
+- assert_match(/Connection refused/, rejected_curl_stderr.read)
++ assert_match(/Connection refused|Couldn't connect to server/,
rejected_curl_stderr.read)
+
+ Process.wait(@server.pid)
+ @server.close unless @server.closed?
diff --git a/test/test_integration_ssl.rb b/test/test_integration_ssl.rb
-index 07dc0972..9c3409a7 100644
+index 3c05b419..f74e1f8d 100644
--- a/test/test_integration_ssl.rb
+++ b/test/test_integration_ssl.rb
-@@ -108,30 +108,6 @@ RUBY
+@@ -152,30 +152,6 @@ RUBY
activate_control_app 'tcp://#{HOST}:#{control_tcp_port}', { auth_token:
'#{TOKEN}' }
