devil-linux-commit Mailing List for Devil-Linux (Page 111)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
      Tag: rel-1-2-patches
	grsecurity prepare 
Log Message:
- removed remains of kernel 2.6 support from 1.2 series (fl)
- updated gradm to 2.1.8-200601212342 (fl)
- patched grsecurity so it applies on top of kernel 2.4.32-hf (fl)
- updated grsecurity to 2.1.8-2.4.32-200601211647 (fl)
- kernel 2.4.32-hf32.5 panics on boot so up to 2.4.32-hf32.6 (fl)
- added kernel hotfix patches so we run kernel 2.4.32-hf32.5 (fl)



Index: grsecurity
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/grsecurity,v
retrieving revision 1.20.2.5
retrieving revision 1.20.2.6
diff -u -d -r1.20.2.5 -r1.20.2.6

--- grsecurity	19 Jun 2005 13:54:12 -0000	1.20.2.5
+++ grsecurity	27 May 2006 13:30:04 -0000	1.20.2.6
@@ -25,15 +25,45 @@
 
 GRADMDIR=$(find_src_dir gradm)
 
+# the crude way: apply a patch to the file grsecurity.patch
+apply_patch2grsecurity_patch () {
+	local PATCHFILE=$1
+	bzcat ${PATCHFILE} | \
+		sed \
+			-e 's/^--- grsecurity.*/--- grsecurity.patch-org/g' \
+			-e 's/^+++ grsecurity.*/+++ grsecurity.patch/g' | \
+				patch -p0
+}
+
+
 case $1 in
     build )
 	if [ "$CONFIG_GRSECURITY" = "y" ] ; then
 		cd $KERNELDIR
 		if [ ! -f devil-linux-grsec-kernel-patches.done ]; then
-			zcat $DL_DIR/src/grsecurity-2.*$CONFIG_LINUX_VERSION*.patch.gz > grsecurity.patch || exit 1
+			zcat $DL_DIR/src/grsecurity-2.*$CONFIG_LINUX_VERSION*.patch.gz \
+				> grsecurity.patch || exit 1
+			# apply a patch to the patch if there's one
+			PATCHFILE="$(ls $DL_DIR/src/grsecurity-2.*-${CONFIG_LINUX_VERSION}.*-patch2patch.bz2 2>/dev/null)"
+			[ -n "${PATCHFILE}" ] && apply_patch2grsecurity_patch ${PATCHFILE} || exit 1
 			if [ ! "$CONFIG_VHZ" = "OFF" ]; then
-				bzcat $DL_DIR/src/grsecurity-kernel-vhz1.patch.bz2 |sed -e 's/^--- grsecurity.*/--- grsecurity.patch.old/g' -e 's/^+++ grsecurity.*/+++ grsecurity.patch/g' | patch -p0 || exit 1
+				PATCHFILE="$(ls $DL_DIR/src/grsecurity-kernel-vhz1.patch.bz2 2>/dev/null)"
+				[ -n "${PATCHFILE}" ] && apply_patch2grsecurity_patch ${PATCHFILE} || exit 1
 			fi
+			# patch kernel version inside patch so this patch applies cleanly
+			eval $(grep ^EXTRAVERSION Makefile | tr -d ' ')
+			eval $(grep ^\+EXTRAVERSION grsecurity.patch | tr -d ' ' | \
+				sed -e "s/+\(EXTRAVERSION\)/GRSEC_\1/")
+			cat <<-EOF | patch -p0 | exit 1
+				--- grsecurity.patch
+				+++ grsecurity.patch
+				@@ -974,2 +974,2 @@
+				--EXTRAVERSION =
+				-+EXTRAVERSION = ${GRSEC_EXTRAVERSION}
+				+-EXTRAVERSION = ${EXTRAVERSION}
+				++EXTRAVERSION = ${EXTRAVERSION}${GRSEC_EXTRAVERSION}
+			EOF
+			# finally apply grsecurity patch to kernel tree
 			cat grsecurity.patch | patch -p1 || exit 1
 			if [ ! "$CONFIG_VHZ" = "OFF" ]; then
 				bzcat $DL_DIR/src/grsecurity-kernel-vhz2.patch.bz2 | patch -p0 || exit 1
@@ -49,10 +79,11 @@
 
 		# compile the admin program
 		cd $GRADMDIR || exit 1
