From 7440e781b8b09bf6eb86d8bcd8feeb0fae9ba36b Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Thu, 13 Jun 2024 10:06:26 -0400 Subject: [PATCH 1/5] user/gitlab-foss: upgrade to 17.0.2 --- user/gitlab-foss/APKBUILD | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/user/gitlab-foss/APKBUILD b/user/gitlab-foss/APKBUILD index 9925aa5..88e4982 100644 --- a/user/gitlab-foss/APKBUILD +++ b/user/gitlab-foss/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Antoine Martin (ayakael) pkgname=gitlab-foss _pkgname=${pkgname%-foss} -pkgver=16.11.4 +pkgver=17.0.2 _gittag=v$pkgver pkgrel=0 pkgdesc="A version control for your server" @@ -17,8 +17,8 @@ depends=" cmd:dpkg-deb exiftool git>=2.42.0 - gitaly~=16.9 - gitlab-shell>=14.34 + gitaly~=17.0 + gitlab-shell>=14.35 graphicsmagick http-parser procps @@ -59,8 +59,6 @@ makedepends=" protobuf-dev re2-dev ruby3.2-dev - ruby3.2-grpc~=1.58 - ruby3.2-rugged rust yarn>=1.2.0 " @@ -91,8 +89,6 @@ export BUNDLE_FROZEN=true export BUNDLE_JOBS=1 prepare() { - local sysgemdir=$(ruby -e 'puts Gem.default_dir') - default_prepare # The default log level is very chatty. @@ -108,17 +104,6 @@ prepare() { # Allow use of any bundler sed -i -e '/BUNDLED/,+1d' Gemfile.lock - - # Some gems are broken, so we copy our fixed version - # instead of installing it from RubyGems using Bundler. - for i in grpc rugged; do - mkdir -p vendor/gems/$i/src/ruby/lib/$i - cp -r "$sysgemdir"/gems/$i-*/* vendor/gems/$i/ - cp "$sysgemdir"/specifications/$i-*.gemspec \ - vendor/gems/$i/$i.gemspec - cp "$sysgemdir"/extensions/*/*/$i-*/$i/*.so \ - vendor/gems/$i/src/ruby/lib/$i/ - done } build() { @@ -154,9 +139,6 @@ build() { # Remove faulty RPATH. chrpath -d vendor/bundle/ruby/*/extensions/*/*/ruby-magic-*/magic/magic.so - # cp grpc lib - cp vendor/gems/grpc/src/ruby/lib/grpc/grpc_c.so vendor/bundle/ruby/*/gems/grpc-*/src/ruby/lib/grpc/grpc_c.so - # Patch installed gem gitlab-markup to use python3. # Option "-S" causes that Python cannot find docutils module. sed -i 's/python2 -S/python3/g' \ @@ -379,7 +361,7 @@ assets() { } sha512sums=" -8b9438778b61901dbfbc5c8af699a72e2279fb25f4e129ebdda294a6a0885056d0b1d2d51d760ad00a86f8ee61eb52bbf82cb96122fe5ccb2d5bffb485e720d3 gitlab-foss-v16.11.4.tar.gz +f9e9a5c4dec5a15281e9173ad93b260315330d4707985e5393d86e08d3dc1883cb107f5e4f6fd2c0d2d3e3325a99e678471a04aa613f8a4a99e9e965f7626466 gitlab-foss-v17.0.2.tar.gz daa496f3d9146f9dbddff62477bf49d5c7bd2f2a4cdbadc70ee51c8230f3ef01dc950ef157154b31c7e7bef0beecc5cbac50fbac65a79d6d9099b27bcba8b2ab database-config.patch 55b0667d3969113ffd6860652ee8bdb9a534c25f413f33b2739e922c886988e7cea72c1c00c7eecf29fcff3682b1324156365605ffc6aae45d1e0ccddf96288b gitlab.initd 1f451b67a5d5e58650b0fe862a2b65cfb8bff5502b37d94ae90619c1ff9affbecf24428303a2849bebce5f94bef37078f0e5710e344bbab616134e910938384a gitlab.mailroom.initd -- 2.45.2 From f57dc997f71f69de0e66a883eeef25563ab4b95e Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Thu, 13 Jun 2024 10:07:13 -0400 Subject: [PATCH 2/5] user/gitaly: upgrade to 17.0.2 --- user/gitaly/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user/gitaly/APKBUILD b/user/gitaly/APKBUILD index 801d299..a925e15 100644 --- a/user/gitaly/APKBUILD +++ b/user/gitaly/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Antoine Martin (ayakael) # Contributor: Jakub Jirutka pkgname=gitaly -pkgver=16.11.4 +pkgver=17.0.2 pkgrel=0 pkgdesc="A Git RPC service for handling all the git calls made by GitLab" url="https://gitlab.com/gitlab-org/gitaly/" @@ -80,7 +80,7 @@ praefect() { } sha512sums=" -c8107d5058bb7470244bc368fd1cec827a6fac32efef3ed4ffe637b1897bac6c440001e7a17bac97a22942c2dcba118c7fdd9dde49b8f286a0676c483aa815e4 gitaly-v16.11.4.tar.gz +645673511a9fbf868094e58c36395867228ba8a9c8e829d499e8008d8a713bab5b0f0bd0daec3f2acea5349435ccfff3559d086a2a96edca97573f8dcbb92fbd gitaly-v17.0.2.tar.gz 7685330e637c3a34db941c9e6b8776d0611ec16297e8be998a3eb4716c455d9f015d433a4d27720c24e520d489dd56bdab7c0e4264f2852b4b0bfd6ecaa7f773 config.patch c32105d921be16eaf559cf21d6840bc346cd92b5e37974cedecdb5a2d2ca1eb5e8fbb144f5fc8a1289bf9415102b313cf2d61ee510c80f08ab33a799f5ac7122 gitaly.initd " -- 2.45.2 From 81ac0611da2411ddc16e123bc5eb71439d6625bf Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Thu, 13 Jun 2024 10:07:23 -0400 Subject: [PATCH 3/5] user/gitlab-pages: upgrade to 17.0.2 --- user/gitlab-pages/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user/gitlab-pages/APKBUILD b/user/gitlab-pages/APKBUILD index ab65b67..7d8ef86 100644 --- a/user/gitlab-pages/APKBUILD +++ b/user/gitlab-pages/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Antoine Martin (ayakael) # Contributor: Jakub Jirutka pkgname=gitlab-pages -pkgver=16.11.4 +pkgver=17.0.2 _gittag="v$pkgver" pkgrel=0 pkgdesc="A daemon used to serve static websites for GitLab users" @@ -29,7 +29,7 @@ package() { } sha512sums=" -09b8fa7e094698ad196de1e75c07fdce3d6b37a11ce7aa57bb2953b098bfd1fd9661911488a914d8e458b3c282c805649219189cf4fc75a45c54785ad87b4074 gitlab-pages-v16.11.4.tar.gz +3cbd35acdd98acac4300bf1eadedd53db8925ae70c1af7c94eaff26399b501490b81432631c493988ca5fa91154b72b0eb8b00441caec6f67771be3079bee526 gitlab-pages-v17.0.2.tar.gz 710a9b652327e57e620c2bdb02bf912a6f61044eaaf61d36c6612284e9b951d2ac6f5eef77dfea16a0cde328bd4c556d9e47791c560139c27cb9659076f809b1 ungit-makefile.patch 20bc66c1c3548568ed353ca8d584f9108b9688f9375f212a18efc7b8386fdaafb3b2dc9e865f21c7f8fd31ada6e91842a8bb8d397f64851d853bb0de3e0e60bb gitlab-pages.initd " -- 2.45.2 From 08ee79d0320b134632d4a97b93f7e0e833c9da22 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Thu, 13 Jun 2024 18:11:32 -0400 Subject: [PATCH 4/5] user/grpc: drop due to not needed --- user/grpc/01-chttp2-maybe-uninitialized.patch | 10 - user/grpc/APKBUILD | 273 ------------------ user/grpc/cython3.patch | 172 ----------- user/grpc/find-dependency.patch | 13 - user/grpc/makefile-use-system-abseil.patch | 22 -- user/grpc/ruby-fix-protoc-path.patch | 25 -- user/grpc/ruby-use-shared-libs.patch | 81 ------ user/grpc/ruby-use-system-certs.patch | 15 - 8 files changed, 611 deletions(-) delete mode 100644 user/grpc/01-chttp2-maybe-uninitialized.patch delete mode 100644 user/grpc/APKBUILD delete mode 100644 user/grpc/cython3.patch delete mode 100644 user/grpc/find-dependency.patch delete mode 100644 user/grpc/makefile-use-system-abseil.patch delete mode 100644 user/grpc/ruby-fix-protoc-path.patch delete mode 100644 user/grpc/ruby-use-shared-libs.patch delete mode 100644 user/grpc/ruby-use-system-certs.patch diff --git a/user/grpc/01-chttp2-maybe-uninitialized.patch b/user/grpc/01-chttp2-maybe-uninitialized.patch deleted file mode 100644 index b531fbc..0000000 --- a/user/grpc/01-chttp2-maybe-uninitialized.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc -+++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc -@@ -978,6 +978,7 @@ - } else { - r = grpc_chttp2_begin_write(t); - } -+ #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" - if (r.writing) { - if (r.partial) { - GRPC_STATS_INC_HTTP2_PARTIAL_WRITES(); diff --git a/user/grpc/APKBUILD b/user/grpc/APKBUILD deleted file mode 100644 index 1572117..0000000 --- a/user/grpc/APKBUILD +++ /dev/null @@ -1,273 +0,0 @@ -# Contributor: Keith Maxwell -# Contributor: wener -# Maintainer: wener -pkgname=grpc -pkgver=1.58.0 -pkgrel=2 -pkgdesc="The C based gRPC" -url="https://grpc.io/" -arch="all" -# BSD-3-Clause: third_party/upb, third_party/address_sorting -# MIT: third_party/upb/third_party/utf8_range -license="Apache-2.0 AND BSD-3-Clause AND MIT" -depends="ca-certificates" -depends_dev=" - $pkgname-cpp=$pkgver-r$pkgrel - $pkgname-plugins=$pkgver-r$pkgrel - " -_pythondepends=" - cython - python3-dev - py3-setuptools - " -_rubydepends=" - $pkgname=$pkgver-r$pkgrel - ruby3.2-google-protobuf>=3.19 - " -makedepends=" - abseil-cpp-dev - autoconf - automake - benchmark-dev - c-ares-dev - chrpath - cmake - libstdc++ - libtool - linux-headers - openssl-dev>3 - protobuf-dev - re2-dev - ruby3.2-dev - samurai - yaml-dev - xxhash-dev - zlib-dev - $_pythondepends - $_rubydepends - " -checkdepends="coreutils python3 py3-six" -subpackages=" - $pkgname-dev - $pkgname-cpp - $pkgname-plugins - $pkgname-doc - py3-grpcio-pyc - py3-grpcio:grpcio - ruby3.2-grpc:_ruby - libaddress_sorting:lib - libgpr:lib - libgrpc:lib - libgrpc_authorization_provider:lib - libgrpc_unsecure:lib - libupb:lib - " -_googletest_rev=0e402173c97aea7a00749e825b194bfede4f2e45 - -# ruby-dont-strip-library.patch: abuild will dot the strip -source="https://github.com/grpc/grpc/archive/v$pkgver/grpc-v$pkgver.tar.gz - googletest-$_googletest_rev.tar.gz::https://github.com/google/googletest/archive/$_googletest_rev.tar.gz - 01-chttp2-maybe-uninitialized.patch - find-dependency.patch - ruby-fix-protoc-path.patch - ruby-use-shared-libs.patch - ruby-use-system-certs.patch - makefile-use-system-abseil.patch - cython3.patch - " -options="net !check" # sometimes hang indefinitely on builders - -prepare() { - rm -r third_party/googletest - mv "$srcdir"/googletest-$_googletest_rev third_party/googletest - - # Remove bundled xxhash. - # Since grpc sets XXH_INCLUDE_ALL wherever it uses xxhash, it is using xxhash - # as a header-only library. This means we can replace it with the system copy - # by doing nothing further; xxhash.h is in the system include path and will be - # found instead, and there are no linker flags to add. See also - # https://github.com/grpc/grpc/issues/25945. - rm -rvf third_party/xxhash/* - - # This will be replaced with a symlink to system certs. - echo '' > etc/roots.pem - - default_prepare - - # Remove some bundled dependencies from the gem's files list. - sed -i \ - -e '/etc\/roots.pem/d' \ - -e '/third_party\/abseil/d' \ - -e '/third_party\/boringssl/d' \ - -e '/third_party\/cares/d' \ - -e '/third_party\/re2/d' \ - -e '/third_party\/xxhash/d' \ - -e '/third_party\/zlib/d' \ - grpc.gemspec - - # Remove unused dependency from gemspec - it's not required anyhwere, - # it's just Google pushing their crap everywhere... - sed -i '/add_dependency.*googleapis-common-protos-types/d' \ - grpc.gemspec -} - -build() { - export CFLAGS="$CFLAGS -flto=auto -DNDEBUG -O2" - export CXXFLAGS="$CXXFLAGS -flto=auto -DNDEBUG -O2" - cmake -B _build -G Ninja \ - -DCMAKE_BUILD_TYPE=None \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_CXX_STANDARD=17 \ - -DBUILD_SHARED_LIBS=True \ - -DgRPC_INSTALL=ON \ - -DgRPC_CARES_PROVIDER=package \ - -DgRPC_PROTOBUF_PROVIDER=package \ - -DgRPC_SSL_PROVIDER=package \ - -DgRPC_ZLIB_PROVIDER=package \ - -DgRPC_ABSL_PROVIDER=package \ - -DgRPC_BENCHMARK_PROVIDER=package \ - -DgRPC_RE2_PROVIDER=package \ - -DgRPC_BACKWARDS_COMPATIBILITY_MODE=OFF \ - -DgRPC_BUILD_TESTS="$(want_check && echo ON || echo OFF)" - cmake --build _build - - GRPC_PYTHON_CFLAGS="-std=c++17" \ - GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY=1 \ - GRPC_PYTHON_BUILD_SYSTEM_CARES=1 \ - GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1 \ - GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1 \ - GRPC_PYTHON_BUILD_SYSTEM_RE2=1 \ - GRPC_PYTHON_BUILD_SYSTEM_ABSL=1 \ - python3 setup.py build - - # grpcio-tools - cd tools/distrib/python - python3 make_grpcio_tools.py - - cd "$builddir" - gem build grpc.gemspec - TOPDIR="$PWD/_build" gem install \ - --local \ - --install-dir _build/ruby \ - --ignore-dependencies \ - --no-document \ - --verbose \ - grpc-$pkgver.gem -} - -check() { - # delete times out in ci or broken for ci tests - rm -f _build/spinlock_test _build/resolve_address_using_ares_resolver_posix_test build/resolve_address_using_native_resolver_posix_test - rm -f _build/flaky_network_test _build/unknown_frame_bad_client_test _build/ssl_transport_security_test _build/httpscli_test - rm -f _build/headers_bad_client_test _build/httpcli_test - case $CARCH in - aarch64|ppc64le) rm -f _build/server_test _build/grpc_tool_test ;; - s390x) rm -f _build/client_lb_end2end_test _build/alts_frame_protector_test _build/alts_iovec_record_protocol_test ;; - armv7) rm -f _build/initial_settings_frame_bad_client_test ;; - x86) rm -f _build/time_jump_test _build/connection_prefix_bad_client_test ;; - esac - - # start helper - ./tools/run_tests/start_port_server.py & - find build/ -maxdepth 1 -type f -executable -name "*_test" -exec {} \; - # kill helper - pkill -9 python3 -} - -package() { - DESTDIR="$pkgdir" cmake --install _build - python3 setup.py install --skip-build --root="$pkgdir" - - cd doc - find ./ -type f -print -exec install -Dm644 {} "$pkgdir"/usr/share/doc/grpc/{} \; - rm "$pkgdir"/usr/share/doc/grpc/.gitignore - - find "$pkgdir" -type f -name roots.pem -exec \ - sh -c 'rm $0 && ln -s /etc/ssl/certs/ca-certificates.crt $0' "{}" \; -} - -cpp() { - pkgdesc="C++ language bindings for gRPC" - depends="$pkgname=$pkgver-r$pkgrel" - - amove usr/lib/libgrpc++*.so.* - amove usr/lib/libgrpc_plugin_support.so.* - amove usr/lib/libgrpcpp*.so.* -} - -plugins() { - pkgdesc="Protocol buffers compiler plugins for gRPC" - depends="$pkgname-cpp=$pkgver-r$pkgrel protobuf" - - amove usr/bin/grpc_*_plugin -} - -cli() { - pkgdesc="gRPC command line tool" - - install -Dm644 -t "$subpkgdir"/usr/lib "$builddir"/_build/libgrpc++_test_config.so.$pkgver - install -Dm755 -t "$subpkgdir"/usr/bin "$builddir"/_build/grpc_cli - - # Fix "Has /home/... in rpath" - chrpath -d "$subpkgdir"/usr/lib/libgrpc++_test_config.so.$pkgver - chrpath -d "$subpkgdir"/usr/bin/grpc_cli -} - -grpcio() { - pkgdesc="gRPC Python HTTP/2-based RPC framework" - depends="py3-six" - - amove usr/lib/python3* -} - -_ruby() { - pkgdesc="Send RPCs from Ruby using GRPC" - depends="$_rubydepends" - - local gemdir="$subpkgdir/$(ruby -e 'puts Gem.default_dir')" - - cd "$builddir"/_build/ruby - - mkdir -p "$gemdir" - cp -r extensions gems specifications "$gemdir"/ - - # Remove unnecessary files and rubbish... - cd "$gemdir"/extensions/*/*/grpc-$pkgver - rm gem_make.out mkmf.log || true - - cd "$gemdir"/gems/grpc-$pkgver - rm -rf .yardopts \ - Makefile \ - include/ \ - src/core/ \ - third_party/ - - cd src/ruby - rm -rf bin/ \ - ext/ \ - lib/grpc/*.so \ - pb/generate_proto_ruby.sh \ - pb/README.md \ - pb/src/ \ - pb/test/ \ - spec/ -} - -lib() { - pkgdesc="$pkgdesc ($subpkgname library)" - depends="$pkgname=$pkgver-r$pkgrel" - - amove usr/lib/$subpkgname.so.* -} - -sha512sums=" -fb2fd211a22dd777cf4df39a9dd72e5c8014f1546a89d3910b006503aac80a74d5797705e02911e9c07316ed973f71110b94cc0e86225f648d4ff91773748a43 grpc-v1.58.0.tar.gz -5c5eaf6ff9f3c1bca025b7ef0234ba97232ba85b43e6354a92f49b7208f5c47581ebaf18bf58618498e5d264f2620c2b6676e81bb0f7df77112b96ba271ececf googletest-0e402173c97aea7a00749e825b194bfede4f2e45.tar.gz -7fa146ce86ddd4f160bb1ca9ff01cb7aca6b2b8c9aa50e4fa6b84504b9117b104be0d1e31ccb452d846549dfe1e9012ceccfcdc1f2357ed567621d71fb8b08c5 01-chttp2-maybe-uninitialized.patch -6702e39c6a3c065fe4ff5ae48898057135c09bf6851e35fc958cf95ee5d77e9dd34e8c34d978efe60682384e46c4c4b2e51156d546b06a0eb1feed89adcc024b find-dependency.patch -4ea72d2acd8bee9c9022a4412aa0af0477faca7b0810d14decb3ad5d4da044247f51189512323bfee855b9b260a7f82b812310391451e5d8ee718297800d7a73 ruby-fix-protoc-path.patch -7123bf1bbc48ceb303ce1e9820ea45a06dabd25e20e3c1c116ef68e629e80f229cf20314c415d74f0c5c1725f23a00b446656e0cffba3dcd3cc766ae29d8fb2f ruby-use-shared-libs.patch -631af4b9ac29c1ebabb2c88394ea2993e36cec1beda38195e1587dbd9d3c8c9eef75a17d2326d3cd2e682de551401216075ba08fdc501c098b8092d718ded381 ruby-use-system-certs.patch -89e260934da83eb45fa6b73884cba1b1c30f99c0eb883a726e2d36ee4788246f4c6fa1b201077038af956bcb58e625f83bedba4f186c711785ec240373ce4fc5 makefile-use-system-abseil.patch -896d2771fbb726db97efc7a76687a8fddfae18b0492977fc1f7cec4002803f7aed29e8276c94c6b60a06ecfe3ee7795d4ec3f8f90031dd3eda32d3e23dc9c98c cython3.patch -" diff --git a/user/grpc/cython3.patch b/user/grpc/cython3.patch deleted file mode 100644 index 9068927..0000000 --- a/user/grpc/cython3.patch +++ /dev/null @@ -1,172 +0,0 @@ -From b3277bac1585ddee88a170b0a95c260d909cce9c Mon Sep 17 00:00:00 2001 -From: Atri Bhattacharya -Date: Sat, 24 Feb 2024 04:06:08 +0530 -Subject: [PATCH] [python] Cython 3 compatibility: declare functions noexcept. - -In Cython 3, cdef functions that really will not raise exceptions must -be declared as `noexcept`. Fixed by this commit. - -Update requirements to `cython >= 3.0` in requirements*.txt and -setup.py. - -Fixes issue #33918. ---- - requirements.bazel.txt | 2 +- - requirements.txt | 2 +- - setup.py | 2 +- - .../grpcio/grpc/_cython/_cygrpc/aio/callback_common.pxd.pxi | 2 +- - .../grpcio/grpc/_cython/_cygrpc/aio/callback_common.pyx.pxi | 2 +- - src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi | 2 +- - src/python/grpcio/grpc/_cython/_cygrpc/fork_posix.pxd.pxi | 6 +++--- - src/python/grpcio/grpc/_cython/_cygrpc/fork_posix.pyx.pxi | 6 +++--- - src/python/grpcio/grpc/_cython/_cygrpc/vtable.pyx.pxi | 6 +++--- - 9 files changed, 15 insertions(+), 15 deletions(-) - -diff --git a/requirements.bazel.txt b/requirements.bazel.txt -index f46432cc88891..905c092ce4c33 100644 ---- a/requirements.bazel.txt -+++ b/requirements.bazel.txt -@@ -1,6 +1,6 @@ - # GRPC Python setup requirements - coverage==4.5.4 --cython==0.29.21 -+cython==3.0.0 - protobuf>=3.5.0.post1, < 4.0dev - wheel==0.38.1 - oauth2client==4.1.0 -diff --git a/requirements.txt b/requirements.txt -index 05390850559f1..56169434b1b78 100644 ---- a/requirements.txt -+++ b/requirements.txt -@@ -1,5 +1,5 @@ - # GRPC Python setup requirements - coverage>=4.0 --cython>=0.29.8,<3.0.0rc1 -+cython>=3.0.0 - protobuf>=4.21.3,<5.0dev - wheel>=0.29 -diff --git a/setup.py b/setup.py -index 2ce5fef422316..8b4ce5c16736a 100644 ---- a/setup.py -+++ b/setup.py -@@ -539,7 +539,7 @@ def cython_extensions_and_necessity(): - sys.stderr.write( - "We could not find Cython. Setup may take 10-20 minutes.\n" - ) -- SETUP_REQUIRES += ("cython>=0.23,<3.0.0rc1",) -+ SETUP_REQUIRES += ("cython>=3.0.0",) - - COMMAND_CLASS = { - "doc": commands.SphinxDocumentation, -diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pxd.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pxd.pxi -index e54e5107547c1..26edbdb917b10 100644 ---- a/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pxd.pxi -+++ b/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pxd.pxi -@@ -48,7 +48,7 @@ cdef class CallbackWrapper: - @staticmethod - cdef void functor_run( - grpc_completion_queue_functor* functor, -- int succeed) -+ int succeed) noexcept - - cdef grpc_completion_queue_functor *c_functor(self) - -diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pyx.pxi -index 14a0098fc2041..2b0df0e5ce7f7 100644 ---- a/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pyx.pxi -+++ b/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pyx.pxi -@@ -50,7 +50,7 @@ cdef class CallbackWrapper: - @staticmethod - cdef void functor_run( - grpc_completion_queue_functor* functor, -- int success): -+ int success) noexcept: - cdef CallbackContext *context = functor - cdef object waiter = context.waiter - if not waiter.cancelled(): -diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi -index 74a3f16d72dbb..600c0f304e067 100644 ---- a/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi -+++ b/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi -@@ -316,7 +316,7 @@ def server_credentials_ssl_dynamic_cert_config(initial_cert_config, - return credentials - - cdef grpc_ssl_certificate_config_reload_status _server_cert_config_fetcher_wrapper( -- void* user_data, grpc_ssl_server_certificate_config **config) with gil: -+ void* user_data, grpc_ssl_server_certificate_config **config) noexcept with gil: - # This is a credentials.ServerCertificateConfig - cdef ServerCertificateConfig cert_config = None - if not user_data: -diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/fork_posix.pxd.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/fork_posix.pxd.pxi -index 13a02434787ba..b300883abae81 100644 ---- a/src/python/grpcio/grpc/_cython/_cygrpc/fork_posix.pxd.pxi -+++ b/src/python/grpcio/grpc/_cython/_cygrpc/fork_posix.pxd.pxi -@@ -12,10 +12,10 @@ - # See the License for the specific language governing permissions and - # limitations under the License. - --cdef void __prefork() nogil -+cdef void __prefork() noexcept nogil - - --cdef void __postfork_parent() nogil -+cdef void __postfork_parent() noexcept nogil - - --cdef void __postfork_child() nogil -\ No newline at end of file -+cdef void __postfork_child() noexcept nogil -diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/fork_posix.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/fork_posix.pyx.pxi -index 565f483b2ae00..d901cfddf4321 100644 ---- a/src/python/grpcio/grpc/_cython/_cygrpc/fork_posix.pyx.pxi -+++ b/src/python/grpcio/grpc/_cython/_cygrpc/fork_posix.pyx.pxi -@@ -35,7 +35,7 @@ _GRPC_ENABLE_FORK_SUPPORT = ( - - _fork_handler_failed = False - --cdef void __prefork() nogil: -+cdef void __prefork() noexcept nogil: - with gil: - global _fork_handler_failed - _fork_handler_failed = False -@@ -49,14 +49,14 @@ cdef void __prefork() nogil: - _fork_handler_failed = True - - --cdef void __postfork_parent() nogil: -+cdef void __postfork_parent() noexcept nogil: - with gil: - with _fork_state.fork_in_progress_condition: - _fork_state.fork_in_progress = False - _fork_state.fork_in_progress_condition.notify_all() - - --cdef void __postfork_child() nogil: -+cdef void __postfork_child() noexcept nogil: - with gil: - try: - if _fork_handler_failed: -diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/vtable.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/vtable.pyx.pxi -index da4b81bd97e65..f59410073b736 100644 ---- a/src/python/grpcio/grpc/_cython/_cygrpc/vtable.pyx.pxi -+++ b/src/python/grpcio/grpc/_cython/_cygrpc/vtable.pyx.pxi -@@ -13,16 +13,16 @@ - # limitations under the License. - - # TODO(https://github.com/grpc/grpc/issues/15662): Reform this. --cdef void* _copy_pointer(void* pointer): -+cdef void* _copy_pointer(void* pointer) noexcept: - return pointer - - - # TODO(https://github.com/grpc/grpc/issues/15662): Reform this. --cdef void _destroy_pointer(void* pointer): -+cdef void _destroy_pointer(void* pointer) noexcept: - pass - - --cdef int _compare_pointer(void* first_pointer, void* second_pointer): -+cdef int _compare_pointer(void* first_pointer, void* second_pointer) noexcept: - if first_pointer < second_pointer: - return -1 - elif first_pointer > second_pointer: diff --git a/user/grpc/find-dependency.patch b/user/grpc/find-dependency.patch deleted file mode 100644 index f846e16..0000000 --- a/user/grpc/find-dependency.patch +++ /dev/null @@ -1,13 +0,0 @@ -without this find_dependency() doesn't exist --- -diff --git a/cmake/gRPCConfig.cmake.in b/cmake/gRPCConfig.cmake.in -index 98d8c6d..5500ca2 100644 ---- a/cmake/gRPCConfig.cmake.in -+++ b/cmake/gRPCConfig.cmake.in -@@ -1,5 +1,6 @@ - # Module path - list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/modules) -+include(CMakeFindDependencyMacro) - - # Depend packages - @_gRPC_FIND_ZLIB@ diff --git a/user/grpc/makefile-use-system-abseil.patch b/user/grpc/makefile-use-system-abseil.patch deleted file mode 100644 index ac4f9fc..0000000 --- a/user/grpc/makefile-use-system-abseil.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -575,8 +575,8 @@ - - # Setup abseil dependency - --GRPC_ABSEIL_DEP = $(LIBDIR)/$(CONFIG)/libgrpc_abseil.a --GRPC_ABSEIL_MERGE_LIBS = $(LIBDIR)/$(CONFIG)/libgrpc_abseil.a -+GRPC_ABSEIL_DEP = -labsl_base -labsl_int128 -labsl_strings -labsl_time -labsl_bad_optional_access -labsl_throw_delegate -labsl_str_format_internal -+GRPC_ABSEIL_MERGE_LIBS = -labsl_base -labsl_int128 -labsl_strings -labsl_time -labsl_bad_optional_access -labsl_throw_delegate -labsl_str_format_internal - - # Setup re2 dependency - -@@ -2809,7 +2809,7 @@ - third_party/abseil-cpp/absl/types/bad_variant_access.cc \ - - --LIBGRPC_ABSEIL_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC_ABSEIL_SRC)))) -+LIBGRPC_ABSEIL_OBJS = - - $(LIBGRPC_ABSEIL_OBJS): CPPFLAGS += -g -Ithird_party/abseil-cpp - diff --git a/user/grpc/ruby-fix-protoc-path.patch b/user/grpc/ruby-fix-protoc-path.patch deleted file mode 100644 index 91f0268..0000000 --- a/user/grpc/ruby-fix-protoc-path.patch +++ /dev/null @@ -1,25 +0,0 @@ -Patch-Source: https://sources.debian.org/src/grpc/1.44.0-3/debian/patches/fix-protoc-path.patch (modified) - ---- a/src/ruby/end2end/package_with_underscore_test.rb -+++ b/src/ruby/end2end/package_with_underscore_test.rb -@@ -20,8 +20,8 @@ def main - pb_dir = File.join(root_dir, 'src', 'ruby', 'end2end', 'protos') - -- bins_dir = File.join(root_dir, 'cmake', 'build') -+ bins_dir = '/usr/bin' - plugin = File.join(bins_dir, 'grpc_ruby_plugin') -- protoc = File.join(bins_dir, 'third_party', 'protobuf', 'protoc') -+ protoc = File.join(bins_dir, 'protoc') - - got = nil - ---- a/src/ruby/tools/bin/grpc_tools_ruby_protoc -+++ b/src/ruby/tools/bin/grpc_tools_ruby_protoc -@@ -25,6 +25,5 @@ plugin_name = 'grpc_ruby_plugin' + ext - --protoc_dir = File.join(File.dirname(__FILE__), -- PLATFORM.architecture + '-' + PLATFORM.os_name) -+protoc_dir = '/usr/bin' - - protoc_path = File.join(protoc_dir, protoc_name) - diff --git a/user/grpc/ruby-use-shared-libs.patch b/user/grpc/ruby-use-shared-libs.patch deleted file mode 100644 index 736869a..0000000 --- a/user/grpc/ruby-use-shared-libs.patch +++ /dev/null @@ -1,81 +0,0 @@ -From: Jakub Jirutka -Date: Wed, 24 Aug 2022 21:20:22 +0200 -Subject: [PATCH] Link with shared libraries, don't embed anything - -- Don't statically link openssl, zlib and cares. -- Don't build and statically link libgrpc, link shared libgrpc. -- Don't statically link libgcc and libstdc++. - -diff --git a/src/ruby/ext/grpc/extconf.rb b/src/ruby/ext/grpc/extconf.rb -index 98a8876..808ecfe 100644 ---- a/src/ruby/ext/grpc/extconf.rb -+++ b/src/ruby/ext/grpc/extconf.rb -@@ -69,11 +69,11 @@ if apple_toolchain && !cross_compiling - end - - # Don't embed on TruffleRuby (constant-time crypto is unsafe with Sulong, slow build times) --ENV['EMBED_OPENSSL'] = (RUBY_ENGINE != 'truffleruby').to_s -+ENV['EMBED_OPENSSL'] = 'false' - # Don't embed on TruffleRuby (the system zlib is already linked for the zlib C extension, slow build times) --ENV['EMBED_ZLIB'] = (RUBY_ENGINE != 'truffleruby').to_s -+ENV['EMBED_ZLIB'] = 'false' - --ENV['EMBED_CARES'] = 'true' -+ENV['EMBED_CARES'] = 'false' - - ENV['ARCH_FLAGS'] = RbConfig::CONFIG['ARCH_FLAG'] - if apple_toolchain && !cross_compiling -@@ -97,32 +97,7 @@ - strip_tool = RbConfig::CONFIG['STRIP'] - strip_tool += ' -x' if apple_toolchain - --unless windows -- puts 'Building internal gRPC into ' + grpc_lib_dir -- nproc = 4 -- nproc = Etc.nprocessors if Etc.respond_to? :nprocessors -- nproc_override = ENV['GRPC_RUBY_BUILD_PROCS'] -- unless nproc_override.nil? or nproc_override.size == 0 -- nproc = nproc_override -- puts "Overriding make parallelism to #{nproc}" -- end -- make = bsd ? 'gmake' : 'make' -- cmd = "#{make} -j#{nproc} -C #{grpc_root} #{grpc_lib_dir}/libgrpc.a CONFIG=#{grpc_config} Q=" -- puts "Building grpc native library: #{cmd}" -- system(cmd) -- exit 1 unless $? == 0 -- -- if grpc_config == 'opt' -- rm_obj_cmd = "rm -rf #{File.join(output_dir, 'objs')}" -- puts "Removing grpc object files: #{rm_obj_cmd}" -- system(rm_obj_cmd) -- exit 1 unless $? == 0 -- strip_cmd = "#{strip_tool} #{grpc_lib_dir}/*.a" -- puts "Stripping grpc native library: #{strip_cmd}" -- system(strip_cmd) -- exit 1 unless $? == 0 -- end --end -+$LDFLAGS << ' -L' + ENV.fetch('TOPDIR', '.') - - $CFLAGS << ' -DGRPC_RUBY_WINDOWS_UCRT' if windows_ucrt - $CFLAGS << ' -I' + File.join(grpc_root, 'include') -@@ -118,7 +103,7 @@ ext_export_file += '-truffleruby' if RUBY_ENGINE == 'truffleruby' - $LDFLAGS << ' -Wl,--version-script="' + ext_export_file + '.gcc"' if linux - $LDFLAGS << ' -Wl,-exported_symbols_list,"' + ext_export_file + '.clang"' if apple_toolchain - --$LDFLAGS << ' ' + File.join(grpc_lib_dir, 'libgrpc.a') unless windows -+$LDFLAGS << ' -Wl,-wrap,memcpy -lgrpc' unless windows - if grpc_config == 'gcov' - $CFLAGS << ' -O0 -fprofile-arcs -ftest-coverage' - $LDFLAGS << ' -fprofile-arcs -ftest-coverage -rdynamic' -@@ -129,10 +114,6 @@ if grpc_config == 'dbg' - end - - $LDFLAGS << ' -Wl,-wrap,memcpy' if linux --# Do not statically link standard libraries on TruffleRuby as this does not work when compiling to bitcode --if linux && RUBY_ENGINE != 'truffleruby' -- $LDFLAGS << ' -static-libgcc -static-libstdc++' --end - $LDFLAGS << ' -static' if windows - - $CFLAGS << ' -std=c11 ' diff --git a/user/grpc/ruby-use-system-certs.patch b/user/grpc/ruby-use-system-certs.patch deleted file mode 100644 index 5d3ba16..0000000 --- a/user/grpc/ruby-use-system-certs.patch +++ /dev/null @@ -1,15 +0,0 @@ -From: Jakub Jirutka -Date: Fri, 20 May 2017 01:35:00 +0200 -Subject: [PATCH] Use system CA certificates - ---- a/src/ruby/lib/grpc.rb -+++ b/src/ruby/lib/grpc.rb -@@ -12,7 +12,7 @@ - # See the License for the specific language governing permissions and - # limitations under the License. - --ssl_roots_path = File.expand_path('../../../../etc/roots.pem', __FILE__) -+ssl_roots_path = '/etc/ssl/certs/ca-certificates.crt' - - require_relative 'grpc/errors' - require_relative 'grpc/structs' -- 2.45.2 From 1c7eeb3dcef1a6901a329ee2637a06d75d523480 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Thu, 13 Jun 2024 18:11:43 -0400 Subject: [PATCH 5/5] user/ruby3.2-rugged: drop due to not needed --- user/ruby3.2-rugged/APKBUILD | 75 ---------------- .../fix-extconf-version-check.patch | 13 --- user/ruby3.2-rugged/libgit2-1.7.patch | 90 ------------------- user/ruby3.2-rugged/libgit2-fixture-dir.patch | 12 --- user/ruby3.2-rugged/skip-online-tests.patch | 15 ---- .../skip-test_discover_false.patch | 27 ------ .../skip-test_read_global_config_file.patch | 13 --- 7 files changed, 245 deletions(-) delete mode 100644 user/ruby3.2-rugged/APKBUILD delete mode 100644 user/ruby3.2-rugged/fix-extconf-version-check.patch delete mode 100644 user/ruby3.2-rugged/libgit2-1.7.patch delete mode 100644 user/ruby3.2-rugged/libgit2-fixture-dir.patch delete mode 100644 user/ruby3.2-rugged/skip-online-tests.patch delete mode 100644 user/ruby3.2-rugged/skip-test_discover_false.patch delete mode 100644 user/ruby3.2-rugged/skip-test_read_global_config_file.patch diff --git a/user/ruby3.2-rugged/APKBUILD b/user/ruby3.2-rugged/APKBUILD deleted file mode 100644 index 42f7818..0000000 --- a/user/ruby3.2-rugged/APKBUILD +++ /dev/null @@ -1,75 +0,0 @@ -# Contributor: Jakub Jirutka -# Maintainer: Jakub Jirutka -pkgname=ruby3.2-rugged -_gemname=rugged -pkgver=1.6.3 -pkgrel=1 -pkgdesc="Ruby bindings to libgit2" -url="https://github.com/libgit2/rugged" -arch="all" -license="MIT" -checkdepends=" - git - libgit2-tests - ruby3.2-minitest - ruby3.2-rake - ruby3.2-rake-compiler - " -makedepends=" - libgit2-dev>=${pkgver%.*} - ruby3.2 - ruby3.2-dev - " -source="$_gemname-$pkgver.tar.gz::https://github.com/libgit2/$_gemname/archive/v$pkgver.tar.gz - fix-extconf-version-check.patch - libgit2-fixture-dir.patch - libgit2-1.7.patch - skip-test_discover_false.patch - skip-test_read_global_config_file.patch - skip-online-tests.patch - " -builddir="$srcdir/$_gemname-$pkgver" -# Rugged::ConfigError: repository path '/tmp/' is not owned by current user -# requires tmp persmissions on host -options="!check" - -build() { - gem build $_gemname.gemspec - - RUGGED_USE_SYSTEM_LIBRARIES=1 gem install --local \ - --install-dir dist \ - --ignore-dependencies \ - --no-document \ - --verbose \ - $_gemname - - # Needed for tests. - cp -l dist/extensions/*/*/$_gemname-*/$_gemname/*.so lib/$_gemname/ -} - -check() { - rake test LIBGIT2_FIXTURE_DIR="/usr/src/libgit2/tests/resources" -} - -package() { - local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')" - cd "$builddir"/dist - - mkdir -p "$gemdir" - cp -r extensions gems specifications "$gemdir"/ - - # Remove unnecessary and duplicated files. - rm -f "$gemdir"/extensions/*/*/$_gemname-*/mkmf.log - cd "$gemdir"/gems/$_gemname-$pkgver - rm -rf ext/ lib/$_gemname/*.so LICENSE* README* -} - -sha512sums=" -4d54b5df04382628aff7e1abbf5fbd9730564c9bcb4e17da34ac59578b306db567b15151629a10c4a6d8174a31cd8be03c27ff0d1514cb19de237e773f4b64ce rugged-1.6.3.tar.gz -0e55aff667175496e9df1920c6d49042077196aa992a729323628224e7930a6f976bcbfae70d2af733a043c173e8cd5f571606f0b898b008472b40fcefe6b425 fix-extconf-version-check.patch -0c749aeb8d6a29aed51737bab09c7b0a6669ac691461758c856ede5d8510ad6edfa284cddd1b54982bf614a45ba817b70e838e071889a9b05e1b0580111ec826 libgit2-fixture-dir.patch -bcf7b554390fb2b1ef9043f8c934ae51a299f223ec1d7826dcb8eed078961cd084c05148c84142d60cc0a3213653bd416af1fbb09bfa5b26c9ce87fca79f6a18 libgit2-1.7.patch -33464eeefc7669fe3bf5f47c4016cacdcba4f7455ed22b441383b49721870072b5095dbb68832cdb933a7659a415476db64b579a98c888b83900d092bb8b54be skip-test_discover_false.patch -b9e028f18830e447773e895046eb03489e94bb5a76fede51f93545ed67f7249ed8f37ed4bb832eb68a2db281ff3e2b84dab8b72bb21eea4b835b0f1ce23943c3 skip-test_read_global_config_file.patch -5f0ad88eb7ac8c69605c43712e046efd47b727f48e98ee4047be850da4fea48c11fc2a383c791810a1bc81c08ca00428d4906c1af02a0d0da6e1ffbd4723b8f3 skip-online-tests.patch -" diff --git a/user/ruby3.2-rugged/fix-extconf-version-check.patch b/user/ruby3.2-rugged/fix-extconf-version-check.patch deleted file mode 100644 index fc22612..0000000 --- a/user/ruby3.2-rugged/fix-extconf-version-check.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/ext/rugged/extconf.rb b/ext/rugged/extconf.rb -index 7dbd2b3..92251e3 100644 ---- a/ext/rugged/extconf.rb -+++ b/ext/rugged/extconf.rb -@@ -70,7 +70,7 @@ if arg_config("--use-system-libraries", !!ENV['RUGGED_USE_SYSTEM_LIBRARIES']) - - major = minor = nil - -- File.readlines(File.join(LIBGIT2_DIR, "include", "git2", "version.h")).each do |line| -+ File.readlines(File.join("/usr", "include", "git2", "version.h")).each do |line| - if !major && (matches = line.match(/^#define LIBGIT2_VER_MAJOR\s+([0-9]+)$/)) - major = matches[1] - next diff --git a/user/ruby3.2-rugged/libgit2-1.7.patch b/user/ruby3.2-rugged/libgit2-1.7.patch deleted file mode 100644 index 4fe0884..0000000 --- a/user/ruby3.2-rugged/libgit2-1.7.patch +++ /dev/null @@ -1,90 +0,0 @@ -Patch-Source: https://github.com/libgit2/rugged/pull/964 -safe as we apply the libgit2 fix to libgit. --- -From 508fbc2bcd8fdc400fcc4513b53d5205c4b7e9d4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Carlos=20Mart=C3=ADn=20Nieto?= -Date: Tue, 18 Jul 2023 10:27:37 +0200 -Subject: [PATCH 1/3] Update libgit2 to v1.7.0 - ---- - vendor/libgit2 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ext/rugged/rugged_allocator.c b/ext/rugged/rugged_allocator.c -index 30ee537..0059af6 100644 ---- a/ext/rugged/rugged_allocator.c -+++ b/ext/rugged/rugged_allocator.c -@@ -13,58 +13,11 @@ static void *rugged_gmalloc(size_t n, const char *file, int line) - return xmalloc(n); - } - --static void *rugged_gcalloc(size_t nelem, size_t elsize, const char *file, int line) --{ -- return xcalloc(nelem, elsize); --} -- --static char *rugged_gstrdup(const char *str, const char *file, int line) --{ -- return ruby_strdup(str); --} -- --static char *rugged_gstrndup(const char *str, size_t n, const char *file, int line) --{ -- size_t len; -- char *newstr; -- -- len = strnlen(str, n); -- if (len < n) -- n = len; -- -- newstr = xmalloc(n+1); -- memcpy(newstr, str, n); -- newstr[n] = '\0'; -- -- return newstr; --} -- --static char *rugged_gsubstrdup(const char *str, size_t n, const char *file, int line) --{ -- char *newstr; -- -- newstr = xmalloc(n+1); -- memcpy(newstr, str, n); -- newstr[n] = '\0'; -- -- return newstr; --} -- - static void *rugged_grealloc(void *ptr, size_t size, const char *file, int line) - { - return xrealloc(ptr, size); - } - --static void *rugged_greallocarray(void *ptr, size_t nelem, size_t elsize, const char *file, int line) --{ -- return xrealloc2(ptr, nelem, elsize); --} -- --static void *rugged_gmallocarray(size_t nelem, size_t elsize, const char *file, int line) --{ -- return xmalloc2(nelem, elsize); --} -- - static void rugged_gfree(void *ptr) - { - xfree(ptr); -@@ -75,14 +28,7 @@ void rugged_set_allocator(void) - git_allocator allocator; - - allocator.gmalloc = rugged_gmalloc; -- allocator.gcalloc = rugged_gcalloc; -- allocator.gstrdup = rugged_gstrdup; -- allocator.gstrndup = rugged_gstrndup; -- allocator.gstrndup = rugged_gstrndup; -- allocator.gsubstrdup = rugged_gsubstrdup; - allocator.grealloc = rugged_grealloc; -- allocator.greallocarray = rugged_greallocarray; -- allocator.gmallocarray = rugged_gmallocarray; - allocator.gfree = rugged_gfree; - - git_libgit2_opts(GIT_OPT_SET_ALLOCATOR, &allocator); diff --git a/user/ruby3.2-rugged/libgit2-fixture-dir.patch b/user/ruby3.2-rugged/libgit2-fixture-dir.patch deleted file mode 100644 index 9d6a24d..0000000 --- a/user/ruby3.2-rugged/libgit2-fixture-dir.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/test/test_helper.rb -+++ b/test/test_helper.rb -@@ -130,7 +130,8 @@ - end - - TEST_DIR = File.dirname(File.expand_path(__FILE__)) -- LIBGIT2_FIXTURE_DIR = File.expand_path("../../vendor/libgit2/tests/resources", __FILE__) -+ LIBGIT2_FIXTURE_DIR = ENV['LIBGIT2_FIXTURE_DIR'] \ -+ || File.expand_path("../../vendor/libgit2/tests/resources", __FILE__) - end - - class OnlineTestCase < TestCase diff --git a/user/ruby3.2-rugged/skip-online-tests.patch b/user/ruby3.2-rugged/skip-online-tests.patch deleted file mode 100644 index c0cb6a6..0000000 --- a/user/ruby3.2-rugged/skip-online-tests.patch +++ /dev/null @@ -1,15 +0,0 @@ -Skip all online tests. - ---- a/test/test_helper.rb -+++ b/test/test_helper.rb -@@ -155,6 +156,10 @@ - end - - super -+ end -+ else -+ def before_setup -+ skip 'online tests have been disabled' - end - end - diff --git a/user/ruby3.2-rugged/skip-test_discover_false.patch b/user/ruby3.2-rugged/skip-test_discover_false.patch deleted file mode 100644 index e968c02..0000000 --- a/user/ruby3.2-rugged/skip-test_discover_false.patch +++ /dev/null @@ -1,27 +0,0 @@ -Skip these two tests: - - 1) Failure: -RepositoryDiscoverTest#test_discover_false [/home/jirutjak/aports/testing/ruby-rugged/src/rugged-0.26.0/test/repo_test.rb:426]: -Rugged::RepositoryError expected but nothing was raised. - - 2) Failure: -RepositoryDiscoverTest#test_discover_nested_false [/home/jirutjak/aports/testing/ruby-rugged/src/rugged-0.26.0/test/repo_test.rb:432]: -Rugged::RepositoryError expected but nothing was raised. - ---- a/test/repo_test.rb -+++ b/test/repo_test.rb -@@ -423,12 +423,14 @@ - end - - def test_discover_false -+ skip 'I have no idea why this test does not pass :(' - assert_raises Rugged::RepositoryError do - Rugged::Repository.discover(@tmpdir) - end - end - - def test_discover_nested_false -+ skip 'I have no idea why this test does not pass :(' - assert_raises Rugged::RepositoryError do - Rugged::Repository.discover(File.join(@tmpdir, 'foo')) - end diff --git a/user/ruby3.2-rugged/skip-test_read_global_config_file.patch b/user/ruby3.2-rugged/skip-test_read_global_config_file.patch deleted file mode 100644 index d3a3310..0000000 --- a/user/ruby3.2-rugged/skip-test_read_global_config_file.patch +++ /dev/null @@ -1,13 +0,0 @@ -It seems that this test fails when user.name is NOT set in ~/.gitconfig -on the build system. - ---- a/test/config_test.rb -+++ b/test/config_test.rb -@@ -17,6 +17,7 @@ - end - - def test_read_global_config_file -+ skip 'This test is flawed, it runs on real FS, i.e. it is not isolated' - config = Rugged::Config.global - refute_nil config['user.name'] - assert_nil config['core.bare'] -- 2.45.2