ostree: update to 2023.4.

This commit is contained in:
Duncaen 2023-06-22 12:56:35 +02:00
parent be92627bc1
commit 346f84e808
No known key found for this signature in database
GPG key ID: 335C1D17EC3D6E35
3 changed files with 16 additions and 33 deletions

View file

@ -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 */

View file

@ -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 */

View file

@ -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"