diff --git a/.gitignore b/.gitignore index e69de29..baf56a9 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/rpm-ostree-2024.3.tar.xz diff --git a/.rpm-ostree.metadata b/.rpm-ostree.metadata new file mode 100644 index 0000000..70ef8b8 --- /dev/null +++ b/.rpm-ostree.metadata @@ -0,0 +1 @@ +dc6e0ea9f33f162b5ca2d1ea1cb79ec7f9f7d71c SOURCES/rpm-ostree-2024.3.tar.xz diff --git a/SOURCES/0001-cliwrap-rpm-mark-eval-E-as-safe.patch b/SOURCES/0001-cliwrap-rpm-mark-eval-E-as-safe.patch new file mode 100644 index 0000000..ae137d0 --- /dev/null +++ b/SOURCES/0001-cliwrap-rpm-mark-eval-E-as-safe.patch @@ -0,0 +1,56 @@ +From d02993e30078db2a04820065ccbf22bd56d0d064 Mon Sep 17 00:00:00 2001 +From: Jonathan Lebon +Date: Thu, 22 Feb 2024 14:44:50 -0500 +Subject: [PATCH] cliwrap/rpm: mark `--eval`/`-E` as safe + +This is sometimes used in scripts to query aspects of the host system. +E.g. this is used by Fedora's pkg-config: + +https://src.fedoraproject.org/rpms/pkgconf/blob/95c0bbee/f/pkg-config.in#_6 + +This in turn gets hit by kdump which runs dracut which has modules that +runs `pkgconf` to query some directory paths. +--- + rust/src/cliwrap/rpm.rs | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) + +diff --git a/rust/src/cliwrap/rpm.rs b/rust/src/cliwrap/rpm.rs +index c6ed5901..3332f76c 100644 +--- a/rust/src/cliwrap/rpm.rs ++++ b/rust/src/cliwrap/rpm.rs +@@ -19,6 +19,12 @@ fn new_rpm_app() -> Command { + .long("version") + .action(clap::ArgAction::Version), + ) ++ .arg( ++ Arg::new("eval") ++ .long("eval") ++ .short('E') ++ .action(clap::ArgAction::Set), ++ ) + .arg( + Arg::new("package") + .help("package") +@@ -130,6 +136,19 @@ mod tests { + Ok(()) + } + ++ #[test] ++ fn test_eval() -> Result<()> { ++ assert_eq!( ++ disposition(SystemHostType::OstreeHost, &["-E", "%{_target_cpu}"])?, ++ RunDisposition::Ok ++ ); ++ assert_eq!( ++ disposition(SystemHostType::OstreeHost, &["--eval=%{_target_cpu}}"])?, ++ RunDisposition::Ok ++ ); ++ Ok(()) ++ } ++ + #[test] + fn test_query_file() -> Result<()> { + assert_eq!( +-- +2.43.2 + diff --git a/SOURCES/rpm-ostree-2023.3.tar.xz b/SOURCES/rpm-ostree-2023.3.tar.xz deleted file mode 100644 index b64cefe..0000000 Binary files a/SOURCES/rpm-ostree-2023.3.tar.xz and /dev/null differ diff --git a/SPECS/rpm-ostree.spec b/SPECS/rpm-ostree.spec index 928a445..516dc3d 100644 --- a/SPECS/rpm-ostree.spec +++ b/SPECS/rpm-ostree.spec @@ -3,7 +3,7 @@ Summary: Hybrid image/package system Name: rpm-ostree -Version: 2023.3 +Version: 2024.3 Release: 1%{?dist} License: LGPLv2+ URL: https://github.com/coreos/rpm-ostree @@ -11,16 +11,14 @@ URL: https://github.com/coreos/rpm-ostree # in the upstream git. It also contains vendored Rust sources. Source0: https://github.com/coreos/rpm-ostree/releases/download/v%{version}/rpm-ostree-%{version}.tar.xz +Patch0: 0001-cliwrap-rpm-mark-eval-E-as-safe.patch + ExclusiveArch: %{rust_arches} BuildRequires: make -%if 0%{?rhel} && !0%{?eln} -BuildRequires: rust-toolset -%else BuildRequires: rust-packaging BuildRequires: cargo BuildRequires: rust -%endif # Enable ASAN + UBSAN %bcond_with sanitizers @@ -43,7 +41,7 @@ BuildRequires: rust %endif # For the autofiles bits below -BuildRequires: /usr/bin/python3 +BuildRequires: python3-devel # We always run autogen.sh BuildRequires: autoconf automake libtool git # For docs @@ -204,8 +202,8 @@ for line in sys.argv[1:]: else: sys.stderr.write('{0} did not match any files\n'.format(line)) EOF -PYTHON=python3 -if ! test -x /usr/bin/python3; then +PYTHON='%{python3}' +if ! test -x '%{python3}'; then PYTHON=python2 fi $PYTHON autofiles.py > files \ @@ -241,6 +239,55 @@ $PYTHON autofiles.py > files.devel \ %files devel -f files.devel %changelog +* Sun Feb 25 2024 Joseph Marrero - 2024.3-1 +- https://github.com/coreos/rpm-ostree/releases/tag/v2024.3 + Backport https://github.com/coreos/rpm-ostree/commit/fe586621e5014d14f92b913338171a02ed29e6cc + Resolves: #RHEL-26186 + +* Wed Jan 24 2024 Joseph Marrero - 2024.2-1 +- https://github.com/coreos/rpm-ostree/releases/tag/v2024.2 + Resolves: #RHEL-11294 + +* Wed Jan 03 2024 Colin Walters - 2024.1-2 +- https://github.com/coreos/rpm-ostree/releases/tag/v2024.1 + Resolves: #RHEL-11294 + +* Mon Dec 18 2023 Joseph Marrero - 2023.12-1 +- https://github.com/coreos/rpm-ostree/releases/tag/v2023.12 + Resolves: #RHEL-11294 + +* Wed Dec 13 2023 Joseph Marrero - 2023.11-1 +- https://github.com/coreos/rpm-ostree/releases/tag/v2023.11 + Resolves: #RHEL-11294 + +* Thu Oct 05 2023 Joseph Marrero - 2023.8-3 +- Use python macros and devel package + Resolves: #RHEL-11892 + +* Mon Oct 02 2023 Colin Walters - 2023.8-2 +- https://github.com/coreos/rpm-ostree/releases/tag/v2023.8 + https://issues.redhat.com/browse/RHEL-11294 + +* Sat Aug 26 2023 Joseph Marrero - 2023.7-1 +- https://github.com/coreos/rpm-ostree/releases/tag/v2023.7 + Resolves: rhbz#2234352 + +* Fri Aug 25 2023 Joseph Marrero - 2023.6-1 +- https://github.com/coreos/rpm-ostree/releases/tag/v2023.6 + Resolves: rhbz#2234352 + +* Fri Jul 21 2023 Colin Walters - 2023.5-2 +- Backport https://github.com/coreos/rpm-ostree/pull/4510 + Related: rhbz#2224081 + +* Thu Jun 22 2023 Joseph Marrero - 2023.5-1 +- https://github.com/coreos/rpm-ostree/releases/tag/v2023.5 + Resolves: rhbz#2216811 + +* Tue Jun 13 2023 Joseph Marrero - 2023.4-1 +- https://github.com/coreos/rpm-ostree/releases/tag/v2023.4 + Resolves: rhbz#2211486 + * Mon Apr 24 2023 Joseph Marrero - 2023.3-1 - https://github.com/coreos/rpm-ostree/releases/tag/v2023.3 Resolves: rhbz#2189315