Merge branch 'master' into kernel36

Conflicts:
	config/rootfiles/common/Mail-Tools

diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire
index 0a947675f90df8637a85bdb7a446e84d8a10a4bb..3fd80c88648519f0e11f5dbd8e265585a2241127 100644 (file)
--- a/config/kernel/kernel.config.i586-ipfire
+++ b/config/kernel/kernel.config.i586-ipfire
@@ -277,6 +277,7 @@ CONFIG_DMI=y
 # CONFIG_IOMMU_HELPER is not set
 CONFIG_IOMMU_API=y
 CONFIG_NR_CPUS=8
+CONFIG_IRQ_TIME_ACCOUNTING=y
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
 CONFIG_PREEMPT_NONE=y

diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae
index 94810b6547ebeddf3c6d7b9be771dc8e1d60b6ef..6d82de48b3bc975f6d3d96d6a03ef5fdfc12f582 100644 (file)
--- a/config/kernel/kernel.config.i586-ipfire-pae
+++ b/config/kernel/kernel.config.i586-ipfire-pae
@@ -281,6 +281,7 @@ CONFIG_DMI=y
 # CONFIG_IOMMU_HELPER is not set
 CONFIG_IOMMU_API=y
 CONFIG_NR_CPUS=8
+CONFIG_IRQ_TIME_ACCOUNTING=y
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
 CONFIG_PREEMPT_NONE=y

diff --git a/config/kernel/kernel.config.i586-ipfire-xen b/config/kernel/kernel.config.i586-ipfire-xen
index 1a6ab28a6dd7f14f10c53fc526b5d9caa1a92eeb..e5122a97d2ba1cd6e53382014745ae2fbe7c0c64 100644 (file)
--- a/config/kernel/kernel.config.i586-ipfire-xen
+++ b/config/kernel/kernel.config.i586-ipfire-xen
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.32.27-ipfire-xen
-# Thu Dec 30 14:49:34 2010
+# Linux kernel version: 2.6.32.33
+# Mon Mar 21 14:20:43 2011
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -89,7 +89,6 @@ CONFIG_RCU_FANOUT=32
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=17
 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
-# CONFIG_GROUP_SCHED is not set
 # CONFIG_CGROUPS is not set
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_SYSFS_DEPRECATED_V2=y
@@ -243,6 +242,7 @@ CONFIG_SWIOTLB=y
 CONFIG_IOMMU_HELPER=y
 # CONFIG_IOMMU_API is not set
 CONFIG_NR_CPUS=8
+CONFIG_IRQ_TIME_ACCOUNTING=y
 CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
 # CONFIG_PREEMPT is not set

diff --git a/config/rootfiles/common/MIME-Tools b/config/rootfiles/common/MIME-Tools
index 6b55d7b7c12ef6106b3d25b50e9a064ab5b61773..76e5a2c3a0e584fec0ed03806a8a2358c52ef7fa 100644 (file)
--- a/config/rootfiles/common/MIME-Tools
+++ b/config/rootfiles/common/MIME-Tools
@@ -1,6 +1,6 @@
 #usr/lib/perl5/site_perl/5.12.3/MIME
 usr/lib/perl5/site_perl/5.12.3/MIME/Body.pm
-usr/lib/perl5/site_perl/5.12.3/MIME/Decoder
+#usr/lib/perl5/site_perl/5.12.3/MIME/Decoder
 usr/lib/perl5/site_perl/5.12.3/MIME/Decoder.pm
 usr/lib/perl5/site_perl/5.12.3/MIME/Decoder/Base64.pm
 usr/lib/perl5/site_perl/5.12.3/MIME/Decoder/BinHex.pm
@@ -24,8 +24,9 @@ usr/lib/perl5/site_perl/5.12.3/MIME/Parser/Results.pm
 usr/lib/perl5/site_perl/5.12.3/MIME/Tools.pm
 usr/lib/perl5/site_perl/5.12.3/MIME/WordDecoder.pm
 usr/lib/perl5/site_perl/5.12.3/MIME/Words.pm
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/MIME-tools
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/MIME-tools/.packlist
+#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/MIME
+#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/MIME/tools
+#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/MIME/tools/.packlist
 #usr/share/man/man3/MIME::Body.3
 #usr/share/man/man3/MIME::Decoder.3
 #usr/share/man/man3/MIME::Decoder::Base64.3

