From: delaco <delaco@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Date: Thu, 27 Jul 2006 19:41:13 +0000 (+0000)
Subject: Update:
X-Git-Tag: v2.3-beta1~1022
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=c6cb9d251398f1b67e9cc3ec3e98bfaa106c46ad

Update:
  * Neue GeoIP-Datenbank. Dank an eXciter.
  * Einige Schritt auf dem Weg zu vollautomatisieren Build-Scripts.


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@232 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
---

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index e47d0643a5..6e61b7424d 100644
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -198,7 +198,7 @@
   * razor-agents-2.81
   * rp-pppoe-3.5
   * rrdtool-1.0.49
-  * samba-3.0.22
+  * samba-3.0.23a
   * sata300_sataii150_tx_series_linux2.4_open_source_1.00.0.15
   * screen-4.0.2
   * sed-4.0.9
diff --git a/doc/packages-to-remove-from-ftp b/doc/packages-to-remove-from-ftp
index dcf0c0efe4..0b04888433 100644
--- a/doc/packages-to-remove-from-ftp
+++ b/doc/packages-to-remove-from-ftp
@@ -1,22 +1 @@
-Mail-SpamAssassin-3.1.1.tar.gz
-__cache_date
-asterisk-1.2.4.tar.gz
-bristuff-0.3.0-PRE-1l.tar.gz
 eagle-usb-2.3.2.tar.tar
-folder.gif
-ipac-ng-1.28.tar.gz
-iptables-1.3.4.tar.bz2
-kbc_option_2420.patch.txt
-libsafe-2.0-16.tgz
-openh323_1.12.2.tar.gz
-patch-o-matic-ng-20050918.tar.bz2
-patch-o-matic-ng-20051229.tar.bz2
-pwlib_1.5.2.tar.gz
-snort-2.4.5.tar.gz
-squid-2.5.STABLE12.tar.bz2
-squid-2.5.STABLE13.tar.bz2
-xampp-linux-1.5.1.tar.gz
-xampp-linux-1.5.3.tar.gz
-xampp-linux-devel-1.5.1.tar.gz
-xampp-linux-devel-1.5.3.tar.gz
-zaptel-1.2.3.tar.gz
diff --git a/lfs/GeoIP b/lfs/GeoIP
index 7ab828cdd3..de42bd82db 100644
--- a/lfs/GeoIP
+++ b/lfs/GeoIP
@@ -44,7 +44,7 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 GeoIP.dat = $(DL_FROM)/GeoIP.dat
 
 $(DL_FILE)_MD5 = 42a6b9d4dd2563a20c8998556216e1de
-GeoIP.dat_MD5 = 757ef6d020a81dae0db2926c48f4a931
+GeoIP.dat_MD5 = 55aa4d51f7920241296f2fc215d9e559
 
 install : $(TARGET)
 
diff --git a/make.sh b/make.sh
index a2375272a9..e2baff5711 100644
--- a/make.sh
+++ b/make.sh
@@ -51,7 +51,6 @@
 	fi
   fi
 
-
   PWD=`pwd`
   BASENAME=`basename $0`
   BASEDIR=`echo $FULLPATH | sed "s/\/$BASENAME//g"`
@@ -61,19 +60,18 @@
   mkdir $BASEDIR/log/ 2>/dev/null
 
   if [ 'x86_64' = $MACHINE -o 'i686' = $MACHINE -o 'i586' = $MACHINE -o 'i486' = $MACHINE -o 'i386' = $MACHINE ]; then
-
-	echo "`date -u '+%b %e %T'`: Machine is ix86 (or equivalent)" | tee -a $LOGFILE
+	echo "`date -u '+%b %e %T'`: Machine is ix86 (or equivalent)" >> $LOGFILE
 	MACHINE=i386
 	BUILDTARGET=i386-pc-linux-gnu
 	CFLAGS="-O2 -mcpu=i386 -march=i386 -pipe -fomit-frame-pointer"
 	CXXFLAGS="-O2 -mcpu=i386 -march=i386 -pipe -fomit-frame-pointer"
   elif [ 'alpha' = $MACHINE ]; then
-	echo "`date -u '+%b %e %T'`: Machine is Alpha AXP" | tee -a $LOGFILE
+	echo "`date -u '+%b %e %T'`: Machine is Alpha AXP" >> $LOGFILE
 	BUILDTARGET=alpha-unknown-linux-gnu
 	CFLAGS="-O2 -mcpu=ev4 -mieee -pipe"
 	CXXFLAGS="-O2 -mcpu=ev4 -mieee -pipe"
   else
