Upgraded `libacvp` to 2.0.1. (#8258)

SPECS/libacvp/libacvp.signatures.json

@@ -1,5 +1,5 @@
 {
  "Signatures": {
-  "libacvp-1.3.0.tar.gz": "afc6b05f8b62846cae69e5722088b106a6a47a9a43cf700a7b905979381d357e"
+  "libacvp-2.0.1.tar.gz": "9f6e904c2ba264bf350ace647cf64fb1e4fa36a10c5391bf6014ff56fcf79d1c"
  }
 }

SPECS/libacvp/libacvp.spec

@@ -1,20 +1,22 @@
 Summary:        A library that implements the client-side of the ACVP protocol
 Name:           libacvp
-Version:        1.3.0
-Release:        3%{?dist}
+Version:        2.0.1
+Release:        1%{?dist}
 License:        ASL 2.0
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
 Group:          Development/Libraries
 URL:            https://github.com/cisco/libacvp
 Source0:        https://github.com/cisco/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
-Patch0:         openssl.patch
-Patch1:         non-static-configure.patch
+
 BuildRequires:  autoconf
 BuildRequires:  automake
+BuildRequires:  curl-devel
 BuildRequires:  gcc
 BuildRequires:  make
 
+Requires:       %{name}-libs = %{version}-%{release}
+
 %description
 A library that implements the client-side of the ACVP protocol.
 
@@ -22,19 +24,35 @@ A library that implements the client-side of the ACVP protocol.
 Summary:        LibACVP application for OpenSSL
 Group:          Applications/System
 BuildRequires:  openssl-devel
-Requires:       openssl-libs
 
 %description app
 This app provides the glue between the OpenSSL module under test
 and the library itself.
 
+%package devel
+Summary:        LibACVP application for OpenSSL
+Group:          Applications/System
+Requires:       %{name} = %{version}-%{release}
+
+%description devel
+Development files for LibACVP.
+
+%package libs
+Summary:        LibACVP application for OpenSSL
+Group:          Applications/System
+
+%description libs
+LibACVP shared libraries.
+
 %prep
 %autosetup -p1
 
 %build
 ./configure \
+    --disable-static \
     --prefix=%{_prefix} \
-    --enable-offline \
+    --with-libcurl-dir=%{_prefix} \
+    --with-ssl-dir=%{_prefix} \
     CFLAGS="-pthread -DACVP_NO_RUNTIME -DOPENSSL_KWP -DOPENSSL_KDF_SUPPORT -O2 -g -fcommon" \
     LIBS="-ldl"
 make clean
@@ -46,14 +64,25 @@ find %{buildroot} -type f -name "*.la" -delete -print
 
 %files
 %license LICENSE
-%{_datadir}/README.md
-%{_libdir}/libacvp.a
-%{_includedir}/acvp/*
+%doc %{_datadir}/README.md
 
 %files app
 %{_bindir}/acvp_app
 
+%files devel
+%{_includedir}/acvp/*
+%{_libdir}/libacvp.so
+
+%files libs
+%{_libdir}/libacvp.so.*
+
 %changelog
+* Tue Mar 05 2024 Pawel Winogrodzki <pawelwi@microsoft.com> - 2.0.1-1
+- Update to version 2.0.1.
+- Split out -devel and -libs subpackages.
+- Disabled static library build.
+- Disabled offline mode.
+
 * Wed Oct 05 2022 Andy Caldwell <andycaldwell@microsoft.com> - 1.3.0-3
 - Enable building without `glibc-static`
 

SPECS/libacvp/non-static-configure.patch

@@ -1,11 +0,0 @@
---- a/configure      2022-10-05 10:39:39.379852300 +0000
-+++ b/configure      2022-10-05 10:34:45.100616761 +0000
-@@ -11519,7 +11519,7 @@
- fi
- if test "x$enable_offline" != "xfalse" ; then
-     #Some platforms have multiple definitions. Allow them for JUST the library test stage.
--    LDFLAGS="-static -Wl,--allow-multiple-definition $LDFLAGS"
-+    LDFLAGS="-Wl,--allow-multiple-definition $LDFLAGS"
- fi
- # Search for SSL and Crypto libs, and if it doesn't fail set the make vars accordingly
- if test "x$disable_app" = "xno" ; then

cgmanifest.json

@@ -8551,8 +8551,8 @@
         "type": "other",
         "other": {
           "name": "libacvp",
-          "version": "1.3.0",
-          "downloadUrl": "https://github.com/cisco/libacvp/archive/v1.3.0.tar.gz"
+          "version": "2.0.1",
+          "downloadUrl": "https://github.com/cisco/libacvp/archive/v2.0.1.tar.gz"
         }
       }
     },
@@ -12536,16 +12536,6 @@
         }
       }
     },
-    {
-      "component": {
-        "type": "other",
-        "other": {
-          "name": "mandoc",
-          "version": "1.14.6",
-          "downloadUrl": "https://mandoc.bsd.lv/snapshots/mandoc-1.14.6.tar.gz"
-        }
-      }
-    },
     {
       "component": {
         "type": "other",
@@ -12646,6 +12636,16 @@
         }
       }
     },
+    {
+      "component": {
+        "type": "other",
+        "other": {
+          "name": "mandoc",
+          "version": "1.14.6",
+          "downloadUrl": "https://mandoc.bsd.lv/snapshots/mandoc-1.14.6.tar.gz"
+        }
+      }
+    },
     {
       "component": {
         "type": "other",
@@ -22472,9 +22472,9 @@
       "component": {
         "type": "other",
         "other": {
-          "name": "python-hatchling",
-          "version": "1.21.1",
-          "downloadUrl": "https://files.pythonhosted.org/packages/source/h/hatchling/hatchling-1.21.1.tar.gz"
+          "name": "python-hatch-vcs",
+          "version": "0.4.0",
+          "downloadUrl": "https://files.pythonhosted.org/packages/source/h/hatch_vcs/hatch_vcs-0.4.0.tar.gz"
         }
       }
     },
@@ -22482,9 +22482,9 @@
       "component": {
         "type": "other",
         "other": {
-          "name": "python-hatch-vcs",
-          "version": "0.4.0",
-          "downloadUrl": "https://files.pythonhosted.org/packages/source/h/hatch_vcs/hatch_vcs-0.4.0.tar.gz"
+          "name": "python-hatchling",
+          "version": "1.21.1",
+          "downloadUrl": "https://files.pythonhosted.org/packages/source/h/hatchling/hatchling-1.21.1.tar.gz"
         }
       }
     },
@@ -23238,16 +23238,6 @@
         }
       }
     },
-    {
-      "component": {
-        "type": "other",
-        "other": {
-          "name": "python-pathspec",
-          "version": "0.12.1",
-          "downloadUrl": "https://files.pythonhosted.org/packages/source/p/pathspec/pathspec-0.12.1.tar.gz"
-        }
-      }
-    },
     {
       "component": {
         "type": "other",
@@ -23268,6 +23258,16 @@
         }
       }
     },
+    {
+      "component": {
+        "type": "other",
+        "other": {
+          "name": "python-pathspec",
+          "version": "0.12.1",
+          "downloadUrl": "https://files.pythonhosted.org/packages/source/p/pathspec/pathspec-0.12.1.tar.gz"
+        }
+      }
+    },
     {
       "component": {
         "type": "other",