From 9c416b4b4e21b1e89356a594d229b5cb11366f51 Mon Sep 17 00:00:00 2001
From: Adam Samalik <asamalik@redhat.com>
Date: Fri, 30 Jun 2023 07:41:58 +0200
Subject: [PATCH] re-import sources as agreed with the maintainer

---
 .gitignore                                    |  3 +-
 ...l3.0.0-tests-disable_TLS1_and_TLS1_1.patch | 37 -------------------
 Net-SSLeay-1.90-pkgconfig.patch               | 16 --------
 gating.yaml                                   |  2 +-
 4 files changed, 2 insertions(+), 56 deletions(-)
 delete mode 100644 Net-SSLeay-1.90-openssl3.0.0-tests-disable_TLS1_and_TLS1_1.patch
 delete mode 100644 Net-SSLeay-1.90-pkgconfig.patch

diff --git a/.gitignore b/.gitignore
index e699ddd..ce73085 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-SOURCES/Net-SSLeay-1.88.tar.gz
-/Net-SSLeay-1.88.tar.gz
+/Net-SSLeay-[0-9.]*.tar.gz
diff --git a/Net-SSLeay-1.90-openssl3.0.0-tests-disable_TLS1_and_TLS1_1.patch b/Net-SSLeay-1.90-openssl3.0.0-tests-disable_TLS1_and_TLS1_1.patch
deleted file mode 100644
index 8cc220c..0000000
--- a/Net-SSLeay-1.90-openssl3.0.0-tests-disable_TLS1_and_TLS1_1.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -ru Net-SSLeay-1.90.orig/t/local/44_sess.t Net-SSLeay-1.90/t/local/44_sess.t
---- Net-SSLeay-1.90.orig/t/local/44_sess.t	2020-12-12 14:55:23.000000000 +0100
-+++ Net-SSLeay-1.90/t/local/44_sess.t	2021-06-04 18:50:09.733150048 +0200
-@@ -13,13 +13,13 @@
- if (not can_fork()) {
-     plan skip_all => "fork() not supported on this system";
- } else {
--    plan tests => 58;
-+    plan tests => 34;
- }
- 
- initialise_libssl();
- 
- my @rounds = qw(
--    TLSv1 TLSv1.1 TLSv1.2 TLSv1.3 TLSv1.3-num-tickets-ssl
-+    TLSv1.2 TLSv1.3 TLSv1.3-num-tickets-ssl
-     TLSv1.3-num-tickets-ctx-6 TLSv1.3-num-tickets-ctx-0
- );
- 
-diff -ru Net-SSLeay-1.90.orig/t/local/45_exporter.t Net-SSLeay-1.90/t/local/45_exporter.t
---- Net-SSLeay-1.90.orig/t/local/45_exporter.t	2020-12-12 14:55:23.000000000 +0100
-+++ Net-SSLeay-1.90/t/local/45_exporter.t	2021-06-04 18:50:13.931192784 +0200
-@@ -15,12 +15,12 @@
- } elsif (!defined &Net::SSLeay::export_keying_material) {
-     plan skip_all => "No export_keying_material()";
- } else {
--    plan tests => 36;
-+    plan tests => 18;
- }
- 
- initialise_libssl();
- 
--my @rounds = qw( TLSv1 TLSv1.1 TLSv1.2 TLSv1.3 );
-+my @rounds = qw( TLSv1.2 TLSv1.3 );
- 
- my %usable =
-     map {
diff --git a/Net-SSLeay-1.90-pkgconfig.patch b/Net-SSLeay-1.90-pkgconfig.patch
deleted file mode 100644
index 5cefe35..0000000
--- a/Net-SSLeay-1.90-pkgconfig.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- Makefile.PL
-+++ Makefile.PL
-@@ -209,7 +209,12 @@ EOM
-         @{ $opts->{lib_links} } = map { $_ =~ s/32\b//g } @{ $opts->{lib_links} } if $Config{use64bitall};
-     }
-     else {
--        push @{ $opts->{lib_links} }, qw( ssl crypto z );
-+        if ( eval { require ExtUtils::PkgConfig; ExtUtils::PkgConfig->VERSION('1.16') } && ExtUtils::PkgConfig->exists('openssl') ) {
-+            push @{ $opts->{lib_links} }, map { s/^-l//; $_ } split(' ', ExtUtils::PkgConfig->libs_only_l('openssl'));
-+        }
-+        else {
-+             push @{ $opts->{lib_links} }, qw( ssl crypto z );
-+        }
- 
-         if (($Config{cc} =~ /aCC/i) && $^O eq 'hpux') {
-             print "*** Enabling HPUX aCC options (+e)\n";
diff --git a/gating.yaml b/gating.yaml
index c190bde..eb7c84f 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -1,6 +1,6 @@
 --- !Policy
 product_versions:
-  - rhel-9
+  - rhel-8
 decision_context: osci_compose_gate
 rules:
   - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}