folkslinux
/
VMware-Photon-OS
mirror of https://github.com/vmware/photon.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rpm: remove brp-elfperms script 

This script removes exec permission from shared object files which
should not be done.

More info at:
https://github.com/rpm-software-management/rpm/discussions/3195

Change-Id: I442520dc200a9ccfcfbff08eeb8ee774cc77d130
Signed-off-by: Shreenidhi Shedi <shreenidhi.shedi@broadcom.com>
Reviewed-on: http://photon-gerrit.lvn.broadcom.net/c/photon/+/24686
Reviewed-by: Guruswamy Basavaiah <guruswamy.basavaiah@broadcom.com>
Reviewed-by: Michelle Wang <michelle.wang@broadcom.com>
This commit is contained in:
Shreenidhi Shedi 2024-10-14 16:17:15 +00:00 committed by Guruswamy Basavaiah
parent fc76f626df
commit 0d115889ca
5 changed files with 78 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
SPECS/rpm/0007-remove-brp-elfperms-script.patch Normal file
View File

@ -0,0 +1,65 @@
From bcf06fded9ff0d94d5104b53344eb959a8dd0c92 Mon Sep 17 00:00:00 2001
From: Shreenidhi Shedi <shreenidhi.shedi@broadcom.com>
Date: Mon, 23 Sep 2024 11:00:55 +0530
Subject: [PATCH] Remove brp-elfperms script
This is done based on discussion at:
https://github.com/rpm-software-management/rpm/discussions/3195
Signed-off-by: Shreenidhi Shedi <shreenidhi.shedi@broadcom.com>
---
platform.in | 2 --
scripts/CMakeLists.txt | 2 +-
scripts/brp-elfperms | 13 -------------
3 files changed, 1 insertion(+), 16 deletions(-)
delete mode 100755 scripts/brp-elfperms
diff --git a/platform.in b/platform.in
index 2e7c6b50a7..30ce585b8b 100644
--- a/platform.in
+++ b/platform.in
@@ -80,12 +80,10 @@
%__brp_strip %{_rpmconfigdir}/brp-strip %{__strip}
%__brp_strip_comment_note %{_rpmconfigdir}/brp-strip-comment-note %{__strip} %{__objdump}
%__brp_strip_static_archive %{_rpmconfigdir}/brp-strip-static-archive %{__strip}
-%__brp_elfperms %{_rpmconfigdir}/brp-elfperms
%__brp_remove_la_files %{_rpmconfigdir}/brp-remove-la-files
%__os_install_post \
%{?__brp_compress} \
- %{?__brp_elfperms} \
%{?__brp_strip} \
%{?__brp_strip_static_archive} \
%{?__brp_strip_comment_note} \
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index cc9d84e5cf..e449f3e716 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -1,7 +1,7 @@
install(PROGRAMS gendiff TYPE BIN)
install(PROGRAMS
brp-compress brp-strip brp-strip-comment-note
- brp-strip-static-archive brp-elfperms brp-remove-la-files
+ brp-strip-static-archive brp-remove-la-files
check-files check-prereqs
check-buildroot check-rpaths check-rpaths-worker
find-lang.sh find-requires find-provides
diff --git a/scripts/brp-elfperms b/scripts/brp-elfperms
deleted file mode 100755
index 0749f36a5e..0000000000
--- a/scripts/brp-elfperms
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# If using normal root, avoid changing anything.
-if [ -z "$RPM_BUILD_ROOT" ] || [ "$RPM_BUILD_ROOT" = "/" ]; then
- exit 0
-fi
-
-ELFCLASSIFY=/usr/bin/eu-elfclassify
-
-[ -x ${ELFCLASSIFY} ] || exit 0
-
-# Strip executable bits from ELF DSO's which are not actually executable
-find "$RPM_BUILD_ROOT" -type f \( -perm -0100 -or -perm -0010 -or -perm -0001 \) | ${ELFCLASSIFY} --shared --print0 --stdin | xargs -0 -r chmod a-x
-

5
SPECS/rpm/rpm.spec
View File

@ -3,7 +3,7 @@
Summary: Package manager
Name: rpm
Version: 4.19.1.1
Release: 2%{?dist}
Release: 3%{?dist}
License: GPLv2+
URL: http://rpm.org
Group: Applications/System
@ -25,6 +25,7 @@ Patch2: 0003-wait-for-lock.patch
Patch3: 0004-migrate-rpmdb.patch
Patch4: 0005-dilute-user-group-requires.patch
Patch5: 0006-disable-sysusers.patch
Patch6: 0007-remove-brp-elfperms-script.patch
Requires: bash
Requires: zstd-libs
@ -368,6 +369,8 @@ rm -rf %{buildroot}
%{_docdir}/%{name}/*.md
%changelog
* Mon Oct 14 2024 Shreenidhi Shedi <shreenidhi.shedi@broadcom.com> 4.19.1.1-3
- Remove brp-elfperms script
* Tue Aug 06 2024 Shreenidhi Shedi <shreenidhi.shedi@broadcom.com> 4.19.1.1-2
- Bump version as a part of nss upgrade
* Sun Jun 16 2024 Shreenidhi Shedi <shreenidhi.shedi@broadcom.com> 4.19.1.1-1

6
SPECS/rubygem-http-parser/rubygem-http-parser.spec
View File

@ -3,7 +3,7 @@
Name: rubygem-http-parser
Version: 1.2.3
Release: 3%{?dist}
Release: 4%{?dist}
Summary: An easy-to-use client library for making requests from Ruby.
Group: Development/Libraries
Vendor: VMware, Inc.
@ -20,8 +20,6 @@ BuildRequires: rubygem-ffi-compiler
Requires: rubygem-ffi-compiler
Requires: ruby
BuildArch: noarch
%description
An easy-to-use client library for making requests from Ruby. It uses a simple
method chaining system for building requests, similar to Python's Requests.
@ -40,6 +38,8 @@ method chaining system for building requests, similar to Python's Requests.
%{gem_base}
%changelog
* Mon Oct 14 2024 Shreenidhi Shedi <shreenidhi.shedi@broadcom.com> 1.2.3-4
- Remove noarch
* Tue Apr 30 2024 Shivani Agarwal <shivani.agarwal@broadcom.com> 1.2.3-3
- Add gem macros
* Wed Feb 28 2024 Shivani Agarwal <shivani.agarwal@broadcom.com> 1.2.3-2

6
SPECS/rubygem-io-event/rubygem-io-event.spec
View File

@ -3,7 +3,7 @@
Name: rubygem-io-event
Version: 1.4.4
Release: 2%{?dist}
Release: 3%{?dist}
Summary: An event loop.
Group: Development/Libraries
Vendor: VMware, Inc.
@ -18,8 +18,6 @@ BuildRequires: ruby-devel
Requires: ruby
BuildArch: noarch
%description
Provides low level cross-platform primitives for constructing
event loops, with support for select, kqueue, epoll and io_uring.
@ -38,6 +36,8 @@ event loops, with support for select, kqueue, epoll and io_uring.
%{gem_base}
%changelog
* Mon Oct 14 2024 Shreenidhi Shedi <shreenidhi.shedi@broadcom.com> 1.4.4-3
- Remove noarch
* Tue Apr 30 2024 Shivani Agarwal <shivani.agarwal@broadcom.com> 1.4.4-2
- Add gem macros
* Mon Feb 26 2024 Shivani Agarwal <shivani.agarwal@broadcom.com> 1.4.4-1

6
SPECS/rubygem-llhttp-ffi/rubygem-llhttp-ffi.spec
View File

@ -3,7 +3,7 @@
Name: rubygem-llhttp-ffi
Version: 0.5.0
Release: 2%{?dist}
Release: 3%{?dist}
Summary: An easy-to-use client library for making requests from Ruby.
Group: Development/Libraries
Vendor: VMware, Inc.
@ -25,8 +25,6 @@ Requires: rubygem-http-parser
Requires: rubygem-ffi-compiler
Requires: ruby
BuildArch: noarch
%description
An easy-to-use client library for making requests from Ruby. It uses a simple
method chaining system for building requests, similar to Python's Requests.
@ -45,6 +43,8 @@ method chaining system for building requests, similar to Python's Requests.
%{gem_base}
%changelog
* Mon Oct 14 2024 Shreenidhi Shedi <shreenidhi.shedi@broadcom.com> 0.5.0-3
- Remove noarch
* Tue Apr 30 2024 Shivani Agarwal <shivani.agarwal@broadcom.com> 0.5.0-2
- Add gem macros
* Mon Feb 26 2024 Shivani Agarwal <shivani.agarwal@broadcom.com> 0.5.0-1