Merge branch 'master' into next

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/48/filelists/perl-GD b/config/rootfiles/core/48/filelists/perl-GD
deleted file mode 120000 (symlink)
index 962d937..0000000
--- a/config/rootfiles/core/48/filelists/perl-GD
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/perl-GD
\ No newline at end of file

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/config/rootfiles/packages/alsa b/config/rootfiles/packages/alsa
index d87664d7f7cf4cd82776a399c0f63e1607aff50f..c9db15008c853ce7cc0e189977dfd870d758d6ad 100644 (file)
--- a/config/rootfiles/packages/alsa
+++ b/config/rootfiles/packages/alsa
@@ -1,3 +1,4 @@
+etc/rc.d/init.d/alsa
 lib/firmware/aica_firmware.bin
 #lib/firmware/asihpi
 lib/firmware/asihpi/dsp2400.bin
@@ -45,22 +46,25 @@ lib/firmware/emagic/emi26-bitstream.bin
 lib/firmware/emagic/emi26-firmware.bin
 lib/firmware/emagic/emi26-loader.bin
 lib/firmware/emagic/emi62-bitstream.bin
+lib/firmware/emagic/emi62-firmware.bin
 lib/firmware/emagic/emi62-firmware-midi.bin
 lib/firmware/emagic/emi62-firmware-spdif.bin
-lib/firmware/emagic/emi62-firmware.bin
 lib/firmware/emagic/emi62-loader.bin
 lib/firmware/emagic/license.txt
 #lib/firmware/emu
 lib/firmware/emu/audio_dock.fw
 lib/firmware/emu/emu0404.fw
-lib/firmware/emu/emu1010_notebook.fw
 lib/firmware/emu/emu1010b.fw
+lib/firmware/emu/emu1010_notebook.fw
 lib/firmware/emu/hana.fw
 lib/firmware/emu/micro_dock.fw
+lib/firmware/ess/maestro3_assp_kernel.fw
+lib/firmware/ess/maestro3_assp_minisrc.fw
+lib/firmware/korg/k1212.dsp
 #lib/firmware/mixart
+lib/firmware/mixart/miXart8AES.xlx
 lib/firmware/mixart/miXart8.elf
 lib/firmware/mixart/miXart8.xlx
-lib/firmware/mixart/miXart8AES.xlx
 lib/firmware/multiface_firmware.bin
 lib/firmware/multiface_firmware_rev11.bin
 #lib/firmware/pcxhr
@@ -86,6 +90,12 @@ lib/firmware/pcxhr/xlxc882e.dat
 lib/firmware/pcxhr/xlxc882hr.dat
 lib/firmware/pcxhr/xlxc924.dat
 lib/firmware/pcxhr/xlxint.dat
+lib/firmware/rpm_firmware.bin
+lib/firmware/sb16/alaw_main.csp
+lib/firmware/sb16/ima_adpcm_capture.csp
+lib/firmware/sb16/ima_adpcm_init.csp
+lib/firmware/sb16/ima_adpcm_playback.csp
+lib/firmware/sb16/mulaw_main.csp
 #lib/firmware/turtlebeach
 lib/firmware/turtlebeach/msndinit.bin
 lib/firmware/turtlebeach/msndperm.bin
@@ -105,9 +115,15 @@ lib/firmware/vx/x1_1_vp4.xlx
 lib/firmware/vx/x1_1_vx2.xlx
 lib/firmware/vx/x1_1_vxp.xlx
 lib/firmware/vx/x1_2_v22.xlx
+lib/firmware/yamaha/ds1_ctrl.fw
+lib/firmware/yamaha/ds1_dsp.fw
+lib/firmware/yamaha/ds1e_ctrl.fw
 lib/firmware/yamaha/yss225_registers.bin
+lib/udev/rules.d/90-alsa-restore.rules
 usr/bin/aconnect
+usr/bin/alsaloop
 usr/bin/alsamixer
+usr/bin/alsaucm
 usr/bin/amidi
 usr/bin/amixer
 usr/bin/aplay
