[packages/rpm] fix autoreq for elf without exe bit during %install; rel 14

atler atler at pld-linux.org
Wed Mar 23 11:54:23 CET 2022


commit a3d712163ed93a2efc2f35c327a61770455b3356
Author: Jan Palus <atler at pld-linux.org>
Date:   Wed Mar 23 11:52:33 2022 +0100

    fix autoreq for elf without exe bit during %install; rel 14

 no-exe-for-elf-req.patch | 12 ++++++++++++
 rpm.spec                 |  4 +++-
 2 files changed, 15 insertions(+), 1 deletion(-)
---
diff --git a/rpm.spec b/rpm.spec
index 8b1631e..7f624d8 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:	13
+Release:	14
 Epoch:		1
 License:	GPL v2 / LGPL v2.1
 Group:		Base
@@ -95,6 +95,7 @@ Patch35:	pl-po.patch
 Patch36:	build-locale.patch
 Patch37:	%{name}-pl.po-update.patch
 Patch38:	no-exe-for-elf-debuginfo.patch
+Patch39:	no-exe-for-elf-req.patch
 URL:		https://rpm.org/
 BuildRequires:	acl-devel
 %{?with_audit:BuildRequires:	audit-libs-devel}
@@ -636,6 +637,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch36 -p1
 %patch37 -p1
 %patch38 -p1
+%patch39 -p1
 
 %{__rm} po/*.gmo
 
diff --git a/no-exe-for-elf-req.patch b/no-exe-for-elf-req.patch
new file mode 100644
index 0000000..3aa7b0f
--- /dev/null
+++ b/no-exe-for-elf-req.patch
@@ -0,0 +1,12 @@
+--- rpm-4.16.1.3/tools/elfdeps.c.orig	2020-05-28 12:04:25.084136944 +0200
++++ rpm-4.16.1.3/tools/elfdeps.c	2022-03-23 11:19:01.656202339 +0100
+@@ -300,7 +300,8 @@
+     if (ehdr->e_type == ET_DYN || ehdr->e_type == ET_EXEC) {
+ 	ei->marker = mkmarker(ehdr);
+     	ei->isDSO = (ehdr->e_type == ET_DYN);
+-	ei->isExec = (st.st_mode & (S_IXUSR|S_IXGRP|S_IXOTH));
++	//ei->isExec = (st.st_mode & (S_IXUSR|S_IXGRP|S_IXOTH));
++	ei->isExec = 1;
+ 
+ 	processProgHeaders(ei, ehdr);
+ 	processSections(ei);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/a3d712163ed93a2efc2f35c327a61770455b3356



More information about the pld-cvs-commit mailing list