Termux
/
termux-packages
mirror of https://github.com/termux/termux-packages
1
0
Fork 0
Code Issues Releases Wiki Activity

nfs-utils: Bump to 2.6.3

This commit is contained in:
Tee KOBAYASHI 2023-04-27 15:39:44 +09:00 committed by xtkoba
parent af26771cf1
commit 126c14c604
3 changed files with 16 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
root-packages/nfs-utils/build.sh
View File

@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://linux-nfs.org/
TERMUX_PKG_DESCRIPTION="Linux NFS userland utilities"
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=2.6.2
TERMUX_PKG_REVISION=1
TERMUX_PKG_VERSION=2.6.3
TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/nfs/nfs-utils-${TERMUX_PKG_VERSION}.tar.bz2
TERMUX_PKG_SHA256=958890e4a2fe981c2e449002709224bedf009934bf69e73fe911cbc96aad0b7d
TERMUX_PKG_SHA256=3fbbca61d00318a8ff1028a6f7f6fe81d15cf70811c3eb0c4709f4039e36695a
TERMUX_PKG_DEPENDS="keyutils, libblkid, libcap, libdevmapper, libevent, libmount, libsqlite, libtirpc, libuuid, openldap"
TERMUX_PKG_BUILD_DEPENDS="libxml2"
TERMUX_PKG_BUILD_IN_SRC=true

24
root-packages/nfs-utils/fix-hardcoded-paths.patch
View File

@ -93,30 +93,6 @@
char *conf_path = PATH_IDMAPDCONF;
main(int ac, char **av)
--- a/systemd/50-nfs.conf
+++ b/systemd/50-nfs.conf
@@ -1,16 +1,16 @@
# Ensure all NFS systctl settings get applied when modules load
# sunrpc module supports "sunrpc.*" sysctls
-install sunrpc /sbin/modprobe --ignore-install sunrpc $CMDLINE_OPTS && { /sbin/sysctl -q --pattern sunrpc --system; exit 0; }
+install sunrpc @TERMUX_PREFIX@/bin/modprobe --ignore-install sunrpc $CMDLINE_OPTS && { @TERMUX_PREFIX@/bin/sysctl -q --pattern sunrpc --system; exit 0; }
# rpcrdma module supports sunrpc.svc_rdma.*
-install rpcrdma /sbin/modprobe --ignore-install rpcrdma $CMDLINE_OPTS && { /sbin/sysctl -q --pattern sunrpc.svc_rdma --system; exit 0; }
+install rpcrdma @TERMUX_PREFIX@/bin/modprobe --ignore-install rpcrdma $CMDLINE_OPTS && { @TERMUX_PREFIX@/bin/sysctl -q --pattern sunrpc.svc_rdma --system; exit 0; }
# lockd module supports "fs.nfs.nlm*" and "fs.nfs.nsm*" sysctls
-install lockd /sbin/modprobe --ignore-install lockd $CMDLINE_OPTS && { /sbin/sysctl -q --pattern fs.nfs.n[sl]m --system; exit 0; }
+install lockd @TERMUX_PREFIX@/bin/modprobe --ignore-install lockd $CMDLINE_OPTS && { @TERMUX_PREFIX@/bin/sysctl -q --pattern fs.nfs.n[sl]m --system; exit 0; }
# nfsv4 module supports "fs.nfs.*" sysctls (nfs_callback_tcpport and idmap_cache_timeout)
-install nfsv4 /sbin/modprobe --ignore-install nfsv4 $CMDLINE_OPTS && { /sbin/sysctl -q --pattern 'fs.nfs.(nfs_callback_tcpport|idmap_cache_timeout)' --system; exit 0; }
+install nfsv4 @TERMUX_PREFIX@/bin/modprobe --ignore-install nfsv4 $CMDLINE_OPTS && { @TERMUX_PREFIX@/bin/sysctl -q --pattern 'fs.nfs.(nfs_callback_tcpport|idmap_cache_timeout)' --system; exit 0; }
# nfs module supports "fs.nfs.*" sysctls
-install nfs /sbin/modprobe --ignore-install nfs $CMDLINE_OPTS && { /sbin/sysctl -q --pattern fs.nfs --system; exit 0; }
+install nfs @TERMUX_PREFIX@/bin/modprobe --ignore-install nfs $CMDLINE_OPTS && { @TERMUX_PREFIX@/bin/sysctl -q --pattern fs.nfs --system; exit 0; }
--- a/systemd/nfs-server-generator.c
+++ b/systemd/nfs-server-generator.c
@@ -62,7 +62,7 @@

14
root-packages/nfs-utils/support-reexport-backend_sqlite.c.patch Normal file
View File

@ -0,0 +1,14 @@
--- a/support/reexport/backend_sqlite.c
+++ b/support/reexport/backend_sqlite.c
@@ -10,6 +10,11 @@
#include <sys/random.h>
#include <unistd.h>
+#if defined __ANDROID__ && __ANDROID_API__ < 28
+#include <syscall.h>
+#define getrandom(buf,buflen,flags) syscall(SYS_getrandom,buf,buflen,flags)
+#endif
+
#include "conffile.h"
#include "reexport_backend.h"
#include "xlog.h"