Eine Reihe an Paketen gemacht: ethereal, nmap, rsync, sox, mailx

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

diff --git a/make.sh b/make.sh
index a01e29c5f1564800bba790aca6c7235bf9c3bd14..03faf906422f42c6219c5f86a53355ff281680e9 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -389,13 +389,12 @@ buildipfire() {
   ipfiremake dnsmasq
   ipfiremake dosfstools
   ipfiremake reiserfsprogs
-  ipfiremake squashfstools
   ipfiremake sysfsutils
   ipfiremake ntfs-3g
   ipfiremake ethtool
   ipfiremake ez-ipupdate
   ipfiremake fcron
-  ipfiremake GD
+  ipfiremake perl-GD
   ipfiremake GD-Graph
   ipfiremake GD-TextUtil
   ipfiremake gnupg
@@ -460,7 +459,7 @@ buildipfire() {
   ipfiremake setserial
   ipfiremake setup
   ipfiremake snort
-  #ipfiremake snortsnarf
+  ipfiremake snortsnarf
   ipfiremake oinkmaster
   ipfiremake squid
   ipfiremake squid-graph
@@ -471,7 +470,6 @@ buildipfire() {
   ipfiremake vlan
   ipfiremake wireless
   ipfiremake libsafe
-  ipfiremake 3c5x9setup
   ipfiremake pakfire
   ipfiremake java
   ipfiremake spandsp
@@ -497,18 +495,20 @@ buildipfire() {
   ipfiremake clamav
   ipfiremake spamassassin
   ipfiremake amavisd
-  ipfiremake stund
-  ipfiremake libpri
-# ipfiremake bristuff
-  ipfiremake asterisk
+  ipfiremake alsa
   ipfiremake mpg123
   ipfiremake mpfire
-  ipfiremake backup
+  ipfiremake guardian
   ipfiremake libmad
   ipfiremake libogg
   ipfiremake libvorbis
   ipfiremake lame
   ipfiremake sox
+  ipfiremake mp3blaster
+  ipfiremake libpri
+  ipfiremake stund
+  ipfiremake asterisk
+  ipfiremake backup
   ipfiremake gnump3d
   ipfiremake libsigc++
   ipfiremake applejuice
@@ -533,8 +533,6 @@ buildipfire() {
   ipfiremake tripwire
   ipfiremake sysstat
   ipfiremake vsftpd
-  ipfiremake alsa
-  ipfiremake mp3blaster
   ipfiremake which
   ipfiremake lsof
 }
@@ -643,23 +641,27 @@ ipfirepackages() {
   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 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 sox
 #  ipfiredist spamassassin
   ipfiredist tripwire
   ipfiredist vsftpd
@@ -984,8 +986,8 @@ EOF
                echo -e "Uploading the iso to $FTP_ISO_PATH/$SVN_REVISION."
 
                md5sum ipfire-$VERSION.$MACHINE-full.iso > ipfire-$VERSION.$MACHINE-full.iso.md5
-               for i in "svn_status ipfire-source-r$SVN_REVISION.tar.gz ipfire-$VERSION.$MACHINE-full.iso ipfire-$VERSION.$MACHINE-full.iso.md5 ipfire-$VERSION.$MACHINE-devel.iso ipfire-$VERSION.$MACHINE-devel.iso.md5"; do
-                               #if [ -e "$i" ]; then
+               for i in svn_status ipfire-source-r$SVN_REVISION.tar.gz ipfire-$VERSION.$MACHINE-full.iso ipfire-$VERSION.$MACHINE-full.iso.md5 ipfire-$VERSION.$MACHINE-devel.iso ipfire-$VERSION.$MACHINE-devel.iso.md5; do
+                               if [ -e "$i" ]; then
                            ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS -P $FTP_ISO_PORT $FTP_ISO_URL $FTP_ISO_PATH$SVN_REVISION/ $i
                                        if [ "$?" -eq "0" ]; then
                                                echo "The file with name $i was successfully uploaded to $FTP_ISO_URL$FTP_ISO_PATH$SVN_REVISION/."
@@ -993,7 +995,7 @@ EOF
                                                echo "There was an error while uploading the file $i to the ftp server."
                                                exit 1
                                        fi
-                               #fi
+                               fi
                done
                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