Commit f5bfa3b7 authored by Jeff Huang's avatar Jeff Huang 🤔

[skip-ci] nfs-utils: update to 2.3.3

parent ec37b6d2
Pipeline #2718 skipped
From fd5ccdc449a0ef79498191aecb3e44120e813618 Mon Sep 17 00:00:00 2001
From: Steve Dickson <steved@redhat.com>
Date: Thu, 31 May 2018 11:02:58 -0400
Subject: [PATCH] rpcgen: Only compile the command when configured.
Only compile and use the internal rpcgen
when required via the --with-rpcgen flag
It is strongly suggested to use the rpcgen from
the new created rpcsvc-proto package be used.
Signed-off-by: Steve Dickson <steved@redhat.com>
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 276dec3..4b698dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -157,7 +157,7 @@ AC_ARG_WITH(rpcgen,
RPCGEN_PATH=$rpcgen_path
fi
AC_SUBST(RPCGEN_PATH)
- AM_CONDITIONAL(CONFIG_RPCGEN, [test "$RPCGEN_PATH" = ""])
+ AM_CONDITIONAL(CONFIG_RPCGEN, [test "$RPCGEN_PATH" = "internal"])
AC_ARG_ENABLE(uuid,
[AC_HELP_STRING([--disable-uuid],
[Exclude uuid support to avoid buggy libblkid. @<:@default=no@:>@])],
--
1.8.3.1
pkgbase=nfs-utils
pkgname=('nfs-utils' 'nfsidmap')
pkgver=2.3.2
pkgver=2.3.3
pkgrel=1
arch=('x86_64')
url='http://nfs.sourceforge.net'
makedepends=('libevent' 'sqlite' 'glibc')
source=(https://www.kernel.org/pub/linux/utils/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.{xz,sign}
id_resolver.conf
exports
0001-Only_compile_the_command_when_configured.diff)
exports)
install=nfs-utils.install
optdepends=('sqlite3: for nfsdcltrack usage'
'python2: for nfsiostat and mountstats usage')
sha1sums=('b7f012ff2e547e46f83d0531c4b4db261733b049'
'SKIP'
'24b3c10b47dc120b2d252cf1e5001effa8f76a62'
'170a929d9c0f22edb13b656648cadf372efea841'
'1347da8cdcc38a7fb3dce1d6feca2577dbcfe6f9')
sha256sums=('f68b34793831b05f1fd5760d6bdec92772c7684177586a99a61e7b444f336322'
'SKIP'
'ed31ae843cf66d3c262b39ed54533a861876231c5f5bb3811c0c498ac2ffa102'
'610715ed3daedc43b2536f541c7c57e138fb31eab5d837d9a6187a7403e30154')
validpgpkeys=('E1B71E339E20A10A676F7CB69AFB1D681A125177') # Steve Dickson
prepare() {
cd $pkgbase-$pkgver
# fix build
patch -Np1 -i ../0001-Only_compile_the_command_when_configured.diff
# fix hardcoded sbin path to our needs
sed -i "s|sbindir = /sbin|sbindir = /usr/bin|g" utils/*/Makefile.am
......@@ -46,11 +38,6 @@ build() {
make
}
check() {
cd $pkgbase-$pkgver
make -k check || /bin/true
}
package_nfs-utils() {
pkgdesc="Support programs for Network File Systems"
......@@ -59,7 +46,7 @@ package_nfs-utils() {
backup=(etc/{exports,nfs.conf,nfsmount.conf})
depends=('rpcbind' 'nfsidmap' 'gssproxy' 'libevent' 'device-mapper')
optdepends=('sqlite: for nfsdcltrack usage'
'python: for nfsiostat and mountstats usage')
'python3: for nfsiostat and mountstats usage')
cd $pkgbase-$pkgver
make DESTDIR=$pkgdir install
......
From: Christoph Hellwig <hch@lst.de>
Subject: nfsd: ignore unsupported address types in nfssvc_setfds
Just continue and try a different record returned from getaddrinfo
if the kernel does not support an address family. This fixes nfsd
startup on kernels without IPv6 support.
Suggested-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
diff --git a/utils/nfsd/nfssvc.c b/utils/nfsd/nfssvc.c
index a2b11d8..fc11d23 100644
--- a/utils/nfsd/nfssvc.c
+++ b/utils/nfsd/nfssvc.c
@@ -174,15 +174,14 @@ nfssvc_setfds(const struct addrinfo *hints, const char *node, const char *port)
sockfd = socket(addr->ai_family, addr->ai_socktype,
addr->ai_protocol);
if (sockfd < 0) {
- if (errno == EAFNOSUPPORT)
- xlog(L_NOTICE, "address family %s not "
- "supported by protocol %s",
- family, proto);
- else
+ if (errno != EAFNOSUPPORT) {
xlog(L_ERROR, "unable to create %s %s socket: "
"errno %d (%m)", family, proto, errno);
- rc = errno;
- goto error;
+ rc = errno;
+ goto error;
+ }
+ addr = addr->ai_next;
+ continue;
}
#ifdef IPV6_SUPPORTED
if (addr->ai_family == AF_INET6 &&
--
# Parameters to be passed to nfs systemd services (nfs clients & server).
#
# Options to pass to rpc.statd.
# See rpc.statd(8) for more details.
# N.B. statd normally runs on both client and server, and run-time
# options should be specified accordingly.
# STATD_OPTS="-p 32765 -o 32766"
STATD_OPTS=""
# Options to pass to sm-notify
# e.g. SMNOTIFY_OPTS="-p 32764"
SMNOTIFY_OPTS=""
# Options to pass to rpc.idmapd.
# See rpc.idmapd(8) for more details.
IDMAPD_OPTS=""
# Options to pass to rpc.gssd.
# See rpc.gssd(8) for more details.
GSSD_OPTS=""
# Parameters to be passed to nfs systemd server services
#
# Options to pass to rpc.nfsd.
# See rpc.nfsd(8) for more details.
NFSD_OPTS=""
# Options for rpc.mountd.
# If you have a port-based firewall, you might want to set up
# a fixed port here using the --port option.
# See rpc.mountd(8) for more details.
MOUNTD_OPTS=""
# Options to pass to rpc.svcgssd.
# See rpc.svcgssd(8) for more details.
SVCGSSD_OPTS=""
#!/bin/bash
# archlinux config files
. /etc/conf.d/nfs-common.conf
. /etc/conf.d/nfs-server.conf
# config file read by systemd files
NFS_UTILS_CONFIG=/run/sysconfig/nfs-utils
[[ -d /run/sysconfig ]] || mkdir /run/sysconfig
[[ -e $NFS_UTILS_CONFIG ]] && rm -f $NFS_UTILS_CONFIG
# /etc/conf.d/nfs-common
echo "STATDARGS=\"$STATD_OPTS\"" >> $NFS_UTILS_CONFIG
echo "SMNOTIFYARGS=\"$SMNOTIFY_OPTS\"" >> $NFS_UTILS_CONFIG
echo "RPCIDMAPDARGS=\"$IDMAPD_OPTS\"" >> $NFS_UTILS_CONFIG
echo "GSSDARGS=\"$GSSD_OPTS\"" >> $NFS_UTILS_CONFIG
# /etc/conf.d/nfs-server
echo "RPCMOUNTDARGS=\"$MOUNTD_OPTS\"" >> $NFS_UTILS_CONFIG
echo "RPCNFSDARGS=\"$NFSD_OPTS\"" >> $NFS_UTILS_CONFIG
echo "SVCGSSDARGS=\"$SVCGSSD_OPTS\"" >> $NFS_UTILS_CONFIG
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment