Merge branch 'next' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x into next

Conflicts:
	doc/packages-list.txt

diff --combined doc/packages-list.txt
index 5c25ea2dc08223269c99c6381d806db876043545,b505d6511902e5a83ca50e2c8427dff39922a088..e7d9659fc8bff8348d185b1dddd651cfd31d86e3
--- 1/doc/packages-list.txt
--- 2/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@@ -66,7 -66,7 +66,7 @@@
  * centerim-4.22.1
  * clamav-0.95.3
  * cmake-2.4.8
- * collectd-4.5.4
+ * collectd-4.9.1
  * coreutils-5.96
  * cpio-2.6
  * cpufrequtils-007
@@@ -76,7 -76,6 +76,7 @@@
  * cyrus-sasl-2.1.21
  * dahdi-2.2.1
  * dahdi-2.2.1-kmod-2.6.32.8-ipfire
 +* dahdi-2.2.1-kmod-2.6.32.8-ipfire-xen
  * db-4.4.20
  * dbus-1.0.3
  * dhcp-3.1.0
@@@ -94,6 -93,7 +94,7 @@@
  * ethtool-3
  * expat-2.0.0
  * ez-ipupdate-3.0.11b8
+ * faad2-2.7
  * fbset-2.1
  * fcron-3.0.4
  * feedparser-4.1
@@@ -153,7 -153,6 +154,7 @@@
  * kbd-1.12
  * klibc-1.5.14
  * kqemu-1.4.0pre1-kmod-2.6.32.8-ipfire
 +* kqemu-1.4.0pre1-kmod-2.6.32.8-ipfire-xen
  * kudzu-1.2.64
  * l7-protocols-2009-05-10
  * lame-3.97
@@@ -171,6 -170,7 +172,7 @@@
  * libnet-1.1.2.1
  * libnl-1.1
  * libogg-1.1.4
+ * liboping-1.3.4
  * libpcap-1.0.0
  * libpng-1.2.12
  * libpri-1.4.10.2
@@@ -186,7 -186,6 +188,7 @@@
  * libxml2-2.6.26
  * libxslt-1.1.17
  * linux-2.6.32.8-ipfire
 +* linux-2.6.32.8-ipfire-xen
  * linux-atm-2.4.1
  * linux-libc-headers-2.6.12.0
  * lm_sensors-3.1.2
@@@ -198,7 -197,6 +200,7 @@@
  * m4-1.4.4
  * mISDNuser_20090906
  * madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.8-ipfire
 +* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.8-ipfire-xen
  * make-3.81
  * man-db-2.4.3
  * man-pages-2.34
@@@ -248,7 -246,6 +250,7 @@@
  * openssl-0.9.8l
  * openswan-2.6.24
  * openswan-2.6.24-kmod-2.6.32.8-ipfire
 +* openswan-2.6.24-kmod-2.6.32.8-ipfire-xen
  * openvpn-2.1_rc20
  * p7zip_4.65
  * pam_mysql-0.7RC1
@@@ -273,7 -270,7 +275,7 @@@
  * reiser4progs-1.0.5
  * reiserfsprogs-3.6.19
  * rp-pppoe-3.8
- * rrdtool-1.2.15
+ * rrdtool-1.2.30
  * rssdler-0.4.0a
  * rsync-3.0.7
  * rtorrent-0.8.6
@@@ -295,13 -292,13 +297,13 @@@
  * squashfs-lzma-cvs20100214
  * squid-2.7.STABLE7
  * squidGuard-1.4.1
- * squidclamav-4.1
+ * squidclamav-5.0
  * sshfs-fuse-2.2
  * sslh-1.6i
  * streamripper-1.63.5
  * sudo-1.6.8p12
  * sysfsutils-1.3.0
- * sysklogd-1.4.1
+ * sysklogd-1.5
  * syslinux-3.62
  * sysstat-6.0.2
  * sysvinit-2.86
