From 4dec5fc0cf5bb712110402326d6908a50fc745cb Mon Sep 17 00:00:00 2001
From: MSVSphere Packaging Team <packager@msvsphere-os.ru>
Date: Thu, 28 Mar 2024 18:26:12 +0300
Subject: [PATCH] import redhat-rpm-config-207-1.el9

---
 SOURCES/brp-llvm-compile-lto-elf |  6 ++++--
 SOURCES/brp-python-bytecompile   |  2 +-
 SOURCES/redhat-hardened-cc1      |  3 +++
 SPECS/redhat-rpm-config.spec     | 23 ++++++++++++++++++++++-
 4 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/SOURCES/brp-llvm-compile-lto-elf b/SOURCES/brp-llvm-compile-lto-elf
index 7eb53a1..1756651 100755
--- a/SOURCES/brp-llvm-compile-lto-elf
+++ b/SOURCES/brp-llvm-compile-lto-elf
@@ -48,5 +48,7 @@ check_convert_bitcode () {
 
 echo "Checking for LLVM bitcode artifacts"
 export -f check_convert_bitcode
-find "$RPM_BUILD_ROOT" -type f -name "*.[ao]" -print0 | \
-  xargs -0 -r -n1 -P$NCPUS sh -c "check_convert_bitcode \$@ $CLANG_FLAGS" ARG0
+# Deduplicate by device:inode to avoid processing hardlinks in parallel.
+find "$RPM_BUILD_ROOT" -type f -name "*.[ao]" -printf "%D:%i %p\n" | \
+  awk '!seen[$1]++' | cut -d" " -f2- | \
+  xargs -d"\n" -r -n1 -P$NCPUS sh -c "check_convert_bitcode \$@ $CLANG_FLAGS" ARG0
diff --git a/SOURCES/brp-python-bytecompile b/SOURCES/brp-python-bytecompile
index ead7022..4f587d4 100755
--- a/SOURCES/brp-python-bytecompile
+++ b/SOURCES/brp-python-bytecompile
@@ -57,7 +57,7 @@ function python_bytecompile()
 		# -x and -e together implements the same functionality as the Filter class below
 		# -s strips $RPM_BUILD_ROOT from the path
 		# -p prepends the leading slash to the path to make it absolute
-		$python_binary -B $options -m compileall -q -f $exclude -s $RPM_BUILD_ROOT -p / -e $RPM_BUILD_ROOT $python_libdir
+		$python_binary -B $options -m compileall -q -f $exclude -s $RPM_BUILD_ROOT -p / -e $RPM_BUILD_ROOT --invalidation-mode=timestamp $python_libdir
 
 	#
 	# Python 3.4 and higher
diff --git a/SOURCES/redhat-hardened-cc1 b/SOURCES/redhat-hardened-cc1
index fc54bcb..a369517 100644
--- a/SOURCES/redhat-hardened-cc1
+++ b/SOURCES/redhat-hardened-cc1
@@ -1,2 +1,5 @@
 *cc1_options:
 + %{!r:%{!fpie:%{!fPIE:%{!fpic:%{!fPIC:%{!fno-pic:-fPIE}}}}}}
+
+*cpp_options:
++ %{!r:%{!fpie:%{!fPIE:%{!fpic:%{!fPIC:%{!fno-pic:-fPIE}}}}}}
diff --git a/SPECS/redhat-rpm-config.spec b/SPECS/redhat-rpm-config.spec
index e2e9cf3..4213663 100644
--- a/SPECS/redhat-rpm-config.spec
+++ b/SPECS/redhat-rpm-config.spec
@@ -6,7 +6,7 @@
 
 Summary: Red Hat specific rpm configuration files
 Name: redhat-rpm-config
-Version: 201
+Version: 207
 Release: 1%{?dist}
 # No version specified.
 License: GPL+
@@ -129,6 +129,7 @@ Requires: %{_bindir}/xargs
 
 # for brp-llvm-compile-lto-elf
 Requires: (llvm if clang)
+Requires: (gawk if clang)
 
 # -fstack-clash-protection and -fcf-protection require GCC 8.
 Conflicts: gcc < 8.0.1-0.22
@@ -253,6 +254,26 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora/srpm forge.lua
 %doc buildflags.md
 
 %changelog
+* Thu Jan 18 2024 Miro Hrončok <mhroncok@redhat.com> - 207-1
+- brp-python-bytecompile: Pass --invalidation-mode=timestamp to compileall
+- Resolves: RHEL-22139
+
+* Mon Oct 02 2023 Nikita Popov <npopov@redhat.com> - 206-1
+- Use correct format specifier in brp-llvm-compile-lto-elf
+
+* Fri Sep 29 2023 Nikita Popov <npopov@redhat.com> - 205-1
+- Fix the fix for brp-llvm-compile-lto-elf
+
+* Tue Sep 26 2023 Florian Weimer <fweimer@redhat.com> - 204-1
+- Enable PIC mode for assembler files (RHEL-6298)
+
+* Wed Sep 13 2023 Florian Weimer <fweimer@redhat.com> - 203-1
+- Rebuild against more recent downstream branch (#2234024)
+
+* Fri Aug 25 2023 Nikita Popov <npopov@redhat.com> - 202-1
+- Fix brp-llvm-compile-lto-elf parallelism with hardlinks
+- Resolves: rhbz#2234024
+
 * Mon May 08 2023 Nikita Popov <npopov@redhat.com> - 201-1
 - Add llvm dependency if clang toolchain used
 - Resolves: rhbz#2193406