Skip to content

Commit d578809

Browse files
committed
Refresh patches
- Update-openssl-to-version-3.0.0.patch: dropped, not necessary anymore - Update-rubygems-to-version-3.3.3.patch: dropped, not necessary anymore Gbp-Dch: full
1 parent 54450c8 commit d578809

12 files changed

Lines changed: 47 additions & 15722 deletions

debian/patches/0002-lib-mkmf.rb-sort-list-of-object-files-in-generated-M.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ Signed-off-by: Reiner Herrmann <reiner@reiner-h.de>
1414
1 file changed, 1 insertion(+), 1 deletion(-)
1515

1616
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
17-
index 9468a2c..516fa1e 100644
17+
index 118b813..8241494 100644
1818
--- a/lib/mkmf.rb
1919
+++ b/lib/mkmf.rb
20-
@@ -2315,7 +2315,7 @@ LOCAL_LIBS = #{$LOCAL_LIBS}
20+
@@ -2360,7 +2360,7 @@ LOCAL_LIBS = #{$LOCAL_LIBS}
2121
LIBS = #{$LIBRUBYARG} #{$libs} #{$LIBS}
2222
ORIG_SRCS = #{orig_srcs.collect(&File.method(:basename)).join(' ')}
2323
SRCS = $(ORIG_SRCS) #{(srcs - orig_srcs).collect(&File.method(:basename)).join(' ')}

debian/patches/0003-Mark-Gemspec-reproducible-change-fixing-784225-too.patch

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@ Signed-off-by: Christian Hofstaedtler <zeha@debian.org>
1212
1 file changed, 3 insertions(+), 1 deletion(-)
1313

1414
diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb
15-
index b493a47..776eff9 100644
15+
index 0d72cee..eb7bc25 100644
1616
--- a/lib/rubygems/specification.rb
1717
+++ b/lib/rubygems/specification.rb
18-
@@ -1696,7 +1696,9 @@ class Gem::Specification < Gem::BasicSpecification
19-
raise(Gem::InvalidSpecificationException,
20-
"invalid date format in specification: #{date.inspect}")
21-
end
22-
- when Time, DateLike then
23-
+ when Time then
24-
+ Time.utc(date.utc.year, date.utc.month, date.utc.day)
25-
+ when DateLike then
26-
Time.utc(date.year, date.month, date.day)
27-
else
28-
TODAY
18+
@@ -1691,7 +1691,9 @@ class Gem::Specification < Gem::BasicSpecification
19+
raise(Gem::InvalidSpecificationException,
20+
"invalid date format in specification: #{date.inspect}")
21+
end
22+
- when Time, DateLike then
23+
+ when Time then
24+
+ Time.utc(date.utc.year, date.utc.month, date.utc.day)
25+
+ when DateLike then
26+
Time.utc(date.year, date.month, date.day)
27+
else
28+
TODAY

debian/patches/0005-Make-gemspecs-reproducible.patch

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,19 @@ build unreproducible
1313
5 files changed, 5 insertions(+)
1414

1515
diff --git a/ext/bigdecimal/bigdecimal.gemspec b/ext/bigdecimal/bigdecimal.gemspec
16-
index 7e5388d..3e0269a 100644
16+
index fd49c1b..5b8bb00 100644
1717
--- a/ext/bigdecimal/bigdecimal.gemspec
1818
+++ b/ext/bigdecimal/bigdecimal.gemspec
19-
@@ -6,6 +6,7 @@ Gem::Specification.new do |s|
19+
@@ -4,6 +4,7 @@ Gem::Specification.new do |s|
2020
s.name = "bigdecimal"
21-
s.version = bigdecimal_version
21+
s.version = "3.1.1"
2222
s.authors = ["Kenta Murata", "Zachary Scott", "Shigeo Kobayashi"]
2323
+ s.date = RUBY_RELEASE_DATE
2424
s.email = ["mrkn@mrkn.jp"]
2525

2626
s.summary = "Arbitrary-precision decimal floating-point number library."
2727
diff --git a/ext/fiddle/fiddle.gemspec b/ext/fiddle/fiddle.gemspec
28-
index a47f795..5141413 100644
28+
index a9c0ec4..89da078 100644
2929
--- a/ext/fiddle/fiddle.gemspec
3030
+++ b/ext/fiddle/fiddle.gemspec
3131
@@ -8,6 +8,7 @@ end
@@ -37,10 +37,10 @@ index a47f795..5141413 100644
3737
spec.email = ["aaron@tenderlovemaking.com", "hsbt@ruby-lang.org"]
3838