@@@ -325,7 -322,6 +327,7 @@@
  * usbutils-0.72
  * util-linux-2.12r
  * v4l-dvb-690055993011-kmod-2.6.32.8-ipfire
 +* v4l-dvb-690055993011-kmod-2.6.32.8-ipfire-xen
  * vdr-1.6.0
  * vdradmin-am-3.6.5
  * vim-7.0

diff --combined make.sh
index 007b53ea9c2c5f6963672d3f7d5003d7705cdee0,2a85a962455ec74798b9f6008f4b4d846f7d52af..62f0a55c217b0a80280d13ad007218c1259956bb
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -341,16 -341,16 +341,16 @@@ buildipfire() 
    ipfiremake unzip
    ipfiremake which
    ipfiremake xz
 -#  ipfiremake linux                   XEN=1
 -#  ipfiremake kqemu                   XEN=1
 -#  #ipfiremake kvm-kmod                       XEN=1
 -#  ipfiremake v4l-dvb                 XEN=1
 -#  ipfiremake madwifi                 XEN=1
 -#  #ipfiremake alsa                   XEN=1 KMOD=1
 -#  ipfiremake dahdi                   XEN=1 KMOD=1
 -#  ipfiremake openswan                        XEN=1 KMOD=1
 -#  ipfiremake mISDN                   XEN=1
 -#  ipfiremake compat-wireless         XEN=1
 +  ipfiremake linux                    XEN=1
 +  ipfiremake kqemu                    XEN=1
 +  #ipfiremake kvm-kmod                        XEN=1
 +  ipfiremake v4l-dvb                  XEN=1
 +  ipfiremake madwifi                  XEN=1
 +  #ipfiremake alsa                    XEN=1 KMOD=1
 +  ipfiremake dahdi                    XEN=1 KMOD=1
 +  ipfiremake openswan                 XEN=1 KMOD=1
 +  #ipfiremake mISDN                   XEN=1
 +  #ipfiremake compat-wireless         XEN=1
    ipfiremake linux
    ipfiremake kqemu
    #ipfiremake kvm-kmod
@@@ -550,6 -550,7 +550,7 @@@
    ipfiremake br2684ctl
    ipfiremake pcmciautils
    ipfiremake lm_sensors
+   ipfiremake liboping
    ipfiremake collectd
    ipfiremake lcd4linux
    ipfiremake tcptrack
@@@ -569,6 -570,7 +570,7 @@@
    ipfiremake freefont
    ipfiremake directfb
    ipfiremake dfb++
+   ipfiremake faad2
    ipfiremake ffmpeg
    ipfiremake videolan
    ipfiremake vdr
@@@ -725,15 -727,15 +727,15 @@@ buildpackages() 
  
    ipfirepackages
  
 -#  # Check if there is a loop device for building in virtual environments
 -#  if [ -e /dev/loop/0 ] || [ -e /dev/loop0 ]; then
 -#        cp -f $BASEDIR/packages/linux-xen-*.ipfire $LFS/install/packages/
 -#        cp -f $BASEDIR/packages/meta-linux-xen $LFS/install/packages/
 -#     ipfiremake xen-image ED=$IPFVER
 -#     rm -rf $LFS/install/packages/linux-xen-*.ipfire
 -#     rm -rf $LFS/install/packages/meta-linux-xen
 -#  fi
 -#  mv $LFS/install/images/*.bz2 $BASEDIR >> $LOGFILE 2>&1
 +  # Check if there is a loop device for building in virtual environments
 +  if [ -e /dev/loop/0 ] || [ -e /dev/loop0 ]; then
 +        cp -f $BASEDIR/packages/linux-xen-*.ipfire $LFS/install/packages/
 +        cp -f $BASEDIR/packages/meta-linux-xen $LFS/install/packages/
 +      ipfiremake xen-image ED=$IPFVER
 +      rm -rf $LFS/install/packages/linux-xen-*.ipfire
 +      rm -rf $LFS/install/packages/meta-linux-xen
 +  fi
 +  mv $LFS/install/images/*.bz2 $BASEDIR >> $LOGFILE 2>&1
  
    # Cleanup
    stdumount