diff --git a/.gitignore b/.gitignore index 96d5b56..3194ad1 100644 --- a/.gitignore +++ b/.gitignore @@ -145,3 +145,4 @@ /rpm-ostree-2024.5.tar.xz /rpm-ostree-2024.6.tar.xz /rpm-ostree-2024.7.tar.xz +/rpm-ostree-2024.8.tar.xz diff --git a/0001-core-Fix-Coverity-WRAPPER_ESCAPE.patch b/0001-core-Fix-Coverity-WRAPPER_ESCAPE.patch deleted file mode 100644 index 79b8567..0000000 --- a/0001-core-Fix-Coverity-WRAPPER_ESCAPE.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 96ddae1acba59cf5249dcfff1157e44b5ed69650 Mon Sep 17 00:00:00 2001 -From: Colin Walters -Date: Thu, 15 Aug 2024 11:41:43 -0400 -Subject: [PATCH 1/1] core: Fix Coverity WRAPPER_ESCAPE - -This should fix: - -``` -32. rpm-ostree-2024.7/src/libpriv/rpmostree-core.cxx:1786:15: use_after_free: Using internal representation of destroyed object temporary of type "std::string". -``` - -Signed-off-by: Colin Walters ---- - src/libpriv/rpmostree-core.cxx | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/libpriv/rpmostree-core.cxx b/src/libpriv/rpmostree-core.cxx -index a2de7262..615e2636 100644 ---- a/src/libpriv/rpmostree-core.cxx -+++ b/src/libpriv/rpmostree-core.cxx -@@ -1782,7 +1782,8 @@ rpmostree_context_prepare (RpmOstreeContext *self, gboolean enable_filelists, - auto pkg = ""; - for (auto &pkg_str : packages) - { -- pkg = std::string (pkg_str).c_str (); -+ auto pkg_buf = std::string (pkg_str); -+ pkg = pkg_buf.c_str (); - char *query = strchr ((char *)pkg, '/'); - if (query) - { --- -2.46.0 - diff --git a/rpm-ostree.spec b/rpm-ostree.spec index 473e13c..f4ba596 100644 --- a/rpm-ostree.spec +++ b/rpm-ostree.spec @@ -3,7 +3,7 @@ Summary: Hybrid image/package system Name: rpm-ostree -Version: 2024.7 +Version: 2024.8 Release: %autorelease License: LGPL-2.0-or-later URL: https://github.com/coreos/rpm-ostree @@ -11,8 +11,6 @@ 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-core-Fix-Coverity-WRAPPER_ESCAPE.patch - ExclusiveArch: %{rust_arches} # ostree not on i686 for RHEL 10 @@ -140,7 +138,16 @@ Requires: librepo%{?_isa} >= %{librepo_version} # rpm-ostree wraps more of ostree (such as `ostree admin unlock` etc.) Requires: ostree Requires: bubblewrap +# We have been building with fuse but changed to fuse3 on: +# https://src.fedoraproject.org/rpms/rpm-ostree/c/3c602a23787fd2df873c0b18df3133c9fec4b66a +# However our code is just calling fuse's fusermount. +# We are updating our spec and code based on the discusion on: +# https://github.com/coreos/rpm-ostree/pull/5047 +%if %{defined rhel} && 0%{?rhel} < 10 Requires: fuse +%else +Requires: fuse3 +%endif # For container functionality # https://github.com/coreos/rpm-ostree/issues/3286 diff --git a/sources b/sources index 0657073..d516667 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpm-ostree-2024.7.tar.xz) = b74861d316929222479aa7751f6fcfe454fb9bb2ecaae3c54b25bf23140320efcc9a29e7e27ad62fd8e75e7f423bd26abbcd81d787506e83742c0455a75132e3 +SHA512 (rpm-ostree-2024.8.tar.xz) = 8639d63a575afa527a3f49516b1970566ed41e11501fe6cf898732c613d8319a449301d882d0b0bc45b9ef2d6b1c792809924f283773c09c6e82a512f107c05b