ruby: upgrade 3.1.0 -> 3.1.1
PATCH 1/1 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 <[email protected]>
---
...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%)meta/recipes-devtools/ruby/ruby/0005-Mark-Gemspec-reproducible-change-fixing-784225-too.patch +22 -19
@@ -1,28 +1,31 @@ -From: Christian Hofstaedtler <[email protected]> -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 <[email protected]> +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 <[email protected]> -Signed-off-by: Christian Hofstaedtler <[email protected]> --- 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 +
meta/recipes-devtools/ruby/ruby/0006-Make-gemspecs-reproducible.patch +8 -5
@@ -41,10 +41,10 @@ index a9c0ec4..89da078 100644 spec.email = ["[email protected]", "[email protected]"] 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 = "[email protected]" 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 = ["[email protected]", "[email protected]"]
@@ -76,3 +76,6 @@ index 525a15f..f6d0e22 100644 s.version = RDoc::VERSION s.authors = [ +-- +2.25.1 +
meta/recipes-devtools/ruby/ruby_3.1.1.bb renamed from meta/recipes-devtools/ruby/ruby_3.1.0.bb +1 -1
@@ -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)}"
Signature · 1 line
2.25.1
PATCH 1/1 wireless-regdb: upgrade 2021.08.28 -> 2022.02.18
Signed-off-by Wang Mingyu <[email protected]>
---
...ireless-regdb_2021.08.28.bb => wireless-regdb_2022.02.18.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-kernel/wireless-regdb/{wireless-regdb_2021.08.28.bb => wireless-regdb_2022.02.18.bb} (94%)meta/recipes-kernel/wireless-regdb/wireless-regdb_2022.02.18.bb renamed from meta/recipes-kernel/wireless-regdb/wireless-regdb_2021.08.28.bb +1 -1
@@ -5,7 +5,7 @@ LICENSE = "ISC" LIC_FILES_CHKSUM = "file://LICENSE;md5=07c4f6dea3845b02a18dc00c8c87699c" SRC_URI = "https://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.xz" -SRC_URI[sha256sum] = "cff370c410d1e6d316ae0a7fa8ac6278fdf1efca5d3d664aca7cfd2aafa54446" +SRC_URI[sha256sum] = "8828c25a4ee25020044004f57374bb9deac852809fad70f8d3d01770bf9ac97f" inherit bin_package allarch
Signature · 1 line
2.25.1