X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=6b886be62ab59540b71c49bbb0d0b7af4f8c802d;hp=f2676184da518b5a49be1c67926e7dde2310e5f8;hb=c98e55d8f8dbc2e3480c3d43b4a92b35f1e5a180;hpb=d63e88899dc47a95a3607f94273c6096ff4526ae

diff --git a/make.sh b/make.sh
index f2676184da..6b886be62a 100644
--- a/make.sh
+++ b/make.sh
@@ -26,7 +26,7 @@
   NAME="IPFire"			# Software name
   SNAME="ipfire"			# Short name
   VERSION="2.0"			# Version number
-  SLOGAN="www.ipfire.org"		# Software slogan
+  SLOGAN="www.ipfire.eu"		# Software slogan
   CONFIG_ROOT=/var/ipfire		# Configuration rootdir
   NICE=10
   MAX_RETRIES=3			# prefetch/check loop
@@ -344,7 +344,7 @@ ipcopmake() {
 
 ipfiredist() {
 	if [ -f $BASEDIR/build/usr/src/lfs/$1 ]; then
-#	   if [ ! `ls -w1 $BASEDIR/packages/*.tar.gz | grep $1` ]; then
+#	   if [ ! `ls -w1 $BASEDIR/packages/*.ipfire | grep $1` ]; then
 		echo "`date -u '+%b %e %T'`: Packaging $1" | tee -a $LOGFILE
 		chroot $LFS /tools/bin/env -i 	HOME=/root \
 						TERM=$TERM PS1='\u:\w\$ ' \
@@ -587,6 +587,11 @@ buildipcop() {
   ipcopmake python
   ipcopmake libnet
   ipcopmake libpng
+  ipcopmake libtiff
+  ipcopmake libjpeg
+  ipcopmake lcms
+  ipcopmake libmng
+  ipcopmake freetype
   ipcopmake gd
   ipcopmake popt
   ipcopmake slang
@@ -594,7 +599,16 @@ buildipcop() {
   ipcopmake libcap
   ipcopmake pciutils
   ipcopmake pcre
-  ipcopmake apache
+  ipcopmake readline
+  ipcopmake libxml2
+  ipcopmake berkeley
+  ipcopmake BerkeleyDB ## The Perl module
+  ipcopmake mysql
+  ipcopmake saslauthd PASS=1
+  ipcopmake openldap
+  #ipcopmake apache
+  ipcopmake apache2
+  ipcopmake php
   ipcopmake arping
   ipcopmake beep
   ipcopmake bind
@@ -652,8 +666,6 @@ buildipcop() {
   ipcopmake Locale-Country
   ipcopmake GeoIP
   ipcopmake fwhits
-  ipcopmake berkeley
-  ipcopmake BerkeleyDB ## The Perl module
   ipcopmake noip_updater
   ipcopmake ntp
   ipcopmake oinkmaster
@@ -665,15 +677,13 @@ buildipcop() {
   ipcopmake setup
   ipcopmake snort
   #ipcopmake speedycgi
-  ipcopmake saslauthd PASS=1
-  ipcopmake openldap
   ipcopmake squid
   ipcopmake squid-graph
   ipcopmake squidguard
   ipcopmake tcpdump
   ipcopmake traceroute
   ipcopmake vlan
-  #ipcopmake wireless
+  ipcopmake wireless
   ipcopmake libsafe
   ipcopmake 3c5x9setup
 #  echo -ne "`date -u '+%b %e %T'`: Building ### IPFire modules ### \n" | tee -a $LOGFILE
@@ -681,13 +691,7 @@ buildipcop() {
   ipcopmake startscripts
 ## Zuerst die Libs und dann die Programme. Ordnung muss sein!
   ipcopmake java
-  ipcopmake libtiff
-  ipcopmake libjpeg
-  ipcopmake lcms
-  ipcopmake libmng
-  ipcopmake freetype
   ipcopmake bootsplash
-  ipcopmake libxml2
   ipcopmake spandsp
   ipcopmake lzo
   ipcopmake openvpn
@@ -732,9 +736,17 @@ buildipcop() {
   ipcopmake bristuff
   ipcopmake asterisk
   ipcopmake mpg123
-  echo -ne "`date -u '+%b %e %T'`: Building ### MP3-Server ### \n" | tee -a $LOGFILE
+  echo -ne "`date -u '+%b %e %T'`: Building ### Multimedia-Server ### \n" | tee -a $LOGFILE
+  ipcopmake libmad
+  ipcopmake libogg
+  ipcopmake libvorbis
   ipcopmake lame
+  ipcopmake xvid
+  ipcopmake mpeg2dec
+  ipcopmake ffmpeg
+  ipcopmake sox
   ipcopmake gnump3d
+  ipcopmake videolan
   echo -ne "`date -u '+%b %e %T'`: Building ### P2P-Clients ### \n" | tee -a $LOGFILE
   ipcopmake applejuice
   ipcopmake ocaml
@@ -755,6 +767,10 @@ buildipcop() {
   ipcopmake etherwake
   ipcopmake ethereal
   ipcopmake tftp-hpa
+  #ipcopmake subversion
+  ipcopmake iptraf
+  ipcopmake nagios
+  ipcopmake yasuc
 #  ipcopmake stunnel # Ausgeschaltet, weil wir es doch nicht nutzen
 }
 
@@ -855,6 +871,8 @@ buildpackages() {
 		cat $i | sed "s%^\./%#%" | sort >> $BASEDIR/log/FILES
 	fi
   done
+  cd $BASEDIR/packages; ls -w1 *.ipfire | awk -F ".ipfire" '{ print $1 }' > $BASEDIR/packages/packages_list.txt
+  echo -n "###EOF###" >> $BASEDIR/packages/packages_list.txt
 
   cd $PWD
 
@@ -868,30 +886,43 @@ ipfirepackages() {
   fi
   ipfiredist amavisd
   ipfiredist applejuice
-  # ipfiredist asterisk
+  ipfiredist asterisk
   ipfiredist clamav
   ipfiredist cups
   ipfiredist cyrusimap
   ipfiredist fetchmail
+  ipfiredist ffmpeg
   ipfiredist gnump3d
+  ipfiredist iptraf
   ipfiredist java
   ipfiredist lame
+  ipfiredist libmad
+  ipfiredist libogg
   ipfiredist libtiff
+  ipfiredist libvorbis
   ipfiredist libxml2
   ipfiredist mailx
   ipfiredist mldonkey
+  ipfiredist mpeg2dec
+  ipfiredist nagios
   ipfiredist nfs
   ipfiredist nmap
   ipfiredist ntop
+  ipfiredist portmap
   ipfiredist postfix
   ipfiredist procmail
   ipfiredist samba
+  ipfiredist sox
   ipfiredist spamassassin
+  ipfiredist subversion
+  ipfiredist videolan
   ipfiredist web-cyradm
   ipfiredist xampp
 #  ipfiredist xinetd
+  ipfiredist xvid
+  ipfiredist yasuc
   test -d $BASEDIR/packages || mkdir $BASEDIR/packages
-  mv -f $LFS/install/packages/*.{tar.gz,md5} $BASEDIR/packages >> $LOGFILE 2>&1
+  mv -f $LFS/install/packages/*.{ipfire,md5} $BASEDIR/packages >> $LOGFILE 2>&1
   rm -rf  $BASEDIR/build/install/packages/*
 }
 
@@ -1149,20 +1180,20 @@ svn)
 	case "$2" in
 	  update|up)
 		# clear
-		echo -n "Load the latest source files..."
-		svn update >> $PWD/log/_build.svn.update.log
+		echo "Loading the latest source files..."
+		svn update | tee -a $PWD/log/_build.svn.update.log
 		if [ $? -eq 0 ]; then
-			echo ".Done!"
+			echo "Finished!"
 		else
-			echo ".Fail!"
+			echo "Failure!"
 			exit 1
 		fi
-		echo -n "Write the svn info to a file..."
+		echo -n "Writing the svn-info to a file..."
 		svn info > $PWD/svn_status
 		if [ "$?" -eq "0" ]; then
-			echo ".Done!"
+			echo ".Finished!"
 		else
-			echo ".Fail!"
+			echo ".Failure!"
 			exit 1
 		fi
 		chmod 755 $0
@@ -1170,14 +1201,22 @@ svn)
 	  ;;
 	  commit|ci)
 		clear
-		$0 changelog
+		if [ -e /sbin/yast ]; then
+			if [ "`echo $SVN_REVISION | cut -c 3`" -eq "0" ]; then
+				$0 changelog
+			fi
+		fi
 		echo "Upload the changed files..."
 		sleep 1
-		svn commit
+		IPFIRE_SVN_MESSAGE=/tmp/ipfire-svn-co-message.txt
+		rm -f $IPFIRE_SVN_MESSAGE
+		mcedit $IPFIRE_SVN_MESSAGE
+		svn commit -F $IPFIRE_SVN_MESSAGE
+		rm -f $IPFIRE_SVN_MESSAGE
 		$0 svn up
 	  ;;
 	  dist)
-		$0 svn up
+		#$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
@@ -1187,7 +1226,7 @@ svn)
 			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
+		tar cfz ipfire-source-r$SVN_REVISION.tar.gz ipfire-source
 		if [ "$?" -eq "0" ]; then
 			echo ".Done!"
 		else
@@ -1203,7 +1242,7 @@ svn)
 			exit 1
 		fi
 	  ;;
-	  diff)
+	  diff|di)
 		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
@@ -1332,28 +1371,39 @@ upload)
 	case "$2" in
 	  iso)
 		echo -e "Uploading the iso to $IPFIRE_FTP_URL_EXT."
-		ncftpls -u $IPFIRE_FTP_USER_EXT -p $IPFIRE_FTP_PASS_EXT ftp://$IPFIRE_FTP_URL_EXT$IPFIRE_FTP_PATH_EXT/ | grep $SVN_REVISION
-		if [ "$?" -eq "1" ]; then
-				cp $BASEDIR/ipfire-install-$VERSION.i386.iso $BASEDIR/ipfire-install-$VERSION.i386-r`svn info | grep Revision | cut -c 11-`.iso
-				md5sum ipfire-install-$VERSION.i386-r$SVN_REVISION.iso > ipfire-install-$VERSION.i386-r$SVN_REVISION.iso.md5
-				ncftpput -V -u $IPFIRE_FTP_USER_EXT -p $IPFIRE_FTP_PASS_EXT $IPFIRE_FTP_URL_EXT $IPFIRE_FTP_PATH_EXT/ ipfire-install-$VERSION.i386-r$SVN_REVISION.iso
-				ncftpput -V -u $IPFIRE_FTP_USER_EXT -p $IPFIRE_FTP_PASS_EXT $IPFIRE_FTP_URL_EXT $IPFIRE_FTP_PATH_EXT/ ipfire-install-$VERSION.i386-r$SVN_REVISION.iso.md5
-				ncftpput -V -u $IPFIRE_FTP_USER_EXT -p $IPFIRE_FTP_PASS_EXT $IPFIRE_FTP_URL_EXT $IPFIRE_FTP_PATH_EXT/ ipfire-source-*-r$SVN_REVISION.tar.gz
-				if [ "$?" -eq "0" ]; then
-					echo -e "The ISO of Revision $SVN_REVISION was successfully uploaded to the ftp server."
-				else
-					echo -e "There was an error while uploading the iso to the ftp server."
-					exit 1
-				fi
+		cat <<EOF > .ftp-commands
+mkdir $IPFIRE_FTP_PATH_EXT
+ls -lah
+quit
+EOF
+		ncftp -u $IPFIRE_FTP_USER_EXT -p $IPFIRE_FTP_PASS_EXT $IPFIRE_FTP_URL_EXT < .ftp-commands
+		rm -f .ftp-commands
+		md5sum ipfire-install-$VERSION.i386.iso > ipfire-install-$VERSION.i386.iso.md5
+		ncftpput -u $IPFIRE_FTP_USER_EXT -p $IPFIRE_FTP_PASS_EXT $IPFIRE_FTP_URL_EXT $IPFIRE_FTP_PATH_EXT/ ipfire-install-$VERSION.i386.iso
+		ncftpput -u $IPFIRE_FTP_USER_EXT -p $IPFIRE_FTP_PASS_EXT $IPFIRE_FTP_URL_EXT $IPFIRE_FTP_PATH_EXT/ ipfire-install-$VERSION.i386.iso.md5
+		ncftpput -u $IPFIRE_FTP_USER_EXT -p $IPFIRE_FTP_PASS_EXT $IPFIRE_FTP_URL_EXT $IPFIRE_FTP_PATH_EXT/ ipfire-source-r$SVN_REVISION.tar.gz
+		ncftpput -u $IPFIRE_FTP_USER_EXT -p $IPFIRE_FTP_PASS_EXT $IPFIRE_FTP_URL_EXT $IPFIRE_FTP_PATH_EXT/ svn_status
+		if [ "$?" -eq "0" ]; then
+			echo -e "The iso of Revision $SVN_REVISION was successfully uploaded to $IPFIRE_FTP_URL_EXT$IPFIRE_FTP_PATH_EXT/."
 		else
-			echo -e "File with name ipfire-install-$VERSION.i386-r$SVN_REVISION.iso already exists on the ftp server!"
+			echo -e "There was an error while uploading the iso to the ftp server."
+			exit 1
+		fi
+		if [ "$3" = "--with-sources-cd" ]; then
+			ncftpput -u $IPFIRE_FTP_USER_EXT -p $IPFIRE_FTP_PASS_EXT $IPFIRE_FTP_URL_EXT $IPFIRE_FTP_PATH_EXT/ ipfire-sources-cd-$VERSION.$MACHINE.iso
 		fi
-		rm -f ipfire-install-$VERSION.i386-r$SVN_REVISION.iso{,.md5}
 		;;
 	  paks)
+		cat <<EOF > .ftp-commands
+mkdir $IPFIRE_FTP_PATH_PAK
+ls -lah
+quit
+EOF
+		ncftp -u $IPFIRE_FTP_USER_PAK -p $IPFIRE_FTP_PASS_PAK $IPFIRE_FTP_URL_PAK < .ftp-commands
+		rm -f .ftp-commands
 		ncftpput -z -u $IPFIRE_FTP_USER_PAK -p $IPFIRE_FTP_PASS_PAK $IPFIRE_FTP_URL_PAK $IPFIRE_FTP_PATH_PAK/ packages/*
 		if [ "$?" -eq "0" ]; then
-			echo -e "The packages were successfully uploaded to the ftp server."
+			echo -e "The packages were successfully uploaded to $IPFIRE_FTP_URL_PAK$IPFIRE_FTP_PATH_PAK/."
 		else
 			echo -e "There was an error while uploading the packages to the ftp server."
 			exit 1
@@ -1492,31 +1542,34 @@ unattended)
 	### This is our procedure that will compile the IPFire by herself...
 	echo "### UPDATE LOGS"
 	update_logs
-	echo "### SAVING TIME"
-	export IPFIRE_START_TIME=`date`
 
-	echo "### GETTING TOOLCHAIN"
-	$0 gettoolchain
+	if [ "$IPFIRE_REBUILD" -eq "0" ]; then
+		echo "### SAVING TIME"
+		export IPFIRE_START_TIME=`date`
 
-	echo "### RUNNING SVN-UPDATE"
-	$0 svn update
-	if [ $? -ne 0 ]; then
-		$0 mail SVNUPDATE
-		exit 1
-	fi
+		echo "### GETTING TOOLCHAIN"
+		$0 gettoolchain
+
+		echo "### RUNNING SVN-UPDATE"
+		$0 svn update
+		if [ $? -ne 0 ]; then
+			$0 mail SVNUPDATE
+			exit 1
+		fi
 	
-	echo "### EXPORT SOURCES"
-	$0 svn dist
-	if [ $? -ne 0 ]; then
-		$0 mail SVNDIST
-		exit 1
-	fi
+		echo "### EXPORT SOURCES"
+		$0 svn dist
+		if [ $? -ne 0 ]; then
+			$0 mail SVNDIST
+			exit 1
+		fi
 
-	echo "### RUNNING PREFETCH"
-	$0 prefetch | grep -q "md5 difference"
-	if [ $? -eq 0 ]; then
-		$0 mail PREFETCH
-		exit 1
+		echo "### RUNNING PREFETCH"
+		$0 prefetch | grep -q "md5 difference"
+		if [ $? -eq 0 ]; then
+			$0 mail PREFETCH
+			exit 1
+		fi
 	fi
 
 	echo "### RUNNING BUILD"
@@ -1527,7 +1580,8 @@ unattended)
 	fi
 
 	echo "### MAKING SOURCES-ISO"
-	$0 sources-iso
+	echo "DISABLED by Delaco!"
+	#$0 sources-iso
 
 	echo "### UPLOADING ISO"
 	$0 upload iso
@@ -1548,10 +1602,16 @@ unattended)
 	exit 0
 	;;
 batch)
-	if [ `screen -ls | grep batch` ]; then
+	if [ `screen -ls | grep -q ipfire` ]; then
 		echo "Build is already running, sorry!"
 		exit 1
 	else
+		if [ "$2" = "--rebuild" ]; then
+			export IPFIRE_REBUILD=1
+			echo "REBUILD!"
+		else
+			export IPFIRE_REBUILD=0
+		fi
 		echo -n "IPFire-Batch-Build is starting..."
 		screen -dmS ipfire $0 unattended
 		if [ "$?" -eq "0" ]; then
@@ -1560,14 +1620,19 @@ batch)
 			echo ".ERROR!"
 			exit 1
 		fi
-		#if [ "$2" -eq "-v" ]; then
-		#	screen -x ipfire
-		#else
-		#	echo "You may attach you with '-v'."
-		#fi
 		exit 0
 	fi
 	;;
+watch)
+	echo "Exit with Ctrl+A, Ctrl+D."
+	echo -n "Preparing..."
+	for i in `seq 5`; do
+		sleep 0.1; echo -n "."
+	done
+	echo ".Ready!"
+	sleep 0.3
+	screen -x ipfire
+	;;
 *)
 	clear
 	svn info
@@ -1581,14 +1646,7 @@ batch)
 		$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.3
-		screen -x ipfire
+		$0 watch
 		;;
 	"IPFIRE: Batch")
 		$0 batch
@@ -1601,6 +1659,7 @@ batch)
 		if [ "$input" == "yes" ]; then
 			$0 svn commit
 		fi
+		$0 sync
 		;;
 	"SVN: Update")
 		$0 svn update