diff --git a/config/rootfiles/core/44/exclude b/config/rootfiles/oldcore/44/exclude
similarity index 100%
rename from config/rootfiles/core/44/exclude
rename to config/rootfiles/oldcore/44/exclude

diff --git a/config/rootfiles/core/44/filelists/acl b/config/rootfiles/oldcore/44/filelists/acl
similarity index 100%
rename from config/rootfiles/core/44/filelists/acl
rename to config/rootfiles/oldcore/44/filelists/acl

diff --git a/config/rootfiles/core/44/filelists/apache2 b/config/rootfiles/oldcore/44/filelists/apache2
similarity index 100%
rename from config/rootfiles/core/44/filelists/apache2
rename to config/rootfiles/oldcore/44/filelists/apache2

diff --git a/config/rootfiles/core/44/filelists/attr b/config/rootfiles/oldcore/44/filelists/attr
similarity index 100%
rename from config/rootfiles/core/44/filelists/attr
rename to config/rootfiles/oldcore/44/filelists/attr

diff --git a/config/rootfiles/core/44/filelists/cpio b/config/rootfiles/oldcore/44/filelists/cpio
similarity index 100%
rename from config/rootfiles/core/44/filelists/cpio
rename to config/rootfiles/oldcore/44/filelists/cpio

diff --git a/config/rootfiles/core/44/filelists/daq b/config/rootfiles/oldcore/44/filelists/daq
similarity index 100%
rename from config/rootfiles/core/44/filelists/daq
rename to config/rootfiles/oldcore/44/filelists/daq

diff --git a/config/rootfiles/core/44/filelists/dhcpcd b/config/rootfiles/oldcore/44/filelists/dhcpcd
similarity index 100%
rename from config/rootfiles/core/44/filelists/dhcpcd
rename to config/rootfiles/oldcore/44/filelists/dhcpcd

diff --git a/config/rootfiles/core/44/filelists/dnsmasq b/config/rootfiles/oldcore/44/filelists/dnsmasq
similarity index 100%
rename from config/rootfiles/core/44/filelists/dnsmasq
rename to config/rootfiles/oldcore/44/filelists/dnsmasq

diff --git a/config/rootfiles/core/44/filelists/dracut b/config/rootfiles/oldcore/44/filelists/dracut
similarity index 100%
rename from config/rootfiles/core/44/filelists/dracut
rename to config/rootfiles/oldcore/44/filelists/dracut

diff --git a/config/rootfiles/core/44/filelists/files b/config/rootfiles/oldcore/44/filelists/files
similarity index 100%
rename from config/rootfiles/core/44/filelists/files
rename to config/rootfiles/oldcore/44/filelists/files

diff --git a/config/rootfiles/core/44/filelists/findutils b/config/rootfiles/oldcore/44/filelists/findutils
similarity index 100%
rename from config/rootfiles/core/44/filelists/findutils
rename to config/rootfiles/oldcore/44/filelists/findutils

diff --git a/config/rootfiles/core/44/filelists/fireinfo b/config/rootfiles/oldcore/44/filelists/fireinfo
similarity index 100%
rename from config/rootfiles/core/44/filelists/fireinfo
rename to config/rootfiles/oldcore/44/filelists/fireinfo

diff --git a/config/rootfiles/core/44/filelists/grub b/config/rootfiles/oldcore/44/filelists/grub
similarity index 100%
rename from config/rootfiles/core/44/filelists/grub
rename to config/rootfiles/oldcore/44/filelists/grub

diff --git a/config/rootfiles/core/44/filelists/hwdata b/config/rootfiles/oldcore/44/filelists/hwdata
similarity index 100%
rename from config/rootfiles/core/44/filelists/hwdata
rename to config/rootfiles/oldcore/44/filelists/hwdata

diff --git a/config/rootfiles/core/44/filelists/iw b/config/rootfiles/oldcore/44/filelists/iw
similarity index 100%
rename from config/rootfiles/core/44/filelists/iw
rename to config/rootfiles/oldcore/44/filelists/iw

diff --git a/config/rootfiles/core/44/filelists/libcap b/config/rootfiles/oldcore/44/filelists/libcap
similarity index 100%
rename from config/rootfiles/core/44/filelists/libcap
rename to config/rootfiles/oldcore/44/filelists/libcap