3939
diff --git a/ext/io/console/io-console.gemspec b/ext/io/console/io-console.gemspec
40-
index 8a0df83..b370b73 100644
40+
index aa57f8a..ba7f8e5 100644
4141
--- a/ext/io/console/io-console.gemspec
4242
+++ b/ext/io/console/io-console.gemspec
43-
@@ -4,6 +4,7 @@ _VERSION = "0.5.7"
43+
@@ -4,6 +4,7 @@ _VERSION = "0.5.11"
4444
Gem::Specification.new do |s|
4545
s.name = "io-console"
4646
s.version = _VERSION
@@ -49,19 +49,19 @@ index 8a0df83..b370b73 100644
4949
s.email = "nobu@ruby-lang.org"
5050
s.description = "add console capabilities to IO instances."
5151
diff --git a/lib/ipaddr.gemspec b/lib/ipaddr.gemspec
52-
index 5187f3b..ded48e7 100644
52+
index 1f4798e..48743cf 100644
5353
--- a/lib/ipaddr.gemspec
5454
+++ b/lib/ipaddr.gemspec
55-
@@ -6,6 +6,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
55+
@@ -18,6 +18,7 @@ end
5656
Gem::Specification.new do |spec|
5757
spec.name = "ipaddr"
58-
spec.version = "1.2.2"
58+
spec.version = version
5959
+ spec.date = RUBY_RELEASE_DATE
6060
spec.authors = ["Akinori MUSHA", "Hajimu UMEMOTO"]
6161
spec.email = ["knu@idaemons.org", "ume@mahoroba.org"]
6262

6363
diff --git a/lib/rdoc/rdoc.gemspec b/lib/rdoc/rdoc.gemspec
64-
index 7725e40..79698f5 100644
64+
index 525a15f..f6d0e22 100644
6565
--- a/lib/rdoc/rdoc.gemspec
6666
+++ b/lib/rdoc/rdoc.gemspec
6767
@@ -7,6 +7,7 @@ end

debian/patches/0006-Fix-FTBS-on-hurd.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
1111
1 file changed, 5 insertions(+), 1 deletion(-)
1212

1313
diff --git a/io.c b/io.c
14-
index caa4dd2..42804d1 100644
14+
index 0b54310..26168b2 100644
1515
--- a/io.c
1616
+++ b/io.c
17-
@@ -1902,7 +1902,11 @@ io_writev(int argc, const VALUE *argv, VALUE io)
17+
@@ -2011,7 +2011,11 @@ io_writev(int argc, const VALUE *argv, VALUE io)
1818

1919
for (i = 0; i < argc; i += cnt) {
2020
#ifdef HAVE_WRITEV

debian/patches/0007-Port-to-kfreebsd-amd64.patch

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ index 4b33b3f..d068292 100644
2626
defined(__APPLE__) || \
2727
defined(_WIN32) || \
2828
diff --git a/ext/socket/raddrinfo.c b/ext/socket/raddrinfo.c
29-
index d99edfe..a19b6db 100644
29+
index d94e96a..e584e8e 100644
3030
--- a/ext/socket/raddrinfo.c
3131
+++ b/ext/socket/raddrinfo.c
32-
@@ -1670,10 +1670,21 @@ addrinfo_mload(VALUE self, VALUE ary)
32+
@@ -1723,10 +1723,21 @@ addrinfo_mload(VALUE self, VALUE ary)
3333
INIT_SOCKADDR_UN(&uaddr, sizeof(struct sockaddr_un));
3434

3535
StringValue(v);
@@ -51,7 +51,7 @@ index d99edfe..a19b6db 100644
5151
memcpy(uaddr.sun_path, RSTRING_PTR(v), RSTRING_LEN(v));
5252
len = (socklen_t)sizeof(uaddr);
5353
memcpy(&ss, &uaddr, len);
54-
@@ -2317,10 +2328,21 @@ addrinfo_unix_path(VALUE self)
54+
@@ -2370,10 +2381,21 @@ addrinfo_unix_path(VALUE self)
5555
if (n < 0)
5656
rb_raise(rb_eSocket, "too short AF_UNIX address: %"PRIuSIZE" bytes given for minimum %"PRIuSIZE" bytes.",
5757
(size_t)rai->sockaddr_len, offsetof(struct sockaddr_un, sun_path));
@@ -74,31 +74,31 @@ index d99edfe..a19b6db 100644
7474
}
7575
#endif
7676
diff --git a/test/fiddle/test_handle.rb b/test/fiddle/test_handle.rb
77-
index 17f9c92..2862585 100644
77+
index 7e3ff9d..3799347 100644
7878
--- a/test/fiddle/test_handle.rb
7979
+++ b/test/fiddle/test_handle.rb
80-
@@ -150,6 +150,7 @@ module Fiddle
80+
@@ -174,6 +174,7 @@ module Fiddle
8181
end unless /mswin|mingw/ =~ RUBY_PLATFORM
8282

