[arch-commits] Commit in ruby-puma/trunk (PKGBUILD ruby-puma_fix_tests.patch)

[Andreas Schleifer]

    Date: Wednesday, August 24, 2022 @ 15:59:18
  Author: segaja
Revision: 1276453

upgpkg: ruby-puma 5.6.5-1

Modified:
  ruby-puma/trunk/PKGBUILD
  ruby-puma/trunk/ruby-puma_fix_tests.patch

---------------------------+
 PKGBUILD                  |   56 +++++++++++++++++++++++++++++---------------
 ruby-puma_fix_tests.patch |    2 -
 2 files changed, 38 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-08-24 15:48:51 UTC (rev 1276452)
+++ PKGBUILD	2022-08-24 15:59:18 UTC (rev 1276453)
@@ -2,7 +2,7 @@
 
 _gemname='puma'
 pkgname="ruby-$_gemname"
-pkgver=5.6.4
+pkgver=5.6.5
 pkgrel=1
 pkgdesc='A Ruby/Rack web server built for concurrency'
 arch=('x86_64')
@@ -12,21 +12,14 @@
 depends=('ruby' 'ruby-nio4r' 'ruby-sd_notify')
 makedepends=('ruby-bundler' 'ruby-minitest' 'ruby-minitest-proveit' 'ruby-minitest-retry' 'ruby-minitest-stub-const' 'ruby-rack' 'ruby-rake' 'ruby-rake-compiler' 'ruby-rdoc')
 source=("https://github.com/puma/puma/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz"
-        "${pkgname}_fix_tests.patch"
-        # from https://github.com/puma/puma/pull/2852
-        "${pkgname}_2852_fix_test_binder.patch::https://github.com/puma/puma/commit/3298f7935b53bb35124be65192e0832b3df568b4.patch"
-        "${pkgname}_2852_fix_test_request_invalid.patch::https://github.com/puma/puma/commit/7aad4ac5bca8936cc197d57de8e15c6a85c2cb7c.patch")
-sha512sums=('6321a08e99be1023a1216466914416fbc91f5436ecccec4ea4cbfdc9c4ebc4979f93894ae12b72654269b0410d6a3053230806b860cb912c1abdf89766683a27'
-            '1a81082dd3e8722d6da4cdbec958d8dee38ba0c89478f29e837903094d84777d6c00460612d4915399aec53b8c6534b31ae39eb71ca562b1bfb5a9b7d631bacf'
-            'fcee232701ca05cbab0f7e73fd40e71ed6f507ad5f8970a51ea418e6692b0c81765700f663519369fcf9206e9cea8a58c85b469cc1cd20ba4cbffc59ebcd3576'
-            '28aec91b50eb89608dcd18872072ccd355ff1d2ce9b12efaee9b69e1db98bdca8a1e48f90cecf56e59c3527b3e8d4c92c192819f8830fae7090ad2553367987b')
+        "${pkgname}_fix_tests.patch")
+sha512sums=('0ad41f3372732bdea6594a20b116ec4fc03a8a1d2ff807b3c315e7769aef4e5361ff775975575125002fbfc83315e6906fa8691ce666161bd8beee8c469289d8'
+            'b41bf9682d34747c30b82fc151df57a3f4d93dcfc1b0f883f37adf23471be49d9748746cf5862c2f899e5eac72d46dc7d8c7fa194a9eefb49e9bc8738e46b3a3')
 
 prepare() {
   cd "${_gemname}-${pkgver}"
 
   # remove some tests and fix others
-  patch --verbose --strip=1 --input="../${pkgname}_2852_fix_test_binder.patch"
-  patch --verbose --strip=1 --input="../${pkgname}_2852_fix_test_request_invalid.patch"
   patch --verbose --strip=1 --input="../${pkgname}_fix_tests.patch"
 
   # we built based on a tar archive, not a git repo
@@ -68,17 +61,42 @@
   cd "${_gemname}-${pkgver}"
 
   local _gemdir="$(gem env gemdir)"
-  local _platform="$(gem env platform | cut -d':' -f2)"
-  local _extension_api_version="$(ruby -e'puts Gem.extension_api_version')"
 
-  gem install --ignore-dependencies --no-user-install --install-dir "${pkgdir}/${_gemdir}" --bindir "${pkgdir}/usr/bin" "pkg/${_gemname}-${pkgver}.gem"
+  gem install \
+    --local \
+    --verbose \
+    --ignore-dependencies \
+    --no-user-install \
+    --install-dir "${pkgdir}/${_gemdir}" \
+    --bindir "${pkgdir}/usr/bin" \
+    "pkg/${_gemname}-${pkgver}.gem"
 
-  rm "${pkgdir}/${_gemdir}/cache/${_gemname}-${pkgver}.gem" \
-      "${pkgdir}/${_gemdir}/gems/${_gemname}-${pkgver}/ext/puma_http11/Makefile" \
-      "${pkgdir}/${_gemdir}/extensions/${_platform}/${_extension_api_version}/${_gemname}-${pkgver}/mkmf.log" \
-      "${pkgdir}/${_gemdir}/extensions/${_platform}/${_extension_api_version}/${_gemname}-${pkgver}/gem_make.out" \
-      "${pkgdir}/${_gemdir}/doc/${_gemname}-${pkgver}/ri/ext/puma_http11/page-Makefile.ri"
+  # remove unrepreducible files
+  rm --force --recursive --verbose \
+    "${pkgdir}/${_gemdir}/cache/" \
+    "${pkgdir}/${_gemdir}/gems/${_gemname}-${pkgver}/vendor/" \
+    "${pkgdir}/${_gemdir}/doc/${_gemname}-${pkgver}/ri/ext/"
 
+  find "${pkgdir}/${_gemdir}/gems/" \
+    -type f \
+    \( \
+      -iname "*.o" -o \
+      -iname "*.c" -o \
+      -iname "*.so" -o \
+      -iname "*.time" -o \
+      -iname "gem.build_complete" -o \
+      -iname "Makefile" \
+    \) \
+    -delete
+
+  find "${pkgdir}/${_gemdir}/extensions/" \
+    -type f \
+    \( \
+      -iname "mkmf.log" -o \
+      -iname "gem_make.out" \
+    \) \
+    -delete
+
   install -D --mode=644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
   install -D --mode=644 *.md --target-directory "${pkgdir}/usr/share/doc/${pkgname}"
 }

Modified: ruby-puma_fix_tests.patch
===================================================================
--- ruby-puma_fix_tests.patch	2022-08-24 15:48:51 UTC (rev 1276452)
+++ ruby-puma_fix_tests.patch	2022-08-24 15:59:18 UTC (rev 1276453)
@@ -31,7 +31,7 @@
 -    bind_configuration = conf.options.file_options[:binds].first
 -    app = conf.app
 -
--    ssl_binding = "ssl://0.0.0.0:9292?cert=&key=&verify_mode=none"
+-    ssl_binding = "ssl://0.0.0.0:9292?&verify_mode=none"
 -    assert_equal [ssl_binding], conf.options[:binds]
 -  end
 -