diff --git a/config/rootfiles/core/44/filelists/libdnet b/config/rootfiles/oldcore/44/filelists/libdnet
similarity index 100%
rename from config/rootfiles/core/44/filelists/libdnet
rename to config/rootfiles/oldcore/44/filelists/libdnet

diff --git a/config/rootfiles/core/44/filelists/linux b/config/rootfiles/oldcore/44/filelists/linux
similarity index 100%
rename from config/rootfiles/core/44/filelists/linux
rename to config/rootfiles/oldcore/44/filelists/linux

diff --git a/config/rootfiles/core/44/filelists/linux-firmware b/config/rootfiles/oldcore/44/filelists/linux-firmware
similarity index 100%
rename from config/rootfiles/core/44/filelists/linux-firmware
rename to config/rootfiles/oldcore/44/filelists/linux-firmware

diff --git a/config/rootfiles/core/44/filelists/smartmontools b/config/rootfiles/oldcore/44/filelists/smartmontools
similarity index 100%
rename from config/rootfiles/core/44/filelists/smartmontools
rename to config/rootfiles/oldcore/44/filelists/smartmontools

diff --git a/config/rootfiles/core/44/filelists/snort b/config/rootfiles/oldcore/44/filelists/snort
similarity index 100%
rename from config/rootfiles/core/44/filelists/snort
rename to config/rootfiles/oldcore/44/filelists/snort

diff --git a/config/rootfiles/core/44/filelists/squid b/config/rootfiles/oldcore/44/filelists/squid
similarity index 100%
rename from config/rootfiles/core/44/filelists/squid
rename to config/rootfiles/oldcore/44/filelists/squid

diff --git a/config/rootfiles/core/44/filelists/strongswan b/config/rootfiles/oldcore/44/filelists/strongswan
similarity index 100%
rename from config/rootfiles/core/44/filelists/strongswan
rename to config/rootfiles/oldcore/44/filelists/strongswan

diff --git a/config/rootfiles/core/44/filelists/tcl b/config/rootfiles/oldcore/44/filelists/tcl
similarity index 100%
rename from config/rootfiles/core/44/filelists/tcl
rename to config/rootfiles/oldcore/44/filelists/tcl

diff --git a/config/rootfiles/core/44/filelists/udev b/config/rootfiles/oldcore/44/filelists/udev
similarity index 100%
rename from config/rootfiles/core/44/filelists/udev
rename to config/rootfiles/oldcore/44/filelists/udev

diff --git a/config/rootfiles/core/44/filelists/usb_modeswitch b/config/rootfiles/oldcore/44/filelists/usb_modeswitch
similarity index 100%
rename from config/rootfiles/core/44/filelists/usb_modeswitch
rename to config/rootfiles/oldcore/44/filelists/usb_modeswitch

diff --git a/config/rootfiles/core/44/filelists/usb_modeswitch_data b/config/rootfiles/oldcore/44/filelists/usb_modeswitch_data
similarity index 100%
rename from config/rootfiles/core/44/filelists/usb_modeswitch_data
rename to config/rootfiles/oldcore/44/filelists/usb_modeswitch_data

diff --git a/config/rootfiles/core/44/filelists/vim b/config/rootfiles/oldcore/44/filelists/vim
similarity index 100%
rename from config/rootfiles/core/44/filelists/vim
rename to config/rootfiles/oldcore/44/filelists/vim

diff --git a/config/rootfiles/core/44/filelists/wireless b/config/rootfiles/oldcore/44/filelists/wireless
similarity index 100%
rename from config/rootfiles/core/44/filelists/wireless
rename to config/rootfiles/oldcore/44/filelists/wireless

diff --git a/config/rootfiles/core/44/filelists/wpa_supplicant b/config/rootfiles/oldcore/44/filelists/wpa_supplicant
similarity index 100%
rename from config/rootfiles/core/44/filelists/wpa_supplicant
rename to config/rootfiles/oldcore/44/filelists/wpa_supplicant

diff --git a/config/rootfiles/core/44/meta b/config/rootfiles/oldcore/44/meta
similarity index 100%
rename from config/rootfiles/core/44/meta
rename to config/rootfiles/oldcore/44/meta

