From 2f7b881a49890a38c3b6a54ce0025068febc841c Mon Sep 17 00:00:00 2001
From: eabdullin <eabdullin@almalinux.org>
Date: Tue, 12 Sep 2023 13:02:45 +0000
Subject: [PATCH] import UBI ostree-2023.1-7.el9_2

---
 ...614a1ac1950ebde3df0e26cc9ab1d72b2f1f.patch | 27 +++++++++++++++++++
 SPECS/ostree.spec                             |  8 +++++-
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 SOURCES/0002-Backport-7f70614a1ac1950ebde3df0e26cc9ab1d72b2f1f.patch

diff --git a/SOURCES/0002-Backport-7f70614a1ac1950ebde3df0e26cc9ab1d72b2f1f.patch b/SOURCES/0002-Backport-7f70614a1ac1950ebde3df0e26cc9ab1d72b2f1f.patch
new file mode 100644
index 0000000..fff515d
--- /dev/null
+++ b/SOURCES/0002-Backport-7f70614a1ac1950ebde3df0e26cc9ab1d72b2f1f.patch
@@ -0,0 +1,27 @@
+From 3443baa6e63b36d169f57027d7e80df614592c8e Mon Sep 17 00:00:00 2001
+From: Joseph Marrero <jmarrero@redhat.com>
+Date: Fri, 4 Aug 2023 16:09:20 -0400
+Subject: [PATCH] Backport: 7f70614a1ac1950ebde3df0e26cc9ab1d72b2f1f
+
+---
+ src/libostree/ostree-sysroot-deploy.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c
+index 2454a587..4d6d796e 100644
+--- a/src/libostree/ostree-sysroot-deploy.c
++++ b/src/libostree/ostree-sysroot-deploy.c
+@@ -1613,9 +1613,8 @@ static void *
+ sync_in_thread (void *ptr)
+ {
+   SyncData *syncdata = ptr;
+-  // Ensure that the caller is blocked waiting
+-  g_mutex_lock (&syncdata->mutex);
+   sync ();
++  g_mutex_lock (&syncdata->mutex);
+   // Signal success
+   syncdata->success = true;
+   g_cond_broadcast (&syncdata->cond);
+-- 
+2.41.0
+
diff --git a/SPECS/ostree.spec b/SPECS/ostree.spec
index 2ad507d..0bf45ce 100644
--- a/SPECS/ostree.spec
+++ b/SPECS/ostree.spec
@@ -8,7 +8,7 @@
 Summary: Tool for managing bootable, immutable filesystem trees
 Name: ostree
 Version: 2023.1
-Release: 6%{?dist}
+Release: 7%{?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
@@ -17,6 +17,8 @@ Source2: ostree-readonly-sysroot-migration.service
 Patch0: 0001-commit-fix-ostree-deployment-on-64-bit-inode-fs.patch
 # https://github.com/ostreedev/ostree/pull/2946
 Patch1: 0001-Add-an-always-on-inode64-feature.patch
+# https://github.com/ostreedev/ostree/pull/2969
+Patch2: 0002-Backport-7f70614a1ac1950ebde3df0e26cc9ab1d72b2f1f.patch
 
 License: LGPLv2+
 URL: https://ostree.readthedocs.io/en/latest/
@@ -183,6 +185,10 @@ find %{buildroot} -name '*.la' -delete
 %endif
 
 %changelog
+* Wed Aug 08 2023 Joseph Marrero <jmarrero@fedoraproject.org> - 2023.1-7
+- Backport https://github.com/ostreedev/ostree/pull/2969/commits/402e04280b54c058ad47be99fe6a9326caf2ae00
+  Resolves: rhbz#2230111
+
 * Mon Jul 24 2023 Colin Walters <walters@verbum.org> - 2023.1-6
 - Resolves: rhbz#2224105