@@ -124,36 +140,38 @@ usr/bin/speaker-test
 #usr/include/alsa/asoundef.h
 #usr/include/alsa/asoundlib.h
 #usr/include/alsa/conf.h
-#usr/include/alsa/control.h
 #usr/include/alsa/control_external.h
+#usr/include/alsa/control.h
 #usr/include/alsa/error.h
 #usr/include/alsa/global.h
 #usr/include/alsa/hwdep.h
 #usr/include/alsa/iatomic.h
 #usr/include/alsa/input.h
-#usr/include/alsa/mixer.h
 #usr/include/alsa/mixer_abst.h
+#usr/include/alsa/mixer.h
 #usr/include/alsa/output.h
-#usr/include/alsa/pcm.h
 #usr/include/alsa/pcm_external.h
 #usr/include/alsa/pcm_extplug.h
+#usr/include/alsa/pcm.h
 #usr/include/alsa/pcm_ioplug.h
 #usr/include/alsa/pcm_old.h
 #usr/include/alsa/pcm_plugin.h
 #usr/include/alsa/pcm_rate.h
 #usr/include/alsa/rawmidi.h
-#usr/include/alsa/seq.h
 #usr/include/alsa/seq_event.h
-#usr/include/alsa/seq_midi_event.h
+#usr/include/alsa/seq.h
 #usr/include/alsa/seqmid.h
+#usr/include/alsa/seq_midi_event.h
 #usr/include/alsa/sound
 #usr/include/alsa/sound/asound_fm.h
 #usr/include/alsa/sound/emu10k1.h
 #usr/include/alsa/sound/hdsp.h
+usr/include/alsa/sound/hdspm.h
 #usr/include/alsa/sound/sb16_csp.h
 #usr/include/alsa/sound/sscape_ioctl.h
 #usr/include/alsa/sound/type_compat.h
 #usr/include/alsa/timer.h
+#usr/include/alsa/use-case.h
 #usr/include/alsa/version.h
 #usr/include/sys/asoundlib.h
 #usr/lib/alsa-lib
@@ -183,11 +201,12 @@ usr/local/share/alsa
 #usr/local/share/alsa/firmware/hdsploader/digiface_firmware_rev11.bin
 #usr/local/share/alsa/firmware/hdsploader/multiface_firmware.bin
 #usr/local/share/alsa/firmware/hdsploader/multiface_firmware_rev11.bin
+usr/local/share/alsa/firmware/hdsploader/rpm_firmware.bin
 #usr/local/share/alsa/firmware/mixartloader
-#usr/local/share/alsa/firmware/mixartloader/miXart.conf
+#usr/local/share/alsa/firmware/mixartloader/miXart8AES.xlx
 #usr/local/share/alsa/firmware/mixartloader/miXart8.elf
 #usr/local/share/alsa/firmware/mixartloader/miXart8.xlx
-#usr/local/share/alsa/firmware/mixartloader/miXart8AES.xlx
+#usr/local/share/alsa/firmware/mixartloader/miXart.conf
 #usr/local/share/alsa/firmware/pcxhrloader
 #usr/local/share/alsa/firmware/pcxhrloader/b321_512.b56
 #usr/local/share/alsa/firmware/pcxhrloader/d321_512.d56
@@ -202,13 +221,13 @@ usr/local/share/alsa
 #usr/local/share/alsa/firmware/pcxhrloader/dspe882.e56
 #usr/local/share/alsa/firmware/pcxhrloader/dspe924.e56
 #usr/local/share/alsa/firmware/pcxhrloader/e321_512.e56
-#usr/local/share/alsa/firmware/pcxhrloader/pcxhr.conf
 #usr/local/share/alsa/firmware/pcxhrloader/pcxhr0.conf
 #usr/local/share/alsa/firmware/pcxhrloader/pcxhr1.conf
 #usr/local/share/alsa/firmware/pcxhrloader/pcxhr2.conf
 #usr/local/share/alsa/firmware/pcxhrloader/pcxhr3.conf
 #usr/local/share/alsa/firmware/pcxhrloader/pcxhr4.conf
 #usr/local/share/alsa/firmware/pcxhrloader/pcxhr5.conf