diff --git a/config/rootfiles/core/44/update.sh b/config/rootfiles/oldcore/44/update.sh
similarity index 100%
rename from config/rootfiles/core/44/update.sh
rename to config/rootfiles/oldcore/44/update.sh

diff --git a/config/rootfiles/core/45/exclude b/config/rootfiles/oldcore/45/exclude
similarity index 100%
rename from config/rootfiles/core/45/exclude
rename to config/rootfiles/oldcore/45/exclude

diff --git a/config/rootfiles/core/45/filelists/files b/config/rootfiles/oldcore/45/filelists/files
similarity index 100%
rename from config/rootfiles/core/45/filelists/files
rename to config/rootfiles/oldcore/45/filelists/files

diff --git a/config/rootfiles/core/45/filelists/fireinfo b/config/rootfiles/oldcore/45/filelists/fireinfo
similarity index 100%
rename from config/rootfiles/core/45/filelists/fireinfo
rename to config/rootfiles/oldcore/45/filelists/fireinfo

diff --git a/config/rootfiles/core/45/filelists/snort b/config/rootfiles/oldcore/45/filelists/snort
similarity index 100%
rename from config/rootfiles/core/45/filelists/snort
rename to config/rootfiles/oldcore/45/filelists/snort

diff --git a/config/rootfiles/core/45/filelists/squid b/config/rootfiles/oldcore/45/filelists/squid
similarity index 100%
rename from config/rootfiles/core/45/filelists/squid
rename to config/rootfiles/oldcore/45/filelists/squid

diff --git a/config/rootfiles/core/45/meta b/config/rootfiles/oldcore/45/meta
similarity index 100%
rename from config/rootfiles/core/45/meta
rename to config/rootfiles/oldcore/45/meta

diff --git a/config/rootfiles/core/45/update.sh b/config/rootfiles/oldcore/45/update.sh
similarity index 100%
rename from config/rootfiles/core/45/update.sh
rename to config/rootfiles/oldcore/45/update.sh

diff --git a/config/rootfiles/core/46/exclude b/config/rootfiles/oldcore/46/exclude
similarity index 100%
rename from config/rootfiles/core/46/exclude
rename to config/rootfiles/oldcore/46/exclude

diff --git a/config/rootfiles/core/46/filelists/compat-wireless b/config/rootfiles/oldcore/46/filelists/compat-wireless
similarity index 100%
rename from config/rootfiles/core/46/filelists/compat-wireless
rename to config/rootfiles/oldcore/46/filelists/compat-wireless

diff --git a/config/rootfiles/core/46/filelists/compat-wireless-modules b/config/rootfiles/oldcore/46/filelists/compat-wireless-modules
similarity index 99%
rename from config/rootfiles/core/46/filelists/compat-wireless-modules
rename to config/rootfiles/oldcore/46/filelists/compat-wireless-modules
index aa2580483f8e37f4ef412ab5df60dd3664590dbf..3f12c8a07f822ca3011e2c471413d40e863ff730 100644 (file)
--- a/config/rootfiles/core/46/filelists/compat-wireless-modules
+++ b/config/rootfiles/oldcore/46/filelists/compat-wireless-modules
@@ -94,7 +94,7 @@ lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/rtl818x/rtl8180.ko
 lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/rtl818x/rtl8187.ko
 lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/wl1251/wl1251.ko
 lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/wl1251/wl1251_sdio.ko
-lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/wl12xx/wl1271.ko
+#lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/wl12xx/wl1271.ko
 lib/modules/2.6.32.28-ipfire/kernel/drivers/net/wireless/zd1211rw/zd1211rw.ko
 lib/modules/2.6.32.28-ipfire/kernel/drivers/ssb/ssb.ko
 lib/modules/2.6.32.28-ipfire/kernel/drivers/staging/ath6kl/ath6kl.ko
@@ -208,7 +208,7 @@ lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/rtl818x/rtl8180.ko
 lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/rtl818x/rtl8187.ko
 lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/wl1251/wl1251.ko
 lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/wl1251/wl1251_sdio.ko
-lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/wl12xx/wl1271.ko
+#lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/wl12xx/wl1271.ko
 lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/net/wireless/zd1211rw/zd1211rw.ko
 lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/ssb/ssb.ko
 lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/staging/ath6kl/ath6kl.ko
