package/nfs-utils: bump version to 2.8.1

* disable junction and nfsdctl by default
* drop 2 local patches that have been committed.

Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
Reviewed-by: Petr Vorel <petr.vorel@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Giulio Benetti
2024-11-04 21:23:19 +01:00
committed by Thomas Petazzoni
parent 66a5f9bc74
commit 37a33d865d
4 changed files with 7 additions and 78 deletions

View File

@@ -1,44 +0,0 @@
From 4710e469cd0f512ac5e2c3c4335d8e21b97f21b0 Mon Sep 17 00:00:00 2001
From: Petr Vorel <pvorel@suse.cz>
Date: Tue, 5 Dec 2023 20:40:36 +0100
Subject: [PATCH] reexport/{fsidd,reexport}.c: Re-add missing includes
Older uClibc-ng requires <unistd.h> for close(2), unlink(2) and write(2),
<sys/un.h> for struct sockaddr_un.
Fixes: 1a4edb2a ("reexport/fsidd.c: Remove unused headers")
Fixes: bdc79f02 ("support/reexport.c: Remove unused headers")
Signed-off-by: Petr Vorel <pvorel@suse.cz>
Upstream: https://lore.kernel.org/linux-nfs/20231205223543.31443-1-pvorel@suse.cz/
---
support/reexport/fsidd.c | 2 ++
support/reexport/reexport.c | 1 +
2 files changed, 3 insertions(+)
diff --git a/support/reexport/fsidd.c b/support/reexport/fsidd.c
index 3e62b3fc..814fb48e 100644
--- a/support/reexport/fsidd.c
+++ b/support/reexport/fsidd.c
@@ -7,6 +7,8 @@
#include <dlfcn.h>
#endif
#include <event2/event.h>
+#include <sys/un.h>
+#include <unistd.h>
#include "conffile.h"
#include "reexport_backend.h"
diff --git a/support/reexport/reexport.c b/support/reexport/reexport.c
index 78516586..1900b336 100644
--- a/support/reexport/reexport.c
+++ b/support/reexport/reexport.c
@@ -7,6 +7,7 @@
#endif
#include <sys/types.h>
#include <sys/vfs.h>
+#include <unistd.h>
#include <errno.h>
#include "nfsd_path.h"
--
2.43.0

View File

@@ -1,31 +0,0 @@
From aee92881ba80cf2ae7381d19f09e7fbeda57974c Mon Sep 17 00:00:00 2001
From: Petr Vorel <petr.vorel@gmail.com>
Date: Tue, 5 Dec 2023 23:20:33 +0100
Subject: [PATCH] support/backend_sqlite.c: Add missing <sys/syscall.h>
This fixes build on systems which actually needs getrandom()
(to get SYS_getrandom).
Fixes: f92fd6ca ("support/backend_sqlite.c: Add getrandom() fallback")
Fixes: http://autobuild.buildroot.net/results/c5fde6099a8b228a8bdc3154d1e47dfa192e94ed/
Reported-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
Signed-off-by: Petr Vorel <pvorel@suse.cz>
Upstream: https://lore.kernel.org/linux-nfs/20231205223543.31443-2-pvorel@suse.cz/
---
support/reexport/backend_sqlite.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/support/reexport/backend_sqlite.c b/support/reexport/backend_sqlite.c
index 0eb5ea37..54dfe447 100644
--- a/support/reexport/backend_sqlite.c
+++ b/support/reexport/backend_sqlite.c
@@ -7,6 +7,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <sys/syscall.h>
#include <unistd.h>
#ifdef HAVE_GETRANDOM
--
2.43.0

View File

@@ -1,4 +1,4 @@
# From https://www.kernel.org/pub/linux/utils/nfs-utils/2.6.4/sha256sums.asc
sha256 01b3b0fb9c7d0bbabf5114c736542030748c788ec2fd9734744201e9b0a1119d nfs-utils-2.6.4.tar.xz
# From https://www.kernel.org/pub/linux/utils/nfs-utils/2.8.1/sha256sums.asc
sha256 a0be95b08396908048583fcf6b34a7c1ab49d53e8a12eb28673ccfd2eff0c505 nfs-utils-2.8.1.tar.xz
# Locally computed
sha256 576540abf5e95029ad4ad90e32071385a5e95b2c30708c706116f3eb87b9a3de COPYING

View File

@@ -4,7 +4,7 @@
#
################################################################################
NFS_UTILS_VERSION = 2.6.4
NFS_UTILS_VERSION = 2.8.1
NFS_UTILS_SOURCE = nfs-utils-$(NFS_UTILS_VERSION).tar.xz
NFS_UTILS_SITE = https://www.kernel.org/pub/linux/utils/nfs-utils/$(NFS_UTILS_VERSION)
NFS_UTILS_LICENSE = GPL-2.0+
@@ -17,6 +17,8 @@ NFS_UTILS_CONF_ENV = knfsd_cv_bsd_signals=no
NFS_UTILS_CONF_OPTS = \
--enable-tirpc \
--enable-ipv6 \
--disable-junction \
--disable-nfsdctl \
--without-tcp-wrappers \
--with-statedir=/run/nfs \
--with-rpcgen=$(HOST_DIR)/bin/rpcgen
@@ -30,6 +32,8 @@ HOST_NFS_UTILS_CONF_OPTS = \
--disable-gss \
--disable-uuid \
--disable-ipv6 \
--disable-junction \
--disable-nfsdctl \
--without-tcp-wrappers \
--with-statedir=/run/nfs \
--disable-caps \