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

SOURCES/brp-mangle-shebangs

@@ -137,10 +137,10 @@ while IFS= read -r line; do
   fi
 
   # Replace "special" env shebang:
-  # /whatsoever/env /whatever/foo → /whatever/foo
-  shebang=$(echo "$shebang" | sed -r -e 's@^(.+)/env /(.+)$@/\2@')
-  # /whatsoever/env foo → /whatsoever/foo
-  shebang=$(echo "$shebang" | sed -r -e 's@^(.+/)env (.+)$@\1\2@')
+  # /whatsoever/env -whatever /whatever/foo → /whatever/foo
+  shebang=$(echo "$shebang" | sed -r -e 's@^(.+)/env( -[^ ]+)* /(.+)$@/\3@')
+  # /whatsoever/env -whatever foo → /whatsoever/foo
+  shebang=$(echo "$shebang" | sed -r -e 's@^(.+/)env( -[^ ]+)* (.+)$@\1\3@')
 
   # If the shebang now starts with /bin, change it to /usr/bin
   # https://bugzilla.redhat.com/show_bug.cgi?id=1581757

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

SOURCES/dist.sh

@@ -25,7 +25,7 @@ function check_rhl {
 }
 
 function check_rhel {
-    egrep -q "(Enterprise|Advanced|CentOS)" $RELEASEFILE && echo $DISTNUM
+    egrep -q "(Enterprise|Advanced|CentOS|MSVSphere)" $RELEASEFILE && echo $DISTNUM
 }
 
 function check_fedora {

SOURCES/libsymlink.attr

@@ -1,5 +1,5 @@
 # Make libfoo.so symlinks require the soname-provide of the target library
 %__libsymlink_requires		%{_rpmconfigdir}/elfdeps --provides --soname-only
-%__libsymlink_magic		^symbolic link to .*lib.*\.so\..*$
-%__libsymlink_path	^.*\.so$
+%__libsymlink_magic		^symbolic link to .*lib.*\\.so\\..*$
+%__libsymlink_path	^.*\\.so$
 %__libsymlink_flags	magic_and_path

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}}}}}}

SPECS/redhat-rpm-config.spec

@@ -6,8 +6,8 @@
 
 Summary: Red Hat specific rpm configuration files
 Name: redhat-rpm-config
-Version: 201
-Release: 1%{?dist}
+Version: 208
+Release: 1%{?dist}.inferit
 # No version specified.
 License: GPL+
 URL: https://src.fedoraproject.org/rpms/redhat-rpm-config
@@ -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,33 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora/srpm forge.lua
 %doc buildflags.md
 
 %changelog
+* Fri Jul 19 2024 Michal Domonkos <mdomonko@redhat.com> - 208-1
+- brp-mangle-shebangs: Strip env flags when mangling shebangs (RHEL-26961)
+- Fix automatic soname requires on non-versioned symlink targets (RHEL-28767)
+
+* Tue Apr 02 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 207-1.inferit
+- Added MSVSphere detection support to dist.sh
+
+* 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
@@ -261,6 +289,9 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora/srpm forge.lua
 - Change clang LTO default to ThinLTO
 - Resolves: rhbz#2178788
 
+* Fri Apr 14 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 199-1
+- Rebuilt for MSVSphere 9.2 beta
+
 * Mon Feb 13 2023 Miro Hrončok <mhroncok@redhat.com> - 199-1
 - Add pyproject-srpm-macros to the default buildroot
 - Related: rhbz#2168193