Cherry pick patch to fix flatpak

This commit is contained in:
Colin Walters 2023-06-26 05:43:22 -04:00
parent 32b1dcb62f
commit 1cbfdfc2b5
2 changed files with 44 additions and 1 deletions

View File

@ -0,0 +1,38 @@
From 15bb7c8d531c24a144c1b7e3f85322ebf4f25be6 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@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

View File

@ -8,11 +8,13 @@
Summary: Tool for managing bootable, immutable filesystem trees
Name: ostree
Version: 2023.4
Release: 1%{?dist}
Release: 2%{?dist}
Source0: https://github.com/ostreedev/%{name}/releases/download/v%{version}/libostree-%{version}.tar.xz
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
@ -169,6 +171,9 @@ find %{buildroot} -name '*.la' -delete
%endif
%changelog
* Mon Jun 26 2023 Colin Walters <walters@verbum.org> - 2023.4-2
- Cherry pick patch to fix flatpak
* Tue Jun 20 2023 Colin Walters <walters@verbum.org> - 2023.4-1
- https://github.com/ostreedev/ostree/releases/tag/v2023.4