@@ -322,7 +322,7 @@ lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/rtl818x/rtl8180.ko
 lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/rtl818x/rtl8187.ko
 lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/wl1251/wl1251.ko
 lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/wl1251/wl1251_sdio.ko
-lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/wl12xx/wl1271.ko
+#lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/wl12xx/wl1271.ko
 lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/net/wireless/zd1211rw/zd1211rw.ko
 lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/ssb/ssb.ko
 lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/staging/ath6kl/ath6kl.ko

diff --git a/config/rootfiles/core/46/filelists/crda b/config/rootfiles/oldcore/46/filelists/crda
similarity index 100%
rename from config/rootfiles/core/46/filelists/crda
rename to config/rootfiles/oldcore/46/filelists/crda

diff --git a/config/rootfiles/core/46/filelists/files b/config/rootfiles/oldcore/46/filelists/files
similarity index 100%
rename from config/rootfiles/core/46/filelists/files
rename to config/rootfiles/oldcore/46/filelists/files

diff --git a/config/rootfiles/core/46/filelists/openssh b/config/rootfiles/oldcore/46/filelists/openssh
similarity index 100%
rename from config/rootfiles/core/46/filelists/openssh
rename to config/rootfiles/oldcore/46/filelists/openssh

diff --git a/config/rootfiles/core/46/filelists/openssl b/config/rootfiles/oldcore/46/filelists/openssl
similarity index 100%
rename from config/rootfiles/core/46/filelists/openssl
rename to config/rootfiles/oldcore/46/filelists/openssl

diff --git a/config/rootfiles/core/46/filelists/squid b/config/rootfiles/oldcore/46/filelists/squid
similarity index 100%
rename from config/rootfiles/core/46/filelists/squid
rename to config/rootfiles/oldcore/46/filelists/squid

diff --git a/config/rootfiles/core/46/meta b/config/rootfiles/oldcore/46/meta
similarity index 100%
rename from config/rootfiles/core/46/meta
rename to config/rootfiles/oldcore/46/meta

diff --git a/config/rootfiles/core/46/update.sh b/config/rootfiles/oldcore/46/update.sh
similarity index 100%
rename from config/rootfiles/core/46/update.sh
rename to config/rootfiles/oldcore/46/update.sh

diff --git a/config/rootfiles/core/47/exclude b/config/rootfiles/oldcore/47/exclude
similarity index 100%
rename from config/rootfiles/core/47/exclude
rename to config/rootfiles/oldcore/47/exclude

diff --git a/config/rootfiles/core/47/filelists/files b/config/rootfiles/oldcore/47/filelists/files
similarity index 100%
rename from config/rootfiles/core/47/filelists/files
rename to config/rootfiles/oldcore/47/filelists/files

diff --git a/config/rootfiles/core/47/filelists/fireinfo b/config/rootfiles/oldcore/47/filelists/fireinfo
similarity index 100%
rename from config/rootfiles/core/47/filelists/fireinfo
rename to config/rootfiles/oldcore/47/filelists/fireinfo

diff --git a/config/rootfiles/core/47/filelists/php b/config/rootfiles/oldcore/47/filelists/php
similarity index 100%
rename from config/rootfiles/core/47/filelists/php
rename to config/rootfiles/oldcore/47/filelists/php

diff --git a/config/rootfiles/core/47/meta b/config/rootfiles/oldcore/47/meta
similarity index 100%
rename from config/rootfiles/core/47/meta
rename to config/rootfiles/oldcore/47/meta

diff --git a/config/rootfiles/core/47/update.sh b/config/rootfiles/oldcore/47/update.sh
similarity index 100%
rename from config/rootfiles/core/47/update.sh
rename to config/rootfiles/oldcore/47/update.sh

diff --git a/config/rootfiles/core/48/exclude b/config/rootfiles/oldcore/48/exclude
similarity index 100%
rename from config/rootfiles/core/48/exclude
rename to config/rootfiles/oldcore/48/exclude

diff --git a/config/rootfiles/core/48/filelists/daq b/config/rootfiles/oldcore/48/filelists/daq
similarity index 100%
rename from config/rootfiles/core/48/filelists/daq
rename to config/rootfiles/oldcore/48/filelists/daq

