[2.0] fix ptest for libcap (#12626)

Author: Kanishk-Bansal

SPECS/libcap/libcap.spec

@@ -1,7 +1,7 @@
 Summary:        Libcap
 Name:           libcap
 Version:        2.60
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        GPLv2+
 Group:          System Environment/Security
 URL:            https://www.gnu.org/software/hurd/community/gsoc/project_ideas/libcap.html
@@ -11,6 +11,7 @@ Distribution:   Mariner
 Patch0:         CVE-2023-2602.patch
 Patch1:         CVE-2023-2603.patch
 Patch2:         CVE-2025-1390.patch
+BuildRequires: glibc-static >= 2.35-7%{?dist}
 
 %description
 The libcap package implements the user-space interfaces to the POSIX 1003.1e capabilities available
@@ -38,7 +39,9 @@ chmod -v 755 %{buildroot}%{_libdir}/libcap.so
 
 %check
 cd progs
+make sudotest
 sed -i "s|pass_capsh --chroot=\$(/bin/pwd) ==||g" quicktest.sh
+sed -i '/echo "attempt to exploit kernel bug"/,/^fi$/d' quicktest.sh
 ./quicktest.sh
 
 %files
@@ -61,6 +64,9 @@ sed -i "s|pass_capsh --chroot=\$(/bin/pwd) ==||g" quicktest.sh
 %{_mandir}/man3/*
 
 %changelog
+* Wed Feb 26 2025 Kanishk Bansal <kanbansal@microsoft.com> - 2.60-4
+- Modify check section to fix ptest
+
 * Sun Feb 23 2025 Kanishk Bansal <kanbansal@microsoft.com> - 2.60-3
 - Patch CVE-2025-1390
 

toolkit/resources/manifests/package/pkggen_core_aarch64.txt

@@ -170,8 +170,8 @@ openssl-devel-1.1.1k-35.cm2.aarch64.rpm
 openssl-libs-1.1.1k-35.cm2.aarch64.rpm
 openssl-perl-1.1.1k-35.cm2.aarch64.rpm
 openssl-static-1.1.1k-35.cm2.aarch64.rpm
-libcap-2.60-3.cm2.aarch64.rpm
-libcap-devel-2.60-3.cm2.aarch64.rpm
+libcap-2.60-4.cm2.aarch64.rpm
+libcap-devel-2.60-4.cm2.aarch64.rpm
 debugedit-5.0-2.cm2.aarch64.rpm
 libarchive-3.6.1-4.cm2.aarch64.rpm
 libarchive-devel-3.6.1-4.cm2.aarch64.rpm

toolkit/resources/manifests/package/pkggen_core_x86_64.txt

@@ -170,8 +170,8 @@ openssl-devel-1.1.1k-35.cm2.x86_64.rpm
 openssl-libs-1.1.1k-35.cm2.x86_64.rpm
 openssl-perl-1.1.1k-35.cm2.x86_64.rpm
 openssl-static-1.1.1k-35.cm2.x86_64.rpm
-libcap-2.60-3.cm2.x86_64.rpm
-libcap-devel-2.60-3.cm2.x86_64.rpm
+libcap-2.60-4.cm2.x86_64.rpm
+libcap-devel-2.60-4.cm2.x86_64.rpm
 debugedit-5.0-2.cm2.x86_64.rpm
 libarchive-3.6.1-4.cm2.x86_64.rpm
 libarchive-devel-3.6.1-4.cm2.x86_64.rpm

toolkit/resources/manifests/package/toolchain_aarch64.txt

@@ -151,9 +151,9 @@ libassuan-2.5.5-2.cm2.aarch64.rpm
 libassuan-debuginfo-2.5.5-2.cm2.aarch64.rpm
 libassuan-devel-2.5.5-2.cm2.aarch64.rpm
 libbacktrace-static-11.2.0-8.cm2.aarch64.rpm
-libcap-2.60-3.cm2.aarch64.rpm
-libcap-debuginfo-2.60-3.cm2.aarch64.rpm
-libcap-devel-2.60-3.cm2.aarch64.rpm
+libcap-2.60-4.cm2.aarch64.rpm
+libcap-debuginfo-2.60-4.cm2.aarch64.rpm
+libcap-devel-2.60-4.cm2.aarch64.rpm
 libcap-ng-0.8.2-2.cm2.aarch64.rpm
 libcap-ng-debuginfo-0.8.2-2.cm2.aarch64.rpm
 libcap-ng-devel-0.8.2-2.cm2.aarch64.rpm

toolkit/resources/manifests/package/toolchain_x86_64.txt

@@ -157,9 +157,9 @@ libassuan-2.5.5-2.cm2.x86_64.rpm
 libassuan-debuginfo-2.5.5-2.cm2.x86_64.rpm
 libassuan-devel-2.5.5-2.cm2.x86_64.rpm
 libbacktrace-static-11.2.0-8.cm2.x86_64.rpm
-libcap-2.60-3.cm2.x86_64.rpm
-libcap-debuginfo-2.60-3.cm2.x86_64.rpm
-libcap-devel-2.60-3.cm2.x86_64.rpm
+libcap-2.60-4.cm2.x86_64.rpm
+libcap-debuginfo-2.60-4.cm2.x86_64.rpm
+libcap-devel-2.60-4.cm2.x86_64.rpm
 libcap-ng-0.8.2-2.cm2.x86_64.rpm
 libcap-ng-debuginfo-0.8.2-2.cm2.x86_64.rpm
 libcap-ng-devel-0.8.2-2.cm2.x86_64.rpm