Merge commit 'origin/master' into next

Conflicts:
	config/rootfiles/core/41/filelists/files
This commit is contained in:
Arne Fitzenreiter
2010-10-10 12:05:20 +02:00
13 changed files with 71 additions and 52 deletions

View File

@@ -37,7 +37,7 @@
* Unix-Syslog-0.100
* XML-Parser-2.34
* alsa-lib-1.0.23
* alsa-lib-1.0.23-kmod-2.6.32.23-ipfire
* alsa-lib-1.0.23-kmod-2.6.32.24-ipfire
* amavisd-new-2.5.2
* apcupsd-3.14.4
* applejuice-0.31
@@ -67,20 +67,20 @@
* clamav-0.96.2
* cmake-2.4.8
* collectd-4.9.1
* compat-wireless-2.6.35-1-kmod-2.6.32.23-ipfire
* compat-wireless-2.6.35-1-kmod-2.6.32.23-ipfire-xen
* compat-wireless-2.6.35-1-kmod-2.6.32.24-ipfire
* compat-wireless-2.6.35-1-kmod-2.6.32.24-ipfire-xen
* coreutils-5.96
* cpio-2.11
* cpufrequtils-007
* cryptodev-20091126-kmod-2.6.32.23-ipfire
* cryptodev-20091126-kmod-2.6.32.23-ipfire-xen
* cryptodev-20091126-kmod-2.6.32.24-ipfire
* cryptodev-20091126-kmod-2.6.32.24-ipfire-xen
* cups-1.4.4
* curl-7.19.5
* cyrus-imapd-2.2.12
* cyrus-sasl-2.1.21
* dahdi-2.2.1
* dahdi-2.2.1-kmod-2.6.32.23-ipfire
* dahdi-2.2.1-kmod-2.6.32.23-ipfire-xen
* dahdi-2.2.1-kmod-2.6.32.24-ipfire
* dahdi-2.2.1-kmod-2.6.32.24-ipfire-xen
* db-4.4.20
* dbus-1.0.3
* ddrescue-1.12
@@ -90,10 +90,10 @@
* dnsmasq-2.45
* dosfstools-3.0.9
* dracut-006
* e1000-8.0.19-kmod-2.6.32.23-ipfire
* e1000-8.0.19-kmod-2.6.32.23-ipfire-xen
* e1000e-1.1.19-kmod-2.6.32.23-ipfire
* e1000e-1.1.19-kmod-2.6.32.23-ipfire-xen
* e1000-8.0.19-kmod-2.6.32.24-ipfire
* e1000-8.0.19-kmod-2.6.32.24-ipfire-xen
* e1000e-1.1.19-kmod-2.6.32.24-ipfire
* e1000e-1.1.19-kmod-2.6.32.24-ipfire-xen
* e2fsprogs-1.41.11
* ebtables-v2.0.8-2
* ed-0.2
@@ -148,10 +148,10 @@
* icecream-0.9.4.8
* icegenerator-0.5.5-pre2
* iftop-0.17
* igb-2.3.4-kmod-2.6.32.23-ipfire
* igb-2.3.4-kmod-2.6.32.23-ipfire-xen
* igb-2.3.4-kmod-2.6.32.24-ipfire
* igb-2.3.4-kmod-2.6.32.24-ipfire-xen
* igmpproxy-0.1
* imspector-0.9
* imspector-20101008
* inetutils-1.4.2
* ipaddr-1.2
* iperf-2.0.4
@@ -165,10 +165,10 @@
* joe-3.7
* jpegsrc.v6b
* kbd-1.12
* kqemu-1.4.0pre1-kmod-2.6.32.23-ipfire
* kqemu-1.4.0pre1-kmod-2.6.32.23-ipfire-xen
* kqemu-1.4.0pre1-kmod-2.6.32.24-ipfire
* kqemu-1.4.0pre1-kmod-2.6.32.24-ipfire-xen
* kudzu-1.2.64
* kvm-kmod-2.6.34.1-kmod-2.6.32.23-ipfire
* kvm-kmod-2.6.34.1-kmod-2.6.32.24-ipfire
* l7-protocols-2009-05-10
* lame-3.97
* lcd4linux-0.10.1-RC2
@@ -201,8 +201,8 @@
* libwww-perl-5.803
* libxml2-2.6.26
* libxslt-1.1.17
* linux-2.6.32.23-ipfire
* linux-2.6.32.23-ipfire-xen
* linux-2.6.32.24-ipfire
* linux-2.6.32.24-ipfire-xen
* linux-atm-2.4.1
* linux-firmware-20100318
* linux-libc-headers-2.6.12.0
@@ -213,11 +213,11 @@
* lynis-1.2.9
* lzo-2.02
* m4-1.4.4
* mISDN-20100525-kmod-2.6.32.23-ipfire
* mISDN-20100525-kmod-2.6.32.23-ipfire-xen
* mISDN-20100525-kmod-2.6.32.24-ipfire
* mISDN-20100525-kmod-2.6.32.24-ipfire-xen
* mISDNuser-20100525
* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.23-ipfire
* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.23-ipfire-xen
* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.24-ipfire
* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.24-ipfire-xen
* make-3.81
* man-db-2.4.3
* man-pages-2.34
@@ -235,7 +235,7 @@
* module-init-tools-3.5
* motion-3.2.11
* mpc-0.19
* mpd-0.15.8
* mpd-0.15.12
* mpeg2dec-0.4.0b
* mpfire-ipfire
* mtd-CVS-20070507
@@ -286,12 +286,12 @@
* psmisc-22.2
* qemu-0.11.1-kqemu
* qemu-0.12.3
* r8101-1.016.00-kmod-2.6.32.23-ipfire
* r8101-1.016.00-kmod-2.6.32.23-ipfire-xen
* r8168-8.018.00-kmod-2.6.32.23-ipfire
* r8168-8.018.00-kmod-2.6.32.23-ipfire-xen
* r8169-6.013.00-kmod-2.6.32.23-ipfire
* r8169-6.013.00-kmod-2.6.32.23-ipfire-xen
* r8101-1.016.00-kmod-2.6.32.24-ipfire
* r8101-1.016.00-kmod-2.6.32.24-ipfire-xen
* r8168-8.018.00-kmod-2.6.32.24-ipfire
* r8168-8.018.00-kmod-2.6.32.24-ipfire-xen
* r8169-6.013.00-kmod-2.6.32.24-ipfire
* r8169-6.013.00-kmod-2.6.32.24-ipfire-xen
* readline-5.1
* reiser4progs-1.0.6
* reiserfsprogs-3.6.21
@@ -299,7 +299,7 @@
* rssdler-0.4.0a
* rsync-3.0.7
* rtorrent-0.8.6
* samba-3.5.5
* samba-3.5.6
* sane-1.0.19
* screen-4.0.3
* sdparm-1.01
@@ -346,8 +346,8 @@
* usb-modeswitch-data-20100707
* usbutils-0.72
* util-linux-2.12r
* v4l-dvb-990bbeaeb761-kmod-2.6.32.23-ipfire
* v4l-dvb-990bbeaeb761-kmod-2.6.32.23-ipfire-xen
* v4l-dvb-990bbeaeb761-kmod-2.6.32.24-ipfire
* v4l-dvb-990bbeaeb761-kmod-2.6.32.24-ipfire-xen
* vdr-1.6.0
* vdradmin-am-3.6.7
* vim-7.0
@@ -355,7 +355,7 @@
* vlc-0.8.6i
* vnstat-1.6
* vnstati-beta3
* vsftpd-2.1.2
* vsftpd-2.2.2
* w_scan-20080105
* watchdog-5.9
* wget-1.10.2