summaryrefslogtreecommitdiff
path: root/nfs-utils
diff options
context:
space:
mode:
authorJuergen Daubert <jue@jue.li>2015-02-02 10:49:47 +0100
committerJuergen Daubert <jue@jue.li>2015-02-02 10:49:47 +0100
commitfdb2fa0311536a9251dad90ee0c9e7b5592b2f3d (patch)
tree59d10e810da3e6ca1ed958b72695a79d796e489e /nfs-utils
parent7ba9ea7efa65b67294c608c431a6274eba814401 (diff)
downloadopt-fdb2fa0311536a9251dad90ee0c9e7b5592b2f3d.tar.gz
opt-fdb2fa0311536a9251dad90ee0c9e7b5592b2f3d.tar.xz
nfs-utils: update to 1.3.2
Diffstat (limited to 'nfs-utils')
-rw-r--r--nfs-utils/.footprint1
-rw-r--r--nfs-utils/.md5sum3
-rw-r--r--nfs-utils/Pkgfile7
-rw-r--r--nfs-utils/statd_foreground_mode.patch27
4 files changed, 35 insertions, 3 deletions
diff --git a/nfs-utils/.footprint b/nfs-utils/.footprint
index 8e120eccc..0236123be 100644
--- a/nfs-utils/.footprint
+++ b/nfs-utils/.footprint
@@ -17,6 +17,7 @@ drwxr-xr-x root/root usr/man/
drwxr-xr-x root/root usr/man/man5/
-rw-r--r-- root/root usr/man/man5/exports.5.gz
-rw-r--r-- root/root usr/man/man5/nfs.5.gz
+-rw-r--r-- root/root usr/man/man5/nfsmount.conf.5.gz
drwxr-xr-x root/root usr/man/man7/
-rw-r--r-- root/root usr/man/man7/nfsd.7.gz
drwxr-xr-x root/root usr/man/man8/
diff --git a/nfs-utils/.md5sum b/nfs-utils/.md5sum
index 29b3a12fd..68a042eed 100644
--- a/nfs-utils/.md5sum
+++ b/nfs-utils/.md5sum
@@ -1,5 +1,6 @@
c5ccf58f5f9f57aba75c8b72219eb6e6 exports
167ea3a16eb6f33b3642e920147bb265 idmapd.conf
1477840e1c19e0ac95c538db8b401d90 nfs
-97f157f954edb6d4d4385a0c5986f36f nfs-utils-1.3.1.tar.bz2
+1e2f3c1ed468dee02d00c534c002ea10 nfs-utils-1.3.2.tar.bz2
071bb2c4e2104599f0bba55a8ce35f37 nfsserver
+b4c745cd305c718157af2f24eef21525 statd_foreground_mode.patch
diff --git a/nfs-utils/Pkgfile b/nfs-utils/Pkgfile
index 88870149e..2de296786 100644
--- a/nfs-utils/Pkgfile
+++ b/nfs-utils/Pkgfile
@@ -4,14 +4,17 @@
# Depends on: util-linux eudev libcap rpcbind libnfsidmap libevent keyutils sqlite3
name=nfs-utils
-version=1.3.1
+version=1.3.2
release=1
source=(http://downloads.sourceforge.net/project/nfs/$name/$version/$name-$version.tar.bz2 \
- exports idmapd.conf nfs nfsserver)
+ exports idmapd.conf nfs nfsserver \
+ statd_foreground_mode.patch)
build () {
cd $name-$version
+ patch -p1 -i $SRC/statd_foreground_mode.patch
+
./configure --prefix=/usr \
--mandir=/usr/man \
--sysconfdir=/etc \
diff --git a/nfs-utils/statd_foreground_mode.patch b/nfs-utils/statd_foreground_mode.patch
new file mode 100644
index 000000000..d171669a5
--- /dev/null
+++ b/nfs-utils/statd_foreground_mode.patch
@@ -0,0 +1,27 @@
+# https://bugzilla.redhat.com/show_bug.cgi?id=1188052
+
+commit 17a3e5bffb7110d46de1bf42b64b90713ff5ea50
+Author: Chris Mayo <aklhfex@gmail.com>
+Date: Sun Feb 1 12:03:46 2015 -0500
+
+ statd: Fix test for foreground mode
+
+ daemon_init parameter has the opposite sense
+ to code removed in commit 7addf9d
+
+ Signed-off-by: Chris Mayo <aklhfex@gmail.com>
+ Signed-off-by: Steve Dickson <steved@redhat.com>
+
+diff --git a/utils/statd/statd.c b/utils/statd/statd.c
+index 60ce6d1..2b7a167 100644
+--- a/utils/statd/statd.c
++++ b/utils/statd/statd.c
+@@ -393,7 +393,7 @@ int main (int argc, char **argv)
+ simulator (--argc, ++argv); /* simulator() does exit() */
+ #endif
+
+- daemon_init(!(run_mode & MODE_NODAEMON));
++ daemon_init((run_mode & MODE_NODAEMON));
+
+ if (run_mode & MODE_LOG_STDERR) {
+ xlog_syslog(0);

Generated by cgit