+#usr/local/share/alsa/firmware/pcxhrloader/pcxhr.conf
 #usr/local/share/alsa/firmware/pcxhrloader/xc_1_882.dat
 #usr/local/share/alsa/firmware/pcxhrloader/xi_1_882.dat
 #usr/local/share/alsa/firmware/pcxhrloader/xlxc1222e.dat
@@ -221,17 +240,17 @@ usr/local/share/alsa
 #usr/local/share/alsa/firmware/usx2yloader
 #usr/local/share/alsa/firmware/usx2yloader/tascam_loader.ihx
 #usr/local/share/alsa/firmware/usx2yloader/us122.conf
+#usr/local/share/alsa/firmware/usx2yloader/us122fw.ihx
 #usr/local/share/alsa/firmware/usx2yloader/us122.prepad
 #usr/local/share/alsa/firmware/usx2yloader/us122.rbt
-#usr/local/share/alsa/firmware/usx2yloader/us122fw.ihx
 #usr/local/share/alsa/firmware/usx2yloader/us224.conf
+#usr/local/share/alsa/firmware/usx2yloader/us224fw.ihx
 #usr/local/share/alsa/firmware/usx2yloader/us224.prepad
 #usr/local/share/alsa/firmware/usx2yloader/us224.rbt
-#usr/local/share/alsa/firmware/usx2yloader/us224fw.ihx
 #usr/local/share/alsa/firmware/usx2yloader/us428.conf
+#usr/local/share/alsa/firmware/usx2yloader/us428fw.ihx
 #usr/local/share/alsa/firmware/usx2yloader/us428.prepad
 #usr/local/share/alsa/firmware/usx2yloader/us428.rbt
-#usr/local/share/alsa/firmware/usx2yloader/us428fw.ihx
 #usr/local/share/alsa/firmware/vxloader
 #usr/local/share/alsa/firmware/vxloader/bd56002.boot
 #usr/local/share/alsa/firmware/vxloader/bd563s3.boot
@@ -257,19 +276,21 @@ usr/share/alsa
 #usr/share/alsa/alsa.conf
 #usr/share/alsa/cards
 #usr/share/alsa/cards/AACI.conf
+#usr/share/alsa/cards/aliases.alisp
+#usr/share/alsa/cards/aliases.conf
+#usr/share/alsa/cards/ATIIXP.conf
 #usr/share/alsa/cards/ATIIXP-MODEM.conf
 #usr/share/alsa/cards/ATIIXP-SPDMA.conf
-#usr/share/alsa/cards/ATIIXP.conf
 #usr/share/alsa/cards/AU8810.conf
 #usr/share/alsa/cards/AU8820.conf
 #usr/share/alsa/cards/AU8830.conf
-#usr/share/alsa/cards/Audigy.conf
 #usr/share/alsa/cards/Audigy2.conf
+#usr/share/alsa/cards/Audigy.conf
 #usr/share/alsa/cards/Aureon51.conf
 #usr/share/alsa/cards/Aureon71.conf
 #usr/share/alsa/cards/CA0106.conf
-#usr/share/alsa/cards/CMI8338-SWIEC.conf
 #usr/share/alsa/cards/CMI8338.conf
+#usr/share/alsa/cards/CMI8338-SWIEC.conf
 #usr/share/alsa/cards/CMI8738-MC6.conf
 #usr/share/alsa/cards/CMI8738-MC8.conf
 #usr/share/alsa/cards/CMI8788.conf
@@ -284,9 +305,9 @@ usr/share/alsa
 #usr/share/alsa/cards/HDA-Intel.conf
 #usr/share/alsa/cards/ICE1712.conf
 #usr/share/alsa/cards/ICE1724.conf
-#usr/share/alsa/cards/ICH-MODEM.conf
-#usr/share/alsa/cards/ICH.conf
 #usr/share/alsa/cards/ICH4.conf
+#usr/share/alsa/cards/ICH.conf
+#usr/share/alsa/cards/ICH-MODEM.conf
 #usr/share/alsa/cards/Maestro3.conf
 #usr/share/alsa/cards/NFORCE.conf
 #usr/share/alsa/cards/PC-Speaker.conf