8383
def test_dlerror
8484
+ return if /kfreebsd/ =~ RUBY_PLATFORM
8585
# FreeBSD (at least 7.2 to 7.2) calls nsdispatch(3) when it calls
8686
# getaddrinfo(3). And nsdispatch(3) doesn't call dlerror(3) even if
8787
# it calls _nss_cache_cycle_prevention_function with dlsym(3).
88-
@@ -158,7 +159,7 @@ module Fiddle
88+
@@ -182,7 +183,7 @@ module Fiddle
8989
require 'socket'
9090
Socket.gethostbyname("localhost")
9191
Fiddle.dlopen("/lib/libc.so.7").sym('strcpy')
9292
- end if /freebsd/=~ RUBY_PLATFORM
9393
+ end if /freebsd/ =~ RUBY_PLATFORM
9494

9595
def test_no_memory_leak
96-
assert_no_memory_leak(%w[-W0 -rfiddle.so], '', '100_000.times {Fiddle::Handle.allocate}; GC.start', rss: true)
96+
if respond_to?(:assert_nothing_leaked_memory)
9797
diff --git a/test/socket/test_socket.rb b/test/socket/test_socket.rb
98-
index b5be0c7..b0fe707 100644
98+
index 7e596f0..930bb61 100644
9999
--- a/test/socket/test_socket.rb
100100
+++ b/test/socket/test_socket.rb
101-
@@ -530,7 +530,7 @@ class TestSocket < Test::Unit::TestCase
101+
@@ -541,7 +541,7 @@ class TestSocket < Test::Unit::TestCase
102102
end
103103

104104
def test_bintime

debian/patches/0009-Fix-FTBFS-on-x32-misdetected-as-i386-or-amd64.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ Bug: #954293
99
1 file changed, 3 insertions(+)
1010

1111
diff --git a/configure.ac b/configure.ac
12-
index 49e0c79..5fb8282 100644
12+
index 5a6b074..403b965 100644
1313
--- a/configure.ac
1414
+++ b/configure.ac
15-
@@ -2433,6 +2433,9 @@ AS_CASE([$rb_cv_coroutine], [yes|''], [
15+
@@ -2524,6 +2524,9 @@ AS_CASE([$coroutine_type], [yes|''], [
1616
[arm64-darwin*], [
17-
rb_cv_coroutine=arm64
17+
coroutine_type=arm64
1818
],
1919
+ [x86_64-linux-gnux32], [
2020
+ rb_cv_coroutine=ucontext
2121
+ ],
2222
[x*64-linux*], [
2323
AS_CASE(["$ac_cv_sizeof_voidp"],
24-
[8], [ rb_cv_coroutine=amd64 ],
24+
[8], [ coroutine_type=amd64 ],

debian/patches/0011-don-t-try-to-download-stuff-in-configure.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ Subject: don't try to download stuff in configure
77
1 file changed, 1 insertion(+), 1 deletion(-)
88

99
diff --git a/defs/gmake.mk b/defs/gmake.mk
10-
index f093fd4..82df5d2 100644
10+
index dd7da5f..9d59f22 100644
1111
--- a/defs/gmake.mk
1212
+++ b/defs/gmake.mk
13-
@@ -250,7 +250,7 @@ extract-gems: $(HAVE_BASERUBY:yes=update-gems)
13+
@@ -265,7 +265,7 @@ extract-gems: $(HAVE_BASERUBY:yes=update-gems)
1414

1515
bundled-gems := $(shell sed '/^[ ]*\#/d;/^[ ]*$$/d;s/[ ][ ]*/-/;s/[ ].*//' $(srcdir)/gems/bundled_gems)
1616

debian/patches/Fix-filenames-for-glibc-SO-files-on-alpha-and-ia64.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ Fixes [Bug #18645]
88
1 file changed, 8 insertions(+), 2 deletions(-)
99

1010
diff --git a/test/fiddle/helper.rb b/test/fiddle/helper.rb
11-
index a6e2019..6b4a5aa 100644
11+
index 0ea3bf5..e470f5a 100644
1212
--- a/test/fiddle/helper.rb
1313
+++ b/test/fiddle/helper.rb
14-
@@ -47,8 +47,14 @@ when /linux/
14+
@@ -49,8 +49,14 @@ when /linux/
1515
libm_so = libc_so
1616
else
1717
# glibc

0 commit comments

Comments
 (0)