From: Arne Fitzenreiter Date: Thu, 19 Aug 2010 12:49:57 +0000 (+0200) Subject: Merge branch 'master' into next X-Git-Tag: v2.9-beta1~48^2~5^2~2^2~102 X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=0b1d3e68d50513e0b119b455b652d80727060af0;hp=-c Merge branch 'master' into next Conflicts: config/rootfiles/core/40/filelists/files config/rootfiles/core/40/update.sh --- 0b1d3e68d50513e0b119b455b652d80727060af0 diff --combined doc/packages-list.txt index e1ed31025c,8f11d1219e..ef6b6355a2 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@@ -1,4 -1,4 +1,4 @@@ -== List of softwares used to build IPFire Version: 2.7 == +== List of softwares used to build IPFire Version: 2.8test == * Archive-Tar-1.29 * Archive-Zip-1.16 * BerkeleyDB-0.27 @@@ -37,7 -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.15-ipfire +* alsa-lib-1.0.23-kmod-2.6.32.19-ipfire * amavisd-new-2.5.2 * apcupsd-3.14.4 * applejuice-0.31 @@@ -56,6 -56,7 +56,6 @@@ * bluez-libs-3.36 * br2684ctl * bridge-utils-1.1 -* busybox-1.2.2 * bwm-ng-0.6 * bzip2-1.0.5 * cacti-0.8.7e @@@ -67,20 -68,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.15-ipfire -* compat-wireless-2.6.35-1-kmod-2.6.32.15-ipfire-xen +* compat-wireless-2.6.35-1-kmod-2.6.32.19-ipfire +* compat-wireless-2.6.35-1-kmod-2.6.32.19-ipfire-xen * coreutils-5.96 * cpio-2.11 * cpufrequtils-007 -* cryptodev-20091126-kmod-2.6.32.15-ipfire -* cryptodev-20091126-kmod-2.6.32.15-ipfire-xen +* cryptodev-20091126-kmod-2.6.32.19-ipfire +* cryptodev-20091126-kmod-2.6.32.19-ipfire-xen * cups-1.4.2 * 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.15-ipfire -* dahdi-2.2.1-kmod-2.6.32.15-ipfire-xen +* dahdi-2.2.1-kmod-2.6.32.19-ipfire +* dahdi-2.2.1-kmod-2.6.32.19-ipfire-xen * db-4.4.20 * dbus-1.0.3 * ddrescue-1.12 @@@ -89,11 -90,10 +89,11 @@@ * diffutils-2.8.1 * dnsmasq-2.45 * dosfstools-3.0.9 -* e1000-8.0.19-kmod-2.6.32.15-ipfire -* e1000-8.0.19-kmod-2.6.32.15-ipfire-xen -* e1000e-1.1.19-kmod-2.6.32.15-ipfire -* e1000e-1.1.19-kmod-2.6.32.15-ipfire-xen +* dracut-006 +* e1000-8.0.19-kmod-2.6.32.19-ipfire +* e1000-8.0.19-kmod-2.6.32.19-ipfire-xen +* e1000e-1.1.19-kmod-2.6.32.19-ipfire +* e1000e-1.1.19-kmod-2.6.32.19-ipfire-xen * e2fsprogs-1.41.11 * ebtables-v2.0.8-2 * ed-0.2 @@@ -162,9 -162,11 +162,9 @@@ * joe-3.7 * jpegsrc.v6b * kbd-1.12 -* klibc-1.5.14 -* kqemu-1.4.0pre1-kmod-2.6.32.15-ipfire -* kqemu-1.4.0pre1-kmod-2.6.32.15-ipfire-xen +* kqemu-1.4.0pre1-kmod-2.6.32.19-ipfire +* kqemu-1.4.0pre1-kmod-2.6.32.19-ipfire-xen * kudzu-1.2.64 -* kvm-kmod-2.6.33.1-kmod-2.6.32.15-ipfire * l7-protocols-2009-05-10 * lame-3.97 * lcd4linux-0.10.1-RC2 @@@ -197,8 -199,8 +197,8 @@@ * libwww-perl-5.803 * libxml2-2.6.26 * libxslt-1.1.17 -* linux-2.6.32.15-ipfire -* linux-2.6.32.15-ipfire-xen +* linux-2.6.32.19-ipfire +* linux-2.6.32.19-ipfire-xen * linux-atm-2.4.1 * linux-firmware-20100318 * linux-libc-headers-2.6.12.0 @@@ -209,11 -211,11 +209,11 @@@ * lynis-1.2.9 * lzo-2.02 * m4-1.4.4 -* mISDN-20100525-kmod-2.6.32.15-ipfire -* mISDN-20100525-kmod-2.6.32.15-ipfire-xen +* mISDN-20100525-kmod-2.6.32.19-ipfire +* mISDN-20100525-kmod-2.6.32.19-ipfire-xen * mISDNuser-20100525 -* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.15-ipfire -* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.15-ipfire-xen +* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.19-ipfire +* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.19-ipfire-xen * make-3.81 * man-db-2.4.3 * man-pages-2.34 @@@ -226,6 -228,7 +226,6 @@@ * miau-0.6.5 * minicom-2.4 * misc-progs -* mkinitcpio-0.5.9 * mktemp-1.5 * mldonkey-3.0.0 * module-init-tools-3.5 @@@ -261,7 -264,7 +261,7 @@@ * openmailadmin-1.0.0 * openssh-5.4p1 * openssl-0.9.8o - * openvpn-2.1.1 + * openvpn-2.1.2 * p7zip_4.65 * pam_mysql-0.7RC1 * patch-2.5.4 @@@ -282,12 -285,12 +282,12 @@@ * psmisc-22.2 * qemu-0.11.1-kqemu * qemu-0.12.3 -* r8101-1.016.00-kmod-2.6.32.15-ipfire -* r8101-1.016.00-kmod-2.6.32.15-ipfire-xen -* r8168-8.018.00-kmod-2.6.32.15-ipfire -* r8168-8.018.00-kmod-2.6.32.15-ipfire-xen -* r8169-6.013.00-kmod-2.6.32.15-ipfire -* r8169-6.013.00-kmod-2.6.32.15-ipfire-xen +* r8101-1.016.00-kmod-2.6.32.19-ipfire +* r8101-1.016.00-kmod-2.6.32.19-ipfire-xen +* r8168-8.018.00-kmod-2.6.32.19-ipfire +* r8168-8.018.00-kmod-2.6.32.19-ipfire-xen +* r8169-6.013.00-kmod-2.6.32.19-ipfire +* r8169-6.013.00-kmod-2.6.32.19-ipfire-xen * readline-5.1 * reiser4progs-1.0.6 * reiserfsprogs-3.6.21 @@@ -321,12 -324,11 +321,12 @@@ * sudo-1.6.8p12 * sysfsutils-1.3.0 * sysklogd-1.5 -* syslinux-3.62 +* syslinux-3.86 * sysstat-6.0.2 * sysvinit-2.86 * taglib-1.5 * tar-1.22 +* tcl8.4.13 * tcp_wrappers_7.6 * tcpdump-4.0.0 * teamspeak-2.0.24.1 @@@ -336,15 -338,15 +336,15 @@@ * traceroute-2.0.12 * tripwire-2.4.1.2 * tunctl -* udev-096 -* udev-096-klibc +* udev-125 * unzip552 * urlgrabber-3.1.0 -* usb-modeswitch-1.1.2 +* usb-modeswitch-1.1.3 +* usb-modeswitch-data-20100707 * usbutils-0.72 * util-linux-2.12r -* v4l-dvb-b576509ea6d2-kmod-2.6.32.15-ipfire -* v4l-dvb-b576509ea6d2-kmod-2.6.32.15-ipfire-xen +* v4l-dvb-b576509ea6d2-kmod-2.6.32.19-ipfire +* v4l-dvb-b576509ea6d2-kmod-2.6.32.19-ipfire-xen * vdr-1.6.0 * vdradmin-am-3.6.7 * vim-7.0