Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdetesting2.git;a=commitdiff;h=d025be307373ed59450775434840720d0224b3b8

commit d025be307373ed59450775434840720d0224b3b8
Author: Miklos Vajna <vmik...@frugalware.org>
Date:   Wed Jan 19 02:29:18 2011 +0100

nfs-utils-1.2.0-3-i686

- portmap -> rpcbind
- /usr/sbin/rpc.rquotad -> /sbin/rpc.rquotad
- add patch to fix up build (missing include of sys/stat.h)

diff --git a/source/network/nfs-utils/FrugalBuild 
b/source/network/nfs-utils/FrugalBuild
index 938a6c5..02b2abe 100644
--- a/source/network/nfs-utils/FrugalBuild
+++ b/source/network/nfs-utils/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=nfs-utils
pkgver=1.2.0
-pkgrel=2
+pkgrel=3
pkgdesc="Support programs for Network File Systems"
groups=('network')
archs=('i686' 'x86_64' 'ppc')
@@ -11,14 +11,15 @@ backup=(etc/exports etc/conf.d/nfsd etc/sysconfig/nfs)
_F_sourceforge_dirname="nfs"
_F_sourceforge_ext=".tar.bz2"
Finclude sourceforge
-depends=('portmap' 'libnfsidmap>=0.21' 'libevent>=1.4.3' 'quota-tools')
+depends=('rpcbind' 'libnfsidmap>=0.21' 'libevent>=1.4.3' 'quota-tools')
makedepends=('tcp_wrappers')
-source=($source exports rc.nfsd rc.nfsd-hu.po nfs)
+source=($source exports rc.nfsd rc.nfsd-hu.po nfs stat-include.patch)
sha1sums=('44edfc809e383bd72d481f1823d138877ff039aa' \
'02f887f84059e19d50d08295d6d0bc9d56312f65' \
-          '6b9e078146c366f4218692814c0f8946599cfbdd' \
+          '7584e36fd775b8986673ebf63ea355f770dc930c' \
'b28e6e7575dc08c3ee4a1b738e25c2f92daa4a62' \
-          'c2753a21b4ddc5afadd958a0f36aee6320ff8b5a')
+          'c2753a21b4ddc5afadd958a0f36aee6320ff8b5a' \
+          '1a541b7edac3e37b8b5360f568db1db13fecbce5')

build()
{
diff --git a/source/network/nfs-utils/rc.nfsd b/source/network/nfs-utils/rc.nfsd
index 0d579c9..06b264f 100644
--- a/source/network/nfs-utils/rc.nfsd
+++ b/source/network/nfs-utils/rc.nfsd
@@ -21,9 +21,9 @@ daemon=$"NFS services"
rc_start()
{
start_msg
-       if [ -z "$(cat /var/run/portmap.pid 2>/dev/null)" ]; then
+       if [ -z "$(cat /var/run/rpcbind.pid 2>/dev/null)" ]; then
ok 1
-               hint $"Portmap is not running"
+               hint $"rpcbind is not running"
exit 1
elif [ ! -r /etc/exports ]; then
ok 1
@@ -37,7 +37,7 @@ rc_start()
# load kernel module if necessary
[ -z "`/sbin/lsmod | grep "^nfsd "`" ] && /sbin/modprobe nfsd
/usr/sbin/exportfs -r >/dev/null 2>/dev/null
-       /usr/sbin/rpc.rquotad >/dev/null
+       /sbin/rpc.rquotad >/dev/null
# start 8 nfsd servers by default (an old Sun standard):
/usr/sbin/rpc.nfsd 8 >/dev/null
if [ ! -z "$MOUNTDPORT" ]; then
diff --git a/source/network/nfs-utils/stat-include.patch 
b/source/network/nfs-utils/stat-include.patch
new file mode 100644
index 0000000..07d3648
--- /dev/null
+++ b/source/network/nfs-utils/stat-include.patch
@@ -0,0 +1,36 @@
+diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c
+index 593a8eb..331e57e 100644
+--- a/utils/exportfs/exportfs.c
++++ b/utils/exportfs/exportfs.c
+@@ -13,6 +13,7 @@
+ #endif
+
+ #include <sys/vfs.h>
++#include <sys/stat.h>
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <string.h>
+diff --git a/utils/mount/mount.c b/utils/mount/mount.c
+index 06e2804..cd04db9 100644
+--- a/utils/mount/mount.c
++++ b/utils/mount/mount.c
+@@ -24,6 +24,7 @@
+
+ #include <unistd.h>
+ #include <sys/types.h>
++#include <sys/stat.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <errno.h>
+diff --git a/utils/mount/network.c b/utils/mount/network.c
+index 04a62ab..03a96d0 100644
+--- a/utils/mount/network.c
++++ b/utils/mount/network.c
+@@ -37,6 +37,7 @@
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/wait.h>
++#include <sys/stat.h>
+ #include <netinet/in.h>
+ #include <rpc/rpc.h>
+ #include <rpc/pmap_prot.h>
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to