From 34881dad3551db9ff9f46b6c7c0a3b641affd08b Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Apr 05 2022 13:36:29 +0000 Subject: import redhat-rpm-config-129-1.el8 --- diff --git a/SOURCES/brp-mangle-shebangs b/SOURCES/brp-mangle-shebangs index fe28768..6a47b9f 100755 --- a/SOURCES/brp-mangle-shebangs +++ b/SOURCES/brp-mangle-shebangs @@ -93,7 +93,14 @@ while IFS= read -r line; do fi - read shebang_line < "$f" + if ! read shebang_line < "$f"; then + echo >&2 "*** WARNING: Cannot read the first line from $f, removing executable bit" + ts=$(stat -c %y "$f") + chmod -x "$f" + touch -d "$ts" "$f" + continue + fi + orig_shebang="${shebang_line#\#!}" if [ "$orig_shebang" = "$shebang_line" ]; then echo >&2 "*** WARNING: $f is executable but has no shebang, removing executable bit" diff --git a/SPECS/redhat-rpm-config.spec b/SPECS/redhat-rpm-config.spec index f6f0476..ccb7d83 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: 128 +Version: 129 Release: 1%{?dist} # No version specified. License: GPL+ @@ -210,6 +210,9 @@ install -p -m 755 %{SOURCE21} %{buildroot}%{_rpmconfigdir}/kabi.sh %{_rpmconfigdir}/macros.d/macros.kmp %changelog +* Wed Mar 23 2022 Michal Domonkos - 129-1 +- Fix handling of files without newlines in brp-mangle-shebang (#2063036) + * Wed Jan 05 2022 Eugene Syromiatnikov - 128-1 - modalias.prov: handle compressed kmods, sanitise alias/version strings (#1976000)