[Devil-linux-commit] build/scripts poptop,NONE,1.1.2.1 finalize,1.3,1.3.2.1 pptp-patches,1.10.2.1,1.10.2.2 pptpd,1.18,NONE

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

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

Modified Files:
      Tag: rel-1-0-patches
	finalize pptp-patches 
Added Files:
      Tag: rel-1-0-patches
	poptop 
Removed Files:
      Tag: rel-1-0-patches
	pptpd 
Log Message:
- jail script now works fine with subdirectories
- updated zlib to v1.2.1
- updated vsftpd to v1.2.1
- updated sagator to v20031201
- updated pcmcia-cs to v3.2.7
- updated lftp to v2.6.10
- updated iANS to v2.3.63b
- updated e1000 to v5.2.22
- updated e100 to v2.3.33
- updated cyrus-sasl to v2.1.17
- updated cyrus-imapd to v2.1.16
- updated SpamAssassin to v2.61
- updated cvs to v1.12.4
- ownership of /etc isn't changed anymore to root during boot
- updated poptop to v1.1.4b4
- updated Kernel mppe patch (fixes pptp problems)
- added kernel patch against do_brk vulnerability


--- NEW FILE: poptop ---
#!/bin/bash
# $Source: /cvsroot/devil-linux/build/scripts/poptop,v $
# $Revision: 1.1.2.1 $
# $Date: 2003/12/20 18:59:40 $
#
# http://www.devil-linux.org

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

### BEGIN INIT INFO
# Provides:       pptpd
# Required-Start: $basebuildtools $libs ppp
# Required-Stop:
# Default-Start:  1 2
# Default-Stop:
# Description:    description
### END INIT INFO

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

# source functions and config
source $MYDIR/settings
source $MYDIR/functions

MYNAME=POPTOP

case $1 in
    build )
		if [ "$CONFIG_PPP" = "y" ] && [ "$CONFIG_POPTOP" = "y" ]; then
			./configure --prefix=/usr || exit 1
			make $PMAKE all || exit 1
			strip_debug
		fi
        ;;

    install )
		if [ "$CONFIG_PPP" = "y" ] && [ "$CONFIG_POPTOP" = "y" ]; then
			rm -rf $WORKDIR/tmp || exit 1
			mkdir -p $WORKDIR/tmp || exit 1
			make install DESTDIR=$WORKDIR/tmp || exit 1
			copy_docs $WORKDIR/tmp
			mkdir -p $DOCDIR/pptpd || exit 1
			cp -dp ./html/* $DOCDIR/pptpd
			copy_files $WORKDIR/tmp/usr $CDDIR || exit 1
			cp -p ./samples/pptpd.conf $ETCDIR/etc || exit 1
			cp -p ./samples/options $ETCDIR/etc/ppp/options.pptp || exit 1
			cp $MYDIR/scripts/pptpd $ETCDIR/etc/init.d/
			rm -rf $WORKDIR/tmp || exit 1

			echo "# Start $MYNAME?" >> $CONFIGFILE
			echo "START_PPTPD=no" >> $CONFIGFILE
			echo >> $CONFIGFILE
			echo "HELP_PPTPD=\"PPTPD is a Point to Point Tunneling Server (MS VPN)\"" >> $SOFTWAREHELP
		fi
    	;;

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


Index: finalize
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/finalize,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- finalize	6 Sep 2003 01:13:57 -0000	1.3
+++ finalize	20 Dec 2003 18:59:39 -0000	1.3.2.1
@@ -22,6 +22,8 @@
 		cp /etc/shadow $ETCDIR/etc/ || exit 1
 		cp /etc/gshadow $ETCDIR/etc/ || exit 1
 		rm -rf $ETCDIR/etc/modules/*
+
+		chown -R 0.0 $ETCDIR/etc || exit 1
 		;;
 
 	* )

Index: pptp-patches
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/pptp-patches,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -d -r1.10.2.1 -r1.10.2.2
--- pptp-patches	16 Nov 2003 18:37:18 -0000	1.10.2.1
+++ pptp-patches	20 Dec 2003 18:59:40 -0000	1.10.2.2
@@ -5,6 +5,18 @@
 #
 # http://www.devil-linux.org
 
+# you need the next line, otherwise script won't be executed !!!
+# DL-build-system v3
+
+### BEGIN INIT INFO
+# Provides:       pptp-patches
+# Required-Start: $basebuildtools $libs
+# Required-Stop:
+# Default-Start:  1
+# Default-Stop:
+# Description:    description
+### END INIT INFO
+
 # get the directoryname of the script
 MYDIR=${0%/*}
 
@@ -19,19 +31,12 @@
 		PPPDIR=$(find_src_dir ppp)
 		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
-		cd $KERNELDIR || exit 1
-		patch -p1 < $PATCHDIR/linux-2.4.21-openssl-0.9.6b-mppe.patch || exit 1
-		popd > /dev/null
+		cd mppe
+		yes "" | ./mppeinstall.sh $KERNELDIR || exit 1
+		echo "CONFIG_PPP_MPPE=m" >> $KERNELDIR/.config || exit 1
 	    fi
 	fi
         ;;
-	
-    install )
-	# nothing to do here
-    	;;
 
     * )
     	echo "ERROR ($0)"

--- pptpd DELETED ---