import CS redhat-rpm-config-208-1.el9

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

SPECS/redhat-rpm-config.spec

@@ -6,7 +6,7 @@
 
 Summary: Red Hat specific rpm configuration files
 Name: redhat-rpm-config
-Version: 207
+Version: 208
 Release: 1%{?dist}
 # No version specified.
 License: GPL+
@@ -254,6 +254,10 @@ 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)
+
 * Thu Jan 18 2024 Miro Hrončok <mhroncok@redhat.com> - 207-1
 - brp-python-bytecompile: Pass --invalidation-mode=timestamp to compileall
 - Resolves: RHEL-22139