From 6ae009ae73fc81de441d57699fee61b6fcc48600 Mon Sep 17 00:00:00 2001 From: wangmy Date: Wed, 23 Feb 2022 21:41:53 +0800 Subject: [PATCH] ruby: upgrade 3.1.0 -> 3.1.1 refresh the following patches for 3.1.1: 0005-Mark-Gemspec-reproducible-change-fixing-784225-too.patch 0006-Make-gemspecs-reproducible.patch Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- ...eproducible-change-fixing-784225-too.patch | 41 ++++++++++--------- .../0006-Make-gemspecs-reproducible.patch | 13 +++--- .../ruby/{ruby_3.1.0.bb => ruby_3.1.1.bb} | 2 +- 3 files changed, 31 insertions(+), 25 deletions(-) rename meta/recipes-devtools/ruby/{ruby_3.1.0.bb => ruby_3.1.1.bb} (97%) diff --git a/meta/recipes-devtools/ruby/ruby/0005-Mark-Gemspec-reproducible-change-fixing-784225-too.patch b/meta/recipes-devtools/ruby/ruby/0005-Mark-Gemspec-reproducible-change-fixing-784225-too.patch index b7faa58655..41f206523e 100644 --- a/meta/recipes-devtools/ruby/ruby/0005-Mark-Gemspec-reproducible-change-fixing-784225-too.patch +++ b/meta/recipes-devtools/ruby/ruby/0005-Mark-Gemspec-reproducible-change-fixing-784225-too.patch @@ -1,28 +1,31 @@ -From: Christian Hofstaedtler -Date: Tue, 10 Oct 2017 15:07:11 -0300 -Subject: Mark Gemspec-reproducible change fixing #784225, too +From 6e1dc610724a7aa8368cbcddf4bbe21cccc0f731 Mon Sep 17 00:00:00 2001 +From: Lucas Kanashiro +Date: Fri, 1 Nov 2019 15:25:17 -0300 +Subject: [PATCH] Make gemspecs reproducible -I think the UTC date change will fix the Multi-Arch not-same file issue, -too. +Without an explicit date, they will get the current date and make the +build unreproducible Upstream-Status: Backport [debian] - -Signed-off-by: Antonio Terceiro -Signed-off-by: Christian Hofstaedtler --- lib/rubygems/specification.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) +diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb +index 0d72cee..eb7bc25 100644 --- a/lib/rubygems/specification.rb +++ b/lib/rubygems/specification.rb -@@ -1695,7 +1695,9 @@ - raise(Gem::InvalidSpecificationException, - "invalid date format in specification: #{date.inspect}") - end -- when Time, DateLike then -+ when Time then -+ Time.utc(date.utc.year, date.utc.month, date.utc.day) -+ when DateLike then - Time.utc(date.year, date.month, date.day) - else - TODAY +@@ -1691,7 +1691,9 @@ class Gem::Specification < Gem::BasicSpecification + raise(Gem::InvalidSpecificationException, + "invalid date format in specification: #{date.inspect}") + end +- when Time, DateLike then ++ when Time then ++ Time.utc(date.utc.year, date.utc.month, date.utc.day) ++ when DateLike then + Time.utc(date.year, date.month, date.day) + else + TODAY +-- +2.25.1 + diff --git a/meta/recipes-devtools/ruby/ruby/0006-Make-gemspecs-reproducible.patch b/meta/recipes-devtools/ruby/ruby/0006-Make-gemspecs-reproducible.patch index de8d4f04cc..1e4a298317 100644 --- a/meta/recipes-devtools/ruby/ruby/0006-Make-gemspecs-reproducible.patch +++ b/meta/recipes-devtools/ruby/ruby/0006-Make-gemspecs-reproducible.patch @@ -41,10 +41,10 @@ index a9c0ec4..89da078 100644 spec.email = ["aaron@tenderlovemaking.com", "hsbt@ruby-lang.org"] diff --git a/ext/io/console/io-console.gemspec b/ext/io/console/io-console.gemspec -index 36beda7..e932d83 100644 +index aa57f8a..ba7f8e5 100644 --- a/ext/io/console/io-console.gemspec +++ b/ext/io/console/io-console.gemspec -@@ -4,6 +4,7 @@ _VERSION = "0.5.10" +@@ -4,6 +4,7 @@ _VERSION = "0.5.11" Gem::Specification.new do |s| s.name = "io-console" s.version = _VERSION @@ -53,13 +53,13 @@ index 36beda7..e932d83 100644 s.email = "nobu@ruby-lang.org" s.description = "add console capabilities to IO instances." diff --git a/lib/ipaddr.gemspec b/lib/ipaddr.gemspec -index 36e2300..06dc888 100644 +index 1f4798e..48743cf 100644 --- a/lib/ipaddr.gemspec +++ b/lib/ipaddr.gemspec -@@ -6,6 +6,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) +@@ -18,6 +18,7 @@ end Gem::Specification.new do |spec| spec.name = "ipaddr" - spec.version = "1.2.3" + spec.version = version + spec.date = RUBY_RELEASE_DATE spec.authors = ["Akinori MUSHA", "Hajimu UMEMOTO"] spec.email = ["knu@idaemons.org", "ume@mahoroba.org"] @@ -76,3 +76,6 @@ index 525a15f..f6d0e22 100644 s.version = RDoc::VERSION s.authors = [ +-- +2.25.1 + diff --git a/meta/recipes-devtools/ruby/ruby_3.1.0.bb b/meta/recipes-devtools/ruby/ruby_3.1.1.bb similarity index 97% rename from meta/recipes-devtools/ruby/ruby_3.1.0.bb rename to meta/recipes-devtools/ruby/ruby_3.1.1.bb index 7a04a36432..d8fddfa520 100644 --- a/meta/recipes-devtools/ruby/ruby_3.1.0.bb +++ b/meta/recipes-devtools/ruby/ruby_3.1.1.bb @@ -14,7 +14,7 @@ SRC_URI += " \ file://0001-vm_dump.c-Define-REG_S1-and-REG_S2-for-musl-riscv.patch \ " -SRC_URI[sha256sum] = "50a0504c6edcb4d61ce6b8cfdbddaa95707195fab0ecd7b5e92654b2a9412854" +SRC_URI[sha256sum] = "fe6e4782de97443978ddba8ba4be38d222aa24dc3e3f02a6a8e7701c0eeb619d" PACKAGECONFIG ??= "" PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" -- 2.40.1