Hinzugefügt:

[ipfire-2.x.git] / make.sh

diff --git a/make.sh b/make.sh
index 944b70392ea1505c293eecc95b471b8b8dce32d1..a7cccf0236b903b0a4f94211ab3fd189cd81ccb9 100644 (file)
--- 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`
 
@@ -505,8 +504,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
 
@@ -634,6 +633,8 @@ buildipcop() {
   ipcopmake Convert-UUlib
   ipcopmake Archive-Tar
   ipcopmake Archive-Zip
+  ipcopmake GeoIP
+  ipcopmake fwhits
   ipcopmake noip_updater
   ipcopmake ntp
   ipcopmake oinkmaster
@@ -650,10 +651,11 @@ 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
 ## Zuerst die Libs und dann die Programme. Ordnung muss sein!
   ipcopmake berkeley
   ipcopmake BerkeleyDB ## The Perl module
@@ -673,7 +675,7 @@ buildipcop() {
   ipcopmake xinetd
   ipcopmake ghostscript
   ipcopmake cups
-#  ipcopmake lpd
+#  ipcopmake lpd ## Im Moment aus, da CUPS vorhanden ist.
   ipcopmake samba
   ipcopmake sudo
   ipcopmake mc
@@ -681,31 +683,37 @@ buildipcop() {
   ipcopmake openh323
   ipcopmake wget
   ipcopmake bridge-utils
-  echo -ne "`date -u '+%b %e %T'`: Building Mailserver \n" | tee -a $LOGFILE
+  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
+  echo -ne "`date -u '+%b %e %T'`: Building ### VoIP-Server ### \n" | tee -a $LOGFILE
   ipcopmake stund
   ipcopmake asterisk
+  echo -ne "`date -u '+%b %e %T'`: Building ### MP3-Server ### \n" | tee -a $LOGFILE
+  ipcopmake lame
+  ipcopmake gnump3d
+  ipcopmake java
   ipcopmake openvpn
   ipcopmake edonkeyclc
   ipcopmake sane
-  echo -ne "`date -u '+%b %e %T'`: Building MP3-Server \n" | tee -a $LOGFILE
-  ipcopmake lame
-  ipcopmake gnump3d
   ipcopmake rsync
   ipcopmake tcpwrapper
   ipcopmake portmap
+  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() {
@@ -1082,8 +1090,32 @@ 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|commit|diff|dist|gettoolchain|make|newpak|prefetch|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
        ;;