diff --git a/ruby3.3-rubyzip.yaml b/ruby3.3-rubyzip.yaml index 4bdfc7aee1d..9cb2eb5e68b 100644 --- a/ruby3.3-rubyzip.yaml +++ b/ruby3.3-rubyzip.yaml @@ -1,7 +1,7 @@ # Generated from https://github.com/rubyzip/rubyzip/tree/v2.3.2 package: name: ruby3.3-rubyzip - version: "3.0.0" + version: "3.0.1" epoch: 0 description: rubyzip is a ruby module for reading and writing zip files copyright: @@ -20,14 +20,10 @@ environment: pipeline: - uses: git-checkout with: - expected-commit: f1d0f486027c18c045f706ad41387ef4ededcdd2 + expected-commit: 932ea90f700610207f567cbeba3ac1f323fb22f6 repository: https://github.com/rubyzip/rubyzip tag: v${{package.version}} - - uses: patch - with: - patches: gh636.patch - - uses: ruby/build with: gem: ${{vars.gem}} diff --git a/ruby3.3-rubyzip/gh636.patch b/ruby3.3-rubyzip/gh636.patch deleted file mode 100644 index 557e2ea6cac..00000000000 --- a/ruby3.3-rubyzip/gh636.patch +++ /dev/null @@ -1,36 +0,0 @@ -Author: Daniel Watkins -Date: Tue Jul 29 11:09:14 2025 -0400 - - entry: fix direct `require` by requiring `constants` - - Without this, we see the following failure: - - ``` - $ ruby -e'require "zip/entry"' - /usr/lib/ruby/gems/3.2.0/gems/rubyzip-3.0.0/lib/zip/entry.rb:13:in `': uninitialized constant Zip::COMPRESSION_METHOD_STORE (NameError) - - STORED = ::Zip::COMPRESSION_METHOD_STORE - ^^^^^^^^^^^^^^^^^^^^^^^^^^ - from /usr/lib/ruby/gems/3.2.0/gems/rubyzip-3.0.0/lib/zip/entry.rb:9:in `' - from /usr/lib/ruby/gems/3.2.0/gems/rubyzip-3.0.0/lib/zip/entry.rb:7:in `' - from :160:in `require' - from :160:in `rescue in require' - from :40:in `require' - from -e:1:in `
' - :86:in `require': cannot load such file -- zip/entry (LoadError) - from :86:in `require' - from -e:1:in `
' - ``` - -diff --git a/lib/zip/entry.rb b/lib/zip/entry.rb -index 394f919..123a2df 100644 ---- a/lib/zip/entry.rb -+++ b/lib/zip/entry.rb -@@ -2,6 +2,7 @@ - - require 'pathname' - -+require_relative 'constants' - require_relative 'dirtyable' - - module Zip