-	echo "`date -u '+%b %e %T'`: Can't determine your architecture - $MACHINE" | tee -a $LOGFILE
+	echo "`date -u '+%b %e %T'`: Can't determine your architecture - $MACHINE" >> $LOGFILE
 	exit 1
   fi
 
@@ -896,7 +894,7 @@ ipfirepackages() {
 case "$1" in 
 build)
 	BUILDMACHINE=`uname -m`
-	PACKAGE=`ls -v -r $BASEDIR/cache/$SNAME-1.4-toolchain-$BUILDMACHINE.tar.gz 2> /dev/null | head -n 1`
+	PACKAGE=`ls -v -r $BASEDIR/cache/$SNAME-$VERSION-toolchain-$BUILDMACHINE.tar.gz 2> /dev/null | head -n 1`
 	#only restore on a clean disk
 	if [ ! -f log/perl-*-tools ]; then
 		if [ ! -n "$PACKAGE" ]; then
@@ -994,14 +992,6 @@ clean)
 		rm -f /tools
 	fi
 	;;
-dist)
-	echo -ne "Updating & building source package from SVN: "
-	svn up > /dev/null
-	svn export http://svn.ipfire.eu/svn/ipfire ipfire-source/ --force > /dev/null
-	tar cfz ipfire-source-`date +'%Y-%m-%d'`-r`svn info | grep Revision | cut -c 11-`.tar.gz ipfire-source
-	rm ipfire-source/ -r
-	echo "Finished!"
-	;;
 newpak)
 	# create structure for a new package
 	echo -e "Name of the new package: $2"
@@ -1113,7 +1103,7 @@ toolchain)
 gettoolchain)
 	BUILDMACHINE=`uname -m`
 	# arbitrary name to be updated in case of new toolchain package upload
-	PACKAGE=$SNAME-1.4-toolchain-$BUILDMACHINE
+	PACKAGE=$SNAME-$VERSION-toolchain-$BUILDMACHINE
 	URL_IPFIRE=`grep URL_IPFIRE lfs/Config | awk '{ print $3 }'`
 	echo "`date -u '+%b %e %T'`: Load toolchain tar.gz for $BUILDMACHINE" | tee -a $LOGFILE
 	cd $BASEDIR/cache
@@ -1128,31 +1118,73 @@ gettoolchain)
 		fi
 	fi
 	;;
-paks)
-	prepareenv
-	# buildpackages
-	ipfirepackages
-	;;
-update)
-	echo "Load the latest source-files:"
-	svn update
-	;;
-commit)
-	echo "Upload the changed files:"
-	svn commit
-	./make.sh sync
-	clear
-	svn up
-	;;
-make)
-	echo "Do a complete compile:"	
-	./make.sh prefetch && ./make.sh gettoolchain && ./make.sh build
-	;;
-diff)
-	echo -ne "Make a local diff to last SVN revision: "
-	svn diff > ipfire-diff-`date +'%Y-%m-%d-%H:%M'`-r`svn info | grep Revision | cut -c 11-`.diff
-	echo "Finished!"
-	echo "Diff was successfully saved to ipfire-diff-`date +'%Y-%m-%d-%H:%M'`-r`svn info | grep Revision | cut -c 11-`.diff"
+svn)
+	case "$2" in
+	  update|up)
+		clear
+		echo -n "Load the latest source files..."
+		svn update >> $PWD/log/_build.svn.update.log
+		if [ $? -eq 0 ]; then
+			echo ".Done!"
+		else
+			echo ".Fail!"
+			exit 1
+		fi
+		echo -n "Write the svn info to a file..."
+		svn info > $PWD/svn_status
+		if [ "$?" -eq "0" ]; then
+			echo ".Done!"
+		else
+			echo ".Fail!"
+			exit 1
+		fi
+	  ;;
+	  commit|ci)
+		clear
+		echo "Upload the changed files..."
+		sleep 1
+		svn commit
+		$0 svn up
+	  ;;
+	  dist)
+		$0 svn up
+		echo -ne "Download source package from svn..."
+		svn export http://svn.ipfire.eu/svn/ipfire ipfire-source/ --force > /dev/null
+		if [ "$?" -eq "0" ]; then
+			echo ".Done!"
+		else
+			echo ".Fail!"
+			exit 1
+		fi
+		echo -n "Compress files..."
+		tar cfz ipfire-source-`date +'%Y-%m-%d'`-r`svn info | grep Revision | cut -c 11-`.tar.gz ipfire-source
+		if [ "$?" -eq "0" ]; then
+			echo ".Done!"
+		else
+			echo ".Fail!"
+			exit 1
+		fi
+		echo -n "Cleanup..."
+		rm ipfire-source/ -r
+		if [ "$?" -eq "0" ]; then
+			echo ".Done!"
+		else
+			echo ".Fail!"
+			exit 1
+		fi
+	  ;;
+	  diff)
+		echo -ne "Make a local diff to last svn revision..."
+		svn diff > ipfire-diff-`date +'%Y-%m-%d-%H:%M'`-r`svn info | grep Revision | cut -c 11-`.diff
+		if [ "$?" -eq "0" ]; then
+			echo ".Done!"
+		else
+			echo ".Fail!"
+			exit 1
+		fi
+		echo "Diff was successfully saved to ipfire-diff-`date +'%Y-%m-%d-%H:%M'`-r`svn info | grep Revision | cut -c 11-`.diff"
+	  ;;
+	esac
 	;;
 sync)
 	echo -e "Syncing Cache to FTP:"
