diff --git a/extra/ruby/.SRCINFO b/extra/ruby/.SRCINFO index 954f4d1fe..01d3ecca0 100644 --- a/extra/ruby/.SRCINFO +++ b/extra/ruby/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = ruby pkgdesc = An object-oriented language for quick and easy programming - pkgver = 3.2.4 + pkgver = 3.2.5 pkgrel = 1 url = https://www.ruby-lang.org/en/ arch = x86_64 @@ -22,12 +22,9 @@ pkgbase = ruby makedepends = tk makedepends = zlib options = !emptydirs - source = https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.4.tar.xz - source = ruby-3.2-openssl-3.3-fix.patch::https://github.com/ruby/ruby/commit/dd5e625d7bcb7dc849fdbc2ad8053f9c2724efb4.patch - sha512sums = fb0af37be4b6ad7b98ab9f8a508952238ee68b5828e3926331e4db52e2ebc1e6046f31114069322db0cd3bea7c9b82ace91c8564573ddcfa1f960877b237dbff - sha512sums = 52351374fc9aa9c3576bfb4b62df1d1d8dbe7327270a4d1c5777d247a33d6e6528b08a537fc4c87d9d0cc54b4b9183848f6c54d54fc727871b3e511b7a73ddb7 - b2sums = 9c2300a958b03528d51f0d74a069c8c538ca4009835d55377509a000bcfb43893a8a80d8fda57011e77c72e6283cb259281d5ba7b37444546e49f2a9ad515cf3 - b2sums = 1ee662e57f9f29b4ab29b391b38b988a8b5c199e62c815353c3a47e6eceea910344c7d9a00512916e05b6404efddf941313dfdcb0bec027f7f668443309228b9 + source = https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.5.tar.xz + sha512sums = 092348b84b513aec62e63ec10b326370d0e3d1fa3126c59c03c84f28e2d7741a4772c461b077ec6a7dac3964a20f434655729e1acd50a3438755d7ad64073305 + b2sums = a37c92a0f751e81dcae328b8944c4ecf10f6aee4f4468d6d08bb924c9808c8556c5febb71a825dd62dbcccf56385138e6e306bf3efae3589bdf0512d16d99d1a pkgname = ruby depends = gcc-libs diff --git a/extra/ruby/PKGBUILD b/extra/ruby/PKGBUILD index f37255581..8b473dead 100644 --- a/extra/ruby/PKGBUILD +++ b/extra/ruby/PKGBUILD @@ -18,7 +18,7 @@ pkgname=( ruby-bundled-gems ruby-stdlib ) -pkgver=3.2.4 +pkgver=3.2.5 pkgrel=1 pkgdesc='An object-oriented language for quick and easy programming' url='https://www.ruby-lang.org/en/' @@ -45,14 +45,9 @@ checkdepends=( procps-ng ) options=('!emptydirs') -source=( - "https://cache.ruby-lang.org/pub/ruby/${pkgver:0:3}/ruby-${pkgver}.tar.xz" - ruby-3.2-openssl-3.3-fix.patch::https://github.com/ruby/ruby/commit/dd5e625d7bcb7dc849fdbc2ad8053f9c2724efb4.patch -) -sha512sums=('fb0af37be4b6ad7b98ab9f8a508952238ee68b5828e3926331e4db52e2ebc1e6046f31114069322db0cd3bea7c9b82ace91c8564573ddcfa1f960877b237dbff' - '52351374fc9aa9c3576bfb4b62df1d1d8dbe7327270a4d1c5777d247a33d6e6528b08a537fc4c87d9d0cc54b4b9183848f6c54d54fc727871b3e511b7a73ddb7') -b2sums=('9c2300a958b03528d51f0d74a069c8c538ca4009835d55377509a000bcfb43893a8a80d8fda57011e77c72e6283cb259281d5ba7b37444546e49f2a9ad515cf3' - '1ee662e57f9f29b4ab29b391b38b988a8b5c199e62c815353c3a47e6eceea910344c7d9a00512916e05b6404efddf941313dfdcb0bec027f7f668443309228b9') +source=("https://cache.ruby-lang.org/pub/ruby/${pkgver:0:3}/ruby-${pkgver}.tar.xz") +sha512sums=('092348b84b513aec62e63ec10b326370d0e3d1fa3126c59c03c84f28e2d7741a4772c461b077ec6a7dac3964a20f434655729e1acd50a3438755d7ad64073305') +b2sums=('a37c92a0f751e81dcae328b8944c4ecf10f6aee4f4468d6d08bb924c9808c8556c5febb71a825dd62dbcccf56385138e6e306bf3efae3589bdf0512d16d99d1a') _bootstrap=0 _rubyver="${pkgver:0:3}.0" @@ -166,15 +161,6 @@ _default_tool_gems_bins=( ri ) -prepare() { - cd "ruby-${pkgver}" - - # ignore test_session_reuse_but_expire test for openssl version 3.3 - sed -i "s/3.2./3.3./g" test/net/http/test_https.rb - - patch -Np1 < ../ruby-3.2-openssl-3.3-fix.patch -} - build() { cd "ruby-${pkgver}" diff --git a/extra/ruby/README.md b/extra/ruby/README.md index f66900b4c..aae9a00b0 100644 --- a/extra/ruby/README.md +++ b/extra/ruby/README.md @@ -55,6 +55,7 @@ Build the following packages in the given order: - ruby-bundler - ruby-webrick - ruby-rake-compiler +- ruby-test-unit-ruby-core - ruby-erb - ruby-power_assert - ruby-test-unit @@ -85,3 +86,9 @@ libraries are compatible with the new Ruby version. This rebuild must be carefully managed to maintain dependency integrity. - rebuild all packages in order + +#### command to find packages to rebuild + +```bash +./build-rebuild-todo-list.sh +``` diff --git a/extra/ruby/build-rebuild-todo-list.sh b/extra/ruby/build-rebuild-todo-list.sh new file mode 100755 index 000000000..fe8b03c90 --- /dev/null +++ b/extra/ruby/build-rebuild-todo-list.sh @@ -0,0 +1,22 @@ +#!/usr/bin/env bash + +if [ -z "${1}" ]; then + echo "Usage: $0 " + exit 1 +fi + +ruby_version_short="${1:0:3}" +ruby_version_long="${ruby_version_short}.0" +todo_list_filename="./ruby_rebuild_todo.txt" + +sudo pacman -Fy + +echo +echo "Generating ${todo_list_filename} ..." + +{ + pacman -Fx ".*/ruby/(${ruby_version_long}|gems/${ruby_version_long}|vendor_ruby/${ruby_version_short}|vendor_ruby/${ruby_version_long})/*" |sed -ne 's,^.*\(core\|extra\|multilib\)/\(.*\) .*$,\2,p' + + sogrep extra libruby.so + sogrep extra "libruby.so.${ruby_version_short}" +} | sort -u > "${todo_list_filename}"