[Devil-linux-commit] build/scripts backports.ssl_match_hostname, NONE, 1.1 certifi, NONE, 1.1 futur

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/devil-linux/build/scripts
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv24150/scripts

Modified Files:
	Python grsecurity open-vm-tools prepare 
Added Files:
	backports.ssl_match_hostname certifi futures html5lib pycurl 
	setuptools tornado 
Log Message:
- updated aufs3 to git-20140117
- added python library backports.ssl_match_hostname 3.4.0.2
- added python library certifi 14.05.14
- added python library futures 2.2.0
- updated grsecurity to 3.0-3.2.66-201501142321.patch
- added python library html5lib 0.999
- added python library pycurl 7.19.5.1
- updated setuptools to 12.0.4
- added python library tornado 4.0.2
- build system: moved grsecurity patch into prepare script


Index: open-vm-tools
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/open-vm-tools,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21

--- open-vm-tools	20 Jul 2014 20:09:38 -0000	1.20
+++ open-vm-tools	24 Jan 2015 21:08:15 -0000	1.21
@@ -17,6 +17,7 @@
 case $1 in
 	build )
 		if [ "$CONFIG_OPEN_VM_TOOLS" = "y" ]; then
+			patch_from_file 1 $DL_DIR/src/open-vm-tools-vmhgfs-d_alias.patch.xz || exit 1
 			mkdir -p /lib/modules/$KERNELVERSION/kernel || exit 1
 			#replace_str ./configure "-Wall" "-Wall -Wno-deprecated -Wno-deprecated-declarations"
 			autoreconf -i || exit 1

--- NEW FILE: backports.ssl_match_hostname ---
#!/bin/bash
# $Source: /cvsroot/devil-linux/build/scripts/backports.ssl_match_hostname,v $
# $Revision: 1.1 $
# $Date: 2015/01/24 21:08:15 $
#
# http://www.devil-linux.org

# you need the next line, otherwise script won't be executed !!!
# DL-build-system v3

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

# source functions and config
source $MYDIR/settings

MYNAME=PYTHON_LDAP

case $1 in
	build )
		if [ "$CONFIG_PYTHON" = "y" ] && [ "$CONFIG_TORNADO" = "y" ] ; then
			python setup.py build || exit 1
		fi
		;;

	install )
		if [ "$CONFIG_PYTHON" = "y" ] && [ "$CONFIG_TORNADO" = "y" ] ; then
			mkdir -p $CDDIR/usr/lib/python*/site-packages || exit 1
			cp -vdpR build/lib*/* $CDDIR/usr/lib/python*/site-packages/ || exit 1
		fi
		;;

	* )
		echo "ERROR ($0)"
		echo "please add parameter so I know what to do"
		exit 1
		;;
esac


--- NEW FILE: pycurl ---
#!/bin/bash
# $Source: /cvsroot/devil-linux/build/scripts/pycurl,v $
# $Revision: 1.1 $
# $Date: 2015/01/24 21:08:15 $
#
# http://www.devil-linux.org

# you need the next line, otherwise script won't be executed !!!
# DL-build-system v3

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

# source functions and config
source $MYDIR/settings

MYNAME=PYTHON_LDAP

case $1 in
	build )
		if [ "$CONFIG_PYTHON" = "y" ] && [ "$CONFIG_TORNADO" = "y" ] ; then
			python setup.py build || exit 1
		fi
		;;

	install )
		if [ "$CONFIG_PYTHON" = "y" ] && [ "$CONFIG_TORNADO" = "y" ] ; then
			mkdir -p $CDDIR/usr/lib/python*/site-packages || exit 1
			cp -vdpR build/lib*/* $CDDIR/usr/lib/python*/site-packages/ || exit 1
		fi
		;;

	* )
		echo "ERROR ($0)"
		echo "please add parameter so I know what to do"
		exit 1
		;;
esac


