fix parsing of statetab files when it contains space characters

Resolves: RHEL-23313
This commit is contained in:
Jan Macku 2024-02-08 12:49:59 +01:00
parent 8ff618bee1
commit 657eb78655
4 changed files with 12 additions and 8 deletions

1
.gitignore vendored
View File

@ -53,3 +53,4 @@
/initscripts-10.11.3.tar.gz /initscripts-10.11.3.tar.gz
/initscripts-10.11.4.tar.gz /initscripts-10.11.4.tar.gz
/initscripts-10.11.5.tar.gz /initscripts-10.11.5.tar.gz
/initscripts-10.11.6.tar.gz

View File

@ -18,7 +18,7 @@ Requires: gawk \
Name: initscripts Name: initscripts
Summary: Basic support for legacy System V init scripts Summary: Basic support for legacy System V init scripts
Version: 10.11.5 Version: 10.11.6
Release: 1%{?dist} Release: 1%{?dist}
License: GPLv2 License: GPLv2
@ -397,6 +397,10 @@ fi
# ============================================================================= # =============================================================================
%changelog %changelog
* Thu Feb 08 2024 Jan Macku <jamacku@redhat.com> - 10.11.6-1
- Add -r to while read as per shellcheck
- Fix splitting spaces in paths from statetab files
* Wed Aug 24 2022 Jan Macku <jamacku@redhat.com> - 10.11.5-1 * Wed Aug 24 2022 Jan Macku <jamacku@redhat.com> - 10.11.5-1
- service: Exit when `/etc/init.d` is missing - service: Exit when `/etc/init.d` is missing

View File

@ -12,17 +12,16 @@
# immediately if something fails. # immediately if something fails.
set -e set -e
curl https://raw.githubusercontent.com/fedora-sysv/initscripts/master/initscripts.spec -o initscripts.spec || exit 1 curl https://raw.githubusercontent.com/fedora-sysv/initscripts/rhel9-branch/initscripts.spec -o initscripts.spec || exit 1
spectool -g initscripts.spec spectool -g initscripts.spec
# Make a local scratch build in mock first. If it fails, do not upload new tarball! # Make a local scratch build in mock first. If it fails, do not upload new tarball!
srpm_file="$(basename $(fedpkg srpm | grep -i "wrote" | cut -d ':' -f 2))" # srpm_file="$(basename $(centpkg srpm | grep -i "wrote" | cut -d ':' -f 2))"
arch="$(uname -p)" # arch="$(uname -p)"
# mock -r "fedora-rawhide-${arch}" "${srpm_file}" || exit 2
mock -r "fedora-rawhide-${arch}" "${srpm_file}" || exit 2
# Scratch build passed, the build should pass in Koji as well. Let's proceed: # Scratch build passed, the build should pass in Koji as well. Let's proceed:
fedpkg new-sources "$(basename $(spectool -S -l initscripts.spec | gawk '{print $2;}'))" || exit 3 centpkg new-sources "$(basename $(spectool -S -l initscripts.spec | gawk '{print $2;}'))" || exit 3
git add initscripts.spec git add initscripts.spec
git commit -m "$(grep Version initscripts.spec | gawk '{print $2;}')" git commit -m "$(grep Version initscripts.spec | gawk '{print $2;}')"

View File

@ -1 +1 @@
SHA512 (initscripts-10.11.5.tar.gz) = 77bf7d68925dc34063984db667b14a2c04490d496d16f553f6eab7dcb635c4617ac01ad88bc4420cb1566fae582fbb6dbf2269ff00ec81101c4aa2dd1a5a8a63 SHA512 (initscripts-10.11.6.tar.gz) = 59d625a64c4486a047287db7a32b1fae637abd3219dbeeaae188e3aa0a4e42b634514353ac4cccce8689dbd1067257d9f93ed8731c651d8bc8556908a4fe345b