Merge branch 'rspezial'

Conflicts:

	config/rootfiles/core/15/files
	config/rootfiles/core/15/update.sh
	lfs/collectd
	make.sh

diff --combined doc/packages-list.txt
index 1b93c6db13fdea9e965605214df88c9321644b21,0d5d82b2266e66c12bf4a71f1d3e5fe9cf9138c9..a8ba0a4ccfc7b328e7d0674c3d26423e5767c34c
--- 1/doc/packages-list.txt
--- 2/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@@ -1,13 -1,15 +1,15 @@@
- == List of softwares used to build IPFire Version: 2.1 ==
+ == List of softwares used to build IPFire Version: 2.2-test ==
  * Archive-Tar-1.29
  * Archive-Zip-1.16
  * BerkeleyDB-0.27
  * Compress-Zlib-1.35
  * Convert-TNEF-0.17
  * Convert-UUlib-1.06
+ * DFB++-1.0.0
  * Digest-1.08
  * Digest-HMAC-1.01
  * Digest-SHA1-2.10
+ * DirectFB-1.1.1
  * GD-2.35
  * GDGraph-1.4308
  * GDTextUtil-0.86
@@@ -70,7 -72,6 +72,6 @@@
  * dhcp-3.1.0
  * dhcpcd-2.0.8
  * diffutils-2.8.1
- * dm9601-2.6
  * dnsmasq-2.40
  * dosfstools-2.11
  * e2fsprogs-1.39
@@@ -83,6 -84,7 +84,7 @@@
  * ethtool-3
  * expat-2.0.0
  * ez-ipupdate-3.0.11b8
+ * fbset-2.1
  * fcron-3.0.1
  * fetchmail-6.3.8
  * ffmpeg-export-2008-04-13
@@@ -113,6 -115,7 +115,7 @@@
  * gzip-1.3.5
  * hddtemp-0.3-beta14
  * hdparm-8.6
+ * hostapd-0.5.10
  * hplip-2.7.10
  * htop-0.7
  * httpd-2.2.6
@@@ -122,13 -125,12 +125,12 @@@
  * icegenerator-0.5.5-pre2
  * igmpproxy-src-0.1-beta2
  * inetutils-1.4.2
- * ipac-ng-1.31
  * ipaddr-1.2
  * ipfireseeder-1.00
  * ipp2p-0.8.2
  * ipp2p-0.8.2-iptables
  * iproute2-2.6.16-060323
- * iptables-1.3.5
+ * iptables-1.3.8
  * iptstate-2.1
  * iputils-ss020927
  * java-1.5.0_06-for-ipfire
@@@ -144,6 -146,7 +146,7 @@@
  * libaal-1.0.5
  * libart_lgpl-2.3.17
  * libcap-1.10
+ * libdvbpsi5-0.1.6
  * libid3tag-0.15.1b
  * libidn-0.6.14
  * libmad-0.15.1b
@@@ -163,28 -166,29 +166,30 @@@
  * libwww-perl-5.803
  * libxml2-2.6.26
  * libxslt-1.1.17
- * linux-2.6.16.57
+ * linux-2.6.20.21
  * linux-atm-2.4.1
+ * linux-fusion-7.0.1
  * linux-libc-headers-2.6.12.0
  * linuxigd-0.95
+ * lm_sensors-3.0.2
  * logrotate-3.7.1
  * logwatch-7.3.6
  * lsof-4.78
  * lzo-2.02
  * m4-1.4.4
  * mISDNuser-1_1_5
+ * madwifi-0.9.4-wlan
  * make-3.81
  * man-db-2.4.3
  * man-pages-2.34
  * mbr-1.1.8
  * mc-4.6.1
- * mcs7830-060926
  * memtest86+-1.65
  * misc-progs
  * mkinitcpio-0.5.9
  * mktemp-1.5
  * mldonkey-2.9.2
 +* mod_perl-2.0.4
  * module-init-tools-3.2.2
  * mpc-0.12.1
  * mpd-0.13.1
@@@ -214,7 -218,7 +219,7 @@@
  * openmailadmin-1.0.0
  * openssh-4.7p1
  * openssl-0.9.8g
- * openswan-2.4.9
+ * openswan-2.4.12
  * openvpn-2.0.9
  * pam_mysql-0.7RC1
  * patch-2.5.4
@@@ -285,15 -289,17 +290,17 @@@
  * vdr-1.6.0
  * vim-7.0
  * vlan.1.9
- * vlc-0.8.6f
+ * vlc-0.8.6h
+ * vnstat-1.6
+ * vnstati-beta3
  * vsftpd-2.0.5
  * w_scan-20080105
  * wget-1.10.2
  * whatmask-1.2
  * which-2.16
  * wireless_tools.28
+ * wpa_supplicant-0.5.10
  * xfsprogs-2.9.4
- * xmbmon205
  * xvidcore-1.1.0
  * zaptel-1.4.4
  * zlib-1.2.3

diff --combined make.sh
index 9206c07c494f10000cc875cee02dc40948aa34cb,ae02a2df4fae1ad46695bec4e2f0edd63313fa0b..04a348c05678ca1fbe665ae836d7b25bcfeba51c
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -24,7 -24,8 +24,8 @@@
  
  NAME="IPFire"                                                                         # Software name
  SNAME="ipfire"                                                                        # Short name