-		if [ ! -f devil-linux-patches.done ]; then
-		    bzcat $DL_DIR/src/gradm-distro.diff.bz2 | patch -p1
-		    touch devil-linux-patches.done
-		fi
+		# currently no need to patch gradm (FL - 20060526)
+		#if [ ! -f devil-linux-patches.done ]; then
+		#    bzcat $DL_DIR/src/gradm-distro.diff.bz2 | patch -p1 || exit 1
+		#    touch devil-linux-patches.done
+		#fi
 		
 		make $PMAKE all || exit 1
 		strip_debug

Index: prepare
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/prepare,v
retrieving revision 1.46.2.3
retrieving revision 1.46.2.4
diff -u -d -r1.46.2.3 -r1.46.2.4
--- prepare	13 Dec 2005 09:51:26 -0000	1.46.2.3
+++ prepare	27 May 2006 13:30:04 -0000	1.46.2.4
@@ -125,10 +125,12 @@
 
 	if [ ! -f devil-linux-kernel-patches.done ]; then
 	    touch devil-linux-kernel-patches.done
-	    for PATCH in $(ls $WORKDIR/kernel-patches-$CONFIG_LINUX_VERSION/* 2> /dev/null )
+	    PATCHDIR="$WORKDIR/kernel-patches-$CONFIG_LINUX_VERSION"
+	    for PATCH in $(cd ${PATCHDIR}; ls * 2> /dev/null )
 	    do
-		echo applying patch: $PATCH
-		patch -p1 -i $PATCH || exit 1
+		echo applying patch: ${PATCH/#[0-9][0-9]_/}
+		patch -p1 -i ${PATCHDIR}/$PATCH || exit 1
+		echo
 	    done
 	fi
 





2003	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (202)	Nov (201)	Dec (280)
2004	Jan (493)	Feb (106)	Mar (215)	Apr (163)	May (79)	Jun (193)	Jul (47)	Aug (71)	Sep (127)	Oct (41)	Nov (49)	Dec (120)
2005	Jan (147)	Feb (45)	Mar (26)	Apr (71)	May (52)	Jun (28)	Jul (92)	Aug (50)	Sep (35)	Oct (193)	Nov (106)	Dec (52)
2006	Jan (51)	Feb (38)	Mar (33)	Apr (79)	May (107)	Jun (67)	Jul (21)	Aug (65)	Sep (44)	Oct (87)	Nov (12)	Dec (56)
2007	Jan (48)	Feb (58)	Mar (63)	Apr (31)	May (25)	Jun (20)	Jul (72)	Aug (54)	Sep (30)	Oct (76)	Nov (74)	Dec (25)
2008	Jan (39)	Feb (39)	Mar (62)	Apr (64)	May (59)	Jun (31)	Jul (25)	Aug (25)	Sep (17)	Oct (24)	Nov	Dec (1)
2009	Jan (60)	Feb (39)	Mar (16)	Apr (30)	May (52)	Jun (35)	Jul (15)	Aug (15)	Sep (21)	Oct (32)	Nov (39)	Dec (52)
2010	Jan (42)	Feb (40)	Mar (23)	Apr (20)	May (27)	Jun (10)	Jul (30)	Aug (30)	Sep (66)	Oct (12)	Nov (35)	Dec (60)
2011	Jan (16)	Feb (1)	Mar (3)	Apr (28)	May (21)	Jun	Jul (12)	Aug (6)	Sep (10)	Oct (14)	Nov (40)	Dec (60)
2012	Jan (23)	Feb (17)	Mar (24)	Apr (18)	May (13)	Jun (1)	Jul	Aug (5)	Sep	Oct (5)	Nov (5)	Dec (15)
2013	Jan (2)	Feb (5)	Mar (1)	Apr (2)	May (2)	Jun (3)	Jul	Aug (3)	Sep (5)	Oct (3)	Nov (1)	Dec (1)
2014	Jan (3)	Feb (5)	Mar (8)	Apr (3)	May (1)	Jun (1)	Jul (2)	Aug	Sep (4)	Oct (10)	Nov	Dec (9)
2015	Jan (18)	Feb (17)	Mar (5)	Apr (2)	May	Jun (5)	Jul (1)	Aug (2)	Sep (1)	Oct (24)	Nov (20)	Dec (41)
2016	Jan (9)	Feb (3)	Mar (2)	Apr (7)	May (8)	Jun (1)	Jul (6)	Aug (5)	Sep (2)	Oct (6)	Nov (1)	Dec (6)
2017	Jan (6)	Feb (1)	Mar	Apr (4)	May (1)	Jun (1)	Jul (2)	Aug (2)	Sep	Oct	Nov	Dec

devil-linux-commit Mailing List for Devil-Linux (Page 111)

devil-linux-commit — Mailing list for CVS commit messages.