diff options
| -rw-r--r-- | testing/s3fs-fuse/APKBUILD | 9 | ||||
| -rw-r--r-- | testing/s3fs-fuse/define-SEEK.patch | 22 |
2 files changed, 3 insertions, 28 deletions
diff --git a/testing/s3fs-fuse/APKBUILD b/testing/s3fs-fuse/APKBUILD index f2684467722..bf545782e41 100644 --- a/testing/s3fs-fuse/APKBUILD +++ b/testing/s3fs-fuse/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Steeve Chailloux <steeve.chailloux@orus.io> # Maintainer: Steeve Chailloux <steeve.chailloux@orus.io> pkgname=s3fs-fuse -pkgver=1.87 +pkgver=1.88 pkgrel=0 pkgdesc="FUSE-based file system backed by Amazon S3" options="!check" # Fails to connect to localhost @@ -12,9 +12,7 @@ depends="fuse" makedepends="automake autoconf libxml2-dev fuse-dev curl-dev git bash" checkdepends="coreutils sed" subpackages="$pkgname-doc" -source="$pkgname-$pkgver.tar.gz::https://github.com/s3fs-fuse/s3fs-fuse/archive/v$pkgver.tar.gz - define-SEEK.patch - " +source="$pkgname-$pkgver.tar.gz::https://github.com/s3fs-fuse/s3fs-fuse/archive/v$pkgver.tar.gz" prepare() { default_prepare @@ -40,5 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="654e96f080423b79403f31380157d3410f4f253648e6f024c271e3b48ec814c3373caf375ea6365e47f36b62cf602c9de1ab75b8e24d99dd37b19c158b12e5e1 s3fs-fuse-1.87.tar.gz -31db7e7f31da53bb56a8cf51e246aef838e520375a39ae4517fe6af5a5a5fc3c092f6df63e9bfa59f3231a51dc1521aa2ae0881f9421da8324c1cd46a519b6f1 define-SEEK.patch" +sha512sums="e4bee4aa7a49effe9c4087e5841a0e0787cb7553d7037e0096f681fd588e9b35dbf8f4687f71e3360e7cde12e6820787dfe7565f845790719150350e7c473604 s3fs-fuse-1.88.tar.gz" diff --git a/testing/s3fs-fuse/define-SEEK.patch b/testing/s3fs-fuse/define-SEEK.patch deleted file mode 100644 index 4cd975ee688..00000000000 --- a/testing/s3fs-fuse/define-SEEK.patch +++ /dev/null @@ -1,22 +0,0 @@ -Upstream: Not applicable -Reason: Fixes compilation with musl - -diff --git a/src/fdcache.cpp b/src/fdcache.cpp -index 6416b01..30e5a50 100644 ---- a/src/fdcache.cpp -+++ b/src/fdcache.cpp -@@ -47,6 +47,14 @@ - #include "curl.h" - #include "fdcache.h" - -+// Taken from toybox portability -+// Introduced in Linux 3.1 -+#ifndef SEEK_DATA -+#define SEEK_DATA 3 -+#endif -+#ifndef SEEK_HOLE -+#define SEEK_HOLE 4 -+#endif - using namespace std; - - //------------------------------------------------ |