[Devil-linux-commit] build/scripts ppp,1.8,1.8.2.1 pptp-patches,1.10,1.10.2.1 pppoe-patch4,1.7.2.1,NONE

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

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv7572/scripts

Modified Files:
      Tag: rel-1-0-patches
	ppp pptp-patches 
Removed Files:
      Tag: rel-1-0-patches
	pppoe-patch4 
Log Message:
enabled some basic ATM stuff in kernel
updated ppp to CVS version debian uses
applied debian ppp patches (except ATM)


Index: ppp
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/ppp,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -d -r1.8 -r1.8.2.1
--- ppp	22 Jul 2003 19:45:11 -0000	1.8
+++ ppp	16 Nov 2003 18:37:18 -0000	1.8.2.1
@@ -17,8 +17,9 @@
 case $1 in
     build )
 	if [ "$CONFIG_PPP" = "y" ]; then
+	    cat ../ppp-patches/* | patch -p1 || exit 1
 	    ./configure || exit 1
-	    make $PMAKE all || exit 1
+	    make $PMAKE FILTER=y HAVE_INET6=y CBCP=y all || exit 1
 	    strip_debug
 	fi
         ;;

Index: pptp-patches
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/pptp-patches,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -d -r1.10 -r1.10.2.1
--- pptp-patches	13 Aug 2003 12:55:47 -0000	1.10
+++ pptp-patches	16 Nov 2003 18:37:18 -0000	1.10.2.1
@@ -20,8 +20,8 @@
 		KERNELDIR=$(find_src_dir linux)
 		PATCHDIR=$(pwd)
 		pushd $PPPDIR > /dev/null || exit 1
-		patch -p1 < $PATCHDIR/ppp-2.4.1-MSCHAPv2-fix.patch || exit 1
-		patch -p1 < $PATCHDIR/ppp-2.4.1-openssl-0.9.6-mppe-patch || exit 1
+		#patch -p1 < $PATCHDIR/ppp-2.4.1-MSCHAPv2-fix.patch || exit 1
+		#patch -p1 < $PATCHDIR/ppp-2.4.1-openssl-0.9.6-mppe-patch || exit 1
 		cd $KERNELDIR || exit 1
 		patch -p1 < $PATCHDIR/linux-2.4.21-openssl-0.9.6b-mppe.patch || exit 1
 		popd > /dev/null

--- pppoe-patch4 DELETED ---