summaryrefslogtreecommitdiff
path: root/app-arch/rpm/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2025-03-11 01:49:36 +0000
committerV3n3RiX <venerix@koprulu.sector>2025-03-11 01:49:36 +0000
commitcf7807d7aea23a99a144afceaba961cfed652b5f (patch)
treeffd2c781c27e0b7e72152a685a04938a2b7966f0 /app-arch/rpm/files
parent7c5ebaf83da4c538dd11b56fdd5dfdf39dcbc096 (diff)
gentoo auto-resync : 11:03:2025 - 01:49:36HEADmaster
Diffstat (limited to 'app-arch/rpm/files')
-rw-r--r--app-arch/rpm/files/rpm-4.19.0-libdir.patch13
-rw-r--r--app-arch/rpm/files/rpm-4.20.1-no-hardened.patch12
2 files changed, 12 insertions, 13 deletions
diff --git a/app-arch/rpm/files/rpm-4.19.0-libdir.patch b/app-arch/rpm/files/rpm-4.19.0-libdir.patch
deleted file mode 100644
index 9899827c985e..000000000000
--- a/app-arch/rpm/files/rpm-4.19.0-libdir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c164e9c52..5738c821f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -32,7 +32,7 @@ option(WITH_FSVERITY "Build with fsverity support" OFF)
- option(WITH_IMAEVM "Build with IMA support" OFF)
- option(WITH_FAPOLICYD "Build with fapolicyd support" ON)
-
--set(RPM_CONFIGDIR "${CMAKE_INSTALL_PREFIX}/lib/rpm" CACHE PATH "rpm home")
-+set(RPM_CONFIGDIR "${CMAKE_INSTALL_PREFIX}/libexec/rpm" CACHE PATH "rpm home")
- set(RPM_VENDOR "vendor" CACHE STRING "rpm vendor string")
-
- # Emulate libtool versioning. Before a public release:
diff --git a/app-arch/rpm/files/rpm-4.20.1-no-hardened.patch b/app-arch/rpm/files/rpm-4.20.1-no-hardened.patch
new file mode 100644
index 000000000000..ea5135c1dccd
--- /dev/null
+++ b/app-arch/rpm/files/rpm-4.20.1-no-hardened.patch
@@ -0,0 +1,12 @@
+Don't override Gentoo's default _FORTIFY_SOURCE.
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -426,7 +426,7 @@ if (ENABLE_ASAN OR ENABLE_UBSAN)
+ endif()
+
+ # try to ensure some compiler sanity and hardening options where supported
+-foreach (flag -fno-strict-overflow -fno-delete-null-pointer-checks -fhardened)
++foreach (flag -fno-strict-overflow -fno-delete-null-pointer-checks)
+ check_c_compiler_flag(${flag} found)
+ if (found)
+ add_compile_options(${flag})