diff --git a/config/rootfiles/core/48/filelists/files b/config/rootfiles/oldcore/48/filelists/files
similarity index 100%
rename from config/rootfiles/core/48/filelists/files
rename to config/rootfiles/oldcore/48/filelists/files

diff --git a/config/rootfiles/core/48/filelists/perl b/config/rootfiles/oldcore/48/filelists/perl
similarity index 100%
rename from config/rootfiles/core/48/filelists/perl
rename to config/rootfiles/oldcore/48/filelists/perl

diff --git a/config/rootfiles/core/48/filelists/perl-modules b/config/rootfiles/oldcore/48/filelists/perl-modules
similarity index 100%
rename from config/rootfiles/core/48/filelists/perl-modules
rename to config/rootfiles/oldcore/48/filelists/perl-modules

diff --git a/config/rootfiles/core/48/filelists/snort b/config/rootfiles/oldcore/48/filelists/snort
similarity index 100%
rename from config/rootfiles/core/48/filelists/snort
rename to config/rootfiles/oldcore/48/filelists/snort

diff --git a/config/rootfiles/core/48/filelists/squid b/config/rootfiles/oldcore/48/filelists/squid
similarity index 100%
rename from config/rootfiles/core/48/filelists/squid
rename to config/rootfiles/oldcore/48/filelists/squid

diff --git a/config/rootfiles/core/48/meta b/config/rootfiles/oldcore/48/meta
similarity index 100%
rename from config/rootfiles/core/48/meta
rename to config/rootfiles/oldcore/48/meta

diff --git a/config/rootfiles/core/48/update.sh b/config/rootfiles/oldcore/48/update.sh
similarity index 100%
rename from config/rootfiles/core/48/update.sh
rename to config/rootfiles/oldcore/48/update.sh

diff --git a/lfs/compat-wireless b/lfs/compat-wireless
index 60a76c6179839f9bbd6bc39a560a534ab3b98b9e..22223d7d7a80e9b671c4f3b39ce910aafe958e40 100644 (file)
--- a/lfs/compat-wireless
+++ b/lfs/compat-wireless
@@ -34,7 +34,7 @@ else
 endif
 endif
 
-VER        = 2.6.37-4-sn
+VER        = 2.6.38-3-ns
 
 THISAPP    = compat-wireless-$(VER)
 DL_FILE    = compat-wireless-$(VER).tar.bz2
@@ -51,7 +51,7 @@ objects = $(DL_FILE) asix-3.5.0a.tar.bz2
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 asix-3.5.0a.tar.bz2 = $(DL_FROM)/asix-3.5.0a.tar.bz2
 
-$(DL_FILE)_MD5 = be07898fa2e28a06c1b90dd424270ad2
+$(DL_FILE)_MD5 = c4c78d1d41c28f0e9c48ab8098a0a9f2
 asix-3.5.0a.tar.bz2_MD5=cc57513505d3ad1a43b58add91d2bba7
 
 install : $(TARGET)

diff --git a/lfs/linux b/lfs/linux
index 26c7b837b94abeb3eb8314b4af32f9b19124c329..c4eea8c33f6a101c5230d69109cf5c324319a083 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2010  IPFire Team <info@ipfire.org>                           #
+# Copyright (C) 2007-2011  IPFire Team <info@ipfire.org>                      #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,8 +24,8 @@
 
 include Config
 
-PATCHLEVEL = .28
-VER        = 2.6.32.28
+PATCHLEVEL = .36
+VER        = 2.6.32.36
 
 THISAPP    = linux-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -60,19 +60,19 @@ objects =$(DL_FILE) \
        netfilter-layer7-v2.22.tar.gz \
        patch-2.6.16-nath323-1.3.bz2 \
        reiser4-for-2.6.32.patch.bz2 \
-       xen-patches-2.6.32-2d.tar.bz2
+       xen-patches-2.6.32-2e.tar.bz2
 
 $(DL_FILE)                             = $(URL_IPFIRE)/$(DL_FILE)
 netfilter-layer7-v2.22.tar.gz          = $(URL_IPFIRE)/netfilter-layer7-v2.22.tar.gz
 patch-2.6.16-nath323-1.3.bz2           = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2
 reiser4-for-2.6.32.patch.bz2           = $(URL_IPFIRE)/reiser4-for-2.6.32.patch.bz2
