Move all to deprecated folder.
This commit is contained in:
@@ -0,0 +1,60 @@
|
||||
From 5796ca01e33596d4102dd714349c908fecc331c0 Mon Sep 17 00:00:00 2001
|
||||
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
Date: Sat, 10 Nov 2012 18:56:12 +0100
|
||||
Subject: [PATCH] Patch taken from Gentoo
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
---
|
||||
tools/locktest/Makefile.am | 7 +++----
|
||||
tools/rpcgen/Makefile.am | 8 +++-----
|
||||
2 files changed, 6 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/tools/locktest/Makefile.am b/tools/locktest/Makefile.am
|
||||
index 3156815..efe6fcd 100644
|
||||
--- a/tools/locktest/Makefile.am
|
||||
+++ b/tools/locktest/Makefile.am
|
||||
@@ -1,12 +1,11 @@
|
||||
## Process this file with automake to produce Makefile.in
|
||||
|
||||
CC=$(CC_FOR_BUILD)
|
||||
-LIBTOOL = @LIBTOOL@ --tag=CC
|
||||
+CFLAGS=$(CFLAGS_FOR_BUILD)
|
||||
+CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
|
||||
+LDFLAGS=$(LDFLAGS_FOR_BUILD)
|
||||
|
||||
noinst_PROGRAMS = testlk
|
||||
testlk_SOURCES = testlk.c
|
||||
-testlk_CFLAGS=$(CFLAGS_FOR_BUILD)
|
||||
-testlk_CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
|
||||
-testlk_LDFLAGS=$(LDFLAGS_FOR_BUILD)
|
||||
|
||||
MAINTAINERCLEANFILES = Makefile.in
|
||||
diff --git a/tools/rpcgen/Makefile.am b/tools/rpcgen/Makefile.am
|
||||
index 8a9ec89..5a5b4d3 100644
|
||||
--- a/tools/rpcgen/Makefile.am
|
||||
+++ b/tools/rpcgen/Makefile.am
|
||||
@@ -1,7 +1,9 @@
|
||||
## Process this file with automake to produce Makefile.in
|
||||
|
||||
CC=$(CC_FOR_BUILD)
|
||||
-LIBTOOL = @LIBTOOL@ --tag=CC
|
||||
+CFLAGS=$(CFLAGS_FOR_BUILD)
|
||||
+CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
|
||||
+LDFLAGS=$(LDFLAGS_FOR_BUILD)
|
||||
|
||||
noinst_PROGRAMS = rpcgen
|
||||
rpcgen_SOURCES = rpc_clntout.c rpc_cout.c rpc_hout.c rpc_main.c \
|
||||
@@ -9,10 +11,6 @@ rpcgen_SOURCES = rpc_clntout.c rpc_cout.c rpc_hout.c rpc_main.c \
|
||||
rpc_util.c rpc_sample.c rpc_output.h rpc_parse.h \
|
||||
rpc_scan.h rpc_util.h
|
||||
|
||||
-rpcgen_CFLAGS=$(CFLAGS_FOR_BUILD)
|
||||
-rpcgen_CPPLAGS=$(CPPFLAGS_FOR_BUILD)
|
||||
-rpcgen_LDFLAGS=$(LDFLAGS_FOR_BUILD)
|
||||
-rpcgen_LDADD=$(LIBTIRPC)
|
||||
|
||||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
--
|
||||
2.1.0
|
||||
|
||||
@@ -0,0 +1,72 @@
|
||||
From a1d45736286939b822fcc7b9c74843f6f90a747e Mon Sep 17 00:00:00 2001
|
||||
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
Date: Sat, 10 Nov 2012 18:58:15 +0100
|
||||
Subject: [PATCH] Switch legacy index() in favour of strchr() Updated for 1.2.6
|
||||
from the previous patch by Frederik Pasch.
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
---
|
||||
support/nfs/nfs_mntent.c | 6 +++---
|
||||
utils/mount/error.c | 2 +-
|
||||
utils/mountd/fsloc.c | 2 +-
|
||||
3 files changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/support/nfs/nfs_mntent.c b/support/nfs/nfs_mntent.c
|
||||
index a2118a2..7496ed6 100644
|
||||
--- a/support/nfs/nfs_mntent.c
|
||||
+++ b/support/nfs/nfs_mntent.c
|
||||
@@ -9,7 +9,7 @@
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
-#include <string.h> /* for index */
|
||||
+#include <string.h> /* for strchr */
|
||||
#include <ctype.h> /* for isdigit */
|
||||
#include <sys/stat.h> /* for umask */
|
||||
#include <unistd.h> /* for ftruncate */
|
||||
@@ -172,7 +172,7 @@ nfs_getmntent (mntFILE *mfp) {
|
||||
return NULL;
|
||||
|
||||
mfp->mntent_lineno++;
|
||||
- s = index (buf, '\n');
|
||||
+ s = strchr (buf, '\n');
|
||||
if (s == NULL) {
|
||||
/* Missing final newline? Otherwise extremely */
|
||||
/* long line - assume file was corrupted */
|
||||
@@ -180,7 +180,7 @@ nfs_getmntent (mntFILE *mfp) {
|
||||
fprintf(stderr, _("[mntent]: warning: no final "
|
||||
"newline at the end of %s\n"),
|
||||
mfp->mntent_file);
|
||||
- s = index (buf, 0);
|
||||
+ s = strchr (buf, 0);
|
||||
} else {
|
||||
mfp->mntent_errs = 1;
|
||||
goto err;
|
||||
diff --git a/utils/mount/error.c b/utils/mount/error.c
|
||||
index e06f598..7bd1d27 100644
|
||||
--- a/utils/mount/error.c
|
||||
+++ b/utils/mount/error.c
|
||||
@@ -62,7 +62,7 @@ static int rpc_strerror(int spos)
|
||||
char *tmp;
|
||||
|
||||
if (estr) {
|
||||
- if ((ptr = index(estr, ':')))
|
||||
+ if ((ptr = strchr(estr, ':')))
|
||||
estr = ++ptr;
|
||||
|
||||
tmp = &errbuf[spos];
|
||||
diff --git a/utils/mountd/fsloc.c b/utils/mountd/fsloc.c
|
||||
index bc737d1..ddbe92f 100644
|
||||
--- a/utils/mountd/fsloc.c
|
||||
+++ b/utils/mountd/fsloc.c
|
||||
@@ -127,7 +127,7 @@ static struct servers *method_list(char *data)
|
||||
bool v6esc = false;
|
||||
|
||||
xlog(L_NOTICE, "method_list(%s)", data);
|
||||
- for (ptr--, listsize=1; ptr; ptr=index(ptr, ':'), listsize++)
|
||||
+ for (ptr--, listsize=1; ptr; ptr=strchr(ptr, ':'), listsize++)
|
||||
ptr++;
|
||||
list = malloc(listsize * sizeof(char *));
|
||||
copy = strdup(data);
|
||||
--
|
||||
2.1.0
|
||||
@@ -0,0 +1,46 @@
|
||||
From 87f88b28ac01b6449463f00b660fe7416d7f9a55 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Date: Sat, 10 Nov 2012 18:53:03 +0100
|
||||
Subject: [PATCH] Let the configure script find getrpcbynumber in libtirpc
|
||||
|
||||
The getrpcbynumber() function may not be available in the C library,
|
||||
but only in the libtirpc library. Take this into account when checking
|
||||
for the existence of getrpcbynumber() and getrpcbynumber_r().
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
---
|
||||
configure.ac | 14 +++++++++++++-
|
||||
1 file changed, 13 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 8e427e3..6e42c96 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -433,11 +433,23 @@ AC_FUNC_STAT
|
||||
AC_FUNC_VPRINTF
|
||||
AC_CHECK_FUNCS([alarm atexit dup2 fdatasync ftruncate getcwd \
|
||||
gethostbyaddr gethostbyname gethostname getmntent \
|
||||
- getnameinfo getrpcbyname getrpcbynumber getrpcbynumber_r getifaddrs \
|
||||
+ getnameinfo getrpcbyname getifaddrs \
|
||||
gettimeofday hasmntopt inet_ntoa innetgr memset mkdir pathconf \
|
||||
ppoll realpath rmdir select socket strcasecmp strchr strdup \
|
||||
strerror strrchr strtol strtoul sigprocmask name_to_handle_at])
|
||||
|
||||
+save_CFLAGS=$CFLAGS
|
||||
+save_LIBS=$LIBS
|
||||
+CFLAGS="$CFLAGS $AM_CPPFLAGS"
|
||||
+LIBS="$LIBS $LIBTIRPC"
|
||||
+AC_CHECK_FUNCS([getrpcbynumber getrpcbynumber_r])
|
||||
+CFLAGS=$save_CFLAGS
|
||||
+LIBS=$save_LIBS
|
||||
+
|
||||
+if test "$ac_cv_func_getrpcbynumber_r" != "yes" -a "$ac_cv_func_getrpcbynumber" != "yes"; then
|
||||
+ AC_MSG_ERROR([Neither getrpcbynumber_r nor getrpcbynumber are available])
|
||||
+fi
|
||||
+
|
||||
dnl *************************************************************
|
||||
dnl Check for data sizes
|
||||
dnl *************************************************************
|
||||
--
|
||||
2.1.0
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
From 3c23b3ea7f5069e8fd4d5758704cd968504f1079 Mon Sep 17 00:00:00 2001
|
||||
From: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
|
||||
Date: Tue, 2 Feb 2016 10:07:22 +0100
|
||||
Subject: [PATCH] mountd: Add check for 'struct file_handle'
|
||||
|
||||
The code to check if name_to_handle_at() is implemented generates only a
|
||||
warning but with some toolchain it doesn't fail to link (the function must be
|
||||
implemented somewhere).
|
||||
However the "struct file_handle" type is not available.
|
||||
|
||||
So, this patch adds a check for this struct.
|
||||
|
||||
Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
|
||||
---
|
||||
configure.ac | 1 +
|
||||
utils/mountd/cache.c | 2 +-
|
||||
2 files changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 25d2ba4..913a86f 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -425,6 +425,7 @@ AC_TYPE_PID_T
|
||||
AC_TYPE_SIZE_T
|
||||
AC_HEADER_TIME
|
||||
AC_STRUCT_TM
|
||||
+AC_CHECK_TYPES([struct file_handle])
|
||||
|
||||
dnl *************************************************************
|
||||
dnl Check for functions
|
||||
diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c
|
||||
index 7847446..dc64f6d 100644
|
||||
--- a/utils/mountd/cache.c
|
||||
+++ b/utils/mountd/cache.c
|
||||
@@ -424,7 +424,7 @@ static int same_path(char *child, char *parent, int len)
|
||||
if (count_slashes(p) != count_slashes(parent))
|
||||
return 0;
|
||||
|
||||
-#if HAVE_NAME_TO_HANDLE_AT
|
||||
+#if defined(HAVE_NAME_TO_HANDLE_AT) && defined(HAVE_STRUCT_FILE_HANDLE)
|
||||
struct {
|
||||
struct file_handle fh;
|
||||
unsigned char handle[128];
|
||||
--
|
||||
2.7.0
|
||||
|
||||
37
deprecated/firmware/buildroot/package/nfs-utils/Config.in
Normal file
37
deprecated/firmware/buildroot/package/nfs-utils/Config.in
Normal file
@@ -0,0 +1,37 @@
|
||||
comment "nfs-utils needs a toolchain w/ threads"
|
||||
depends on BR2_USE_MMU
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS
|
||||
|
||||
config BR2_PACKAGE_NFS_UTILS
|
||||
bool "nfs-utils"
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # libtirpc, rpcbind
|
||||
select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC
|
||||
select BR2_PACKAGE_RPCBIND # runtime
|
||||
depends on BR2_USE_MMU # fork()
|
||||
help
|
||||
The NFS Linux kernel server.
|
||||
|
||||
http://sourceforge.net/projects/nfs
|
||||
|
||||
if BR2_PACKAGE_NFS_UTILS
|
||||
|
||||
menu "NFS utilities selection"
|
||||
|
||||
config BR2_PACKAGE_NFS_UTILS_RPCDEBUG
|
||||
bool "rpcdebug"
|
||||
help
|
||||
The RPC debugging utility
|
||||
|
||||
config BR2_PACKAGE_NFS_UTILS_RPC_LOCKD
|
||||
bool "rpc.lockd"
|
||||
help
|
||||
NFS lock manager for Linux kernels older than 2.4
|
||||
|
||||
config BR2_PACKAGE_NFS_UTILS_RPC_RQUOTAD
|
||||
bool "rpc.rquotad"
|
||||
help
|
||||
NFS remote quota server
|
||||
|
||||
endmenu
|
||||
|
||||
endif
|
||||
88
deprecated/firmware/buildroot/package/nfs-utils/S60nfs
Executable file
88
deprecated/firmware/buildroot/package/nfs-utils/S60nfs
Executable file
@@ -0,0 +1,88 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# nfs This shell script takes care of starting and stopping
|
||||
# the NFS services. Stolen from RedHat FC5.
|
||||
|
||||
[ -x /usr/sbin/rpc.statd ] || exit 0
|
||||
[ -x /usr/sbin/rpc.nfsd ] || exit 0
|
||||
[ -x /usr/sbin/rpc.mountd ] || exit 0
|
||||
[ -x /usr/sbin/exportfs ] || exit 0
|
||||
|
||||
mkdir -p /var/lock/subsys
|
||||
mkdir -p /run/nfs/sm
|
||||
mkdir -p /run/nfs/sm.bak
|
||||
touch /run/nfs/rmtab
|
||||
|
||||
CFG_FILE=/etc/default/nfsd
|
||||
|
||||
NR_THREADS=2
|
||||
if [ -f "${CFG_FILE}" ]; then
|
||||
. "${CFG_FILE}"
|
||||
fi
|
||||
|
||||
|
||||
start() {
|
||||
# Start daemons.
|
||||
printf "Starting NFS statd: "
|
||||
rpc.statd
|
||||
touch /var/lock/subsys/nfslock
|
||||
echo "done"
|
||||
|
||||
printf "Starting NFS services: "
|
||||
/usr/sbin/exportfs -r
|
||||
echo "done"
|
||||
|
||||
printf "Starting NFS daemon: "
|
||||
rpc.nfsd ${NR_THREADS}
|
||||
echo "done"
|
||||
|
||||
printf "Starting NFS mountd: "
|
||||
rpc.mountd
|
||||
echo "done"
|
||||
touch /var/lock/subsys/nfs
|
||||
}
|
||||
|
||||
stop() {
|
||||
# Stop daemons.
|
||||
printf "Shutting down NFS mountd: "
|
||||
killall -q rpc.mountd
|
||||
echo "done"
|
||||
|
||||
printf "Shutting down NFS daemon: "
|
||||
kill -9 `pidof nfsd` 2>/dev/null
|
||||
echo "done"
|
||||
|
||||
printf "Shutting down NFS services: "
|
||||
/usr/sbin/exportfs -au
|
||||
rm -f /var/lock/subsys/nfs
|
||||
killall -q rpc.statd
|
||||
echo "done"
|
||||
|
||||
printf "Stopping NFS statd: "
|
||||
killall -q rpc.statd
|
||||
echo "done"
|
||||
rm -f /var/lock/subsys/nfslock
|
||||
}
|
||||
|
||||
# See how we were called.
|
||||
case "$1" in
|
||||
start)
|
||||
start
|
||||
;;
|
||||
stop)
|
||||
stop
|
||||
;;
|
||||
restart)
|
||||
stop
|
||||
start
|
||||
;;
|
||||
reload)
|
||||
/usr/sbin/exportfs -r
|
||||
touch /var/lock/subsys/nfs
|
||||
;;
|
||||
*)
|
||||
echo "Usage: nfs {start|stop|reload}"
|
||||
exit 1
|
||||
esac
|
||||
|
||||
exit 0
|
||||
@@ -0,0 +1,2 @@
|
||||
# From https://www.kernel.org/pub/linux/utils/nfs-utils/1.3.3/sha256sums.asc
|
||||
sha256 700d689c5622c87953c34102e5befafc4d3c811e676852238f0dd79c9c0c084d nfs-utils-1.3.3.tar.xz
|
||||
92
deprecated/firmware/buildroot/package/nfs-utils/nfs-utils.mk
Normal file
92
deprecated/firmware/buildroot/package/nfs-utils/nfs-utils.mk
Normal file
@@ -0,0 +1,92 @@
|
||||
################################################################################
|
||||
#
|
||||
# nfs-utils
|
||||
#
|
||||
################################################################################
|
||||
|
||||
NFS_UTILS_VERSION = 1.3.3
|
||||
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 = GPLv2+
|
||||
NFS_UTILS_LICENSE_FILES = COPYING
|
||||
NFS_UTILS_AUTORECONF = YES
|
||||
NFS_UTILS_DEPENDENCIES = host-pkgconf
|
||||
|
||||
NFS_UTILS_CONF_ENV = knfsd_cv_bsd_signals=no
|
||||
|
||||
NFS_UTILS_CONF_OPTS = \
|
||||
--disable-nfsv4 \
|
||||
--disable-nfsv41 \
|
||||
--disable-gss \
|
||||
--disable-uuid \
|
||||
--disable-ipv6 \
|
||||
--without-tcp-wrappers \
|
||||
--with-statedir=/run/nfs \
|
||||
--with-rpcgen=internal
|
||||
|
||||
NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPCDEBUG) += usr/sbin/rpcdebug
|
||||
NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_LOCKD) += usr/sbin/rpc.lockd
|
||||
NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_RQUOTAD) += usr/sbin/rpc.rquotad
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBCAP),y)
|
||||
NFS_UTILS_CONF_OPTS += --enable-caps
|
||||
NFS_UTILS_DEPENDENCIES += libcap
|
||||
else
|
||||
NFS_UTILS_CONF_OPTS += --disable-caps
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBTIRPC),y)
|
||||
NFS_UTILS_CONF_OPTS += --enable-tirpc
|
||||
NFS_UTILS_DEPENDENCIES += libtirpc
|
||||
else
|
||||
NFS_UTILS_CONF_OPTS += --disable-tirpc
|
||||
endif
|
||||
|
||||
define NFS_UTILS_INSTALL_FIXUP
|
||||
rm -f $(NFS_UTILS_TARGETS_)
|
||||
touch $(TARGET_DIR)/etc/exports
|
||||
$(INSTALL) -D -m 644 \
|
||||
$(@D)/utils/mount/nfsmount.conf $(TARGET_DIR)/etc/nfsmount.conf
|
||||
endef
|
||||
NFS_UTILS_POST_INSTALL_TARGET_HOOKS += NFS_UTILS_INSTALL_FIXUP
|
||||
|
||||
ifeq ($(BR2_INIT_SYSTEMD),y)
|
||||
NFS_UTILS_CONF_OPTS += --with-systemd=/usr/lib/systemd/system
|
||||
NFS_UTILS_DEPENDENCIES += systemd
|
||||
else
|
||||
NFS_UTILS_CONF_OPTS += --without-systemd
|
||||
endif
|
||||
|
||||
define NFS_UTILS_INSTALL_INIT_SYSV
|
||||
$(INSTALL) -D -m 0755 package/nfs-utils/S60nfs \
|
||||
$(TARGET_DIR)/etc/init.d/S60nfs
|
||||
endef
|
||||
|
||||
define NFS_UTILS_INSTALL_INIT_SYSTEMD
|
||||
mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
|
||||
|
||||
ln -fs ../../../../usr/lib/systemd/system/nfs-server.service \
|
||||
$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/nfs-server.service
|
||||
ln -fs ../../../../usr/lib/systemd/system/nfs-client.target \
|
||||
$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/nfs-client.target
|
||||
|
||||
mkdir -p $(TARGET_DIR)/etc/systemd/system/remote-fs.target.wants
|
||||
|
||||
ln -fs ../../../../usr/lib/systemd/system/nfs-client.target \
|
||||
$(TARGET_DIR)/etc/systemd/system/remote-fs.target.wants/nfs-client.target
|
||||
|
||||
$(INSTALL) -D -m 0755 package/nfs-utils/nfs-utils_env.sh \
|
||||
$(TARGET_DIR)/usr/lib/systemd/scripts/nfs-utils_env.sh
|
||||
|
||||
$(INSTALL) -D -m 0644 package/nfs-utils/nfs-utils_tmpfiles.conf \
|
||||
$(TARGET_DIR)/usr/lib/tmpfiles.d/nfs-utils.conf
|
||||
endef
|
||||
|
||||
define NFS_UTILS_REMOVE_NFSIOSTAT
|
||||
rm -f $(TARGET_DIR)/usr/sbin/nfsiostat
|
||||
endef
|
||||
|
||||
# nfsiostat is interpreted python, so remove it unless it's in the target
|
||||
NFS_UTILS_POST_INSTALL_TARGET_HOOKS += $(if $(BR2_PACKAGE_PYTHON),,NFS_UTILS_REMOVE_NFSIOSTAT)
|
||||
|
||||
$(eval $(autotools-package))
|
||||
3
deprecated/firmware/buildroot/package/nfs-utils/nfs-utils_env.sh
Executable file
3
deprecated/firmware/buildroot/package/nfs-utils/nfs-utils_env.sh
Executable file
@@ -0,0 +1,3 @@
|
||||
#!/bin/sh
|
||||
# This script is empty, it simply needs to exist to make the
|
||||
# nfs-config.service happy.
|
||||
@@ -0,0 +1,4 @@
|
||||
d /run/nfs/sm 0700 root root -
|
||||
d /run/nfs/sm.bak 0700 root root -
|
||||
f /run/nfs/rmtab 0644 root root -
|
||||
f /run/nfs/etab 0644 root root -
|
||||
Reference in New Issue
Block a user