From d3824fff9ad00754817a8297894b7115e5347c82 Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Fri, 5 Nov 2021 00:30:00 +0100 Subject: [PATCH] don't require executable bit when searching for debuginfo; rel 8 --- no-exe-for-elf-debuginfo.patch | 10 ++++++++++ rpm.spec | 4 +++- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 no-exe-for-elf-debuginfo.patch diff --git a/no-exe-for-elf-debuginfo.patch b/no-exe-for-elf-debuginfo.patch new file mode 100644 index 0000000..70d37cd --- /dev/null +++ b/no-exe-for-elf-debuginfo.patch @@ -0,0 +1,10 @@ +--- rpm-4.16.1.3/scripts/find-debuginfo.sh.orig 2021-11-05 00:19:27.239390489 +0100 ++++ rpm-4.16.1.3/scripts/find-debuginfo.sh 2021-11-05 00:21:27.102128386 +0100 +@@ -352,7 +352,6 @@ + # Build a list of unstripped ELF files and their hardlinks + touch "$temp/primary" + find "$RPM_BUILD_ROOT" ! -path "${debugdir}/*.debug" -type f \ +- \( -perm -0100 -or -perm -0010 -or -perm -0001 \) \ + -print | LC_ALL=C sort | + file -N -f - | sed -n -e 's/^\(.*\):[ ]*.*ELF.*, not stripped.*/\1/p' | + xargs --no-run-if-empty stat -c '%h %D_%i %n' | diff --git a/rpm.spec b/rpm.spec index 2b5f88a..231690b 100644 --- a/rpm.spec +++ b/rpm.spec @@ -34,7 +34,7 @@ Summary(ru.UTF-8): Менеджер пакетов от RPM Summary(uk.UTF-8): Менеджер пакетів від RPM Name: rpm Version: 4.16.1.3 -Release: 7 +Release: 8 Epoch: 1 License: GPL v2 / LGPL v2.1 Group: Base @@ -94,6 +94,7 @@ Patch34: skip-symlinks.patch Patch35: pl-po.patch Patch36: build-locale.patch Patch37: %{name}-pl.po-update.patch +Patch38: no-exe-for-elf-debuginfo.patch URL: https://rpm.org/ BuildRequires: acl-devel %{?with_audit:BuildRequires: audit-libs-devel} @@ -633,6 +634,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze %patch35 -p1 %patch36 -p1 %patch37 -p1 +%patch38 -p1 %{__rm} po/*.gmo -- 2.44.0