]> git.ipfire.org Git - ipfire-2.x.git/blobdiff - make.sh
HinzugefĆ¼gt:
[ipfire-2.x.git] / make.sh
diff --git a/make.sh b/make.sh
index bc61fa3a1a0fc862aded6bc95e113368cc9aede0..e2baff571142f240973fc4429456ae0fc70862d8 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -2,43 +2,43 @@
 #
 ############################################################################
 #                                                                          #
-# This file is part of the IPCop Firewall.                                 #
+# This file is part of the IPFire Firewall.                                #
 #                                                                          #
-# IPCop is free software; you can redistribute it and/or modify            #
+# IPFire is free software; you can redistribute it and/or modify           #
 # it under the terms of the GNU General Public License as published by     #
 # the Free Software Foundation; either version 2 of the License, or        #
 # (at your option) any later version.                                      #
 #                                                                          #
-# IPCop is distributed in the hope that it will be useful,                 #
+# IPFire is distributed in the hope that it will be useful,                #
 # but WITHOUT ANY WARRANTY; without even the implied warranty of           #
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
 # GNU General Public License for more details.                             #
 #                                                                          #
 # You should have received a copy of the GNU General Public License        #
-# along with IPCop; if not, write to the Free Software                     #
+# along with IPFire; if not, write to the Free Software                    #
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
 #                                                                          #
-# Copyright (C) 2001 Mark Wormgoor <mark@wormgoor.com>.                    #
-#                                                                          #
-# (c) 2001 Eric S. Johansson <esj@harvee.billerica.ma.us> Check for Bash   #
-# (c) 2002 Thorsten Fischer <frosch@cs.tu-berlin.de> MD5Sum checking       #
+# Copyright (C) 2006 IPFire-Team <entwickler@ipfire.org>.                  #
 #                                                                          #
 ############################################################################
-#
-# $Id: make.sh,v 1.129.2.145 2006/02/01 07:04:09 gespinasse Exp $
 #
 
-  NAME="IPFire"                                        # Software name
-  SNAME="ipfire"                                       # Short name
-  VERSION="1.4.11"                             # Version number
-  PREVIOUSTAG=IPCOP_v1_4_10_FINAL
-  SLOGAN="We save your network"                # Software slogan
-  CONFIG_ROOT=/var/ipfire                      # Configuration rootdir
+  NAME="IPFire"                        # Software name
+  SNAME="ipfire"                       # Short name
+  VERSION="2.0"                        # Version number
+  SLOGAN="www.ipfire.org"              # 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`
 
+  # Setzen des IPFire Builds
+  if [ -e ./.svn ]; then
+    FIREBUILD=`cat .svn/entries |sed -n 's/^[ \t]*revision=\"// p' | sed -n 's/\".*$// p'`
+#    VERSION="$VERSION (Build:$FIREBUILD)"
+  fi
+
   # Debian specific settings
   if [ ! -e /etc/debian_version ]; then
        FULLPATH=`which $0`
@@ -51,7 +51,6 @@
        fi
   fi
 