Index: prepare
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/prepare,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -d -r1.94 -r1.95
--- prepare	31 Jan 2012 17:37:34 -0000	1.94
+++ prepare	24 Jan 2015 21:08:15 -0000	1.95
@@ -111,8 +111,6 @@
 	    cat $KERNEL_CONFIG_DIR/config_linux.$CONFIG_KERNEL_CPU >> $KERNELDIR/.config || exit 1
 	fi
 	
-	set_kernel_option CONFIG_NR_CPUS $CONFIG_LINUX_NR_CPUS
-
 	if [ "$CONFIG_ALSA" == "y" ]; then
 		cat $KERNEL_CONFIG_DIR/config_linux.alsa >> $KERNELDIR/.config || exit 1
 	fi
@@ -145,7 +143,6 @@
 		fi
 		popd > /dev/null 
 	fi
-
 	cd $KERNELDIR
 
 	patch_from_dir $WORKDIR/kernel-patches-$CONFIG_LINUX_VERSION
@@ -175,20 +172,46 @@
 			fi
 		fi
 	fi
+
+	if [ "$CONFIG_GRSECURITY" = "y" ] ; then
+		echo "Patching GRSecurity"
+		cd $KERNELDIR
+		if [ ! -f $KERNELDIR/devil-linux-grsec-kernel-patches.done ]; then
+			bzcat $DL_DIR/src/grsecurity-?.*.patch.bz2 | sed -e "s/-Wno-empty-body//g" | patch -d $KERNELDIR -p1 || exit 1
+			touch $KERNELDIR/devil-linux-grsec-kernel-patches.done
+		fi
+
+		# make sure we got all the line breaks we need
+		echo >> $KERNELDIR/.config
+		# add configuration to kernel config
+		cat $KERNEL_CONFIG_DIR/config_grsecurity >> $KERNELDIR/.config
+		echo >> $KERNELDIR/.config
+
+		## re-read the config to get the new kernel version
+		#source $MYDIR/settings
+		#echo new kernel version is $KERNELVERSION
+		#mkdir -p /lib/modules/$KERNELVERSION
+		#ln -sf $KERNELDIR /lib/modules/$KERNELVERSION/build || exit 1
+	fi
 	
-        if [ "$CONFIG_ETCFS" = "AUFS" ]; then
-	    echo "Patching AUFS"
-            if [ ! -f $KERNELDIR/.done_aufs_patch ]; then
-                AUFSDIR=$(find_src_dir aufs3)
-                patch -d $KERNELDIR -p1 -i ${AUFSDIR}/aufs3-standalone/aufs3-kbuild.patch || exit 1
-                patch -d $KERNELDIR -p1 -i ${AUFSDIR}/aufs3-standalone/aufs3-base.patch || exit 1
-                patch -d $KERNELDIR -p1 -i ${AUFSDIR}/aufs3-standalone/aufs3-standalone.patch || exit 1
-                cp -dpvR ${AUFSDIR}/aufs3-standalone/{fs,Documentation} $KERNELDIR/ || exit 1
-                cp -dpvR ${AUFSDIR}/aufs3-standalone/include/linux/aufs_type.h $KERNELDIR/include/linux/ || exit 1
-                #patch -d $KERNELDIR -p1 -i ${AUFSDIR}/aufs3-standalone/aufs3-loopback.patch || exit 1
-                bzcat $DL_DIR/src/aufs2-pax-fix.patch.bz2 | patch -d $KERNELDIR -p1 || exit 1
-                touch $KERNELDIR/.done_aufs_patch
-            fi
+	if [ "$CONFIG_ETCFS" = "AUFS" ]; then
+		echo "Patching AUFS"
+		if [ ! -f $KERNELDIR/.done_aufs_patch ]; then
+			AUFSDIR=$(find_src_dir aufs3)
+			xzcat ${DL_DIR}/src/aufs-d_child.patch.xz | patch -d ${AUFSDIR} -p0 || exit 1
+			if [ "$CONFIG_GRSECURITY" = "y" ] ; then
+				patch -d $KERNELDIR -p1 -i ${AUFSDIR}/aufs3-standalone/aufs3-mmap-grsecurity.patch || exit 1
+			else
+				patch -d $KERNELDIR -p1 -i ${AUFSDIR}/aufs3-standalone/aufs3-mmap.patch || exit 1
+			fi
+			patch -d $KERNELDIR -p1 -i ${AUFSDIR}/aufs3-standalone/aufs3-kbuild.patch || exit 1
+			patch -d $KERNELDIR -p1 -i ${AUFSDIR}/aufs3-standalone/aufs3-base.patch || exit 1
+			patch -d $KERNELDIR -p1 -i ${AUFSDIR}/aufs3-standalone/aufs3-standalone.patch || exit 1
+			cp -dpvR ${AUFSDIR}/aufs3-standalone/{fs,Documentation} $KERNELDIR/ || exit 1
+			cp -dpvR ${AUFSDIR}/aufs3-standalone/include/linux/aufs_type.h $KERNELDIR/include/linux/ || exit 1
+			bzcat $DL_DIR/src/aufs2-pax-fix.patch.bz2 | patch -d $KERNELDIR -p1 || exit 1
+			touch $KERNELDIR/.done_aufs_patch
+		fi
 	    set_kernel_option CONFIG_AUFS_FS y
 	    set_kernel_option CONFIG_AUFS_HINOTIFY n
 	    set_kernel_option CONFIG_AUFS_HNOTIFY n
