]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 6cf9e77 9f3e557)
Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 11 Aug 2010 16:08:51 +0000 (18:08 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 11 Aug 2010 16:08:51 +0000 (18:08 +0200)
Conflicts:
config/rootfiles/core/40/filelists/compat-wireless
config/rootfiles/core/40/filelists/files
doc/packages-list.txt

1  2 
config/kernel/kernel.config.i586-ipfire patch | diff1 | diff2 | blob | history
config/rootfiles/core/40/exclude patch | blob1 | blob2 | history
config/rootfiles/core/40/filelists/files patch | blob1 | blob2 | history
config/rootfiles/core/40/filelists/python patch | blob1 | blob2 | history
config/rootfiles/core/40/meta patch | blob1 | blob2 | history
config/rootfiles/core/40/update.sh patch | blob1 | blob2 | history
doc/packages-list.txt patch | diff1 | diff2 | blob | history

diff --combined config/kernel/kernel.config.i586-ipfire
index 2b1403eb5df3523c48e62eca79e451e7fa12cde4,2657d14cf288f6e2fcb964c6d6256288f2582608..4fce3ecf20ab2855477ba552519f936d10ba4e20
--- 1/config/kernel/kernel.config.i586-ipfire
--- 2/config/kernel/kernel.config.i586-ipfire
+++ b/config/kernel/kernel.config.i586-ipfire
@@@ -1,7 -1,7 +1,7 @@@
  #
  # Automatically generated make config: don't edit
 -# Linux kernel version: 2.6.32.11
 -# Sun Apr 18 15:29:55 2010
 +# Linux kernel version: 2.6.32.15
 +# Thu Jul 22 17:12:33 2010
  #
  # CONFIG_64BIT is not set
  CONFIG_X86_32=y
@@@ -140,10 -140,9 +140,10 @@@ CONFIG_HAVE_PERF_EVENTS=
  # CONFIG_PERF_COUNTERS is not set
  CONFIG_VM_EVENT_COUNTERS=y
  CONFIG_PCI_QUIRKS=y
 -CONFIG_COMPAT_BRK=y
 -CONFIG_SLAB=y
 -# CONFIG_SLUB is not set
 +CONFIG_SLUB_DEBUG=y
 +# CONFIG_COMPAT_BRK is not set
 +# CONFIG_SLAB is not set
 +CONFIG_SLUB=y
  # CONFIG_SLOB is not set
  # CONFIG_PROFILING is not set
  CONFIG_HAVE_OPROFILE=y
@@@ -307,7 -306,6 +307,7 @@@ CONFIG_HIGHMEM=
  CONFIG_ARCH_FLATMEM_ENABLE=y
  CONFIG_ARCH_SPARSEMEM_ENABLE=y
  CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 +CONFIG_ILLEGAL_POINTER_VALUE=0
  CONFIG_SELECT_MEMORY_MODEL=y
  CONFIG_FLATMEM_MANUAL=y
  # CONFIG_DISCONTIGMEM_MANUAL is not set
@@@ -3210,7 -3208,7 +3210,7 @@@ CONFIG_USB_STORAGE_CYPRESS_ATACB=
  CONFIG_USB_USS720=m
  CONFIG_USB_SERIAL=m
  CONFIG_USB_EZUSB=y
- # CONFIG_USB_SERIAL_GENERIC is not set
+ CONFIG_USB_SERIAL_GENERIC=y
  CONFIG_USB_SERIAL_AIRCABLE=m
  CONFIG_USB_SERIAL_ARK3116=m
  CONFIG_USB_SERIAL_BELKIN=m
@@@ -3810,13 -3808,11 +3810,13 @@@ CONFIG_TRACE_IRQFLAGS_SUPPORT=
  CONFIG_ENABLE_MUST_CHECK=y
  CONFIG_FRAME_WARN=1024
  # CONFIG_MAGIC_SYSRQ is not set
 -# CONFIG_STRIP_ASM_SYMS is not set
 -CONFIG_UNUSED_SYMBOLS=y
 +CONFIG_STRIP_ASM_SYMS=y
 +# CONFIG_UNUSED_SYMBOLS is not set
  # CONFIG_DEBUG_FS is not set
  # CONFIG_HEADERS_CHECK is not set
  # CONFIG_DEBUG_KERNEL is not set
 +# CONFIG_SLUB_DEBUG_ON is not set
 +CONFIG_SLUB_STATS=y
  CONFIG_DEBUG_BUGVERBOSE=y
  CONFIG_DEBUG_MEMORY_INIT=y
  CONFIG_ARCH_WANT_FRAME_POINTERS=y
diff --combined config/rootfiles/core/40/exclude
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391,e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
deleted file mode 100644,100644
--- 1/config/rootfiles/core/40/exclude
--- 2/config/rootfiles/core/40/exclude
+++ /dev/null
diff --combined config/rootfiles/core/40/filelists/files
index 34fb93159341063af4bbacbb19ed7eb9a1c2b690,79518f2dccf89f66811065a6c07fc8a01edb934d..0000000000000000000000000000000000000000
deleted file mode 100644,100644
--- 1/config/rootfiles/core/40/filelists/files
--- 2/config/rootfiles/core/40/filelists/files
+++ /dev/null
@@@ -1,16 -1,20 +1,0 @@@
--etc/system-release
--var/ipfire/langs/en.pl
--var/ipfire/langs/de.pl
--var/ipfire/langs/es.pl
--var/ipfire/langs/fr.pl
--var/ipfire/dhcp/dhcpd.conf.local
--etc/rc.d/init.d/dnsmasq
--etc/rc.d/init.d/functions
--srv/web/ipfire/cgi-bin/dhcp.cgi
--srv/web/ipfire/cgi-bin/time.cgi
--usr/lib/python2.7/ipaddr.pyc
--usr/lib/python2.7/site-packages/drv_libxml2.py
--usr/lib/python2.7/site-packages/libxml2.py
--usr/lib/python2.7/site-packages/libxml2mod.so
--usr/lib/python2.7/site-packages/libxml2.pyc
--usr/lib/python2.7/site-packages/libxsltmod.so
 -lib/modules/2.6.32.15-ipfire/kernel/drivers/usb/serial/option.ko
 -lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/usb/serial/option.ko
 -lib/modules/2.6.32.15-ipfire/kernel/drivers/usb/serial/usbserial.ko
 -lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/usb/serial/usbserial.ko
diff --combined config/rootfiles/core/40/filelists/python
index ffe6e2c498bfc9fe8fc99cafc9e7c9e6d7d5c972,ffe6e2c498bfc9fe8fc99cafc9e7c9e6d7d5c972..0000000000000000000000000000000000000000
deleted file mode 120000,120000
--- 1/config/rootfiles/core/40/filelists/python
--- 2/config/rootfiles/core/40/filelists/python
+++ /dev/null
@@@ -1,1 -1,1 +1,0 @@@
--../../../common/python
diff --combined config/rootfiles/core/40/meta
index d547fa86fa8487654281f4d5309d6733f66a323c,d547fa86fa8487654281f4d5309d6733f66a323c..0000000000000000000000000000000000000000
deleted file mode 100644,100644
--- 1/config/rootfiles/core/40/meta
--- 2/config/rootfiles/core/40/meta
+++ /dev/null
@@@ -1,1 -1,1 +1,0 @@@
--DEPS=""
diff --combined config/rootfiles/core/40/update.sh
index 11e039594e9f7e1ad70c9d9b779bfe4922118b58,11e039594e9f7e1ad70c9d9b779bfe4922118b58..0000000000000000000000000000000000000000
deleted file mode 100644,100644
--- 1/config/rootfiles/core/40/update.sh
--- 2/config/rootfiles/core/40/update.sh
+++ /dev/null
@@@ -1,51 -1,51 +1,0 @@@
--#!/bin/bash
--############################################################################
--#                                                                          #
--# This file is part of the IPFire Firewall.                                #
--#                                                                          #
--# IPFire is free software; you can redistribute it and/or modify           #
--# it under the terms of the GNU General Public License as published by     #
--# the Free Software Foundation; either version 3 of the License, or        #
--# (at your option) any later version.                                      #
--#                                                                          #
--# IPFire is distributed in the hope that it will be useful,                #
--# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
--# GNU General Public License for more details.                             #
--#                                                                          #
--# You should have received a copy of the GNU General Public License        #
--# along with IPFire; if not, write to the Free Software                    #
--# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
--#                                                                          #
--# Copyright (C) 2010 IPFire-Team <info@ipfire.org>.                        #
--#                                                                          #
--############################################################################
--#
--. /opt/pakfire/lib/functions.sh
--/usr/local/bin/backupctrl exclude >/dev/null 2>&1
--
--#
--#Stop services
--
--#
--#Extract files
--extract_files
--#
--#Remove old python files...
--rm -rf /usr/lib/python2.4
--
--#
--#Start services
--
--#
--#Update Language cache
--perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
--
--#
--#Rebuild module dep's
--depmod 2.6.32.15-ipfire
--depmod 2.6.32.15-ipfire-xen
--#
--#Finish
--#Don't report the exitcode last command
--exit 0
diff --combined doc/packages-list.txt
index e4fca57161e5b2222b006b0703fbdb0c6a30ddfb,7cec76a713a765a5dbabe93461cedec11bf3ac94..d3f54fa545541e1fd75c839d3eb0fadfdaaa5b70
--- 1/doc/packages-list.txt
--- 2/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@@ -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.17-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,17 -68,20 +67,18 @@@
  * clamav-0.96.1
  * 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.34.1-kmod-2.6.32.17-ipfire
++* compat-wireless-2.6.35-1-kmod-2.6.32.17-ipfire
  * 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.17-ipfire
  * 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.17-ipfire
  * db-4.4.20
  * dbus-1.0.3
  * ddrescue-1.12
@@@ -86,9 -90,10 +87,9 @@@
  * 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.17-ipfire
 +* e1000e-1.1.19-kmod-2.6.32.17-ipfire
  * e2fsprogs-1.41.11
  * ebtables-v2.0.8-2
  * ed-0.2
@@@ -157,8 -162,11 +158,8 @@@
  * 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.17-ipfire
  * 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
@@@ -191,7 -199,8 +192,7 @@@
  * 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.17-ipfire
  * linux-atm-2.4.1
  * linux-firmware-20100318
  * linux-libc-headers-2.6.12.0
@@@ -202,9 -211,11 +203,9 @@@
  * 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.17-ipfire
  * 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.17-ipfire
  * make-3.81
  * man-db-2.4.3
  * man-pages-2.34
@@@ -217,6 -228,7 +218,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
@@@ -273,9 -285,12 +274,9 @@@
  * 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.17-ipfire
 +* r8168-8.018.00-kmod-2.6.32.17-ipfire
 +* r8169-6.013.00-kmod-2.6.32.17-ipfire
  * readline-5.1
  * reiser4progs-1.0.6
  * reiserfsprogs-3.6.21
@@@ -309,7 -324,7 +310,7 @@@
  * 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
@@@ -323,13 -338,15 +324,13 @@@
  * 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
  * 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.17-ipfire
  * vdr-1.6.0
  * vdradmin-am-3.6.7
  * vim-7.0
Peter's tree of IPFire 2.x