diff --git a/check-if-the-file-is-a-symbolic-link-in-brp-digest-list.patch b/check-if-the-file-is-a-symbolic-link-in-brp-digest-list.patch new file mode 100644 index 0000000000000000000000000000000000000000..853ec38a7fdef67ed5fc654e5ed123e4aca4d693 --- /dev/null +++ b/check-if-the-file-is-a-symbolic-link-in-brp-digest-list.patch @@ -0,0 +1,25 @@ +From 0eea7318489474d20e391cc55eb81f2a642e36f8 Mon Sep 17 00:00:00 2001 +From: gaoyusong +Date: Fri, 3 Nov 2023 10:55:26 +0800 +Subject: [PATCH] check if the file is a symbolic link in brp-digest-list + +--- + brp-digest-list | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/brp-digest-list b/brp-digest-list +index 9ec50a2..77248c9 100644 +--- a/brp-digest-list ++++ b/brp-digest-list +@@ -18,7 +18,7 @@ cat - > $BIN_PKG_FILES + trap "rm -f \"${BIN_PKG_FILES}\"" 0 2 3 5 10 13 15 + + # File empty, exit +-if [ -z $(head -c 1 $BIN_PKG_FILES) ]; then ++if [ -L $BIN_PKG_FILES ] || [ -z $(head -c 1 $BIN_PKG_FILES) ]; then + exit 0 + fi + +-- +2.27.0 + diff --git a/openEuler-rpm-config.spec b/openEuler-rpm-config.spec index f8d7de3e997fcbc2dfd2b44921f36bd7d5435958..677f52f59f1087e1b0b9659edfad8e92d76b1862 100644 --- a/openEuler-rpm-config.spec +++ b/openEuler-rpm-config.spec @@ -3,7 +3,7 @@ Name: %{vendor}-rpm-config Version: 30 -Release: 35 +Release: 36 License: GPL+ Summary: specific rpm configuration files URL: https://gitee.com/openeuler/openEuler-rpm-config @@ -29,6 +29,7 @@ Patch15: 0001-add-loongarch64-for-golang_arches.patch Patch16: fix-config-error-for-loongarch64.patch Patch17: Feature-support-EBS-sign-for-IMA-digest-list.patch Patch18: fix-brp-ldconfig-riscv-default-library-directory.patch +Patch19: check-if-the-file-is-a-symbolic-link-in-brp-digest-list.patch Provides: python-rpm-macros = %{?epoch:%{epoch}:}%{version}-%{release} Provides: python2-rpm-macros = %{?epoch:%{epoch}:}%{version}-%{release} @@ -136,6 +137,9 @@ sed -i "s/__vendor/%{vendor}/g" `grep "__vendor" -rl %{buildroot}%{_rpmconfigdir %{rpmvdir}/find-requires.ksyms %changelog +* Fri Nov 03 2023 fuanan - 30-36 +- check if the file is a symbolic link in brp-digest-list + * Mon Apr 10 2023 laokz - 30-35 - fix riscv64 default library directory of brp-ldconfig