From bc237eb78dd4cf07fb2b080666bf32e46bc7ba9a Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Mon, 3 Feb 2020 20:47:44 +0000
Subject: Mon Feb  3 20:47:44 UTC 2020

a/cryptsetup-2.3.0-x86_64-1.txz:  Upgraded.
a/kernel-firmware-20200203_6d9f399-noarch-1.txz:  Upgraded.
ap/xfsdump-3.1.9-x86_64-1.txz:  Upgraded.
d/mercurial-5.3-x86_64-1.txz:  Upgraded.
l/libzip-1.6.1-x86_64-1.txz:  Upgraded.
n/nfs-utils-2.4.2-x86_64-3.txz:  Rebuilt.
  Added /etc/exports.d directory.
  Removed the bogus sanity checks. Sure, we could try to "fix" them, but this
  seems to be the path of least resistance.
n/postfix-3.4.9-x86_64-1.txz:  Upgraded.
x/libinput-1.15.1-x86_64-1.txz:  Upgraded.
x/vulkan-sdk-1.2.131.1-x86_64-1.txz:  Upgraded.
xap/sane-1.0.29-x86_64-1.txz:  Upgraded.
---
 source/n/nfs-utils/nfs-utils.SlackBuild |  4 ++--
 source/n/nfs-utils/rc.nfsd              | 13 +++++--------
 2 files changed, 7 insertions(+), 10 deletions(-)

(limited to 'source/n/nfs-utils')

diff --git a/source/n/nfs-utils/nfs-utils.SlackBuild b/source/n/nfs-utils/nfs-utils.SlackBuild
index 123856a27..6b2eddf83 100755
--- a/source/n/nfs-utils/nfs-utils.SlackBuild
+++ b/source/n/nfs-utils/nfs-utils.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=nfs-utils
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -70,7 +70,7 @@ TMP=${TMP:-/tmp}
 PKG=$TMP/package-nfs-utils
 
 rm -rf $PKG
-mkdir -p $TMP $PKG
+mkdir -p $TMP $PKG/etc/exports.d
 
 # Add defaults file:
 mkdir -p $PKG/etc/default
diff --git a/source/n/nfs-utils/rc.nfsd b/source/n/nfs-utils/rc.nfsd
index b73d8cc81..ad087a355 100644
--- a/source/n/nfs-utils/rc.nfsd
+++ b/source/n/nfs-utils/rc.nfsd
@@ -16,13 +16,10 @@ if [ -r /etc/default/nfs ]; then
 fi
 
 nfsd_start() {
-  # Sanity checks.  Exit if there's no /etc/exports, or if there aren't any
-  # shares defined in it.
-  if [ ! -r /etc/exports ]; then # no config file, exit:
-    exit
-  elif ! grep -v '^#' /etc/exports | grep '/' 1> /dev/null 2> /dev/null ; then
-    exit # no uncommented shares in /etc/exports
-  fi
+  # There used to be "sanity checks" here to exit without starting if various
+  # config files didn't exist, or didn't contain certain expected content.
+  # This behavior led to some bugs and has been removed. It's not our business
+  # to check your config files - that's for the binaries that use them.
 
   # If we do not detect nfsd support built into the kernel (or previously
   # loaded as a module), we will try to load the nfsd.ko kernel module:
@@ -43,7 +40,7 @@ nfsd_start() {
       sh /etc/rc.d/rc.rpc start
     else
       # Sure, we tested for rpc.statd, but this is the probable cause:
-      echo "FATAL:  Can't start NFS server without portmap package."
+      echo "FATAL:  Can't start NFS server without rpcbind package."
       sleep 5
       exit 1
     fi
-- 
cgit v1.2.3