import CS ostree-2025.1-1.el9

.gitignore

@@ -1 +1 @@
-SOURCES/libostree-2024.7.tar.xz
+SOURCES/libostree-2025.1.tar.xz

.ostree.metadata

@@ -1 +1 @@
-7d1cb267442682402152ed4bb5379853e666f06b SOURCES/libostree-2024.7.tar.xz
+d1ad76514f2dcc673d1d6c38707b2f9cbd062632 SOURCES/libostree-2025.1.tar.xz

SOURCES/0001-repo-NUL-terminate-readlinkat-result.patch

@@ -1,52 +0,0 @@
-From 6756841a7d04c3cc651a1ce7de35c55c754578d3 Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters@verbum.org>
-Date: Mon, 29 Jul 2024 15:17:10 -0400
-Subject: [PATCH 1/1] repo: NUL terminate readlinkat result
-
-Coverity was correctly complaining about this.
-
-Signed-off-by: Colin Walters <walters@verbum.org>
----
- src/libostree/ostree-repo-commit.c | 11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/src/libostree/ostree-repo-commit.c b/src/libostree/ostree-repo-commit.c
-index 4d12d5ec..db83ebf2 100644
---- a/src/libostree/ostree-repo-commit.c
-+++ b/src/libostree/ostree-repo-commit.c
-@@ -794,7 +794,7 @@ _try_clone_from_payload_link (OstreeRepo *self, OstreeRepo *dest_repo, const cha
-       glnx_autofd int fdf = -1;
-       char loose_path_buf[_OSTREE_LOOSE_PATH_MAX];
-       char loose_path_target_buf[_OSTREE_LOOSE_PATH_MAX];
--      char target_buf[_OSTREE_LOOSE_PATH_MAX + _OSTREE_PAYLOAD_LINK_PREFIX_LEN];
-+      char target_buf[_OSTREE_LOOSE_PATH_MAX + _OSTREE_PAYLOAD_LINK_PREFIX_LEN + 1];
-       char target_checksum[OSTREE_SHA256_STRING_LEN + 1];
-       int dfd = dfd_searches[i];
-       ssize_t size;
-@@ -804,16 +804,21 @@ _try_clone_from_payload_link (OstreeRepo *self, OstreeRepo *dest_repo, const cha
-       _ostree_loose_path (loose_path_buf, payload_checksum, OSTREE_OBJECT_TYPE_PAYLOAD_LINK,
-                           self->mode);
- 
--      size = TEMP_FAILURE_RETRY (readlinkat (dfd, loose_path_buf, target_buf, sizeof (target_buf)));
-+      size = TEMP_FAILURE_RETRY (
-+          readlinkat (dfd, loose_path_buf, target_buf, sizeof (target_buf) - 1));
-       if (size < 0)
-         {
-           if (errno == ENOENT)
-             continue;
-           return glnx_throw_errno_prefix (error, "readlinkat");
-         }
-+      target_buf[size] = '\0';
- 
-+      const size_t expected_len = OSTREE_SHA256_STRING_LEN + _OSTREE_PAYLOAD_LINK_PREFIX_LEN;
-       if (size < OSTREE_SHA256_STRING_LEN + _OSTREE_PAYLOAD_LINK_PREFIX_LEN)
--        return glnx_throw (error, "invalid data size for %s", loose_path_buf);
-+        return glnx_throw (error, "invalid data size for %s; expected=%llu found=%llu",
-+                           loose_path_buf, (unsigned long long)expected_len,
-+                           (unsigned long long)size);
- 
-       snprintf (target_checksum, size, "%.2s%.62s", target_buf + _OSTREE_PAYLOAD_LINK_PREFIX_LEN,
-                 target_buf + _OSTREE_PAYLOAD_LINK_PREFIX_LEN + 3);
--- 
-2.45.2
-

SOURCES/ostree-readonly-sysroot-migration

@@ -5,6 +5,7 @@
 set -euo pipefail
 
 main() {
+
     # Used to condition execution of this unit at the systemd level
     local -r stamp_file="/var/lib/.ostree-readonly-sysroot"
 
@@ -42,6 +43,12 @@ main() {
 
     # Some deployments are still missing the rw karg. Let's try to update them
     if [[ "${boot_entries}" -ne "${rw_kargs_found}" ]]; then
+        # work around https://github.com/ostreedev/ostree/issues/2734#issuecomment-2353739450
+        stateroot=$(ls /ostree/deploy | head -n1)
+        if ls /boot/loader/entries/ostree-*-$stateroot.conf &>/dev/null; then
+            echo "Enabling bootloader naming workaround" 1>&2
+            export OSTREE_SYSROOT_OPTS=bootloader-naming-1
+        fi
         ostree admin kargs edit-in-place --append-if-missing=rw || \
             echo "Failed to edit kargs in place with ostree" 1>&2
     fi

SPECS/ostree.spec

@@ -7,14 +7,12 @@
 
 Summary: Tool for managing bootable, immutable filesystem trees
 Name: ostree
-Version: 2024.7
-Release: 2%{?dist}
+Version: 2025.1
+Release: 1%{?dist}
 Source0: https://github.com/ostreedev/%{name}/releases/download/v%{version}/libostree-%{version}.tar.xz
 Source1: ostree-readonly-sysroot-migration
 Source2: ostree-readonly-sysroot-migration.service
 
-Patch0: 0001-repo-NUL-terminate-readlinkat-result.patch
-
 License: LGPLv2+
 URL: https://ostree.readthedocs.io/en/latest/
 
@@ -181,6 +179,22 @@ find %{buildroot} -name '*.la' -delete
 %endif
 
 %changelog
+* Mon Jan 20 2025 Joseph Marrero <jmarrero@fedoraproject.org> - 2025.1-1
+- Rebase to https://github.com/ostreedev/ostree/releases/tag/v2025.1
+  Resolves: #RHEL-73827
+
+* Tue Nov 05 2024 Joseph Marrero <jmarrero@fedoraproject.org> - 2024.9-1
+- Rebase to https://github.com/ostreedev/ostree/releases/tag/v2024.9
+  Resolves: #RHEL-62769
+
+* Thu Oct 17 2024 Joseph Marrero <jmarrero@fedoraproject.org> - 2024.8-1
+- Rebase to https://github.com/ostreedev/ostree/releases/tag/v2024.8
+  Resolves: #RHEL-62769
+
+* Thu Sep 12 2024 Joseph Marrero <jmarrero@fedoraproject.org> - 2024.7-3
+- Rebuild to pickup changes to ostree-readonly-sysroot-migration
+  Resolves: #RHEL-58437
+
 * Wed Aug 14 2024 Joseph Marrero <jmarrero@fedoraproject.org> - 2024.7-2
 - Backport https://github.com/ostreedev/ostree/pull/3281
   Resolves: #RHEL-50680