[Devil-linux-commit] build/scripts cvs, 1.8, 1.9 open-vm-tools, 1.2, 1.3 openssl, 1.26, 1.27

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv28227/scripts

Modified Files:
	cvs open-vm-tools openssl 
Log Message:
- get closer to a working open-vm-tools package
- crypto library didn't work with grsecurity enabled (executable stack issue)


Index: open-vm-tools
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/open-vm-tools,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- open-vm-tools	25 Nov 2007 15:15:31 -0000	1.2
+++ open-vm-tools	24 Dec 2007 17:50:02 -0000	1.3
@@ -28,33 +28,36 @@
 	build )
 		if [ "$CONFIG_OPEN_VM_TOOLS" = "y" ]; then
 			CC="gcc -U_FORTIFY_SOURCE -fno-PIE" LDFLAGS=-liconv ./configure --prefix=/usr --without-x  || exit 1
-			make  all modules || exit 1
+			make  all modules || exit 1	
 		fi
 	        ;;
 
 	install )
 		if [ "$CONFIG_OPEN_VM_TOOLS" = "y" ]; then
 		    cp -dpvR libguestlib/.libs/libguestlib.so* $CDDIR/usr/lib/ || exit 1
-		    
-		exit 1
-			mkdir -p $CDDIR/lib/modules/$KERNELVERSION/misc/ || exit 1
-			cp -v vmmemctl-$KERNELVERSION $CDDIR/lib/modules/$KERNELVERSION/misc/vmmemctl.o || exit 1
-                        mkdir -p $CDDIR/lib/modules/$KERNELVERSION/kernel/drivers/net/ || exit 1
-                        cp -v vmxnet-$KERNELVERSION $CDDIR/lib/modules/$KERNELVERSION/kernel/drivers/net/vmxnet.o || exit 1
-
-                        VMBINDIR=$(find_src_dir vmbin)
-                        cp -dpvR $VMBINDIR/{lib,sbin} $CDDIR/usr/ || exit 1
-                        mkdir -p $ETCDIR/etc/vmware-tools || exit 1
-                        cp -dpvR $VMBINDIR/etc/* $ETCDIR/etc/ || exit 1
-                        cp $MYDIR/scripts/vmware $ETCDIR/etc/init.d || exit 1
 
-                        echo "# Load VMWare drivers?" >> $CONFIGFILE
-                        #echo "# the driver will autodetect if we're running within a VM" >> $CONFIGFILE
-                        #echo "# so you can safely leave this on" >> $CONFIGFILE
-                        echo "START_VMWARE=no" >> $CONFIGFILE
-                        echo >> $CONFIGFILE
-                        echo "HELP_VMWARE=\"Load the vmware modules for better performance\"" >> $SOFTWAREHELP
- 
+		    # copy all the binaries and put a vmware- in front of it
+		    SBINS="guestd/guestd checkvm/checkvm hgfsclient/hgfsclient hgfsmounter/hgfsmounter xferlogs/xferlogs"
+		    for SBIN in ${SBINS} ;
+		    do
+			cp -dpv $SBIN $CDDIR/usr/sbin/vmware-${SBIN##*/}
+		    done
+		    
+		    # now lets catch all the modules
+		    mkdir -p $CDDIR/lib/modules/$KERNELVERSION/misc/ || exit 1
+		    cp -dpv $(find modules/ -name \*.ko) $CDDIR/lib/modules/$KERNELVERSION/misc/ || exit 1
+		    
+                    mkdir -p $ETCDIR/etc/vmware-tools || exit 1
+		    cp -dpv scripts/linux/* $ETCDIR/etc/vmware-tools/ || exit 1
+		    
+                    cp $MYDIR/scripts/vmware $ETCDIR/etc/init.d/ || exit 1
+		    
+                    echo "# Load VMWare drivers?" >> $CONFIGFILE
+                    #echo "# the driver will autodetect if we're running within a VM" >> $CONFIGFILE
+                    #echo "# so you can safely leave this on" >> $CONFIGFILE
+                    echo "START_VMWARE=no" >> $CONFIGFILE
+                    echo >> $CONFIGFILE
+                    echo "HELP_VMWARE=\"Load the vmware modules for better performance\"" >> $SOFTWAREHELP 
 		fi
 		;;
 

Index: openssl
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/openssl,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- openssl	2 Nov 2007 17:08:35 -0000	1.26
+++ openssl	24 Dec 2007 17:50:02 -0000	1.27
@@ -32,6 +32,9 @@
 	    bzcat $SRCDIR/openssl-0.9.8e-engine.diff.bz2 | patch -p1 || exit 1
 	    touch .patches_done
         fi
+	
+	find crypto/ -name Makefile -exec sed 's/^ASFLAGS=/&-Wa,--noexecstack /' -i.orig {} \;
+	    
 	./Configure linux-elf shared threads zlib-dynamic --prefix=/usr --openssldir=/etc/ssl  || exit 1
         make depend || exit 1
 

Index: cvs
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/cvs,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- cvs	12 Dec 2004 21:48:08 -0000	1.8
+++ cvs	24 Dec 2007 17:50:02 -0000	1.9
@@ -28,7 +28,7 @@
 case $1 in
     build )
         if [ "$CONFIG_CVS" = "y" ]; then
-	    ./configure --prefix=/usr --sysconfdir=/etc || exit 1
+	    CC="gcc -D_FORTIFY_SOURCE=0" ./configure --prefix=/usr --sysconfdir=/etc || exit 1
     	    make $PMAKE all || exit 1
 	    strip_debug
 	fi