From: Peter Pfeiffer Date: Fri, 15 May 2009 06:08:12 +0000 (+0200) Subject: Merge branch 'master' of ssh://peterman@people.ipfire.org/pub/git/ipfire-2.x X-Git-Tag: v2.5-beta3~20 X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=fb26467bb390ba85c09f4af1fb16422ef7d800dc;hp=-c Merge branch 'master' of ssh://peterman@people.ipfire.org/pub/git/ipfire-2.x --- fb26467bb390ba85c09f4af1fb16422ef7d800dc diff --combined doc/packages-list.txt index c0c91e40bb,b87953da52..966d732f9c --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@@ -36,15 -36,15 +36,15 @@@ * Unix-Syslog-0.100 * XML-Parser-2.34 * alsa-lib-1.0.19 - * alsa-lib-1.0.19-kmod-2.6.27.21-ipfire + * alsa-lib-1.0.19-kmod-2.6.27.23-ipfire * amavisd-new-2.5.2 * apcupsd-3.14.4 * applejuice-0.31 * arping-2.05 * as86-0.16.17 * asterisk-1.4.18 - * atl2-2.0.5-kmod-2.6.27.21-ipfire - * atl2-2.0.5-kmod-2.6.27.21-ipfire-xen + * atl2-2.0.5-kmod-2.6.27.23-ipfire + * atl2-2.0.5-kmod-2.6.27.23-ipfire-xen * autoconf-2.59 * automake-1.9.6 * backup-ipfire @@@ -60,17 -60,16 +60,17 @@@ * busybox-1.2.2 * bwm-ng-0.6 * bzip2-1.0.5 +* cacti-0.8.7d * calamaris-2.59 * capi4k-utils-2005-07-18 * ccache-2.4 * cdrtools-2.01.01 * centerim-4.22.1 - * clamav-0.94.2 + * clamav-0.95.1 * cmake-2.4.8 * collectd-4.5.3 - * compat-wireless-2009-03-30-kmod-2.6.27.21-ipfire - * compat-wireless-2009-03-30-kmod-2.6.27.21-ipfire-xen + * compat-wireless-2009-03-30-kmod-2.6.27.23-ipfire + * compat-wireless-2009-03-30-kmod-2.6.27.23-ipfire-xen * coreutils-5.96 * cpio-2.6 * cpufrequtils-005 @@@ -89,7 -88,7 +89,7 @@@ * e2fsprogs-1.39 * ebtables-v2.0.8-2 * ed-0.2 - * elinks-0.11.4rc0 + * elinks-0.11.6 * esniper-2-19-0 * espgs-8.15.1 * etherwake-1.09 @@@ -115,7 -114,7 +115,7 @@@ * gd-2.0.33 * gdbm-1.8.3 * gettext-0.14.5 - * git-1.6.1.2 + * git-1.6.3 * glib-2.16.5 * glibc-2.3.6 * gmp-4.2 @@@ -151,8 -150,8 +151,8 @@@ * jpegsrc.v6b * kbd-1.12 * klibc-1.5.14 - * kqemu-1.4.0pre1-kmod-2.6.27.21-ipfire - * kqemu-1.4.0pre1-kmod-2.6.27.21-ipfire-xen + * kqemu-1.4.0pre1-kmod-2.6.27.23-ipfire + * kqemu-1.4.0pre1-kmod-2.6.27.23-ipfire-xen * kudzu-1.2.64 * l7-protocols-2008-12-18 * lame-3.97 @@@ -183,8 -182,8 +183,8 @@@ * libwww-perl-5.803 * libxml2-2.6.26 * libxslt-1.1.17 - * linux-2.6.27.21-ipfire - * linux-2.6.27.21-ipfire-xen + * linux-2.6.27.23-ipfire + * linux-2.6.27.23-ipfire-xen * linux-atm-2.4.1 * linux-libc-headers-2.6.12.0 * lm_sensors-3.0.3 @@@ -194,11 -193,11 +194,11 @@@ * lynis-1.2.3 * lzo-2.02 * m4-1.4.4 - * mISDN.git-9bf7deaa4b8829ab8fbccb34529a17aab2ddea93-kmod-2.6.27.21-ipfire - * mISDN.git-9bf7deaa4b8829ab8fbccb34529a17aab2ddea93-kmod-2.6.27.21-ipfire-xen + * mISDN.git-9bf7deaa4b8829ab8fbccb34529a17aab2ddea93-kmod-2.6.27.23-ipfire + * mISDN.git-9bf7deaa4b8829ab8fbccb34529a17aab2ddea93-kmod-2.6.27.23-ipfire-xen * mISDNuser.git-54928dec57bc846f2c2186f3640e69a053cd3641 - * madwifi-hal-testing-r4003-20090416-kmod-2.6.27.21-ipfire - * madwifi-hal-testing-r4003-20090416-kmod-2.6.27.21-ipfire-xen + * madwifi-hal-testing-r4003-20090416-kmod-2.6.27.23-ipfire + * madwifi-hal-testing-r4003-20090416-kmod-2.6.27.23-ipfire-xen * make-3.81 * man-db-2.4.3 * man-pages-2.34 @@@ -241,8 -240,8 +241,8 @@@ * openssh-5.2p1 * openssl-0.9.8k * openswan-2.6.21 - * openswan-2.6.21-kmod-2.6.27.21-ipfire - * openswan-2.6.21-kmod-2.6.27.21-ipfire-xen + * openswan-2.6.21-kmod-2.6.27.23-ipfire + * openswan-2.6.21-kmod-2.6.27.23-ipfire-xen * openvpn-2.0.9 * p7zip_4.65 * pam_mysql-0.7RC1 @@@ -257,7 -256,7 +257,7 @@@ * pkg-config-0.20 * popt-1.10.4 * portmap_6.0 - * postfix-2.5.5 + * postfix-2.5.6 * ppp-2.4.4 * pptp-1.7.2 * procps-3.2.6 @@@ -271,7 -270,7 +271,7 @@@ * rssdler-0.4.0a * rsync-3.0.4 * rtorrent-0.8.4 - * samba-3.3.3 + * samba-3.3.4 * sane-1.0.19 * screen-4.0.3 * sdparm-1.01 @@@ -317,8 -316,8 +317,8 @@@ * urlgrabber-3.1.0 * usbutils-0.72 * util-linux-2.12r - * v4l-dvb-4cd17f5a20cc-kmod-2.6.27.21-ipfire - * v4l-dvb-4cd17f5a20cc-kmod-2.6.27.21-ipfire-xen + * v4l-dvb-4cd17f5a20cc-kmod-2.6.27.23-ipfire + * v4l-dvb-4cd17f5a20cc-kmod-2.6.27.23-ipfire-xen * vdr-1.6.0 * vdradmin-am-3.6.4 * vim-7.0