From b43b2d54f694830326b2973bcceab188556ed069 Mon Sep 17 00:00:00 2001
From: MSVSphere Packaging Team <packager@msvsphere-os.ru>
Date: Wed, 8 Nov 2023 16:21:47 +0300
Subject: [PATCH] import ostree-2023.6-1.el9

---
 .gitignore                                    |  2 +-
 .ostree.metadata                              |  2 +-
 ...614a1ac1950ebde3df0e26cc9ab1d72b2f1f.patch | 27 -------------------
 SPECS/ostree.spec                             | 13 ++++-----
 4 files changed, 9 insertions(+), 35 deletions(-)
 delete mode 100644 SOURCES/0001-Backport-7f70614a1ac1950ebde3df0e26cc9ab1d72b2f1f.patch

diff --git a/.gitignore b/.gitignore
index c74a0ef..d302873 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/libostree-2023.5.tar.xz
+SOURCES/libostree-2023.6.tar.xz
diff --git a/.ostree.metadata b/.ostree.metadata
index 5c7ec2d..4099ae6 100644
--- a/.ostree.metadata
+++ b/.ostree.metadata
@@ -1 +1 @@
-6164b5a75cdb304c7049c9da05eba48a0c17b4be SOURCES/libostree-2023.5.tar.xz
+1f063c495ee29b92903c152fa410df96c80d5e25 SOURCES/libostree-2023.6.tar.xz
diff --git a/SOURCES/0001-Backport-7f70614a1ac1950ebde3df0e26cc9ab1d72b2f1f.patch b/SOURCES/0001-Backport-7f70614a1ac1950ebde3df0e26cc9ab1d72b2f1f.patch
deleted file mode 100644
index fff515d..0000000
--- a/SOURCES/0001-Backport-7f70614a1ac1950ebde3df0e26cc9ab1d72b2f1f.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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 83dd3fa..3054f05 100644
--- a/SPECS/ostree.spec
+++ b/SPECS/ostree.spec
@@ -1,4 +1,4 @@
-# Don't ship tests on RHEL > 7.
+# We haven't yet "productized" the tests
 %if 0%{?rhel} > 7
     %bcond_with tests
 %else
@@ -7,14 +7,12 @@
 
 Summary: Tool for managing bootable, immutable filesystem trees
 Name: ostree
-Version: 2023.5
+Version: 2023.6
 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-Backport-7f70614a1ac1950ebde3df0e26cc9ab1d72b2f1f.patch
-
 License: LGPLv2+
 URL: https://ostree.readthedocs.io/en/latest/
 
@@ -109,6 +107,7 @@ env NOCONFIGURE=1 ./autogen.sh
            --with-selinux \
            --with-curl \
            --with-openssl \
+           --with-composefs \
            %{?with_tests:--enable-installed-tests=exclusive} \
            --with-dracut=yesbutnoconf
 %make_build
@@ -143,7 +142,6 @@ find %{buildroot} -name '*.la' -delete
 %{_prefix}/lib/systemd/system-generators/ostree-system-generator
 %exclude %{_sysconfdir}/grub.d/*ostree
 %exclude %{_libexecdir}/libostree/grub2*
-%exclude %{_libexecdir}/libostree/ostree-trivial-httpd
 %{_prefix}/lib/tmpfiles.d/*
 %{_prefix}/lib/ostree
 # Moved in git master
@@ -176,10 +174,13 @@ find %{buildroot} -name '*.la' -delete
 %files tests
 %{_libexecdir}/installed-tests
 %{_datadir}/installed-tests
-%{_libexecdir}/libostree/ostree-trivial-httpd
 %endif
 
 %changelog
+* Fri Aug 25 2023 Joseph Marrero <jmarrero@fedoraproject.org> - 2023.6-1
+- https://github.com/ostreedev/ostree/releases/tag/v2023.6
+  Resolves: rhbz#2234351
+
 * Fri Aug 4 2023 Joseph Marrero <jmarrero@fedoraproject.org> - 2023.5-1
 - https://github.com/ostreedev/ostree/releases/tag/v2023.5
   backport: https://github.com/ostreedev/ostree/commit/7f70614a1ac1950ebde3df0e26cc9ab1d72b2f1f