X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=3274b94c2877a18c7f8d7f6f4aa3470290f07ce4;hp=5fc36987021262150967b6b531766035ae6a04a3;hb=af95dec53c1f58f0eb5b616bcfd497e584f4808c;hpb=a89770fa4ff30c4909909afc16afdb9476fa71f0

diff --git a/make.sh b/make.sh
index 5fc3698702..3274b94c28 100755
--- a/make.sh
+++ b/make.sh
@@ -24,7 +24,7 @@
 
 NAME="IPFire"										# Software name
 SNAME="ipfire"									# Short name
-VERSION="2.0rc1t"								# Version number
+VERSION="2.1"										# Version number
 SLOGAN="www.ipfire.org"					# Software slogan
 CONFIG_ROOT=/var/ipfire					# Configuration rootdir
 NICE=10													# Nice level
@@ -318,6 +318,7 @@ buildipfire() {
   LOGFILE="$BASEDIR/log/_build.ipfire.log"
   export LOGFILE
   ipfiremake configroot
+  ipfiremake backup
   ipfiremake dhcp
   ipfiremake dhcpcd
   ipfiremake libusb
@@ -327,11 +328,9 @@ buildipfire() {
   ipfiremake unzip
   ipfiremake linux			SMP=1
   ipfiremake ipp2p			SMP=1
-  ipfiremake r8169			SMP=1
   ipfiremake zaptel			SMP=1
   ipfiremake linux
   ipfiremake ipp2p
-  ipfiremake r8169
   ipfiremake zaptel
   ipfiremake pkg-config
   ipfiremake linux-atm
@@ -396,7 +395,6 @@ buildipfire() {
   ipfiremake iptables
   ipfiremake libupnp
   ipfiremake ipp2p			IPT=1
-  ipfiremake moblock
   ipfiremake linux-igd
   ipfiremake ipac-ng
   ipfiremake ipaddr
@@ -464,6 +462,7 @@ buildipfire() {
   ipfiremake cups
   ipfiremake ghostscript
   ipfiremake foomatic
+  ipfiremake hplip
   ipfiremake samba
   ipfiremake sudo
   ipfiremake mc
@@ -475,9 +474,8 @@ buildipfire() {
   ipfiremake htop
   ipfiremake postfix
   ipfiremake fetchmail
-  ipfiremake cyrusimap
+  ipfiremake cyrus-imapd
   ipfiremake openmailadmin
-  ipfiremake mailx
   ipfiremake clamav
   ipfiremake spamassassin
   ipfiremake amavisd
@@ -498,12 +496,9 @@ buildipfire() {
   ipfiremake mpc
   ipfiremake xvid
   ipfiremake libmpeg2
-  #ipfiremake ffmpeg
   ipfiremake videolan
   ipfiremake libpri
-  ipfiremake stund
   ipfiremake asterisk
-  ipfiremake backup
   ipfiremake gnump3d
   ipfiremake libsigc++
   ipfiremake applejuice
@@ -518,18 +513,16 @@ buildipfire() {
   ipfiremake nfs
   ipfiremake nmap
   ipfiremake mbmon
-  ipfiremake iftop
   ipfiremake ncftp
-  ipfiremake cftp
   ipfiremake etherwake
-  ipfiremake ethereal
-  ipfiremake tftp-hpa
   ipfiremake bwm-ng
   ipfiremake tripwire
   ipfiremake sysstat
   ipfiremake vsftpd
   ipfiremake which
   ipfiremake lsof
+  ipfiremake centerim
+  ipfiremake br2684ctl
 }
 
 buildinstaller() {