Revert "Patch libarchive for CVE-2025-1632, CVE-2025-25724 [Medium] (#12884)"

This reverts commit 078d078.

Author: jslobodzian

SPECS/libarchive/CVE-2025-1632.patch

@@ -1,15 +1,13 @@
 Summary:        Multi-format archive and compression library
 Name:           libarchive
 Version:        3.7.7
-Release:        2%{?dist}
+Release:        1%{?dist}
 # Certain files have individual licenses. For more details see contents of "COPYING".
 License:        BSD AND Public Domain AND (ASL 2.0 OR CC0 1.0 OR OpenSSL)
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
 URL:            https://www.libarchive.org/
 Source0:        https://github.com/libarchive/libarchive/releases/download/v%{version}/%{name}-%{version}.tar.gz
-Patch0:         CVE-2025-1632.patch
-Patch1:         CVE-2025-25724.patch
 Provides:       bsdtar = %{version}-%{release}
 
 BuildRequires:  xz-libs
@@ -62,9 +60,6 @@ make %{?_smp_mflags} check
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Tue Mar 11 2025 Kanishk Bansal <[email protected]> - 3.7.7-2
-- Patch CVE-2025-1632, CVE-2025-25724
-
 * Tue Oct 15 2024 Nan Liu <[email protected]> - 3.7.7-1
 - Upgrade to 3.7.7 - Fix CVE-2024-48957, CVE-2024-48958, CVE-2024-20696
 - Remove unused patches

SPECS/libarchive/CVE-2025-25724.patch

@@ -178,8 +178,8 @@ openssl-static-3.3.3-1.azl3.aarch64.rpm
 libcap-2.69-3.azl3.aarch64.rpm
 libcap-devel-2.69-3.azl3.aarch64.rpm
 debugedit-5.0-2.azl3.aarch64.rpm
-libarchive-3.7.7-2.azl3.aarch64.rpm
-libarchive-devel-3.7.7-2.azl3.aarch64.rpm
+libarchive-3.7.7-1.azl3.aarch64.rpm
+libarchive-devel-3.7.7-1.azl3.aarch64.rpm
 rpm-4.18.2-1.azl3.aarch64.rpm
 rpm-build-4.18.2-1.azl3.aarch64.rpm
 rpm-build-libs-4.18.2-1.azl3.aarch64.rpm

SPECS/libarchive/libarchive.spec

@@ -178,8 +178,8 @@ openssl-static-3.3.3-1.azl3.x86_64.rpm
 libcap-2.69-3.azl3.x86_64.rpm
 libcap-devel-2.69-3.azl3.x86_64.rpm
 debugedit-5.0-2.azl3.x86_64.rpm
-libarchive-3.7.7-2.azl3.x86_64.rpm
-libarchive-devel-3.7.7-2.azl3.x86_64.rpm
+libarchive-3.7.7-1.azl3.x86_64.rpm
+libarchive-devel-3.7.7-1.azl3.x86_64.rpm
 rpm-4.18.2-1.azl3.x86_64.rpm
 rpm-build-4.18.2-1.azl3.x86_64.rpm
 rpm-build-libs-4.18.2-1.azl3.x86_64.rpm

toolkit/resources/manifests/package/pkggen_core_aarch64.txt

@@ -166,9 +166,9 @@ krb5-devel-1.21.3-2.azl3.aarch64.rpm
 krb5-lang-1.21.3-2.azl3.aarch64.rpm
 libacl-2.3.1-2.azl3.aarch64.rpm
 libacl-devel-2.3.1-2.azl3.aarch64.rpm
-libarchive-3.7.7-2.azl3.aarch64.rpm
-libarchive-debuginfo-3.7.7-2.azl3.aarch64.rpm
-libarchive-devel-3.7.7-2.azl3.aarch64.rpm
+libarchive-3.7.7-1.azl3.aarch64.rpm
+libarchive-debuginfo-3.7.7-1.azl3.aarch64.rpm
+libarchive-devel-3.7.7-1.azl3.aarch64.rpm
 libassuan-2.5.6-1.azl3.aarch64.rpm
 libassuan-debuginfo-2.5.6-1.azl3.aarch64.rpm
 libassuan-devel-2.5.6-1.azl3.aarch64.rpm

toolkit/resources/manifests/package/pkggen_core_x86_64.txt

@@ -174,9 +174,9 @@ krb5-devel-1.21.3-2.azl3.x86_64.rpm
 krb5-lang-1.21.3-2.azl3.x86_64.rpm
 libacl-2.3.1-2.azl3.x86_64.rpm
 libacl-devel-2.3.1-2.azl3.x86_64.rpm
-libarchive-3.7.7-2.azl3.x86_64.rpm
-libarchive-debuginfo-3.7.7-2.azl3.x86_64.rpm
-libarchive-devel-3.7.7-2.azl3.x86_64.rpm
+libarchive-3.7.7-1.azl3.x86_64.rpm
+libarchive-debuginfo-3.7.7-1.azl3.x86_64.rpm
+libarchive-devel-3.7.7-1.azl3.x86_64.rpm
 libassuan-2.5.6-1.azl3.x86_64.rpm
 libassuan-debuginfo-2.5.6-1.azl3.x86_64.rpm
 libassuan-devel-2.5.6-1.azl3.x86_64.rpm