From 346f84e808c8d0cfd021cd4615a161458bfcc403 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 22 Jun 2023 12:56:35 +0200
Subject: [PATCH] ostree: update to 2023.4.

---
 srcpkgs/ostree/patches/missing-off-t.patch | 14 ++++++++++
 srcpkgs/ostree/patches/musl-fixes.patch    | 31 ----------------------
 srcpkgs/ostree/template                    |  4 +--
 3 files changed, 16 insertions(+), 33 deletions(-)
 create mode 100644 srcpkgs/ostree/patches/missing-off-t.patch
 delete mode 100644 srcpkgs/ostree/patches/musl-fixes.patch

diff --git a/srcpkgs/ostree/patches/missing-off-t.patch b/srcpkgs/ostree/patches/missing-off-t.patch
new file mode 100644
index 00000000000000..67864dc55c93ed
--- /dev/null
+++ b/srcpkgs/ostree/patches/missing-off-t.patch
@@ -0,0 +1,14 @@
+From https://git.alpinelinux.org/aports/tree/community/ostree/missing-off-t.patch
+diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c
+index 8fcd5e8..2454a58 100644
+--- a/src/libostree/ostree-sysroot-deploy.c
++++ b/src/libostree/ostree-sysroot-deploy.c
+@@ -2536,7 +2536,7 @@ get_kernel_layout_size (OstreeSysroot *self, OstreeDeployment *deployment, guint
+ /* This is a roundabout but more trustworthy way of doing a space check than
+  * relying on statvfs's f_bfree when you know the size of the objects. */
+ static gboolean
+-dfd_fallocate_check (int dfd, __off_t len, gboolean *out_passed, GError **error)
++dfd_fallocate_check (int dfd, off_t len, gboolean *out_passed, GError **error)
+ {
+   /* If the requested size is 0 then return early. Passing a 0 len to
+    * fallocate results in EINVAL */
diff --git a/srcpkgs/ostree/patches/musl-fixes.patch b/srcpkgs/ostree/patches/musl-fixes.patch
deleted file mode 100644
index e9a578a3e66637..00000000000000
--- a/srcpkgs/ostree/patches/musl-fixes.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/config.h.in
-+++ b/config.h.in
-@@ -1,5 +1,15 @@
- /* config.h.in.  Generated from configure.ac by autoheader.  */
- 
-+/* taken from glibc unistd.h and fixes musl */
-+#ifndef TEMP_FAILURE_RETRY
-+#define TEMP_FAILURE_RETRY(expression) \
-+  (__extension__                                                              \
-+    ({ long int __result;                                                     \
-+       do __result = (long int) (expression);                                 \
-+       while (__result == -1L && errno == EINTR);                             \
-+       __result; }))
-+#endif
-+
- /* Define if we are building with asan and ubsan */
- #undef BUILDOPT_ASAN
- 
---- a/src/libostree/ostree-repo-checkout.c
-+++ b/src/libostree/ostree-repo-checkout.c
-@@ -37,6 +37,10 @@
- 
- #define OVERLAYFS_WHITEOUT_PREFIX ".ostree-wh."
- 
-+#ifndef ALLPERMS
-+#define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO)/* 07777 */
-+#endif
-+
- /* Per-checkout call state/caching */
- typedef struct {
-   GString *path_buf; /* buffer for real path if filtering enabled */
diff --git a/srcpkgs/ostree/template b/srcpkgs/ostree/template
index 4eab7462e297bb..3d30742c6b8e6b 100644
--- a/srcpkgs/ostree/template
+++ b/srcpkgs/ostree/template
@@ -1,6 +1,6 @@
 # Template file for 'ostree'
 pkgname=ostree
-version=2023.3
+version=2023.4
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -20,7 +20,7 @@ license="LGPL-2.0-or-later"
 homepage="https://ostree.readthedocs.io/en/latest/"
 changelog="https://github.com/ostreedev/ostree/releases"
 distfiles="https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz"
-checksum=9c575a094da2c307769f0aee15de95470c3b5550cbff211fbbc4f6fc75f333b1
+checksum=7cee8ace6aae3c778527927a85abefbfbd491c021f52ae229c51ca3077f9c5d1
 
 build_options="gir"
 build_options_default="gir"