Update fuse, rclone, and syncthing.
This commit is contained in:
fewtarius
parent
f29919120c
commit
2915363ad7
7 changed files with 25 additions and 120 deletions
|
|
@ -3,7 +3,7 @@
|
|||
# Copyright (C) 2022-present Fewtarius
|
||||
|
||||
PKG_NAME="rclone"
|
||||
PKG_VERSION="1.62.2"
|
||||
PKG_VERSION="1.63.1"
|
||||
PKG_DEPENDS_TARGET="toolchain fuse rsync"
|
||||
PKG_SECTION="tools"
|
||||
PKG_SHORTDESC="rsync for cloud storage"
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
# Copyright (C) 2023-present Fewtarius
|
||||
|
||||
PKG_NAME="syncthing"
|
||||
PKG_VERSION="1.23.5"
|
||||
PKG_VERSION="1.23.7"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="MPLv2"
|
||||
PKG_SITE="https://syncthing.net/"
|
||||
|
|
|
|||
|
|
@ -3,8 +3,7 @@
|
|||
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="fuse"
|
||||
PKG_VERSION="2.9.9"
|
||||
PKG_SHA256="d0e69d5d608cc22ff4843791ad097f554dd32540ddc9bed7638cc6fea7c1b4b5"
|
||||
PKG_VERSION="3.16.1"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://github.com/libfuse/libfuse/"
|
||||
PKG_URL="https://github.com/libfuse/libfuse/releases/download/${PKG_NAME}-${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz"
|
||||
|
|
@ -12,14 +11,13 @@ PKG_DEPENDS_TARGET="toolchain"
|
|||
PKG_LONGDESC="FUSE provides a simple interface for userspace programs to export a virtual filesystem to the Linux kernel."
|
||||
# fuse fails to build with GOLD linker on gcc-4.9
|
||||
PKG_BUILD_FLAGS="-gold"
|
||||
PKG_TOOLCHAIN="autotools"
|
||||
|
||||
PKG_CONFIGURE_OPTS_TARGET="MOUNT_FUSE_PATH=/usr/sbin \
|
||||
UDEV_RULES_PATH=/usr/lib/udev \
|
||||
--enable-lib \
|
||||
--enable-util \
|
||||
--disable-example \
|
||||
--enable-mtab \
|
||||
--disable-rpath \
|
||||
--with-gnu-ld"
|
||||
|
||||
PKG_MESON_OPTS_TARGET+="-Dudevrulesdir=/usr/lib/udev \
|
||||
-Dinitscriptdir= \
|
||||
-Dtests=false \
|
||||
-Dexamples=false"
|
||||
|
||||
post_makeinstall_target() {
|
||||
ln -sf fusermount3 ${INSTALL}/usr/bin/fusermount
|
||||
ln -sf mount.fuse3 ${INSTALL}/usr/sbin/mount.fuse
|
||||
}
|
||||
|
|
|
|||
13
packages/sysutils/fuse/patches/001-noinstall.patch
Normal file
13
packages/sysutils/fuse/patches/001-noinstall.patch
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
diff -rupN fuse-3.16.1.orig/util/meson.build fuse-3.16.1/util/meson.build
|
||||
--- fuse-3.16.1.orig/util/meson.build 2023-08-19 14:31:45.825870616 +0000
|
||||
+++ fuse-3.16.1/util/meson.build 2023-08-19 14:31:23.468678346 +0000
|
||||
@@ -26,9 +26,3 @@ if udevrulesdir == ''
|
||||
warning('could not determine udevdir, udev.rules will not be installed')
|
||||
endif
|
||||
|
||||
-meson.add_install_script('install_helper.sh',
|
||||
- join_paths(get_option('prefix'), get_option('sysconfdir')),
|
||||
- join_paths(get_option('prefix'), get_option('bindir')),
|
||||
- udevrulesdir,
|
||||
- '@0@'.format(get_option('useroot')),
|
||||
- get_option('initscriptdir'))
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
fuse: add aarch64 support
|
||||
|
||||
u64/u32 is not defined in sys/types.h, include linux/types.h like
|
||||
the kernel version of fuse.h does. Patch sent to upstream mailing list.
|
||||
|
||||
Upstream-Status: Submitted
|
||||
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
|
||||
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
---
|
||||
include/fuse_kernel.h | 7 +------
|
||||
1 file changed, 1 insertion(+), 6 deletions(-)
|
||||
|
||||
diff --git a/include/fuse_kernel.h b/include/fuse_kernel.h
|
||||
index c632b58..e804278 100644
|
||||
--- a/include/fuse_kernel.h
|
||||
+++ b/include/fuse_kernel.h
|
||||
@@ -88,12 +88,7 @@
|
||||
#ifndef _LINUX_FUSE_H
|
||||
#define _LINUX_FUSE_H
|
||||
|
||||
-#include <sys/types.h>
|
||||
-#define __u64 uint64_t
|
||||
-#define __s64 int64_t
|
||||
-#define __u32 uint32_t
|
||||
-#define __s32 int32_t
|
||||
-#define __u16 uint16_t
|
||||
+#include <linux/types.h>
|
||||
|
||||
/*
|
||||
* Version negotiation:
|
||||
--
|
||||
1.8.1.2
|
||||
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
--- a/util/Makefile.in 2017-06-23 22:47:36.762827097 +0200
|
||||
+++ b/util/Makefile.in 2017-06-23 22:47:47.358852950 +0200
|
||||
@@ -734,10 +734,6 @@
|
||||
$(INSTALL_PROGRAM) $(builddir)/mount.fuse $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
|
||||
$(MKDIR_P) $(DESTDIR)$(INIT_D_PATH)
|
||||
$(INSTALL_SCRIPT) $(srcdir)/init_script $(DESTDIR)$(INIT_D_PATH)/fuse
|
||||
- @if test -x /usr/sbin/update-rc.d; then \
|
||||
- echo "/usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 . || true"; \
|
||||
- /usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 . || true; \
|
||||
- fi
|
||||
|
||||
install-data-local:
|
||||
$(MKDIR_P) $(DESTDIR)$(UDEV_RULES_PATH)
|
||||
|
|
@ -1,60 +0,0 @@
|
|||
From ae2352bca9b4e607538412da0cc2a9625cd8b692 Mon Sep 17 00:00:00 2001
|
||||
From: Sam James <sam@gentoo.org>
|
||||
Date: Sat, 24 Jul 2021 22:02:45 +0100
|
||||
Subject: [PATCH] util/ulockmgr_server.c: conditionally define closefrom (fix
|
||||
glibc-2.34+)
|
||||
|
||||
closefrom(3) has joined us in glibc-land from *BSD and Solaris. Since
|
||||
it's available in glibc 2.34+, we want to detect it and only define our
|
||||
fallback if the libc doesn't provide it.
|
||||
|
||||
Bug: https://bugs.gentoo.org/803923
|
||||
Signed-off-by: Sam James <sam@gentoo.org>
|
||||
---
|
||||
configure.ac | 1 +
|
||||
util/ulockmgr_server.c | 6 ++++++
|
||||
2 files changed, 7 insertions(+)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 9946a0efa..a2d481aa9 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -55,6 +55,7 @@ fi
|
||||
|
||||
AC_CHECK_FUNCS([fork setxattr fdatasync splice vmsplice utimensat])
|
||||
AC_CHECK_FUNCS([posix_fallocate])
|
||||
+AC_CHECK_FUNCS([closefrom])
|
||||
AC_CHECK_MEMBERS([struct stat.st_atim])
|
||||
AC_CHECK_MEMBERS([struct stat.st_atimespec])
|
||||
|
||||
diff --git a/util/ulockmgr_server.c b/util/ulockmgr_server.c
|
||||
index 273c7d923..a04dac5c6 100644
|
||||
--- a/util/ulockmgr_server.c
|
||||
+++ b/util/ulockmgr_server.c
|
||||
@@ -22,6 +22,10 @@
|
||||
#include <sys/socket.h>
|
||||
#include <sys/wait.h>
|
||||
|
||||
+#ifdef HAVE_CONFIG_H
|
||||
+ #include "config.h"
|
||||
+#endif
|
||||
+
|
||||
struct message {
|
||||
unsigned intr : 1;
|
||||
unsigned nofd : 1;
|
||||
@@ -124,6 +128,7 @@ static int receive_message(int sock, void *buf, size_t buflen, int *fdp,
|
||||
return res;
|
||||
}
|
||||
|
||||
+#if !defined(HAVE_CLOSEFROM)
|
||||
static int closefrom(int minfd)
|
||||
{
|
||||
DIR *dir = opendir("/proc/self/fd");
|
||||
@@ -141,6 +146,7 @@ static int closefrom(int minfd)
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
+#endif
|
||||
|
||||
static void send_reply(int cfd, struct message *msg)
|
||||
{
|
||||
Loading…
Reference in a new issue