From e9cf2c92cf9ccd94d562b4db7bc12934e9000541 Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com>
Date: Fri, 20 Sep 2024 14:45:54 +0300
Subject: [PATCH] Revert OL changes

---
 ...ate-doc-template-for-tls-verify-peer.patch | 39 -------------------
 SOURCES/copy-patches.sh                       |  0
 SPECS/libnbd.spec                             |  8 +---
 3 files changed, 1 insertion(+), 46 deletions(-)
 delete mode 100644 SOURCES/1000-Update-doc-template-for-tls-verify-peer.patch
 mode change 100644 => 100755 SOURCES/copy-patches.sh

diff --git a/SOURCES/1000-Update-doc-template-for-tls-verify-peer.patch b/SOURCES/1000-Update-doc-template-for-tls-verify-peer.patch
deleted file mode 100644
index 6673f7e..0000000
--- a/SOURCES/1000-Update-doc-template-for-tls-verify-peer.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 9acc05f757ff7518104c8f232b49230f0503ffa1 Mon Sep 17 00:00:00 2001
-From: Alex Burmashev <alexander.burmashev@oracle.com>
-Date: Thu, 19 Sep 2024 09:16:31 +0000
-Subject: [PATCH] Update doc template for tls-verify-peer
-
-Without this change, docs on i686 are not generated correctly.
-
-Signed-off-by: Alex Burmashev <alexander.burmashev@oracle.com>
----
- docs/nbd_connect_uri.pod | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/docs/nbd_connect_uri.pod b/docs/nbd_connect_uri.pod
-index 5d7ecdb..9e49e24 100644
---- a/docs/nbd_connect_uri.pod
-+++ b/docs/nbd_connect_uri.pod
-@@ -119,6 +119,11 @@ Note this is not allowed by default - see next section.
- Set the PSK file.  See L<nbd_set_tls_psk_file(3)>.  Note
- this is not allowed by default - see next section.
- 
-+=item B<tls-verify-peer=false>
-+
-+Do not verify the server certificate.  See L<nbd_set_tls_verify_peer(3)>.
-+The default is C<true>.
-+
- =back
- 
- =head2 Disable URI features
-@@ -227,6 +232,7 @@ L<nbd_set_opt_mode(3)>,
- L<nbd_set_tls(3)>,
- L<nbd_set_tls_certificates(3)>,
- L<nbd_set_tls_psk_file(3)>,
-+L<nbd_set_tls_verify_peer(3)>,
- L<nbd_set_uri_allow_local_file(3)>,
- L<nbd_set_uri_allow_tls(3)>,
- L<nbd_set_uri_allow_transports(3)>,
--- 
-2.43.5
-
diff --git a/SOURCES/copy-patches.sh b/SOURCES/copy-patches.sh
old mode 100644
new mode 100755
diff --git a/SPECS/libnbd.spec b/SPECS/libnbd.spec
index b52c1ce..f7841ea 100644
--- a/SPECS/libnbd.spec
+++ b/SPECS/libnbd.spec
@@ -9,7 +9,7 @@
 
 Name:           libnbd
 Version:        1.18.1
-Release:        4.0.1%{?dist}
+Release:        4%{?dist}
 Summary:        NBD client library in userspace
 
 License:        LGPL-2.0-or-later AND BSD-3-Clause
@@ -42,9 +42,6 @@ Patch0010:     0010-lib-uri.c-Allow-tls-verify-peer-to-be-overridden-in-.patch
 Patch0011:     0011-docs-security-Add-link-to-TLS-server-certificate-che.patch
 Patch0012:     0012-docs-libnbd-security.pod-Assign-CVE-2024-7383.patch
 
-# Oracle patches
-Patch1000:     1000-Update-doc-template-for-tls-verify-peer.patch
-
 %if 0%{patches_touch_autotools}
 BuildRequires: autoconf, automake, libtool
 %endif
@@ -395,9 +392,6 @@ make %{?_smp_mflags} check || {
 
 
 %changelog
-* Thu Sep 19 2024 Alex Burmashev <alexander.burmashev@oracle.com> - 1.18.1-4.0.1
-- Add new content to nbd_connect_uri.pod
-
 * Tue Aug 27 2024 Richard W.M. Jones <rjones@redhat.com> - 1.18.1-4
 - Fix CVE-2024-7383 NBD server improper certificate validation
   resolves: RHEL-52730