-
   PWD=`pwd`
   BASENAME=`basename $0`
   BASEDIR=`echo $FULLPATH | sed "s/\/$BASENAME//g"`
   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
 
 # Define immediately
 stdumount() {
        umount $BASEDIR/build/dev/pts           2>/dev/null;
-       umount $BASEDIR/build/proc              2>/dev/null;
-       umount $BASEDIR/build/install/mnt       2>/dev/null;
+       umount $BASEDIR/build/proc                      2>/dev/null;
+       umount $BASEDIR/build/install/mnt               2>/dev/null;
        umount $BASEDIR/build/usr/src/cache     2>/dev/null;
        umount $BASEDIR/build/usr/src/ccache    2>/dev/null;
        umount $BASEDIR/build/usr/src/config    2>/dev/null;
-       umount $BASEDIR/build/usr/src/doc       2>/dev/null;
-       umount $BASEDIR/build/usr/src/html      2>/dev/null;
+       umount $BASEDIR/build/usr/src/doc               2>/dev/null;
+       umount $BASEDIR/build/usr/src/html              2>/dev/null;
        umount $BASEDIR/build/usr/src/langs     2>/dev/null;
-       umount $BASEDIR/build/usr/src/lfs       2>/dev/null;
-       umount $BASEDIR/build/usr/src/log       2>/dev/null;
-       umount $BASEDIR/build/usr/src/src       2>/dev/null;
+       umount $BASEDIR/build/usr/src/lfs               2>/dev/null;
+       umount $BASEDIR/build/usr/src/log               2>/dev/null;
+       umount $BASEDIR/build/usr/src/src               2>/dev/null;
 }
 
 exiterror() {
@@ -339,6 +338,34 @@ ipcopmake() {
        return 0
 }
 
+ipfiredist() {
+       if [ -f $BASEDIR/build/usr/src/lfs/$1 ]; then
+#         if [ ! `ls -w1 $BASEDIR/packages/*.tar.gz | 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\$ ' \
+                                               PATH=/usr/local/bin:/bin:/usr/bin:/sbin:/usr/sbin \
+                                               VERSION=$VERSION \
+                                               CONFIG_ROOT=$CONFIG_ROOT \
+                                               NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \
+                                               CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" \
+                                               CCACHE_DIR=/usr/src/ccache CCACHE_HASHDIR=1 \
+                                               KVER=$KVER \
+                                               BUILDTARGET="$BUILDTARGET" MACHINE="$MACHINE" \
+                   /bin/bash -x -c "cd /usr/src/lfs && \
+                   make -f $1 LFS_BASEDIR=/usr/src dist" >>$LOGFILE 2>&1
+               if [ $? -ne 0 ]; then
+                       exiterror "Packaging $1"
+               fi
+#         else
+#              echo "`date -u '+%b %e %T'`: Packaging: The package $1 already exists"
+#         fi
+       else
+               exiterror "No such file or directory: $BASEDIR/build/usr/src/lfs/$1"
+       fi
+       return 0
+}
+
 
 installmake() {
        if [ -f $BASEDIR/build/usr/src/lfs/$1 ]; then
@@ -483,8 +510,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
 
@@ -503,8 +530,8 @@ buildipcop() {
   if [ 'i386' = $MACHINE ]; then 
        # abuse the SMP flag, and make an minimal installer kernel first
        # so that the boot floppy always works.....
-       ipcopmake linux         LFS_PASS=ipcop SMP=installer
-       ipcopmake linux         LFS_PASS=ipcop SMP=1
+       ipcopmake linux         LFS_PASS=ipfire SMP=installer
+       ipcopmake linux         LFS_PASS=ipfire SMP=1
        ipcopmake 3cp4218       SMP=1
        ipcopmake amedyn        SMP=1
        ipcopmake cxacru        SMP=1
@@ -518,11 +545,14 @@ buildipcop() {
        ipcopmake fcdslsl       SMP=1
        ipcopmake fcdslusb      SMP=1
        ipcopmake fcdslslusb    SMP=1
+       ipcopmake fcpci SMP=1
+       ipcopmake fcclassic     SMP=1
        ipcopmake pulsar        SMP=1
        ipcopmake unicorn       SMP=1
+       ipcopmake promise-sata-300-tx SMP=1
   fi
 
-  ipcopmake linux      LFS_PASS=ipcop
+  ipcopmake linux      LFS_PASS=ipfire
   ipcopmake 3cp4218    
   ipcopmake amedyn     
   ipcopmake cxacru     
@@ -537,9 +567,12 @@ buildipcop() {
        ipcopmake fcdsl2        
        ipcopmake fcdslsl       
        ipcopmake fcdslusb      
-       ipcopmake fcdslslusb    
-       ipcopmake pulsar        
-       ipcopmake unicorn       
+       ipcopmake fcdslslusb 
+       ipcopmake fcpci
+       ipcopmake fcclassic
+       ipcopmake pulsar        
+       ipcopmake unicorn
+       ipcopmake promise-sata-300-tx
   fi
 
   ipcopmake pcmcia-cs
@@ -568,7 +601,7 @@ buildipcop() {
   ipcopmake ethtool
   ipcopmake ez-ipupdate
   ipcopmake fcron
-  ipcopmake GD
+  ipcopmake perl-GD
   ipcopmake gnupg
   ipcopmake hdparm
   ipcopmake ibod
@@ -579,6 +612,7 @@ buildipcop() {
   ipcopmake iproute2
   ipcopmake iptstate
   ipcopmake iputils
+  ipcopmake l7-protocols
   ipcopmake isapnptools
   ipcopmake isdn4k-utils
   ipcopmake kudzu
@@ -601,6 +635,21 @@ 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 Text-Tabs+Wrap
+  ipcopmake Locale-Country
+  ipcopmake GeoIP
+  ipcopmake fwhits
+  ipcopmake berkeley
+  ipcopmake BerkeleyDB ## The Perl module
   ipcopmake noip_updater
   ipcopmake ntp
   ipcopmake oinkmaster
@@ -612,18 +661,96 @@ 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
-  ipcopmake stund
-  ipcopmake lpd
+#  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 java
+  ipcopmake libtiff
+  ipcopmake libjpeg
+  ipcopmake lcms
+  ipcopmake libmng
+  ipcopmake freetype
+  ipcopmake bootsplash
+  ipcopmake libxml2
+  ipcopmake spandsp
+  ipcopmake lzo
+  ipcopmake openvpn
+  ipcopmake pkg-config
+  ipcopmake glib
   ipcopmake xampp
   ipcopmake pam
+  ipcopmake pammysql
+  ipcopmake saslauthd PASS=2
+  ipcopmake xinetd
+  ipcopmake ghostscript
+  ipcopmake cups
+#  ipcopmake lpd ## Im Moment aus, da CUPS vorhanden ist.
+  ipcopmake samba
+  ipcopmake sudo
+  ipcopmake mc
+#  ipcopmake pwlib
+#  ipcopmake openh323
+  ipcopmake wget
+  ipcopmake wput
+  ipcopmake bridge-utils
+  ipcopmake screen
+  ipcopmake hddtemp
+  ipcopmake smartmontools
+  ipcopmake htop
+  ipcopmake lynx
+  echo -ne "`date -u '+%b %e %T'`: Building ### Mailserver ### \n" | tee -a $LOGFILE
+  ipcopmake postfix
+  ipcopmake procmail
+  ipcopmake fetchmail
+  ipcopmake cyrusimap
+  ipcopmake web-cyradm
+  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 zaptel
+  ipcopmake libpri
+  ipcopmake bristuff
+  ipcopmake asterisk
+  ipcopmake mpg123
+  echo -ne "`date -u '+%b %e %T'`: Building ### MP3-Server ### \n" | tee -a $LOGFILE
+  ipcopmake lame
+  ipcopmake gnump3d
+  echo -ne "`date -u '+%b %e %T'`: Building ### P2P-Clients ### \n" | tee -a $LOGFILE
+  ipcopmake applejuice
+  ipcopmake ocaml
+  ipcopmake mldonkey
+#  ipcopmake edonkeyclc
+#  ipcopmake sane
+  echo -ne "`date -u '+%b %e %T'`: Building ### Net-Tools ### \n" | tee -a $LOGFILE
+  ipcopmake ntop
+#  ipcopmake rsync
+  ipcopmake tcpwrapper
+  ipcopmake portmap
+  ipcopmake nfs
+  ipcopmake nmap
+  ipcopmake mbmon
+  ipcopmake iftop
+  ipcopmake ncftp
+  ipcopmake cftp
+  ipcopmake etherwake
+  ipcopmake ethereal
+#  ipcopmake stunnel # Ausgeschaltet, weil wir es doch nicht nutzen
 }
 
 buildinstaller() {
@@ -663,7 +790,7 @@ buildpackages() {
   echo "`date -u '+%b %e %T'`: Stripping files" | tee -a $LOGFILE
   find $LFS/lib $LFS/usr/lib $LFS/usr/share/rrdtool-* $LFS/install ! -type l \( -name '*.so' -o -name '*.so[\.0-9]*' \) \
        ! -name 'libc.so' ! -name 'libpthread.so' ! -name 'libcrypto.so.0.9.7.sha1' \
-       -exec $LFS/tools/bin/strip --strip-all {} \; >> $LOGFILE 2>&1
+        -exec $LFS/tools/bin/strip --strip-all {} \; >> $LOGFILE 2>&1
   # add -ls before -exec if you want to verify what files are stripped
 
   find $LFS/{,s}bin $LFS/usr/{,s}bin $LFS/usr/local/{,s}bin ! -type l \
@@ -686,32 +813,28 @@ buildpackages() {
        rm -f $LFS/license.txt >> $LOGFILE 2>&1
        cd $BASEDIR
   fi
-
-  # Create update for this version
-#  echo "`date -u '+%b %e %T'`: Building update $VERSION tgz" | tee -a $LOGFILE
-#  tar -cz -C $BASEDIR/build --files-from=$BASEDIR/updates/$VERSION/ROOTFILES.$MACHINE-$VERSION -f $BASEDIR/updates/$VERSION/patch.tar.gz --exclude='#*'; 
-#  chmod 755 $BASEDIR/updates/$VERSION/setup
-#  tar -cz -C $BASEDIR/updates/$VERSION -f $LFS/install/images/$SNAME-update-$VERSION.$MACHINE.tgz patch.tar.gz setup information
-#  rm -f $LFS/var/run/{need-depmod-$KVER,need-depmod-$KVER-smp}
   
   # Generating list of packages used
   echo "`date -u '+%b %e %T'`: Generating packages list from logs" | tee -a $LOGFILE
   rm -f $BASEDIR/doc/packages-list
   for i in `ls -1tr $BASEDIR/log/[^_]*`; do
        if [ "$i" != "$BASEDIR/log/FILES" -a -n $i ]; then
-               echo "* `basename $i`" >>$BASEDIR/doc/packages-list
+               echo "  * `basename $i`" >>$BASEDIR/doc/packages-list
        fi
   done
-  echo "!!! List of softwares used to build $NAME Version:$VERSION" > $BASEDIR/doc/packages-list.txt
-  grep -v 'configroot$\|img$\|initrd$\|initscripts$\|installer$\|install$\|ipcop$\|setup$\|stage2$\|smp$\|tools$\|tools1$\|tools2$' \
+  echo "====== List of softwares used to build $NAME Version: $VERSION ======" > $BASEDIR/doc/packages-list.txt
+  grep -v 'configroot$\|img$\|initrd$\|initscripts$\|installer$\|install$\|ipcop$\|setup$\|pakfire$\|stage2$\|smp$\|tools$\|tools1$\|tools2$' \
        $BASEDIR/doc/packages-list | sort >> $BASEDIR/doc/packages-list.txt
   rm -f $BASEDIR/doc/packages-list
-  # packages-list.txt is ready to be displayed for wiki page IPCopSoftwares
+  # packages-list.txt is ready to be displayed for wiki page
 
   # Create ISO for CDRom and USB-superfloppy
   ipcopmake cdrom
+  rm -f $LFS/install/images/*usb*
   cp $LFS/install/images/{*.iso,*.tgz} $BASEDIR >> $LOGFILE 2>&1
 
+  ipfirepackages
+
   # Cleanup
   stdumount
   rm -rf $BASEDIR/build/tmp/*
@@ -732,11 +855,46 @@ buildpackages() {
 
 }
 
+ipfirepackages() {
+  if [ -d "$BASEDIR/packages" ]; then
+         for i in `ls $BASEDIR/packages`; do
+               touch $BASEDIR/build/install/packages/$i.empty
+         done
+  fi
+  ipfiredist amavisd
+  ipfiredist applejuice
+  # ipfiredist asterisk
+  ipfiredist clamav
+  ipfiredist cups
+  ipfiredist cyrusimap
+  ipfiredist fetchmail
+  ipfiredist gnump3d
+  ipfiredist java
+  ipfiredist lame
+  ipfiredist libtiff
+  ipfiredist libxml2
+  ipfiredist mailx
+  ipfiredist mldonkey
+  ipfiredist nfs
+  ipfiredist nmap
+  ipfiredist ntop
+  ipfiredist postfix
+  ipfiredist procmail
+  ipfiredist samba
+  ipfiredist spamassassin
+  ipfiredist web-cyradm
+  ipfiredist xampp
+  ipfiredist xinetd
+  test -d $BASEDIR/packages || mkdir $BASEDIR/packages
+  mv -f $LFS/install/packages/*.{tar.gz,md5} $BASEDIR/packages >> $LOGFILE 2>&1
+  rm -rf  $BASEDIR/build/install/packages/*
+}
+
 # See what we're supposed to do
 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
@@ -757,8 +915,17 @@ build)
                echo "`date -u '+%b %e %T'`: Using installed toolchain" | tee -a $LOGFILE
                prepareenv
        fi
+
        buildbase
        buildipcop
+
+       # Setzen des IPFire Builds
+       if [ "$FIREBUILD" ]; then
+               echo "$FIREBUILD" > $BASEDIR/build/var/ipfire/firebuild
+       else
+               echo "_(OvO)_" > $BASEDIR/build/var/ipfire/firebuild
+       fi
+
        buildinstaller
        buildpackages
        ;;
@@ -769,20 +936,9 @@ shell)
        entershell
        ;;
 changelog)
-       echo "Building doc/Changelog from CVS"
-       # cv2cl script come from http://www.red-bean.com/cvs2cl/
-       if [ ! -s $BASEDIR/doc/CVS/Tag ]; then
-               BRANCHOPTS=""
-       else
-               BRANCH=`cat $BASEDIR/doc/CVS/Tag`
-               BRANCH=${BRANCH:1}
-               BRANCHOPTS="--follow-only $BRANCH"
-       fi
-       
-       $BASEDIR/tools/cvs2cl.pl --gmt --show-dead $BRANCHOPTS -f $BASEDIR/doc/ChangeLog
-       rm -f $BASEDIR/doc/ChangeLog.bak
-       echo
-       echo "Commit the change now to update CVS"
+       echo -n "Loading new Changelog from SVN: "
+       svn log http://svn.ipfire.eu/svn/ipfire > doc/ChangeLog
+       echo "Finished!"
        ;;
 check)
        echo "Checking sources files availability on the web"
@@ -830,79 +986,61 @@ 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 CVS, list of changed files, MD5 of release files"
-       if [ ! -s $BASEDIR/doc/CVS/Tag ]; then
-               BRANCH=""
-               BRANCHOPTS="-D `date +'%Y-%m-%d'`"
-       else
-               BRANCH=`cat $BASEDIR/doc/CVS/Tag`
-               BRANCH=${BRANCH:1}
-               BRANCHOPTS="-r $BRANCH"
-       fi
+newpak)
+       # create structure for a new package
+       echo -e "Name of the new package: $2"
+       if [ ! -f "lfs/$2" ]; then
+               echo "`date -u '+%b %e %T'`: Creating directory src/paks/$2"
+               mkdir -p src/paks/$2
+               cd src/paks/$2
+               echo "`date -u '+%b %e %T'`: Creating files"
+               cp $BASEDIR/lfs/postfix $BASEDIR/lfs/$2
 
-       rm -rf $BASEDIR/build/tmp/$SNAME-$VERSION $BASEDIR/doc/release.txt
-       cd $BASEDIR/build/tmp
-       # build sources tgz
-       echo "Export tree $BRANCH $SNAME-$VERSION"
-       cvs -z3 -d `cat $BASEDIR/CVS/Root` export $BRANCHOPTS ipcop
-       if [ $? -eq 0 ]; then
-               mv ipcop $SNAME-$VERSION
-               tar cfz $BASEDIR/$SNAME-sources-$VERSION.tgz $SNAME-$VERSION
-               cd $BASEDIR
-
-               if [ ! -d $BASEDIR/build/tmp/$PREVIOUSTAG ]; then
-                       # export previous version to be compared with actual, this help to check wich files need to go in update
-                       cd $BASEDIR/build/tmp
-                       echo "Export tree $PREVIOUSTAG"
-                       cvs -z3 -d `cat $BASEDIR/CVS/Root` export -r $PREVIOUSTAG ipcop
-                       mv ipcop $PREVIOUSTAG
-               fi
-               if [ -d $BASEDIR/build/tmp/$PREVIOUSTAG -o -d $BASEDIR/build/tmp/$SNAME-$VERSION ]; then
-                       cd $BASEDIR/build/tmp
-                       echo "diff $PREVIOUSTAG <> $BRANCH $SNAME-$VERSION >doc/updated-sources.txt"
-                       diff -rq $PREVIOUSTAG $SNAME-$VERSION > $BASEDIR/doc/updated-sources.txt
-                       mv $BASEDIR/doc/updated-sources.txt $BASEDIR/doc/updated-sources.bak
-                       sed -e "s+Files $PREVIOUSTAG\/++" \
-                               -e "s+ and .*$++" \
-                               -e "s+src/rc.d+etc/rc.d+" \
-                               -e "s+^langs/+var/ipcop/langs/+" \
-                               -e "s+html/cgi-bin+home/httpd/cgi-bin+" $BASEDIR/doc/updated-sources.bak \
-                               > $BASEDIR/doc/updated-sources.txt
-                       rm -f $BASEDIR/doc/updated-sources.bak
+               touch ROOTFILES
+               touch {,un}install.sh
+       ## install.sh
+               echo '#!/bin/bash' > install.sh
+               echo '#' >> install.sh
+               echo '#################################################################' >> install.sh
+               echo '#                                                               #' >> install.sh
+               echo '# This file belongs to IPFire Firewall - GPLv2 - www.ipfire.org #' >> install.sh
+               echo '#                                                               #' >> install.sh
+               echo '#################################################################' >> install.sh
+               echo '#' >> install.sh
+               echo '# Extract the files' >> install.sh
+               echo 'tar xfz files.tgz -C /' >> install.sh
+               echo 'cp -f ROOTFILES /opt/pakfire/installed/ROOTFILES.$2' >> install.sh
+       ## uninstall.sh
+               echo '#!/bin/bash' > uninstall.sh
+               echo '#################################################################' >> uninstall.sh
+               echo '#                                                               #' >> uninstall.sh
+               echo '# This file belongs to IPFire Firewall - GPLv2 - www.ipfire.org #' >> uninstall.sh
+               echo '#                                                               #' >> uninstall.sh
+               echo '#################################################################' >> uninstall.sh
+               echo '#' >> uninstall.sh
+               echo '# Delete the files' >> uninstall.sh
+               echo '## Befehl fehlt noch' >> uninstall.sh
+               echo 'rm -f /opt/pakfire/installed/ROOTFILES.$2' >> uninstall.sh
+               echo "`date -u '+%b %e %T'`: Adding files to SVN"
+               cd - && svn add lfs/$2 && svn add src/paks/$2
+
+               echo -n "Do you want to remove the folders? [y/n]"
+               read REM
+               if  [ "$REM" == "y" ]; then
+                       echo "Removing the folders..."
+                       svn del src/paks/$2 --force
+               else
+                       echo "Folders are kept."
                fi
-       fi
-       ;;
-newupdate)
-       # create structure for $VERSION update
-       if [ ! -f "updates/$VERSION" ]; then
-               mkdir -p updates/$VERSION
-               cd updates/$VERSION
-               touch information
-               echo 'etc/issue' > ROOTFILES.alpha-$VERSION
-               echo 'etc/issue' > ROOTFILES.i386-$VERSION
-               echo 'patch.tar.gz' > .cvsignore
-               sed -e "s+^UPGRADEVERSION.*$+UPGRADEVERSION=$VERSION+" $BASEDIR/src/scripts/updatesetup > setup
-               chmod 755 setup
-               cd ..
-               echo "Adding directory $VERSION to cvs"
-               cvs add $VERSION
-               echo "Adding files to cvs"
-               cvs add $VERSION/ROOTFILES.alpha-$VERSION \
-                       $VERSION/ROOTFILES.i386-$VERSION \
-                       $VERSION/information \
-                       $VERSION/setup \
-                       $VERSION/.cvsignore
        else
-               echo "update/$VERSION already exist"
+               echo "$2 already exists"
        fi
-       cd -
        exit 0
        ;;
 prefetch)
@@ -949,40 +1087,6 @@ prefetch)
        fi
        cd -
        ;;
-rootfiles)
-       PREVIOUSVERSION=`echo $PREVIOUSTAG | sed -e 's/IPCOP_v//' -e 's/_FINAL//' -e 's/_/\./g'`
-       # make md5 list of actual build
-       # some packages include a timestamp (kernel/perl/python/vim and more), so md5 vary at each build
-       # anyway, it is sometime usable after a patch or a minor upgrade to know wich files include in update
-       if [ ! -f "$BASEDIR/build/install/cdrom/$SNAME-$VERSION.tgz" ]; then
-               echo "need cdrom be build to read include files list, use ./make.sh build before."
-       else
-               tar tzf $BASEDIR/build/install/cdrom/$SNAME-$VERSION.tgz > $BASEDIR/updates/$VERSION/FILES.tmp
-               cd $BASEDIR/build
-               rm -f $BASEDIR/updates/$VERSION/FILES-$MACHINE-$VERSION.md5
-               for line in `cat $BASEDIR/updates/$VERSION/FILES.tmp`; do
-                       if [ -f "$line" -a ! -L "$line" ]; then
-                               md5sum "$line" >> $BASEDIR/updates/$VERSION/FILES-$MACHINE-$VERSION.md5
-                       fi
-               done
-               diff $BASEDIR/updates/$PREVIOUSVERSION/FILES-$MACHINE-$PREVIOUSVERSION.md5 \
-                       $BASEDIR/updates/$VERSION/FILES-$MACHINE-$VERSION.md5 \
-                       > $BASEDIR/updates/$VERSION/FILES-$MACHINE.diff
-               awk '$1==">" {print $3}' $BASEDIR/updates/$VERSION/FILES-$MACHINE.diff \
-                       > $BASEDIR/updates/$VERSION/ROOTFILES.add.$MACHINE
-               awk '$1=="<" {print $3}' $BASEDIR/updates/$VERSION/FILES-$MACHINE.diff \
-                       > $BASEDIR/updates/$VERSION/ROOTFILES.remove.$MACHINE.tmp
-               rm -f $BASEDIR/updates/$VERSION/ROOTFILES.remove.$MACHINE
-               for line in `cat $BASEDIR/updates/$VERSION/ROOTFILES.remove.$MACHINE.tmp`; do
-                       # a file is only removed when not in add file
-                       if ( ! grep -q "^$line$" $BASEDIR/updates/$VERSION/ROOTFILES.add.$MACHINE ); then
-                               echo $line >> $BASEDIR/updates/$VERSION/ROOTFILES.remove.$MACHINE
-                       fi
-               done
-               rm -f $BASEDIR/updates/$VERSION/{FILES.tmp,FILES-*.diff,ROOTFILES.remove.*.tmp}
-       fi
-       exit 0
-       ;;
 toolchain)
        prepareenv
        buildtoolchain
@@ -999,11 +1103,11 @@ toolchain)
 gettoolchain)
        BUILDMACHINE=`uname -m`
        # arbitrary name to be updated in case of new toolchain package upload
-       PACKAGE=$SNAME-1.4.11-toolchain-$BUILDMACHINE
-       URL_SFNET=`grep URL_SFNET lfs/Config | awk '{ print $3 }'`
+       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
-       wget -c $URL_SFNET/ipcop/$PACKAGE.tar.gz $URL_SFNET/ipcop/$PACKAGE.md5
+       wget $URL_IPFIRE/toolchains/$PACKAGE.tar.gz $URL_IPFIRE/toolchains/$PACKAGE.md5 >& /dev/null
        if [ $? -ne 0 ]; then
                echo "`date -u '+%b %e %T'`: error downloading toolchain for $BUILDMACHINE machine" | tee -a $LOGFILE
        else
@@ -1014,9 +1118,195 @@ gettoolchain)
                fi
        fi
        ;;
+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:"
+       if [ -f .pass ]; then
+               PASS="`cat .pass`"
+       else
+               echo -ne "Password for mirror.ipfire.org: "; read PASS
+       fi
+       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
+       ;;
+pub-iso)
+       echo -e "Upload the ISO to the beta-mirror!"
+       if [ -f .pass ]; then
+               PASS="`cat .pass`"
+       else
+               echo -ne "Password for mirror.ipfire.org: "; read PASS
+       fi
+       ncftpls -u web3 -p $PASS ftp://mirror.ipfire.org/html/source-packages/beta/ | grep `svn info | grep Revision | cut -c 11-`
+       if [ "$?" -eq "1" ]; then
+                       cp $BASEDIR/ipfire-install-1.4.i386.iso $BASEDIR/ipfire-install-1.4.i386-r`svn info | grep Revision | cut -c 11-`.iso
+                       md5sum ipfire-install-1.4.i386-r`svn info | grep Revision | cut -c 11-`.iso > ipfire-install-1.4.i386-r`svn info | grep Revision | cut -c 11-`.iso.md5
+                       ncftpput -u web3 -p $PASS mirror.ipfire.org /html/source-packages/beta/ ipfire-install-1.4.i386-r`svn info | grep Revision | cut -c 11-`.iso
+                       ncftpput -u web3 -p $PASS mirror.ipfire.org /html/source-packages/beta/ ipfire-install-1.4.i386-r`svn info | grep Revision | cut -c 11-`.iso.md5
+                       if [ "$?" -eq "0" ]; then
+                               echo -e "The ISO of Revision `svn info | grep Revision | cut -c 11-` was successfully uploaded to the ftp server."
+                       else
+                               echo -e "There was an error while uploading the ISO to the ftp server."
+                       fi
+       else
+               echo -e "File with name ipfire-install-1.4.i386-r`svn info | grep Revision | cut -c 11-`.iso already exists on the ftp server!"
+       fi
+       rm -f ipfire-install-1.4.i386-r`svn info | grep Revision | cut -c 11-`.iso{,.md5}
+       ;;
+pub-paks)
+       echo -e "Upload the packages to the beta-mirror!"
+       if [ -f .pass ]; then
+               PASS="`cat .pass`"
+       else
+               echo -ne "Password for mirror.ipfire.org: "; read PASS
+       fi
+       ncftpput -z -u web3 -p $PASS mirror.ipfire.org /html/source-packages/packages/ packages/*
+       if [ "$?" -eq "0" ]; then
+               echo -e "The packages were successfully uploaded to the ftp server."
+       else
+               echo -e "There was an error while uploading the packages to the ftp server."
+       fi
+       ;;
+build-only)
+       rm -f $BASEDIR/log/$2*
+       BUILDMACHINE=`uname -m`
+       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'."
+       ;;
 *)
-       echo "Usage: $0 {build|changelog|check|checkclean|clean|dist|gettoolchain|newupdate|prefetch|rootfiles|shell|toolchain}"
-       cat doc/make.sh-usage
-       exit 1
+       clear
+       svn info
+       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
+       "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
        ;;
 esac