@@ -303,15 +324,13 @@ usr/share/alsa
 #usr/share/alsa/cards/TRID4DWAVENX.conf
 #usr/share/alsa/cards/USB-Audio.conf
 #usr/share/alsa/cards/VIA686A.conf
-#usr/share/alsa/cards/VIA8233.conf
 #usr/share/alsa/cards/VIA8233A.conf
+#usr/share/alsa/cards/VIA8233.conf
 #usr/share/alsa/cards/VIA8237.conf
 #usr/share/alsa/cards/VX222.conf
-#usr/share/alsa/cards/VXPocket.conf
 #usr/share/alsa/cards/VXPocket440.conf
+#usr/share/alsa/cards/VXPocket.conf
 #usr/share/alsa/cards/YMF744.conf
-#usr/share/alsa/cards/aliases.alisp
-#usr/share/alsa/cards/aliases.conf
 #usr/share/alsa/init
 #usr/share/alsa/init/00main
 #usr/share/alsa/init/default
@@ -341,12 +360,14 @@ usr/share/alsa
 #usr/share/alsa/speaker-test
 #usr/share/alsa/speaker-test/sample_map.csv
 #usr/share/locale/de/LC_MESSAGES/alsa-utils.mo
-#usr/share/locale/ja/LC_MESSAGES/alsa-utils.mo
+#usr/share/locale/fr/LC_MESSAGES/alsa-utils.mo
 #usr/share/locale/ja/LC_MESSAGES/alsaconf.mo
+#usr/share/locale/ja/LC_MESSAGES/alsa-utils.mo
 #usr/share/locale/ru/LC_MESSAGES/alsaconf.mo
 #usr/share/man/fr/man8/alsaconf.8
 #usr/share/man/man1/aconnect.1
 #usr/share/man/man1/alsactl.1
+#usr/share/man/man1/alsaloop.1
 #usr/share/man/man1/alsamixer.1
 #usr/share/man/man1/amidi.1
 #usr/share/man/man1/amixer.1
@@ -370,15 +391,4 @@ usr/share/sounds/alsa
 #usr/share/sounds/alsa/Rear_Right.wav
 #usr/share/sounds/alsa/Side_Left.wav
 #usr/share/sounds/alsa/Side_Right.wav
-etc/rc.d/init.d/alsa
-lib/firmware/ess/maestro3_assp_kernel.fw
-lib/firmware/ess/maestro3_assp_minisrc.fw
-lib/firmware/korg/k1212.dsp
-lib/firmware/sb16/alaw_main.csp
-lib/firmware/sb16/ima_adpcm_capture.csp
-lib/firmware/sb16/ima_adpcm_init.csp
-lib/firmware/sb16/ima_adpcm_playback.csp
-lib/firmware/sb16/mulaw_main.csp
-lib/firmware/yamaha/ds1_ctrl.fw
-lib/firmware/yamaha/ds1_dsp.fw
-lib/firmware/yamaha/ds1e_ctrl.fw
+var/lib/alsa

diff --git a/lfs/alsa b/lfs/alsa
index d2eaadbbaf6865ec7ca6e88ef6eb416240bfedc9..f6f6df8046fe6eaf08b931d6c90342aee0798884 100644 (file)
--- a/lfs/alsa
+++ b/lfs/alsa
@@ -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        #
@@ -34,17 +34,17 @@ else
 endif
 endif
 
-VER        = 1.0.23
-UVER       = 1.0.23
-FVER       = 1.0.23
-DVER       = 1.0.23
+VER        = 1.0.24.1
+UVER       = 1.0.24.2
+FVER       = 1.0.24.1
+DVER       = 1.0.24
 
 THISAPP    = alsa-lib-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 PROG       = alsa
-PAK_VER    = 8
+PAK_VER    = 9
 
 DEPS       = ""
 
@@ -66,10 +66,10 @@ alsa-utils-$(UVER).tar.bz2 = $(DL_FROM)/alsa-utils-$(UVER).tar.bz2
 alsa-firmware-$(FVER).tar.bz2 = $(DL_FROM)/alsa-firmware-$(FVER).tar.bz2
 alsa-driver-$(DVER).tar.bz2 = $(DL_FROM)/alsa-driver-$(DVER).tar.bz2
 