@@ -213,13 +236,15 @@
 					 
 	set_all_kernel_options crypto
 	set_all_kernel_options drivers/i2c
-        set_all_kernel_options drivers/hwmon
-							
+    set_all_kernel_options drivers/hwmon
+	
 	make oldconfig || exit 1
 #	( yes "" | make oldconfig ) || exit 1
 	
 	# make sure we have all needed and clean directories
 	# one for the DL Kernel and one for the build system Kernel
+	# re-read the config to get the new kernel version
+	source $MYDIR/settings
 	rm -rf /lib/modules
 	mkdir -p /lib/modules/$KERNELVERSION || exit 1
 	mkdir -p /lib/modules/$(cat /proc/sys/kernel/osrelease) || exit 1

--- NEW FILE: tornado ---
#!/bin/bash
# $Source: /cvsroot/devil-linux/build/scripts/tornado,v $
# $Revision: 1.1 $
# $Date: 2015/01/24 21:08:16 $
#
# http://www.devil-linux.org

# you need the next line, otherwise script won't be executed !!!
# DL-build-system v3

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

# source functions and config
source $MYDIR/settings

MYNAME=PYTHON_LDAP

case $1 in
	build )
		if [ "$CONFIG_PYTHON" = "y" ] && [ "$CONFIG_TORNADO" = "y" ] ; then
			python setup.py build || exit 1
		fi
		;;

	install )
		if [ "$CONFIG_PYTHON" = "y" ] && [ "$CONFIG_TORNADO" = "y" ] ; then
			mkdir -p $CDDIR/usr/lib/python*/site-packages || exit 1
			cp -vdpR build/lib*/* $CDDIR/usr/lib/python*/site-packages/ || exit 1
		fi
		;;

	* )
		echo "ERROR ($0)"
		echo "please add parameter so I know what to do"
		exit 1
		;;
esac


--- NEW FILE: futures ---
#!/bin/bash
# $Source: /cvsroot/devil-linux/build/scripts/futures,v $
# $Revision: 1.1 $
# $Date: 2015/01/24 21:08:15 $
#
# http://www.devil-linux.org

# you need the next line, otherwise script won't be executed !!!
# DL-build-system v3

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

# source functions and config
source $MYDIR/settings

MYNAME=PYTHON_LDAP

