From a7c0d8187496e1ef3b519d416cc496e27a82e188 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 19 Mar 2025 14:45:19 +0300 Subject: [PATCH] Revert OL changes --- SOURCES/libreswan-oracle.patch | 24 ------------------------ SPECS/libreswan.spec | 7 +------ 2 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 SOURCES/libreswan-oracle.patch diff --git a/SOURCES/libreswan-oracle.patch b/SOURCES/libreswan-oracle.patch deleted file mode 100644 index 76293eb..0000000 --- a/SOURCES/libreswan-oracle.patch +++ /dev/null @@ -1,24 +0,0 @@ -From d2b6309933caaee42804eadd687a3a1f2db9833f Mon Sep 17 00:00:00 2001 -From: Edward Leung -Date: Wed, 9 Jan 2019 15:55:37 -0800 -Subject: [PATCH] Add libreswan-oracle.patch to detect Oracle Linux distro - -Signed-off-by: David Sloboda -diff --git a/libreswan-oracle.patch b/libreswan-oracle.patch -new file mode 100644 -index 0000000..89a6e6f ---- /dev/null -+++ b/libreswan-oracle.patch -@@ -0,0 +1,12 @@ -+diff -Nur libreswan-3.27.orig/programs/barf/barf.in libreswan-3.27/programs/barf/barf.in -+--- libreswan-3.27.orig/programs/barf/barf.in 2013-10-31 06:46:36.000000000 +0400 -++++ libreswan-3.27/programs/barf/barf.in 2014-03-24 18:18:25.256273674 +0400 -+@@ -272,7 +272,7 @@ -+ cat /proc/config_built_with -+ fi -+ _________________________ distro-release -+-for distro in /etc/redhat-release /etc/debian-release /etc/SuSE-release /etc/mandrake-release /etc/mandriva-release /etc/gentoo-release -++for distro in /etc/redhat-release /etc/oracle-release /etc/debian-release /etc/SuSE-release /etc/mandrake-release /etc/mandriva-release /etc/gentoo-release -+ do -+ if [ -f ${distro} ]; then -+ cat ${distro} diff --git a/SPECS/libreswan.spec b/SPECS/libreswan.spec index 4a2937b..9e318ae 100644 --- a/SPECS/libreswan.spec +++ b/SPECS/libreswan.spec @@ -31,7 +31,7 @@ Name: libreswan Summary: Internet Key Exchange (IKEv1 and IKEv2) implementation for IPsec # version is generated in the release script Version: 4.15 -Release: %{?prever:0.}3%{?prever:.%{prever}}.0.1%{?dist}.3 +Release: %{?prever:0.}3%{?prever:.%{prever}}%{?dist}.3 License: GPLv2 Url: https://libreswan.org/ Source0: https://download.libreswan.org/%{?prever:development/}%{name}-%{version}%{?prever}.tar.gz @@ -46,8 +46,6 @@ Patch: libreswan-4.15-netlink-extack.patch Patch: libreswan-4.15-create-child-sa-race-condition.patch Patch: libreswan-4.15-rereadsecrets.patch -Patch100: libreswan-oracle.patch - BuildRequires: audit-libs-devel BuildRequires: bison BuildRequires: curl-devel @@ -202,9 +200,6 @@ certutil -N -d sql:$tmpdir --empty-password %doc %{_mandir}/*/* %changelog -* Tue Mar 18 2025 Craig Guiller - 4.15-3.0.1.3 -- Add libreswan-oracle.patch to detect Oracle Linux distro - * Fri Jan 24 2025 Daiki Ueno - 4.15-3.3 - showhostkey: fix regression after RHEL-68755 (RHEL-75967)