Notification time stamped 2023-06-30 19:17:27 UTC
From acfa02e9d5ed425a697de86cff24ec0d2b861728 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters(a)verbum.org>
Date: Jun 30 2023 19:17:17 +0000
Subject:
https://github.com/ostreedev/ostree/releases/tag/v2023.5
---
diff --git a/.gitignore b/.gitignore
index c375452..b258220 100644
--- a/.gitignore
+++ b/.gitignore
@@ -100,3 +100,4 @@
/libostree-2023.2.tar.xz
/libostree-2023.3.tar.xz
/libostree-2023.4.tar.xz
+/libostree-2023.5.tar.xz
diff --git a/0001-Revert-fetcher-Always-open-tmpfiles-in-repo-location.patch
b/0001-Revert-fetcher-Always-open-tmpfiles-in-repo-location.patch
deleted file mode 100644
index fd40771..0000000
--- a/0001-Revert-fetcher-Always-open-tmpfiles-in-repo-location.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 15bb7c8d531c24a144c1b7e3f85322ebf4f25be6 Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters(a)verbum.org>
-Date: Mon, 26 Jun 2023 05:17:45 -0400
-Subject: [PATCH] Revert "fetcher: Always open tmpfiles in repo location"
-
-This reverts commit f7f6f87c513c9f35bc24f35e909779c19cb49d3a.
-
-This seems to have broken flatpak, so we'll revert and then
-investigate.
-
-Closes:
https://github.com/ostreedev/ostree/issues/2900
----
- src/libostree/ostree-fetcher-util.h | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/libostree/ostree-fetcher-util.h b/src/libostree/ostree-fetcher-util.h
-index 35f3e854..c3243801 100644
---- a/src/libostree/ostree-fetcher-util.h
-+++ b/src/libostree/ostree-fetcher-util.h
-@@ -35,8 +35,14 @@ static inline gboolean
- _ostree_fetcher_tmpf_from_flags (OstreeFetcherRequestFlags flags, int dfd, GLnxTmpfile
*tmpf,
- GError **error)
- {
-- if (!glnx_open_tmpfile_linkable_at (dfd, ".", O_RDWR | O_CLOEXEC, tmpf,
error))
-+ if ((flags & OSTREE_FETCHER_REQUEST_LINKABLE) > 0)
-+ {
-+ if (!glnx_open_tmpfile_linkable_at (dfd, ".", O_RDWR | O_CLOEXEC, tmpf,
error))
-+ return FALSE;
-+ }
-+ else if (!glnx_open_anonymous_tmpfile (O_RDWR | O_CLOEXEC, tmpf, error))
- return FALSE;
-+
- if (!glnx_fchmod (tmpf->fd, 0644, error))
- return FALSE;
- return TRUE;
---
-2.41.0
-
diff --git a/ostree.spec b/ostree.spec
index aa0fc3d..225cd61 100644
--- a/ostree.spec
+++ b/ostree.spec
@@ -7,14 +7,12 @@
Summary: Tool for managing bootable, immutable filesystem trees
Name: ostree
-Version: 2023.4
+Version: 2023.5
Release: 2%{?dist}
Source0:
https://github.com/ostreedev/%{name}/releases/download/v%{version}/libost...
License: LGPL-2.0-or-later
URL:
https://ostree.readthedocs.io/en/latest/
-Patch0: 0001-Revert-fetcher-Always-open-tmpfiles-in-repo-location.patch
-
BuildRequires: make
BuildRequires: git
# We always run autogen.sh
@@ -171,6 +169,9 @@ find %{buildroot} -name '*.la' -delete
%endif
%changelog
+* Fri Jun 30 2023 Colin Walters <walters(a)verbum.org> - 2023.5-2
+-
https://github.com/ostreedev/ostree/releases/tag/v2023.5
+
* Mon Jun 26 2023 Colin Walters <walters(a)verbum.org> - 2023.4-2
- Cherry pick patch to fix flatpak
diff --git a/sources b/sources
index c2b6fa1..3362907 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libostree-2023.4.tar.xz) =
7587732c6852843abd6e4ab0778399a3da868318eb536c1c8e7031bcc7d18ad033c3162e146da3dbdee1c468c4287721cf7421c6208dbd6a9383982e160a5e80
+SHA512 (libostree-2023.5.tar.xz) =
0bb19f199344d8db7299cf710f2ba0b2657cdcb5b1fc6d85446cef9538b069e470b47fc0c2c1029e12b8b9adb978f32a6f44f48949ff5c97a01051a425a9f2d5
https://src.fedoraproject.org/rpms/ostree/c/acfa02e9d5ed425a697de86cff24e...