From bf25e572136e6a1b4e19a5409a98d64dfd41fcd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Josef=20=C5=A0pa=C4=8Dek?= <mspacek@redhat.com>
Date: Fri, 23 Jul 2021 12:44:22 +0200
Subject: [PATCH] Update Net-SSLeay-1.90-openssl3.0.0-43_misc_functions.patch
 to accept beta version

Related: rhbz#1985255
---
 Net-SSLeay-1.90-openssl3.0.0-43_misc_functions.patch | 11 +++++++----
 perl-Net-SSLeay.spec                                 |  2 ++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Net-SSLeay-1.90-openssl3.0.0-43_misc_functions.patch b/Net-SSLeay-1.90-openssl3.0.0-43_misc_functions.patch
index 2b5679c..76bf9a6 100644
--- a/Net-SSLeay-1.90-openssl3.0.0-43_misc_functions.patch
+++ b/Net-SSLeay-1.90-openssl3.0.0-43_misc_functions.patch
@@ -1,7 +1,7 @@
 diff -ru Net-SSLeay-1.90.orig/t/local/43_misc_functions.t Net-SSLeay-1.90/t/local/43_misc_functions.t
 --- Net-SSLeay-1.90.orig/t/local/43_misc_functions.t	2021-01-21 16:14:11.000000000 +0100
 +++ Net-SSLeay-1.90/t/local/43_misc_functions.t	2021-06-04 17:30:29.508947419 +0200
-@@ -245,6 +245,20 @@
+@@ -245,6 +245,23 @@
  
      my $ciphersuites = join(':', keys(%tls_1_3_aead_cipher_to_keyblock_size));
  
@@ -13,10 +13,13 @@ diff -ru Net-SSLeay-1.90.orig/t/local/43_misc_functions.t Net-SSLeay-1.90/t/loca
 +    if (Net::SSLeay::SSLeay == 0x30000000 && $ssleay_version =~ /-alpha(\d+)\ /) {
 +	$openssl_alpha_version = $1;
 +    }
-+    if (Net::SSLeay::SSLeay >= 0x30000000 && defined $openssl_alpha_version && $openssl_alpha_version > 10) {
-+	$ret_partially_bad_ciphersuites = 1;
-+    } else {
++    if ((Net::SSLeay::SSLeay == 0x30000000
++       && defined $openssl_alpha_version && $openssl_alpha_version < 11)
++       || Net::SSLeay::SSLeay < 0x30000000) {
++
 +	$ret_partially_bad_ciphersuites = 0;
++    } else {
++	$ret_partially_bad_ciphersuites = 1;
 +    }
 +
      my ($ctx, $rv, $ssl);
diff --git a/perl-Net-SSLeay.spec b/perl-Net-SSLeay.spec
index 364ec40..804d78b 100644
--- a/perl-Net-SSLeay.spec
+++ b/perl-Net-SSLeay.spec
@@ -138,6 +138,8 @@ make test
 
 %changelog
 * Fri Jul 23 2021 Michal Josef Špaček <mspacek@redhat.com> - 1.90-6
+- Fix tests for openssl 3.0.0-beta1. rhbz#1964854
+  - Update Net-SSLeay-1.90-openssl3.0.0-43_misc_functions.patch to accept beta version
 - Fix tab vs space in spec file
 - Update Net-SSLeay-1.90-openssl3.0.0-39_pkcs12.patch patch to upstream version