- VERSION="2.1"                                                                         # Version number
+ VERSION="2.2-test"
+ GIT_BRANCH=rspezial:rspezial                                                                          # Version number
  SLOGAN="www.ipfire.org"                                       # Software slogan
  CONFIG_ROOT=/var/ipfire                                       # Configuration rootdir
  NICE=10                                                                                                       # Nice level
@@@ -332,26 -333,26 +333,26 @@@ buildipfire() 
    ipfiremake rp-pppoe
    ipfiremake unzip
    ipfiremake linux                    SMP=1
+   ipfiremake linux-fusion             SMP=1
    ipfiremake ipp2p                    SMP=1
    ipfiremake zaptel                   SMP=1
    ipfiremake r8169                    SMP=1
    ipfiremake r8168                    SMP=1
-   ipfiremake mcs7830                  SMP=1
    ipfiremake atl1                     SMP=1
-   ipfiremake dm9601                   SMP=1
    ipfiremake kqemu                    SMP=1
    ipfiremake v4l-dvb                  SMP=1
+   ipfiremake madwifi                    SMP=1
    ipfiremake sane             KMOD=1  SMP=1
    ipfiremake linux
+   ipfiremake linux-fusion
    ipfiremake ipp2p
    ipfiremake zaptel
    ipfiremake r8169
    ipfiremake r8168
-   ipfiremake mcs7830
    ipfiremake atl1
-   ipfiremake dm9601
    ipfiremake kqemu
    ipfiremake v4l-dvb
+   ipfiremake madwifi
    ipfiremake sane             KMOD=1
    ipfiremake pkg-config
    ipfiremake linux-atm
@@@ -418,7 -419,6 +419,6 @@@
    ipfiremake libupnp
    ipfiremake ipp2p                    IPT=1
    ipfiremake linux-igd
-   ipfiremake ipac-ng
    ipfiremake ipaddr
    ipfiremake iptstate
    ipfiremake iputils
@@@ -510,6 -510,7 +510,7 @@@
    ipfiremake libmad
    ipfiremake libogg
    ipfiremake libvorbis
+   ipfiremake libdvbpsi
    ipfiremake lame
    ipfiremake sox
    ipfiremake libshout
@@@ -535,7 -536,6 +536,6 @@@
    ipfiremake portmap
    ipfiremake nfs
    ipfiremake nmap
-   ipfiremake mbmon
    ipfiremake ncftp
    ipfiremake etherwake
    ipfiremake bwm-ng
@@@ -547,6 -547,7 +547,7 @@@
    ipfiremake centerim
    ipfiremake br2684ctl
    ipfiremake pcmciautils
+   ipfiremake lm_sensors
    ipfiremake collectd
    ipfiremake lcd4linux
    ipfiremake neon
@@@ -555,6 -556,7 +556,7 @@@
    ipfiremake teamspeak
    ipfiremake elinks
    ipfiremake igmpproxy
+   ipfiremake fbset
    ipfiremake sdl
    ipfiremake qemu
    ipfiremake sane
@@@ -566,6 -568,8 +568,8 @@@
    ipfiremake arptables
    ipfiremake fontconfig
    ipfiremake freefont
+   ipfiremake directfb
+   ipfiremake dfb++
    ipfiremake ffmpeg
    ipfiremake videolan
    ipfiremake vdr
@@@ -574,8 -578,11 +578,11 @@@
    ipfiremake squidclamav
    ipfiremake bc
    ipfiremake esniper
- }
 +  ipfiremake mod_perl
 -  ipfiremake hostapd
 -}
+   ipfiremake vnstat
+   ipfiremake vnstati
+   ipfiremake wpa_supplicant
++  ipfiremake hostapd}
  
  buildinstaller() {
    # Run installer scripts one by one
@@@ -646,7 -653,10 +653,10 @@@ buildpackages() 
    if [ -e /dev/loop/0 ] || [ -e /dev/loop0 ]; then
        ipfiremake usb-stick
    fi
-   mv $LFS/install/images/{*.iso,*.tgz,*.img.gz} $BASEDIR >> $LOGFILE 2>&1
+ 
+   # Create updater package
+   ipfiremake updater
+   mv $LFS/install/images/{*.iso,*.tgz,*.img.gz,*.bz2} $BASEDIR >> $LOGFILE 2>&1
  
    ipfirepackages
  
@@@ -671,7 -681,7 +681,7 @@@
  }
  
  ipfirepackages() {
-       ipfiremake core-updates
+       #ipfiremake core-updates
        for i in $(ls -1 $BASEDIR/config/rootfiles/packages); do
                if [ -e $BASEDIR/lfs/$i ]; then
                        ipfiredist $i
@@@ -898,7 -908,7 +908,7 @@@ git
                [ -z $GIT_USER ] && exiterror "You have to setup GIT_USER first."
                        GIT_URL="ssh://${GIT_USER}@git.ipfire.org/pub/git/ipfire-2.x"
                        
-               git push ${GIT_URL} master
+               git push ${GIT_URL} ${GIT_BRANCH}
                ;;
        esac
        ;;