X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=803baeee5e9b77de4dc04e7e1c8e798e122f2fb3;hp=1d8079cb6a383ab86164b160359799c17a44f481;hb=78331e301975a38f952ad9311a7ff3201e5a5e2e;hpb=ecc898f7ac41801814f36de35a89014983a4819e

diff --git a/make.sh b/make.sh
index 1d8079cb6a..803baeee5e 100644
--- a/make.sh
+++ b/make.sh
@@ -26,11 +26,10 @@
   NAME="IPFire"			# Software name
   SNAME="ipfire"			# Short name
   VERSION="1.4"			# Version number
-# PREVIOUSTAG=IPCOP_v1_4_10_FINAL
   SLOGAN="We secure your network"	# Software slogan
   CONFIG_ROOT=/var/ipfire		# Configuration rootdir
   NICE=10
-  MAX_RETRIES=3				# prefetch/check loop
+  MAX_RETRIES=3			# prefetch/check loop
   KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
   MACHINE=`uname -m`
 
@@ -336,6 +335,7 @@ ipcopmake() {
 
 ipfiredist() {
 	if [ -f $BASEDIR/build/usr/src/lfs/$1 ]; then
+	  if [ "`ls -w1 $BASEDIR/packages/ | grep $1; echo $?`" -ne "0" ]; then
 		echo "`date -u '+%b %e %T'`: Packaging $1" | tee -a $LOGFILE
 		cp -f $BASEDIR/src/scripts/make-packages.sh $BASEDIR/build/usr/local/bin
 		chroot $LFS /tools/bin/env -i 	HOME=/root \
@@ -353,11 +353,12 @@ ipfiredist() {
 		if [ $? -ne 0 ]; then
 			exiterror "Packaging $1"
 		fi
+	  else
+		echo "`date -u '+%b %e %T'`: Package $1 already exists" | tee -a $LOGFILE
+	  fi		
 	else
 		exiterror "No such file or directory: $BASEDIR/build/usr/src/lfs/$1"
 	fi
-#	test -d $BASEDIR/packages || mkdir $BASEDIR/packages
-#	mv -f $BASEDIR/build/paks/* $BASEDIR/packages/
 	return 0
 }
 
@@ -505,8 +506,8 @@ buildbase() {
 }
 
 buildipcop() {
-  # Run IPCop make scripts one by one
-  LOGFILE="$BASEDIR/log/_build.ipcop.log"
+  # Run IPFire make scripts one by one
+  LOGFILE="$BASEDIR/log/_build.ipfire.log"
   export LOGFILE
   echo -ne "`date -u '+%b %e %T'`: Stage3 $NAME build \n" | tee -a $LOGFILE
 
@@ -540,6 +541,7 @@ buildipcop() {
  	ipcopmake fcdslsl 	SMP=1
  	ipcopmake fcdslusb 	SMP=1
  	ipcopmake fcdslslusb 	SMP=1
+	ipcopmake fcpci	SMP=1
 	ipcopmake pulsar 	SMP=1
   	ipcopmake unicorn 	SMP=1
   fi
@@ -559,7 +561,8 @@ buildipcop() {
  	ipcopmake fcdsl2 	
  	ipcopmake fcdslsl 	
  	ipcopmake fcdslusb 	
- 	ipcopmake fcdslslusb 	
+ 	ipcopmake fcdslslusb 
+  	ipcopmake fcpci	
 	ipcopmake pulsar 	
   	ipcopmake unicorn 	
   fi
@@ -601,6 +604,7 @@ buildipcop() {
   ipcopmake iproute2
   ipcopmake iptstate
   ipcopmake iputils
+  ipcopmake l7-protocols
   ipcopmake isapnptools
   ipcopmake isdn4k-utils
   ipcopmake kudzu
@@ -623,6 +627,17 @@ buildipcop() {
   ipcopmake Net-DNS
   ipcopmake Net-IPv4Addr
   ipcopmake Net_SSLeay
+  ipcopmake IO-Stringy
+  ipcopmake Unix-Syslog
+  ipcopmake Mail-Tools
+  ipcopmake MIME-Tools
+  ipcopmake Net-Server
+  ipcopmake Convert-TNEF
+  ipcopmake Convert-UUlib
+  ipcopmake Archive-Tar
+  ipcopmake Archive-Zip
+  ipcopmake GeoIP
+  ipcopmake fwhits
   ipcopmake noip_updater
   ipcopmake ntp
   ipcopmake oinkmaster
@@ -639,17 +654,22 @@ buildipcop() {
   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
+  echo -ne "`date -u '+%b %e %T'`: Building ### IPFire modules ### \n" | tee -a $LOGFILE
+  ipcopmake pakfire
+  ipcopmake startscripts
 ## Zuerst die Libs und dann die Programme. Ordnung muss sein!
   ipcopmake berkeley
+  ipcopmake BerkeleyDB ## The Perl module
+  ipcopmake java
   ipcopmake libtiff
   ipcopmake libjpeg
   ipcopmake libxml2
   ipcopmake spandsp
   ipcopmake lzo
+  ipcopmake openvpn
   ipcopmake pkg-config
   ipcopmake glib
   ipcopmake xampp
@@ -661,6 +681,7 @@ buildipcop() {
   ipcopmake xinetd
   ipcopmake ghostscript
   ipcopmake cups
+#  ipcopmake lpd ## Im Moment aus, da CUPS vorhanden ist.
   ipcopmake samba
   ipcopmake sudo
   ipcopmake mc
@@ -668,22 +689,38 @@ buildipcop() {
   ipcopmake openh323
   ipcopmake wget
   ipcopmake bridge-utils
+  echo -ne "`date -u '+%b %e %T'`: Building ### Mailserver ### \n" | tee -a $LOGFILE
   ipcopmake postfix
   ipcopmake fetchmail
   ipcopmake cyrusimap
+  ipcopmake procmail
+  ipcopmake mailx
+  ipcopmake clamav
+  ipcopmake razor
+  ipcopmake spamassassin
+  ipcopmake amavisd
+  echo -ne "`date -u '+%b %e %T'`: Building ### VoIP-Server ### \n" | tee -a $LOGFILE
   ipcopmake stund
-#  ipcopmake lpd
-  ipcopmake openvpn
   ipcopmake asterisk
-  ipcopmake edonkeyclc
-  ipcopmake sane
+  echo -ne "`date -u '+%b %e %T'`: Building ### MP3-Server ### \n" | tee -a $LOGFILE
   ipcopmake lame
   ipcopmake gnump3d
-  ipcopmake clamav
+  echo -ne "`date -u '+%b %e %T'`: Building ### P2P-Clients ### \n" | tee -a $LOGFILE
+  ipcopmake applejuice
+  ipcopmake edonkeyclc
+  ipcopmake sane
   ipcopmake rsync
+  ipcopmake tcpwrapper
+  ipcopmake portmap
+  ipcopmake screen
+  ipcopmake nmap
+  ipcopmake htop
+  ipcopmake nfs
+  ipcopmake ncftp
+  ipcopmake ethereal
 #  wget http://www.guzu.net/linux/hddtemp.db && mv hddtemp.db $BASEDIR/build/etc/hddtemp.db
 #  ipcopmake hddtemp
-# ipcopmake stunnel # Ausgeschaltet, weil wir es doch nicht nutzen
+#  ipcopmake stunnel # Ausgeschaltet, weil wir es doch nicht nutzen
 }
 
 buildinstaller() {
@@ -772,11 +809,12 @@ buildpackages() {
   ipcopmake cdrom
   cp $LFS/install/images/{*.iso,*.tgz} $BASEDIR >> $LOGFILE 2>&1
 
-  # Build IPFire packages
+  ipfiredist applejuice
   ipfiredist asterisk
   ipfiredist cyrusimap
   ipfiredist fetchmail
   ipfiredist gnump3d
+  ipfiredist lame
   ipfiredist libtiff
   ipfiredist libxml2
   ipfiredist mc
@@ -788,7 +826,9 @@ buildpackages() {
   ipfiredist xampp
   ipfiredist xinetd
   test -d $BASEDIR/packages || mkdir $BASEDIR/packages
-  cp -f $LFS/paks/*.tar.gz $LFS/paks/*.md5 $BASEDIR/packages >> $LOGFILE 2>&1
+  mv -f $LFS/paks/*.tar.gz $LFS/paks/*.md5 $BASEDIR/packages >> $LOGFILE 2>&1
+  rm -rf $LFS/paks
+  rm -rf $BASEDIR/build/tmp/*
 
   # Cleanup
   stdumount
@@ -848,7 +888,7 @@ shell)
 	;;
 changelog)
 	echo -n "Loading new Changelog from SVN: "
-	svn log > doc/ChangeLog
+	svn log http://svn.ipfire.eu/svn/ipfire > doc/ChangeLog
 	echo "Finished!"
 	;;
 check)
@@ -897,17 +937,19 @@ clean)
 	done
 	rm -rf $BASEDIR/build
 	rm -rf $BASEDIR/cdrom
+	rm -rf $BASEDIR/packages
 	rm -rf $BASEDIR/log
-	rm -f $BASEDIR/updates/$VERSION/patch.tar.gz;
 	if [ -h /tools ]; then
 		rm -f /tools
 	fi
 	;;
 dist)
-	echo "Building source package from SVN: "
-	svn export http://svn.ipfire.eu/svn/ipfire ipfire-source/ --force
+	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
@@ -1032,18 +1074,61 @@ gettoolchain)
 		if [ "`md5sum $PACKAGE.tar.gz | awk '{print $1}'`" = "`cat $PACKAGE.md5 | awk '{print $1}'`" ]; then
 			echo "`date -u '+%b %e %T'`: toolchain md5 ok" | tee -a $LOGFILE
 			echo "`date -u '+%b %e %T'`: Uncompressing toolchain" | tee -a $LOGFILE
-			cd $BASEDIR && tar xvfz cache/$PACKAGE.tar.gz -C .
+			cd $BASEDIR && tar xfz cache/$PACKAGE.tar.gz -C .
+			rm -vf $BASEDIR/cache/$PACKAGE.{tar.gz,md5}
 		else
 			exiterror "$PACKAGE.md5 did not match, check downloaded package"
 		fi
 	fi
 	;;
+paks)
+	prepareenv
+	buildpackages
+	;;
 update)
 	echo "Load the latest source-files:"
 	svn update
 	;;
+commit)
+	echo "Upload the changed files:"
+	svn commit
+	;;
+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"
+	;;
+sync)
+	echo -e "Syncing Cache to FTP:"
+	echo -ne "Password for mirror.ipfire.org: "; read PASS
+	rm -f doc/packages-to-remove-from-ftp
+	ncftpls -u web3 -p $PASS ftp://mirror.ipfire.org/html/source-packages/source/ > ftplist
+	for i in `ls -w1 cache/`; do
+		grep $i ftplist
+		if [ "$?" -ne "0" ]; then
+			ncftpput -u web3 -p $PASS mirror.ipfire.org /html/source-packages/source cache/$i
+			if [ "$?" -eq "0" ]; then
+				echo -e "$i was successfully uploaded to the ftp server."
+			else
+				echo -e "There was an error while uploading $i to the ftp server."
+			fi
+		fi
+	done
+	for i in `cat ftplist`; do
+		ls -w1 cache/ | grep $i
+		if [ "$?" -eq "1" ]; then
+			echo $i | grep -v toolchain >> doc/packages-to-remove-from-ftp
+		fi
+	done
+	rm -f ftplist
+	;;
 *)
-	echo "Usage: $0 {build|changelog|check|checkclean|clean|dist|gettoolchain|newpak|prefetch|rootfiles|shell|toolchain|update}"
+	echo "Usage: $0 {build|changelog|check|checkclean|clean|commit|diff|dist|gettoolchain|make|newpak|prefetch|shell|sync|toolchain|update}"
 	cat doc/make.sh-usage
 	exit 1
 	;;