Skip to content

Commit b4bdbb1

Browse files
committed
refresh patches
1 parent 372332e commit b4bdbb1

4 files changed

Lines changed: 28 additions & 70 deletions

File tree

debian/changelog

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ruby3.4 (3.4.1-1ppa1) focal; urgency=medium
88
* New upstream version 3.4.1
99
* restore .github directory
1010

11-
-- aogata <aogata@instructure.com> Mon, 03 Feb 2025 12:15:10 -0800
11+
-- aogata <aogata@instructure.com> Mon, 03 Feb 2025 12:15:11 -0800
1212

1313
ruby3.3 (3.3.3-1ppa1) focal; urgency=medium
1414

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

Lines changed: 27 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,23 @@ Signed-off-by: Svante Signell <svante.signell@gmail.com>
1313
test/socket/test_socket.rb | 2 +-
1414
4 files changed, 26 insertions(+), 2 deletions(-)
1515

16-
--- a/ext/socket/option.c
17-
+++ b/ext/socket/option.c
18-
@@ -10,6 +10,7 @@
16+
Index: deb-ruby/ext/socket/option.c
17+
===================================================================
18+
--- deb-ruby.orig/ext/socket/option.c
19+
+++ deb-ruby/ext/socket/option.c
20+
@@ -10,6 +10,7 @@ VALUE rb_cSockOpt;
1921
#if defined(__linux__) || \
2022
defined(__GNU__) /* GNU/Hurd */ || \
2123
defined(__FreeBSD__) || \
2224
+ defined(__FreeBSD_kernel__) || \
2325
defined(__DragonFly__) || \
2426
defined(__APPLE__) || \
2527
defined(_WIN32) || \
26-
--- a/ext/socket/raddrinfo.c
27-
+++ b/ext/socket/raddrinfo.c
28-
@@ -2138,10 +2138,21 @@
28+
Index: deb-ruby/ext/socket/raddrinfo.c
29+
===================================================================
30+
--- deb-ruby.orig/ext/socket/raddrinfo.c
31+
+++ deb-ruby/ext/socket/raddrinfo.c
32+
@@ -2138,10 +2138,21 @@ addrinfo_mload(VALUE self, VALUE ary)
2933
INIT_SOCKADDR_UN(&uaddr, sizeof(struct sockaddr_un));
3034

3135
StringValue(v);
@@ -47,7 +51,7 @@ Signed-off-by: Svante Signell <svante.signell@gmail.com>
4751
memcpy(uaddr.sun_path, RSTRING_PTR(v), RSTRING_LEN(v));
4852
len = (socklen_t)sizeof(uaddr);
4953
memcpy(&ss, &uaddr, len);
50-
@@ -2785,10 +2796,21 @@
54+
@@ -2785,10 +2796,21 @@ addrinfo_unix_path(VALUE self)
5155
if (n < 0)
5256
rb_raise(rb_eSocket, "too short AF_UNIX address: %"PRIuSIZE" bytes given for minimum %"PRIuSIZE" bytes.",
5357
(size_t)rai->sockaddr_len, offsetof(struct sockaddr_un, sun_path));
@@ -69,28 +73,32 @@ Signed-off-by: Svante Signell <svante.signell@gmail.com>
6973
return rb_str_new(addr->sun_path, n);
7074
}
7175
#endif
72-
--- a/test/fiddle/test_handle.rb
73-
+++ b/test/fiddle/test_handle.rb
74-
@@ -178,6 +178,7 @@
75-
end unless /mswin|mingw/ =~ RUBY_PLATFORM
76+
Index: deb-ruby/test/fiddle/test_handle.rb
77+
===================================================================
78+
--- deb-ruby.orig/test/fiddle/test_handle.rb
79+
+++ deb-ruby/test/fiddle/test_handle.rb
80+
@@ -215,6 +215,7 @@ module Fiddle
81+
end
7682

7783
def test_dlerror
7884
+ return if /kfreebsd/ =~ RUBY_PLATFORM
7985
# FreeBSD (at least 7.2 to 7.2) calls nsdispatch(3) when it calls
8086
# getaddrinfo(3). And nsdispatch(3) doesn't call dlerror(3) even if
8187
# it calls _nss_cache_cycle_prevention_function with dlsym(3).
82-
@@ -186,7 +187,7 @@
83-
require 'socket'
84-
Socket.gethostbyname("localhost")
88+
@@ -226,7 +227,7 @@ module Fiddle
8589
Fiddle.dlopen("/lib/libc.so.7").sym('strcpy')
90+
ensure
91+
$VERBOSE = verbose
8692
- end if /freebsd/=~ RUBY_PLATFORM
8793
+ end if /freebsd/ =~ RUBY_PLATFORM
8894

89-
def test_no_memory_leak
90-
# https://github.com/ruby/fiddle/actions/runs/3202406059/jobs/5231356410
91-
--- a/test/socket/test_socket.rb
92-
+++ b/test/socket/test_socket.rb
93-
@@ -549,7 +549,7 @@
95+
if /cygwin|mingw|mswin/ =~ RUBY_PLATFORM
96+
def test_fallback_to_ansi
97+
Index: deb-ruby/test/socket/test_socket.rb
98+
===================================================================
99+
--- deb-ruby.orig/test/socket/test_socket.rb
100+
+++ deb-ruby/test/socket/test_socket.rb
101+
@@ -549,7 +549,7 @@ class TestSocket < Test::Unit::TestCase
94102
end
95103

96104
def test_bintime

debian/patches/rbconfig-mkmf-call-foreign-pkg-config-when-cross-compilin.patch

Lines changed: 0 additions & 49 deletions
This file was deleted.

debian/patches/series

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,3 @@
77
0007-Port-to-kfreebsd-amd64.patch
88
0009-Fix-FTBFS-on-x32-misdetected-as-i386-or-amd64.patch
99
0011-don-t-try-to-download-stuff-in-configure.patch
10-
rbconfig-mkmf-call-foreign-pkg-config-when-cross-compilin.patch

0 commit comments

Comments
 (0)