libostree: update to 2022.4.

This commit is contained in:
Duncaen 2022-06-29 21:13:06 +02:00
parent 0a8176dc2d
commit 47ab26eca4
No known key found for this signature in database
GPG Key ID: 335C1D17EC3D6E35
3 changed files with 20 additions and 6 deletions

View File

@ -0,0 +1,12 @@
glibc's and musl's strerror for EOVERFLOW are different...
--- a/tests/test-commit-timestamp.sh
+++ b/tests/test-commit-timestamp.sh
@@ -40,6 +40,6 @@
${CMD_PREFIX} ostree --repo=./testrepo show env > show-env.txt
rm -rf testrepo testrepo-files
assert_file_has_content_literal commit-invalid.txt 'Failed to convert SOURCE_DATE_EPOCH'
-assert_file_has_content_literal commit-overflowing.txt 'Parsing SOURCE_DATE_EPOCH: Numerical result out of range'
+assert_file_has_content_literal commit-overflowing.txt 'Parsing SOURCE_DATE_EPOCH:'
assert_file_has_content_literal show-env.txt 'Date: 2009-02-13 23:31:30 +0000'
echo "ok commit with env timestamp"

View File

@ -1,10 +1,8 @@
--- a/config.h.in
+++ b/config.h.in
@@ -154,3 +154,13 @@
@@ -1,5 +1,15 @@
/* config.h.in. Generated from configure.ac by autoheader. */
/* Define to 1 if you need to in order for `stat' and other things to work. */
#undef _POSIX_SOURCE
+
+/* taken from glibc unistd.h and fixes musl */
+#ifndef TEMP_FAILURE_RETRY
+#define TEMP_FAILURE_RETRY(expression) \
@ -14,3 +12,7 @@
+ while (__result == -1L && errno == EINTR); \
+ __result; }))
+#endif
+
/* Define if we are building with asan and ubsan */
#undef BUILDOPT_ASAN

View File

@ -1,6 +1,6 @@
# Template file for 'libostree'
pkgname=libostree
version=2021.2
version=2022.4
revision=1
build_style=gnu-configure
build_helper="gir"
@ -19,7 +19,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=854008e7c71d44f6b3670f0e9b8500db0f08ff8b297d0b30a7cb9a66f34c5d7c
checksum=14bbd351a95066f68c3b283e0bd0ddd03562e862af66f6f6d894c6c328d7eb81
build_options="gir"
build_options_default="gir"