[Devil-linux-commit] build/scripts grsecurity, 1.50, 1.51 linux, 1.78, 1.79 prepare, 1.97, 1.98

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

Modified Files:
	grsecurity linux prepare 
Log Message:
cleaning up the kernel configuration
don't keep grsec config separate from kernel
resolved issue where about 20% of memory was lost


Index: grsecurity
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/grsecurity,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- grsecurity	24 Jan 2015 21:08:15 -0000	1.50
+++ grsecurity	26 Dec 2015 14:20:38 -0000	1.51
@@ -19,20 +19,6 @@
 case $1 in
     build )
 	if [ "$CONFIG_GRSECURITY" = "y" ] ; then
-		#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
-				
 		# compile the admin program
 		cd $GRADMDIR || exit 1
 		make $PMAKE all || exit 1
@@ -55,19 +41,6 @@
 		cp -dp $MYDIR/scripts/grsecurity $ETCDIR/etc/init.d || exit 1
 		cp -dp $MYDIR/scripts/grsecurity.proc $ETCDIR/etc/sysconfig || exit 1
 
-		HELPFILE=$DOCDIR/grsecurity/kernel.help
-
-		test -f $HELPFILE &&  rm $HELPFILE
-
-		for KOPTION in $(grep -v "^#" $MYDIR/config/config_grsecurity | sort)
-		do
-			KOPTION=${KOPTION%%=*}
-			if $(get_kernel_help $KOPTION > ./help.tmp) ; then
-				cat  ./help.tmp >> $HELPFILE
-				echo >> $HELPFILE
-				echo >> $HELPFILE
-			fi
-		done
 		rm -rf $TMPDIR || exit 1
 	fi
 	;;

Index: prepare
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/prepare,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- prepare	17 Oct 2015 20:20:05 -0000	1.97
+++ prepare	26 Dec 2015 14:20:38 -0000	1.98
@@ -160,18 +160,6 @@
 			xzcat $DL_DIR/src/grsecurity-?.*.patch.xz | 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

Index: linux
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/linux,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- linux	28 Nov 2015 15:16:32 -0000	1.78
+++ linux	26 Dec 2015 14:20:38 -0000	1.79
@@ -30,7 +30,7 @@
 		    cat .config.add >> .config || exit 1
 		fi
 		
-		make oldconfig
+		#make oldconfig
 		make CC="gcc -specs=${WORKDIR}/gcc-specs-default" $PMAKE V=1 bzImage || exit 1
 		make CC="gcc -specs=${WORKDIR}/gcc-specs-default" $PMAKE V=1 modules || exit 1