Merge ~lucaskanashiro/ubuntu/+source/ruby3.1:fix-segfault into ubuntu/+source/ruby3.1:ubuntu/mantic-devel
- Git
- lp:~lucaskanashiro/ubuntu/+source/ruby3.1
- fix-segfault
- Merge into ubuntu/mantic-devel
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Approved by: | git-ubuntu bot | ||||||||
Approved revision: | not available | ||||||||
Merged at revision: | e6aa1a2642f9a06c459c96fb3834d66db319d8a2 | ||||||||
Proposed branch: | ~lucaskanashiro/ubuntu/+source/ruby3.1:fix-segfault | ||||||||
Merge into: | ubuntu/+source/ruby3.1:ubuntu/mantic-devel | ||||||||
Diff against target: |
345 lines (+317/-0) 4 files modified
debian/changelog (+8/-0) debian/patches/fix-ruby_xfree-segfault.patch (+46/-0) debian/patches/renew-test-certificates-844672256e8e843a7e3a52b7e3c9bb8ea4c328b4.patch (+260/-0) debian/patches/series (+3/-0) |
||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Sergio Durigan Junior (community) | Approve | ||
git-ubuntu bot | Approve | ||
Canonical Server Reporter | Pending | ||
Review via email: mp+462903@code.launchpad.net |
Commit message
Description of the change
Fix LP #2049197 . Also fix LP #2051380 which is causing a FTBFS due to expired certificates.
The proposed package is available here:
https:/
I tried to verify the fix using the reproduction steps listed by Athos on the bug, and apparently I got no segfault after running the script for around 7 minutes.
autopkgtest is passing:
autopkgtest [18:11:20]: @@@@@@@
run-all PASS
bundled-gems PASS
builtin-extensions PASS
rubyconfig PASS
pkg-config PASS
git-ubuntu bot (git-ubuntu-bot) wrote : | # |
Approvers: lucaskanashiro, sergiodj
Uploaders: lucaskanashiro, sergiodj
MP auto-approved
Sergio Durigan Junior (sergiodj) wrote : | # |
Hm, let me step back a little bit here...
I'm actually seeing the following dep8 failure against armhf:
1307s
1307s 1) Error:
1307s TestThread#
1307s Timeout::Error: execution of assert_separately expired timeout (120 sec)
1307s pid 3076 exit 1
1307s |
1307s | -:27:in `gets': Exception raised: (Test::
1307s | <#<SignalException: SIGTERM>>
1307s | Backtrace:
1307s | -:27:in `gets'
1307s | -:27:in `block (3 levels) in <main>'
1307s | -:21:in `times'
1307s | -:21:in `block (2 levels) in <main>'.
1307s | from -:27:in `block (3 levels) in <main>'
1307s | from -:21:in `times'
1307s | from -:21:in `block (2 levels) in <main>'
1307s | from /tmp/autopkgtes
1307s | from -:20:in `block in <main>'
1307s | from -:10:in `popen'
1307s | from -:10:in `<main>'
1307s | -:27:in `gets': SIGTERM (SignalException)
1307s | from -:27:in `block (3 levels) in <main>'
1307s | from -:21:in `times'
1307s | from -:21:in `block (2 levels) in <main>'
1307s | from /tmp/autopkgtes
1307s | from -:20:in `block in <main>'
1307s | from -:10:in `popen'
1307s | from -:10:in `<main>'
1307s
1307s /tmp/autopkgtes
1307s
1307s Finished tests in 1004.332484s, 17.1915 tests/s, 2691.3348 assertions/s.
1307s 17266 tests, 2702995 assertions, 0 failures, 1 errors, 37 skips
1307s
1307s ruby -v: ruby 3.1.2p20 (2022-04-12 revision 4491bb740a) [arm-linux-
1308s autopkgtest [19:42:56]: test run-all: -------
1321s autopkgtest [19:43:09]: test run-all: - - - - - - - - - - results - - - - - - - - - -
1321s run-all FAIL non-zero exit status 1
I see that the ruby3.1 from the archive doesn't have this failure, so I'm wondering what's happening. Any ideas?
Sergio Durigan Junior (sergiodj) wrote : | # |
Curiously enough, this is almost the same failure that's causing the ruby3.0 FTBFS on Jammy (from your PPA):
1) Failure:
TestThreadQueue
only 37/250 done in 60 seconds.
2) Error:
TestThread#
Timeout::Error: execution of assert_separately expired timeout (120 sec)
pid 30807 exit 1
|
| -:27:in `gets': Exception raised: (MiniTest:
| <#<SignalException: SIGTERM>>
| Backtrace:
| -:27:in `gets'
| -:27:in `block (3 levels) in <main>'
| -:21:in `times'
| -:21:in `block (2 levels) in <main>'
| /<<PKGBUILDDIR>
| -:20:in `block in <main>'
| -:10:in `popen'
| -:10:in `<main>'.
| from -:27:in `block (3 levels) in <main>'
| from -:21:in `times'
| from -:21:in `block (2 levels) in <main>'
| from /<<PKGBUILDDIR>
| from -:20:in `block in <main>'
| from -:10:in `popen'
| from -:10:in `<main>'
| -:27:in `gets': SIGTERM (SignalException)
| from -:27:in `block (3 levels) in <main>'
| from -:21:in `times'
| from -:21:in `block (2 levels) in <main>'
| from /<<PKGBUILDDIR>
| from -:20:in `block in <main>'
| from -:10:in `popen'
| from -:10:in `<main>'
/<<
Finished tests in 1895.138193s, 9.9265 tests/s, 1403.2386 assertions/s.
18812 tests, 2659331 assertions, 1 failures, 1 errors, 56 skips
I wonder if this is a flaky test.
Sergio Durigan Junior (sergiodj) wrote : | # |
I retriggered the armhf dep8 test run.
Sergio Durigan Junior (sergiodj) wrote : | # |
The test failed again.
Sergio Durigan Junior (sergiodj) : | # |
Lucas Kanashiro (lucaskanashiro) wrote : | # |
Sergio, I re-triggered the tests on armhf and they passed:
Sergio Durigan Junior (sergiodj) wrote : | # |
Hi Lucas,
Thanks! Aside from the comment I left below, LGTM. +1
Lucas Kanashiro (lucaskanashiro) wrote : | # |
Thanks Sergio! I addressed your comment and uploaded the package:
Uploading to ubuntu (via ftp to upload.ubuntu.com):
Uploading ruby3.1_
Uploading ruby3.1_
Uploading ruby3.1_
Uploading ruby3.1_
Uploading ruby3.1_
Successfully uploaded packages.
Preview Diff
1 | diff --git a/debian/changelog b/debian/changelog | |||
2 | index 75aabc4..95d07e7 100644 | |||
3 | --- a/debian/changelog | |||
4 | +++ b/debian/changelog | |||
5 | @@ -1,3 +1,11 @@ | |||
6 | 1 | ruby3.1 (3.1.2-7ubuntu3.1) mantic; urgency=medium | ||
7 | 2 | |||
8 | 3 | * d/p/fix-ruby_xfree-segfault.patch: fix occasional segfault (LP: #2049197). | ||
9 | 4 | * Replace expired certificate in tests with upstream patch (LP: #2051380). | ||
10 | 5 | - d/p/renew-test-certificates-d3933fc753187a055a4904af82f5f3794c88c416.patch | ||
11 | 6 | |||
12 | 7 | -- Lucas Kanashiro <kanashiro@ubuntu.com> Wed, 20 Mar 2024 17:39:43 -0300 | ||
13 | 8 | |||
14 | 1 | ruby3.1 (3.1.2-7ubuntu3) mantic; urgency=medium | 9 | ruby3.1 (3.1.2-7ubuntu3) mantic; urgency=medium |
15 | 2 | 10 | ||
16 | 3 | * Mark strlcat strlcpy as optional, since they are now part of glibc | 11 | * Mark strlcat strlcpy as optional, since they are now part of glibc |
17 | diff --git a/debian/patches/fix-ruby_xfree-segfault.patch b/debian/patches/fix-ruby_xfree-segfault.patch | |||
18 | 4 | new file mode 100644 | 12 | new file mode 100644 |
19 | index 0000000..f3ac518 | |||
20 | --- /dev/null | |||
21 | +++ b/debian/patches/fix-ruby_xfree-segfault.patch | |||
22 | @@ -0,0 +1,46 @@ | |||
23 | 1 | From 52e571fa72debcd764765775bd1b76ee87e36d2d Mon Sep 17 00:00:00 2001 | ||
24 | 2 | From: Mike Dalessio <mike.dalessio@gmail.com> | ||
25 | 3 | Date: Tue, 4 Apr 2023 23:55:43 -0400 | ||
26 | 4 | Subject: [PATCH] Ensure ruby_xfree won't segfault if called after vm_destruct | ||
27 | 5 | |||
28 | 6 | [Bug #19580] | ||
29 | 7 | |||
30 | 8 | The real-world scenario motivating this change is libxml2's pthread | ||
31 | 9 | code which uses `pthread_key_create` to set up a destructor that is | ||
32 | 10 | called at thread exit to free thread-local storage. | ||
33 | 11 | |||
34 | 12 | There is a small window of time -- after ruby_vm_destruct but before | ||
35 | 13 | the process exits -- in which a pthread may exit and the destructor is | ||
36 | 14 | called, leading to a segfault. | ||
37 | 15 | |||
38 | 16 | Please note that this window of time may be relatively large if | ||
39 | 17 | `atexit` is being used. | ||
40 | 18 | --- | ||
41 | 19 | |||
42 | 20 | Origin: upstream, https://github.com/ruby/ruby/commit/52e571fa72debcd76 | ||
43 | 21 | Reviewed-By: Lucas Kanashiro <kanashiro@ubuntu.com> | ||
44 | 22 | Bug: https://bugs.ruby-lang.org/issues/19580 | ||
45 | 23 | Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/noble/+source/ruby3.1/+bug/2049197 | ||
46 | 24 | Last-Updated: 2024-03-20 | ||
47 | 25 | |||
48 | 26 | --- a/gc.c | ||
49 | 27 | +++ b/gc.c | ||
50 | 28 | @@ -11746,8 +11746,16 @@ | ||
51 | 29 | void | ||
52 | 30 | ruby_sized_xfree(void *x, size_t size) | ||
53 | 31 | { | ||
54 | 32 | - if (x) { | ||
55 | 33 | - objspace_xfree(&rb_objspace, x, size); | ||
56 | 34 | + if (LIKELY(x)) { | ||
57 | 35 | + /* It's possible for a C extension's pthread destructor function set by pthread_key_create | ||
58 | 36 | + * to be called after ruby_vm_destruct and attempt to free memory. Fall back to mimfree in | ||
59 | 37 | + * that case. */ | ||
60 | 38 | + if (LIKELY(GET_VM())) { | ||
61 | 39 | + objspace_xfree(&rb_objspace, x, size); | ||
62 | 40 | + } | ||
63 | 41 | + else { | ||
64 | 42 | + ruby_mimfree(x); | ||
65 | 43 | + } | ||
66 | 44 | } | ||
67 | 45 | } | ||
68 | 46 | |||
69 | diff --git a/debian/patches/renew-test-certificates-844672256e8e843a7e3a52b7e3c9bb8ea4c328b4.patch b/debian/patches/renew-test-certificates-844672256e8e843a7e3a52b7e3c9bb8ea4c328b4.patch | |||
70 | 0 | new file mode 100644 | 47 | new file mode 100644 |
71 | index 0000000..ab74b12 | |||
72 | --- /dev/null | |||
73 | +++ b/debian/patches/renew-test-certificates-844672256e8e843a7e3a52b7e3c9bb8ea4c328b4.patch | |||
74 | @@ -0,0 +1,260 @@ | |||
75 | 1 | From 844672256e8e843a7e3a52b7e3c9bb8ea4c328b4 Mon Sep 17 00:00:00 2001 | ||
76 | 2 | From: Sorah Fukumori <her@sorah.jp> | ||
77 | 3 | Date: Mon, 1 Jan 2024 20:45:54 +0900 | ||
78 | 4 | Subject: [PATCH] [ruby/net-http] Renew test certificates | ||
79 | 5 | |||
80 | 6 | The private key is replaced with a public known test key published at | ||
81 | 7 | [RFC 9500]. | ||
82 | 8 | |||
83 | 9 | Also lifetime has been extended to 10 years from 4 years. | ||
84 | 10 | |||
85 | 11 | [RFC 9500]: https://www.rfc-editor.org/rfc/rfc9500.html | ||
86 | 12 | |||
87 | 13 | https://github.com/ruby/net-http/commit/4ab6c4a500 | ||
88 | 14 | Applied-Upstream: 3.1.5 (expected), 3.2.3, 3.3.1 (expected) | ||
89 | 15 | Bug: https://bugs.ruby-lang.org/issues/20106 | ||
90 | 16 | Origin: upstream, https://github.com/ruby/ruby/pull/9420/commits/844672256e8e843a7e3a52b7e3c9bb8ea4c328b4 | ||
91 | 17 | Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/ruby3.1/+bug/2051380 | ||
92 | 18 | --- | ||
93 | 19 | test/net/fixtures/Makefile | 6 +-- | ||
94 | 20 | test/net/fixtures/cacert.pem | 44 ++++++++-------- | ||
95 | 21 | test/net/fixtures/server.crt | 99 +++++++----------------------------- | ||
96 | 22 | test/net/fixtures/server.key | 55 ++++++++++---------- | ||
97 | 23 | 4 files changed, 71 insertions(+), 133 deletions(-) | ||
98 | 24 | |||
99 | 25 | diff --git a/test/net/fixtures/Makefile b/test/net/fixtures/Makefile | ||
100 | 26 | index b2bc9c7368ee2e..88c232e3b6c16b 100644 | ||
101 | 27 | --- a/test/net/fixtures/Makefile | ||
102 | 28 | +++ b/test/net/fixtures/Makefile | ||
103 | 29 | @@ -5,11 +5,11 @@ regen_certs: | ||
104 | 30 | make server.crt | ||
105 | 31 | |||
106 | 32 | cacert.pem: server.key | ||
107 | 33 | - openssl req -new -x509 -days 1825 -key server.key -out cacert.pem -text -subj "/C=JP/ST=Shimane/L=Matz-e city/O=Ruby Core Team/CN=Ruby Test CA/emailAddress=security@ruby-lang.org" | ||
108 | 34 | + openssl req -new -x509 -days 3650 -key server.key -out cacert.pem -subj "/C=JP/ST=Shimane/L=Matz-e city/O=Ruby Core Team/CN=Ruby Test CA/emailAddress=security@ruby-lang.org" | ||
109 | 35 | |||
110 | 36 | server.csr: | ||
111 | 37 | - openssl req -new -key server.key -out server.csr -text -subj "/C=JP/ST=Shimane/O=Ruby Core Team/OU=Ruby Test/CN=localhost" | ||
112 | 38 | + openssl req -new -key server.key -out server.csr -subj "/C=JP/ST=Shimane/O=Ruby Core Team/OU=Ruby Test/CN=localhost" | ||
113 | 39 | |||
114 | 40 | server.crt: server.csr cacert.pem | ||
115 | 41 | - openssl x509 -days 1825 -CA cacert.pem -CAkey server.key -set_serial 00 -in server.csr -req -text -out server.crt | ||
116 | 42 | + openssl x509 -days 3650 -CA cacert.pem -CAkey server.key -set_serial 00 -in server.csr -req -out server.crt | ||
117 | 43 | rm server.csr | ||
118 | 44 | diff --git a/test/net/fixtures/cacert.pem b/test/net/fixtures/cacert.pem | ||
119 | 45 | index f623bd62ed3758..24c83f1c652253 100644 | ||
120 | 46 | --- a/test/net/fixtures/cacert.pem | ||
121 | 47 | +++ b/test/net/fixtures/cacert.pem | ||
122 | 48 | @@ -1,24 +1,24 @@ | ||
123 | 49 | -----BEGIN CERTIFICATE----- | ||
124 | 50 | -MIID7TCCAtWgAwIBAgIJAIltvxrFAuSnMA0GCSqGSIb3DQEBCwUAMIGMMQswCQYD | ||
125 | 51 | -VQQGEwJKUDEQMA4GA1UECAwHU2hpbWFuZTEUMBIGA1UEBwwLTWF0ei1lIGNpdHkx | ||
126 | 52 | -FzAVBgNVBAoMDlJ1YnkgQ29yZSBUZWFtMRUwEwYDVQQDDAxSdWJ5IFRlc3QgQ0Ex | ||
127 | 53 | -JTAjBgkqhkiG9w0BCQEWFnNlY3VyaXR5QHJ1YnktbGFuZy5vcmcwHhcNMTkwMTAy | ||
128 | 54 | -MDI1ODI4WhcNMjQwMTAxMDI1ODI4WjCBjDELMAkGA1UEBhMCSlAxEDAOBgNVBAgM | ||
129 | 55 | -B1NoaW1hbmUxFDASBgNVBAcMC01hdHotZSBjaXR5MRcwFQYDVQQKDA5SdWJ5IENv | ||
130 | 56 | -cmUgVGVhbTEVMBMGA1UEAwwMUnVieSBUZXN0IENBMSUwIwYJKoZIhvcNAQkBFhZz | ||
131 | 57 | -ZWN1cml0eUBydWJ5LWxhbmcub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB | ||
132 | 58 | -CgKCAQEAznlbjRVhz1NlutHVrhcGnK8W0qug2ujKXv1njSC4U6nJF6py7I9EeehV | ||
133 | 59 | -SaKePyv+I9z3K1LnfUHOtUbdwdKC77yN66A6q2aqzu5q09/NSykcZGOIF0GuItYI | ||
134 | 60 | -3nvW3IqBddff2ffsyR+9pBjfb5AIPP08WowF9q4s1eGULwZc4w2B8PFhtxYANd7d | ||
135 | 61 | -BvGLXFlcufv9tDtzyRi4t7eqxCRJkZQIZNZ6DHHIJrNxejOILfHLarI12yk8VK6L | ||
136 | 62 | -2LG4WgGqyeePiRyd1o1MbuiAFYqAwpXNUbRKg5NaZGwBHZk8UZ+uFKt1QMBURO5R | ||
137 | 63 | -WFy1c349jbWszTqFyL4Lnbg9HhAowQIDAQABo1AwTjAdBgNVHQ4EFgQU9tEiKdU9 | ||
138 | 64 | -I9derQyc5nWPnc34nVMwHwYDVR0jBBgwFoAU9tEiKdU9I9derQyc5nWPnc34nVMw | ||
139 | 65 | -DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAxj7F/u3C3fgq24N7hGRA | ||
140 | 66 | -of7ClFQxGmo/IGT0AISzW3HiVYiFaikKhbO1NwD9aBpD8Zwe62sCqMh8jGV/b0+q | ||
141 | 67 | -aOORnWYNy2R6r9FkASAglmdF6xn3bhgGD5ls4pCvcG9FynGnGc24g6MrjFNrBYUS | ||
142 | 68 | -2iIZsg36i0IJswo/Dy6HLphCms2BMCD3DeWtfjePUiTmQHJo6HsQIKP/u4N4Fvee | ||
143 | 69 | -uMBInei2M4VU74fLXbmKl1F9AEX7JDP3BKSZG19Ch5pnUo4uXM1uNTGsi07P4Y0s | ||
144 | 70 | -K44+SKBC0bYEFbDK0eQWMrX3kIhkPxyIWhxdq9/NqPYjShuSEAhA6CSpmRg0pqc+ | ||
145 | 71 | -mA== | ||
146 | 72 | +MIID+zCCAuOgAwIBAgIUGMvHl3EhtKPKcgc3NQSAYfFuC+8wDQYJKoZIhvcNAQEL | ||
147 | 73 | +BQAwgYwxCzAJBgNVBAYTAkpQMRAwDgYDVQQIDAdTaGltYW5lMRQwEgYDVQQHDAtN | ||
148 | 74 | +YXR6LWUgY2l0eTEXMBUGA1UECgwOUnVieSBDb3JlIFRlYW0xFTATBgNVBAMMDFJ1 | ||
149 | 75 | +YnkgVGVzdCBDQTElMCMGCSqGSIb3DQEJARYWc2VjdXJpdHlAcnVieS1sYW5nLm9y | ||
150 | 76 | +ZzAeFw0yNDAxMDExMTQ3MjNaFw0zMzEyMjkxMTQ3MjNaMIGMMQswCQYDVQQGEwJK | ||
151 | 77 | +UDEQMA4GA1UECAwHU2hpbWFuZTEUMBIGA1UEBwwLTWF0ei1lIGNpdHkxFzAVBgNV | ||
152 | 78 | +BAoMDlJ1YnkgQ29yZSBUZWFtMRUwEwYDVQQDDAxSdWJ5IFRlc3QgQ0ExJTAjBgkq | ||
153 | 79 | +hkiG9w0BCQEWFnNlY3VyaXR5QHJ1YnktbGFuZy5vcmcwggEiMA0GCSqGSIb3DQEB | ||
154 | 80 | +AQUAA4IBDwAwggEKAoIBAQCw+egZQ6eumJKq3hfKfED4dE/tL4FI5sjqont9ABVI | ||
155 | 81 | ++1GSqyi1bFBgsRjM0THllIdMbKmJtWwnKW8J+5OgNN8y6Xxv8JmM/Y5vQt2lis0f | ||
156 | 82 | +qXmG8UTz0VTWdlAXXmhUs6lSADvAaIe4RVrCsZ97L3ZQTryY7JRVcbB4khUN3Gp0 | ||
157 | 83 | +yg+801SXzoFTTa+UGIRLE66jH51aa5VXu99hnv1OiH8tQrjdi8mH6uG/icq4XuIe | ||
158 | 84 | +NWMF32wHqIOOPvQcWV3M5D2vxJEj702Ku6k9OQXkAo17qRSEonWW4HtLbtmS8He1 | ||
159 | 85 | +JNPc/n3dVUm+fM6NoDXPoLP7j55G9zKyqGtGAWXAj1MTAgMBAAGjUzBRMB0GA1Ud | ||
160 | 86 | +DgQWBBSJGVleDvFp9cu9R+E0/OKYzGkwkTAfBgNVHSMEGDAWgBSJGVleDvFp9cu9 | ||
161 | 87 | +R+E0/OKYzGkwkTAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBl | ||
162 | 88 | +8GLB8skAWlkSw/FwbUmEV3zyqu+p7PNP5YIYoZs0D74e7yVulGQ6PKMZH5hrZmHo | ||
163 | 89 | +orFSQU+VUUirG8nDGj7Rzce8WeWBxsaDGC8CE2dq6nC6LuUwtbdMnBrH0LRWAz48 | ||
164 | 90 | +jGFF3jHtVz8VsGfoZTZCjukWqNXvU6hETT9GsfU+PZqbqcTVRPH52+XgYayKdIbD | ||
165 | 91 | +r97RM4X3+aXBHcUW0b76eyyi65RR/Xtvn8ioZt2AdX7T2tZzJyXJN3Hupp77s6Ui | ||
166 | 92 | +AZR35SToHCZeTZD12YBvLBdaTPLZN7O/Q/aAO9ZiJaZ7SbFOjz813B2hxXab4Fob | ||
167 | 93 | +2uJX6eMWTVxYK5D4M9lm | ||
168 | 94 | -----END CERTIFICATE----- | ||
169 | 95 | diff --git a/test/net/fixtures/server.crt b/test/net/fixtures/server.crt | ||
170 | 96 | index 5ca78a6d146a00..5d2923795dabca 100644 | ||
171 | 97 | --- a/test/net/fixtures/server.crt | ||
172 | 98 | +++ b/test/net/fixtures/server.crt | ||
173 | 99 | @@ -1,82 +1,21 @@ | ||
174 | 100 | -Certificate: | ||
175 | 101 | - Data: | ||
176 | 102 | - Version: 3 (0x2) | ||
177 | 103 | - Serial Number: 2 (0x2) | ||
178 | 104 | - Signature Algorithm: sha256WithRSAEncryption | ||
179 | 105 | - Issuer: C=JP, ST=Shimane, L=Matz-e city, O=Ruby Core Team, CN=Ruby Test CA/emailAddress=security@ruby-lang.org | ||
180 | 106 | - Validity | ||
181 | 107 | - Not Before: Jan 2 03:27:13 2019 GMT | ||
182 | 108 | - Not After : Jan 1 03:27:13 2024 GMT | ||
183 | 109 | - Subject: C=JP, ST=Shimane, O=Ruby Core Team, OU=Ruby Test, CN=localhost | ||
184 | 110 | - Subject Public Key Info: | ||
185 | 111 | - Public Key Algorithm: rsaEncryption | ||
186 | 112 | - Public-Key: (2048 bit) | ||
187 | 113 | - Modulus: | ||
188 | 114 | - 00:e8:da:9c:01:2e:2b:10:ec:49:cd:5e:07:13:07: | ||
189 | 115 | - 9c:70:9e:c6:74:bc:13:c2:e1:6f:c6:82:fd:e3:48: | ||
190 | 116 | - e0:2c:a5:68:c7:9e:42:de:60:54:65:e6:6a:14:57: | ||
191 | 117 | - 7a:30:d0:cc:b5:b6:d9:c3:d2:df:c9:25:97:54:67: | ||
192 | 118 | - cf:f6:be:5e:cb:8b:ee:03:c5:e1:e2:f9:e7:f7:d1: | ||
193 | 119 | - 0c:47:f0:b8:da:33:5a:ad:41:ad:e7:b5:a2:7b:b7: | ||
194 | 120 | - bf:30:da:60:f8:e3:54:a2:bc:3a:fd:1b:74:d9:dc: | ||
195 | 121 | - 74:42:e9:29:be:df:ac:b4:4f:eb:32:f4:06:f1:e1: | ||
196 | 122 | - 8c:4b:a8:8b:fb:29:e7:b1:bf:1d:01:ee:73:0f:f9: | ||
197 | 123 | - 40:dc:d5:15:79:d9:c6:73:d0:c0:dd:cb:e4:da:19: | ||
198 | 124 | - 47:80:c6:14:04:72:fd:9a:7c:8f:11:82:76:49:04: | ||
199 | 125 | - 79:cc:f2:5c:31:22:95:13:3e:5d:40:a6:4d:e0:a3: | ||
200 | 126 | - 02:26:7d:52:3b:bb:ed:65:a1:0f:ed:6b:b0:3c:d4: | ||
201 | 127 | - de:61:15:5e:d3:dd:68:09:9f:4a:57:a5:c2:a9:6d: | ||
202 | 128 | - 86:92:c5:f4:a4:d4:b7:13:3b:52:63:24:05:e2:cc: | ||
203 | 129 | - e3:8a:3c:d4:35:34:2b:10:bb:58:72:e7:e1:8d:1d: | ||
204 | 130 | - 74:8c:61:16:20:3d:d0:1c:4e:8f:6e:fd:fe:64:10: | ||
205 | 131 | - 4f:41 | ||
206 | 132 | - Exponent: 65537 (0x10001) | ||
207 | 133 | - X509v3 extensions: | ||
208 | 134 | - X509v3 Basic Constraints: | ||
209 | 135 | - CA:FALSE | ||
210 | 136 | - Netscape Comment: | ||
211 | 137 | - OpenSSL Generated Certificate | ||
212 | 138 | - X509v3 Subject Key Identifier: | ||
213 | 139 | - ED:28:C2:7E:AB:4B:C8:E8:FE:55:6D:66:95:31:1C:2D:60:F9:02:36 | ||
214 | 140 | - X509v3 Authority Key Identifier: | ||
215 | 141 | - keyid:F6:D1:22:29:D5:3D:23:D7:5E:AD:0C:9C:E6:75:8F:9D:CD:F8:9D:53 | ||
216 | 142 | - | ||
217 | 143 | - Signature Algorithm: sha256WithRSAEncryption | ||
218 | 144 | - 1d:b8:c5:8b:72:41:20:65:ad:27:6f:15:63:06:26:12:8d:9c: | ||
219 | 145 | - ad:ca:f4:db:97:b4:90:cb:ff:35:94:bb:2a:a7:a1:ab:1e:35: | ||
220 | 146 | - 2d:a5:3f:c9:24:b0:1a:58:89:75:3e:81:0a:2c:4f:98:f9:51: | ||
221 | 147 | - fb:c0:a3:09:d0:0a:9b:e7:a2:b7:c3:60:40:c8:f4:6d:b2:6a: | ||
222 | 148 | - 56:12:17:4c:00:24:31:df:9c:60:ae:b1:68:54:a9:e6:b5:4a: | ||
223 | 149 | - 04:e6:92:05:86:d9:5a:dc:96:30:a5:58:de:14:99:0f:e5:15: | ||
224 | 150 | - 89:3e:9b:eb:80:e3:bd:83:c3:ea:33:35:4b:3e:2f:d3:0d:64: | ||
225 | 151 | - 93:67:7f:8d:f5:3f:0c:27:bc:37:5a:cc:d6:47:16:af:5a:62: | ||
226 | 152 | - d2:da:51:f8:74:06:6b:24:ad:28:68:08:98:37:7d:ed:0e:ab: | ||
227 | 153 | - 1e:82:61:05:d0:ba:75:a0:ab:21:b0:9a:fd:2b:54:86:1d:0d: | ||
228 | 154 | - 1f:c2:d4:77:1f:72:26:5e:ad:8a:9f:09:36:6d:44:be:74:c2: | ||
229 | 155 | - 5a:3e:ff:5c:9d:75:d6:38:7b:c5:39:f9:44:6e:a1:d1:8e:ff: | ||
230 | 156 | - 63:db:c4:bb:c6:91:92:ca:5c:60:9b:1d:eb:0a:de:08:ee:bf: | ||
231 | 157 | - da:76:03:65:62:29:8b:f8:7f:c7:86:73:1e:f6:1f:2d:89:69: | ||
232 | 158 | - fd:be:bd:6e | ||
233 | 159 | -----BEGIN CERTIFICATE----- | ||
234 | 160 | -MIID4zCCAsugAwIBAgIBAjANBgkqhkiG9w0BAQsFADCBjDELMAkGA1UEBhMCSlAx | ||
235 | 161 | -EDAOBgNVBAgMB1NoaW1hbmUxFDASBgNVBAcMC01hdHotZSBjaXR5MRcwFQYDVQQK | ||
236 | 162 | -DA5SdWJ5IENvcmUgVGVhbTEVMBMGA1UEAwwMUnVieSBUZXN0IENBMSUwIwYJKoZI | ||
237 | 163 | -hvcNAQkBFhZzZWN1cml0eUBydWJ5LWxhbmcub3JnMB4XDTE5MDEwMjAzMjcxM1oX | ||
238 | 164 | -DTI0MDEwMTAzMjcxM1owYDELMAkGA1UEBhMCSlAxEDAOBgNVBAgMB1NoaW1hbmUx | ||
239 | 165 | -FzAVBgNVBAoMDlJ1YnkgQ29yZSBUZWFtMRIwEAYDVQQLDAlSdWJ5IFRlc3QxEjAQ | ||
240 | 166 | -BgNVBAMMCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB | ||
241 | 167 | -AOjanAEuKxDsSc1eBxMHnHCexnS8E8Lhb8aC/eNI4CylaMeeQt5gVGXmahRXejDQ | ||
242 | 168 | -zLW22cPS38kll1Rnz/a+XsuL7gPF4eL55/fRDEfwuNozWq1Bree1onu3vzDaYPjj | ||
243 | 169 | -VKK8Ov0bdNncdELpKb7frLRP6zL0BvHhjEuoi/sp57G/HQHucw/5QNzVFXnZxnPQ | ||
244 | 170 | -wN3L5NoZR4DGFARy/Zp8jxGCdkkEeczyXDEilRM+XUCmTeCjAiZ9Uju77WWhD+1r | ||
245 | 171 | -sDzU3mEVXtPdaAmfSlelwqlthpLF9KTUtxM7UmMkBeLM44o81DU0KxC7WHLn4Y0d | ||
246 | 172 | -dIxhFiA90BxOj279/mQQT0ECAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhC | ||
247 | 173 | -AQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFO0o | ||
248 | 174 | -wn6rS8jo/lVtZpUxHC1g+QI2MB8GA1UdIwQYMBaAFPbRIinVPSPXXq0MnOZ1j53N | ||
249 | 175 | -+J1TMA0GCSqGSIb3DQEBCwUAA4IBAQAduMWLckEgZa0nbxVjBiYSjZytyvTbl7SQ | ||
250 | 176 | -y/81lLsqp6GrHjUtpT/JJLAaWIl1PoEKLE+Y+VH7wKMJ0Aqb56K3w2BAyPRtsmpW | ||
251 | 177 | -EhdMACQx35xgrrFoVKnmtUoE5pIFhtla3JYwpVjeFJkP5RWJPpvrgOO9g8PqMzVL | ||
252 | 178 | -Pi/TDWSTZ3+N9T8MJ7w3WszWRxavWmLS2lH4dAZrJK0oaAiYN33tDqsegmEF0Lp1 | ||
253 | 179 | -oKshsJr9K1SGHQ0fwtR3H3ImXq2Knwk2bUS+dMJaPv9cnXXWOHvFOflEbqHRjv9j | ||
254 | 180 | -28S7xpGSylxgmx3rCt4I7r/adgNlYimL+H/HhnMe9h8tiWn9vr1u | ||
255 | 181 | +MIIDYTCCAkkCAQAwDQYJKoZIhvcNAQELBQAwgYwxCzAJBgNVBAYTAkpQMRAwDgYD | ||
256 | 182 | +VQQIDAdTaGltYW5lMRQwEgYDVQQHDAtNYXR6LWUgY2l0eTEXMBUGA1UECgwOUnVi | ||
257 | 183 | +eSBDb3JlIFRlYW0xFTATBgNVBAMMDFJ1YnkgVGVzdCBDQTElMCMGCSqGSIb3DQEJ | ||
258 | 184 | +ARYWc2VjdXJpdHlAcnVieS1sYW5nLm9yZzAeFw0yNDAxMDExMTQ3MjNaFw0zMzEy | ||
259 | 185 | +MjkxMTQ3MjNaMGAxCzAJBgNVBAYTAkpQMRAwDgYDVQQIDAdTaGltYW5lMRcwFQYD | ||
260 | 186 | +VQQKDA5SdWJ5IENvcmUgVGVhbTESMBAGA1UECwwJUnVieSBUZXN0MRIwEAYDVQQD | ||
261 | 187 | +DAlsb2NhbGhvc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCw+egZ | ||
262 | 188 | +Q6eumJKq3hfKfED4dE/tL4FI5sjqont9ABVI+1GSqyi1bFBgsRjM0THllIdMbKmJ | ||
263 | 189 | +tWwnKW8J+5OgNN8y6Xxv8JmM/Y5vQt2lis0fqXmG8UTz0VTWdlAXXmhUs6lSADvA | ||
264 | 190 | +aIe4RVrCsZ97L3ZQTryY7JRVcbB4khUN3Gp0yg+801SXzoFTTa+UGIRLE66jH51a | ||
265 | 191 | +a5VXu99hnv1OiH8tQrjdi8mH6uG/icq4XuIeNWMF32wHqIOOPvQcWV3M5D2vxJEj | ||
266 | 192 | +702Ku6k9OQXkAo17qRSEonWW4HtLbtmS8He1JNPc/n3dVUm+fM6NoDXPoLP7j55G | ||
267 | 193 | +9zKyqGtGAWXAj1MTAgMBAAEwDQYJKoZIhvcNAQELBQADggEBACtGNdj5TEtnJBYp | ||
268 | 194 | +M+LhBeU3oNteldfycEm993gJp6ghWZFg23oX8fVmyEeJr/3Ca9bAgDqg0t9a0npN | ||
269 | 195 | +oWKEY6wVKqcHgu3gSvThF5c9KhGbeDDmlTSVVNQmXWX0K2d4lS2cwZHH8mCm2mrY | ||
270 | 196 | +PDqlEkSc7k4qSiqigdS8i80Yk+lDXWsm8CjsiC93qaRM7DnS0WPQR0c16S95oM6G | ||
271 | 197 | +VklFKUSDAuFjw9aVWA/nahOucjn0w5fVW6lyIlkBslC1ChlaDgJmvhz+Ol3iMsE0 | ||
272 | 198 | +kAmFNu2KKPVrpMWaBID49QwQTDyhetNLaVVFM88iUdA9JDoVMEuP1mm39JqyzHTu | ||
273 | 199 | +uBrdP4Q= | ||
274 | 200 | -----END CERTIFICATE----- | ||
275 | 201 | diff --git a/test/net/fixtures/server.key b/test/net/fixtures/server.key | ||
276 | 202 | index 7f2380e71e637b..6a83d5bcf4a521 100644 | ||
277 | 203 | --- a/test/net/fixtures/server.key | ||
278 | 204 | +++ b/test/net/fixtures/server.key | ||
279 | 205 | @@ -1,28 +1,27 @@ | ||
280 | 206 | ------BEGIN PRIVATE KEY----- | ||
281 | 207 | -MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDo2pwBLisQ7EnN | ||
282 | 208 | -XgcTB5xwnsZ0vBPC4W/Ggv3jSOAspWjHnkLeYFRl5moUV3ow0My1ttnD0t/JJZdU | ||
283 | 209 | -Z8/2vl7Li+4DxeHi+ef30QxH8LjaM1qtQa3ntaJ7t78w2mD441SivDr9G3TZ3HRC | ||
284 | 210 | -6Sm+36y0T+sy9Abx4YxLqIv7Keexvx0B7nMP+UDc1RV52cZz0MDdy+TaGUeAxhQE | ||
285 | 211 | -cv2afI8RgnZJBHnM8lwxIpUTPl1Apk3gowImfVI7u+1loQ/ta7A81N5hFV7T3WgJ | ||
286 | 212 | -n0pXpcKpbYaSxfSk1LcTO1JjJAXizOOKPNQ1NCsQu1hy5+GNHXSMYRYgPdAcTo9u | ||
287 | 213 | -/f5kEE9BAgMBAAECggEBAOHkwhc7DLh8IhTDNSW26oMu5OP2WU1jmiYAigDmf+OQ | ||
288 | 214 | -DBgrZj+JQBci8qINQxL8XLukSZn5hvQCLc7Kbyu1/wyEEUFDxSGGwwzclodr9kho | ||
289 | 215 | -LX2LDASPZrOSzD2+fPi2wTKmXKuS6Uc44OjQfZkYMNkz9r4Vkm8xGgOD3VipjIYX | ||
290 | 216 | -QXlhhdqkXZcNABsihCV52GKkDFSVm8jv95YJc5xhoYCy/3a4/qPdF0aT2R7oYUej | ||
291 | 217 | -hKrxVDskyooe8Zg/JTydZNV5GQEDmW01/K3r6XGT26oPi1AqMU1gtv/jkW56CRQQ | ||
292 | 218 | -1got8smnqM+AV7Slf9R6DauIPdQJ2S8wsr/o8ISBsOECgYEA9YrqEP2gAYSGFXRt | ||
293 | 219 | -liw0WI2Ant8BqXS6yvq1jLo/qWhLw/ph4Di73OQ2mpycVTpgfGr2wFPQR1XJ+0Fd | ||
294 | 220 | -U+Ir/C3Q7FK4VIGHK7B0zNvZr5tEjlFfeRezo2JMVw5YWeSagIFcSwK+KqCTH9qc | ||
295 | 221 | -pw/Eb8nB/4XNcpTZu7Fg0Wc+ooUCgYEA8sVaicn1Wxkpb45a4qfrA6wOr5xdJ4cC | ||
296 | 222 | -A5qs7vjX2OdPIQOmoQhdI7bCWFXZzF33wA4YCws6j5wRaySLIJqdms8Gl9QnODy1 | ||
297 | 223 | -ZlA5gwKToBC/jqPmWAXSKb8EH7cHilaxU9OKnQ7CfwlGLHqjMtjrhR7KHlt3CVRs | ||
298 | 224 | -oRmvsjZVXI0CgYAmPedslAO6mMhFSSfULrhMXmV82OCqYrrA6EEkVNGbcdnzAOkD | ||
299 | 225 | -gfKIWabDd8bFY10po4Mguy0CHzNhBXIioWQWV5BlbhC1YKMLw+S9DzSdLAKGY9gJ | ||
300 | 226 | -xQ4+UQ3wtRQ/k+IYR413RUsW2oFvgZ3KSyNeAb9MK6uuv84VdG/OzVSs/QKBgQDn | ||
301 | 227 | -kap//l2EbObiWyaERunckdVcW0lcN+KK75J/TGwPoOwQsLvTpPe65kxRGGrtDsEQ | ||
302 | 228 | -uCDk/+v3KkZPLgdrrTAih9FhJ+PVN8tMcb+6IM4SA4fFFr/UPJEwct0LJ3oQ0grJ | ||
303 | 229 | -y+HPWFHb/Uurh7t99/4H98uR02sjQh1wOeEmm78mzQKBgQDm+LzGH0se6CXQ6cdZ | ||
304 | 230 | -g1JRZeXkDEsrW3hfAsW62xJQmXcWxBoblP9OamMY+A06rM5og3JbDk5Zm6JsOaA8 | ||
305 | 231 | -wS2gw4ilp46jors4eQey8ux7kB9LzdBoDBBElnsbjLO8oBNZlVcYXg+6BOl/CUi7 | ||
306 | 232 | -2whRF0FEjKA8ehrNhAq+VFfFNw== | ||
307 | 233 | ------END PRIVATE KEY----- | ||
308 | 234 | +-----BEGIN RSA PRIVATE KEY----- | ||
309 | 235 | +MIIEowIBAAKCAQEAsPnoGUOnrpiSqt4XynxA+HRP7S+BSObI6qJ7fQAVSPtRkqso | ||
310 | 236 | +tWxQYLEYzNEx5ZSHTGypibVsJylvCfuToDTfMul8b/CZjP2Ob0LdpYrNH6l5hvFE | ||
311 | 237 | +89FU1nZQF15oVLOpUgA7wGiHuEVawrGfey92UE68mOyUVXGweJIVDdxqdMoPvNNU | ||
312 | 238 | +l86BU02vlBiESxOuox+dWmuVV7vfYZ79Toh/LUK43YvJh+rhv4nKuF7iHjVjBd9s | ||
313 | 239 | +B6iDjj70HFldzOQ9r8SRI+9NirupPTkF5AKNe6kUhKJ1luB7S27ZkvB3tSTT3P59 | ||
314 | 240 | +3VVJvnzOjaA1z6Cz+4+eRvcysqhrRgFlwI9TEwIDAQABAoIBAEEYiyDP29vCzx/+ | ||
315 | 241 | +dS3LqnI5BjUuJhXUnc6AWX/PCgVAO+8A+gZRgvct7PtZb0sM6P9ZcLrweomlGezI | ||
316 | 242 | +FrL0/6xQaa8bBr/ve/a8155OgcjFo6fZEw3Dz7ra5fbSiPmu4/b/kvrg+Br1l77J | ||
317 | 243 | +aun6uUAs1f5B9wW+vbR7tzbT/mxaUeDiBzKpe15GwcvbJtdIVMa2YErtRjc1/5B2 | ||
318 | 244 | +BGVXyvlJv0SIlcIEMsHgnAFOp1ZgQ08aDzvilLq8XVMOahAhP1O2A3X8hKdXPyrx | ||
319 | 245 | +IVWE9bS9ptTo+eF6eNl+d7htpKGEZHUxinoQpWEBTv+iOoHsVunkEJ3vjLP3lyI/ | ||
320 | 246 | +fY0NQ1ECgYEA3RBXAjgvIys2gfU3keImF8e/TprLge1I2vbWmV2j6rZCg5r/AS0u | ||
321 | 247 | +pii5CvJ5/T5vfJPNgPBy8B/yRDs+6PJO1GmnlhOkG9JAIPkv0RBZvR0PMBtbp6nT | ||
322 | 248 | +Y3yo1lwamBVBfY6rc0sLTzosZh2aGoLzrHNMQFMGaauORzBFpY5lU50CgYEAzPHl | ||
323 | 249 | +u5DI6Xgep1vr8QvCUuEesCOgJg8Yh1UqVoY/SmQh6MYAv1I9bLGwrb3WW/7kqIoD | ||
324 | 250 | +fj0aQV5buVZI2loMomtU9KY5SFIsPV+JuUpy7/+VE01ZQM5FdY8wiYCQiVZYju9X | ||
325 | 251 | +Wz5LxMNoz+gT7pwlLCsC4N+R8aoBk404aF1gum8CgYAJ7VTq7Zj4TFV7Soa/T1eE | ||
326 | 252 | +k9y8a+kdoYk3BASpCHJ29M5R2KEA7YV9wrBklHTz8VzSTFTbKHEQ5W5csAhoL5Fo | ||
327 | 253 | +qoHzFFi3Qx7MHESQb9qHyolHEMNx6QdsHUn7rlEnaTTyrXh3ifQtD6C0yTmFXUIS | ||
328 | 254 | +CW9wKApOrnyKJ9nI0HcuZQKBgQCMtoV6e9VGX4AEfpuHvAAnMYQFgeBiYTkBKltQ | ||
329 | 255 | +XwozhH63uMMomUmtSG87Sz1TmrXadjAhy8gsG6I0pWaN7QgBuFnzQ/HOkwTm+qKw | ||
330 | 256 | +AsrZt4zeXNwsH7QXHEJCFnCmqw9QzEoZTrNtHJHpNboBuVnYcoueZEJrP8OnUG3r | ||
331 | 257 | +UjmopwKBgAqB2KYYMUqAOvYcBnEfLDmyZv9BTVNHbR2lKkMYqv5LlvDaBxVfilE0 | ||
332 | 258 | +2riO4p6BaAdvzXjKeRrGNEKoHNBpOSfYCOM16NjL8hIZB1CaV3WbT5oY+jp7Mzd5 | ||
333 | 259 | +7d56RZOE+ERK2uz/7JX9VSsM/LbH9pJibd4e8mikDS9ntciqOH/3 | ||
334 | 260 | +-----END RSA PRIVATE KEY----- | ||
335 | diff --git a/debian/patches/series b/debian/patches/series | |||
336 | index 7ba0ac0..249ff0d 100644 | |||
337 | --- a/debian/patches/series | |||
338 | +++ b/debian/patches/series | |||
339 | @@ -22,3 +22,6 @@ fix-wss-tests.patch | |||
340 | 22 | fix-fiber-tests.patch | 22 | fix-fiber-tests.patch |
341 | 23 | fix-generic-tests.patch | 23 | fix-generic-tests.patch |
342 | 24 | CVE-2023-36617.patch | 24 | CVE-2023-36617.patch |
343 | 25 | fix-ruby_xfree-segfault.patch | ||
344 | 26 | # Update outdated certificates used in testsuite | ||
345 | 27 | renew-test-certificates-844672256e8e843a7e3a52b7e3c9bb8ea4c328b4.patch |
Thanks, Lucas.
Package builds OK. I was able to reproduce the segfault locally, and verified that it is fixed by the build in the PPA. dep8 tests LGTM. I'm leaving some cosmetic comments below, but otherwise +1.