-$(DL_FILE)_MD5 = f48b50421d8a69d2d806d9c47e534f0d
-alsa-utils-$(UVER).tar.bz2_MD5 = cb0cf46029ac9549cf3a31bff6a4f4e1
-alsa-firmware-$(FVER).tar.bz2_MD5 = e3f755331d6d485f6fd697249b90f877
-alsa-driver-$(DVER).tar.bz2_MD5 = 4be102f995bd4cc68e6e8178b0d19ec2
+$(DL_FILE)_MD5 = 7cc05f25e1d5b65da8fb3fdcd540f226
+alsa-utils-$(UVER).tar.bz2_MD5 = 8238cd57cb301d1c36bcf0ecb59ce6b2
+alsa-firmware-$(FVER).tar.bz2_MD5 = d37434dfcfececd8581d2f0bbe2fcf1b
+alsa-driver-$(DVER).tar.bz2_MD5 = a4ffd80745ce5098dfd48d83c2769e0e
 
 install : $(TARGET)
 

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/e1000 b/lfs/e1000
index 1d61e5bb277d31884e354dd7e65f20fa284d4214..66e4fdd6e6c61020e2ae7aa3fc1e74ebf510c969 100644 (file)
--- a/lfs/e1000
+++ b/lfs/e1000
@@ -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        #
@@ -34,7 +34,7 @@ else
 endif
 endif
 
-VER        = 8.0.19
+VER        = 8.0.30
 
 THISAPP    = e1000-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -50,7 +50,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = dc66dcbfd7c2e48af8cfc86f4f174fce
+$(DL_FILE)_MD5 = d85a64fdde2987b27ac6fbab5be605a0
 
 install : $(TARGET)
 

diff --git a/lfs/e1000e b/lfs/e1000e
index cce53673551bbb1542360cb46a1ea28ae4c178b9..ba465952bda6d25478e919dc6d809a9b921a8aa2 100644 (file)
--- a/lfs/e1000e
+++ b/lfs/e1000e
@@ -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        #
@@ -34,7 +34,7 @@ else
 endif
 endif
 
-VER        = 1.1.19
+VER        = 1.3.10a
 
 THISAPP    = e1000e-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -50,7 +50,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 94e86507f139226c1add173dafdbbd52
+$(DL_FILE)_MD5 = 04b8856433d5e582ab41bdd3b24f20a5
 
 install : $(TARGET)
 

diff --git a/lfs/igb b/lfs/igb
index 830564795047f583c2a02304323c599e71f9f64f..678c7036708e06509e23f6b682dedd4e49c388e8 100644 (file)
--- a/lfs/igb
+++ b/lfs/igb
@@ -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        #
@@ -34,7 +34,7 @@ else
 endif
 endif
 
-VER        = 2.3.4
+VER        = 3.0.19
 
 THISAPP    = igb-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -50,7 +50,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = b0ea2a70198746b69392ef935b61454a
+$(DL_FILE)_MD5 = 8fdc04600bea4a4188672a1a8d0eb73b
 
 install : $(TARGET)
 

diff --git a/lfs/linux b/lfs/linux
index 26c7b837b94abeb3eb8314b4af32f9b19124c329..d9df8fc8a41a15795dee3773b684ac71257fc1c2 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 = .39
+VER        = 2.6.32.39
 
 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-2f.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-2f.tar.bz2          = $(URL_IPFIRE)/xen-patches-2.6.32-2f.tar.bz2
 
-$(DL_FILE)_MD5                         = 9ee6d4023f34eb055ec32f201b5f9206
+$(DL_FILE)_MD5                         = e0e741937640a875392b1820e945be25
 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-2f.tar.bz2_MD5      = b59d6f89e11accb9d40354418e13f31b
 
 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-2f.tar.bz2
 
        for x in `ls -1 $(DIR_SRC)/xen-patches/*.patch1`; do \
                echo "*********** [Patch: $$x]"; \

