OpenSwan gefixt.

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

diff --git a/make.sh b/make.sh
index 7e51cef755c36632a77988f676d496084cdcaa11..e2873bd96062167c2b64a3026522d01fa0423d98 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -24,7 +24,7 @@
 
 NAME="IPFire"                                                                          # Software name
 SNAME="ipfire"                                                                 # Short name
-VERSION="2.0t4"                                                                        # Version number
+VERSION="2.0t5"                                                                        # Version number
 SLOGAN="www.ipfire.org"                                        # Software slogan
 CONFIG_ROOT=/var/ipfire                                        # Configuration rootdir
 NICE=10                                                                                                        # Nice level
@@ -333,7 +333,7 @@ buildipfire() {
   ipfiremake fcdslsl           SMP=1
   ipfiremake fcdslusb          SMP=1
   ipfiremake fcdslslusb        SMP=1
-#  ipfiremake promise-sata-300-tx      SMP=1
+  ipfiremake r8169                     SMP=1
   ipfiremake zaptel                    SMP=1
   ipfiremake fuse                              SMP=1
   ipfiremake linux
@@ -343,7 +343,7 @@ buildipfire() {
   ipfiremake fcdslsl
   ipfiremake fcdslusb
   ipfiremake fcdslslusb
-#  ipfiremake promise-sata-300-tx
+  ipfiremake r8169
   ipfiremake zaptel
   ipfiremake fuse
   ipfiremake pkg-config
@@ -420,7 +420,6 @@ buildipfire() {
   ipfiremake logrotate
   ipfiremake logwatch
   ipfiremake misc-progs
-  ipfiremake mtools
   ipfiremake nano
   ipfiremake nasm
   ipfiremake URI
@@ -505,6 +504,9 @@ buildipfire() {
   ipfiremake libvorbis
   ipfiremake lame
   ipfiremake sox
+  ipfiremake libshout
+  ipfiremake icecast
+  ipfiremake ices
   ipfiremake mp3blaster
   ipfiremake libpri
   ipfiremake stund
@@ -635,38 +637,9 @@ buildpackages() {
 }
 
 ipfirepackages() {
-  ipfiredist alsa
-#  ipfiredist amavisd
-  ipfiredist applejuice
-#  ipfiredist asterisk
-  ipfiredist clamav
-  ipfiredist cups
-  ipfiredist cyrus-sasl
-  ipfiredist ethereal
-#  ipfiredist fetchmail
-#  ipfiredist gnump3d
-  ipfiredist guardian
-  ipfiredist ipfireseeder
-  ipfiredist java
-  ipfiredist libogg
-  ipfiredist libvorbis
-  ipfiredist mailx
-#  ipfiredist mldonkey
-  ipfiredist mp3blaster
-  ipfiredist mpfire
-  ipfiredist mpg123
-#  ipfiredist nfs
-  ipfiredist nmap
-  ipfiredist openldap
-#  ipfiredist postfix
-  ipfiredist rsync
-  ipfiredist rtorrent
-  ipfiredist samba
-  ipfiredist sox
-#  ipfiredist spamassassin
-  ipfiredist tripwire
-  ipfiredist vsftpd
-#  ipfiredist webcyradm
+       for i in $(ls -1 $BASEDIR/config/rootfiles/packages); do
+               [ -e $BASEDIR/lfs/$i ] && ipfiredist $i
+       done
   test -d $BASEDIR/packages || mkdir $BASEDIR/packages
   mv -f $LFS/install/packages/* $BASEDIR/packages >> $LOGFILE 2>&1
   rm -rf  $BASEDIR/build/install/packages/*
@@ -998,6 +971,7 @@ EOF
                                        fi
                                fi
                done
+               rm -f ipfire-$VERSION.$MACHINE-full.iso.md5
                if [ "$3" = "--with-sources-cd" ]; then
                        ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS -P $FTP_ISO_PORT $FTP_ISO_URL $FTP_ISO_PATH/$SVN_REVISION/ ipfire-sources-cd-$VERSION.$MACHINE.iso
                fi