From 9462c3cc492f11ba5e4a3d4383793160ecdff02c Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com>
Date: Thu, 25 Jul 2024 11:10:08 +0300
Subject: [PATCH] Revert OL changes

---
 .../1000-replace-upstream-references.patch    | 23 -------------------
 SPECS/edk2.spec                               |  8 +------
 2 files changed, 1 insertion(+), 30 deletions(-)
 delete mode 100644 SOURCES/1000-replace-upstream-references.patch

diff --git a/SOURCES/1000-replace-upstream-references.patch b/SOURCES/1000-replace-upstream-references.patch
deleted file mode 100644
index b2eabcd..0000000
--- a/SOURCES/1000-replace-upstream-references.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From a194940b0fc62054430ca36b2bcec473a56745a1 Tue 30 Apr 00:00:00 2001
-From: rpm-build <rpm-build>
-Date: Tue, 30 Apr 2024 11:58:21 -0700
-Subject: [PATCH] Replace upstream references
-
-Orabug: 36569119
-
-Signed-off-by: John McWalters <john.mcwalters@oracle.com>
-Reviewed-by: Laurence Rochfort <laurence.rochfort@oracle.com>
-
-diff --git a/CryptoPkg/Library/OpensslLib/openssl/apps/fipsinstall.c b/CryptoPkg/Library/OpensslLib/openssl/apps/fipsinstall.c
-index e978057..67d6957 100644
---- a/CryptoPkg/Library/OpensslLib/openssl/apps/fipsinstall.c
-+++ b/CryptoPkg/Library/OpensslLib/openssl/apps/fipsinstall.c
-@@ -311,7 +311,7 @@ int fipsinstall_main(int argc, char **argv)
-     EVP_MAC *mac = NULL;
-     CONF *conf = NULL;
- 
--    BIO_printf(bio_err, "This command is not enabled in the Red Hat Enterprise Linux OpenSSL build, please consult Red Hat documentation to learn how to enable FIPS mode\n");
-+    BIO_printf(bio_err, "This command is not enabled in the Oracle Linux OpenSSL build, please consult Oracle Linux documentation to learn how to enable FIPS mode\n");
-     return 1;
- 
-     if ((opts = sk_OPENSSL_STRING_new_null()) == NULL)
diff --git a/SPECS/edk2.spec b/SPECS/edk2.spec
index f17596c..405983f 100644
--- a/SPECS/edk2.spec
+++ b/SPECS/edk2.spec
@@ -20,7 +20,7 @@ ExclusiveArch: x86_64 aarch64
 
 Name:       edk2
 Version:    %{GITDATE}
-Release:    6.0.1%{?dist}.2
+Release:    6%{?dist}.2
 Summary:    UEFI firmware for 64-bit virtual machines
 License:    BSD-2-Clause-Patent and Apache-2.0 and MIT
 URL:        http://www.tianocore.org
@@ -51,9 +51,6 @@ Source82: edk2-build.rhel-9
 
 Source90: DBXUpdate-%{DBXDATE}.x64.bin
 
-# Oracle patch
-Source1000: 1000-replace-upstream-references.patch
-
 Patch1: 0001-ignore-build-artifacts-generated-files-session-setti.patch
 Patch2: 0002-Remove-submodules.patch
 Patch3: 0003-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch
@@ -406,9 +403,6 @@ cp -a -- %{SOURCE80} %{SOURCE82} .
 cp -a -- %{SOURCE90} .
 tar -C CryptoPkg/Library/OpensslLib -a -f %{SOURCE2} -x
 
-#Apply Oracle patches
-patch -p1 < %{SOURCE1000}
-
 # Done by %setup, but we do not use it for the auxiliary tarballs
 chmod -Rf a+rX,u+w,g-w,o-w .