diff options
| author | psykose <alice@ayaya.dev> | 2023-02-05 02:16:18 +0000 |
|---|---|---|
| committer | psykose <alice@ayaya.dev> | 2023-02-05 03:16:18 +0100 |
| commit | 703ed7b9bcbe6cec4a804a1b87bc26eaa47f5489 (patch) | |
| tree | 373cdbbe0a2897cb670650c2d9a7c075ccf57970 | |
| parent | 04f0d30ee27999a7899e170823126fb4f8ef09ea (diff) | |
| download | aports-703ed7b9bcbe6cec4a804a1b87bc26eaa47f5489.tar.gz aports-703ed7b9bcbe6cec4a804a1b87bc26eaa47f5489.tar.bz2 aports-703ed7b9bcbe6cec4a804a1b87bc26eaa47f5489.tar.xz | |
main/fuse3: upgrade to 3.13.1
| -rw-r--r-- | main/fuse3/APKBUILD | 16 | ||||
| -rw-r--r-- | main/fuse3/off-t.patch | 35 |
2 files changed, 6 insertions, 45 deletions
diff --git a/main/fuse3/APKBUILD b/main/fuse3/APKBUILD index 1ee1b974eb5..da06d68d47e 100644 --- a/main/fuse3/APKBUILD +++ b/main/fuse3/APKBUILD @@ -1,8 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=fuse3 -_pkgname=fuse -pkgver=3.13.0 -pkgrel=1 +pkgver=3.13.1 +pkgrel=0 pkgdesc="The reference implementation of the Linux FUSE (Filesystem in Userspace) interface" url="https://github.com/libfuse/libfuse" arch="all" @@ -28,13 +27,11 @@ subpackages=" fuse-openrc:_openrc " source="https://github.com/libfuse/libfuse/releases/download/fuse-$pkgver/fuse-$pkgver.tar.xz - off-t.patch fix-realpath.patch fuse.initd " options="suid !check" # check is currently broken: https://github.com/libfuse/libfuse/issues/293 - -builddir="$srcdir"/$_pkgname-$pkgver +builddir="$srcdir"/fuse-$pkgver # secfixes: # 3.2.5-r0: @@ -75,8 +72,8 @@ package() { _common() { pkgdesc="Common files for fuse2 and fuse3" - mkdir -p "$subpkgdir"/etc/ - mv "$pkgdir"/etc/fuse.conf "$subpkgdir"/etc/ + + amove etc/fuse.conf } _openrc() { @@ -85,8 +82,7 @@ _openrc() { } sha512sums=" -762262ed45b3e139481e39e7c7aae1df4347064fe100538138467f7567ae04f46fca19e6dac76f046cc07d2c4736f34ddb3780e067a48165e0d1fdd1153b66b1 fuse-3.13.0.tar.xz -33a723a9481f180be51370e434860d927b8d3fcf5a520e9496c15b7f4459d18decb576dea2c30c7acfec22ee723a55e88153915c2b74c10d0eb6e0eb909c5dd2 off-t.patch +7630e17a68d81e1ac66c9e8937bc9e1a99d8887d48639cbd5a96d04c7f687729dbab71a875d90bb77bdf361a154f195223f34c3438ab149630286bf87238c679 fuse-3.13.1.tar.xz 1a9e1d1e8a7b0778ffde328e4322c73b5d57ec98d52767c846d755cce861ab27989823a75b6c5f994432ddb77fa351dfa4a8f948c9467c5f7d5f471e4608358b fix-realpath.patch 7f6a503ef23cfa8b809c544375c2d83ad56525269b48ad1a7dff0ce36f4bf2f2a3fafed9dc70a71ff6281b261db5f01829e16c06f041921a5d8c8d715a04a8c1 fuse.initd " diff --git a/main/fuse3/off-t.patch b/main/fuse3/off-t.patch deleted file mode 100644 index df6d194f36d..00000000000 --- a/main/fuse3/off-t.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/example/hello_ll_uds.c b/example/hello_ll_uds.c -index c1f64d7..f291fed 100644 ---- a/example/hello_ll_uds.c -+++ b/example/hello_ll_uds.c -@@ -277,8 +277,8 @@ static ssize_t stream_read(int fd, void *buf, size_t buf_len, void *userdata) { - return (res == -1) ? res : (res + prev_res); - } - --static ssize_t stream_splice_send(int fdin, __off64_t *offin, int fdout, -- __off64_t *offout, size_t len, -+static ssize_t stream_splice_send(int fdin, off_t *offin, int fdout, -+ off_t *offout, size_t len, - unsigned int flags, void *userdata) { - (void)userdata; - -diff --git a/include/fuse_lowlevel.h b/include/fuse_lowlevel.h -index ff0d966..96088d7 100644 ---- a/include/fuse_lowlevel.h -+++ b/include/fuse_lowlevel.h -@@ -130,11 +130,11 @@ struct fuse_forget_data { - struct fuse_custom_io { - ssize_t (*writev)(int fd, struct iovec *iov, int count, void *userdata); - ssize_t (*read)(int fd, void *buf, size_t buf_len, void *userdata); -- ssize_t (*splice_receive)(int fdin, __off64_t *offin, int fdout, -- __off64_t *offout, size_t len, -+ ssize_t (*splice_receive)(int fdin, off_t *offin, int fdout, -+ off_t *offout, size_t len, - unsigned int flags, void *userdata); -- ssize_t (*splice_send)(int fdin, __off64_t *offin, int fdout, -- __off64_t *offout, size_t len, -+ ssize_t (*splice_send)(int fdin, off_t *offin, int fdout, -+ off_t *offout, size_t len, - unsigned int flags, void *userdata); - }; - |