From 87567950da750976d1252b9b6bf4319ee89ea50b Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Thu, 26 Dec 2024 03:31:43 +0300 Subject: [PATCH] import ostree-2024.9-1.el9_5 --- .gitignore | 2 +- .ostree.metadata | 2 +- ...repo-NUL-terminate-readlinkat-result.patch | 52 ------------------- SPECS/ostree.spec | 14 +++-- 4 files changed, 12 insertions(+), 58 deletions(-) delete mode 100644 SOURCES/0001-repo-NUL-terminate-readlinkat-result.patch diff --git a/.gitignore b/.gitignore index f32473c..0dec4a6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/libostree-2024.7.tar.xz +SOURCES/libostree-2024.9.tar.xz diff --git a/.ostree.metadata b/.ostree.metadata index 9672719..70d671f 100644 --- a/.ostree.metadata +++ b/.ostree.metadata @@ -1 +1 @@ -7d1cb267442682402152ed4bb5379853e666f06b SOURCES/libostree-2024.7.tar.xz +b37cd0e29ac24260c9082b3f62a9c3b21a46a505 SOURCES/libostree-2024.9.tar.xz diff --git a/SOURCES/0001-repo-NUL-terminate-readlinkat-result.patch b/SOURCES/0001-repo-NUL-terminate-readlinkat-result.patch deleted file mode 100644 index e2b2de7..0000000 --- a/SOURCES/0001-repo-NUL-terminate-readlinkat-result.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 6756841a7d04c3cc651a1ce7de35c55c754578d3 Mon Sep 17 00:00:00 2001 -From: Colin Walters -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 ---- - 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 - diff --git a/SPECS/ostree.spec b/SPECS/ostree.spec index 42133dc..8720106 100644 --- a/SPECS/ostree.spec +++ b/SPECS/ostree.spec @@ -7,14 +7,12 @@ Summary: Tool for managing bootable, immutable filesystem trees Name: ostree -Version: 2024.7 -Release: 3%{?dist} +Version: 2024.9 +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,14 @@ find %{buildroot} -name '*.la' -delete %endif %changelog +* Thu Nov 21 2024 Joseph Marrero - 2024.9-1 +- Rebase to 2024.9 + Resolves: #RHEL-68351 + +* Thu Oct 17 2024 Joseph Marrero - 2024.7-4 +- Backport https://github.com/ostreedev/ostree/pull/3300 + Resolves: #RHEL-62772 + * Thu Sep 12 2024 Joseph Marrero - 2024.7-3 - Rebuild to pickup changes to ostree-readonly-sysroot-migration Resolves: #RHEL-58437