[Devil-linux-commit] build/scripts ntop,1.10,1.11 ppp,1.21,1.22

[Serge L. <sma...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv15929/d

Modified Files:
	ntop ppp 
Log Message:

- added mppe-mppc patch for ppp
- updated openssl
- updated ntop (still experimental)


Index: ppp
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/ppp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- ppp	15 Jan 2006 11:45:01 -0000	1.21
+++ ppp	10 Jan 2009 00:11:34 -0000	1.22
@@ -32,6 +32,12 @@
 				cat ../ppp-patches/* | patch -p1 || exit 1
 				touch .patches_done
 			fi
+		if [ "$CONFIG_PPTP_MPPE_MPPC" = "y" ]; then
+			if [ ! -f devil-linux-mppe_mppc-patch.done ]; then
+				bzcat $SRCDIR/ppp-*-mppe-mppc*patch.bz2 | patch -p1 || exit 1
+				touch devil-linux-mppe_mppc-patch.done
+			fi
+		fi
 			./configure --prefix=/usr || exit 1
 			replace_str pppd/Makefile "#CBCP=y" "CBCP=y"
 #			replace_str pppd/Makefile "USE_PAM=y" "#USE_PAM=y"

Index: ntop
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/ntop,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ntop	15 Jun 2007 13:23:54 -0000	1.10
+++ ntop	10 Jan 2009 00:11:34 -0000	1.11
@@ -27,6 +27,10 @@
 case $1 in
 	build )
 		if [ "$CONFIG_NTOP" = "y" ]; then
+			if [ ! -e .patches_done ]; then
+				bzcat $SRCDIR/ntop-geoipdownload.patch.bz2 | patch -p1 || exit 1
+				touch .patches_done
+			fi
 			./autogen.sh || exit 1
 			./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
 				--with-gdchart-include=/usr/include --with-gdchart-lib=/usr/lib \
@@ -43,19 +47,20 @@
 		if [ "$CONFIG_NTOP" = "y" ]; then
 			rm -rf $TMPDIR || exit 1
 			mkdir -p $TMPDIR/usr || exit 1
+			# Workarond for a weird bug. Remove the next line if update ntop
+			ln -sf `pwd`/GeoIP-*/libGeoIP/.libs/libGeoIP.a /usr/local/lib/
+			 
 			make LN_S="ln -sf" install DESTDIR=$TMPDIR || exit 1
-
 			rm -rf $TMPDIR/usr/lib/*a || exit 1
-
+			rm -rf $TMPDIR/usr/include || exit 1
 			copy_docs $TMPDIR
-
-			mkdir -p $TMPDIR/usr/share/ntop || exit 1
-			chmod -x $TMPDIR/etc/ntop/*.gz 
-			mv -f $TMPDIR/etc/ntop/*.gz $TMPDIR/usr/share/ntop/ || exit 1
-			ln -sf /usr/share/ntop/etter.passive.os.fp.gz $TMPDIR/etc/ntop/etter.passive.os.fp.gz || exit 1
-			ln -sf /usr/share/ntop/oui.txt.gz $TMPDIR/etc/ntop/oui.txt.gz || exit 1
-			ln -sf /usr/share/ntop/p2c.opt.table.gz $TMPDIR/etc/ntop/p2c.opt.table.gz || exit 1
-			ln -sf /usr/share/ntop/specialMAC.txt.gz $TMPDIR/etc/ntop/specialMAC.txt.gz || exit 1
+			#mkdir -p $TMPDIR/usr/share/ntop || exit 1
+			#chmod -x $TMPDIR/etc/ntop/*.gz 
+			#mv -f $TMPDIR/etc/ntop/*.gz $TMPDIR/usr/share/ntop/ || exit 1
+			#ln -sf /usr/share/ntop/etter.finger.os.gz $TMPDIR/etc/ntop/etter.finger.os.gz || exit 1
+			#ln -sf /usr/share/ntop/oui.txt.gz $TMPDIR/etc/ntop/oui.txt.gz || exit 1
+			#ln -sf /usr/share/ntop/p2c.opt.table.gz $TMPDIR/etc/ntop/p2c.opt.table.gz || exit 1
+			#ln -sf /usr/share/ntop/specialMAC.txt.gz $TMPDIR/etc/ntop/specialMAC.txt.gz || exit 1
 
 			cp -dp $MYDIR/scripts/ntop $ETCDIR/etc/init.d/ || exit 1
 			cp -dpfR $TMPDIR/etc/* $ETCDIR/etc/ || exit 1
@@ -66,9 +71,9 @@
 			
 			rm -rf $TMPDIR || exit 1
 
-                	mkdir -p $CDDIR/var/lib/ntop || exit 1
-        	        chmod -R 755 $CDDIR/var/lib/ntop || exit 1
-	                chown -R ntop $CDDIR/var/lib/ntop || exit 1
+                	mkdir -p $CDDIR/var/ntop || exit 1
+        	        chmod -R 755 $CDDIR/var/ntop || exit 1
+	                chown -R ntop $CDDIR/var/ntop || exit 1
 
 			echo "# Start ntop?" >> $CONFIGFILE
 			echo "START_$MYNAME=no" >> $CONFIGFILE