case $1 in
	build )
		if [ "$CONFIG_PYTHON" = "y" ] && [ "$CONFIG_TORNADO" = "y" ] ; then
			python setup.py build || exit 1
		fi
		;;

	install )
		if [ "$CONFIG_PYTHON" = "y" ] && [ "$CONFIG_TORNADO" = "y" ] ; then
			mkdir -p $CDDIR/usr/lib/python*/site-packages || exit 1
			cp -vdpR build/lib*/* $CDDIR/usr/lib/python*/site-packages/ || exit 1
		fi
		;;

	* )
		echo "ERROR ($0)"
		echo "please add parameter so I know what to do"
		exit 1
		;;
esac


Index: Python
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/Python,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- Python	5 Dec 2014 18:51:28 -0000	1.34
+++ Python	24 Jan 2015 21:08:15 -0000	1.35
@@ -36,8 +36,6 @@
 
 	    # we need to install it, because Python-LDAP needs it
 	    make install || exit 1
-	    # install the easyinstall stuff
-	    sh $DL_DIR/src/setuptools-0.6c11-py2.7.egg || exit 1
 	fi
         ;;
 

Index: grsecurity
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/grsecurity,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- grsecurity	4 Jan 2014 14:13:15 -0000	1.49
+++ grsecurity	24 Jan 2015 21:08:15 -0000	1.50
@@ -19,42 +19,23 @@
 case $1 in
     build )
 	if [ "$CONFIG_GRSECURITY" = "y" ] ; then
-		cd $KERNELDIR
-		if [ ! -f devil-linux-grsec-kernel-patches.done ]; then
-			bzcat $DL_DIR/src/grsecurity-?.*.patch.bz2 | sed -e "s/-Wno-empty-body//g" | patch -p1 || exit 1
-			touch devil-linux-grsec-kernel-patches.done
-		fi
-		# make sure we got all the line breaks we need
-		echo >> .config
-		# add configuration to kernel config
-		cat $KERNEL_CONFIG_DIR/config_grsecurity >> .config
-		echo >> .config
-		set_kernel_option CONFIG_NETLABEL n
-		set_kernel_option CONFIG_IP_NF_MATCH_STEALTH m
-		set_kernel_option CONFIG_SECURITY_NETWORK y 	
-		set_kernel_option CONFIG_SECURITY_NETWORK_XFRM y
-		set_kernel_option CONFIG_SECURITY_ROOTPLUG n
-		set_kernel_option CONFIG_SECURITY_PATH y
-		set_kernel_option CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR 0
-		set_kernel_option CONFIG_NETLABEL n
-		set_kernel_option CONFIG_IP_NF_SECURITY m
-		set_kernel_option CONFIG_IP6_NF_SECURITY m
-		set_kernel_option CONFIG_SECURITY_TOMOYO n
-		set_kernel_option CONFIG_GRKERNSEC_SETXID n
+		#set_kernel_option CONFIG_NETLABEL n
+		#set_kernel_option CONFIG_IP_NF_MATCH_STEALTH m
+		#set_kernel_option CONFIG_SECURITY_NETWORK y 	
+		#set_kernel_option CONFIG_SECURITY_NETWORK_XFRM y
+		#set_kernel_option CONFIG_SECURITY_ROOTPLUG n
+		#set_kernel_option CONFIG_SECURITY_PATH y
+		#set_kernel_option CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR 0
+		#set_kernel_option CONFIG_NETLABEL n
+		#set_kernel_option CONFIG_IP_NF_SECURITY m
+		#set_kernel_option CONFIG_IP6_NF_SECURITY m
+		#set_kernel_option CONFIG_SECURITY_TOMOYO n
+		#set_kernel_option CONFIG_GRKERNSEC_SETXID n
+		#set_kernel_option CONFIG_MAXSMP n
 				
-		# start oldconfig, in case there are new options
-		make oldconfig || exit 1
-
 		# compile the admin program
 		cd $GRADMDIR || exit 1
 		make $PMAKE all || exit 1
-
-		
-		# re-read the config to get the new kernel version
-		source $MYDIR/settings
-		echo new kernel version is $KERNELVERSION
-		mkdir -p /lib/modules/$KERNELVERSION
-		ln -sf $KERNELDIR /lib/modules/$KERNELVERSION/build || exit 1
 	fi
 	;;
 

