openscap: upgrade to 1.3.9 (#8701)

Co-authored-by: Betty Lakes <bettylakes@microsoft.com>

SPECS/openscap/openscap.signatures.json

@@ -1,5 +1,5 @@
 {
  "Signatures": {
-  "openscap-1.3.5.tar.gz": "7c3e540b757fe35de15f21a849f1afa4d3776ee3279276ada4ddd3506c3679c2"
+  "openscap-1.3.9.tar.gz": "2d8450b6b6ef068991e1292cd3989e8a1d81f2bcda0a2644dcb2943c2de1a20d"
  }
 }

SPECS/openscap/openscap.spec

@@ -1,14 +1,13 @@
 Summary:        Open Source Security Compliance Solution
 Name:           openscap
-Version:        1.3.5
-Release:        4%{?dist}
+Version:        1.3.9
+Release:        1%{?dist}
 License:        LGPLv2+
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
 Group:          System Environment/Libraries
 URL:            https://www.open-scap.org
 Source0:        https://github.com/OpenSCAP/openscap/releases/download/%{version}/%{name}-%{version}.tar.gz
-Patch0:         support_rpm_418.patch
 BuildRequires:  bzip2-devel
 BuildRequires:  cmake
 BuildRequires:  curl-devel
@@ -18,7 +17,7 @@ BuildRequires:  libgcrypt-devel
 BuildRequires:  libselinux-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  libxslt-devel
-BuildRequires:  pcre-devel
+BuildRequires:  pcre2-devel
 BuildRequires:  perl-devel
 BuildRequires:  perl-XML-Parser
 BuildRequires:  popt-devel
@@ -69,7 +68,9 @@ mkdir build
 
 %build
 cd build
-%cmake -DENABLE_PERL=ON \
+%cmake \
+       -DWITH_PCRE2=ON \
+       -DENABLE_PERL=ON \
        -DENABLE_SCE=ON \
        -DPYTHON_EXECUTABLE:STRING=%{python3} \
        -DPYTHON_VERSION_MAJOR:STRING=$(%{python3} -c "import sys; print(sys.version_info.major)") \
@@ -116,6 +117,9 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %{python3_sitelib}/*
 
 %changelog
+* Fri Mar 08 2024 Betty Lakes <bettylakes@microsoft.com> - 1.3.9-1
+- Upgrade to 1.3.9
+
 * Wed Sep 20 2023 Jon Slobodzian <joslobo@microsoft.com> - 1.3.5-4
 - Recompile with stack-protection fixed gcc version (CVE-2023-4039)
 

SPECS/openscap/support_rpm_418.patch

@@ -1,58 +0,0 @@
-From 8dec1bb5e9546e75ae6e7b7cf94cf00197ce3e5d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jan=20=C4=8Cern=C3=BD?= <jcerny@redhat.com>
-Date: Tue, 24 May 2022 12:15:44 +0200
-Subject: [PATCH] Use correct includes
-
-rpmvercmp is defined in rpm/rpmver.h
-risdigit is defined in rpm/rpmstring.h
-
-Resolves: rhbz#2080210
----
- cmake/FindRPM.cmake                    | 3 +++
- config.h.in                            | 1 +
- src/OVAL/results/oval_cmp_evr_string.c | 5 +++++
- 3 files changed, 9 insertions(+)
-
-diff --git a/cmake/FindRPM.cmake b/cmake/FindRPM.cmake
-index a666942eae..369d153fcc 100644
---- a/cmake/FindRPM.cmake
-+++ b/cmake/FindRPM.cmake
-@@ -30,6 +30,9 @@ set(RPM_VERSION ${RPM_PKGCONF_VERSION})
- if(RPM_VERSION)
- 	string(COMPARE GREATER "4.6" ${RPM_VERSION} RPM46_FOUND)
- 	string(COMPARE GREATER "4.7" ${RPM_VERSION} RPM47_FOUND)
-+	if(NOT (RPM_VERSION VERSION_LESS "4.18"))
-+		set(RPM418_FOUND 1)
-+	endif()
- endif()
- 
- # Set the include dir variables and the libraries and let libfind_process do the rest.
-diff --git a/config.h.in b/config.h.in
-index 1b72855822..bb1428afc8 100644
---- a/config.h.in
-+++ b/config.h.in
-@@ -44,6 +44,7 @@
- #cmakedefine HAVE_RPMVERCMP
- #cmakedefine RPM46_FOUND
- #cmakedefine RPM47_FOUND
-+#cmakedefine RPM418_FOUND
- 
- #cmakedefine BZIP2_FOUND
- 
-diff --git a/src/OVAL/results/oval_cmp_evr_string.c b/src/OVAL/results/oval_cmp_evr_string.c
-index 3bfc8ce5f9..3ba0fa0cbd 100644
---- a/src/OVAL/results/oval_cmp_evr_string.c
-+++ b/src/OVAL/results/oval_cmp_evr_string.c
-@@ -37,7 +37,12 @@
- #include "common/_error.h"
- 
- #ifdef HAVE_RPMVERCMP
-+#ifdef RPM418_FOUND
-+#include <rpm/rpmver.h>
-+#include <rpm/rpmstring.h>
-+#else
- #include <rpm/rpmlib.h>
-+#endif
- #else
- #ifdef OS_WINDOWS
- #include <malloc.h>

cgmanifest.json

@@ -15163,8 +15163,8 @@
         "type": "other",
         "other": {
           "name": "openscap",
-          "version": "1.3.5",
-          "downloadUrl": "https://github.com/OpenSCAP/openscap/releases/download/1.3.5/openscap-1.3.5.tar.gz"
+          "version": "1.3.9",
+          "downloadUrl": "https://github.com/OpenSCAP/openscap/releases/download/1.3.9/openscap-1.3.9.tar.gz"
         }
       }
     },