Korrekturen im IDS System

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

diff --git a/make.sh b/make.sh
index 8c91dadbc2e1c4e8712f3449578c8bf16d7ef54f..e45b28a20e944f3575af0e5161021bba2b06cf71 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -17,18 +17,18 @@
 # along with IPFire; if not, write to the Free Software                    #
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
 #                                                                          #
-# Copyright (C) 2006 IPFire-Team <info@ipfire.eu>.                         #
+# Copyright (C) 2007 IPFire-Team <info@ipfire.org>.                        #
 #                                                                          #
 ############################################################################
 #
 
-NAME="IPFire"                          # Software name
-SNAME="ipfire"                 # Short name
-VERSION="2.0a3"                        # Version number
-SLOGAN="www.ipfire.org"                # Software slogan
-CONFIG_ROOT=/var/ipfire                # Configuration rootdir
-NICE=10                                # Nice level
-MAX_RETRIES=1                          # prefetch/check loop
+NAME="IPFire"                                                                          # Software name
+SNAME="ipfire"                                                                 # Short name
+VERSION="2.0t4"                                                                        # Version number
+SLOGAN="www.ipfire.org"                                        # Software slogan
+CONFIG_ROOT=/var/ipfire                                        # Configuration rootdir
+NICE=10                                                                                                        # Nice level
+MAX_RETRIES=1                                                                          # prefetch/check loop
 KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
 MACHINE=`uname -m`
 SVN_REVISION=`svn info | grep Revision | cut -c 11-`
@@ -333,11 +333,10 @@ buildipfire() {
   ipfiremake fcdslsl           SMP=1
   ipfiremake fcdslusb          SMP=1
   ipfiremake fcdslslusb        SMP=1
-  ipfiremake fcpci                     SMP=1
 #  ipfiremake promise-sata-300-tx      SMP=1
   ipfiremake zaptel                    SMP=1
   ipfiremake fuse                              SMP=1
-  ipfiremake linux                     XEN=1
+  #ipfiremake linux                    XEN=1
   ipfiremake linux
   ipfiremake ipp2p
   ipfiremake fcdsl
@@ -345,7 +344,6 @@ buildipfire() {
   ipfiremake fcdslsl
   ipfiremake fcdslusb
   ipfiremake fcdslslusb
-  ipfiremake fcpci
 #  ipfiremake promise-sata-300-tx
   ipfiremake zaptel
   ipfiremake fuse
@@ -359,15 +357,14 @@ buildipfire() {
   ipfiremake gmp
   ipfiremake pam
   ipfiremake openssl
+  ipfiremake curl
   ipfiremake python
   ipfiremake libnet
   ipfiremake libjpeg
   ipfiremake libpng
   ipfiremake libtiff
-  ipfiremake lcms
-  ipfiremake libmng
-  ipfiremake freetype
   ipfiremake libart
+  ipfiremake freetype
   ipfiremake gd
   ipfiremake popt
   ipfiremake pcre
@@ -375,7 +372,9 @@ buildipfire() {
   ipfiremake newt
   ipfiremake libcap
   ipfiremake pciutils
+  ipfiremake usbutils
   ipfiremake libxml2
+  ipfiremake libxslt
   ipfiremake BerkeleyDB
   ipfiremake mysql
   ipfiremake cyrus-sasl
@@ -415,7 +414,8 @@ buildipfire() {
   ipfiremake iptstate
   ipfiremake iputils
   ipfiremake l7-protocols
-#  ipfiremake isdn4k-utils # What about mISDN???
+  ipfiremake isdn4k-utils
+  ipfiremake mISDN
   ipfiremake hwdata
   ipfiremake kudzu
   ipfiremake logrotate
@@ -423,7 +423,6 @@ buildipfire() {
   ipfiremake misc-progs
   ipfiremake mtools
   ipfiremake nano
-  ipfiremake nash
   ipfiremake nasm
   ipfiremake URI
   ipfiremake HTML-Tagset
@@ -448,6 +447,8 @@ buildipfire() {
   ipfiremake Text-Tabs+Wrap
   ipfiremake Locale-Country
   ipfiremake XML-Parser
+  ipfiremake MP3-Info
+  ipfiremake MP3-Tag
   ipfiremake glib
   ipfiremake GeoIP
   ipfiremake fwhits
@@ -474,7 +475,6 @@ buildipfire() {
   ipfiremake 3c5x9setup
   ipfiremake pakfire
   ipfiremake java
-  ipfiremake bootsplash
   ipfiremake spandsp
   ipfiremake lzo
   ipfiremake openvpn
@@ -503,15 +503,21 @@ buildipfire() {
 # ipfiremake bristuff
   ipfiremake asterisk
   ipfiremake mpg123
+  ipfiremake mpfire
+  ipfiremake backup
   ipfiremake libmad
   ipfiremake libogg
   ipfiremake libvorbis
   ipfiremake lame
   ipfiremake sox
   ipfiremake gnump3d
+  ipfiremake libsigc++
   ipfiremake applejuice
   ipfiremake ocaml
   ipfiremake mldonkey
+  ipfiremake libtorrent
+  ipfiremake rtorrent
+  ipfiremake ipfireseeder
   ipfiremake rsync
   ipfiremake tcpwrapper
   ipfiremake portmap
@@ -527,6 +533,11 @@ buildipfire() {
   ipfiremake bwm-ng
   ipfiremake tripwire
   ipfiremake sysstat
+  ipfiremake vsftpd
+  ipfiremake alsa
+  ipfiremake mp3blaster
+  ipfiremake which
+  ipfiremake lsof
 }
 
 buildinstaller() {
@@ -627,23 +638,33 @@ buildpackages() {
 }
 
 ipfirepackages() {
+  ipfiredist alsa
 #  ipfiredist amavisd
-#  ipfiredist applejuice
+  ipfiredist applejuice
 #  ipfiredist asterisk
   ipfiredist clamav
-#  ipfiredist cups
-#  ipfiredist cyrusimap
+  ipfiredist cups
+  ipfiredist cyrus-sasl
 #  ipfiredist fetchmail
 #  ipfiredist gnump3d
-#  ipfiredist java
+  ipfiredist ipfireseeder
+  ipfiredist java
+  ipfiredist libogg
+  ipfiredist libvorbis
 #  ipfiredist mailx
 #  ipfiredist mldonkey
+  ipfiredist mp3blaster
+  ipfiredist mpfire
+  ipfiredist mpg123
 #  ipfiredist nfs
+  ipfiredist openldap
 #  ipfiredist postfix
+  ipfiredist rtorrent
   ipfiredist samba
 #  ipfiredist sox
 #  ipfiredist spamassassin
   ipfiredist tripwire
+  ipfiredist vsftpd
 #  ipfiredist webcyradm
   test -d $BASEDIR/packages || mkdir $BASEDIR/packages
   mv -f $LFS/install/packages/* $BASEDIR/packages >> $LOGFILE 2>&1
@@ -951,7 +972,7 @@ upload)
          iso)
                echo -e "Uploading the iso to $FTP_ISO_PATH/$SVN_REVISION."
                cat <<EOF > .ftp-commands
-mkdir -p $FTP_ISO_PATH/$SVN_REVISION
+mkdir -p $FTP_ISO_PATH$SVN_REVISION
 ls -lah
 quit
 EOF
@@ -979,7 +1000,7 @@ EOF
                ;;
          paks)
                cat <<EOF > .ftp-commands
-mkdir -p $FTP_ISO_PATH/$SVN_REVISION/paks
+mkdir -p $FTP_ISO_PATH$SVN_REVISION/paks
 ls -lah
 quit
 EOF