--- NEW FILE: setuptools ---
#!/bin/bash
# $Source: /cvsroot/devil-linux/build/scripts/setuptools,v $
# $Revision: 1.1 $
# $Date: 2015/01/24 21:08:16 $
#
# http://www.devil-linux.org

# you need the next line, otherwise script won't be executed !!!
# DL-build-system v3

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

# source functions and config
source $MYDIR/settings

case $1 in
	build )
		if [ "$CONFIG_PYTHON" = "y" ] ; then
			python setup.py build || exit 1
			
			#we need this, so let's install it
			python setup.py install || exit 1
		fi
		;;

	install )
		if [ "$CONFIG_PYTHON" = "y" ] ; then
			mkdir -p $CDDIR/usr/lib/python*/site-packages || exit 1
			cp -vdpR build/lib*/* $CDDIR/usr/lib/python*/site-packages/ || exit 1
		fi
		;;

	* )
		echo "ERROR ($0)"
		echo "please add parameter so I know what to do"
		exit 1
		;;
esac


--- NEW FILE: certifi ---
#!/bin/bash
# $Source: /cvsroot/devil-linux/build/scripts/certifi,v $
# $Revision: 1.1 $
# $Date: 2015/01/24 21:08:15 $
#
# http://www.devil-linux.org

# you need the next line, otherwise script won't be executed !!!
# DL-build-system v3

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

# source functions and config
source $MYDIR/settings

MYNAME=PYTHON_LDAP

case $1 in
	build )
		if [ "$CONFIG_PYTHON" = "y" ] && [ "$CONFIG_TORNADO" = "y" ] ; then
			python setup.py build || exit 1
		fi
		;;

	install )
		if [ "$CONFIG_PYTHON" = "y" ] && [ "$CONFIG_TORNADO" = "y" ] ; then
			mkdir -p $CDDIR/usr/lib/python*/site-packages || exit 1
			cp -vdpR build/lib*/* $CDDIR/usr/lib/python*/site-packages/ || exit 1
		fi
		;;

	* )
		echo "ERROR ($0)"
		echo "please add parameter so I know what to do"
		exit 1
		;;
esac


--- NEW FILE: html5lib ---
#!/bin/bash
# $Source: /cvsroot/devil-linux/build/scripts/html5lib,v $
# $Revision: 1.1 $
# $Date: 2015/01/24 21:08:15 $
#
# http://www.devil-linux.org

# you need the next line, otherwise script won't be executed !!!
# DL-build-system v3

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

# source functions and config
source $MYDIR/settings

MYNAME=PYTHON_LDAP

case $1 in
	build )
		if [ "$CONFIG_PYTHON" = "y" ] && [ "$CONFIG_TORNADO" = "y" ] ; then
			python setup.py build || exit 1
		fi
		;;

	install )
		if [ "$CONFIG_PYTHON" = "y" ] && [ "$CONFIG_TORNADO" = "y" ] ; then
			mkdir -p $CDDIR/usr/lib/python*/site-packages || exit 1
			cp -vdpR build/lib*/* $CDDIR/usr/lib/python*/site-packages/ || exit 1
		fi
		;;

	* )
		echo "ERROR ($0)"
		echo "please add parameter so I know what to do"
		exit 1
		;;
esac






[Devil-linux-commit] build/scripts backports.ssl_match_hostname, NONE, 1.1 certifi, NONE, 1.1 futur

[Devil-linux-commit] build/scripts backports.ssl_match_hostname, NONE, 1.1 certifi, NONE, 1.1 futures, NONE, 1.1 html5lib, NONE, 1.1 pycurl, NONE, 1.1 setuptools, NONE, 1.1 tornado, NONE, 1.1 Python, 1.34, 1.35 grsecurity, 1.49, 1.50 open-vm-tools, 1.20, 1.21 prepare, 1.94, 1.95