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
# #
############################################################################
if [ ! "$BASH" ]; then
- exiterror "BASH environment variable is not set. You're probably running the wrong shell."
+ exiterror "BASH environment variable is not set. You're probably running the wrong shell."
fi
if [ -z "${BASH_VERSION}" ]; then
- exiterror "Not running BASH shell."
+ exiterror "Not running BASH shell."
fi
echo -ne "Resetting our nice level to $NICE" | tee -a $LOGFILE
renice $NICE $$ > /dev/null
if [ `nice` != "$NICE" ]; then
- beautify message FAIL
- exiterror "Failed to set correct nice level"
+ beautify message FAIL
+ exiterror "Failed to set correct nice level"
else
- beautify message DONE
+ beautify message DONE
fi
############################################################################
echo -ne "Checking if we're running as root user" | tee -a $LOGFILE
if [ `id -u` != 0 ]; then
- beautify message FAIL
- exiterror "Not building as root"
+ beautify message FAIL
+ exiterror "Not building as root"
else
- beautify message DONE
+ beautify message DONE
fi
BASE_DEV=`df -P -k $BASEDIR | tail -n 1 | awk '{ print $1 }'`
BASE_ASPACE=`df -P -k $BASEDIR | tail -n 1 | awk '{ print $4 }'`
if (( 2048000 > $BASE_ASPACE )); then
- BASE_USPACE=`du -skx $BASEDIR | awk '{print $1}'`
- if (( 2048000 - $BASE_USPACE > $BASE_ASPACE )); then
- beautify message FAIL
- exiterror "Not enough temporary space available, need at least 2GB on $BASE_DEV"
- fi
+ BASE_USPACE=`du -skx $BASEDIR | awk '{print $1}'`
+ if (( 2048000 - $BASE_USPACE > $BASE_ASPACE )); then
+ beautify message FAIL
+ exiterror "Not enough temporary space available, need at least 2GB on $BASE_DEV"
+ fi
else
- beautify message DONE
+ beautify message DONE
fi
############################################################################
rm -f /tools
fi
if [ ! -a /tools ]; then
- ln -s $BASEDIR/build/tools /
+ ln -s $BASEDIR/build/tools /
fi
if [ ! -h /tools ]; then
- exiterror "Could not create /tools symbolic link."
+ exiterror "Could not create /tools symbolic link."
fi
# Setup environment
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
ipfiremake fcdslsl
ipfiremake fcdslusb
ipfiremake fcdslslusb
-# ipfiremake promise-sata-300-tx
+ ipfiremake r8169
ipfiremake zaptel
ipfiremake fuse
ipfiremake pkg-config
ipfiremake cdrtools
ipfiremake dnsmasq
ipfiremake dosfstools
- ipfiremake reiserfsprogs
ipfiremake squashfstools
+ ipfiremake reiserfsprogs
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
ipfiremake iptstate
ipfiremake iputils
ipfiremake l7-protocols
- ipfiremake isdn4k-utils
ipfiremake mISDN
+ ipfiremake isdn4k-utils
ipfiremake hwdata
ipfiremake kudzu
ipfiremake logrotate
ipfiremake logwatch
ipfiremake misc-progs
- ipfiremake mtools
ipfiremake nano
ipfiremake nasm
ipfiremake URI
ipfiremake setserial
ipfiremake setup
ipfiremake snort
- #ipfiremake snortsnarf
+ ipfiremake snortsnarf
ipfiremake oinkmaster
ipfiremake squid
ipfiremake squid-graph
ipfiremake vlan
ipfiremake wireless
ipfiremake libsafe
- ipfiremake 3c5x9setup
ipfiremake pakfire
ipfiremake java
ipfiremake spandsp
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 libshout
+ ipfiremake icecast
+ ipfiremake ices
+ ipfiremake mp3blaster
+ ipfiremake libpri
+ ipfiremake stund
+ ipfiremake asterisk
+ ipfiremake backup
ipfiremake gnump3d
ipfiremake libsigc++
ipfiremake applejuice
ipfiremake tripwire
ipfiremake sysstat
ipfiremake vsftpd
- ipfiremake alsa
- ipfiremake mp3blaster
ipfiremake which
ipfiremake lsof
}
installmake popt
installmake sysvinit
installmake misc-progs
- installmake e2fsprogs
installmake libaal
installmake reiser4progs
installmake reiserfsprogs
}
ipfirepackages() {
- ipfiredist alsa
-# ipfiredist amavisd
- ipfiredist applejuice
-# ipfiredist asterisk
- ipfiredist clamav
- ipfiredist cups
- ipfiredist cyrus-sasl
-# ipfiredist fetchmail
-# ipfiredist gnump3d
- 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
+ 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/*
exit 0
;;
upload)
- case "$2" in
- iso)
- echo -e "Uploading the iso to $FTP_ISO_PATH/$SVN_REVISION."
- cat <<EOF > .ftp-commands
+ FTP_ISO_PORT=`echo "$FTP_ISO_URL" | awk -F: '{ print $2 }'`
+ FTP_ISO_URL=`echo "$FTP_ISO_URL" | awk -F: '{ print $1 }'`
+ if [ -z $FTP_ISO_PORT ]; then
+ FTP_ISO_PORT=21
+ fi
+ cat <<EOF > .ftp-commands
mkdir -p $FTP_ISO_PATH$SVN_REVISION
-ls -lah
+mkdir -p $FTP_ISO_PATH$SVN_REVISION/paks
quit
EOF
- ncftp -u $FTP_ISO_USER -p $FTP_ISO_PASS $FTP_ISO_URL < .ftp-commands
- rm -f .ftp-commands
+ ncftp -u $FTP_ISO_USER -p $FTP_ISO_PASS -P $FTP_ISO_PORT $FTP_ISO_URL < .ftp-commands
+ rm -f .ftp-commands
+
+ case "$2" in
+ iso)
+ echo -e "Uploading the iso to $FTP_ISO_PATH/$SVN_REVISION."
+
md5sum ipfire-$VERSION.$MACHINE-full.iso > ipfire-$VERSION.$MACHINE-full.iso.md5
- ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS $FTP_ISO_URL $FTP_ISO_PATH$SVN_REVISION/ ipfire-$VERSION.$MACHINE-full.iso
- ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS $FTP_ISO_URL $FTP_ISO_PATH$SVN_REVISION/ ipfire-$VERSION.$MACHINE-full.iso.md5
- if [ -e ipfire-$VERSION.$MACHINE-devel.iso ]; then
- md5sum ipfire-$VERSION.$MACHINE-devel.iso > ipfire-$VERSION.$MACHINE-devel.iso.md5
- ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS $FTP_ISO_URL $FTP_ISO_PATH$SVN_REVISION/ ipfire-$VERSION.$MACHINE-devel.iso
- ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS $FTP_ISO_URL $FTP_ISO_PATH$SVN_REVISION/ ipfire-$VERSION.$MACHINE-devel.iso.md5
- fi
- ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS $FTP_ISO_URL $FTP_ISO_PATH$SVN_REVISION/ ipfire-source-r$SVN_REVISION.tar.gz
- ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS $FTP_ISO_URL $FTP_ISO_PATH$SVN_REVISION/ svn_status
- if [ "$?" -eq "0" ]; then
- echo -e "The iso of Revision $SVN_REVISION was successfully uploaded to $FTP_ISO_URL$FTP_ISO_PATH$SVN_REVISION/."
- else
- echo -e "There was an error while uploading the iso to the ftp server."
- exit 1
- fi
+ 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/."
+ else
+ echo "There was an error while uploading the file $i to the ftp server."
+ exit 1
+ fi
+ fi
+ done
if [ "$3" = "--with-sources-cd" ]; then
- ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS $FTP_ISO_URL $FTP_ISO_PATH/$SVN_REVISION/ ipfire-sources-cd-$VERSION.$MACHINE.iso
+ 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
;;
paks)
- cat <<EOF > .ftp-commands
-mkdir -p $FTP_ISO_PATH$SVN_REVISION/paks
-ls -lah
-quit
-EOF
- ncftp -u $FTP_ISO_USER -p $FTP_ISO_PASS $FTP_ISO_URL < .ftp-commands
- rm -f .ftp-commands
- ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS $FTP_ISO_URL $FTP_ISO_PATH$SVN_REVISION/paks packages/*
+ ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS -P $FTP_ISO_PORT $FTP_ISO_URL $FTP_ISO_PATH$SVN_REVISION/paks packages/*
if [ "$?" -eq "0" ]; then
echo -e "The packages were successfully uploaded to $FTP_ISO_URL$FTP_ISO_PATH$SVN_REVISION/."
else