From a51a61214c0c78df737f4badba1af8b7a429cc78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
Date: Tue, 25 Jan 2022 17:35:49 +0100
Subject: [PATCH] Drop Puma workaround.

This is considered as Puma issue which should be addressed in latest
release:

https://github.com/puma/puma/issues/2753
---
 ruby-3.1.0-SSL_read-EOF-handling.patch | 16 ----------------
 ruby.spec                              |  4 ----
 2 files changed, 20 deletions(-)
 delete mode 100644 ruby-3.1.0-SSL_read-EOF-handling.patch

diff --git a/ruby-3.1.0-SSL_read-EOF-handling.patch b/ruby-3.1.0-SSL_read-EOF-handling.patch
deleted file mode 100644
index 1c5660f..0000000
--- a/ruby-3.1.0-SSL_read-EOF-handling.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c
-index 3b425ca..40e748c 100644
---- a/ext/openssl/ossl_ssl.c
-+++ b/ext/openssl/ossl_ssl.c
-@@ -1870,6 +1870,11 @@ ossl_ssl_read_internal(int argc, VALUE *argv, VALUE self, int nonblock)
- 	return str;
- 
-     GetSSL(self, ssl);
-+
-+#ifdef SSL_OP_IGNORE_UNEXPECTED_EOF
-+    SSL_set_options(ssl, SSL_OP_IGNORE_UNEXPECTED_EOF);
-+#endif
-+
-     io = rb_attr_get(self, id_i_io);
-     GetOpenFile(io, fptr);
-     if (ssl_started(ssl)) {
diff --git a/ruby.spec b/ruby.spec
index a1273d1..f92b10d 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -250,9 +250,6 @@ Patch57: rubygems-3.3.1-Fix-compatibility-with-OpenSSL3.0.patch
 # Miscellaneous changes for OpenSSL 3.0 support.
 # https://github.com/ruby/openssl/pull/481
 Patch58: ruby-3.1.0-Miscellaneous-changes-for-OpenSSL-3.0-support-part-2.patch
-# Fix `TestPumaControlCli#test_control_ssl` testcase in Puma.
-# https://github.com/ruby/openssl/pull/399#issuecomment-966239736
-Patch59: ruby-3.1.0-SSL_read-EOF-handling.patch
 
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Suggests: rubypick
@@ -726,7 +723,6 @@ rm -rf ext/fiddle/libffi*
 %patch56 -p1
 %patch57 -p1
 %patch58 -p1
-%patch59 -p1
 
 # Provide an example of usage of the tapset:
 cp -a %{SOURCE3} .