devil-linux-commit

[Serge L. <sma...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory vz-cvs-3.sog:/tmp/cvs-serv1712/scripts

Modified Files:
	libtirpc nfs-utils 
Added Files:
	rpcbind 
Log Message:

- portmap is replaced by rpcbind
- updated nfs-utils 
- updated nfs libs


Index: libtirpc
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/libtirpc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- libtirpc	6 Jan 2010 15:20:24 -0000	1.2
+++ libtirpc	20 Jul 2011 18:14:41 -0000	1.3
@@ -22,7 +22,10 @@
 		# install it in local system, because other programs could need it
 		make install
 		;;
-
+	install )
+		cp -p doc/etc_netconfig $ETCDIR/etc/netconfig
+		chmod 0644 $ETCDIR/etc/netconfig
+		;;
 	* )
 		echo "ERROR ($0)"
 		echo "please add parameter so I know what to do"

--- NEW FILE: rpcbind ---
#!/bin/bash
# $Source: /cvsroot/devil-linux/build/scripts/rpcbind,v $
# $Revision: 1.1 $
# $Date: 2011/07/20 18:14:41 $
#
# http://www.devil-linux.org

# get the directoryname of the script
MYDIR=${0%/*}

# source functions and config
source $MYDIR/settings

case $1 in
	build )
		if [ "$CONFIG_PORTMAP" = "y" ]; then
			./configure --prefix=/usr || exit 1
			make $PMAKE all || exit 1
			strip_debug
		fi
		;;
	install )
		if [ "$CONFIG_PORTMAP" = "y" ]; then
			make install DESTDIR=$TMPDIR || exit 1
			cp -dpvR $TMPDIR/* $CDDIR/ || exit 1
			$MYDIR/scripts/rpcbind $ETCDIR/etc/init.d/ || exit 1

                	echo "# Start $MYNAME?" >> $CONFIGFILE
                	echo "START_$MYNAME=no" >> $CONFIGFILE
                	echo >> $CONFIGFILE || exit 1

                	echo "HELP_$MYNAME=\"$MYNAME is the RPC Portmapper\"" >> $SOFTWAREHELP
		fi
		;;
	* )
		echo "ERROR ($0)"
		echo "please add parameter so I know what to do"
		exit 1
		;;
esac

Index: nfs-utils
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/nfs-utils,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- nfs-utils	28 Feb 2010 10:06:41 -0000	1.9
+++ nfs-utils	20 Jul 2011 18:14:41 -0000	1.10
@@ -16,37 +16,40 @@
 
 case $1 in
         build )
-		if [ "$CONFIG_NFSD" = "y" ]; then
-		    ./configure --prefix=/usr --disable-gss --without-tcp-wrappers || exit 1
+		if [ "$CONFIG_NFSD" = "y" -o "$CONFIG_NFS" = "y" ]; then
+		    ./configure --prefix=/usr --without-tcp-wrappers --enable-nfsv41  --disable-gss --enable-ipv6  || exit 1
 		    make || exit 1
 		    strip_debug
 		fi
                 ;;
 
         install )
-		if [ "$CONFIG_NFSD" = "y" ]; then
-	    	rm -rf $TMPDIR || exit 1
-		mkdir -p $TMPDIR || exit 1
-		make install DESTDIR=$TMPDIR || exit 1
-		cp -ar $TMPDIR/* $CDDIR/ || exit 1
-		rm -rf $TMPDIR || exit 1
-		cp -p /etc/rpc $ETCDIR/etc/ || exit 1
-		cat > $ETCDIR/etc/sysconfig/nfs-server <<-EOF
-		    PORT="2049"
-		    PROCESSES="8"
-		    QUOTAS="no"
-		    KILLDELAY="10"
-		EOF
-		touch $ETCDIR/etc/exports || exit 1
-	
-		cp $MYDIR/scripts/nfsd $ETCDIR/etc/init.d || exit 1
+		if [ "$CONFIG_NFSD" = "y" -o "$CONFIG_NFS" = "y" ]; then
+	    		rm -rf $TMPDIR || exit 1
+			mkdir -p $TMPDIR || exit 1
+			make install DESTDIR=$TMPDIR || exit 1
+			cp -ar $TMPDIR/* $CDDIR/ || exit 1
+			rm -rf $TMPDIR || exit 1
+			cp -p /etc/rpc $ETCDIR/etc/ || exit 1
 		
-		echo "# Start NFS server?" >> $CONFIGFILE
-		echo "START_NFSD=no" >> $CONFIGFILE
-		echo >> $CONFIGFILE
-		echo "HELP_NFSD=\"NFSD is Network File System v4(3,2) Server"
+			if [ "$CONFIG_NFSD" = "y" ] ; then
+				cat > $ETCDIR/etc/sysconfig/nfs-server <<-EOF
+				    PORT="2049"
+				    PROCESSES="8"
+				    QUOTAS="no"
+				    KILLDELAY="10"
+				EOF
+
+		    		touch $ETCDIR/etc/exports || exit 1
+		    		cp $MYDIR/scripts/nfsd $ETCDIR/etc/init.d || exit 1
+		    		    	
+		    		echo "# Start NFS server?" >> $CONFIGFILE
+		    		echo "START_NFSD=no" >> $CONFIGFILE
+		    		echo >> $CONFIGFILE
+		    		echo "HELP_NFSD=\"NFSD is Network File System v4(3,2) Server"
+			fi
 		
-		fi	
+		fi
 		;;
         * )
 			echo "ERROR ($0)"