-xen-patches-2.6.32-2d.tar.bz2          = $(URL_IPFIRE)/xen-patches-2.6.32-2d.tar.bz2
+xen-patches-2.6.32-2e.tar.bz2          = $(URL_IPFIRE)/xen-patches-2.6.32-2e.tar.bz2
 
-$(DL_FILE)_MD5                         = 9ee6d4023f34eb055ec32f201b5f9206
+$(DL_FILE)_MD5                         = 71cd2ab6060fb929fc0d81f4d13b88a8
 netfilter-layer7-v2.22.tar.gz_MD5      = 98dff8a3d5a31885b73341633f69501f
 patch-2.6.16-nath323-1.3.bz2_MD5       = f926409ff703a307baf54b57ab75d138
 reiser4-for-2.6.32.patch.bz2_MD5       = 3246397973d9271eb8e6d7c97c5d2d91
-xen-patches-2.6.32-2d.tar.bz2_MD5      = d1690d2b8b0c9124897981aea505f8f7
+xen-patches-2.6.32-2e.tar.bz2_MD5      = ec9f2a4a321cdfb887c03592bc6fad94
 
 install : $(TARGET)
 
@@ -110,7 +110,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 ifeq "$(XEN)" "1"
        # Apply gentoo Xen patches
        mkdir -p $(DIR_SRC)/xen-patches
-       cd $(DIR_SRC)/xen-patches && tar jxf $(DIR_DL)/xen-patches-2.6.32-2d.tar.bz2
+       cd $(DIR_SRC)/xen-patches && tar jxf $(DIR_DL)/xen-patches-2.6.32-2e.tar.bz2
 
        for x in `ls -1 $(DIR_SRC)/xen-patches/*.patch1`; do \
                echo "*********** [Patch: $$x]"; \

diff --git a/src/paks/linux-pae/install.sh b/src/paks/linux-pae/install.sh
index 445af204f2f1e3a43c5c46f0378890b05b9d5f2c..bb9d0bc3f99333c5f3100629961c9b816ebd06a1 100644 (file)
--- a/src/paks/linux-pae/install.sh
+++ b/src/paks/linux-pae/install.sh
@@ -24,7 +24,7 @@
 . /opt/pakfire/lib/functions.sh
 extract_files
 #
-KVER=2.6.32.28
+KVER=2.6.32.36
 ROOT=`mount | grep " / " | cut -d" " -f1`
 ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2`
 if [ ! -z $ROOTUUID ]; then

diff --git a/src/paks/linux-pae/uninstall.sh b/src/paks/linux-pae/uninstall.sh
index 9a453004633919ed356a7e96e8ed64a71dcc4321..959fdb1a7e2c818d5eb84cf52382f64294138b50 100644 (file)
--- a/src/paks/linux-pae/uninstall.sh
+++ b/src/paks/linux-pae/uninstall.sh
@@ -23,4 +23,4 @@
 #
 . /opt/pakfire/lib/functions.sh
 remove_files
-mv -f /boot/grub/grub-backup-2.6.32.*-pae.conf /boot/grub/grub.conf
+#mv -f /boot/grub/grub-backup-2.6.32.*-pae.conf /boot/grub/grub.conf

diff --git a/src/paks/linux-xen/install.sh b/src/paks/linux-xen/install.sh
index 2015b5d178509e31935a9a2db3d8792e61c77403..07c11e3c958651e526382591c0ff78fb69bf8210 100644 (file)
--- a/src/paks/linux-xen/install.sh
+++ b/src/paks/linux-xen/install.sh
@@ -24,7 +24,7 @@
 . /opt/pakfire/lib/functions.sh
 extract_files
 #
-KVER=2.6.32.28
+KVER=2.6.32.36
 ROOT=`mount | grep " / " | cut -d" " -f1`
 ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2`
 if [ ! -z $ROOTUUID ]; then

diff --git a/src/paks/linux-xen/update.sh b/src/paks/linux-xen/update.sh
index abbaf47c3cdefc976257ad3dcd052b658b3002b7..89c40d0d7c5d3dd57b5944f3af4977d5f8d76760 100644 (file)
--- a/src/paks/linux-xen/update.sh
+++ b/src/paks/linux-xen/update.sh
@@ -22,6 +22,5 @@
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
-#Don't remove old xen kernel at update
-#./uninstall.sh
+./uninstall.sh
 ./install.sh