From 5fa9b27391696a3ec6943c26537d49580ff46a79 Mon Sep 17 00:00:00 2001
From: psykose <alice@ayaya.dev>
Date: Sat, 25 Jun 2022 18:43:20 +0000
Subject: [PATCH] testing/libeatmydata: upgrade to 130
closes #13957
---
testing/libeatmydata/18.patch | 26 ------------------------
testing/libeatmydata/APKBUILD | 20 +++++-------------
testing/libeatmydata/autoconf-2.71.patch | 12 -----------
3 files changed, 5 insertions(+), 53 deletions(-)
delete mode 100644 testing/libeatmydata/18.patch
delete mode 100644 testing/libeatmydata/autoconf-2.71.patch
diff --git a/testing/libeatmydata/18.patch b/testing/libeatmydata/18.patch
deleted file mode 100644
index 9858ac40ad94..000000000000
--- a/testing/libeatmydata/18.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Upstream: https://github.com/stewartsmith/libeatmydata/pull/18
-Reason: Libeatmydata redefines open and open64 so it can make those a NO_OP
-for tests. Musl also defines these in fnctl.h, so we have to undefine them
-to not get conflicting definitions
-diff --git a/libeatmydata/libeatmydata.c b/libeatmydata/libeatmydata.c
-index 8fe1b6a..95d940b 100644
---- a/libeatmydata/libeatmydata.c
-+++ b/libeatmydata/libeatmydata.c
-@@ -131,6 +131,8 @@ void LIBEATMYDATA_API sync(void)
- (*libc_sync)();
- }
-
-+#undef open
-+
- int LIBEATMYDATA_API open(const char* pathname, int flags, ...)
- {
- va_list ap;
-@@ -157,6 +159,8 @@ int LIBEATMYDATA_API open(const char* pathname, int flags, ...)
- return (*libc_open)(pathname,flags,mode);
- }
-
-+#undef open64
-+
- #ifndef __USE_FILE_OFFSET64
- int LIBEATMYDATA_API open64(const char* pathname, int flags, ...)
- {
diff --git a/testing/libeatmydata/APKBUILD b/testing/libeatmydata/APKBUILD
index 4ee571e85f0c..4e010ae80450 100644
--- a/testing/libeatmydata/APKBUILD
+++ b/testing/libeatmydata/APKBUILD
@@ -1,24 +1,15 @@
# Contributor: Rasmus Thomsen <oss@cogitri.dev>
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=libeatmydata
-pkgver=105
+pkgver=130
pkgrel=0
pkgdesc="An LD_PRELOAD library that disables all forms of writing data safely to disk"
url="https://www.flamingspork.com/projects/libeatmydata/"
arch="all"
license="GPL-3.0-or-later"
makedepends="autoconf automake libtool"
-checkdepends="strace"
-source="https://github.com/stewartsmith/libeatmydata/archive/libeatmydata-$pkgver/libeatmydata-$pkgver.tar.gz
- 18.patch
- autoconf-2.71.patch"
-builddir="$srcdir/$pkgname-$pkgname-$pkgver"
-
-prepare() {
- default_prepare
-
- autoreconf -fi
-}
+checkdepends="bash strace"
+source="https://github.com/stewartsmith/libeatmydata/releases/download/v$pkgver/libeatmydata-$pkgver.tar.gz"
build() {
./configure \
@@ -37,10 +28,9 @@ check() {
package() {
make DESTDIR="$pkgdir" install
+ rm "$pkgdir"/usr/lib/libeatmydata.a
}
sha512sums="
-225453a12913c08fd91371e3546a256e102438f9a88e7f51726dd5befbcf6c396850c039a38ca3d939558f0369df23d232e24b487564cdf86562645b8b5f92d6 libeatmydata-105.tar.gz
-8fff381b392cf7ee3faf39c41e20d3f152529ec4b2d4ffb503695ff8dce49b86872cbcc56001b2160b617ceb76bb4d1d389939922b1d539413a00fea35904b2a 18.patch
-4eff62d7d14e55e426d98b8ca7be006fd5fdbe8c5c9715d3edb7d8d28694f6827a972d568bfbd797cc2d88af28540c595a1a43102220ebd65059c1aad22958e0 autoconf-2.71.patch
+80edeee1b39e14d10e7d04d7fff63a233119c6e13216e92ec786cc41ecd79eb58937da0e621aaef697490e9fb285f3e1109b786ee6967fa1736bb4879e100f18 libeatmydata-130.tar.gz
"
diff --git a/testing/libeatmydata/autoconf-2.71.patch b/testing/libeatmydata/autoconf-2.71.patch
deleted file mode 100644
index 0238fc7e9a8b..000000000000
--- a/testing/libeatmydata/autoconf-2.71.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN libeatmydata-libeatmydata-105.orig/m4/pandora_canonical.m4 libeatmydata-libeatmydata-105/m4/pandora_canonical.m4
---- libeatmydata-libeatmydata-105.orig/m4/pandora_canonical.m4 2021-07-26 23:33:42.433846352 -0600
-+++ libeatmydata-libeatmydata-105/m4/pandora_canonical.m4 2021-07-26 23:34:18.850708125 -0600
-@@ -72,8 +72,6 @@
- ])
- ])
-
-- AC_CONFIG_MACRO_DIR([m4])
--
- m4_if(m4_substr(m4_esyscmd(test -d src && echo 0),0,1),0,[
- AC_CONFIG_HEADERS([src/config.h])
- ],[
--
GitLab