[SSI] openssi/specs nfs-utils.spec,1.1.15.2,1.1.15.2.2.1

Roger Tsang <[email protected]> Thu, 15 Jul 2010 03:56:53 +0000
Newsgroups gmane.linux.cluster.ssic.cvs
Message-ID <[email protected]>
Update of /cvsroot/ssic-linux/openssi/specs
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv14979

Modified Files:
      Tag: OPENSSI-CENTOS
	nfs-utils.spec 
Log Message:
OpenSSI changes for nfs-utils-1.0.6-93.EL4


Index: nfs-utils.spec
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/specs/nfs-utils.spec,v
retrieving revision 1.1.15.2
retrieving revision 1.1.15.2.2.1
diff -u -d -r1.1.15.2 -r1.1.15.2.2.1
--- nfs-utils.spec	15 Jul 2010 03:51:44 -0000	1.1.15.2
+++ nfs-utils.spec	15 Jul 2010 03:56:51 -0000	1.1.15.2.2.1
@@ -1,7 +1,7 @@
 Summary: NFS utlilities and supporting daemons for the kernel NFS server.
 Name: nfs-utils
 Version: 1.0.6
-Release: 93.EL4
+Release: 93.EL4.ssi_1
 
 # group all 32bit related archs
 %define all_32bit_archs i386 i686 athlon
@@ -16,6 +16,7 @@
 Source12: rpcidmapd.init
 Source13: rpcgssd.init
 Source14: rpcsvcgssd.init
+Source15: SSInfs.init
 
 #
 # Upstream Patches
@@ -106,6 +107,8 @@
 
 # Experimental
 
+Patch1000: nfs-utils-ssi.patch
+
 Group: System Environment/Daemons
 Obsoletes: nfs-server
 Obsoletes: knfsd
@@ -119,7 +122,7 @@
 Provides: knfsd
 License: GPL
 Buildroot: %{_tmppath}/%{name}-root
-Requires: kernel >= 2.2.14, portmap >= 4.0, shadow-utils >= 2:4.0.3-49.RHEL4
+Requires: kernel >= 2.2.14, portmap >= 4.0-63.ssi_1, shadow-utils >= 2:4.0.3-49.RHEL4
 Requires: sed, gawk, sh-utils, fileutils, textutils, grep, tcp_wrappers
 Requires: modutils >= 2.4.26-9
 Requires: nfs-utils-lib libgssapi openldap
@@ -201,6 +204,9 @@
 %patch100 -p1 
 %patch150 -p1
 
+# OpenSSI patch
+%patch1000 -p1 -b .ssi
+
 %ifarch s390 s390x
 perl -pi -e 's/-fpie/-fPIE/' */*/Makefile
 %endif
@@ -236,6 +242,7 @@
 install -m 755 %{SOURCE12} $RPM_BUILD_ROOT/etc/rc.d/init.d/rpcidmapd
 install -m 755 %{SOURCE13} $RPM_BUILD_ROOT/etc/rc.d/init.d/rpcgssd
 install -m 755 %{SOURCE14} $RPM_BUILD_ROOT/etc/rc.d/init.d/rpcsvcgssd
+install -m 755 %{SOURCE15} $RPM_BUILD_ROOT/etc/rc.d/init.d/SSInfs
 
 install -m 644 utils/idmapd/idmapd.conf \
 	$RPM_BUILD_ROOT/etc/idmapd.conf
@@ -247,6 +254,8 @@
 
 mkdir -p $RPM_BUILD_ROOT/var/lib/nfs/statd/sm
 mkdir -p $RPM_BUILD_ROOT/var/lib/nfs/statd/sm.bak
+mkdir -p $RPM_BUILD_ROOT/var/lib/nfs/statd.cvip/sm
+mkdir -p $RPM_BUILD_ROOT/var/lib/nfs/statd.cvip/sm.bak
 
 # we are using quotad from quota utils
 rm %{buildroot}/%{_mandir}/man8/rquotad*
@@ -278,6 +287,12 @@
 /sbin/chkconfig --add nfslock
 /sbin/chkconfig --add rpcidmapd
 /sbin/chkconfig --add rpcgssd
+/sbin/chkconfig --add SSInfs
+# Enable SSInfs if standard nfs is already enabled
+if /sbin/chkconfig --list nfs | grep -q on
+then
+	/sbin/chkconfig SSInfs on
+fi
 # fix a regression in RHEL4U4 where statd ran as root (BZ 233073)
 if [ -f /var/lock/subsys/nfslock ]; then
 	/etc/rc.d/init.d/nfslock stop > /dev/null
@@ -298,6 +313,7 @@
     /sbin/chkconfig --del rpcsvcgssd
     /sbin/chkconfig --del nfs
     /sbin/chkconfig --del nfslock
+	/sbin/chkconfig --del SSInfs
     /usr/sbin/userdel rpcuser 2>/dev/null || :
     /usr/sbin/groupdel rpcuser 2>/dev/null || :
     /usr/sbin/userdel nfsnobody 2>/dev/null || :
@@ -313,6 +329,7 @@
 
 %triggerpostun -- nfs-server
 /sbin/chkconfig --add nfs
+/sbin/chkconfig --add SSInfs
 
 %triggerpostun -- knfsd
 /sbin/chkconfig --add nfs
@@ -332,6 +349,9 @@
 %dir %verify(not md5 size mtime) %attr(700,rpcuser,rpcuser) /var/lib/nfs/statd
 %dir %verify(not md5 size mtime) %attr(700,rpcuser,rpcuser) /var/lib/nfs/statd/sm
 %dir %verify(not md5 size mtime) %attr(700,rpcuser,rpcuser) /var/lib/nfs/statd/sm.bak
+%dir %verify(not md5 size mtime) %attr(700,rpcuser,rpcuser) /var/lib/nfs/statd.cvip
+%dir %verify(not md5 size mtime) %attr(700,rpcuser,rpcuser) /var/lib/nfs/statd.cvip/sm
+%dir %verify(not md5 size mtime) %attr(700,rpcuser,rpcuser) /var/lib/nfs/statd.cvip/sm.bak
 %config(noreplace) %verify(not md5 size mtime) %attr(644,rpcuser,rpcuser) /var/lib/nfs/state
 %config(noreplace) %verify(not md5 size mtime) /var/lib/nfs/xtab
 %config(noreplace) %verify(not md5 size mtime) /var/lib/nfs/etab
@@ -350,6 +370,7 @@
 /usr/sbin/rpc.svcgssd
 %{_mandir}/*/*
 %config /etc/rc.d/init.d/nfslock
+%config /etc/rc.d/init.d/SSInfs
 
 %changelog
 * Tue Apr  7 2009 Steve Dickson <[email protected]> 1.0.6-93.EL4


------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first