From 2f6f97d72aee67706e7821e51ab5947c7610950e Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Tue, 28 Jan 2025 18:51:12 +0800 Subject: [PATCH] whitelist META.json/yml for scanning perl dependencies --- macros.perl | 5 +++-- openEuler-rpm-config.spec | 5 ++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/macros.perl b/macros.perl index 9c1fd0c..1e45bcb 100644 --- a/macros.perl +++ b/macros.perl @@ -31,7 +31,7 @@ export PERL_MM_USE_DEFAULT=1 %perl_default_filter_revision 3 # By default, for perl packages we want to filter all files in _docdir from -# req/prov scanning. +# req/prov scanning, except META.json/yml for scanning requirements. # Filtering out any provides caused by private libs in vendorarch/archlib # (vendor/core) is done by rpmbuild since Fedora 20 # . @@ -40,8 +40,9 @@ export PERL_MM_USE_DEFAULT=1 # "%{?perl_default_filter}", before any %description block. %perl_default_filter %{expand: \ +%global __global_requires_exclude_from %{nil} %global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}^%{_docdir} -%global __requires_exclude_from %{?__requires_exclude_from:%__requires_exclude_from|}^%{_docdir} +%global __requires_exclude_from %{?__requires_exclude_from:%__requires_exclude_from|}^%{_docdir}/.*\\\\(?=META.json|\\\\(MY|\\\\)META.yml\\\\)$ %global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^perl\\\\(VMS|^perl\\\\(Win32|^perl\\\\(DB\\\\)|^perl\\\\(UNIVERSAL\\\\) %global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\\\(VMS|^perl\\\\(Win32 } diff --git a/openEuler-rpm-config.spec b/openEuler-rpm-config.spec index 3d22bc9..6bffa70 100644 --- a/openEuler-rpm-config.spec +++ b/openEuler-rpm-config.spec @@ -3,7 +3,7 @@ Name: %{vendor}-rpm-config Version: 31 -Release: 13 +Release: 14 License: GPL+ Summary: specific rpm configuration files URL: https://gitee.com/src-openeuler/openEuler-rpm-config @@ -186,6 +186,9 @@ sed -i "s/@VENDOR@/%{vendor}/g" `grep "@VENDOR@" -rl %{buildroot}%{_rpmconfigdir %{rpmvdir}/find-requires.ksyms %changelog +* Tue Jan 28 2025 Funda Wang - 31-14 +- whitelist META.json/yml for scanning perl dependencies + * Fri Jan 17 2025 Funda Wang - 31-13 - split out fortify level definition for supporting build with FORTIFY_SOURCE=3 in the future -- Gitee