@@ -1225,55 +1257,55 @@ build-only)
 	prepareenv
 	ipcopmake $2
 	;;
+build-silent)
+	screen -dmS ipfire $0 build
+	echo "Build started... This will take a while!"
+	echo "You can see the status with 'screen -x ipfire'."
+	;;
 *)
 	clear
 	svn info
-	#echo "Usage: $0 {build|changelog|check|checkclean|clean|commit|diff|dist|gettoolchain|make|newpak|prefetch|pub-iso|pub-paks|shell|sync|toolchain|update}"
-	#cat doc/make.sh-usage
-	select name in "End" "Build IPFire (silent)" "Watch IPFire Build" "Prefetch" "Create Diff" "Get Toolchain" "Update SVN Version" "Sync To Server" "Show Last Log Lines" "Make Clean"
+	select name in "Exit" "IPFIRE: Prefetch" "IPFIRE: Build (silent)" "IPFIRE: Watch Build" "IPFIRE: Clean" "SVN: Commit" "SVN: Update" "SVN: Status" "SVN: Diff" "Help"
 	do
 	case $name in
-        "Update SVN Version")
-                echo "### SVN UPDATE ###"
-                svn update
-                ;;
-        "Prefetch")
-                echo "### MAKE.SH PREFETCH ###"
-                $0 prefetch
-                ;;
-        "Create Diff")
-                echo "### MAKE.SH DIFF ###"
-                $0 diff
-                ;;
-        "Build IPFire (silent)")
-                echo "### MAKE.SH BUILD ###"
-                screen -dmS ipfire $0 build
-                echo "You can see the status with 'screen -x ipfire'."
-                ;;
-        "Get Toolchain")
-                echo "### MAKE.SH GETTOOLCHAIN ###"
-                $0 gettoolchain
-                ;;
-	"Sync to Server")
-		  echo "svn commit"
-		  svn commit
-		  ;;
-	"Show last log lines")
-		  tail log/_*
-		  ;;
-	"Watch IPFire Build")
-                echo "### MAKE.SH BUILD ###"
-                echo "Exit with Ctrl+A, Ctrl+D."
-                sleep 1
-                screen -x ipfire
-                ;;
-	"Make Clean")
-                echo "### MAKE.SH CLEAN ###"
-                $0 clean
-                ;;
-        "End")
-                break
-                ;;
+	"IPFIRE: Prefetch")
+		$0 prefetch
+		;;
+	"IPFIRE: Build (silent)")
+		$0 build-silent
+		;;
+	"IPFIRE: Watch Build")
+		echo "Exit with Ctrl+A, Ctrl+D."
+		echo -n "Preparing..."
+		for i in `seq 10`; do
+			sleep 0.1; echo -n "."
+		done
+		echo ".Ready!"
+		sleep 0.5
+		screen -x ipfire
+		;;
+	"IPFIRE: Clean")
+		$0 clean
+		;;
+	"SVN: Commit")
+		$0 svn commit
+		;;
+	"SVN: Update")
+		$0 svn update
+		;;
+	"SVN: Status")
+		svn status # | grep -v ^?
+		;;
+	"SVN: Diff")
+		$0 svn diff
+		;;
+	"Help")
+		echo "Usage: $0 {build|changelog|check|checkclean|clean|gettoolchain|newpak|prefetch|shell|sync|toolchain}"
+		cat doc/make.sh-usage
+		;;
+	"Exit")
+		break
+		;;
 	esac
 	done
 	;;