nfs-utils: fix build

This commit is contained in:
suvari
2023-01-08 14:41:17 +03:00
parent f4de32d18e
commit e78a182976
4 changed files with 4 additions and 72 deletions
+1
View File
@@ -20,6 +20,7 @@ def setup():
--enable-nfsv4 \
--enable-gss \
--with-krb5=/usr \
--libexecdir=/usr/lib \
--with-statedir=/var/lib/nfs")
pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
@@ -1,12 +0,0 @@
diff -up nfs-utils-1.2.1/support/nfs/exports.c.orig nfs-utils-1.2.1/support/nfs/exports.c
--- nfs-utils-1.2.1/support/nfs/exports.c.orig 2010-01-15 10:48:49.631894982 -0500
+++ nfs-utils-1.2.1/support/nfs/exports.c 2010-01-15 11:05:02.009874055 -0500
@@ -483,7 +483,7 @@ static void fix_pseudoflavor_flags(struc
static int
parseopts(char *cp, struct exportent *ep, int warn, int *had_subtree_opt_ptr)
{
- int had_subtree_opt = 0;
+ int had_subtree_opt = 1;
char *flname = efname?efname:"command line";
int flline = efp?efp->x_line:0;
unsigned int active = 0;
@@ -1,58 +0,0 @@
diff -up nfs-utils-1.2.1/utils/statd/sm-notify.man.save nfs-utils-1.2.1/utils/statd/sm-notify.man
--- nfs-utils-1.2.1/utils/statd/sm-notify.man.save 2010-01-15 11:10:25.096874609 -0500
+++ nfs-utils-1.2.1/utils/statd/sm-notify.man 2010-01-15 11:14:12.636873981 -0500
@@ -186,7 +186,7 @@ where NSM state information resides.
If this option is not specified,
.B sm-notify
uses
-.I /var/lib/nfs
+.I /var/lib/nfs/statd
by default.
.IP
After starting,
@@ -287,13 +287,13 @@ Currently, the
command supports sending notification only via datagram transport protocols.
.SH FILES
.TP 2.5i
-.I /var/lib/nfs/sm
+.I /var/lib/nfs/statd/sm
directory containing monitor list
.TP 2.5i
-.I /var/lib/nfs/sm.bak
+.I /var/lib/nfs/statd/sm.bak
directory containing notify list
.TP 2.5i
-.I /var/lib/nfs/state
+.I /var/lib/nfs/statd/state
NSM state number for this host
.TP 2.5i
.I /proc/sys/fs/nfs/nsm_local_state
diff -up nfs-utils-1.2.1/utils/statd/statd.man.save nfs-utils-1.2.1/utils/statd/statd.man
--- nfs-utils-1.2.1/utils/statd/statd.man.save 2010-01-15 11:10:25.098906325 -0500
+++ nfs-utils-1.2.1/utils/statd/statd.man 2010-01-15 11:11:03.874769717 -0500
@@ -232,7 +232,7 @@ where NSM state information resides.
If this option is not specified,
.B rpc.statd
uses
-.I /var/lib/nfs
+.I /var/lib/nfs/statd
by default.
.IP
After starting,
@@ -368,13 +368,13 @@ As long as at least one network transpor
will operate.
.SH FILES
.TP 2.5i
-.I /var/lib/nfs/sm
+.I /var/lib/nfs/statd/sm
directory containing monitor list
.TP 2.5i
-.I /var/lib/nfs/sm.bak
+.I /var/lib/nfs/statd/sm.bak
directory containing notify list
.TP 2.5i
-.I /var/lib/nfs/state
+.I /var/lib/nfs/statd/state
NSM state number for this host
.TP 2.5i
.I /run/run.statd.pid
+3 -2
View File
@@ -28,8 +28,6 @@
<Dependency>libutil-linux-devel</Dependency>
</BuildDependencies>
<Patches>
<!-- <Patch level="1">nfs-utils-1.2.1-statdpath-man.patch</Patch> -->
<!-- <Patch level="1">nfs-utils-1.2.1-exp-subtree-warn-off.patch</Patch> -->
<!-- <Patch level></Patch> -->
</Patches>
</Source>
@@ -57,6 +55,9 @@
<Path fileType="config">/etc/gssapi_mech.conf</Path>
<Path fileType="config">/etc/nfsmount.conf</Path>
<Path fileType="config">/etc/conf.d/nfs</Path>
<Path fileType="config">/usr/lib/modprobe.d/50-nfs.conf</Path>
<Path fileType="library">/usr/lib/nfsrahead</Path>
<Path fileType="library">/usr/lib/udev/rules.d/99-nfs.rules</Path>
<Path fileType="executable">/usr/sbin</Path>
<Path fileType="executable">/sbin</Path>
<Path fileType="library">/var/lib</Path>