diff --git a/lfs/v4l-dvb b/lfs/v4l-dvb
index e8f2e54f156eaf7f354fc59218fc082fa0720a7d..6c6a5fc5bba69ac63a04eb483110cfb1807a34e6 100644 (file)
--- a/lfs/v4l-dvb
+++ b/lfs/v4l-dvb
@@ -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        #
@@ -34,10 +34,10 @@ else
 endif
 endif
 
-VER        = abd3aac6644e
+VER        = git20110427
 
 THISAPP    = v4l-dvb-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 PAK_VER    = 2
@@ -51,7 +51,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = fca89ad531c5d04dadbbc65997c92aac
+$(DL_FILE)_MD5 = 8b83a89332fe8468ebffd516a4a47128
 
 install : $(TARGET)
 
@@ -83,12 +83,9 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-       # Remove backported warning...
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/v4l-dvb_remove_backport_warning.patch
-               cd $(DIR_APP) && make release VER=$(KVER)-$(VERSUFIX)
-       cd $(DIR_APP) && make $(MAKETUNING) all
-       cd $(DIR_APP) && make install
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && make all KERNELRELEASE=$(KVER)-$(VERSUFIX) VER=2.6.32
+       cd $(DIR_APP) && make install KERNELRELEASE=$(KVER)-$(VERSUFIX) VER=2.6.32
        ln -sf $(DIR_APP)/ /usr/src/v4l-dvb
 #      @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index f572b9304a7bcdc781d1e65607d1e348a8e8656a..e9b3f8888599e85923ae6cf32757283c195678af 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -24,7 +24,7 @@
 
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
-VERSION="2.9"                                                  # Version number
+VERSION="2.10"                                                 # Version number
 CORE="49"                                                      # Core Level (Filename)
 PAKFIRE_CORE="48"                                              # Core Level (PAKFIRE)
 GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`             # Git Branch
@@ -698,7 +698,7 @@ buildipfire() {
   echo >> $BASEDIR/build/var/ipfire/firebuild
   cat /proc/cpuinfo >> $BASEDIR/build/var/ipfire/firebuild
   echo $PAKFIRE_CORE > $BASEDIR/build/opt/pakfire/db/core/mine
-  if [ "$GIT_BRANCH" = "master" ]; then
+  if [ "$GIT_BRANCH" = "next" ]; then
        echo "$NAME $VERSION - (Development Build: $GIT_LASTCOMMIT)" > $BASEDIR/build/etc/system-release
   else
        echo "$NAME $VERSION - $GIT_BRANCH" > $BASEDIR/build/etc/system-release

diff --git a/src/paks/linux-pae/install.sh b/src/paks/linux-pae/install.sh
index 445af204f2f1e3a43c5c46f0378890b05b9d5f2c..01e59ebce42eb7a2faeb536585b7716e38001074 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.39
 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..f3ffbdb8bb2668b5591980174da6dcfc82ed2e92 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.39
 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

diff --git a/src/patches/v4l-dvb_remove_backport_warning.patch b/src/patches/v4l-dvb_remove_backport_warning.patch
deleted file mode 100644 (file)
index 7f57822..0000000
--- a/src/patches/v4l-dvb_remove_backport_warning.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur v4l-dvb-abd3aac6644e.org/v4l/compat.h v4l-dvb-abd3aac6644e/v4l/compat.h
---- v4l-dvb-abd3aac6644e.org/v4l/compat.h      2010-07-02 05:38:54.000000000 +0200
-+++ v4l-dvb-abd3aac6644e/v4l/compat.h  2010-12-04 12:19:09.531056981 +0100
-@@ -14,8 +14,6 @@
- #define INIT_DELAYED_WORK(a,b,c)      INIT_WORK(a,b,c)
- #endif
- 
--#define EXPERIMENTAL_TREE
--
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
- #define usb_buffer_alloc(dev, size, mem_flags, dma) usb_alloc_coherent(dev, size, mem_flags, dma)
- #define usb_buffer_free(dev, size, addr, dma) usb_free_coherent(dev, size, addr, dma)