[rpms/rubygem-eventmachine] rawhide: Backport some OpenSSL related fixes from upstream

[Mamoru TASAKA <mtasaka@fedoraproject.org>]

A new commit has been pushed.

Repo   : rpms/rubygem-eventmachine
Branch : rawhide
Commit : 164ddffd1c9ef112df1d45df1470a96c06032ad0
Author : Mamoru TASAKA <mtasaka@fedoraproject.org>
Date   : 2026-06-20T15:45:58+09:00
Stats  : +59/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/rubygem-eventmachine/c/164ddffd1c9ef112df1d45df1470a96c06032ad0?branch=rawhide

Log:
Backport some OpenSSL related fixes from upstream

---
diff --git a/rubygem-eventmachine-1.2.7-openssl4-test-fix.patch b/rubygem-eventmachine-1.2.7-openssl4-test-fix.patch
new file mode 100644
index 0000000..b9b612e
--- /dev/null
+++ b/rubygem-eventmachine-1.2.7-openssl4-test-fix.patch
@@ -0,0 +1,50 @@
+diff -urp eventmachine-1.2.7.orig/ext/ssl.cpp eventmachine-1.2.7/ext/ssl.cpp
+--- eventmachine-1.2.7.orig/ext/ssl.cpp	2026-06-20 15:11:35.120969915 +0900
++++ eventmachine-1.2.7/ext/ssl.cpp	2026-06-20 15:21:50.332794635 +0900
+@@ -276,6 +276,8 @@ SslContext_t::SslContext_t (bool is_serv
+ 
+ 			DH_free(dh);
+ 			BIO_free(bio);
++		} else {
++                SSL_CTX_set_dh_auto(pCtx, 1);
+ 		}
+ 
+ 		if (ecdh_curve.length() > 0) {
+@@ -584,7 +586,7 @@ X509 *SslBox_t::GetPeerCert()
+ 	X509 *cert = NULL;
+ 
+ 	if (pSSL)
+-		cert = SSL_get_peer_certificate(pSSL);
++		cert = SSL_get1_peer_certificate(pSSL);
+ 
+ 	return cert;
+ }
+diff -urp eventmachine-1.2.7.orig/tests/test_ssl_dhparam.rb eventmachine-1.2.7/tests/test_ssl_dhparam.rb
+--- eventmachine-1.2.7.orig/tests/test_ssl_dhparam.rb	2026-06-20 15:11:35.111379645 +0900
++++ eventmachine-1.2.7/tests/test_ssl_dhparam.rb	2026-06-20 15:13:12.623986845 +0900
+@@ -45,6 +45,9 @@ class TestSslDhParam < Test::Unit::TestC
+   end
+ 
+   def test_no_dhparam
++    is_SSL_GE_1_1 = (EM::OPENSSL_LIBRARY_VERSION[/OpenSSL (\d+\.\d+\.\d+)/, 1]
++      .split('.').map(&:to_i) <=> [1,1]) == 1
++
+     omit_unless(EM.ssl?)
+     omit_if(EM.library_type == :pure_ruby) # DH will work with defaults
+     omit_if(rbx?)
+@@ -57,8 +60,13 @@ class TestSslDhParam < Test::Unit::TestC
+       EM.connect("127.0.0.1", 16784, Client)
+     }
+ 
+-    assert(!$client_handshake_completed)
+-    assert(!$server_handshake_completed)
++    if is_SSL_GE_1_1
++      assert($client_handshake_completed)
++      assert($server_handshake_completed)
++    else
++      assert(!$client_handshake_completed)
++      assert(!$server_handshake_completed)
++    end
+   end
+ 
+   def test_dhparam

diff --git a/rubygem-eventmachine.spec b/rubygem-eventmachine.spec
index d10acb0..488374e 100644
--- a/rubygem-eventmachine.spec
+++ b/rubygem-eventmachine.spec
@@ -6,7 +6,7 @@
 
 Name: rubygem-%{gem_name}
 Version: 1.2.7
-Release: 34%{?dist}
+Release: 35%{?dist}
 Summary: Ruby/EventMachine library
 # Automatically converted from old format: GPLv2 or Ruby - review is highly recommended.
 License: GPL-2.0-only OR Ruby
@@ -31,6 +31,10 @@ Patch5: rubygem-eventmachine-1.2.7-Bump-TLS-version.patch
 # Fix intermittent tests.
 # https://github.com/eventmachine/eventmachine/pull/870
 Patch6: rubygem-eventmachine-1.2.7-Fix-intermittent-tests.patch
+# https://github.com/eventmachine/eventmachine/pull/868
+# https://github.com/eventmachine/eventmachine/pull/970
+# Backport some OpenSSL related upstream fix
+Patch7: rubygem-eventmachine-1.2.7-openssl4-test-fix.patch
 BuildRequires: ruby(release)
 BuildRequires: rubygems-devel
 BuildRequires: ruby-devel
@@ -77,6 +81,7 @@ sed -i '/SSL_CTX_set_cipher_list/ s/".*"/"PROFILE=SYSTEM"/' ext/ssl.cpp
 %patch 4 -p1
 %patch 5 -p1
 %patch 6 -p1
+%patch 7 -p1
 
 %build
 # Create the gem as gem install only works on a gem file
@@ -158,6 +163,9 @@ popd
 %{gem_instdir}/tests
 
 %changelog
+* Sat Jun 20 2026 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.2.7-35
+- Backport some OpenSSL related fixes from upstream
+
 * Fri Jun 12 2026 Yaakov Selkowitz <yselkowi@redhat.com> - 1.2.7-34
 - Rebuilt for openssl 4.0