Merge branch 'core37'

diff --git a/config/backup/backup.pl b/config/backup/backup.pl
index e67a958f471d01f41b8e675e43fe0b57c8f69c2c..103807fa6d6515372acf3514d9b3e1f42c82f5fc 100644 (file)
--- a/config/backup/backup.pl
+++ b/config/backup/backup.pl
@@ -61,11 +61,11 @@ elsif ($ARGV[0] eq 'exclude') {
   system("rm /tmp/include");
 }
 elsif ($ARGV[0] eq 'restore') {
-  system("cd / && tar -xvz --preserve -f /tmp/restore.ipf");
+  system("cd / && tar -xvz -p -f /tmp/restore.ipf");
 }
 elsif ($ARGV[0] eq 'restoreaddon') {
   if ( -e "/tmp/$ARGV[1]" ){system("mv /tmp/$ARGV[1] /var/ipfire/backup/addons/backup/$ARGV[1]");}
-  system("cd / && tar -xvz --preserve -f /var/ipfire/backup/addons/backup/$ARGV[1]");
+  system("cd / && tar -xvz -p -f /var/ipfire/backup/addons/backup/$ARGV[1]");
 }
 elsif ($ARGV[0] eq 'cli') {
   system("tar -cvzf /var/ipfire/backup/$Jahr$Monat$Monatstag-$Stunden$Minuten-$ARGV[1].ipf --files-from='$ARGV[2]' --exclude-from='$ARGV[3]'");

diff --git a/config/backup/includes/pound b/config/backup/includes/pound
new file mode 100644 (file)
index 0000000..a1ec94b
--- /dev/null
+++ b/config/backup/includes/pound
@@ -0,0 +1 @@
+/etc/pound.cfg

diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl
index 3a2c932e324959727f7cee2af5d6a0a24dbc08ee..bbb0eca79c88e25a70b7135ed878635d3cad8d81 100644 (file)
--- a/config/cfgroot/header.pl
+++ b/config/cfgroot/header.pl
@@ -494,3 +494,29 @@ sub leasesort {
        }
     }
 }
+
+sub colorize {
+       my $string =  $_[0];
+       my @array = split(/\//,$string);
+       my $string2 = $array[0];
+
+       if ( $string eq "*" or $string eq "" ){
+               return $string;
+       } elsif ( $string =~ "ipsec" ){
+               return "<font color='".${Header::colourvpn}."'>".$string."</font>";
+       } elsif ( $string =~ "tun" ){
+               return "<font color='".${Header::colourovpn}."'>".$string."</font>";
+       } elsif ( $string =~ "lo" or $string =~ "127.0.0.0" ){
+               return "<font color='".${Header::colourfw}."'>".$string."</font>";
+       } elsif ( $string =~ $ethsettings{'GREEN_DEV'} or &IpInSubnet($string2,$ethsettings{'GREEN_NETADDRESS'},$ethsettings{'GREEN_NETMASK'}) ){
+               return "<font color='".${Header::colourgreen}."'>".$string."</font>";
+       } elsif (  $string =~ "ppp0" or $string =~ $ethsettings{'RED_DEV'} or $string =~ "0.0.0.0" or $string =~ $ethsettings{'RED_ADDRESS'} ){
+               return "<font color='".${Header::colourred}."'>".$string."</font>";
+       } elsif ( $ethsettings{'CONFIG_TYPE'}>1 and ( $string =~ $ethsettings{'BLUE_DEV'} or &IpInSubnet($string2,$ethsettings{'BLUE_NETADDRESS'},$ethsettings{'BLUE_NETMASK'}) )){
+               return "<font color='".${Header::colourblue}."'>".$string."</font>";
+       } elsif ( $ethsettings{'CONFIG_TYPE'}>2 and ( $string =~ $ethsettings{'ORANGE_DEV'} or &IpInSubnet($string2,$ethsettings{'ORANGE_NETADDRESS'},$ethsettings{'ORANGE_NETMASK'}) )){
+               return "<font color='".${Header::colourorange}."'>".$string."</font>";
+       } else {
+               return $string;
+       }
+}

diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf
index 07349c8f31816fd518bf506d0475401bfe47ebbc..b0166e5d639b301f136e2d6befe0c0673ecae5d7 100644 (file)
--- a/config/collectd/collectd.conf
+++ b/config/collectd/collectd.conf
@@ -8,7 +8,7 @@ Hostname    "localhost"
 BaseDir     "/var/log/rrd/collectd"
 PIDFile     "/var/run/collectd.pid"
 PluginDir   "/usr/lib/collectd"
-TypesDB     "/usr/lib/collectd/types.db"
+TypesDB     "/usr/share/collectd/types.db"
 Interval     30
 ReadThreads  3
 

diff --git a/config/etc/modprobe.d/cfg80211 b/config/etc/modprobe.d/cfg80211
new file mode 100644 (file)
index 0000000..3339ea8
--- /dev/null
+++ b/config/etc/modprobe.d/cfg80211
@@ -0,0 +1,2 @@
+options cfg80211 ieee80211_regdom=EU
+blacklist ieee80211

diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire
index f74c349a5e0e8fe0f4955e1e0bef2fd739f3bcc0..957999dbb191ed54e28a7c1befabbaadb7af68b1 100644 (file)
--- a/config/kernel/kernel.config.i586-ipfire
+++ b/config/kernel/kernel.config.i586-ipfire
@@ -1,14 +1,14 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.27.39
-# Tue Nov 17 16:33:58 2009
+# Linux kernel version: 2.6.32.10
+# Tue Mar 30 18:43:57 2010
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
 # CONFIG_X86_64 is not set
 CONFIG_X86=y
+CONFIG_OUTPUT_FORMAT="elf32-i386"
 CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
-# CONFIG_GENERIC_LOCKBREAK is not set
 CONFIG_GENERIC_TIME=y
 CONFIG_GENERIC_CMOS_UPDATE=y
 CONFIG_CLOCKSOURCE_WATCHDOG=y
@@ -17,19 +17,15 @@ CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-CONFIG_FAST_CMPXCHG_LOCAL=y
 CONFIG_MMU=y
 CONFIG_ZONE_DMA=y
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_GENERIC_IOMAP=y
 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_HWEIGHT=y
-# CONFIG_GENERIC_GPIO is not set
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 # CONFIG_RWSEM_GENERIC_SPINLOCK is not set
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 # CONFIG_GENERIC_TIME_VSYSCALL is not set
@@ -37,24 +33,29 @@ CONFIG_ARCH_HAS_CPU_RELAX=y
 CONFIG_ARCH_HAS_DEFAULT_IDLE=y
 CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
 CONFIG_HAVE_SETUP_PER_CPU_AREA=y
+CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
+CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
 # CONFIG_HAVE_CPUMASK_OF_CPU_MAP is not set
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 # CONFIG_ZONE_DMA32 is not set
 CONFIG_ARCH_POPULATES_NODE_MAP=y
 # CONFIG_AUDIT_ARCH is not set
-CONFIG_ARCH_SUPPORTS_AOUT=y
 CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+CONFIG_HAVE_INTEL_TXT=y
 CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GENERIC_PENDING_IRQ=y
-CONFIG_X86_SMP=y
+CONFIG_USE_GENERIC_SMP_HELPERS=y
 CONFIG_X86_32_SMP=y
 CONFIG_X86_HT=y
-CONFIG_X86_BIOS_REBOOT=y
 CONFIG_X86_TRAMPOLINE=y
+CONFIG_X86_32_LAZY_GS=y
 CONFIG_KTIME_SCALAR=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+CONFIG_CONSTRUCTORS=y
 
 #
 # General setup
@@ -64,20 +65,37 @@ CONFIG_LOCK_KERNEL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_BZIP2=y
+CONFIG_HAVE_KERNEL_LZMA=y
+# CONFIG_KERNEL_GZIP is not set
+# CONFIG_KERNEL_BZIP2 is not set
+CONFIG_KERNEL_LZMA=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
 CONFIG_AUDIT=y
 CONFIG_AUDITSYSCALL=y
 CONFIG_AUDIT_TREE=y
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_RCU=y
+# CONFIG_TREE_PREEMPT_RCU is not set
+# CONFIG_RCU_TRACE is not set
+CONFIG_RCU_FANOUT=32
+# CONFIG_RCU_FANOUT_EXACT is not set
+# CONFIG_TREE_RCU_TRACE is not set
 # CONFIG_IKCONFIG is not set
-CONFIG_LOG_BUF_SHIFT=15
-# CONFIG_CGROUPS 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
 # CONFIG_RELAY is not set
@@ -86,10 +104,15 @@ CONFIG_NAMESPACES=y
 # CONFIG_IPC_NS is not set
 # CONFIG_USER_NS is not set
 # CONFIG_PID_NS is not set
+# CONFIG_NET_NS is not set
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+CONFIG_RD_BZIP2=y
+CONFIG_RD_LZMA=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
+CONFIG_ANON_INODES=y
 # CONFIG_EMBEDDED is not set
 CONFIG_UID16=y
 CONFIG_SYSCTL_SYSCALL=y
@@ -100,36 +123,45 @@ CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_PCSPKR_PLATFORM=y
-CONFIG_COMPAT_BRK=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
-CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
 CONFIG_SIGNALFD=y
 CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
+CONFIG_AIO=y
+CONFIG_HAVE_PERF_EVENTS=y
+
+#
+# Kernel Performance Events And Counters
+#
+# CONFIG_PERF_EVENTS is not set
+# 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_SLOB is not set
 # CONFIG_PROFILING is not set
-# CONFIG_MARKERS is not set
 CONFIG_HAVE_OPROFILE=y
 # CONFIG_KPROBES is not set
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
 CONFIG_HAVE_IOREMAP_PROT=y
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
-# CONFIG_HAVE_ARCH_TRACEHOOK is not set
-# CONFIG_HAVE_DMA_ATTRS is not set
-CONFIG_USE_GENERIC_SMP_HELPERS=y
-# CONFIG_HAVE_CLK is not set
-CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_HAVE_DMA_API_DEBUG=y
+
+#
+# GCOV-based kernel profiling
+#
+CONFIG_SLOW_WORK=y
 CONFIG_HAVE_GENERIC_DMA_COHERENT=y
 CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
-# CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
 # CONFIG_MODULE_FORCE_LOAD is not set
@@ -137,12 +169,9 @@ CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_KMOD=y
 CONFIG_STOP_MACHINE=y
 CONFIG_BLOCK=y
-CONFIG_LBD=y
-# CONFIG_BLK_DEV_IO_TRACE is not set
-CONFIG_LSF=y
+CONFIG_LBDAF=y
 # CONFIG_BLK_DEV_BSG is not set
 # CONFIG_BLK_DEV_INTEGRITY is not set
 
@@ -153,38 +182,39 @@ CONFIG_IOSCHED_NOOP=y
 CONFIG_IOSCHED_AS=y
 CONFIG_IOSCHED_DEADLINE=y
 CONFIG_IOSCHED_CFQ=y
-CONFIG_DEFAULT_AS=y
+# CONFIG_DEFAULT_AS is not set
 # CONFIG_DEFAULT_DEADLINE is not set
-# CONFIG_DEFAULT_CFQ is not set
+CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="anticipatory"
+CONFIG_DEFAULT_IOSCHED="cfq"
 CONFIG_PREEMPT_NOTIFIERS=y
-CONFIG_CLASSIC_RCU=y
+CONFIG_FREEZER=y
 
 #
 # Processor type and features
 #
-# CONFIG_TICK_ONESHOT is not set
-# CONFIG_NO_HZ is not set
-# CONFIG_HIGH_RES_TIMERS is not set
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_SMP=y
-CONFIG_X86_FIND_SMP_CONFIG=y
+CONFIG_SPARSE_IRQ=y
 CONFIG_X86_MPPARSE=y
-CONFIG_X86_PC=y
+# CONFIG_X86_BIGSMP is not set
+CONFIG_X86_EXTENDED_PLATFORM=y
 # CONFIG_X86_ELAN is not set
-# CONFIG_X86_VOYAGER is not set
-# CONFIG_X86_GENERICARCH is not set
-# CONFIG_X86_VSMP is not set
+# CONFIG_X86_MRST is not set
 # CONFIG_X86_RDC321X is not set
-CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
+# CONFIG_X86_32_NON_STANDARD is not set
+CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
+CONFIG_SCHED_OMIT_FRAME_POINTER=y
 CONFIG_PARAVIRT_GUEST=y
-CONFIG_XEN_SAVE_RESTORE=y
 CONFIG_VMI=y
 CONFIG_KVM_CLOCK=y
 CONFIG_KVM_GUEST=y
 CONFIG_LGUEST_GUEST=y
 CONFIG_PARAVIRT=y
+CONFIG_PARAVIRT_SPINLOCKS=y
 CONFIG_PARAVIRT_CLOCK=y
 # CONFIG_MEMTEST is not set
 # CONFIG_M386 is not set
@@ -203,7 +233,6 @@ CONFIG_M586TSC=y
 # CONFIG_MCRUSOE is not set
 # CONFIG_MEFFICEON is not set
 # CONFIG_MWINCHIPC6 is not set
-# CONFIG_MWINCHIP2 is not set
 # CONFIG_MWINCHIP3D is not set
 # CONFIG_MGEODEGX1 is not set
 # CONFIG_MGEODE_LX is not set
@@ -212,11 +241,14 @@ CONFIG_M586TSC=y
 # CONFIG_MVIAC7 is not set
 # CONFIG_MPSC is not set
 # CONFIG_MCORE2 is not set
+# CONFIG_MATOM is not set
 # CONFIG_GENERIC_CPU is not set
 CONFIG_X86_GENERIC=y
 CONFIG_X86_CPU=y
+CONFIG_X86_L1_CACHE_BYTES=64
+CONFIG_X86_INTERNODE_CACHE_BYTES=64
 CONFIG_X86_CMPXCHG=y
-CONFIG_X86_L1_CACHE_SHIFT=7
+CONFIG_X86_L1_CACHE_SHIFT=5
 CONFIG_X86_XADD=y
 CONFIG_X86_PPRO_FENCE=y
 CONFIG_X86_F00F_BUG=y
@@ -228,10 +260,17 @@ CONFIG_X86_ALIGNMENT_16=y
 CONFIG_X86_INTEL_USERCOPY=y
 CONFIG_X86_TSC=y
 CONFIG_X86_MINIMUM_CPU_FAMILY=4
+CONFIG_CPU_SUP_INTEL=y
+CONFIG_CPU_SUP_CYRIX_32=y
+CONFIG_CPU_SUP_AMD=y
+CONFIG_CPU_SUP_CENTAUR=y
+CONFIG_CPU_SUP_TRANSMETA_32=y
+CONFIG_CPU_SUP_UMC_32=y
 CONFIG_HPET_TIMER=y
 CONFIG_HPET_EMULATE_RTC=y
 CONFIG_DMI=y
 # CONFIG_IOMMU_HELPER is not set
+CONFIG_IOMMU_API=y
 CONFIG_NR_CPUS=8
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
@@ -240,14 +279,21 @@ CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT is not set
 CONFIG_X86_LOCAL_APIC=y
 CONFIG_X86_IO_APIC=y
+CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
 CONFIG_X86_MCE=y
-CONFIG_X86_MCE_NONFATAL=m
-CONFIG_X86_MCE_P4THERMAL=y
+CONFIG_X86_MCE_INTEL=y
+CONFIG_X86_MCE_AMD=y
+CONFIG_X86_ANCIENT_MCE=y
+CONFIG_X86_MCE_THRESHOLD=y
+CONFIG_X86_MCE_INJECT=m
+CONFIG_X86_THERMAL_VECTOR=y
 CONFIG_VM86=y
 CONFIG_TOSHIBA=m
 CONFIG_I8K=m
 CONFIG_X86_REBOOTFIXUPS=y
 CONFIG_MICROCODE=m
+CONFIG_MICROCODE_INTEL=y
+CONFIG_MICROCODE_AMD=y
 CONFIG_MICROCODE_OLD_INTERFACE=y
 CONFIG_X86_MSR=m
 CONFIG_X86_CPUID=y
@@ -256,6 +302,7 @@ CONFIG_HIGHMEM4G=y
 # CONFIG_HIGHMEM64G is not set
 CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_HIGHMEM=y
+# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
 CONFIG_ARCH_FLATMEM_ENABLE=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
@@ -266,41 +313,47 @@ CONFIG_FLATMEM_MANUAL=y
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_SPARSEMEM_STATIC=y
-# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
-# CONFIG_RESOURCES_64BIT is not set
+# CONFIG_PHYS_ADDR_T_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=1
 CONFIG_BOUNCE=y
 CONFIG_VIRT_TO_BUS=y
+CONFIG_HAVE_MLOCK=y
+CONFIG_HAVE_MLOCKED_PAGE_BIT=y
 CONFIG_MMU_NOTIFIER=y
+# CONFIG_KSM is not set
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
+# CONFIG_MEMORY_FAILURE is not set
 # CONFIG_HIGHPTE is not set
+# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
 CONFIG_X86_RESERVE_LOW_64K=y
 CONFIG_MATH_EMULATION=y
 CONFIG_MTRR=y
 # CONFIG_MTRR_SANITIZER is not set
 # CONFIG_X86_PAT is not set
 # CONFIG_EFI is not set
-CONFIG_IRQBALANCE=y
 CONFIG_SECCOMP=y
+# CONFIG_CC_STACKPROTECTOR is not set
 CONFIG_HZ_100=y
 # CONFIG_HZ_250 is not set
 # CONFIG_HZ_300 is not set
 # CONFIG_HZ_1000 is not set
 CONFIG_HZ=100
-# CONFIG_SCHED_HRTICK is not set
+CONFIG_SCHED_HRTICK=y
 # CONFIG_KEXEC is not set
 # CONFIG_CRASH_DUMP is not set
-CONFIG_PHYSICAL_START=0x100000
+CONFIG_PHYSICAL_START=0x1000000
 # CONFIG_RELOCATABLE is not set
 CONFIG_PHYSICAL_ALIGN=0x100000
 CONFIG_HOTPLUG_CPU=y
 CONFIG_COMPAT_VDSO=y
+# CONFIG_CMDLINE_BOOL is not set
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 
 #
-# Power management options
+# Power management and ACPI options
 #
 CONFIG_PM=y
 # CONFIG_PM_DEBUG is not set
@@ -309,10 +362,12 @@ CONFIG_PM_SLEEP=y
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
 # CONFIG_HIBERNATION is not set
+# CONFIG_PM_RUNTIME is not set
 CONFIG_ACPI=y
 CONFIG_ACPI_SLEEP=y
 # CONFIG_ACPI_PROCFS is not set
 CONFIG_ACPI_PROCFS_POWER=y
+CONFIG_ACPI_POWER_METER=m
 CONFIG_ACPI_SYSFS_POWER=y
 CONFIG_ACPI_PROC_EVENT=y
 CONFIG_ACPI_AC=m
@@ -320,25 +375,20 @@ CONFIG_ACPI_BATTERY=m
 CONFIG_ACPI_BUTTON=m
 CONFIG_ACPI_VIDEO=m
 CONFIG_ACPI_FAN=m
-CONFIG_ACPI_DOCK=m
-CONFIG_ACPI_BAY=m
+CONFIG_ACPI_DOCK=y
 CONFIG_ACPI_PROCESSOR=m
 CONFIG_ACPI_HOTPLUG_CPU=y
+CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
 CONFIG_ACPI_THERMAL=m
-CONFIG_ACPI_WMI=m
-CONFIG_ACPI_ASUS=m
-CONFIG_ACPI_TOSHIBA=m
 CONFIG_ACPI_CUSTOM_DSDT_FILE=""
 # CONFIG_ACPI_CUSTOM_DSDT is not set
 CONFIG_ACPI_BLACKLIST_YEAR=0
 # CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_EC=y
 CONFIG_ACPI_PCI_SLOT=m
-CONFIG_ACPI_POWER=y
-CONFIG_ACPI_SYSTEM=y
 CONFIG_X86_PM_TIMER=y
 CONFIG_ACPI_CONTAINER=m
 CONFIG_ACPI_SBS=m
+# CONFIG_SFI is not set
 CONFIG_X86_APM_BOOT=y
 CONFIG_APM=m
 CONFIG_APM_IGNORE_USER_SUSPEND=y
@@ -346,7 +396,6 @@ CONFIG_APM_IGNORE_USER_SUSPEND=y
 CONFIG_APM_CPU_IDLE=y
 # CONFIG_APM_DISPLAY_BLANK is not set
 # CONFIG_APM_ALLOW_INTS is not set
-# CONFIG_APM_REAL_MODE_POWER_OFF is not set
 
 #
 # CPU Frequency scaling
@@ -375,7 +424,6 @@ CONFIG_X86_POWERNOW_K6=m
 CONFIG_X86_POWERNOW_K7=m
 CONFIG_X86_POWERNOW_K7_ACPI=y
 CONFIG_X86_POWERNOW_K8=m
-CONFIG_X86_POWERNOW_K8_ACPI=y
 CONFIG_X86_GX_SUSPMOD=m
 CONFIG_X86_SPEEDSTEP_CENTRINO=m
 CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y
@@ -390,11 +438,11 @@ CONFIG_X86_E_POWERSAVER=m
 #
 # shared options
 #
-# CONFIG_X86_ACPI_CPUFREQ_PROC_INTF is not set
 CONFIG_X86_SPEEDSTEP_LIB=m
 # CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK is not set
 CONFIG_CPU_IDLE=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_IDLE_GOV_MENU=y
 
 #
 # Bus options (PCI etc.)
@@ -409,13 +457,20 @@ CONFIG_PCI_BIOS=y
 CONFIG_PCI_DIRECT=y
 CONFIG_PCI_MMCONFIG=y
 CONFIG_PCI_DOMAINS=y
+CONFIG_DMAR=y
+CONFIG_DMAR_DEFAULT_ON=y
+CONFIG_DMAR_FLOPPY_WA=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCIEAER=y
+# CONFIG_PCIE_ECRC is not set
+# CONFIG_PCIEAER_INJECT is not set
 # CONFIG_PCIEASPM is not set
 CONFIG_ARCH_SUPPORTS_MSI=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_LEGACY=y
+CONFIG_PCI_STUB=m
 CONFIG_HT_IRQ=y
+CONFIG_PCI_IOV=y
 CONFIG_ISA_DMA_API=y
 CONFIG_ISA=y
 CONFIG_EISA=y
@@ -458,8 +513,11 @@ CONFIG_PCCARD_NONSTATIC=m
 # Executable file formats / Emulations
 #
 CONFIG_BINFMT_ELF=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_HAVE_AOUT=y
 # CONFIG_BINFMT_AOUT is not set
 # CONFIG_BINFMT_MISC is not set
+CONFIG_HAVE_ATOMIC_IOMAP=y
 CONFIG_NET=y
 
 #
@@ -502,7 +560,7 @@ CONFIG_INET_TUNNEL=m
 CONFIG_INET_XFRM_MODE_TRANSPORT=y
 CONFIG_INET_XFRM_MODE_TUNNEL=y
 CONFIG_INET_XFRM_MODE_BEET=y
-CONFIG_INET_LRO=m
+CONFIG_INET_LRO=y
 CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 CONFIG_TCP_CONG_ADVANCED=y
@@ -526,7 +584,6 @@ CONFIG_TCP_CONG_ILLINOIS=m
 CONFIG_DEFAULT_RENO=y
 CONFIG_DEFAULT_TCP_CONG="reno"
 # CONFIG_TCP_MD5SIG is not set
-# CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
 CONFIG_NETFILTER=y
@@ -558,19 +615,24 @@ CONFIG_NF_CONNTRACK_SANE=m
 CONFIG_NF_CONNTRACK_SIP=m
 CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NF_CT_NETLINK=m
+CONFIG_NETFILTER_TPROXY=m
 CONFIG_NETFILTER_XTABLES=m
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
 CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HL=m
+CONFIG_NETFILTER_XT_TARGET_LED=m
 CONFIG_NETFILTER_XT_TARGET_IMQ=m
 CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
 CONFIG_NETFILTER_XT_TARGET_RATEEST=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
 CONFIG_NETFILTER_XT_TARGET_TRACE=m
 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
 CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
@@ -579,21 +641,26 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
 CONFIG_NETFILTER_XT_MATCH_DCCP=m
 CONFIG_NETFILTER_XT_MATCH_DSCP=m
 CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_HL=m
 CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
 CONFIG_NETFILTER_XT_MATCH_MAC=m
 CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
 CONFIG_NETFILTER_XT_MATCH_OWNER=m
 CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
 CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
 CONFIG_NETFILTER_XT_MATCH_QUOTA=m
 CONFIG_NETFILTER_XT_MATCH_RATEEST=m
 CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT=y
 CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
 CONFIG_NETFILTER_XT_MATCH_STATE=m
 CONFIG_NETFILTER_XT_MATCH_LAYER7=m
 # CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG is not set
@@ -602,20 +669,21 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
 CONFIG_NETFILTER_XT_MATCH_TIME=m
 CONFIG_NETFILTER_XT_MATCH_U32=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
+# CONFIG_IP_VS is not set
 
 #
 # IP: Netfilter Configuration
 #
+CONFIG_NF_DEFRAG_IPV4=m
 CONFIG_NF_CONNTRACK_IPV4=m
 CONFIG_NF_CONNTRACK_PROC_COMPAT=y
 CONFIG_IP_NF_QUEUE=m
 CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_RECENT=m
-CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
 CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
 CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
 CONFIG_IP_NF_FILTER=m
 CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IP_NF_TARGET_LOG=m
@@ -623,8 +691,8 @@ CONFIG_IP_NF_TARGET_ULOG=m
 CONFIG_NF_NAT=m
 CONFIG_NF_NAT_NEEDED=y
 CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
 CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
 CONFIG_NF_NAT_SNMP_BASIC=m
 CONFIG_NF_NAT_PROTO_DCCP=m
 CONFIG_NF_NAT_PROTO_GRE=m
@@ -638,18 +706,14 @@ CONFIG_NF_NAT_PPTP=m
 CONFIG_NF_NAT_H323=m
 CONFIG_NF_NAT_SIP=m
 CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
 CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
 CONFIG_IP_NF_RAW=m
 CONFIG_IP_NF_ARPTABLES=m
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
 CONFIG_IP_NF_MATCH_IPP2P=m
-
-#
-# Bridge: Netfilter Configuration
-#
 CONFIG_BRIDGE_NF_EBTABLES=m
 CONFIG_BRIDGE_EBT_BROUTE=m
 CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -673,6 +737,9 @@ CONFIG_BRIDGE_EBT_ULOG=m
 CONFIG_BRIDGE_EBT_NFLOG=m
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_SCTP is not set
+CONFIG_RDS=m
+CONFIG_RDS_TCP=m
+# CONFIG_RDS_DEBUG is not set
 # CONFIG_TIPC is not set
 CONFIG_ATM=m
 CONFIG_ATM_CLIP=m
@@ -683,6 +750,15 @@ CONFIG_ATM_BR2684=m
 CONFIG_STP=m
 CONFIG_GARP=m
 CONFIG_BRIDGE=m
+CONFIG_NET_DSA=y
+CONFIG_NET_DSA_TAG_DSA=y
+CONFIG_NET_DSA_TAG_EDSA=y
+CONFIG_NET_DSA_TAG_TRAILER=y
+CONFIG_NET_DSA_MV88E6XXX=y
+CONFIG_NET_DSA_MV88E6060=y
+CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y
+CONFIG_NET_DSA_MV88E6131=y
+CONFIG_NET_DSA_MV88E6123_61_65=y
 CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_GVRP=y
 # CONFIG_DECNET is not set
@@ -694,6 +770,8 @@ CONFIG_LLC=m
 # CONFIG_LAPB is not set
 # CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
+CONFIG_PHONET=m
+CONFIG_IEEE802154=m
 CONFIG_NET_SCHED=y
 
 #
@@ -704,6 +782,7 @@ CONFIG_NET_SCH_HTB=m
 CONFIG_NET_SCH_HFSC=m
 CONFIG_NET_SCH_ATM=m
 CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_MULTIQ=m
 CONFIG_NET_SCH_RED=m
 CONFIG_NET_SCH_SFQ=m
 CONFIG_NET_SCH_TEQL=m
@@ -711,6 +790,7 @@ CONFIG_NET_SCH_TBF=m
 CONFIG_NET_SCH_GRED=m
 CONFIG_NET_SCH_DSMARK=m
 CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_DRR=m
 CONFIG_NET_SCH_INGRESS=m
 
 #
@@ -744,8 +824,10 @@ CONFIG_NET_ACT_IPT=m
 CONFIG_NET_ACT_NAT=m
 CONFIG_NET_ACT_PEDIT=m
 # CONFIG_NET_ACT_SIMP is not set
+CONFIG_NET_ACT_SKBEDIT=m
 CONFIG_NET_CLS_IND=y
 CONFIG_NET_SCH_FIFO=y
+# CONFIG_DCB is not set
 
 #
 # Network testing
@@ -828,37 +910,40 @@ CONFIG_BT_HCIBT3C=m
 CONFIG_BT_HCIBLUECARD=m
 CONFIG_BT_HCIBTUART=m
 CONFIG_BT_HCIVHCI=m
+CONFIG_BT_MRVL=m
+CONFIG_BT_MRVL_SDIO=m
 CONFIG_AF_RXRPC=m
 # CONFIG_AF_RXRPC_DEBUG is not set
 CONFIG_RXKAD=m
 CONFIG_FIB_RULES=y
-
-#
-# Wireless
-#
+CONFIG_WIRELESS=y
 CONFIG_CFG80211=m
-CONFIG_NL80211=y
+# CONFIG_NL80211_TESTMODE is not set
+# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
+# CONFIG_CFG80211_REG_DEBUG is not set
+# CONFIG_CFG80211_DEFAULT_PS is not set
+CONFIG_CFG80211_DEFAULT_PS_VALUE=0
+CONFIG_WIRELESS_OLD_REGULATORY=y
 CONFIG_WIRELESS_EXT=y
 CONFIG_WIRELESS_EXT_SYSFS=y
+CONFIG_LIB80211=m
+CONFIG_LIB80211_CRYPT_WEP=m
+CONFIG_LIB80211_CRYPT_CCMP=m
+CONFIG_LIB80211_CRYPT_TKIP=m
+# CONFIG_LIB80211_DEBUG is not set
 CONFIG_MAC80211=m
-
-#
-# Rate control algorithm selection
-#
-CONFIG_MAC80211_RC_PID=y
-CONFIG_MAC80211_RC_DEFAULT_PID=y
-CONFIG_MAC80211_RC_DEFAULT="pid"
+CONFIG_MAC80211_RC_MINSTREL=y
+# CONFIG_MAC80211_RC_DEFAULT_PID is not set
+CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT="minstrel"
 CONFIG_MAC80211_MESH=y
 CONFIG_MAC80211_LEDS=y
 # CONFIG_MAC80211_DEBUG_MENU is not set
-CONFIG_IEEE80211=m
-# CONFIG_IEEE80211_DEBUG is not set
-CONFIG_IEEE80211_CRYPT_WEP=m
-CONFIG_IEEE80211_CRYPT_CCMP=m
-CONFIG_IEEE80211_CRYPT_TKIP=m
+CONFIG_WIMAX=m
+CONFIG_WIMAX_DEBUG_LEVEL=8
 CONFIG_RFKILL=m
-CONFIG_RFKILL_INPUT=m
 CONFIG_RFKILL_LEDS=y
+CONFIG_RFKILL_INPUT=y
 # CONFIG_NET_9P is not set
 
 #
@@ -869,6 +954,7 @@ CONFIG_RFKILL_LEDS=y
 # Generic Driver Options
 #
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+# CONFIG_DEVTMPFS is not set
 # CONFIG_STANDALONE is not set
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
 CONFIG_FW_LOADER=y
@@ -878,6 +964,7 @@ CONFIG_EXTRA_FIRMWARE=""
 CONFIG_CONNECTOR=m
 CONFIG_MTD=m
 # CONFIG_MTD_DEBUG is not set
+CONFIG_MTD_TESTS=m
 CONFIG_MTD_CONCAT=m
 CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_REDBOOT_PARTS is not set
@@ -920,6 +1007,8 @@ CONFIG_MTD_CFI_I2=y
 # Mapping drivers for chip access
 #
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
+CONFIG_MTD_PHYSMAP=m
+# CONFIG_MTD_PHYSMAP_COMPAT is not set
 # CONFIG_MTD_TS5500 is not set
 # CONFIG_MTD_INTEL_VR_NOR is not set
 # CONFIG_MTD_PLATRAM is not set
@@ -942,6 +1031,12 @@ CONFIG_MTD_CFI_I2=y
 # CONFIG_MTD_NAND is not set
 # CONFIG_MTD_ONENAND is not set
 
+#
+# LPDDR flash memory drivers
+#
+CONFIG_MTD_LPDDR=m
+CONFIG_MTD_QINFO_PROBE=m
+
 #
 # UBI - Unsorted block images
 #
@@ -965,7 +1060,7 @@ CONFIG_PARPORT_AX88796=m
 CONFIG_PARPORT_1284=y
 CONFIG_PARPORT_NOT_PC=y
 CONFIG_PNP=y
-# CONFIG_PNP_DEBUG is not set
+# CONFIG_PNP_DEBUG_MESSAGES is not set
 
 #
 # Protocols
@@ -987,6 +1082,7 @@ CONFIG_BLK_DEV_DAC960=m
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_CRYPTOLOOP=m
 CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_OSD=m
 CONFIG_BLK_DEV_SX8=m
 # CONFIG_BLK_DEV_UB is not set
 CONFIG_BLK_DEV_RAM=y
@@ -1000,47 +1096,45 @@ CONFIG_VIRTIO_BLK=m
 CONFIG_MISC_DEVICES=y
 # CONFIG_IBM_ASM is not set
 # CONFIG_PHANTOM is not set
-CONFIG_EEPROM_93CX6=m
 # CONFIG_SGI_IOC4 is not set
 CONFIG_TIFM_CORE=m
 CONFIG_TIFM_7XX1=m
-CONFIG_ACER_WMI=m
-CONFIG_ASUS_LAPTOP=m
-CONFIG_FUJITSU_LAPTOP=m
-CONFIG_FUJITSU_LAPTOP_DEBUG=y
-CONFIG_TC1100_WMI=m
-CONFIG_HP_WMI=m
-CONFIG_MSI_LAPTOP=m
-CONFIG_COMPAL_LAPTOP=m
-CONFIG_SONY_LAPTOP=m
-# CONFIG_SONYPI_COMPAT is not set
-CONFIG_THINKPAD_ACPI=m
-# CONFIG_THINKPAD_ACPI_DEBUG is not set
-CONFIG_THINKPAD_ACPI_VIDEO=y
-CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
-CONFIG_INTEL_MENLOW=m
-CONFIG_EEEPC_LAPTOP=m
+CONFIG_ICS932S401=m
 CONFIG_ENCLOSURE_SERVICES=m
 CONFIG_HP_ILO=m
+CONFIG_ISL29003=m
+CONFIG_C2PORT=m
+CONFIG_C2PORT_DURAMAR_2150=m
+
+#
+# EEPROM support
+#
+CONFIG_EEPROM_AT24=m
+CONFIG_EEPROM_LEGACY=m
+CONFIG_EEPROM_MAX6875=m
+CONFIG_EEPROM_93CX6=m
+CONFIG_CB710_CORE=m
+# CONFIG_CB710_DEBUG is not set
+CONFIG_CB710_DEBUG_ASSUMPTIONS=y
 CONFIG_HAVE_IDE=y
 CONFIG_IDE=y
-CONFIG_BLK_DEV_IDE=m
 
 #
 # Please see Documentation/ide/ide.txt for help/info on IDE drives
 #
+CONFIG_IDE_XFER_MODE=y
 CONFIG_IDE_TIMINGS=y
 CONFIG_IDE_ATAPI=y
+CONFIG_IDE_LEGACY=y
 # CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_BLK_DEV_IDEDISK=m
-# CONFIG_IDEDISK_MULTI_MODE is not set
+CONFIG_IDE_GD=m
+CONFIG_IDE_GD_ATA=y
+# CONFIG_IDE_GD_ATAPI is not set
 CONFIG_BLK_DEV_IDECS=m
 CONFIG_BLK_DEV_DELKIN=m
 CONFIG_BLK_DEV_IDECD=m
 CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
 # CONFIG_BLK_DEV_IDETAPE is not set
-CONFIG_BLK_DEV_IDEFLOPPY=m
-# CONFIG_BLK_DEV_IDESCSI is not set
 CONFIG_BLK_DEV_IDEACPI=y
 # CONFIG_IDE_TASK_IOCTL is not set
 CONFIG_IDE_PROC_FS=y
@@ -1059,6 +1153,7 @@ CONFIG_BLK_DEV_IDEDMA_SFF=y
 # PCI IDE chipsets support
 #
 CONFIG_BLK_DEV_IDEPCI=y
+CONFIG_IDEPCI_PCIBUS_ORDER=y
 # CONFIG_BLK_DEV_OFFBOARD is not set
 CONFIG_BLK_DEV_GENERIC=m
 CONFIG_BLK_DEV_OPTI621=m
@@ -1073,10 +1168,12 @@ CONFIG_BLK_DEV_TRIFLEX=m
 CONFIG_BLK_DEV_CS5520=m
 CONFIG_BLK_DEV_CS5530=m
 CONFIG_BLK_DEV_CS5535=m
+CONFIG_BLK_DEV_CS5536=m
 CONFIG_BLK_DEV_HPT366=m
 CONFIG_BLK_DEV_JMICRON=m
 CONFIG_BLK_DEV_SC1200=m
 CONFIG_BLK_DEV_PIIX=m
+CONFIG_BLK_DEV_IT8172=m
 CONFIG_BLK_DEV_IT8213=m
 CONFIG_BLK_DEV_IT821X=m
 CONFIG_BLK_DEV_NS87415=m
@@ -1126,10 +1223,6 @@ CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=m
 CONFIG_CHR_DEV_SCH=m
 CONFIG_SCSI_ENCLOSURE=m
-
-#
-# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-#
 CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
@@ -1150,6 +1243,9 @@ CONFIG_SCSI_SAS_LIBSAS_DEBUG=y
 CONFIG_SCSI_SRP_ATTRS=m
 CONFIG_SCSI_LOWLEVEL=y
 CONFIG_ISCSI_TCP=m
+CONFIG_SCSI_CXGB3_ISCSI=m
+CONFIG_SCSI_BNX2_ISCSI=m
+CONFIG_BE2ISCSI=m
 CONFIG_BLK_DEV_3W_XXXX_RAID=m
 CONFIG_SCSI_3W_9XXX=m
 CONFIG_SCSI_7000FASST=m
@@ -1175,6 +1271,8 @@ CONFIG_AIC79XX_DEBUG_MASK=0
 # CONFIG_AIC79XX_REG_PRETTY_PRINT is not set
 CONFIG_SCSI_AIC94XX=m
 # CONFIG_AIC94XX_DEBUG is not set
+CONFIG_SCSI_MVSAS=m
+CONFIG_SCSI_MVSAS_DEBUG=y
 CONFIG_SCSI_DPT_I2O=m
 CONFIG_SCSI_ADVANSYS=m
 CONFIG_SCSI_IN2000=m
@@ -1185,9 +1283,16 @@ CONFIG_MEGARAID_MM=m
 CONFIG_MEGARAID_MAILBOX=m
 CONFIG_MEGARAID_LEGACY=m
 CONFIG_MEGARAID_SAS=m
+CONFIG_SCSI_MPT2SAS=m
+CONFIG_SCSI_MPT2SAS_MAX_SGE=128
+# CONFIG_SCSI_MPT2SAS_LOGGING is not set
 CONFIG_SCSI_HPTIOP=m
 CONFIG_SCSI_BUSLOGIC=m
 CONFIG_SCSI_FLASHPOINT=y
+CONFIG_LIBFC=m
+CONFIG_LIBFCOE=m
+CONFIG_FCOE=m
+CONFIG_FCOE_FNIC=m
 CONFIG_SCSI_DMX3191D=m
 CONFIG_SCSI_DTC3280=m
 CONFIG_SCSI_EATA=m
@@ -1210,7 +1315,6 @@ CONFIG_SCSI_PPA=m
 CONFIG_SCSI_IMM=m
 # CONFIG_SCSI_IZIP_EPP16 is not set
 # CONFIG_SCSI_IZIP_SLOW_CTR is not set
-CONFIG_SCSI_MVSAS=m
 CONFIG_SCSI_NCR53C406A=m
 CONFIG_SCSI_NCR_D700=m
 CONFIG_SCSI_STEX=m
@@ -1244,7 +1348,9 @@ CONFIG_SCSI_U14_34F_MAX_TAGS=8
 CONFIG_SCSI_ULTRASTOR=m
 CONFIG_SCSI_NSP32=m
 # CONFIG_SCSI_DEBUG is not set
+CONFIG_SCSI_PMCRAID=m
 # CONFIG_SCSI_SRP is not set
+CONFIG_SCSI_BFA_FC=m
 CONFIG_SCSI_LOWLEVEL_PCMCIA=y
 CONFIG_PCMCIA_AHA152X=m
 CONFIG_PCMCIA_FDOMAIN=m
@@ -1256,8 +1362,13 @@ CONFIG_SCSI_DH_RDAC=m
 CONFIG_SCSI_DH_HP_SW=m
 CONFIG_SCSI_DH_EMC=m
 CONFIG_SCSI_DH_ALUA=m
+CONFIG_SCSI_OSD_INITIATOR=m
+CONFIG_SCSI_OSD_ULD=m
+CONFIG_SCSI_OSD_DPRINT_SENSE=1
+# CONFIG_SCSI_OSD_DEBUG is not set
 CONFIG_ATA=m
 # CONFIG_ATA_NONSTANDARD is not set
+CONFIG_ATA_VERBOSE_ERROR=y
 CONFIG_ATA_ACPI=y
 CONFIG_SATA_PMP=y
 CONFIG_SATA_AHCI=m
@@ -1281,6 +1392,7 @@ CONFIG_PATA_ACPI=m
 CONFIG_PATA_ALI=m
 CONFIG_PATA_AMD=m
 CONFIG_PATA_ARTOP=m
+CONFIG_PATA_ATP867X=m
 CONFIG_PATA_ATIIXP=m
 CONFIG_PATA_CMD640_PCI=m
 CONFIG_PATA_CMD64X=m
@@ -1315,6 +1427,7 @@ CONFIG_PATA_PCMCIA=m
 CONFIG_PATA_PDC_OLD=m
 CONFIG_PATA_QDI=m
 CONFIG_PATA_RADISYS=m
+CONFIG_PATA_RDC=m
 CONFIG_PATA_RZ1000=m
 CONFIG_PATA_SC1200=m
 CONFIG_PATA_SERVERWORKS=m
@@ -1332,7 +1445,9 @@ CONFIG_MD_RAID0=m
 CONFIG_MD_RAID1=m
 CONFIG_MD_RAID10=m
 CONFIG_MD_RAID456=m
-CONFIG_MD_RAID5_RESHAPE=y
+CONFIG_MULTICORE_RAID456=y
+CONFIG_MD_RAID6_PQ=m
+CONFIG_ASYNC_RAID6_TEST=m
 CONFIG_MD_MULTIPATH=m
 # CONFIG_MD_FAULTY is not set
 CONFIG_BLK_DEV_DM=m
@@ -1340,8 +1455,11 @@ CONFIG_BLK_DEV_DM=m
 CONFIG_DM_CRYPT=m
 CONFIG_DM_SNAPSHOT=m
 CONFIG_DM_MIRROR=m
+CONFIG_DM_LOG_USERSPACE=m
 CONFIG_DM_ZERO=m
 CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_QL=m
+CONFIG_DM_MULTIPATH_ST=m
 CONFIG_DM_DELAY=m
 CONFIG_DM_UEVENT=y
 CONFIG_FUSION=y
@@ -1357,12 +1475,17 @@ CONFIG_FUSION_CTL=m
 #
 
 #
-# Enable only one of the two stacks, unless you know what you are doing
+# You can enable one or both FireWire driver stacks.
+#
+
+#
+# See the help texts for more information.
 #
 CONFIG_FIREWIRE=m
 CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_OHCI_DEBUG=y
 CONFIG_FIREWIRE_SBP2=m
+CONFIG_FIREWIRE_NET=m
 CONFIG_IEEE1394=m
 CONFIG_IEEE1394_OHCI1394=m
 CONFIG_IEEE1394_PCILYNX=m
@@ -1392,7 +1515,7 @@ CONFIG_TUN=m
 CONFIG_VETH=m
 CONFIG_NET_SB1000=m
 # CONFIG_ARCNET is not set
-CONFIG_PHYLIB=m
+CONFIG_PHYLIB=y
 
 #
 # MII PHY device drivers
@@ -1407,6 +1530,10 @@ CONFIG_SMSC_PHY=m
 CONFIG_BROADCOM_PHY=m
 CONFIG_ICPLUS_PHY=m
 CONFIG_REALTEK_PHY=m
+CONFIG_NATIONAL_PHY=m
+CONFIG_STE10XP=m
+CONFIG_LSI_ET1011C_PHY=m
+# CONFIG_FIXED_PHY is not set
 CONFIG_MDIO_BITBANG=m
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=m
@@ -1431,11 +1558,14 @@ CONFIG_ULTRAMCA=m
 CONFIG_ULTRA=m
 CONFIG_ULTRA32=m
 CONFIG_SMC9194=m
+CONFIG_ETHOC=m
 CONFIG_NET_VENDOR_RACAL=y
 CONFIG_NI52=m
 CONFIG_NI65=m
+CONFIG_DNET=m
 CONFIG_NET_TULIP=y
 CONFIG_DE2104X=m
+CONFIG_DE2104X_DSL=0
 CONFIG_TULIP=m
 # CONFIG_TULIP_MWI is not set
 # CONFIG_TULIP_MMIO is not set
@@ -1466,6 +1596,9 @@ CONFIG_IBMLANA=m
 # CONFIG_IBM_NEW_EMAC_RGMII is not set
 # CONFIG_IBM_NEW_EMAC_TAH is not set
 # CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
 CONFIG_NET_PCI=y
 CONFIG_PCNET32=m
 CONFIG_AMD8111_ETH=m
@@ -1479,7 +1612,6 @@ CONFIG_B44_PCI=y
 CONFIG_FORCEDETH=m
 # CONFIG_FORCEDETH_NAPI is not set
 CONFIG_CS89x0=m
-CONFIG_EEPRO100=m
 CONFIG_E100=m
 CONFIG_LNE390=m
 CONFIG_FEALNX=m
@@ -1496,9 +1628,12 @@ CONFIG_8139TOO_8129=y
 CONFIG_R6040=m
 CONFIG_SIS900=m
 CONFIG_EPIC100=m
+CONFIG_SMSC9420=m
 CONFIG_SUNDANCE=m
 CONFIG_SUNDANCE_MMIO=y
 CONFIG_TLAN=m
+CONFIG_KS8842=m
+CONFIG_KS8851_MLL=m
 CONFIG_VIA_RHINE=m
 CONFIG_VIA_RHINE_MMIO=y
 CONFIG_SC92031=m
@@ -1506,16 +1641,17 @@ CONFIG_NET_POCKET=y
 CONFIG_ATP=m
 CONFIG_DE600=m
 CONFIG_DE620=m
+CONFIG_ATL2=m
 CONFIG_NETDEV_1000=y
 CONFIG_ACENIC=m
 # CONFIG_ACENIC_OMIT_TIGON_I is not set
 CONFIG_DL2K=m
 CONFIG_E1000=m
-# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
 CONFIG_E1000E=m
 CONFIG_IP1000=m
 CONFIG_IGB=m
-# CONFIG_IGB_LRO is not set
+CONFIG_IGB_DCA=y
+CONFIG_IGBVF=m
 CONFIG_NS83820=m
 CONFIG_HAMACHI=m
 CONFIG_YELLOWFIN=m
@@ -1527,71 +1663,159 @@ CONFIG_SKY2=m
 CONFIG_VIA_VELOCITY=m
 CONFIG_TIGON3=m
 CONFIG_BNX2=m
+CONFIG_CNIC=m
 CONFIG_QLA3XXX=m
 CONFIG_ATL1=m
 CONFIG_ATL1E=m
+CONFIG_ATL1C=m
+CONFIG_JME=m
 CONFIG_NETDEV_10000=y
+CONFIG_MDIO=m
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T1_1G=y
+CONFIG_CHELSIO_T3_DEPENDS=y
 CONFIG_CHELSIO_T3=m
+CONFIG_ENIC=m
 CONFIG_IXGBE=m
+CONFIG_IXGBE_DCA=y
 CONFIG_IXGB=m
 CONFIG_S2IO=m
+CONFIG_VXGE=m
+# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
 CONFIG_MYRI10GE=m
+CONFIG_MYRI10GE_DCA=y
 CONFIG_NETXEN_NIC=m
 CONFIG_NIU=m
-# CONFIG_MLX4_CORE is not set
+CONFIG_MLX4_EN=m
+CONFIG_MLX4_CORE=m
+CONFIG_MLX4_DEBUG=y
 CONFIG_TEHUTI=m
 CONFIG_BNX2X=m
+CONFIG_QLGE=m
 CONFIG_SFC=m
+CONFIG_SFC_MTD=y
+CONFIG_BE2NET=m
 # CONFIG_TR is not set
-
-#
-# Wireless LAN
-#
+CONFIG_WLAN=y
 # CONFIG_WLAN_PRE80211 is not set
 CONFIG_WLAN_80211=y
 CONFIG_PCMCIA_RAYCS=m
-# CONFIG_IPW2100 is not set
-# CONFIG_IPW2200 is not set
-# CONFIG_LIBERTAS is not set
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_USB=m
+CONFIG_LIBERTAS_CS=m
+CONFIG_LIBERTAS_SDIO=m
+# CONFIG_LIBERTAS_DEBUG is not set
+CONFIG_LIBERTAS_THINFIRM=m
+CONFIG_LIBERTAS_THINFIRM_USB=m
 CONFIG_AIRO=m
-CONFIG_HERMES=m
-CONFIG_PLX_HERMES=m
-CONFIG_TMD_HERMES=m
-CONFIG_NORTEL_HERMES=m
-CONFIG_PCI_HERMES=m
-CONFIG_PCMCIA_HERMES=m
-CONFIG_PCMCIA_SPECTRUM=m
 CONFIG_ATMEL=m
 CONFIG_PCI_ATMEL=m
 CONFIG_PCMCIA_ATMEL=m
+CONFIG_AT76C50X_USB=m
 CONFIG_AIRO_CS=m
 CONFIG_PCMCIA_WL3501=m
 CONFIG_PRISM54=m
 CONFIG_USB_ZD1201=m
 CONFIG_USB_NET_RNDIS_WLAN=m
-# CONFIG_RTL8180 is not set
-# CONFIG_RTL8187 is not set
-# CONFIG_ADM8211 is not set
+CONFIG_RTL8180=m
+CONFIG_RTL8187=m
+CONFIG_RTL8187_LEDS=y
+CONFIG_ADM8211=m
 # CONFIG_MAC80211_HWSIM is not set
-# CONFIG_P54_COMMON is not set
-# CONFIG_ATH5K is not set
-# CONFIG_ATH9K is not set
-# CONFIG_IWLCORE is not set
+CONFIG_MWL8K=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+CONFIG_P54_LEDS=y
+CONFIG_ATH_COMMON=m
+CONFIG_ATH5K=m
+# CONFIG_ATH5K_DEBUG is not set
+CONFIG_ATH9K=m
+# CONFIG_ATH9K_DEBUG is not set
+CONFIG_AR9170_USB=m
+CONFIG_AR9170_LEDS=y
+CONFIG_IPW2100=m
+# CONFIG_IPW2100_MONITOR is not set
+# CONFIG_IPW2100_DEBUG is not set
+CONFIG_IPW2200=m
+# CONFIG_IPW2200_MONITOR is not set
+# CONFIG_IPW2200_QOS is not set
+# CONFIG_IPW2200_DEBUG is not set
+CONFIG_LIBIPW=m
+# CONFIG_LIBIPW_DEBUG is not set
+CONFIG_IWLWIFI=m
 # CONFIG_IWLWIFI_LEDS is not set
-# CONFIG_IWLAGN is not set
-# CONFIG_IWL3945 is not set
+# CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT is not set
+# CONFIG_IWLWIFI_DEBUG is not set
+CONFIG_IWLAGN=m
+CONFIG_IWL4965=y
+CONFIG_IWL5000=y
+CONFIG_IWL3945=m
+# CONFIG_IWL3945_SPECTRUM_MEASUREMENT is not set
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
 # CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
 CONFIG_HOSTAP_PLX=m
 CONFIG_HOSTAP_PCI=m
 CONFIG_HOSTAP_CS=m
-# CONFIG_B43 is not set
-# CONFIG_B43LEGACY is not set
-# CONFIG_ZD1211RW is not set
-# CONFIG_RT2X00 is not set
+CONFIG_B43=m
+CONFIG_B43_PCI_AUTOSELECT=y
+CONFIG_B43_PCICORE_AUTOSELECT=y
+CONFIG_B43_PCMCIA=y
+CONFIG_B43_SDIO=y
+CONFIG_B43_PIO=y
+CONFIG_B43_PHY_LP=y
+CONFIG_B43_LEDS=y
+CONFIG_B43_HWRNG=y
+# CONFIG_B43_DEBUG is not set
+CONFIG_B43LEGACY=m
+CONFIG_B43LEGACY_PCI_AUTOSELECT=y
+CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
+CONFIG_B43LEGACY_LEDS=y
+CONFIG_B43LEGACY_HWRNG=y
+CONFIG_B43LEGACY_DEBUG=y
+CONFIG_B43LEGACY_DMA=y
+CONFIG_B43LEGACY_PIO=y
+CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
+# CONFIG_B43LEGACY_DMA_MODE is not set
+# CONFIG_B43LEGACY_PIO_MODE is not set
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_RT2X00=m
+CONFIG_RT2400PCI=m
+CONFIG_RT2500PCI=m
+CONFIG_RT61PCI=m
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+CONFIG_RT2X00_LIB_PCI=m
+CONFIG_RT2X00_LIB_USB=m
+CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_HT=y
+CONFIG_RT2X00_LIB_FIRMWARE=y
+CONFIG_RT2X00_LIB_CRYPTO=y
+CONFIG_RT2X00_LIB_LEDS=y
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_HERMES=m
+CONFIG_HERMES_CACHE_FW_ON_INIT=y
+CONFIG_PLX_HERMES=m
+CONFIG_TMD_HERMES=m
+CONFIG_NORTEL_HERMES=m
+CONFIG_PCI_HERMES=m
+CONFIG_PCMCIA_HERMES=m
+CONFIG_PCMCIA_SPECTRUM=m
+CONFIG_WL12XX=m
+CONFIG_WL1251=m
+CONFIG_WL1251_SDIO=m
+CONFIG_IWM=m
+
+#
+# WiMAX Wireless Broadband devices
+#
+CONFIG_WIMAX_I2400M=m
+CONFIG_WIMAX_I2400M_USB=m
+CONFIG_WIMAX_I2400M_SDIO=m
+CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
 
 #
 # USB Network Adapters
@@ -1603,7 +1827,9 @@ CONFIG_USB_RTL8150=m
 CONFIG_USB_USBNET=m
 CONFIG_USB_NET_AX8817X=m
 CONFIG_USB_NET_CDCETHER=m
+CONFIG_USB_NET_CDC_EEM=m
 CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SMSC95XX=m
 CONFIG_USB_NET_GL620A=m
 CONFIG_USB_NET_NET1080=m
 CONFIG_USB_NET_PLUSB=m
@@ -1618,6 +1844,8 @@ CONFIG_USB_EPSON2888=y
 CONFIG_USB_KC2190=y
 CONFIG_USB_NET_ZAURUS=m
 CONFIG_USB_HSO=m
+CONFIG_USB_NET_INT51X1=m
+CONFIG_USB_CDC_PHONET=m
 CONFIG_NET_PCMCIA=y
 CONFIG_PCMCIA_3C589=m
 CONFIG_PCMCIA_3C574=m
@@ -1627,7 +1855,36 @@ CONFIG_PCMCIA_NMCLAN=m
 CONFIG_PCMCIA_SMC91C92=m
 CONFIG_PCMCIA_XIRC2PS=m
 CONFIG_PCMCIA_AXNET=m
-# CONFIG_WAN is not set
+CONFIG_WAN=y
+CONFIG_HOSTESS_SV11=m
+CONFIG_COSA=m
+CONFIG_LANMEDIA=m
+CONFIG_SEALEVEL_4021=m
+CONFIG_HDLC=m
+CONFIG_HDLC_RAW=m
+CONFIG_HDLC_RAW_ETH=m
+CONFIG_HDLC_CISCO=m
+CONFIG_HDLC_FR=m
+CONFIG_HDLC_PPP=m
+
+#
+# X.25/LAPB support is disabled
+#
+CONFIG_PCI200SYN=m
+CONFIG_WANXL=m
+# CONFIG_WANXL_BUILD_FIRMWARE is not set
+CONFIG_PC300TOO=m
+CONFIG_N2=m
+CONFIG_C101=m
+CONFIG_FARSYNC=m
+CONFIG_DSCC4=m
+CONFIG_DSCC4_PCISYNC=y
+CONFIG_DSCC4_PCI_RST=y
+CONFIG_DLCI=m
+CONFIG_DLCI_MAX=8
+CONFIG_SDLA=m
+CONFIG_SBNI=m
+CONFIG_SBNI_MULTILINE=y
 CONFIG_ATM_DRIVERS=y
 # CONFIG_ATM_DUMMY is not set
 CONFIG_ATM_TCP=m
@@ -1665,6 +1922,9 @@ CONFIG_ATM_FORE200E_TX_RETRY=16
 CONFIG_ATM_FORE200E_DEBUG=0
 CONFIG_ATM_HE=m
 CONFIG_ATM_HE_USE_SUNI=y
+CONFIG_ATM_SOLOS=m
+CONFIG_IEEE802154_DRIVERS=m
+CONFIG_IEEE802154_FAKEHARD=m
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
 # CONFIG_PLIP is not set
@@ -1689,7 +1949,9 @@ CONFIG_SLIP_MODE_SLIP6=y
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
 CONFIG_VIRTIO_NET=m
+CONFIG_VMXNET3=m
 CONFIG_ISDN=y
+CONFIG_ISDN_I4L=m
 CONFIG_MISDN=m
 CONFIG_MISDN_DSP=m
 CONFIG_MISDN_L1OIP=m
@@ -1699,7 +1961,107 @@ CONFIG_MISDN_L1OIP=m
 #
 CONFIG_MISDN_HFCPCI=m
 CONFIG_MISDN_HFCMULTI=m
-# CONFIG_ISDN_I4L is not set
+CONFIG_MISDN_HFCUSB=m
+CONFIG_MISDN_AVMFRITZ=m
+CONFIG_MISDN_SPEEDFAX=m
+CONFIG_MISDN_INFINEON=m
+CONFIG_MISDN_W6692=m
+CONFIG_MISDN_NETJET=m
+CONFIG_MISDN_IPAC=m
+CONFIG_MISDN_ISAR=m
+CONFIG_ISDN_PPP=y
+CONFIG_ISDN_PPP_VJ=y
+CONFIG_ISDN_MPP=y
+CONFIG_IPPP_FILTER=y
+CONFIG_ISDN_PPP_BSDCOMP=m
+CONFIG_ISDN_AUDIO=y
+CONFIG_ISDN_TTY_FAX=y
+
+#
+# ISDN feature submodules
+#
+CONFIG_ISDN_DIVERSION=m
+
+#
+# ISDN4Linux hardware drivers
+#
+
+#
+# Passive cards
+#
+CONFIG_ISDN_DRV_HISAX=m
+
+#
+# D-channel protocol features
+#
+CONFIG_HISAX_EURO=y
+CONFIG_DE_AOC=y
+# CONFIG_HISAX_NO_SENDCOMPLETE is not set
+# CONFIG_HISAX_NO_LLC is not set
+# CONFIG_HISAX_NO_KEYPAD is not set
+CONFIG_HISAX_1TR6=y
+CONFIG_HISAX_NI1=y
+CONFIG_HISAX_MAX_CARDS=8
+
+#
+# HiSax supported cards
+#
+CONFIG_HISAX_16_0=y
+CONFIG_HISAX_16_3=y
+CONFIG_HISAX_TELESPCI=y
+CONFIG_HISAX_S0BOX=y
+CONFIG_HISAX_AVM_A1=y
+CONFIG_HISAX_FRITZPCI=y
+CONFIG_HISAX_AVM_A1_PCMCIA=y
+CONFIG_HISAX_ELSA=y
+CONFIG_HISAX_IX1MICROR2=y
+CONFIG_HISAX_DIEHLDIVA=y
+CONFIG_HISAX_ASUSCOM=y
+CONFIG_HISAX_TELEINT=y
+CONFIG_HISAX_HFCS=y
+CONFIG_HISAX_SEDLBAUER=y
+CONFIG_HISAX_SPORTSTER=y
+CONFIG_HISAX_MIC=y
+CONFIG_HISAX_NETJET=y
+CONFIG_HISAX_NETJET_U=y
+CONFIG_HISAX_NICCY=y
+CONFIG_HISAX_ISURF=y
+CONFIG_HISAX_HSTSAPHIR=y
+CONFIG_HISAX_BKM_A4T=y
+CONFIG_HISAX_SCT_QUADRO=y
+CONFIG_HISAX_GAZEL=y
+CONFIG_HISAX_HFC_PCI=y
+CONFIG_HISAX_W6692=y
+CONFIG_HISAX_HFC_SX=y
+CONFIG_HISAX_ENTERNOW_PCI=y
+CONFIG_HISAX_DEBUG=y
+
+#
+# HiSax PCMCIA card service modules
+#
+CONFIG_HISAX_SEDLBAUER_CS=m
+CONFIG_HISAX_ELSA_CS=m
+CONFIG_HISAX_AVM_A1_CS=m
+CONFIG_HISAX_TELES_CS=m
+
+#
+# HiSax sub driver modules
+#
+CONFIG_HISAX_ST5481=m
+CONFIG_HISAX_HFCUSB=m
+CONFIG_HISAX_HFC4S8S=m
+CONFIG_HISAX_FRITZ_PCIPNP=m
+
+#
+# Active cards
+#
+CONFIG_ISDN_DRV_ICN=m
+CONFIG_ISDN_DRV_PCBIT=m
+CONFIG_ISDN_DRV_SC=m
+CONFIG_ISDN_DRV_ACT2000=m
+CONFIG_HYSDN=m
+CONFIG_HYSDN_CAPI=y
+CONFIG_ISDN_HDLC=m
 CONFIG_ISDN_CAPI=m
 CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
 CONFIG_CAPI_TRACE=y
@@ -1707,6 +2069,7 @@ CONFIG_ISDN_CAPI_MIDDLEWARE=y
 CONFIG_ISDN_CAPI_CAPI20=m
 CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
 CONFIG_ISDN_CAPI_CAPIFS=m
+CONFIG_ISDN_CAPI_CAPIDRV=m
 
 #
 # CAPI hardware drivers
@@ -1727,13 +2090,18 @@ CONFIG_ISDN_DIVAS_PRIPCI=y
 CONFIG_ISDN_DIVAS_DIVACAPI=m
 CONFIG_ISDN_DIVAS_USERIDI=m
 CONFIG_ISDN_DIVAS_MAINT=m
+CONFIG_ISDN_DRV_GIGASET=m
+CONFIG_GIGASET_BASE=m
+CONFIG_GIGASET_M105=m
+CONFIG_GIGASET_M101=m
+# CONFIG_GIGASET_DEBUG is not set
 # CONFIG_PHONE is not set
 
 #
 # Input device support
 #
 CONFIG_INPUT=y
-# CONFIG_INPUT_FF_MEMLESS is not set
+CONFIG_INPUT_FF_MEMLESS=m
 CONFIG_INPUT_POLLDEV=m
 
 #
@@ -1751,18 +2119,23 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 # Input Device Drivers
 #
 CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ADP5588=m
 CONFIG_KEYBOARD_ATKBD=y
-CONFIG_KEYBOARD_SUNKBD=m
+CONFIG_QT2160=m
 CONFIG_KEYBOARD_LKKBD=m
-CONFIG_KEYBOARD_XTKBD=m
+CONFIG_KEYBOARD_LM8323=m
+CONFIG_KEYBOARD_MAX7359=m
 CONFIG_KEYBOARD_NEWTON=m
+CONFIG_KEYBOARD_OPENCORES=m
 CONFIG_KEYBOARD_STOWAWAY=m
+CONFIG_KEYBOARD_SUNKBD=m
+CONFIG_KEYBOARD_XTKBD=m
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
 # CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 CONFIG_INPUT_MISC=y
-CONFIG_INPUT_PCSPKR=y
+CONFIG_INPUT_PCSPKR=m
 CONFIG_INPUT_APANEL=m
 # CONFIG_INPUT_WISTRON_BTNS is not set
 # CONFIG_INPUT_ATLAS_BTNS is not set
@@ -1771,7 +2144,11 @@ CONFIG_INPUT_ATI_REMOTE2=m
 CONFIG_INPUT_KEYSPAN_REMOTE=m
 CONFIG_INPUT_POWERMATE=m
 CONFIG_INPUT_YEALINK=m
+CONFIG_INPUT_CM109=m
 # CONFIG_INPUT_UINPUT is not set
+CONFIG_INPUT_WINBOND_CIR=m
+CONFIG_INPUT_PCF50633_PMU=m
+CONFIG_INPUT_WM831X_ON=m
 
 #
 # Hardware I/O ports
@@ -1828,6 +2205,7 @@ CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_JSM is not set
 CONFIG_UNIX98_PTYS=y
+# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_PRINTER=m
 # CONFIG_LP_CONSOLE is not set
@@ -1842,6 +2220,7 @@ CONFIG_IPMI_SI=m
 CONFIG_IPMI_WATCHDOG=m
 CONFIG_IPMI_POWEROFF=m
 CONFIG_HW_RANDOM=m
+CONFIG_HW_RANDOM_TIMERIOMEM=m
 CONFIG_HW_RANDOM_INTEL=m
 CONFIG_HW_RANDOM_AMD=m
 CONFIG_HW_RANDOM_GEODE=m
@@ -1874,6 +2253,7 @@ CONFIG_HANGCHECK_TIMER=m
 CONFIG_DEVPORT=y
 CONFIG_I2C=m
 CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_COMPAT=y
 CONFIG_I2C_CHARDEV=m
 CONFIG_I2C_HELPER_AUTO=y
 CONFIG_I2C_ALGOBIT=m
@@ -1903,6 +2283,11 @@ CONFIG_I2C_SIS96X=m
 CONFIG_I2C_VIA=m
 CONFIG_I2C_VIAPRO=m
 
+#
+# ACPI drivers
+#
+CONFIG_I2C_SCMI=m
+
 #
 # I2C system bus drivers (mostly embedded / system-on-chip)
 #
@@ -1935,19 +2320,18 @@ CONFIG_SCx200_ACB=m
 # Miscellaneous I2C Chip support
 #
 CONFIG_DS1682=m
-CONFIG_AT24=m
-CONFIG_SENSORS_EEPROM=m
-CONFIG_SENSORS_PCF8574=m
-CONFIG_PCF8575=m
-CONFIG_SENSORS_PCA9539=m
-CONFIG_SENSORS_PCF8591=m
-CONFIG_SENSORS_MAX6875=m
 CONFIG_SENSORS_TSL2550=m
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
 # CONFIG_I2C_DEBUG_CHIP is not set
 # CONFIG_SPI is not set
+
+#
+# PPS support
+#
+CONFIG_PPS=m
+# CONFIG_PPS_DEBUG is not set
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 # CONFIG_GPIOLIB is not set
 CONFIG_W1=m
@@ -1965,15 +2349,28 @@ CONFIG_W1_MASTER_DS2482=m
 #
 CONFIG_W1_SLAVE_THERM=m
 CONFIG_W1_SLAVE_SMEM=m
+CONFIG_W1_SLAVE_DS2431=m
 CONFIG_W1_SLAVE_DS2433=m
 CONFIG_W1_SLAVE_DS2433_CRC=y
 CONFIG_W1_SLAVE_DS2760=m
+CONFIG_W1_SLAVE_BQ27000=m
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 # CONFIG_PDA_POWER is not set
+CONFIG_WM831X_POWER=m
+CONFIG_WM8350_POWER=m
 # CONFIG_BATTERY_DS2760 is not set
+CONFIG_BATTERY_DS2782=m
+CONFIG_BATTERY_BQ27x00=m
+CONFIG_BATTERY_MAX17040=m
+CONFIG_CHARGER_PCF50633=m
 CONFIG_HWMON=m
 CONFIG_HWMON_VID=m
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Native drivers
+#
 CONFIG_SENSORS_ABITUGURU=m
 CONFIG_SENSORS_ABITUGURU3=m
 CONFIG_SENSORS_AD7414=m
@@ -1984,8 +2381,10 @@ CONFIG_SENSORS_ADM1026=m
 CONFIG_SENSORS_ADM1029=m
 CONFIG_SENSORS_ADM1031=m
 CONFIG_SENSORS_ADM9240=m
+CONFIG_SENSORS_ADT7462=m
 CONFIG_SENSORS_ADT7470=m
 CONFIG_SENSORS_ADT7473=m
+CONFIG_SENSORS_ADT7475=m
 CONFIG_SENSORS_K8TEMP=m
 CONFIG_SENSORS_ASB100=m
 CONFIG_SENSORS_ATXP1=m
@@ -1994,9 +2393,8 @@ CONFIG_SENSORS_I5K_AMB=m
 CONFIG_SENSORS_F71805F=m
 CONFIG_SENSORS_F71882FG=m
 CONFIG_SENSORS_F75375S=m
-CONFIG_SENSORS_FSCHER=m
-CONFIG_SENSORS_FSCPOS=m
 CONFIG_SENSORS_FSCHMD=m
+CONFIG_SENSORS_G760A=m
 CONFIG_SENSORS_GL518SM=m
 CONFIG_SENSORS_GL520SM=m
 CONFIG_SENSORS_CORETEMP=m
@@ -2014,10 +2412,14 @@ CONFIG_SENSORS_LM87=m
 CONFIG_SENSORS_LM90=m
 CONFIG_SENSORS_LM92=m
 CONFIG_SENSORS_LM93=m
+CONFIG_SENSORS_LTC4215=m
+CONFIG_SENSORS_LTC4245=m
+CONFIG_SENSORS_LM95241=m
 CONFIG_SENSORS_MAX1619=m
 CONFIG_SENSORS_MAX6650=m
 CONFIG_SENSORS_PC87360=m
 CONFIG_SENSORS_PC87427=m
+CONFIG_SENSORS_PCF8591=m
 CONFIG_SENSORS_SIS5595=m
 CONFIG_SENSORS_DME1737=m
 CONFIG_SENSORS_SMSC47M1=m
@@ -2025,6 +2427,8 @@ CONFIG_SENSORS_SMSC47M192=m
 CONFIG_SENSORS_SMSC47B397=m
 CONFIG_SENSORS_ADS7828=m
 CONFIG_SENSORS_THMC50=m
+CONFIG_SENSORS_TMP401=m
+CONFIG_SENSORS_TMP421=m
 CONFIG_SENSORS_VIA686A=m
 CONFIG_SENSORS_VT1211=m
 CONFIG_SENSORS_VT8231=m
@@ -2036,9 +2440,16 @@ CONFIG_SENSORS_W83L785TS=m
 CONFIG_SENSORS_W83L786NG=m
 CONFIG_SENSORS_W83627HF=m
 CONFIG_SENSORS_W83627EHF=m
+CONFIG_SENSORS_WM831X=m
+CONFIG_SENSORS_WM8350=m
 CONFIG_SENSORS_HDAPS=m
 CONFIG_SENSORS_APPLESMC=m
-# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# ACPI drivers
+#
+CONFIG_SENSORS_ATK0110=m
+CONFIG_SENSORS_LIS3LV02D=m
 CONFIG_THERMAL=y
 CONFIG_WATCHDOG=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -2047,11 +2458,14 @@ CONFIG_WATCHDOG=y
 # Watchdog Device Drivers
 #
 CONFIG_SOFT_WATCHDOG=m
+CONFIG_WM831X_WATCHDOG=m
+CONFIG_WM8350_WATCHDOG=m
 CONFIG_ACQUIRE_WDT=m
 CONFIG_ADVANTECH_WDT=m
 CONFIG_ALIM1535_WDT=m
 CONFIG_ALIM7101_WDT=m
 CONFIG_SC520_WDT=m
+CONFIG_SBC_FITPC2_WATCHDOG=m
 CONFIG_EUROTECH_WDT=m
 CONFIG_IB700_WDT=m
 CONFIG_IBMASR=m
@@ -2060,6 +2474,7 @@ CONFIG_I6300ESB_WDT=m
 CONFIG_ITCO_WDT=m
 # CONFIG_ITCO_VENDOR_SUPPORT is not set
 CONFIG_IT8712F_WDT=m
+CONFIG_IT87_WDT=m
 CONFIG_HP_WATCHDOG=m
 CONFIG_SC1200_WDT=m
 CONFIG_SCx200_WDT=m
@@ -2068,9 +2483,11 @@ CONFIG_60XX_WDT=m
 CONFIG_SBC8360_WDT=m
 CONFIG_SBC7240_WDT=m
 CONFIG_CPU5_WDT=m
+CONFIG_SMSC_SCH311X_WDT=m
 CONFIG_SMSC37B787_WDT=m
 CONFIG_W83627HF_WDT=m
 CONFIG_W83697HF_WDT=m
+CONFIG_W83697UG_WDT=m
 CONFIG_W83877F_WDT=m
 CONFIG_W83977F_WDT=m
 CONFIG_MACHZ_WDT=m
@@ -2088,24 +2505,26 @@ CONFIG_SBC_EPX_C3_WATCHDOG=m
 #
 CONFIG_PCIPCWATCHDOG=m
 CONFIG_WDTPCI=m
-CONFIG_WDT_501_PCI=y
 
 #
 # USB-based Watchdog Cards
 #
 CONFIG_USBPCWATCHDOG=m
+CONFIG_SSB_POSSIBLE=y
 
 #
 # Sonics Silicon Backplane
 #
-CONFIG_SSB_POSSIBLE=y
 CONFIG_SSB=m
 CONFIG_SSB_SPROM=y
+CONFIG_SSB_BLOCKIO=y
 CONFIG_SSB_PCIHOST_POSSIBLE=y
 CONFIG_SSB_PCIHOST=y
-# CONFIG_SSB_B43_PCI_BRIDGE is not set
+CONFIG_SSB_B43_PCI_BRIDGE=y
 CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
 CONFIG_SSB_PCMCIAHOST=y
+CONFIG_SSB_SDIOHOST_POSSIBLE=y
+CONFIG_SSB_SDIOHOST=y
 # CONFIG_SSB_DEBUG is not set
 CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
 CONFIG_SSB_DRIVER_PCICORE=y
@@ -2113,14 +2532,21 @@ CONFIG_SSB_DRIVER_PCICORE=y
 #
 # Multifunction device drivers
 #
-# CONFIG_MFD_CORE is not set
+CONFIG_MFD_CORE=m
 CONFIG_MFD_SM501=m
 CONFIG_HTC_PASIC3=m
 # CONFIG_MFD_TMIO is not set
-
-#
-# Multimedia devices
-#
+CONFIG_MFD_WM8400=m
+CONFIG_MFD_WM831X=m
+CONFIG_MFD_WM8350=m
+CONFIG_MFD_WM8350_I2C=m
+CONFIG_MFD_PCF50633=m
+CONFIG_PCF50633_ADC=m
+CONFIG_PCF50633_GPIO=m
+CONFIG_AB3100_CORE=m
+CONFIG_AB3100_OTP=m
+# CONFIG_REGULATOR is not set
+CONFIG_MEDIA_SUPPORT=m
 
 #
 # Multimedia core support
@@ -2137,26 +2563,20 @@ CONFIG_VIDEO_MEDIA=m
 #
 # CONFIG_MEDIA_ATTACH is not set
 CONFIG_MEDIA_TUNER=m
-CONFIG_MEDIA_TUNER_CUSTOMIZE=y
-# CONFIG_MEDIA_TUNER_SIMPLE is not set
-# CONFIG_MEDIA_TUNER_TDA8290 is not set
-# CONFIG_MEDIA_TUNER_TDA827X is not set
-# CONFIG_MEDIA_TUNER_TDA18271 is not set
-# CONFIG_MEDIA_TUNER_TDA9887 is not set
-# CONFIG_MEDIA_TUNER_TEA5761 is not set
-# CONFIG_MEDIA_TUNER_TEA5767 is not set
-# CONFIG_MEDIA_TUNER_MT20XX is not set
-# CONFIG_MEDIA_TUNER_MT2060 is not set
-# CONFIG_MEDIA_TUNER_MT2266 is not set
-# CONFIG_MEDIA_TUNER_MT2131 is not set
-# CONFIG_MEDIA_TUNER_QT1010 is not set
-# CONFIG_MEDIA_TUNER_XC2028 is not set
-# CONFIG_MEDIA_TUNER_XC5000 is not set
-# CONFIG_MEDIA_TUNER_MXL5005S is not set
-# CONFIG_MEDIA_TUNER_MXL5007T is not set
+# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_MC44S803=m
 CONFIG_VIDEO_V4L2=m
 CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
 # CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
 
 #
@@ -2181,14 +2601,28 @@ CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # CONFIG_VIDEO_WM8739 is not set
 # CONFIG_VIDEO_VP27SMPX is not set
 
+#
+# RDS decoders
+#
+# CONFIG_VIDEO_SAA6588 is not set
+
 #
 # Video decoders
 #
+# CONFIG_VIDEO_ADV7180 is not set
+# CONFIG_VIDEO_BT819 is not set
+# CONFIG_VIDEO_BT856 is not set
+# CONFIG_VIDEO_BT866 is not set
+# CONFIG_VIDEO_KS0127 is not set
 # CONFIG_VIDEO_OV7670 is not set
+# CONFIG_VIDEO_MT9V011 is not set
 # CONFIG_VIDEO_TCM825X is not set
+# CONFIG_VIDEO_SAA7110 is not set
 # CONFIG_VIDEO_SAA711X is not set
 # CONFIG_VIDEO_SAA717X is not set
+# CONFIG_VIDEO_TVP514X is not set
 # CONFIG_VIDEO_TVP5150 is not set
+# CONFIG_VIDEO_VPX3220 is not set
 
 #
 # Video and audio decoders
@@ -2204,6 +2638,11 @@ CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # Video encoders
 #
 # CONFIG_VIDEO_SAA7127 is not set
+# CONFIG_VIDEO_SAA7185 is not set
+# CONFIG_VIDEO_ADV7170 is not set
+# CONFIG_VIDEO_ADV7175 is not set
+# CONFIG_VIDEO_THS7303 is not set
+# CONFIG_VIDEO_ADV7343 is not set
 
 #
 # Video improvement chips
@@ -2214,28 +2653,34 @@ CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # CONFIG_VIDEO_BT848 is not set
 # CONFIG_VIDEO_SAA5246A is not set
 # CONFIG_VIDEO_SAA5249 is not set
+# CONFIG_VIDEO_ZORAN is not set
 # CONFIG_VIDEO_SAA7134 is not set
 # CONFIG_VIDEO_HEXIUM_ORION is not set
 # CONFIG_VIDEO_HEXIUM_GEMINI is not set
 # CONFIG_VIDEO_CX88 is not set
 # CONFIG_VIDEO_CX23885 is not set
 # CONFIG_VIDEO_AU0828 is not set
+# CONFIG_VIDEO_IVTV is not set
 # CONFIG_VIDEO_CX18 is not set
+# CONFIG_VIDEO_SAA7164 is not set
 # CONFIG_VIDEO_CAFE_CCIC is not set
+# CONFIG_SOC_CAMERA is not set
 CONFIG_V4L_USB_DRIVERS=y
 # CONFIG_USB_VIDEO_CLASS is not set
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
 # CONFIG_USB_GSPCA is not set
 # CONFIG_VIDEO_PVRUSB2 is not set
+# CONFIG_VIDEO_HDPVR is not set
 # CONFIG_VIDEO_EM28XX is not set
+# CONFIG_VIDEO_CX231XX is not set
 # CONFIG_VIDEO_USBVISION is not set
 # CONFIG_USB_ET61X251 is not set
 # CONFIG_USB_SN9C102 is not set
 # CONFIG_USB_ZC0301 is not set
+# CONFIG_USB_PWC_INPUT_EVDEV is not set
 # CONFIG_USB_ZR364XX is not set
 # CONFIG_USB_STKWEBCAM is not set
 # CONFIG_USB_S2255 is not set
-# CONFIG_SOC_CAMERA is not set
-# CONFIG_VIDEO_SH_MOBILE_CEU is not set
 CONFIG_RADIO_ADAPTERS=y
 # CONFIG_RADIO_CADET is not set
 # CONFIG_RADIO_RTRACK is not set
@@ -2251,8 +2696,14 @@ CONFIG_RADIO_ADAPTERS=y
 # CONFIG_RADIO_TRUST is not set
 # CONFIG_RADIO_TYPHOON is not set
 # CONFIG_RADIO_ZOLTRIX is not set
+# CONFIG_I2C_SI4713 is not set
+# CONFIG_RADIO_SI4713 is not set
 # CONFIG_USB_DSBR is not set
-# CONFIG_USB_SI470X is not set
+# CONFIG_RADIO_SI470X is not set
+# CONFIG_USB_MR800 is not set
+# CONFIG_RADIO_TEA5764 is not set
+CONFIG_DVB_MAX_ADAPTERS=8
+# CONFIG_DVB_DYNAMIC_MINORS is not set
 CONFIG_DVB_CAPTURE_DRIVERS=y
 
 #
@@ -2268,8 +2719,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
 # CONFIG_DVB_USB is not set
 # CONFIG_DVB_TTUSB_BUDGET is not set
 # CONFIG_DVB_TTUSB_DEC is not set
-# CONFIG_DVB_CINERGYT2 is not set
-# CONFIG_DVB_SIANO_SMS1XXX is not set
+# CONFIG_SMS_SIANO_MDTV is not set
 
 #
 # Supported FlexCopII (B2C2) Adapters
@@ -2286,80 +2736,24 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
 # CONFIG_DVB_PLUTO2 is not set
 
 #
-# Supported DVB Frontends
+# Supported SDMC DM1105 Adapters
 #
+# CONFIG_DVB_DM1105 is not set
 
 #
-# Customise DVB Frontends
+# Supported FireWire (IEEE 1394) Adapters
 #
-# CONFIG_DVB_FE_CUSTOMISE is not set
+# CONFIG_DVB_FIREDTV is not set
 
 #
-# DVB-S (satellite) frontends
+# Supported Earthsoft PT1 Adapters
 #
-# CONFIG_DVB_CX24110 is not set
-# CONFIG_DVB_CX24123 is not set
-# CONFIG_DVB_MT312 is not set
-# CONFIG_DVB_S5H1420 is not set
-# CONFIG_DVB_STV0299 is not set
-# CONFIG_DVB_TDA8083 is not set
-# CONFIG_DVB_TDA10086 is not set
-# CONFIG_DVB_VES1X93 is not set
-# CONFIG_DVB_TUNER_ITD1000 is not set
-# CONFIG_DVB_TDA826X is not set
-# CONFIG_DVB_TUA6100 is not set
+# CONFIG_DVB_PT1 is not set
 
 #
-# DVB-T (terrestrial) frontends
-#
-# CONFIG_DVB_SP8870 is not set
-# CONFIG_DVB_SP887X is not set
-# CONFIG_DVB_CX22700 is not set
-# CONFIG_DVB_CX22702 is not set
-# CONFIG_DVB_DRX397XD is not set
-# CONFIG_DVB_L64781 is not set
-# CONFIG_DVB_TDA1004X is not set
-# CONFIG_DVB_NXT6000 is not set
-# CONFIG_DVB_MT352 is not set
-# CONFIG_DVB_ZL10353 is not set
-# CONFIG_DVB_DIB3000MB is not set
-# CONFIG_DVB_DIB3000MC is not set
-# CONFIG_DVB_DIB7000M is not set
-# CONFIG_DVB_DIB7000P is not set
-# CONFIG_DVB_TDA10048 is not set
-
-#
-# DVB-C (cable) frontends
-#
-# CONFIG_DVB_VES1820 is not set
-# CONFIG_DVB_TDA10021 is not set
-# CONFIG_DVB_TDA10023 is not set
-# CONFIG_DVB_STV0297 is not set
-
-#
-# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
-#
-# CONFIG_DVB_NXT200X is not set
-# CONFIG_DVB_OR51211 is not set
-# CONFIG_DVB_OR51132 is not set
-# CONFIG_DVB_BCM3510 is not set
-# CONFIG_DVB_LGDT330X is not set
-# CONFIG_DVB_S5H1409 is not set
-# CONFIG_DVB_AU8522 is not set
-# CONFIG_DVB_S5H1411 is not set
-
-#
-# Digital terrestrial only tuners/PLL
-#
-# CONFIG_DVB_PLL is not set
-# CONFIG_DVB_TUNER_DIB0070 is not set
-
-#
-# SEC control devices for DVB-S
+# Supported DVB Frontends
 #
-# CONFIG_DVB_LNBP21 is not set
-# CONFIG_DVB_ISL6405 is not set
-# CONFIG_DVB_ISL6421 is not set
+# CONFIG_DVB_FE_CUSTOMISE is not set
 CONFIG_DAB=y
 # CONFIG_USB_DABUSB is not set
 
@@ -2377,13 +2771,17 @@ CONFIG_AGP_SIS=m
 CONFIG_AGP_SWORKS=m
 CONFIG_AGP_VIA=m
 CONFIG_AGP_EFFICEON=m
+CONFIG_VGA_ARB=y
 CONFIG_DRM=m
+CONFIG_DRM_KMS_HELPER=m
+CONFIG_DRM_TTM=m
 CONFIG_DRM_TDFX=m
 CONFIG_DRM_R128=m
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_I810=m
 CONFIG_DRM_I830=m
 CONFIG_DRM_I915=m
+CONFIG_DRM_I915_KMS=y
 CONFIG_DRM_MGA=m
 CONFIG_DRM_SIS=m
 CONFIG_DRM_VIA=m
@@ -2393,15 +2791,17 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m
 CONFIG_FB=y
 CONFIG_FIRMWARE_EDID=y
 CONFIG_FB_DDC=m
+CONFIG_FB_BOOT_VESA_SUPPORT=y
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-# CONFIG_FB_SYS_FILLRECT is not set
-# CONFIG_FB_SYS_COPYAREA is not set
-# CONFIG_FB_SYS_IMAGEBLIT is not set
+CONFIG_FB_SYS_FILLRECT=m
+CONFIG_FB_SYS_COPYAREA=m
+CONFIG_FB_SYS_IMAGEBLIT=m
 # CONFIG_FB_FOREIGN_ENDIAN is not set
-# CONFIG_FB_SYS_FOPS is not set
+CONFIG_FB_SYS_FOPS=m
+CONFIG_FB_DEFERRED_IO=y
 CONFIG_FB_SVGALIB=m
 # CONFIG_FB_MACMODES is not set
 CONFIG_FB_BACKLIGHT=y
@@ -2421,7 +2821,6 @@ CONFIG_FB_ASILIANT=y
 # CONFIG_FB_VGA16 is not set
 CONFIG_FB_UVESA=m
 CONFIG_FB_VESA=y
-CONFIG_FB_EFI=y
 # CONFIG_FB_N411 is not set
 # CONFIG_FB_HGA is not set
 # CONFIG_FB_S1D13XXX is not set
@@ -2438,16 +2837,12 @@ CONFIG_FB_I810_GTF=y
 CONFIG_FB_I810_I2C=y
 CONFIG_FB_LE80578=m
 CONFIG_FB_CARILLO_RANCH=m
-CONFIG_FB_INTEL=m
-# CONFIG_FB_INTEL_DEBUG is not set
-CONFIG_FB_INTEL_I2C=y
 CONFIG_FB_MATROX=m
 CONFIG_FB_MATROX_MILLENIUM=y
 CONFIG_FB_MATROX_MYSTIQUE=y
 CONFIG_FB_MATROX_G=y
 CONFIG_FB_MATROX_I2C=m
 CONFIG_FB_MATROX_MAVEN=m
-CONFIG_FB_MATROX_MULTIHEAD=y
 CONFIG_FB_RADEON=m
 CONFIG_FB_RADEON_I2C=y
 CONFIG_FB_RADEON_BACKLIGHT=y
@@ -2466,15 +2861,15 @@ CONFIG_FB_SAVAGE_ACCEL=y
 CONFIG_FB_SIS=m
 CONFIG_FB_SIS_300=y
 CONFIG_FB_SIS_315=y
+CONFIG_FB_VIA=m
 CONFIG_FB_NEOMAGIC=m
 CONFIG_FB_KYRO=m
 CONFIG_FB_3DFX=m
 CONFIG_FB_3DFX_ACCEL=y
+CONFIG_FB_3DFX_I2C=y
 CONFIG_FB_VOODOO1=m
 CONFIG_FB_VT8623=m
-CONFIG_FB_CYBLA=m
 CONFIG_FB_TRIDENT=m
-CONFIG_FB_TRIDENT_ACCEL=y
 CONFIG_FB_ARK=m
 CONFIG_FB_PM3=m
 # CONFIG_FB_CARMINE is not set
@@ -2482,17 +2877,24 @@ CONFIG_FB_GEODE=y
 CONFIG_FB_GEODE_LX=m
 CONFIG_FB_GEODE_GX=m
 CONFIG_FB_GEODE_GX1=m
+CONFIG_FB_TMIO=m
+CONFIG_FB_TMIO_ACCELL=y
 CONFIG_FB_SM501=m
 # CONFIG_FB_VIRTUAL is not set
+CONFIG_FB_METRONOME=m
+# CONFIG_FB_MB862XX is not set
+# CONFIG_FB_BROADSHEET is not set
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_LCD_CLASS_DEVICE=m
 # CONFIG_LCD_ILI9320 is not set
 CONFIG_LCD_PLATFORM=m
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_CORGI=m
+CONFIG_BACKLIGHT_GENERIC=m
 CONFIG_BACKLIGHT_PROGEAR=m
 CONFIG_BACKLIGHT_CARILLO_RANCH=m
 CONFIG_BACKLIGHT_MBP_NVIDIA=m
+CONFIG_BACKLIGHT_SAHARA=m
+CONFIG_BACKLIGHT_WM831X=m
 
 #
 # Display device support
@@ -2508,7 +2910,6 @@ CONFIG_DISPLAY_SUPPORT=m
 #
 CONFIG_VGA_CONSOLE=y
 # CONFIG_VGACON_SOFT_SCROLLBACK is not set
-CONFIG_VIDEO_SELECT=y
 # CONFIG_MDA_CONSOLE is not set
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
@@ -2522,6 +2923,8 @@ CONFIG_LOGO_LINUX_MONO=y
 CONFIG_LOGO_LINUX_VGA16=y
 CONFIG_LOGO_LINUX_CLUT224=y
 CONFIG_SOUND=m
+CONFIG_SOUND_OSS_CORE=y
+CONFIG_SOUND_OSS_CORE_PRECLAIM=y
 CONFIG_SND=m
 CONFIG_SND_TIMER=m
 CONFIG_SND_PCM=m
@@ -2532,12 +2935,20 @@ CONFIG_SND_MIXER_OSS=m
 CONFIG_SND_PCM_OSS=m
 CONFIG_SND_PCM_OSS_PLUGINS=y
 CONFIG_SND_SEQUENCER_OSS=y
+# CONFIG_SND_HRTIMER is not set
 # CONFIG_SND_DYNAMIC_MINORS is not set
 # CONFIG_SND_SUPPORT_OLD_API is not set
 CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SND_VERBOSE_PRINTK is not set
 # CONFIG_SND_DEBUG is not set
+CONFIG_SND_DMA_SGBUF=y
+# CONFIG_SND_RAWMIDI_SEQ is not set
+# CONFIG_SND_OPL3_LIB_SEQ is not set
+# CONFIG_SND_OPL4_LIB_SEQ is not set
+# CONFIG_SND_SBAWE_SEQ is not set
+# CONFIG_SND_EMU10K1_SEQ is not set
 CONFIG_SND_DRIVERS=y
+# CONFIG_SND_PCSP is not set
 CONFIG_SND_DUMMY=m
 # CONFIG_SND_VIRMIDI is not set
 # CONFIG_SND_MTPAV is not set
@@ -2553,7 +2964,6 @@ CONFIG_SND_ISA=y
 # CONFIG_SND_AZT2320 is not set
 # CONFIG_SND_CMI8330 is not set
 # CONFIG_SND_CS4231 is not set
-# CONFIG_SND_CS4232 is not set
 # CONFIG_SND_CS4236 is not set
 # CONFIG_SND_DT019X is not set
 # CONFIG_SND_ES968 is not set
@@ -2576,6 +2986,8 @@ CONFIG_SND_ISA=y
 # CONFIG_SND_SGALAXY is not set
 # CONFIG_SND_SSCAPE is not set
 # CONFIG_SND_WAVEFRONT is not set
+# CONFIG_SND_MSND_PINNACLE is not set
+# CONFIG_SND_MSND_CLASSIC is not set
 CONFIG_SND_PCI=y
 # CONFIG_SND_AD1889 is not set
 # CONFIG_SND_ALS300 is not set
@@ -2596,6 +3008,7 @@ CONFIG_SND_PCI=y
 # CONFIG_SND_CS46XX is not set
 # CONFIG_SND_CS5530 is not set
 # CONFIG_SND_CS5535AUDIO is not set
+# CONFIG_SND_CTXFI is not set
 # CONFIG_SND_DARLA20 is not set
 # CONFIG_SND_GINA20 is not set
 # CONFIG_SND_LAYLA20 is not set
@@ -2608,6 +3021,8 @@ CONFIG_SND_PCI=y
 # CONFIG_SND_INDIGO is not set
 # CONFIG_SND_INDIGOIO is not set
 # CONFIG_SND_INDIGODJ is not set
+# CONFIG_SND_INDIGOIOX is not set
+# CONFIG_SND_INDIGODJX is not set
 # CONFIG_SND_EMU10K1 is not set
 # CONFIG_SND_EMU10K1X is not set
 # CONFIG_SND_ENS1370 is not set
@@ -2624,6 +3039,7 @@ CONFIG_SND_PCI=y
 # CONFIG_SND_INTEL8X0 is not set
 # CONFIG_SND_INTEL8X0M is not set
 # CONFIG_SND_KORG1212 is not set
+# CONFIG_SND_LX6464ES is not set
 # CONFIG_SND_MAESTRO3 is not set
 # CONFIG_SND_MIXART is not set
 # CONFIG_SND_NM256 is not set
@@ -2644,6 +3060,7 @@ CONFIG_SND_USB=y
 # CONFIG_SND_USB_AUDIO is not set
 # CONFIG_SND_USB_USX2Y is not set
 # CONFIG_SND_USB_CAIAQ is not set
+# CONFIG_SND_USB_US122L is not set
 CONFIG_SND_PCMCIA=y
 # CONFIG_SND_VXPOCKET is not set
 # CONFIG_SND_PDAUDIOCF is not set
@@ -2651,22 +3068,53 @@ CONFIG_SND_PCMCIA=y
 # CONFIG_SOUND_PRIME is not set
 CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
-CONFIG_HID_DEBUG=y
 # CONFIG_HIDRAW is not set
 
 #
 # USB Input Devices
 #
 CONFIG_USB_HID=m
-# CONFIG_USB_HIDINPUT_POWERBOOK is not set
-# CONFIG_HID_FF is not set
+# CONFIG_HID_PID is not set
 CONFIG_USB_HIDDEV=y
 
 #
-# USB HID Boot Protocol drivers
-#
-# CONFIG_USB_KBD is not set
-# CONFIG_USB_MOUSE is not set
+# Special HID drivers
+#
+CONFIG_HID_A4TECH=m
+CONFIG_HID_APPLE=m
+CONFIG_HID_BELKIN=m
+CONFIG_HID_CHERRY=m
+CONFIG_HID_CHICONY=m
+CONFIG_HID_CYPRESS=m
+CONFIG_HID_DRAGONRISE=m
+CONFIG_DRAGONRISE_FF=y
+CONFIG_HID_EZKEY=m
+CONFIG_HID_KYE=m
+CONFIG_HID_GYRATION=m
+CONFIG_HID_TWINHAN=m
+CONFIG_HID_KENSINGTON=m
+CONFIG_HID_LOGITECH=m
+CONFIG_LOGITECH_FF=y
+CONFIG_LOGIRUMBLEPAD2_FF=y
+CONFIG_HID_MICROSOFT=m
+CONFIG_HID_MONTEREY=m
+CONFIG_HID_NTRIG=m
+CONFIG_HID_PANTHERLORD=m
+CONFIG_PANTHERLORD_FF=y
+CONFIG_HID_PETALYNX=m
+CONFIG_HID_SAMSUNG=m
+CONFIG_HID_SONY=m
+CONFIG_HID_SUNPLUS=m
+CONFIG_HID_GREENASIA=m
+CONFIG_GREENASIA_FF=y
+CONFIG_HID_SMARTJOYPLUS=m
+CONFIG_SMARTJOYPLUS_FF=y
+CONFIG_HID_TOPSEED=m
+CONFIG_HID_THRUSTMASTER=m
+CONFIG_THRUSTMASTER_FF=y
+CONFIG_HID_WACOM=m
+CONFIG_HID_ZEROPLUS=m
+CONFIG_ZEROPLUS_FF=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
@@ -2684,16 +3132,23 @@ CONFIG_USB_DYNAMIC_MINORS=y
 CONFIG_USB_SUSPEND=y
 # CONFIG_USB_OTG is not set
 # CONFIG_USB_MON is not set
+CONFIG_USB_WUSB=m
+CONFIG_USB_WUSB_CBAF=m
+# CONFIG_USB_WUSB_CBAF_DEBUG is not set
 
 #
 # USB Host Controller Drivers
 #
 # CONFIG_USB_C67X00_HCD is not set
+CONFIG_USB_XHCI_HCD=m
+# CONFIG_USB_XHCI_HCD_DEBUGGING is not set
 CONFIG_USB_EHCI_HCD=m
 # CONFIG_USB_EHCI_ROOT_HUB_TT is not set
 # CONFIG_USB_EHCI_TT_NEWSCHED is not set
+CONFIG_USB_OXU210HP_HCD=m
 CONFIG_USB_ISP116X_HCD=m
 # CONFIG_USB_ISP1760_HCD is not set
+CONFIG_USB_ISP1362_HCD=m
 CONFIG_USB_OHCI_HCD=m
 CONFIG_USB_OHCI_HCD_SSB=y
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
@@ -2704,6 +3159,8 @@ CONFIG_USB_U132_HCD=m
 CONFIG_USB_SL811_HCD=m
 # CONFIG_USB_SL811_CS is not set
 CONFIG_USB_R8A66597_HCD=m
+CONFIG_USB_WHCI_HCD=m
+CONFIG_USB_HWA_HCD=m
 
 #
 # Enable Host or Gadget support to see Inventra options
@@ -2715,28 +3172,28 @@ CONFIG_USB_R8A66597_HCD=m
 CONFIG_USB_ACM=m
 CONFIG_USB_PRINTER=m
 CONFIG_USB_WDM=m
+CONFIG_USB_TMC=m
 
 #
-# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
 #
 
 #
-# may also be needed; see USB_STORAGE Help for more information
+# also be needed; see USB_STORAGE Help for more info
 #
 CONFIG_USB_STORAGE=m
 # CONFIG_USB_STORAGE_DEBUG is not set
 # CONFIG_USB_STORAGE_DATAFAB is not set
-CONFIG_USB_STORAGE_FREECOM=y
-CONFIG_USB_STORAGE_ISD200=y
-CONFIG_USB_STORAGE_DPCM=y
-CONFIG_USB_STORAGE_USBAT=y
-CONFIG_USB_STORAGE_SDDR09=y
-CONFIG_USB_STORAGE_SDDR55=y
-CONFIG_USB_STORAGE_JUMPSHOT=y
-CONFIG_USB_STORAGE_ALAUDA=y
-CONFIG_USB_STORAGE_ONETOUCH=y
-CONFIG_USB_STORAGE_KARMA=y
-CONFIG_USB_STORAGE_CYPRESS_ATACB=y
+CONFIG_USB_STORAGE_FREECOM=m
+CONFIG_USB_STORAGE_ISD200=m
+CONFIG_USB_STORAGE_USBAT=m
+CONFIG_USB_STORAGE_SDDR09=m
+CONFIG_USB_STORAGE_SDDR55=m
+CONFIG_USB_STORAGE_JUMPSHOT=m
+CONFIG_USB_STORAGE_ALAUDA=m
+CONFIG_USB_STORAGE_ONETOUCH=m
+CONFIG_USB_STORAGE_KARMA=m
+CONFIG_USB_STORAGE_CYPRESS_ATACB=m
 # CONFIG_USB_LIBUSUAL is not set
 
 #
@@ -2758,7 +3215,7 @@ CONFIG_USB_SERIAL_BELKIN=m
 CONFIG_USB_SERIAL_CH341=m
 CONFIG_USB_SERIAL_WHITEHEAT=m
 CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-CONFIG_USB_SERIAL_CP2101=m
+CONFIG_USB_SERIAL_CP210X=m
 CONFIG_USB_SERIAL_CYPRESS_M8=m
 CONFIG_USB_SERIAL_EMPEG=m
 CONFIG_USB_SERIAL_FTDI_SIO=m
@@ -2782,16 +3239,20 @@ CONFIG_USB_SERIAL_MOTOROLA=m
 # CONFIG_USB_SERIAL_NAVMAN is not set
 CONFIG_USB_SERIAL_PL2303=m
 CONFIG_USB_SERIAL_OTI6858=m
+CONFIG_USB_SERIAL_QUALCOMM=m
 CONFIG_USB_SERIAL_SPCP8X5=m
 CONFIG_USB_SERIAL_HP4X=m
 CONFIG_USB_SERIAL_SAFE=m
 # CONFIG_USB_SERIAL_SAFE_PADDED is not set
+CONFIG_USB_SERIAL_SIEMENS_MPI=m
 CONFIG_USB_SERIAL_SIERRAWIRELESS=m
+CONFIG_USB_SERIAL_SYMBOL=m
 CONFIG_USB_SERIAL_TI=m
 # CONFIG_USB_SERIAL_CYBERJACK is not set
 CONFIG_USB_SERIAL_XIRCOM=m
 CONFIG_USB_SERIAL_OPTION=m
 # CONFIG_USB_SERIAL_OMNINET is not set
+CONFIG_USB_SERIAL_OPTICON=m
 # CONFIG_USB_SERIAL_DEBUG is not set
 
 #
@@ -2800,6 +3261,7 @@ CONFIG_USB_SERIAL_OPTION=m
 CONFIG_USB_EMI62=m
 CONFIG_USB_EMI26=m
 # CONFIG_USB_ADUTUX is not set
+CONFIG_USB_SEVSEG=m
 # CONFIG_USB_RIO500 is not set
 # CONFIG_USB_LEGOTOWER is not set
 CONFIG_USB_LCD=m
@@ -2807,7 +3269,6 @@ CONFIG_USB_BERRY_CHARGE=m
 CONFIG_USB_LED=m
 CONFIG_USB_CYPRESS_CY7C63=m
 CONFIG_USB_CYTHERM=m
-# CONFIG_USB_PHIDGET is not set
 # CONFIG_USB_IDMOUSE is not set
 CONFIG_USB_FTDI_ELAN=m
 # CONFIG_USB_APPLEDISPLAY is not set
@@ -2818,18 +3279,31 @@ CONFIG_USB_SISUSBVGA_CON=y
 CONFIG_USB_IOWARRIOR=m
 # CONFIG_USB_TEST is not set
 CONFIG_USB_ISIGHTFW=m
+CONFIG_USB_VST=m
 CONFIG_USB_ATM=m
 CONFIG_USB_SPEEDTOUCH=m
 CONFIG_USB_CXACRU=m
 CONFIG_USB_UEAGLEATM=m
 CONFIG_USB_XUSBATM=m
 # CONFIG_USB_GADGET is not set
+
+#
+# OTG and related infrastructure
+#
+CONFIG_USB_OTG_UTILS=y
+CONFIG_NOP_USB_XCEIV=m
+CONFIG_UWB=m
+CONFIG_UWB_HWA=m
+CONFIG_UWB_WHCI=m
+CONFIG_UWB_WLP=m
+CONFIG_UWB_I1480U=m
+CONFIG_UWB_I1480U_WLP=m
 CONFIG_MMC=m
 # CONFIG_MMC_DEBUG is not set
 # CONFIG_MMC_UNSAFE_RESUME is not set
 
 #
-# MMC/SD Card Drivers
+# MMC/SD/SDIO Card Drivers
 #
 CONFIG_MMC_BLOCK=m
 CONFIG_MMC_BLOCK_BOUNCE=y
@@ -2837,14 +3311,19 @@ CONFIG_SDIO_UART=m
 CONFIG_MMC_TEST=m
 
 #
-# MMC/SD Host Controller Drivers
+# MMC/SD/SDIO Host Controller Drivers
 #
 CONFIG_MMC_SDHCI=m
 CONFIG_MMC_SDHCI_PCI=m
 CONFIG_MMC_RICOH_MMC=m
+CONFIG_MMC_SDHCI_PLTFM=m
 CONFIG_MMC_WBSD=m
+# CONFIG_MMC_AT91 is not set
+# CONFIG_MMC_ATMELMCI is not set
 CONFIG_MMC_TIFM_SD=m
 CONFIG_MMC_SDRICOH_CS=m
+CONFIG_MMC_CB710=m
+CONFIG_MMC_VIA_SDMMC=m
 CONFIG_MEMSTICK=m
 # CONFIG_MEMSTICK_DEBUG is not set
 
@@ -2867,10 +3346,14 @@ CONFIG_LEDS_CLASS=m
 #
 CONFIG_LEDS_NET48XX=m
 CONFIG_LEDS_WRAP=m
-CONFIG_LEDS_ALIX=m
+CONFIG_LEDS_ALIX2=m
 CONFIG_LEDS_PCA9532=m
+CONFIG_LEDS_LP3944=m
 CONFIG_LEDS_CLEVO_MAIL=m
 CONFIG_LEDS_PCA955X=m
+CONFIG_LEDS_WM831X_STATUS=m
+CONFIG_LEDS_WM8350=m
+CONFIG_LEDS_BD2802=m
 
 #
 # LED Triggers
@@ -2879,7 +3362,12 @@ CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=m
 CONFIG_LEDS_TRIGGER_IDE_DISK=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+CONFIG_LEDS_TRIGGER_BACKLIGHT=m
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
 # CONFIG_ACCESSIBILITY is not set
 # CONFIG_INFINIBAND is not set
 # CONFIG_EDAC is not set
@@ -2911,6 +3399,8 @@ CONFIG_RTC_DRV_M41T80=m
 # CONFIG_RTC_DRV_M41T80_WDT is not set
 CONFIG_RTC_DRV_S35390A=m
 CONFIG_RTC_DRV_FM3130=m
+CONFIG_RTC_DRV_RX8581=m
+CONFIG_RTC_DRV_RX8025=m
 
 #
 # SPI RTC drivers
@@ -2920,13 +3410,20 @@ CONFIG_RTC_DRV_FM3130=m
 # Platform RTC drivers
 #
 CONFIG_RTC_DRV_CMOS=m
+CONFIG_RTC_DRV_DS1286=m
 CONFIG_RTC_DRV_DS1511=m
 CONFIG_RTC_DRV_DS1553=m
 CONFIG_RTC_DRV_DS1742=m
 CONFIG_RTC_DRV_STK17TA8=m
 CONFIG_RTC_DRV_M48T86=m
+CONFIG_RTC_DRV_M48T35=m
 CONFIG_RTC_DRV_M48T59=m
+CONFIG_RTC_DRV_BQ4802=m
 CONFIG_RTC_DRV_V3020=m
+CONFIG_RTC_DRV_WM831X=m
+CONFIG_RTC_DRV_WM8350=m
+CONFIG_RTC_DRV_PCF50633=m
+CONFIG_RTC_DRV_AB3100=m
 
 #
 # on-CPU RTC drivers
@@ -2936,6 +3433,7 @@ CONFIG_DMADEVICES=y
 #
 # DMA Devices
 #
+CONFIG_ASYNC_TX_DISABLE_CHANNEL_SWITCH=y
 CONFIG_INTEL_IOATDMA=m
 CONFIG_DMA_ENGINE=y
 
@@ -2943,6 +3441,7 @@ CONFIG_DMA_ENGINE=y
 # DMA Clients
 #
 CONFIG_NET_DMA=y
+CONFIG_ASYNC_TX_DMA=y
 CONFIG_DMATEST=m
 CONFIG_DCA=m
 # CONFIG_AUXDISPLAY is not set
@@ -2951,6 +3450,97 @@ CONFIG_UIO_CIF=m
 CONFIG_UIO_PDRV=m
 CONFIG_UIO_PDRV_GENIRQ=m
 CONFIG_UIO_SMX=m
+CONFIG_UIO_AEC=m
+CONFIG_UIO_SERCOS3=m
+CONFIG_UIO_PCI_GENERIC=m
+
+#
+# TI VLYNQ
+#
+CONFIG_STAGING=y
+# CONFIG_STAGING_EXCLUDE_BUILD is not set
+CONFIG_ET131X=m
+# CONFIG_ET131X_DEBUG is not set
+CONFIG_SLICOSS=m
+# CONFIG_VIDEO_GO7007 is not set
+# CONFIG_VIDEO_CX25821 is not set
+# CONFIG_USB_IP_COMMON is not set
+# CONFIG_W35UND is not set
+# CONFIG_PRISM2_USB is not set
+# CONFIG_ECHO is not set
+# CONFIG_POCH is not set
+# CONFIG_OTUS is not set
+# CONFIG_RT2860 is not set
+# CONFIG_RT2870 is not set
+# CONFIG_RT3090 is not set
+# CONFIG_COMEDI is not set
+# CONFIG_ASUS_OLED is not set
+# CONFIG_PANEL is not set
+# CONFIG_ALTERA_PCIE_CHDMA is not set
+# CONFIG_RTL8187SE is not set
+# CONFIG_RTL8192SU is not set
+# CONFIG_RTL8192E is not set
+# CONFIG_TRANZPORT is not set
+
+#
+# Android
+#
+
+#
+# Qualcomm MSM Camera And Video
+#
+
+#
+# Camera Sensor Selection
+#
+# CONFIG_INPUT_GPIO is not set
+# CONFIG_DST is not set
+# CONFIG_POHMELFS is not set
+# CONFIG_B3DFG is not set
+CONFIG_IDE_PHISON=m
+# CONFIG_PLAN9AUTH is not set
+# CONFIG_LINE6_USB is not set
+# CONFIG_DRM_RADEON_KMS is not set
+# CONFIG_USB_SERIAL_QUATECH2 is not set
+# CONFIG_USB_SERIAL_QUATECH_USB2 is not set
+# CONFIG_VT6655 is not set
+# CONFIG_VT6656 is not set
+# CONFIG_FB_UDL is not set
+CONFIG_HYPERV=m
+CONFIG_HYPERV_STORAGE=m
+CONFIG_HYPERV_BLOCK=m
+CONFIG_HYPERV_NET=m
+# CONFIG_VME_BUS is not set
+
+#
+# RAR Register Driver
+#
+# CONFIG_RAR_REGISTER is not set
+# CONFIG_IIO is not set
+CONFIG_X86_PLATFORM_DEVICES=y
+CONFIG_ACER_WMI=m
+CONFIG_ASUS_LAPTOP=m
+CONFIG_DELL_WMI=m
+CONFIG_FUJITSU_LAPTOP=m
+CONFIG_FUJITSU_LAPTOP_DEBUG=y
+CONFIG_TC1100_WMI=m
+CONFIG_HP_WMI=m
+CONFIG_MSI_LAPTOP=m
+CONFIG_PANASONIC_LAPTOP=m
+CONFIG_COMPAL_LAPTOP=m
+CONFIG_SONY_LAPTOP=m
+# CONFIG_SONYPI_COMPAT is not set
+CONFIG_THINKPAD_ACPI=m
+# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
+# CONFIG_THINKPAD_ACPI_DEBUG is not set
+# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
+CONFIG_THINKPAD_ACPI_VIDEO=y
+CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
+CONFIG_INTEL_MENLOW=m
+CONFIG_ACPI_WMI=m
+CONFIG_ACPI_ASUS=m
+CONFIG_TOPSTAR_LAPTOP=m
+CONFIG_ACPI_TOSHIBA=m
 
 #
 # Firmware Drivers
@@ -2972,11 +3562,17 @@ CONFIG_EXT2_FS_POSIX_ACL=y
 CONFIG_EXT2_FS_SECURITY=y
 # CONFIG_EXT2_FS_XIP is not set
 CONFIG_EXT3_FS=m
+# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
 CONFIG_EXT3_FS_XATTR=y
 CONFIG_EXT3_FS_POSIX_ACL=y
 CONFIG_EXT3_FS_SECURITY=y
-# CONFIG_EXT4DEV_FS is not set
+CONFIG_EXT4_FS=m
+CONFIG_EXT4_FS_XATTR=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+# CONFIG_EXT4_DEBUG is not set
 CONFIG_JBD=m
+CONFIG_JBD2=m
 CONFIG_FS_MBCACHE=m
 CONFIG_REISER4_FS=m
 # CONFIG_REISER4_DEBUG is not set
@@ -2999,21 +3595,43 @@ CONFIG_XFS_POSIX_ACL=y
 CONFIG_XFS_DEBUG=y
 # CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
+# CONFIG_BTRFS_FS is not set
+# CONFIG_NILFS2_FS is not set
+CONFIG_FILE_LOCKING=y
+CONFIG_FSNOTIFY=y
 CONFIG_DNOTIFY=y
 CONFIG_INOTIFY=y
 CONFIG_INOTIFY_USER=y
-# CONFIG_QUOTA is not set
+CONFIG_QUOTA=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+CONFIG_PRINT_QUOTA_WARNING=y
+CONFIG_QUOTA_TREE=m
+CONFIG_QFMT_V1=m
+CONFIG_QFMT_V2=m
 CONFIG_QUOTACTL=y
 CONFIG_AUTOFS_FS=m
 CONFIG_AUTOFS4_FS=m
 CONFIG_FUSE_FS=m
+CONFIG_CUSE=m
+
+#
+# Caches
+#
+CONFIG_FSCACHE=m
+# CONFIG_FSCACHE_STATS is not set
+# CONFIG_FSCACHE_HISTOGRAM is not set
+# CONFIG_FSCACHE_DEBUG is not set
+# CONFIG_FSCACHE_OBJECT_LIST is not set
+CONFIG_CACHEFILES=m
+# CONFIG_CACHEFILES_DEBUG is not set
+# CONFIG_CACHEFILES_HISTOGRAM is not set
 
 #
 # CD-ROM/DVD Filesystems
 #
 CONFIG_ISO9660_FS=m
 CONFIG_JOLIET=y
-# CONFIG_ZISOFS is not set
+CONFIG_ZISOFS=y
 CONFIG_UDF_FS=m
 CONFIG_UDF_NLS=y
 
@@ -3033,16 +3651,14 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 CONFIG_PROC_FS=y
 # CONFIG_PROC_KCORE is not set
 CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
 CONFIG_SYSFS=y
 CONFIG_TMPFS=y
 # CONFIG_TMPFS_POSIX_ACL is not set
 # CONFIG_HUGETLBFS is not set
 # CONFIG_HUGETLB_PAGE is not set
 # CONFIG_CONFIGFS_FS is not set
-
-#
-# Miscellaneous filesystems
-#
+CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_ADFS_FS is not set
 # CONFIG_AFFS_FS is not set
 CONFIG_ECRYPT_FS=m
@@ -3069,6 +3685,7 @@ CONFIG_JFFS2_CMODE_PRIORITY=y
 # CONFIG_UBIFS_FS is not set
 # CONFIG_CRAMFS is not set
 CONFIG_SQUASHFS=y
+CONFIG_SQUASHFS_LZMA=y
 # CONFIG_SQUASHFS_EMBEDDED is not set
 CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
 # CONFIG_VXFS_FS is not set
@@ -3079,18 +3696,23 @@ CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
 # CONFIG_ROMFS_FS is not set
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
+# CONFIG_EXOFS_FS is not set
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=m
 CONFIG_NFS_V3=y
-# CONFIG_NFS_V3_ACL is not set
+CONFIG_NFS_V3_ACL=y
 CONFIG_NFS_V4=y
+# CONFIG_NFS_V4_1 is not set
+# CONFIG_NFS_FSCACHE is not set
 CONFIG_NFSD=m
+CONFIG_NFSD_V2_ACL=y
 CONFIG_NFSD_V3=y
-# CONFIG_NFSD_V3_ACL is not set
-# CONFIG_NFSD_V4 is not set
+CONFIG_NFSD_V3_ACL=y
+CONFIG_NFSD_V4=y
 CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
 CONFIG_EXPORTFS=m
+CONFIG_NFS_ACL_SUPPORT=m
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=m
 CONFIG_SUNRPC_GSS=m
@@ -3104,8 +3726,9 @@ CONFIG_CIFS_STATS2=y
 # CONFIG_CIFS_WEAK_PW_HASH is not set
 # CONFIG_CIFS_UPCALL is not set
 CONFIG_CIFS_XATTR=y
-# CONFIG_CIFS_POSIX is not set
+CONFIG_CIFS_POSIX=y
 # CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_DFS_UPCALL is not set
 # CONFIG_CIFS_EXPERIMENTAL is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
@@ -3125,7 +3748,8 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_MINIX_SUBPARTITION is not set
 # CONFIG_SOLARIS_X86_PARTITION is not set
 # CONFIG_UNIXWARE_DISKLABEL is not set
-# CONFIG_LDM_PARTITION is not set
+CONFIG_LDM_PARTITION=y
+# CONFIG_LDM_DEBUG is not set
 # CONFIG_SGI_PARTITION is not set
 # CONFIG_ULTRIX_PARTITION is not set
 # CONFIG_SUN_PARTITION is not set
@@ -3183,30 +3807,42 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 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_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
 CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_DEBUG_MEMORY_INIT=y
+CONFIG_ARCH_WANT_FRAME_POINTERS=y
+CONFIG_FRAME_POINTER=y
+CONFIG_RCU_CPU_STALL_DETECTOR=y
 # CONFIG_LATENCYTOP is not set
 # CONFIG_SYSCTL_SYSCALL_CHECK is not set
-CONFIG_HAVE_FTRACE=y
+CONFIG_USER_STACKTRACE_SUPPORT=y
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
+CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
 CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_TRACING_SUPPORT=y
 # CONFIG_FTRACE is not set
-# CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_SYSPROF_TRACER is not set
-# CONFIG_SCHED_TRACER is not set
-# CONFIG_CONTEXT_SWITCH_TRACER is not set
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
 # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
+# CONFIG_DMA_API_DEBUG is not set
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_ARCH_KGDB=y
+CONFIG_HAVE_ARCH_KMEMCHECK=y
 # CONFIG_STRICT_DEVMEM is not set
 CONFIG_X86_VERBOSE_BOOTUP=y
 CONFIG_EARLY_PRINTK=y
+# CONFIG_EARLY_PRINTK_DBGP is not set
 # CONFIG_4KSTACKS is not set
 CONFIG_DOUBLEFAULT=y
+# CONFIG_IOMMU_STRESS is not set
+CONFIG_HAVE_MMIOTRACE_SUPPORT=y
 CONFIG_IO_DELAY_TYPE_0X80=0
 CONFIG_IO_DELAY_TYPE_0XED=1
 CONFIG_IO_DELAY_TYPE_UDELAY=2
@@ -3224,23 +3860,40 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
 CONFIG_KEYS=y
 # CONFIG_KEYS_DEBUG_PROC_KEYS is not set
 # CONFIG_SECURITY is not set
+# CONFIG_SECURITYFS is not set
 # CONFIG_SECURITY_FILE_CAPABILITIES is not set
+# CONFIG_INTEL_TXT is not set
+# CONFIG_IMA is not set
 CONFIG_XOR_BLOCKS=m
 CONFIG_ASYNC_CORE=m
 CONFIG_ASYNC_MEMCPY=m
 CONFIG_ASYNC_XOR=m
+CONFIG_ASYNC_PQ=m
+CONFIG_ASYNC_RAID6_RECOV=m
+CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y
+CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y
 CONFIG_CRYPTO=y
 
 #
 # Crypto core or helper
 #
+CONFIG_CRYPTO_FIPS=y
 CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
 CONFIG_CRYPTO_AEAD=m
+CONFIG_CRYPTO_AEAD2=y
 CONFIG_CRYPTO_BLKCIPHER=m
+CONFIG_CRYPTO_BLKCIPHER2=y
 CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG=m
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_PCOMP=y
 CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
 CONFIG_CRYPTO_GF128MUL=m
 # CONFIG_CRYPTO_NULL is not set
+CONFIG_CRYPTO_WORKQUEUE=y
 CONFIG_CRYPTO_CRYPTD=m
 CONFIG_CRYPTO_AUTHENC=m
 # CONFIG_CRYPTO_TEST is not set
@@ -3268,11 +3921,14 @@ CONFIG_CRYPTO_XTS=m
 #
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_XCBC=m
+CONFIG_CRYPTO_VMAC=m
 
 #
 # Digest
 #
 CONFIG_CRYPTO_CRC32C=m
+CONFIG_CRYPTO_CRC32C_INTEL=m
+CONFIG_CRYPTO_GHASH=m
 # CONFIG_CRYPTO_MD4 is not set
 CONFIG_CRYPTO_MD5=m
 CONFIG_CRYPTO_MICHAEL_MIC=m
@@ -3313,7 +3969,13 @@ CONFIG_CRYPTO_TWOFISH_586=m
 # Compression
 #
 CONFIG_CRYPTO_DEFLATE=y
+CONFIG_CRYPTO_ZLIB=m
 CONFIG_CRYPTO_LZO=m
+
+#
+# Random Number Generation
+#
+CONFIG_CRYPTO_ANSI_CPRNG=m
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
@@ -3322,6 +3984,9 @@ CONFIG_CRYPTO_DEV_GEODE=m
 CONFIG_CRYPTO_DEV_HIFN_795X=m
 CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
 CONFIG_HAVE_KVM=y
+CONFIG_HAVE_KVM_IRQCHIP=y
+CONFIG_HAVE_KVM_EVENTFD=y
+CONFIG_KVM_APIC_ARCHITECTURE=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=m
 CONFIG_KVM_INTEL=m
@@ -3331,6 +3996,7 @@ CONFIG_VIRTIO=y
 CONFIG_VIRTIO_RING=y
 CONFIG_VIRTIO_PCI=m
 CONFIG_VIRTIO_BALLOON=m
+# CONFIG_BINARY_PRINTF is not set
 
 #
 # Library routines
@@ -3338,6 +4004,7 @@ CONFIG_VIRTIO_BALLOON=m
 CONFIG_BITREVERSE=y
 CONFIG_GENERIC_FIND_FIRST_BIT=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
+CONFIG_GENERIC_FIND_LAST_BIT=y
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
 CONFIG_CRC_T10DIF=m
@@ -3350,12 +4017,16 @@ CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_LZO_COMPRESS=m
 CONFIG_LZO_DECOMPRESS=m
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_LZMA_NEEDED=y
 CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_KMP=m
 CONFIG_TEXTSEARCH_BM=m
 CONFIG_TEXTSEARCH_FSM=m
-CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y
 CONFIG_CHECK_SIGNATURE=y
+CONFIG_NLATTR=y

diff --git a/config/kernel/kernel.config.i586-ipfire-xen b/config/kernel/kernel.config.i586-ipfire-xen
index 6461aae1734f471dbdf947f57da77f373aa2bb59..036bfc62ac7e222b21cc4c46c086931466eaabbd 100644 (file)
--- a/config/kernel/kernel.config.i586-ipfire-xen
+++ b/config/kernel/kernel.config.i586-ipfire-xen
@@ -1,32 +1,28 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.27.42
-# Tue Jan 19 21:40:07 2010
+# Linux kernel version: 2.6.32.10
+# Tue Mar 30 18:36:37 2010
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
 # CONFIG_X86_64 is not set
 CONFIG_X86=y
+CONFIG_OUTPUT_FORMAT="elf32-i386"
 CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
-# CONFIG_GENERIC_LOCKBREAK is not set
 CONFIG_GENERIC_TIME=y
 CONFIG_GENERIC_CMOS_UPDATE=y
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-CONFIG_FAST_CMPXCHG_LOCAL=y
 CONFIG_MMU=y
 CONFIG_ZONE_DMA=y
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_GENERIC_IOMAP=y
 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_HWEIGHT=y
-# CONFIG_GENERIC_GPIO is not set
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 # CONFIG_RWSEM_GENERIC_SPINLOCK is not set
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 # CONFIG_GENERIC_TIME_VSYSCALL is not set
@@ -34,22 +30,29 @@ CONFIG_ARCH_HAS_CPU_RELAX=y
 CONFIG_ARCH_HAS_DEFAULT_IDLE=y
 CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
 CONFIG_HAVE_SETUP_PER_CPU_AREA=y
+CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
+CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
 # CONFIG_HAVE_CPUMASK_OF_CPU_MAP is not set
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 # CONFIG_ZONE_DMA32 is not set
 CONFIG_ARCH_POPULATES_NODE_MAP=y
 # CONFIG_AUDIT_ARCH is not set
-CONFIG_ARCH_SUPPORTS_AOUT=y
 CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GENERIC_PENDING_IRQ=y
-CONFIG_X86_SMP=y
+CONFIG_USE_GENERIC_SMP_HELPERS=y
 CONFIG_X86_32_SMP=y
 CONFIG_X86_NO_TSS=y
 CONFIG_X86_NO_IDT=y
+CONFIG_X86_32_LAZY_GS=y
 CONFIG_KTIME_SCALAR=y
+CONFIG_SUSE_KERNEL=y
+# CONFIG_KERNEL_DESKTOP is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+CONFIG_CONSTRUCTORS=y
 
 #
 # General setup
@@ -59,20 +62,35 @@ CONFIG_LOCK_KERNEL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_KERNEL_GZIP=y
+# CONFIG_KERNEL_BZIP2 is not set
+# CONFIG_KERNEL_LZMA is not set
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
 CONFIG_AUDIT=y
 CONFIG_AUDITSYSCALL=y
 CONFIG_AUDIT_TREE=y
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_RCU=y
+# CONFIG_TREE_PREEMPT_RCU is not set
+# CONFIG_RCU_TRACE is not set
+CONFIG_RCU_FANOUT=32
+# CONFIG_RCU_FANOUT_EXACT is not set
+# CONFIG_TREE_RCU_TRACE is not set
 # CONFIG_IKCONFIG is not set
-CONFIG_LOG_BUF_SHIFT=15
-# CONFIG_CGROUPS 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
 # CONFIG_RELAY is not set
@@ -81,10 +99,15 @@ CONFIG_NAMESPACES=y
 # CONFIG_IPC_NS is not set
 # CONFIG_USER_NS is not set
 # CONFIG_PID_NS is not set
+# CONFIG_NET_NS is not set
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+CONFIG_RD_BZIP2=y
+CONFIG_RD_LZMA=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
+CONFIG_ANON_INODES=y
 # CONFIG_EMBEDDED is not set
 CONFIG_UID16=y
 CONFIG_SYSCTL_SYSCALL=y
@@ -95,22 +118,26 @@ CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_PCSPKR_PLATFORM=y
-CONFIG_COMPAT_BRK=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
-CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
 CONFIG_SIGNALFD=y
 CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
+CONFIG_AIO=y
+
+#
+# Kernel Performance Events And Counters
+#
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_PCI_QUIRKS=y
+CONFIG_COMPAT_BRK=y
 CONFIG_SLAB=y
 # CONFIG_SLUB is not set
 # CONFIG_SLOB is not set
+CONFIG_DEFAULT_VM_DIRTY_RATIO=40
 # CONFIG_PROFILING is not set
-CONFIG_TRACEPOINTS=y
-# CONFIG_MARKERS is not set
 CONFIG_HAVE_OPROFILE=y
 # CONFIG_KPROBES is not set
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -118,14 +145,16 @@ CONFIG_HAVE_IOREMAP_PROT=y
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
-# CONFIG_HAVE_DMA_ATTRS is not set
-CONFIG_USE_GENERIC_SMP_HELPERS=y
-# CONFIG_HAVE_CLK is not set
-CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_HAVE_DMA_API_DEBUG=y
+
+#
+# GCOV-based kernel profiling
+#
+CONFIG_SLOW_WORK=y
 CONFIG_HAVE_GENERIC_DMA_COHERENT=y
 CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
-# CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
 # CONFIG_MODULE_FORCE_LOAD is not set
@@ -133,13 +162,10 @@ CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_KMOD=y
 CONFIG_STOP_MACHINE=y
 # CONFIG_UTRACE is not set
 CONFIG_BLOCK=y
-CONFIG_LBD=y
-# CONFIG_BLK_DEV_IO_TRACE is not set
-CONFIG_LSF=y
+CONFIG_LBDAF=y
 # CONFIG_BLK_DEV_BSG is not set
 # CONFIG_BLK_DEV_INTEGRITY is not set
 
@@ -150,30 +176,21 @@ CONFIG_IOSCHED_NOOP=y
 CONFIG_IOSCHED_AS=y
 CONFIG_IOSCHED_DEADLINE=y
 CONFIG_IOSCHED_CFQ=y
-CONFIG_DEFAULT_AS=y
+# CONFIG_DEFAULT_AS is not set
 # CONFIG_DEFAULT_DEADLINE is not set
-# CONFIG_DEFAULT_CFQ is not set
+CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="anticipatory"
-CONFIG_CLASSIC_RCU=y
+CONFIG_DEFAULT_IOSCHED="cfq"
 CONFIG_FREEZER=y
 
 #
 # Processor type and features
 #
-# CONFIG_TICK_ONESHOT is not set
 CONFIG_SMP=y
-CONFIG_X86_FIND_SMP_CONFIG=y
+CONFIG_SPARSE_IRQ=y
 CONFIG_X86_MPPARSE=y
-# CONFIG_X86_PC is not set
 CONFIG_X86_XEN=y
-# CONFIG_X86_ELAN is not set
-# CONFIG_X86_VOYAGER is not set
-# CONFIG_X86_GENERICARCH is not set
-# CONFIG_X86_64_XEN is not set
-# CONFIG_X86_VSMP is not set
-# CONFIG_X86_RDC321X is not set
-CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
+CONFIG_SCHED_OMIT_FRAME_POINTER=y
 # CONFIG_M386 is not set
 # CONFIG_M486 is not set
 # CONFIG_M586 is not set
@@ -190,7 +207,6 @@ CONFIG_M586TSC=y
 # CONFIG_MCRUSOE is not set
 # CONFIG_MEFFICEON is not set
 # CONFIG_MWINCHIPC6 is not set
-# CONFIG_MWINCHIP2 is not set
 # CONFIG_MWINCHIP3D is not set
 # CONFIG_MGEODEGX1 is not set
 # CONFIG_MGEODE_LX is not set
@@ -199,9 +215,12 @@ CONFIG_M586TSC=y
 # CONFIG_MVIAC7 is not set
 # CONFIG_MPSC is not set
 # CONFIG_MCORE2 is not set
+# CONFIG_MATOM is not set
 # CONFIG_GENERIC_CPU is not set
 CONFIG_X86_GENERIC=y
 CONFIG_X86_CPU=y
+CONFIG_X86_L1_CACHE_BYTES=128
+CONFIG_X86_INTERNODE_CACHE_BYTES=128
 CONFIG_X86_CMPXCHG=y
 CONFIG_X86_L1_CACHE_SHIFT=7
 CONFIG_X86_XADD=y
@@ -213,17 +232,23 @@ CONFIG_X86_POPAD_OK=y
 CONFIG_X86_ALIGNMENT_16=y
 CONFIG_X86_INTEL_USERCOPY=y
 CONFIG_X86_CMPXCHG64=y
-CONFIG_X86_MINIMUM_CPU_FAMILY=4
+CONFIG_X86_MINIMUM_CPU_FAMILY=5
+CONFIG_CPU_SUP_INTEL=y
+CONFIG_CPU_SUP_CYRIX_32=y
+CONFIG_CPU_SUP_AMD=y
+CONFIG_CPU_SUP_CENTAUR=y
+CONFIG_CPU_SUP_TRANSMETA_32=y
 CONFIG_DMI=y
 CONFIG_SWIOTLB=y
 CONFIG_IOMMU_HELPER=y
-CONFIG_NR_CPUS=4
+# CONFIG_IOMMU_API is not set
+CONFIG_NR_CPUS=8
 CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
 # CONFIG_PREEMPT is not set
-# CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set
 CONFIG_X86_LOCAL_APIC=y
 CONFIG_X86_IO_APIC=y
+# CONFIG_X86_MCE is not set
 CONFIG_VM86=y
 CONFIG_TOSHIBA=m
 CONFIG_I8K=m
@@ -237,26 +262,31 @@ CONFIG_HIGHMEM4G=y
 CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_HIGHMEM=y
 CONFIG_X86_PAE=y
+CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_FLATMEM_MANUAL=y
 # CONFIG_DISCONTIGMEM_MANUAL is not set
 # CONFIG_SPARSEMEM_MANUAL is not set
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
-# CONFIG_SPARSEMEM_STATIC is not set
-# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
-CONFIG_RESOURCES_64BIT=y
+CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_ZONE_DMA_FLAG=1
 CONFIG_BOUNCE=y
 CONFIG_VIRT_TO_BUS=y
+CONFIG_HAVE_MLOCK=y
+CONFIG_HAVE_MLOCKED_PAGE_BIT=y
+# CONFIG_KSM is not set
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+# CONFIG_PRECACHE is not set
+# CONFIG_PRESWAP is not set
 # CONFIG_HIGHPTE is not set
 CONFIG_MTRR=y
 # CONFIG_X86_PAT is not set
 CONFIG_SECCOMP=y
 # CONFIG_SECCOMP_DISABLE_TSC is not set
+# CONFIG_CC_STACKPROTECTOR is not set
 CONFIG_HZ_100=y
 # CONFIG_HZ_250 is not set
 # CONFIG_HZ_300 is not set
@@ -265,12 +295,13 @@ CONFIG_HZ=100
 # CONFIG_SCHED_HRTICK is not set
 # CONFIG_KEXEC is not set
 CONFIG_PHYSICAL_START=0x100000
-CONFIG_PHYSICAL_ALIGN=0x100000
+CONFIG_PHYSICAL_ALIGN=0x2000
 CONFIG_HOTPLUG_CPU=y
 CONFIG_COMPAT_VDSO=y
+# CONFIG_CMDLINE_BOOL is not set
 
 #
-# Power management options
+# Power management and ACPI options
 #
 CONFIG_PM=y
 # CONFIG_PM_DEBUG is not set
@@ -278,10 +309,12 @@ CONFIG_PM_SLEEP_SMP=y
 CONFIG_PM_SLEEP=y
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
+# CONFIG_PM_RUNTIME is not set
 CONFIG_ACPI=y
 CONFIG_ACPI_SLEEP=y
 # CONFIG_ACPI_PROCFS is not set
 CONFIG_ACPI_PROCFS_POWER=y
+CONFIG_ACPI_POWER_METER=m
 CONFIG_ACPI_SYSFS_POWER=y
 CONFIG_ACPI_PROC_EVENT=y
 CONFIG_ACPI_AC=m
@@ -289,26 +322,21 @@ CONFIG_ACPI_BATTERY=m
 CONFIG_ACPI_BUTTON=m
 CONFIG_ACPI_VIDEO=m
 CONFIG_ACPI_FAN=m
-CONFIG_ACPI_DOCK=m
+CONFIG_ACPI_DOCK=y
 CONFIG_ACPI_PROCESSOR=m
 CONFIG_ACPI_HOTPLUG_CPU=y
+CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
 CONFIG_ACPI_THERMAL=m
-CONFIG_ACPI_WMI=m
-CONFIG_ACPI_ASUS=m
-CONFIG_ACPI_TOSHIBA=m
 CONFIG_ACPI_CUSTOM_DSDT_FILE=""
 # CONFIG_ACPI_CUSTOM_DSDT is not set
-# CONFIG_ACPI_CUSTOM_DSDT_INITRD is not set
 CONFIG_ACPI_BLACKLIST_YEAR=0
 # CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_EC=y
 CONFIG_ACPI_PCI_SLOT=m
-CONFIG_ACPI_POWER=y
-CONFIG_ACPI_SYSTEM=y
 CONFIG_ACPI_CONTAINER=m
 CONFIG_ACPI_SBS=m
 CONFIG_ACPI_PV_SLEEP=y
 CONFIG_PROCESSOR_EXTERNAL_CONTROL=y
+# CONFIG_SFI is not set
 
 #
 # CPU Frequency scaling
@@ -331,11 +359,17 @@ CONFIG_XEN_PCIDEV_FRONTEND=y
 # CONFIG_XEN_PCIDEV_FE_DEBUG is not set
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCIEAER=y
+# CONFIG_PCIE_ECRC is not set
+# CONFIG_PCIEAER_INJECT is not set
 # CONFIG_PCIEASPM is not set
 CONFIG_ARCH_SUPPORTS_MSI=y
 CONFIG_PCI_MSI=y
-CONFIG_PCI_REASSIGN=y
 CONFIG_PCI_LEGACY=y
+CONFIG_PCI_GUESTDEV=y
+CONFIG_PCI_IOMULTI=y
+CONFIG_PCI_RESERVE=y
+CONFIG_PCI_STUB=m
+CONFIG_PCI_IOV=y
 CONFIG_ISA_DMA_API=y
 CONFIG_SCx200=m
 CONFIG_SCx200HR_TIMER=m
@@ -366,8 +400,11 @@ CONFIG_PCCARD_NONSTATIC=m
 # Executable file formats / Emulations
 #
 CONFIG_BINFMT_ELF=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_HAVE_AOUT=y
 # CONFIG_BINFMT_AOUT is not set
 # CONFIG_BINFMT_MISC is not set
+CONFIG_HAVE_ATOMIC_IOMAP=y
 CONFIG_NET=y
 
 #
@@ -410,7 +447,7 @@ CONFIG_INET_TUNNEL=m
 CONFIG_INET_XFRM_MODE_TRANSPORT=y
 CONFIG_INET_XFRM_MODE_TUNNEL=y
 CONFIG_INET_XFRM_MODE_BEET=y
-CONFIG_INET_LRO=m
+CONFIG_INET_LRO=y
 CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 CONFIG_TCP_CONG_ADVANCED=y
@@ -434,7 +471,6 @@ CONFIG_TCP_CONG_ILLINOIS=m
 CONFIG_DEFAULT_RENO=y
 CONFIG_DEFAULT_TCP_CONG="reno"
 # CONFIG_TCP_MD5SIG is not set
-# CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
 CONFIG_NETFILTER=y
@@ -467,19 +503,24 @@ CONFIG_NF_CONNTRACK_SIP=m
 CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NF_CONNTRACK_SLP=m
 CONFIG_NF_CT_NETLINK=m
+CONFIG_NETFILTER_TPROXY=m
 CONFIG_NETFILTER_XTABLES=m
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
 CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HL=m
+CONFIG_NETFILTER_XT_TARGET_LED=m
 CONFIG_NETFILTER_XT_TARGET_IMQ=m
 CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
 CONFIG_NETFILTER_XT_TARGET_RATEEST=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
 CONFIG_NETFILTER_XT_TARGET_TRACE=m
 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
 CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
@@ -488,21 +529,26 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
 CONFIG_NETFILTER_XT_MATCH_DCCP=m
 CONFIG_NETFILTER_XT_MATCH_DSCP=m
 CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_HL=m
 CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
 CONFIG_NETFILTER_XT_MATCH_MAC=m
 CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
 CONFIG_NETFILTER_XT_MATCH_OWNER=m
 CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
 CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
 CONFIG_NETFILTER_XT_MATCH_QUOTA=m
 CONFIG_NETFILTER_XT_MATCH_RATEEST=m
 CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT=y
 CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
 CONFIG_NETFILTER_XT_MATCH_STATE=m
 CONFIG_NETFILTER_XT_MATCH_LAYER7=m
 # CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG is not set
@@ -511,20 +557,21 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
 CONFIG_NETFILTER_XT_MATCH_TIME=m
 CONFIG_NETFILTER_XT_MATCH_U32=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
+# CONFIG_IP_VS is not set
 
 #
 # IP: Netfilter Configuration
 #
+CONFIG_NF_DEFRAG_IPV4=m
 CONFIG_NF_CONNTRACK_IPV4=m
 CONFIG_NF_CONNTRACK_PROC_COMPAT=y
 CONFIG_IP_NF_QUEUE=m
 CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_RECENT=m
-CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
 CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
 CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
 CONFIG_IP_NF_MATCH_IPV4OPTIONS=m
 CONFIG_IP_NF_FILTER=m
 CONFIG_IP_NF_TARGET_REJECT=m
@@ -533,8 +580,8 @@ CONFIG_IP_NF_TARGET_ULOG=m
 CONFIG_NF_NAT=m
 CONFIG_NF_NAT_NEEDED=y
 CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
 CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
 CONFIG_NF_NAT_SNMP_BASIC=m
 CONFIG_NF_NAT_PROTO_DCCP=m
 CONFIG_NF_NAT_PROTO_GRE=m
@@ -548,18 +595,14 @@ CONFIG_NF_NAT_PPTP=m
 CONFIG_NF_NAT_H323=m
 CONFIG_NF_NAT_SIP=m
 CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
 CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
 CONFIG_IP_NF_RAW=m
 CONFIG_IP_NF_ARPTABLES=m
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
 CONFIG_IP_NF_MATCH_IPP2P=m
-
-#
-# Bridge: Netfilter Configuration
-#
 CONFIG_BRIDGE_NF_EBTABLES=m
 CONFIG_BRIDGE_EBT_BROUTE=m
 CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -583,6 +626,9 @@ CONFIG_BRIDGE_EBT_ULOG=m
 CONFIG_BRIDGE_EBT_NFLOG=m
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_SCTP is not set
+CONFIG_RDS=m
+CONFIG_RDS_TCP=m
+# CONFIG_RDS_DEBUG is not set
 # CONFIG_TIPC is not set
 CONFIG_ATM=m
 CONFIG_ATM_CLIP=m
@@ -593,6 +639,15 @@ CONFIG_ATM_BR2684=m
 CONFIG_STP=m
 CONFIG_GARP=m
 CONFIG_BRIDGE=m
+CONFIG_NET_DSA=y
+CONFIG_NET_DSA_TAG_DSA=y
+CONFIG_NET_DSA_TAG_EDSA=y
+CONFIG_NET_DSA_TAG_TRAILER=y
+CONFIG_NET_DSA_MV88E6XXX=y
+CONFIG_NET_DSA_MV88E6060=y
+CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y
+CONFIG_NET_DSA_MV88E6131=y
+CONFIG_NET_DSA_MV88E6123_61_65=y
 CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_GVRP=y
 # CONFIG_DECNET is not set
@@ -604,6 +659,8 @@ CONFIG_LLC=m
 # CONFIG_LAPB is not set
 # CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
+CONFIG_PHONET=m
+CONFIG_IEEE802154=m
 CONFIG_NET_SCHED=y
 
 #
@@ -622,6 +679,7 @@ CONFIG_NET_SCH_TBF=m
 CONFIG_NET_SCH_GRED=m
 CONFIG_NET_SCH_DSMARK=m
 CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_DRR=m
 CONFIG_NET_SCH_INGRESS=m
 
 #
@@ -655,7 +713,7 @@ CONFIG_NET_ACT_IPT=m
 CONFIG_NET_ACT_NAT=m
 CONFIG_NET_ACT_PEDIT=m
 # CONFIG_NET_ACT_SIMP is not set
-# CONFIG_NET_ACT_SKBEDIT is not set
+CONFIG_NET_ACT_SKBEDIT=m
 CONFIG_NET_CLS_IND=y
 CONFIG_NET_SCH_FIFO=y
 # CONFIG_DCB is not set
@@ -741,37 +799,40 @@ CONFIG_BT_HCIBT3C=m
 CONFIG_BT_HCIBLUECARD=m
 CONFIG_BT_HCIBTUART=m
 CONFIG_BT_HCIVHCI=m
+CONFIG_BT_MRVL=m
+CONFIG_BT_MRVL_SDIO=m
 CONFIG_AF_RXRPC=m
 # CONFIG_AF_RXRPC_DEBUG is not set
 CONFIG_RXKAD=m
 CONFIG_FIB_RULES=y
-
-#
-# Wireless
-#
+CONFIG_WIRELESS=y
 CONFIG_CFG80211=m
-CONFIG_NL80211=y
+# CONFIG_NL80211_TESTMODE is not set
+# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
+# CONFIG_CFG80211_REG_DEBUG is not set
+# CONFIG_CFG80211_DEFAULT_PS is not set
+CONFIG_CFG80211_DEFAULT_PS_VALUE=0
+CONFIG_WIRELESS_OLD_REGULATORY=y
 CONFIG_WIRELESS_EXT=y
 CONFIG_WIRELESS_EXT_SYSFS=y
+CONFIG_LIB80211=m
+CONFIG_LIB80211_CRYPT_WEP=m
+CONFIG_LIB80211_CRYPT_CCMP=m
+CONFIG_LIB80211_CRYPT_TKIP=m
+# CONFIG_LIB80211_DEBUG is not set
 CONFIG_MAC80211=m
-
-#
-# Rate control algorithm selection
-#
-CONFIG_MAC80211_RC_PID=y
-CONFIG_MAC80211_RC_DEFAULT_PID=y
-CONFIG_MAC80211_RC_DEFAULT="pid"
+CONFIG_MAC80211_RC_MINSTREL=y
+# CONFIG_MAC80211_RC_DEFAULT_PID is not set
+CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT="minstrel"
 CONFIG_MAC80211_MESH=y
 CONFIG_MAC80211_LEDS=y
 # CONFIG_MAC80211_DEBUG_MENU is not set
-CONFIG_IEEE80211=m
-# CONFIG_IEEE80211_DEBUG is not set
-CONFIG_IEEE80211_CRYPT_WEP=m
-CONFIG_IEEE80211_CRYPT_CCMP=m
-CONFIG_IEEE80211_CRYPT_TKIP=m
+CONFIG_WIMAX=m
+CONFIG_WIMAX_DEBUG_LEVEL=8
 CONFIG_RFKILL=m
-CONFIG_RFKILL_INPUT=m
 CONFIG_RFKILL_LEDS=y
+CONFIG_RFKILL_INPUT=y
 # CONFIG_NET_9P is not set
 # CONFIG_NETVM is not set
 
@@ -783,6 +844,7 @@ CONFIG_RFKILL_LEDS=y
 # Generic Driver Options
 #
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+# CONFIG_DEVTMPFS is not set
 # CONFIG_STANDALONE is not set
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
 CONFIG_FW_LOADER=y
@@ -792,6 +854,7 @@ CONFIG_SYS_HYPERVISOR=y
 CONFIG_CONNECTOR=m
 CONFIG_MTD=m
 # CONFIG_MTD_DEBUG is not set
+CONFIG_MTD_TESTS=m
 CONFIG_MTD_CONCAT=m
 CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_REDBOOT_PARTS is not set
@@ -834,6 +897,8 @@ CONFIG_MTD_CFI_I2=y
 # Mapping drivers for chip access
 #
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
+CONFIG_MTD_PHYSMAP=m
+# CONFIG_MTD_PHYSMAP_COMPAT is not set
 # CONFIG_MTD_TS5500 is not set
 # CONFIG_MTD_INTEL_VR_NOR is not set
 # CONFIG_MTD_PLATRAM is not set
@@ -856,6 +921,12 @@ CONFIG_MTD_CFI_I2=y
 # CONFIG_MTD_NAND is not set
 # CONFIG_MTD_ONENAND is not set
 
+#
+# LPDDR flash memory drivers
+#
+CONFIG_MTD_LPDDR=m
+CONFIG_MTD_QINFO_PROBE=m
+
 #
 # UBI - Unsorted block images
 #
@@ -878,7 +949,7 @@ CONFIG_PARPORT_AX88796=m
 CONFIG_PARPORT_1284=y
 CONFIG_PARPORT_NOT_PC=y
 CONFIG_PNP=y
-# CONFIG_PNP_DEBUG is not set
+# CONFIG_PNP_DEBUG_MESSAGES is not set
 
 #
 # Protocols
@@ -896,6 +967,7 @@ CONFIG_BLK_DEV_DAC960=m
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_CRYPTOLOOP=m
 CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_OSD=m
 CONFIG_BLK_DEV_SX8=m
 # CONFIG_BLK_DEV_UB is not set
 CONFIG_BLK_DEV_RAM=y
@@ -909,48 +981,44 @@ CONFIG_ATA_OVER_ETH=m
 CONFIG_MISC_DEVICES=y
 # CONFIG_IBM_ASM is not set
 # CONFIG_PHANTOM is not set
-CONFIG_EEPROM_93CX6=m
 # CONFIG_SGI_IOC4 is not set
 CONFIG_TIFM_CORE=m
 CONFIG_TIFM_7XX1=m
-CONFIG_ACER_WMI=m
-CONFIG_ASUS_LAPTOP=m
-CONFIG_FUJITSU_LAPTOP=m
-CONFIG_FUJITSU_LAPTOP_DEBUG=y
-CONFIG_TC1100_WMI=m
-CONFIG_HP_WMI=m
-CONFIG_MSI_LAPTOP=m
-# CONFIG_PANASONIC_LAPTOP is not set
-CONFIG_COMPAL_LAPTOP=m
-CONFIG_SONY_LAPTOP=m
-# CONFIG_SONYPI_COMPAT is not set
-CONFIG_THINKPAD_ACPI=m
-# CONFIG_THINKPAD_ACPI_DEBUG is not set
-CONFIG_THINKPAD_ACPI_VIDEO=y
-CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
-CONFIG_INTEL_MENLOW=m
-CONFIG_EEEPC_LAPTOP=m
+CONFIG_ICS932S401=m
 CONFIG_ENCLOSURE_SERVICES=m
 CONFIG_HP_ILO=m
+CONFIG_ISL29003=m
+CONFIG_C2PORT=m
+CONFIG_C2PORT_DURAMAR_2150=m
+
+#
+# EEPROM support
+#
+CONFIG_EEPROM_AT24=m
+CONFIG_EEPROM_LEGACY=m
+CONFIG_EEPROM_MAX6875=m
+CONFIG_EEPROM_93CX6=m
+CONFIG_CB710_CORE=m
+# CONFIG_CB710_DEBUG is not set
+CONFIG_CB710_DEBUG_ASSUMPTIONS=y
 CONFIG_HAVE_IDE=y
 CONFIG_IDE=y
-CONFIG_BLK_DEV_IDE=m
 
 #
 # Please see Documentation/ide/ide.txt for help/info on IDE drives
 #
+CONFIG_IDE_XFER_MODE=y
 CONFIG_IDE_TIMINGS=y
 CONFIG_IDE_ATAPI=y
 # CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_BLK_DEV_IDEDISK=m
-# CONFIG_IDEDISK_MULTI_MODE is not set
+CONFIG_IDE_GD=m
+CONFIG_IDE_GD_ATA=y
+# CONFIG_IDE_GD_ATAPI is not set
 CONFIG_BLK_DEV_IDECS=m
 CONFIG_BLK_DEV_DELKIN=m
 CONFIG_BLK_DEV_IDECD=m
 CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
 # CONFIG_BLK_DEV_IDETAPE is not set
-CONFIG_BLK_DEV_IDEFLOPPY=m
-# CONFIG_BLK_DEV_IDESCSI is not set
 CONFIG_BLK_DEV_IDEACPI=y
 # CONFIG_IDE_TASK_IOCTL is not set
 CONFIG_IDE_PROC_FS=y
@@ -969,6 +1037,7 @@ CONFIG_BLK_DEV_IDEDMA_SFF=y
 # PCI IDE chipsets support
 #
 CONFIG_BLK_DEV_IDEPCI=y
+CONFIG_IDEPCI_PCIBUS_ORDER=y
 # CONFIG_BLK_DEV_OFFBOARD is not set
 CONFIG_BLK_DEV_GENERIC=m
 CONFIG_BLK_DEV_OPTI621=m
@@ -983,10 +1052,12 @@ CONFIG_BLK_DEV_TRIFLEX=m
 CONFIG_BLK_DEV_CS5520=m
 CONFIG_BLK_DEV_CS5530=m
 CONFIG_BLK_DEV_CS5535=m
+CONFIG_BLK_DEV_CS5536=m
 CONFIG_BLK_DEV_HPT366=m
 CONFIG_BLK_DEV_JMICRON=m
 CONFIG_BLK_DEV_SC1200=m
 CONFIG_BLK_DEV_PIIX=m
+CONFIG_BLK_DEV_IT8172=m
 CONFIG_BLK_DEV_IT8213=m
 CONFIG_BLK_DEV_IT821X=m
 CONFIG_BLK_DEV_NS87415=m
@@ -1022,10 +1093,6 @@ CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=m
 CONFIG_CHR_DEV_SCH=m
 CONFIG_SCSI_ENCLOSURE=m
-
-#
-# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-#
 CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
@@ -1046,8 +1113,11 @@ CONFIG_SCSI_SAS_LIBSAS_DEBUG=y
 CONFIG_SCSI_SRP_ATTRS=m
 CONFIG_SCSI_LOWLEVEL=y
 CONFIG_ISCSI_TCP=m
-# CONFIG_SCSI_CXGB3_ISCSI is not set
+CONFIG_SCSI_CXGB3_ISCSI=m
+CONFIG_SCSI_BNX2_ISCSI=m
+CONFIG_BE2ISCSI=m
 CONFIG_BLK_DEV_3W_XXXX_RAID=m
+CONFIG_SCSI_HPSA=m
 CONFIG_SCSI_3W_9XXX=m
 CONFIG_SCSI_ACARD=m
 CONFIG_SCSI_AACRAID=m
@@ -1068,6 +1138,8 @@ CONFIG_AIC79XX_DEBUG_MASK=0
 # CONFIG_AIC79XX_REG_PRETTY_PRINT is not set
 CONFIG_SCSI_AIC94XX=m
 # CONFIG_AIC94XX_DEBUG is not set
+CONFIG_SCSI_MVSAS=m
+CONFIG_SCSI_MVSAS_DEBUG=y
 CONFIG_SCSI_DPT_I2O=m
 CONFIG_SCSI_ADVANSYS=m
 CONFIG_SCSI_ARCMSR=m
@@ -1077,11 +1149,14 @@ CONFIG_MEGARAID_MM=m
 CONFIG_MEGARAID_MAILBOX=m
 CONFIG_MEGARAID_LEGACY=m
 CONFIG_MEGARAID_SAS=m
+# CONFIG_SCSI_MPT2SAS is not set
 CONFIG_SCSI_HPTIOP=m
 CONFIG_SCSI_BUSLOGIC=m
 CONFIG_SCSI_FLASHPOINT=y
-# CONFIG_LIBFC is not set
-# CONFIG_FCOE is not set
+CONFIG_LIBFC=m
+CONFIG_LIBFCOE=m
+CONFIG_FCOE=m
+CONFIG_FCOE_FNIC=m
 CONFIG_SCSI_DMX3191D=m
 CONFIG_SCSI_EATA=m
 CONFIG_SCSI_EATA_TAGGED_QUEUE=y
@@ -1096,7 +1171,6 @@ CONFIG_SCSI_PPA=m
 CONFIG_SCSI_IMM=m
 # CONFIG_SCSI_IZIP_EPP16 is not set
 # CONFIG_SCSI_IZIP_SLOW_CTR is not set
-CONFIG_SCSI_MVSAS=m
 CONFIG_SCSI_STEX=m
 CONFIG_SCSI_SYM53C8XX_2=m
 CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
@@ -1114,7 +1188,9 @@ CONFIG_SCSI_DC395x=m
 CONFIG_SCSI_DC390T=m
 CONFIG_SCSI_NSP32=m
 # CONFIG_SCSI_DEBUG is not set
+CONFIG_SCSI_PMCRAID=m
 # CONFIG_SCSI_SRP is not set
+CONFIG_SCSI_BFA_FC=m
 CONFIG_SCSI_LOWLEVEL_PCMCIA=y
 CONFIG_PCMCIA_AHA152X=m
 CONFIG_PCMCIA_FDOMAIN=m
@@ -1126,8 +1202,13 @@ CONFIG_SCSI_DH_RDAC=m
 CONFIG_SCSI_DH_HP_SW=m
 CONFIG_SCSI_DH_EMC=m
 CONFIG_SCSI_DH_ALUA=m
+CONFIG_SCSI_OSD_INITIATOR=m
+CONFIG_SCSI_OSD_ULD=m
+CONFIG_SCSI_OSD_DPRINT_SENSE=1
+# CONFIG_SCSI_OSD_DEBUG is not set
 CONFIG_ATA=m
 # CONFIG_ATA_NONSTANDARD is not set
+CONFIG_ATA_VERBOSE_ERROR=y
 CONFIG_ATA_ACPI=y
 CONFIG_SATA_PMP=y
 CONFIG_SATA_AHCI=m
@@ -1151,6 +1232,7 @@ CONFIG_PATA_ACPI=m
 CONFIG_PATA_ALI=m
 CONFIG_PATA_AMD=m
 CONFIG_PATA_ARTOP=m
+CONFIG_PATA_ATP867X=m
 CONFIG_PATA_ATIIXP=m
 CONFIG_PATA_CMD640_PCI=m
 CONFIG_PATA_CMD64X=m
@@ -1182,6 +1264,7 @@ CONFIG_PATA_OPTIDMA=m
 CONFIG_PATA_PCMCIA=m
 CONFIG_PATA_PDC_OLD=m
 CONFIG_PATA_RADISYS=m
+CONFIG_PATA_RDC=m
 CONFIG_PATA_RZ1000=m
 CONFIG_PATA_SC1200=m
 CONFIG_PATA_SERVERWORKS=m
@@ -1198,7 +1281,9 @@ CONFIG_MD_RAID0=m
 CONFIG_MD_RAID1=m
 CONFIG_MD_RAID10=m
 CONFIG_MD_RAID456=m
-CONFIG_MD_RAID5_RESHAPE=y
+CONFIG_MULTICORE_RAID456=y
+CONFIG_MD_RAID6_PQ=m
+# CONFIG_ASYNC_RAID6_TEST is not set
 CONFIG_MD_MULTIPATH=m
 # CONFIG_MD_FAULTY is not set
 CONFIG_BLK_DEV_DM=m
@@ -1206,8 +1291,11 @@ CONFIG_BLK_DEV_DM=m
 CONFIG_DM_CRYPT=m
 CONFIG_DM_SNAPSHOT=m
 CONFIG_DM_MIRROR=m
+CONFIG_DM_LOG_USERSPACE=m
 CONFIG_DM_ZERO=m
 CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_QL=m
+CONFIG_DM_MULTIPATH_ST=m
 CONFIG_DM_DELAY=m
 CONFIG_DM_RAID45=m
 CONFIG_DM_UEVENT=y
@@ -1225,12 +1313,17 @@ CONFIG_FUSION_CTL=m
 #
 
 #
-# Enable only one of the two stacks, unless you know what you are doing
+# You can enable one or both FireWire driver stacks.
+#
+
+#
+# See the help texts for more information.
 #
 CONFIG_FIREWIRE=m
 CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_OHCI_DEBUG=y
 CONFIG_FIREWIRE_SBP2=m
+CONFIG_FIREWIRE_NET=m
 CONFIG_IEEE1394=m
 CONFIG_IEEE1394_OHCI1394=m
 CONFIG_IEEE1394_PCILYNX=m
@@ -1260,7 +1353,7 @@ CONFIG_TUN=m
 CONFIG_VETH=m
 CONFIG_NET_SB1000=m
 # CONFIG_ARCNET is not set
-CONFIG_PHYLIB=m
+CONFIG_PHYLIB=y
 
 #
 # MII PHY device drivers
@@ -1275,6 +1368,10 @@ CONFIG_SMSC_PHY=m
 CONFIG_BROADCOM_PHY=m
 CONFIG_ICPLUS_PHY=m
 CONFIG_REALTEK_PHY=m
+CONFIG_NATIONAL_PHY=m
+CONFIG_STE10XP=m
+CONFIG_LSI_ET1011C_PHY=m
+# CONFIG_FIXED_PHY is not set
 CONFIG_MDIO_BITBANG=m
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=m
@@ -1284,8 +1381,11 @@ CONFIG_CASSINI=m
 CONFIG_NET_VENDOR_3COM=y
 CONFIG_VORTEX=m
 CONFIG_TYPHOON=m
+CONFIG_ETHOC=m
+CONFIG_DNET=m
 CONFIG_NET_TULIP=y
 CONFIG_DE2104X=m
+CONFIG_DE2104X_DSL=0
 CONFIG_TULIP=m
 # CONFIG_TULIP_MWI is not set
 # CONFIG_TULIP_MMIO is not set
@@ -1300,6 +1400,9 @@ CONFIG_HP100=m
 # CONFIG_IBM_NEW_EMAC_RGMII is not set
 # CONFIG_IBM_NEW_EMAC_TAH is not set
 # CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
 CONFIG_NET_PCI=y
 CONFIG_PCNET32=m
 CONFIG_AMD8111_ETH=m
@@ -1310,7 +1413,6 @@ CONFIG_B44_PCICORE_AUTOSELECT=y
 CONFIG_B44_PCI=y
 CONFIG_FORCEDETH=m
 # CONFIG_FORCEDETH_NAPI is not set
-CONFIG_EEPRO100=m
 CONFIG_E100=m
 CONFIG_FEALNX=m
 CONFIG_NATSEMI=m
@@ -1324,9 +1426,12 @@ CONFIG_8139TOO_8129=y
 CONFIG_R6040=m
 CONFIG_SIS900=m
 CONFIG_EPIC100=m
+CONFIG_SMSC9420=m
 CONFIG_SUNDANCE=m
 CONFIG_SUNDANCE_MMIO=y
 CONFIG_TLAN=m
+CONFIG_KS8842=m
+CONFIG_KS8851_MLL=m
 CONFIG_VIA_RHINE=m
 CONFIG_VIA_RHINE_MMIO=y
 CONFIG_SC92031=m
@@ -1334,17 +1439,17 @@ CONFIG_NET_POCKET=y
 CONFIG_ATP=m
 CONFIG_DE600=m
 CONFIG_DE620=m
-# CONFIG_ATL2 is not set
+CONFIG_ATL2=m
 CONFIG_NETDEV_1000=y
 CONFIG_ACENIC=m
 # CONFIG_ACENIC_OMIT_TIGON_I is not set
 CONFIG_DL2K=m
 CONFIG_E1000=m
-# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
 CONFIG_E1000E=m
 CONFIG_IP1000=m
 CONFIG_IGB=m
-# CONFIG_IGB_LRO is not set
+CONFIG_IGB_DCA=y
+CONFIG_IGBVF=m
 CONFIG_NS83820=m
 CONFIG_HAMACHI=m
 CONFIG_YELLOWFIN=m
@@ -1356,74 +1461,158 @@ CONFIG_SKY2=m
 CONFIG_VIA_VELOCITY=m
 CONFIG_TIGON3=m
 CONFIG_BNX2=m
+CONFIG_CNIC=m
 CONFIG_QLA3XXX=m
 CONFIG_ATL1=m
 CONFIG_ATL1E=m
+CONFIG_ATL1C=m
+CONFIG_JME=m
 CONFIG_NETDEV_10000=y
+CONFIG_MDIO=m
 CONFIG_CHELSIO_T1=m
 # CONFIG_CHELSIO_T1_1G is not set
+CONFIG_CHELSIO_T3_DEPENDS=y
 CONFIG_CHELSIO_T3=m
+CONFIG_ENIC=m
 CONFIG_IXGBE=m
-CONFIG_IXGBE_LRO=y
+CONFIG_IXGBE_DCA=y
 CONFIG_IXGB=m
 CONFIG_S2IO=m
+CONFIG_VXGE=m
+# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
 CONFIG_MYRI10GE=m
+CONFIG_MYRI10GE_DCA=y
 CONFIG_NETXEN_NIC=m
 CONFIG_NIU=m
-# CONFIG_MLX4_CORE is not set
+CONFIG_MLX4_EN=m
+CONFIG_MLX4_CORE=m
+CONFIG_MLX4_DEBUG=y
 CONFIG_TEHUTI=m
 CONFIG_BNX2X=m
-CONFIG_SFC=m
-CONFIG_SFC_DRIVERLINK=y
-CONFIG_SFC_RESOURCE=m
+CONFIG_QLGE=m
+# CONFIG_SFC is not set
+CONFIG_BE2NET=m
 # CONFIG_TR is not set
-
-#
-# Wireless LAN
-#
+CONFIG_WLAN=y
 # CONFIG_WLAN_PRE80211 is not set
 CONFIG_WLAN_80211=y
 CONFIG_PCMCIA_RAYCS=m
-# CONFIG_IPW2100 is not set
-# CONFIG_IPW2200 is not set
-# CONFIG_LIBERTAS is not set
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_USB=m
+CONFIG_LIBERTAS_CS=m
+CONFIG_LIBERTAS_SDIO=m
+# CONFIG_LIBERTAS_DEBUG is not set
+CONFIG_LIBERTAS_THINFIRM=m
+CONFIG_LIBERTAS_THINFIRM_USB=m
 CONFIG_AIRO=m
-CONFIG_HERMES=m
-CONFIG_PLX_HERMES=m
-CONFIG_TMD_HERMES=m
-CONFIG_NORTEL_HERMES=m
-CONFIG_PCI_HERMES=m
-CONFIG_PCMCIA_HERMES=m
-CONFIG_PCMCIA_SPECTRUM=m
 CONFIG_ATMEL=m
 CONFIG_PCI_ATMEL=m
 CONFIG_PCMCIA_ATMEL=m
+CONFIG_AT76C50X_USB=m
 CONFIG_AIRO_CS=m
 CONFIG_PCMCIA_WL3501=m
 CONFIG_PRISM54=m
 CONFIG_USB_ZD1201=m
 CONFIG_USB_NET_RNDIS_WLAN=m
-# CONFIG_RTL8180 is not set
-# CONFIG_RTL8187 is not set
-# CONFIG_ADM8211 is not set
+CONFIG_RTL8180=m
+CONFIG_RTL8187=m
+CONFIG_RTL8187_LEDS=y
+CONFIG_ADM8211=m
 # CONFIG_MAC80211_HWSIM is not set
-# CONFIG_P54_COMMON is not set
-# CONFIG_ATH5K is not set
-# CONFIG_ATH9K is not set
-# CONFIG_IWLCORE is not set
+CONFIG_MWL8K=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+CONFIG_P54_LEDS=y
+CONFIG_ATH_COMMON=m
+CONFIG_ATH5K=m
+# CONFIG_ATH5K_DEBUG is not set
+CONFIG_ATH9K=m
+# CONFIG_ATH9K_DEBUG is not set
+CONFIG_AR9170_USB=m
+CONFIG_AR9170_LEDS=y
+CONFIG_IPW2100=m
+# CONFIG_IPW2100_MONITOR is not set
+# CONFIG_IPW2100_DEBUG is not set
+CONFIG_IPW2200=m
+# CONFIG_IPW2200_MONITOR is not set
+# CONFIG_IPW2200_QOS is not set
+# CONFIG_IPW2200_DEBUG is not set
+CONFIG_LIBIPW=m
+# CONFIG_LIBIPW_DEBUG is not set
+CONFIG_IWLWIFI=m
 # CONFIG_IWLWIFI_LEDS is not set
-# CONFIG_IWLAGN is not set
-# CONFIG_IWL3945 is not set
+# CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT is not set
+# CONFIG_IWLWIFI_DEBUG is not set
+CONFIG_IWLAGN=m
+CONFIG_IWL4965=y
+CONFIG_IWL5000=y
+CONFIG_IWL3945=m
+# CONFIG_IWL3945_SPECTRUM_MEASUREMENT is not set
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
 # CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
 CONFIG_HOSTAP_PLX=m
 CONFIG_HOSTAP_PCI=m
 CONFIG_HOSTAP_CS=m
-# CONFIG_B43 is not set
-# CONFIG_B43LEGACY is not set
-# CONFIG_ZD1211RW is not set
-# CONFIG_RT2X00 is not set
+CONFIG_B43=m
+CONFIG_B43_PCI_AUTOSELECT=y
+CONFIG_B43_PCICORE_AUTOSELECT=y
+CONFIG_B43_PCMCIA=y
+CONFIG_B43_SDIO=y
+CONFIG_B43_PIO=y
+CONFIG_B43_PHY_LP=y
+CONFIG_B43_LEDS=y
+CONFIG_B43_HWRNG=y
+# CONFIG_B43_DEBUG is not set
+CONFIG_B43LEGACY=m
+CONFIG_B43LEGACY_PCI_AUTOSELECT=y
+CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
+CONFIG_B43LEGACY_LEDS=y
+CONFIG_B43LEGACY_HWRNG=y
+CONFIG_B43LEGACY_DEBUG=y
+CONFIG_B43LEGACY_DMA=y
+CONFIG_B43LEGACY_PIO=y
+CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
+# CONFIG_B43LEGACY_DMA_MODE is not set
+# CONFIG_B43LEGACY_PIO_MODE is not set
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_RT2X00=m
+CONFIG_RT2400PCI=m
+CONFIG_RT2500PCI=m
+CONFIG_RT61PCI=m
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+CONFIG_RT2X00_LIB_PCI=m
+CONFIG_RT2X00_LIB_USB=m
+CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_HT=y
+CONFIG_RT2X00_LIB_FIRMWARE=y
+CONFIG_RT2X00_LIB_CRYPTO=y
+CONFIG_RT2X00_LIB_LEDS=y
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_HERMES=m
+CONFIG_HERMES_CACHE_FW_ON_INIT=y
+CONFIG_PLX_HERMES=m
+CONFIG_TMD_HERMES=m
+CONFIG_NORTEL_HERMES=m
+CONFIG_PCI_HERMES=m
+CONFIG_PCMCIA_HERMES=m
+CONFIG_PCMCIA_SPECTRUM=m
+CONFIG_WL12XX=m
+CONFIG_WL1251=m
+CONFIG_WL1251_SDIO=m
+CONFIG_IWM=m
+
+#
+# WiMAX Wireless Broadband devices
+#
+CONFIG_WIMAX_I2400M=m
+CONFIG_WIMAX_I2400M_USB=m
+CONFIG_WIMAX_I2400M_SDIO=m
+CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
 
 #
 # USB Network Adapters
@@ -1435,7 +1624,9 @@ CONFIG_USB_RTL8150=m
 CONFIG_USB_USBNET=m
 CONFIG_USB_NET_AX8817X=m
 CONFIG_USB_NET_CDCETHER=m
+CONFIG_USB_NET_CDC_EEM=m
 CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SMSC95XX=m
 CONFIG_USB_NET_GL620A=m
 CONFIG_USB_NET_NET1080=m
 CONFIG_USB_NET_PLUSB=m
@@ -1450,6 +1641,8 @@ CONFIG_USB_EPSON2888=y
 CONFIG_USB_KC2190=y
 CONFIG_USB_NET_ZAURUS=m
 CONFIG_USB_HSO=m
+CONFIG_USB_NET_INT51X1=m
+CONFIG_USB_CDC_PHONET=m
 CONFIG_NET_PCMCIA=y
 CONFIG_PCMCIA_3C589=m
 CONFIG_PCMCIA_3C574=m
@@ -1497,6 +1690,9 @@ CONFIG_ATM_FORE200E_TX_RETRY=16
 CONFIG_ATM_FORE200E_DEBUG=0
 CONFIG_ATM_HE=m
 CONFIG_ATM_HE_USE_SUNI=y
+CONFIG_ATM_SOLOS=m
+CONFIG_IEEE802154_DRIVERS=m
+CONFIG_IEEE802154_FAKEHARD=m
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
 # CONFIG_PLIP is not set
@@ -1521,6 +1717,7 @@ CONFIG_SLIP_MODE_SLIP6=y
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
 CONFIG_ISDN=y
+CONFIG_ISDN_I4L=m
 CONFIG_MISDN=m
 CONFIG_MISDN_DSP=m
 CONFIG_MISDN_L1OIP=m
@@ -1530,13 +1727,100 @@ CONFIG_MISDN_L1OIP=m
 #
 CONFIG_MISDN_HFCPCI=m
 CONFIG_MISDN_HFCMULTI=m
-# CONFIG_ISDN_I4L is not set
+CONFIG_MISDN_HFCUSB=m
+CONFIG_MISDN_AVMFRITZ=m
+CONFIG_MISDN_SPEEDFAX=m
+CONFIG_MISDN_INFINEON=m
+CONFIG_MISDN_W6692=m
+CONFIG_MISDN_NETJET=m
+CONFIG_MISDN_IPAC=m
+CONFIG_MISDN_ISAR=m
+CONFIG_ISDN_PPP=y
+CONFIG_ISDN_PPP_VJ=y
+CONFIG_ISDN_MPP=y
+CONFIG_IPPP_FILTER=y
+CONFIG_ISDN_PPP_BSDCOMP=m
+CONFIG_ISDN_AUDIO=y
+CONFIG_ISDN_TTY_FAX=y
+
+#
+# ISDN feature submodules
+#
+CONFIG_ISDN_DIVERSION=m
+
+#
+# ISDN4Linux hardware drivers
+#
+
+#
+# Passive cards
+#
+CONFIG_ISDN_DRV_HISAX=m
+
+#
+# D-channel protocol features
+#
+CONFIG_HISAX_EURO=y
+CONFIG_DE_AOC=y
+# CONFIG_HISAX_NO_SENDCOMPLETE is not set
+# CONFIG_HISAX_NO_LLC is not set
+# CONFIG_HISAX_NO_KEYPAD is not set
+CONFIG_HISAX_1TR6=y
+CONFIG_HISAX_NI1=y
+CONFIG_HISAX_MAX_CARDS=8
+
+#
+# HiSax supported cards
+#
+CONFIG_HISAX_16_3=y
+CONFIG_HISAX_TELESPCI=y
+CONFIG_HISAX_S0BOX=y
+CONFIG_HISAX_FRITZPCI=y
+CONFIG_HISAX_AVM_A1_PCMCIA=y
+CONFIG_HISAX_ELSA=y
+CONFIG_HISAX_DIEHLDIVA=y
+CONFIG_HISAX_SEDLBAUER=y
+CONFIG_HISAX_NETJET=y
+CONFIG_HISAX_NETJET_U=y
+CONFIG_HISAX_NICCY=y
+CONFIG_HISAX_BKM_A4T=y
+CONFIG_HISAX_SCT_QUADRO=y
+CONFIG_HISAX_GAZEL=y
+CONFIG_HISAX_HFC_PCI=y
+CONFIG_HISAX_W6692=y
+CONFIG_HISAX_HFC_SX=y
+CONFIG_HISAX_ENTERNOW_PCI=y
+CONFIG_HISAX_DEBUG=y
+
+#
+# HiSax PCMCIA card service modules
+#
+CONFIG_HISAX_SEDLBAUER_CS=m
+CONFIG_HISAX_ELSA_CS=m
+CONFIG_HISAX_AVM_A1_CS=m
+CONFIG_HISAX_TELES_CS=m
+
+#
+# HiSax sub driver modules
+#
+CONFIG_HISAX_ST5481=m
+CONFIG_HISAX_HFCUSB=m
+CONFIG_HISAX_HFC4S8S=m
+CONFIG_HISAX_FRITZ_PCIPNP=m
+
+#
+# Active cards
+#
+CONFIG_HYSDN=m
+CONFIG_HYSDN_CAPI=y
+CONFIG_ISDN_HDLC=m
 CONFIG_ISDN_CAPI=m
 CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
 CONFIG_CAPI_TRACE=y
 CONFIG_ISDN_CAPI_MIDDLEWARE=y
 CONFIG_ISDN_CAPI_CAPI20=m
 # CONFIG_ISDN_CAPI_CAPIFS_BOOL is not set
+CONFIG_ISDN_CAPI_CAPIDRV=m
 
 #
 # CAPI hardware drivers
@@ -1550,18 +1834,23 @@ CONFIG_ISDN_DRV_AVMB1_T1PCI=m
 CONFIG_ISDN_DRV_AVMB1_C4=m
 CONFIG_CAPI_EICON=y
 CONFIG_ISDN_DIVAS=m
-# CONFIG_ISDN_DIVAS_BRIPCI is not set
-# CONFIG_ISDN_DIVAS_PRIPCI is not set
+CONFIG_ISDN_DIVAS_BRIPCI=y
+CONFIG_ISDN_DIVAS_PRIPCI=y
 CONFIG_ISDN_DIVAS_DIVACAPI=m
 CONFIG_ISDN_DIVAS_USERIDI=m
 CONFIG_ISDN_DIVAS_MAINT=m
+CONFIG_ISDN_DRV_GIGASET=m
+CONFIG_GIGASET_BASE=m
+CONFIG_GIGASET_M105=m
+CONFIG_GIGASET_M101=m
+# CONFIG_GIGASET_DEBUG is not set
 # CONFIG_PHONE is not set
 
 #
 # Input device support
 #
 CONFIG_INPUT=y
-# CONFIG_INPUT_FF_MEMLESS is not set
+CONFIG_INPUT_FF_MEMLESS=m
 CONFIG_INPUT_POLLDEV=m
 
 #
@@ -1579,18 +1868,23 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 # Input Device Drivers
 #
 CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ADP5588=m
 CONFIG_KEYBOARD_ATKBD=y
-CONFIG_KEYBOARD_SUNKBD=m
+CONFIG_QT2160=m
 CONFIG_KEYBOARD_LKKBD=m
-CONFIG_KEYBOARD_XTKBD=m
+CONFIG_KEYBOARD_LM8323=m
+CONFIG_KEYBOARD_MAX7359=m
 CONFIG_KEYBOARD_NEWTON=m
+CONFIG_KEYBOARD_OPENCORES=m
 CONFIG_KEYBOARD_STOWAWAY=m
+CONFIG_KEYBOARD_SUNKBD=m
+CONFIG_KEYBOARD_XTKBD=m
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
 # CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 CONFIG_INPUT_MISC=y
-CONFIG_INPUT_PCSPKR=y
+CONFIG_INPUT_PCSPKR=m
 CONFIG_INPUT_APANEL=m
 # CONFIG_INPUT_WISTRON_BTNS is not set
 # CONFIG_INPUT_ATLAS_BTNS is not set
@@ -1599,7 +1893,11 @@ CONFIG_INPUT_ATI_REMOTE2=m
 CONFIG_INPUT_KEYSPAN_REMOTE=m
 CONFIG_INPUT_POWERMATE=m
 CONFIG_INPUT_YEALINK=m
+CONFIG_INPUT_CM109=m
 # CONFIG_INPUT_UINPUT is not set
+CONFIG_INPUT_WINBOND_CIR=m
+CONFIG_INPUT_PCF50633_PMU=m
+CONFIG_INPUT_WM831X_ON=m
 
 #
 # Hardware I/O ports
@@ -1637,6 +1935,7 @@ CONFIG_FIX_EARLYCON_MEM=y
 CONFIG_SERIAL_CORE=m
 CONFIG_SERIAL_JSM=m
 CONFIG_UNIX98_PTYS=y
+# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_PRINTER=m
 # CONFIG_LP_CONSOLE is not set
@@ -1649,6 +1948,7 @@ CONFIG_IPMI_SI=m
 CONFIG_IPMI_WATCHDOG=m
 CONFIG_IPMI_POWEROFF=m
 CONFIG_HW_RANDOM=m
+CONFIG_HW_RANDOM_TIMERIOMEM=m
 CONFIG_HW_RANDOM_INTEL=m
 CONFIG_HW_RANDOM_AMD=m
 CONFIG_HW_RANDOM_GEODE=m
@@ -1677,6 +1977,7 @@ CONFIG_HANGCHECK_TIMER=m
 CONFIG_DEVPORT=y
 CONFIG_I2C=m
 CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_COMPAT=y
 CONFIG_I2C_CHARDEV=m
 CONFIG_I2C_HELPER_AUTO=y
 CONFIG_I2C_ALGOBIT=m
@@ -1706,6 +2007,11 @@ CONFIG_I2C_SIS96X=m
 CONFIG_I2C_VIA=m
 CONFIG_I2C_VIAPRO=m
 
+#
+# ACPI drivers
+#
+CONFIG_I2C_SCMI=m
+
 #
 # I2C system bus drivers (mostly embedded / system-on-chip)
 #
@@ -1737,19 +2043,18 @@ CONFIG_SCx200_ACB=m
 # Miscellaneous I2C Chip support
 #
 CONFIG_DS1682=m
-CONFIG_AT24=m
-CONFIG_SENSORS_EEPROM=m
-CONFIG_SENSORS_PCF8574=m
-CONFIG_PCF8575=m
-CONFIG_SENSORS_PCA9539=m
-CONFIG_SENSORS_PCF8591=m
-CONFIG_SENSORS_MAX6875=m
 CONFIG_SENSORS_TSL2550=m
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
 # CONFIG_I2C_DEBUG_CHIP is not set
 # CONFIG_SPI is not set
+
+#
+# PPS support
+#
+CONFIG_PPS=m
+# CONFIG_PPS_DEBUG is not set
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 # CONFIG_GPIOLIB is not set
 CONFIG_W1=m
@@ -1767,15 +2072,28 @@ CONFIG_W1_MASTER_DS2482=m
 #
 CONFIG_W1_SLAVE_THERM=m
 CONFIG_W1_SLAVE_SMEM=m
+CONFIG_W1_SLAVE_DS2431=m
 CONFIG_W1_SLAVE_DS2433=m
 CONFIG_W1_SLAVE_DS2433_CRC=y
 CONFIG_W1_SLAVE_DS2760=m
+CONFIG_W1_SLAVE_BQ27000=m
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 # CONFIG_PDA_POWER is not set
+CONFIG_WM831X_POWER=m
+CONFIG_WM8350_POWER=m
 # CONFIG_BATTERY_DS2760 is not set
+CONFIG_BATTERY_DS2782=m
+CONFIG_BATTERY_BQ27x00=m
+CONFIG_BATTERY_MAX17040=m
+CONFIG_CHARGER_PCF50633=m
 CONFIG_HWMON=m
 CONFIG_HWMON_VID=m
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Native drivers
+#
 CONFIG_SENSORS_ABITUGURU=m
 CONFIG_SENSORS_ABITUGURU3=m
 CONFIG_SENSORS_AD7414=m
@@ -1786,8 +2104,10 @@ CONFIG_SENSORS_ADM1026=m
 CONFIG_SENSORS_ADM1029=m
 CONFIG_SENSORS_ADM1031=m
 CONFIG_SENSORS_ADM9240=m
+CONFIG_SENSORS_ADT7462=m
 CONFIG_SENSORS_ADT7470=m
 CONFIG_SENSORS_ADT7473=m
+CONFIG_SENSORS_ADT7475=m
 CONFIG_SENSORS_K8TEMP=m
 CONFIG_SENSORS_ASB100=m
 CONFIG_SENSORS_ATXP1=m
@@ -1796,9 +2116,8 @@ CONFIG_SENSORS_I5K_AMB=m
 CONFIG_SENSORS_F71805F=m
 CONFIG_SENSORS_F71882FG=m
 CONFIG_SENSORS_F75375S=m
-CONFIG_SENSORS_FSCHER=m
-CONFIG_SENSORS_FSCPOS=m
 CONFIG_SENSORS_FSCHMD=m
+CONFIG_SENSORS_G760A=m
 CONFIG_SENSORS_GL518SM=m
 CONFIG_SENSORS_GL520SM=m
 CONFIG_SENSORS_CORETEMP=m
@@ -1816,10 +2135,14 @@ CONFIG_SENSORS_LM87=m
 CONFIG_SENSORS_LM90=m
 CONFIG_SENSORS_LM92=m
 CONFIG_SENSORS_LM93=m
+CONFIG_SENSORS_LTC4215=m
+CONFIG_SENSORS_LTC4245=m
+CONFIG_SENSORS_LM95241=m
 CONFIG_SENSORS_MAX1619=m
 CONFIG_SENSORS_MAX6650=m
 CONFIG_SENSORS_PC87360=m
 CONFIG_SENSORS_PC87427=m
+CONFIG_SENSORS_PCF8591=m
 CONFIG_SENSORS_SIS5595=m
 CONFIG_SENSORS_DME1737=m
 CONFIG_SENSORS_SMSC47M1=m
@@ -1827,6 +2150,8 @@ CONFIG_SENSORS_SMSC47M192=m
 CONFIG_SENSORS_SMSC47B397=m
 CONFIG_SENSORS_ADS7828=m
 CONFIG_SENSORS_THMC50=m
+CONFIG_SENSORS_TMP401=m
+CONFIG_SENSORS_TMP421=m
 CONFIG_SENSORS_VIA686A=m
 CONFIG_SENSORS_VT1211=m
 CONFIG_SENSORS_VT8231=m
@@ -1838,9 +2163,16 @@ CONFIG_SENSORS_W83L785TS=m
 CONFIG_SENSORS_W83L786NG=m
 CONFIG_SENSORS_W83627HF=m
 CONFIG_SENSORS_W83627EHF=m
+CONFIG_SENSORS_WM831X=m
+CONFIG_SENSORS_WM8350=m
 CONFIG_SENSORS_HDAPS=m
 CONFIG_SENSORS_APPLESMC=m
-# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# ACPI drivers
+#
+CONFIG_SENSORS_ATK0110=m
+CONFIG_SENSORS_LIS3LV02D=m
 CONFIG_THERMAL=y
 CONFIG_WATCHDOG=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -1849,11 +2181,14 @@ CONFIG_WATCHDOG=y
 # Watchdog Device Drivers
 #
 CONFIG_SOFT_WATCHDOG=m
+CONFIG_WM831X_WATCHDOG=m
+CONFIG_WM8350_WATCHDOG=m
 CONFIG_ACQUIRE_WDT=m
 CONFIG_ADVANTECH_WDT=m
 CONFIG_ALIM1535_WDT=m
 CONFIG_ALIM7101_WDT=m
 CONFIG_SC520_WDT=m
+CONFIG_SBC_FITPC2_WATCHDOG=m
 CONFIG_EUROTECH_WDT=m
 CONFIG_IB700_WDT=m
 CONFIG_IBMASR=m
@@ -1862,6 +2197,7 @@ CONFIG_I6300ESB_WDT=m
 CONFIG_ITCO_WDT=m
 # CONFIG_ITCO_VENDOR_SUPPORT is not set
 CONFIG_IT8712F_WDT=m
+CONFIG_IT87_WDT=m
 CONFIG_HP_WATCHDOG=m
 CONFIG_SC1200_WDT=m
 CONFIG_SCx200_WDT=m
@@ -1870,9 +2206,11 @@ CONFIG_60XX_WDT=m
 CONFIG_SBC8360_WDT=m
 CONFIG_SBC7240_WDT=m
 CONFIG_CPU5_WDT=m
+CONFIG_SMSC_SCH311X_WDT=m
 CONFIG_SMSC37B787_WDT=m
 CONFIG_W83627HF_WDT=m
 CONFIG_W83697HF_WDT=m
+CONFIG_W83697UG_WDT=m
 CONFIG_W83877F_WDT=m
 CONFIG_W83977F_WDT=m
 CONFIG_MACHZ_WDT=m
@@ -1883,24 +2221,26 @@ CONFIG_SBC_EPX_C3_WATCHDOG=m
 #
 CONFIG_PCIPCWATCHDOG=m
 CONFIG_WDTPCI=m
-CONFIG_WDT_501_PCI=y
 
 #
 # USB-based Watchdog Cards
 #
 CONFIG_USBPCWATCHDOG=m
+CONFIG_SSB_POSSIBLE=y
 
 #
 # Sonics Silicon Backplane
 #
-CONFIG_SSB_POSSIBLE=y
 CONFIG_SSB=m
 CONFIG_SSB_SPROM=y
+CONFIG_SSB_BLOCKIO=y
 CONFIG_SSB_PCIHOST_POSSIBLE=y
 CONFIG_SSB_PCIHOST=y
-# CONFIG_SSB_B43_PCI_BRIDGE is not set
+CONFIG_SSB_B43_PCI_BRIDGE=y
 CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
 CONFIG_SSB_PCMCIAHOST=y
+CONFIG_SSB_SDIOHOST_POSSIBLE=y
+CONFIG_SSB_SDIOHOST=y
 # CONFIG_SSB_DEBUG is not set
 CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
 CONFIG_SSB_DRIVER_PCICORE=y
@@ -1908,14 +2248,21 @@ CONFIG_SSB_DRIVER_PCICORE=y
 #
 # Multifunction device drivers
 #
-# CONFIG_MFD_CORE is not set
+CONFIG_MFD_CORE=m
 CONFIG_MFD_SM501=m
 CONFIG_HTC_PASIC3=m
 # CONFIG_MFD_TMIO is not set
-
-#
-# Multimedia devices
-#
+CONFIG_MFD_WM8400=m
+CONFIG_MFD_WM831X=m
+CONFIG_MFD_WM8350=m
+CONFIG_MFD_WM8350_I2C=m
+CONFIG_MFD_PCF50633=m
+CONFIG_PCF50633_ADC=m
+CONFIG_PCF50633_GPIO=m
+CONFIG_AB3100_CORE=m
+CONFIG_AB3100_OTP=m
+# CONFIG_REGULATOR is not set
+CONFIG_MEDIA_SUPPORT=m
 
 #
 # Multimedia core support
@@ -1923,7 +2270,7 @@ CONFIG_HTC_PASIC3=m
 CONFIG_VIDEO_DEV=m
 CONFIG_VIDEO_V4L2_COMMON=m
 # CONFIG_VIDEO_ALLOW_V4L1 is not set
-# CONFIG_VIDEO_V4L1_COMPAT is not set
+CONFIG_VIDEO_V4L1_COMPAT=y
 CONFIG_DVB_CORE=m
 CONFIG_VIDEO_MEDIA=m
 
@@ -1932,26 +2279,20 @@ CONFIG_VIDEO_MEDIA=m
 #
 # CONFIG_MEDIA_ATTACH is not set
 CONFIG_MEDIA_TUNER=m
-CONFIG_MEDIA_TUNER_CUSTOMIZE=y
-# CONFIG_MEDIA_TUNER_SIMPLE is not set
-# CONFIG_MEDIA_TUNER_TDA8290 is not set
-# CONFIG_MEDIA_TUNER_TDA827X is not set
-# CONFIG_MEDIA_TUNER_TDA18271 is not set
-# CONFIG_MEDIA_TUNER_TDA9887 is not set
-# CONFIG_MEDIA_TUNER_TEA5761 is not set
-# CONFIG_MEDIA_TUNER_TEA5767 is not set
-# CONFIG_MEDIA_TUNER_MT20XX is not set
-# CONFIG_MEDIA_TUNER_MT2060 is not set
-# CONFIG_MEDIA_TUNER_MT2266 is not set
-# CONFIG_MEDIA_TUNER_MT2131 is not set
-# CONFIG_MEDIA_TUNER_QT1010 is not set
-# CONFIG_MEDIA_TUNER_XC2028 is not set
-# CONFIG_MEDIA_TUNER_XC5000 is not set
-# CONFIG_MEDIA_TUNER_MXL5005S is not set
-# CONFIG_MEDIA_TUNER_MXL5007T is not set
+# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_MC44S803=m
 CONFIG_VIDEO_V4L2=m
 CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
 # CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
 
 #
@@ -1976,14 +2317,28 @@ CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # CONFIG_VIDEO_WM8739 is not set
 # CONFIG_VIDEO_VP27SMPX is not set
 
+#
+# RDS decoders
+#
+# CONFIG_VIDEO_SAA6588 is not set
+
 #
 # Video decoders
 #
+# CONFIG_VIDEO_ADV7180 is not set
+# CONFIG_VIDEO_BT819 is not set
+# CONFIG_VIDEO_BT856 is not set
+# CONFIG_VIDEO_BT866 is not set
+# CONFIG_VIDEO_KS0127 is not set
 # CONFIG_VIDEO_OV7670 is not set
+# CONFIG_VIDEO_MT9V011 is not set
 # CONFIG_VIDEO_TCM825X is not set
+# CONFIG_VIDEO_SAA7110 is not set
 # CONFIG_VIDEO_SAA711X is not set
 # CONFIG_VIDEO_SAA717X is not set
+# CONFIG_VIDEO_TVP514X is not set
 # CONFIG_VIDEO_TVP5150 is not set
+# CONFIG_VIDEO_VPX3220 is not set
 
 #
 # Video and audio decoders
@@ -1999,6 +2354,11 @@ CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # Video encoders
 #
 # CONFIG_VIDEO_SAA7127 is not set
+# CONFIG_VIDEO_SAA7185 is not set
+# CONFIG_VIDEO_ADV7170 is not set
+# CONFIG_VIDEO_ADV7175 is not set
+# CONFIG_VIDEO_THS7303 is not set
+# CONFIG_VIDEO_ADV7343 is not set
 
 #
 # Video improvement chips
@@ -2009,34 +2369,46 @@ CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # CONFIG_VIDEO_BT848 is not set
 # CONFIG_VIDEO_SAA5246A is not set
 # CONFIG_VIDEO_SAA5249 is not set
+# CONFIG_VIDEO_ZORAN is not set
 # CONFIG_VIDEO_SAA7134 is not set
 # CONFIG_VIDEO_HEXIUM_ORION is not set
 # CONFIG_VIDEO_HEXIUM_GEMINI is not set
 # CONFIG_VIDEO_CX88 is not set
 # CONFIG_VIDEO_CX23885 is not set
 # CONFIG_VIDEO_AU0828 is not set
+# CONFIG_VIDEO_IVTV is not set
 # CONFIG_VIDEO_CX18 is not set
+# CONFIG_VIDEO_SAA7164 is not set
 # CONFIG_VIDEO_CAFE_CCIC is not set
+# CONFIG_SOC_CAMERA is not set
 CONFIG_V4L_USB_DRIVERS=y
 # CONFIG_USB_VIDEO_CLASS is not set
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
 # CONFIG_USB_GSPCA is not set
 # CONFIG_VIDEO_PVRUSB2 is not set
+# CONFIG_VIDEO_HDPVR is not set
 # CONFIG_VIDEO_EM28XX is not set
+# CONFIG_VIDEO_CX231XX is not set
 # CONFIG_VIDEO_USBVISION is not set
 # CONFIG_USB_ET61X251 is not set
 # CONFIG_USB_SN9C102 is not set
 # CONFIG_USB_ZC0301 is not set
+CONFIG_USB_PWC_INPUT_EVDEV=y
 # CONFIG_USB_ZR364XX is not set
 # CONFIG_USB_STKWEBCAM is not set
 # CONFIG_USB_S2255 is not set
-# CONFIG_SOC_CAMERA is not set
-# CONFIG_VIDEO_SH_MOBILE_CEU is not set
 CONFIG_RADIO_ADAPTERS=y
 # CONFIG_RADIO_GEMTEK_PCI is not set
 # CONFIG_RADIO_MAXIRADIO is not set
 # CONFIG_RADIO_MAESTRO is not set
+# CONFIG_I2C_SI4713 is not set
+# CONFIG_RADIO_SI4713 is not set
 # CONFIG_USB_DSBR is not set
-# CONFIG_USB_SI470X is not set
+# CONFIG_RADIO_SI470X is not set
+# CONFIG_USB_MR800 is not set
+# CONFIG_RADIO_TEA5764 is not set
+CONFIG_DVB_MAX_ADAPTERS=8
+# CONFIG_DVB_DYNAMIC_MINORS is not set
 CONFIG_DVB_CAPTURE_DRIVERS=y
 
 #
@@ -2052,8 +2424,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
 # CONFIG_DVB_USB is not set
 # CONFIG_DVB_TTUSB_BUDGET is not set
 # CONFIG_DVB_TTUSB_DEC is not set
-# CONFIG_DVB_CINERGYT2 is not set
-# CONFIG_DVB_SIANO_SMS1XXX is not set
+# CONFIG_SMS_SIANO_MDTV is not set
 
 #
 # Supported FlexCopII (B2C2) Adapters
@@ -2070,80 +2441,24 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
 # CONFIG_DVB_PLUTO2 is not set
 
 #
-# Supported DVB Frontends
+# Supported SDMC DM1105 Adapters
 #
+# CONFIG_DVB_DM1105 is not set
 
 #
-# Customise DVB Frontends
+# Supported FireWire (IEEE 1394) Adapters
 #
-# CONFIG_DVB_FE_CUSTOMISE is not set
+# CONFIG_DVB_FIREDTV is not set
 
 #
-# DVB-S (satellite) frontends
+# Supported Earthsoft PT1 Adapters
 #
-# CONFIG_DVB_CX24110 is not set
-# CONFIG_DVB_CX24123 is not set
-# CONFIG_DVB_MT312 is not set
-# CONFIG_DVB_S5H1420 is not set
-# CONFIG_DVB_STV0299 is not set
-# CONFIG_DVB_TDA8083 is not set
-# CONFIG_DVB_TDA10086 is not set
-# CONFIG_DVB_VES1X93 is not set
-# CONFIG_DVB_TUNER_ITD1000 is not set
-# CONFIG_DVB_TDA826X is not set
-# CONFIG_DVB_TUA6100 is not set
+# CONFIG_DVB_PT1 is not set
 
 #
-# DVB-T (terrestrial) frontends
-#
-# CONFIG_DVB_SP8870 is not set
-# CONFIG_DVB_SP887X is not set
-# CONFIG_DVB_CX22700 is not set
-# CONFIG_DVB_CX22702 is not set
-# CONFIG_DVB_DRX397XD is not set
-# CONFIG_DVB_L64781 is not set
-# CONFIG_DVB_TDA1004X is not set
-# CONFIG_DVB_NXT6000 is not set
-# CONFIG_DVB_MT352 is not set
-# CONFIG_DVB_ZL10353 is not set
-# CONFIG_DVB_DIB3000MB is not set
-# CONFIG_DVB_DIB3000MC is not set
-# CONFIG_DVB_DIB7000M is not set
-# CONFIG_DVB_DIB7000P is not set
-# CONFIG_DVB_TDA10048 is not set
-
-#
-# DVB-C (cable) frontends
-#
-# CONFIG_DVB_VES1820 is not set
-# CONFIG_DVB_TDA10021 is not set
-# CONFIG_DVB_TDA10023 is not set
-# CONFIG_DVB_STV0297 is not set
-
-#
-# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
-#
-# CONFIG_DVB_NXT200X is not set
-# CONFIG_DVB_OR51211 is not set
-# CONFIG_DVB_OR51132 is not set
-# CONFIG_DVB_BCM3510 is not set
-# CONFIG_DVB_LGDT330X is not set
-# CONFIG_DVB_S5H1409 is not set
-# CONFIG_DVB_AU8522 is not set
-# CONFIG_DVB_S5H1411 is not set
-
-#
-# Digital terrestrial only tuners/PLL
-#
-# CONFIG_DVB_PLL is not set
-# CONFIG_DVB_TUNER_DIB0070 is not set
-
-#
-# SEC control devices for DVB-S
+# Supported DVB Frontends
 #
-# CONFIG_DVB_LNBP21 is not set
-# CONFIG_DVB_ISL6405 is not set
-# CONFIG_DVB_ISL6421 is not set
+# CONFIG_DVB_FE_CUSTOMISE is not set
 CONFIG_DAB=y
 # CONFIG_USB_DABUSB is not set
 
@@ -2161,32 +2476,37 @@ CONFIG_AGP_SIS=m
 CONFIG_AGP_SWORKS=m
 CONFIG_AGP_VIA=m
 CONFIG_AGP_EFFICEON=m
+CONFIG_VGA_ARB=y
 CONFIG_DRM=m
+CONFIG_DRM_KMS_HELPER=m
+CONFIG_DRM_TTM=m
 CONFIG_DRM_TDFX=m
 CONFIG_DRM_R128=m
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_I810=m
 CONFIG_DRM_I830=m
 CONFIG_DRM_I915=m
+CONFIG_DRM_I915_KMS=y
 CONFIG_DRM_MGA=m
 CONFIG_DRM_SIS=m
 CONFIG_DRM_VIA=m
-CONFIG_DRM_VIA_CHROME9=m
 CONFIG_DRM_SAVAGE=m
 CONFIG_VGASTATE=m
 CONFIG_VIDEO_OUTPUT_CONTROL=m
 CONFIG_FB=y
 CONFIG_FIRMWARE_EDID=y
 CONFIG_FB_DDC=m
+CONFIG_FB_BOOT_VESA_SUPPORT=y
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-# CONFIG_FB_SYS_FILLRECT is not set
-# CONFIG_FB_SYS_COPYAREA is not set
-# CONFIG_FB_SYS_IMAGEBLIT is not set
+CONFIG_FB_SYS_FILLRECT=m
+CONFIG_FB_SYS_COPYAREA=m
+CONFIG_FB_SYS_IMAGEBLIT=m
 # CONFIG_FB_FOREIGN_ENDIAN is not set
-# CONFIG_FB_SYS_FOPS is not set
+CONFIG_FB_SYS_FOPS=m
+CONFIG_FB_DEFERRED_IO=y
 CONFIG_FB_SVGALIB=m
 # CONFIG_FB_MACMODES is not set
 CONFIG_FB_BACKLIGHT=y
@@ -2206,7 +2526,6 @@ CONFIG_FB_ASILIANT=y
 # CONFIG_FB_VGA16 is not set
 CONFIG_FB_UVESA=m
 CONFIG_FB_VESA=y
-CONFIG_FB_EFI=y
 # CONFIG_FB_N411 is not set
 # CONFIG_FB_HGA is not set
 # CONFIG_FB_S1D13XXX is not set
@@ -2223,16 +2542,12 @@ CONFIG_FB_I810_GTF=y
 CONFIG_FB_I810_I2C=y
 CONFIG_FB_LE80578=m
 CONFIG_FB_CARILLO_RANCH=m
-CONFIG_FB_INTEL=m
-# CONFIG_FB_INTEL_DEBUG is not set
-CONFIG_FB_INTEL_I2C=y
 CONFIG_FB_MATROX=m
 CONFIG_FB_MATROX_MILLENIUM=y
 CONFIG_FB_MATROX_MYSTIQUE=y
 CONFIG_FB_MATROX_G=y
 CONFIG_FB_MATROX_I2C=m
 CONFIG_FB_MATROX_MAVEN=m
-CONFIG_FB_MATROX_MULTIHEAD=y
 CONFIG_FB_RADEON=m
 CONFIG_FB_RADEON_I2C=y
 CONFIG_FB_RADEON_BACKLIGHT=y
@@ -2251,15 +2566,15 @@ CONFIG_FB_SAVAGE_ACCEL=y
 CONFIG_FB_SIS=m
 CONFIG_FB_SIS_300=y
 CONFIG_FB_SIS_315=y
+CONFIG_FB_VIA=m
 CONFIG_FB_NEOMAGIC=m
 CONFIG_FB_KYRO=m
 CONFIG_FB_3DFX=m
 CONFIG_FB_3DFX_ACCEL=y
+CONFIG_FB_3DFX_I2C=y
 CONFIG_FB_VOODOO1=m
 CONFIG_FB_VT8623=m
-CONFIG_FB_CYBLA=m
 CONFIG_FB_TRIDENT=m
-CONFIG_FB_TRIDENT_ACCEL=y
 CONFIG_FB_ARK=m
 CONFIG_FB_PM3=m
 # CONFIG_FB_CARMINE is not set
@@ -2267,17 +2582,25 @@ CONFIG_FB_GEODE=y
 CONFIG_FB_GEODE_LX=m
 CONFIG_FB_GEODE_GX=m
 CONFIG_FB_GEODE_GX1=m
+CONFIG_FB_TMIO=m
+CONFIG_FB_TMIO_ACCELL=y
 CONFIG_FB_SM501=m
 # CONFIG_FB_VIRTUAL is not set
+CONFIG_FB_METRONOME=m
+CONFIG_FB_MB862XX=m
+CONFIG_FB_MB862XX_PCI_GDC=y
+CONFIG_FB_BROADSHEET=m
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_LCD_CLASS_DEVICE=m
 # CONFIG_LCD_ILI9320 is not set
 CONFIG_LCD_PLATFORM=m
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_CORGI=m
+CONFIG_BACKLIGHT_GENERIC=m
 CONFIG_BACKLIGHT_PROGEAR=m
 CONFIG_BACKLIGHT_CARILLO_RANCH=m
 CONFIG_BACKLIGHT_MBP_NVIDIA=m
+CONFIG_BACKLIGHT_SAHARA=m
+CONFIG_BACKLIGHT_WM831X=m
 
 #
 # Display device support
@@ -2293,7 +2616,6 @@ CONFIG_DISPLAY_SUPPORT=m
 #
 CONFIG_VGA_CONSOLE=y
 # CONFIG_VGACON_SOFT_SCROLLBACK is not set
-CONFIG_VIDEO_SELECT=y
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
 # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
@@ -2311,11 +2633,14 @@ CONFIG_LOGO_LINUX_CLUT224=y
 #
 # CONFIG_BOOTSPLASH is not set
 CONFIG_SOUND=m
+CONFIG_SOUND_OSS_CORE=y
+CONFIG_SOUND_OSS_CORE_PRECLAIM=y
 CONFIG_SND=m
 CONFIG_SND_TIMER=m
 CONFIG_SND_PCM=m
 CONFIG_SND_HWDEP=m
 CONFIG_SND_RAWMIDI=m
+CONFIG_SND_JACK=y
 CONFIG_SND_SEQUENCER=m
 CONFIG_SND_SEQ_DUMMY=m
 CONFIG_SND_OSSEMUL=y
@@ -2329,6 +2654,12 @@ CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SND_VERBOSE_PRINTK is not set
 # CONFIG_SND_DEBUG is not set
 CONFIG_SND_VMASTER=y
+CONFIG_SND_DMA_SGBUF=y
+CONFIG_SND_RAWMIDI_SEQ=m
+CONFIG_SND_OPL3_LIB_SEQ=m
+# CONFIG_SND_OPL4_LIB_SEQ is not set
+# CONFIG_SND_SBAWE_SEQ is not set
+CONFIG_SND_EMU10K1_SEQ=m
 CONFIG_SND_MPU401_UART=m
 CONFIG_SND_OPL3_LIB=m
 CONFIG_SND_VX_LIB=m
@@ -2367,6 +2698,7 @@ CONFIG_SND_CS46XX=m
 CONFIG_SND_CS46XX_NEW_DSP=y
 CONFIG_SND_CS5530=m
 CONFIG_SND_CS5535AUDIO=m
+CONFIG_SND_CTXFI=m
 CONFIG_SND_DARLA20=m
 CONFIG_SND_GINA20=m
 CONFIG_SND_LAYLA20=m
@@ -2379,6 +2711,8 @@ CONFIG_SND_ECHO3G=m
 CONFIG_SND_INDIGO=m
 CONFIG_SND_INDIGOIO=m
 CONFIG_SND_INDIGODJ=m
+CONFIG_SND_INDIGOIOX=m
+CONFIG_SND_INDIGODJX=m
 CONFIG_SND_EMU10K1=m
 CONFIG_SND_EMU10K1X=m
 CONFIG_SND_ENS1370=m
@@ -2386,9 +2720,13 @@ CONFIG_SND_ENS1371=m
 CONFIG_SND_ES1938=m
 CONFIG_SND_ES1968=m
 CONFIG_SND_FM801=m
+# CONFIG_SND_FM801_TEA575X_BOOL is not set
 CONFIG_SND_HDA_INTEL=m
 CONFIG_SND_HDA_HWDEP=y
+CONFIG_SND_HDA_RECONFIG=y
 # CONFIG_SND_HDA_INPUT_BEEP is not set
+# CONFIG_SND_HDA_INPUT_JACK is not set
+CONFIG_SND_HDA_PATCH_LOADER=y
 CONFIG_SND_HDA_CODEC_REALTEK=y
 CONFIG_SND_HDA_CODEC_ANALOG=y
 CONFIG_SND_HDA_CODEC_SIGMATEL=y
@@ -2397,7 +2735,9 @@ CONFIG_SND_HDA_CODEC_ATIHDMI=y
 CONFIG_SND_HDA_CODEC_NVHDMI=y
 CONFIG_SND_HDA_CODEC_INTELHDMI=y
 CONFIG_SND_HDA_ELD=y
+CONFIG_SND_HDA_CODEC_CIRRUS=y
 CONFIG_SND_HDA_CODEC_CONEXANT=y
+CONFIG_SND_HDA_CODEC_CA0110=y
 CONFIG_SND_HDA_CODEC_CMEDIA=y
 CONFIG_SND_HDA_CODEC_SI3054=y
 CONFIG_SND_HDA_GENERIC=y
@@ -2410,6 +2750,7 @@ CONFIG_SND_ICE1724=m
 CONFIG_SND_INTEL8X0=m
 CONFIG_SND_INTEL8X0M=m
 CONFIG_SND_KORG1212=m
+CONFIG_SND_LX6464ES=m
 CONFIG_SND_MAESTRO3=m
 CONFIG_SND_MIXART=m
 CONFIG_SND_NM256=m
@@ -2431,30 +2772,99 @@ CONFIG_SND_USB_AUDIO=m
 CONFIG_SND_USB_USX2Y=m
 CONFIG_SND_USB_CAIAQ=m
 CONFIG_SND_USB_CAIAQ_INPUT=y
+CONFIG_SND_USB_US122L=m
 CONFIG_SND_PCMCIA=y
 CONFIG_SND_VXPOCKET=m
 CONFIG_SND_PDAUDIOCF=m
 CONFIG_SND_SOC=m
+CONFIG_SND_SOC_I2C_AND_SPI=m
+CONFIG_SND_SOC_ALL_CODECS=m
+CONFIG_SND_SOC_WM_HUBS=m
+CONFIG_SND_SOC_AD73311=m
+CONFIG_SND_SOC_AK4535=m
+CONFIG_SND_SOC_AK4642=m
+CONFIG_SND_SOC_CS4270=m
+CONFIG_SND_SOC_L3=m
+CONFIG_SND_SOC_PCM3008=m
+CONFIG_SND_SOC_SPDIF=m
+CONFIG_SND_SOC_SSM2602=m
+CONFIG_SND_SOC_TLV320AIC23=m
+CONFIG_SND_SOC_TLV320AIC3X=m
+CONFIG_SND_SOC_UDA134X=m
+CONFIG_SND_SOC_UDA1380=m
+CONFIG_SND_SOC_WM8350=m
+CONFIG_SND_SOC_WM8400=m
+CONFIG_SND_SOC_WM8510=m
+CONFIG_SND_SOC_WM8523=m
+CONFIG_SND_SOC_WM8580=m
+CONFIG_SND_SOC_WM8728=m
+CONFIG_SND_SOC_WM8731=m
+CONFIG_SND_SOC_WM8750=m
+CONFIG_SND_SOC_WM8753=m
+CONFIG_SND_SOC_WM8776=m
+CONFIG_SND_SOC_WM8900=m
+CONFIG_SND_SOC_WM8903=m
+CONFIG_SND_SOC_WM8940=m
+CONFIG_SND_SOC_WM8960=m
+CONFIG_SND_SOC_WM8961=m
+CONFIG_SND_SOC_WM8971=m
+CONFIG_SND_SOC_WM8974=m
+CONFIG_SND_SOC_WM8988=m
+CONFIG_SND_SOC_WM8990=m
+CONFIG_SND_SOC_WM8993=m
+CONFIG_SND_SOC_WM9081=m
+CONFIG_SND_SOC_MAX9877=m
 # CONFIG_SOUND_PRIME is not set
 CONFIG_AC97_BUS=m
 CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
-CONFIG_HID_DEBUG=y
 # CONFIG_HIDRAW is not set
 
 #
 # USB Input Devices
 #
 CONFIG_USB_HID=m
-# CONFIG_USB_HIDINPUT_POWERBOOK is not set
-# CONFIG_HID_FF is not set
+# CONFIG_HID_PID is not set
 CONFIG_USB_HIDDEV=y
 
 #
-# USB HID Boot Protocol drivers
-#
-# CONFIG_USB_KBD is not set
-# CONFIG_USB_MOUSE is not set
+# Special HID drivers
+#
+CONFIG_HID_A4TECH=m
+CONFIG_HID_APPLE=m
+CONFIG_HID_BELKIN=m
+CONFIG_HID_CHERRY=m
+CONFIG_HID_CHICONY=m
+CONFIG_HID_CYPRESS=m
+CONFIG_HID_DRAGONRISE=m
+# CONFIG_DRAGONRISE_FF is not set
+CONFIG_HID_EZKEY=m
+CONFIG_HID_KYE=m
+CONFIG_HID_GYRATION=m
+CONFIG_HID_TWINHAN=m
+CONFIG_HID_KENSINGTON=m
+CONFIG_HID_LOGITECH=m
+# CONFIG_LOGITECH_FF is not set
+# CONFIG_LOGIRUMBLEPAD2_FF is not set
+CONFIG_HID_MICROSOFT=m
+CONFIG_HID_MONTEREY=m
+CONFIG_HID_NTRIG=m
+CONFIG_HID_PANTHERLORD=m
+# CONFIG_PANTHERLORD_FF is not set
+CONFIG_HID_PETALYNX=m
+CONFIG_HID_SAMSUNG=m
+CONFIG_HID_SONY=m
+CONFIG_HID_SUNPLUS=m
+CONFIG_HID_GREENASIA=m
+# CONFIG_GREENASIA_FF is not set
+CONFIG_HID_SMARTJOYPLUS=m
+# CONFIG_SMARTJOYPLUS_FF is not set
+CONFIG_HID_TOPSEED=m
+CONFIG_HID_THRUSTMASTER=m
+# CONFIG_THRUSTMASTER_FF is not set
+CONFIG_HID_WACOM=m
+CONFIG_HID_ZEROPLUS=m
+# CONFIG_ZEROPLUS_FF is not set
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
@@ -2472,16 +2882,23 @@ CONFIG_USB_DYNAMIC_MINORS=y
 CONFIG_USB_SUSPEND=y
 # CONFIG_USB_OTG is not set
 # CONFIG_USB_MON is not set
+CONFIG_USB_WUSB=m
+CONFIG_USB_WUSB_CBAF=m
+# CONFIG_USB_WUSB_CBAF_DEBUG is not set
 
 #
 # USB Host Controller Drivers
 #
 # CONFIG_USB_C67X00_HCD is not set
+CONFIG_USB_XHCI_HCD=m
+# CONFIG_USB_XHCI_HCD_DEBUGGING is not set
 CONFIG_USB_EHCI_HCD=m
 # CONFIG_USB_EHCI_ROOT_HUB_TT is not set
 # CONFIG_USB_EHCI_TT_NEWSCHED is not set
+CONFIG_USB_OXU210HP_HCD=m
 CONFIG_USB_ISP116X_HCD=m
 # CONFIG_USB_ISP1760_HCD is not set
+CONFIG_USB_ISP1362_HCD=m
 CONFIG_USB_OHCI_HCD=m
 CONFIG_USB_OHCI_HCD_SSB=y
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
@@ -2492,6 +2909,8 @@ CONFIG_USB_U132_HCD=m
 CONFIG_USB_SL811_HCD=m
 # CONFIG_USB_SL811_CS is not set
 CONFIG_USB_R8A66597_HCD=m
+CONFIG_USB_WHCI_HCD=m
+CONFIG_USB_HWA_HCD=m
 
 #
 # Enable Host or Gadget support to see Inventra options
@@ -2503,28 +2922,28 @@ CONFIG_USB_R8A66597_HCD=m
 CONFIG_USB_ACM=m
 CONFIG_USB_PRINTER=m
 CONFIG_USB_WDM=m
+CONFIG_USB_TMC=m
 
 #
-# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
 #
 
 #
-# may also be needed; see USB_STORAGE Help for more information
+# also be needed; see USB_STORAGE Help for more info
 #
 CONFIG_USB_STORAGE=m
 # CONFIG_USB_STORAGE_DEBUG is not set
 # CONFIG_USB_STORAGE_DATAFAB is not set
-CONFIG_USB_STORAGE_FREECOM=y
-CONFIG_USB_STORAGE_ISD200=y
-CONFIG_USB_STORAGE_DPCM=y
-CONFIG_USB_STORAGE_USBAT=y
-CONFIG_USB_STORAGE_SDDR09=y
-CONFIG_USB_STORAGE_SDDR55=y
-CONFIG_USB_STORAGE_JUMPSHOT=y
-CONFIG_USB_STORAGE_ALAUDA=y
-CONFIG_USB_STORAGE_ONETOUCH=y
-CONFIG_USB_STORAGE_KARMA=y
-CONFIG_USB_STORAGE_CYPRESS_ATACB=y
+CONFIG_USB_STORAGE_FREECOM=m
+CONFIG_USB_STORAGE_ISD200=m
+CONFIG_USB_STORAGE_USBAT=m
+CONFIG_USB_STORAGE_SDDR09=m
+CONFIG_USB_STORAGE_SDDR55=m
+CONFIG_USB_STORAGE_JUMPSHOT=m
+CONFIG_USB_STORAGE_ALAUDA=m
+CONFIG_USB_STORAGE_ONETOUCH=m
+CONFIG_USB_STORAGE_KARMA=m
+CONFIG_USB_STORAGE_CYPRESS_ATACB=m
 # CONFIG_USB_LIBUSUAL is not set
 
 #
@@ -2546,7 +2965,7 @@ CONFIG_USB_SERIAL_BELKIN=m
 CONFIG_USB_SERIAL_CH341=m
 CONFIG_USB_SERIAL_WHITEHEAT=m
 CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-CONFIG_USB_SERIAL_CP2101=m
+CONFIG_USB_SERIAL_CP210X=m
 CONFIG_USB_SERIAL_CYPRESS_M8=m
 CONFIG_USB_SERIAL_EMPEG=m
 CONFIG_USB_SERIAL_FTDI_SIO=m
@@ -2575,12 +2994,15 @@ CONFIG_USB_SERIAL_SPCP8X5=m
 CONFIG_USB_SERIAL_HP4X=m
 CONFIG_USB_SERIAL_SAFE=m
 # CONFIG_USB_SERIAL_SAFE_PADDED is not set
+CONFIG_USB_SERIAL_SIEMENS_MPI=m
 CONFIG_USB_SERIAL_SIERRAWIRELESS=m
+CONFIG_USB_SERIAL_SYMBOL=m
 CONFIG_USB_SERIAL_TI=m
 # CONFIG_USB_SERIAL_CYBERJACK is not set
 CONFIG_USB_SERIAL_XIRCOM=m
 CONFIG_USB_SERIAL_OPTION=m
 # CONFIG_USB_SERIAL_OMNINET is not set
+CONFIG_USB_SERIAL_OPTICON=m
 # CONFIG_USB_SERIAL_DEBUG is not set
 
 #
@@ -2589,6 +3011,7 @@ CONFIG_USB_SERIAL_OPTION=m
 CONFIG_USB_EMI62=m
 CONFIG_USB_EMI26=m
 # CONFIG_USB_ADUTUX is not set
+CONFIG_USB_SEVSEG=m
 # CONFIG_USB_RIO500 is not set
 # CONFIG_USB_LEGOTOWER is not set
 CONFIG_USB_LCD=m
@@ -2607,18 +3030,31 @@ CONFIG_USB_SISUSBVGA_CON=y
 CONFIG_USB_IOWARRIOR=m
 # CONFIG_USB_TEST is not set
 CONFIG_USB_ISIGHTFW=m
+CONFIG_USB_VST=m
 CONFIG_USB_ATM=m
 CONFIG_USB_SPEEDTOUCH=m
 CONFIG_USB_CXACRU=m
 CONFIG_USB_UEAGLEATM=m
 CONFIG_USB_XUSBATM=m
 # CONFIG_USB_GADGET is not set
+
+#
+# OTG and related infrastructure
+#
+CONFIG_USB_OTG_UTILS=y
+CONFIG_NOP_USB_XCEIV=m
+CONFIG_UWB=m
+CONFIG_UWB_HWA=m
+CONFIG_UWB_WHCI=m
+CONFIG_UWB_WLP=m
+CONFIG_UWB_I1480U=m
+CONFIG_UWB_I1480U_WLP=m
 CONFIG_MMC=m
 # CONFIG_MMC_DEBUG is not set
 # CONFIG_MMC_UNSAFE_RESUME is not set
 
 #
-# MMC/SD Card Drivers
+# MMC/SD/SDIO Card Drivers
 #
 CONFIG_MMC_BLOCK=m
 CONFIG_MMC_BLOCK_BOUNCE=y
@@ -2626,14 +3062,19 @@ CONFIG_SDIO_UART=m
 CONFIG_MMC_TEST=m
 
 #
-# MMC/SD Host Controller Drivers
+# MMC/SD/SDIO Host Controller Drivers
 #
 CONFIG_MMC_SDHCI=m
 CONFIG_MMC_SDHCI_PCI=m
 CONFIG_MMC_RICOH_MMC=m
+CONFIG_MMC_SDHCI_PLTFM=m
 CONFIG_MMC_WBSD=m
+# CONFIG_MMC_AT91 is not set
+# CONFIG_MMC_ATMELMCI is not set
 CONFIG_MMC_TIFM_SD=m
 CONFIG_MMC_SDRICOH_CS=m
+CONFIG_MMC_CB710=m
+CONFIG_MMC_VIA_SDMMC=m
 CONFIG_MEMSTICK=m
 # CONFIG_MEMSTICK_DEBUG is not set
 
@@ -2656,10 +3097,14 @@ CONFIG_LEDS_CLASS=m
 #
 CONFIG_LEDS_NET48XX=m
 CONFIG_LEDS_WRAP=m
-CONFIG_LEDS_ALIX=m
+CONFIG_LEDS_ALIX2=m
 CONFIG_LEDS_PCA9532=m
+CONFIG_LEDS_LP3944=m
 CONFIG_LEDS_CLEVO_MAIL=m
 CONFIG_LEDS_PCA955X=m
+CONFIG_LEDS_WM831X_STATUS=m
+CONFIG_LEDS_WM8350=m
+CONFIG_LEDS_BD2802=m
 
 #
 # LED Triggers
@@ -2668,7 +3113,12 @@ CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=m
 CONFIG_LEDS_TRIGGER_IDE_DISK=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+CONFIG_LEDS_TRIGGER_BACKLIGHT=m
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
 # CONFIG_ACCESSIBILITY is not set
 # CONFIG_INFINIBAND is not set
 # CONFIG_EDAC is not set
@@ -2700,6 +3150,8 @@ CONFIG_RTC_DRV_M41T80=m
 # CONFIG_RTC_DRV_M41T80_WDT is not set
 CONFIG_RTC_DRV_S35390A=m
 CONFIG_RTC_DRV_FM3130=m
+CONFIG_RTC_DRV_RX8581=m
+CONFIG_RTC_DRV_RX8025=m
 
 #
 # SPI RTC drivers
@@ -2709,13 +3161,20 @@ CONFIG_RTC_DRV_FM3130=m
 # Platform RTC drivers
 #
 CONFIG_RTC_DRV_CMOS=m
+CONFIG_RTC_DRV_DS1286=m
 CONFIG_RTC_DRV_DS1511=m
 CONFIG_RTC_DRV_DS1553=m
 CONFIG_RTC_DRV_DS1742=m
 CONFIG_RTC_DRV_STK17TA8=m
 CONFIG_RTC_DRV_M48T86=m
+CONFIG_RTC_DRV_M48T35=m
 CONFIG_RTC_DRV_M48T59=m
+CONFIG_RTC_DRV_BQ4802=m
 CONFIG_RTC_DRV_V3020=m
+CONFIG_RTC_DRV_WM831X=m
+CONFIG_RTC_DRV_WM8350=m
+CONFIG_RTC_DRV_PCF50633=m
+CONFIG_RTC_DRV_AB3100=m
 
 #
 # on-CPU RTC drivers
@@ -2725,6 +3184,7 @@ CONFIG_DMADEVICES=y
 #
 # DMA Devices
 #
+CONFIG_ASYNC_TX_DISABLE_CHANNEL_SWITCH=y
 CONFIG_INTEL_IOATDMA=m
 CONFIG_DMA_ENGINE=y
 
@@ -2732,6 +3192,7 @@ CONFIG_DMA_ENGINE=y
 # DMA Clients
 #
 CONFIG_NET_DMA=y
+# CONFIG_ASYNC_TX_DMA is not set
 CONFIG_DMATEST=m
 CONFIG_DCA=m
 # CONFIG_AUXDISPLAY is not set
@@ -2740,6 +3201,13 @@ CONFIG_UIO_CIF=m
 CONFIG_UIO_PDRV=m
 CONFIG_UIO_PDRV_GENIRQ=m
 CONFIG_UIO_SMX=m
+CONFIG_UIO_AEC=m
+CONFIG_UIO_SERCOS3=m
+CONFIG_UIO_PCI_GENERIC=m
+
+#
+# TI VLYNQ
+#
 CONFIG_XEN=y
 CONFIG_XEN_INTERFACE_VERSION=0x00030207
 
@@ -2749,15 +3217,17 @@ CONFIG_XEN_INTERFACE_VERSION=0x00030207
 CONFIG_XEN_PRIVILEGED_GUEST=y
 # CONFIG_XEN_UNPRIVILEGED_GUEST is not set
 CONFIG_XEN_PRIVCMD=y
+CONFIG_XEN_DOMCTL=y
 CONFIG_XEN_XENBUS_DEV=y
 CONFIG_XEN_NETDEV_ACCEL_SFC_UTIL=y
 CONFIG_XEN_BACKEND=y
 CONFIG_XEN_BLKDEV_BACKEND=y
 CONFIG_XEN_BLKDEV_TAP=y
+CONFIG_XEN_BLKDEV_TAP2=m
+CONFIG_XEN_BLKBACK_PAGEMAP=y
 CONFIG_XEN_NETDEV_BACKEND=y
 CONFIG_XEN_NETDEV_TX_SHIFT=8
 # CONFIG_XEN_NETDEV_PIPELINED_TRANSMITTER is not set
-CONFIG_XEN_NETDEV_ACCEL_SFC_BACKEND=m
 CONFIG_XEN_NETDEV_LOOPBACK=y
 CONFIG_XEN_PCIDEV_BACKEND=y
 CONFIG_XEN_PCIDEV_BACKEND_VPCI=y
@@ -2765,12 +3235,16 @@ CONFIG_XEN_PCIDEV_BACKEND_VPCI=y
 # CONFIG_XEN_PCIDEV_BACKEND_SLOT is not set
 # CONFIG_XEN_PCIDEV_BACKEND_CONTROLLER is not set
 CONFIG_XEN_PCIDEV_BE_DEBUG=y
-CONFIG_XEN_TPMDEV_BACKEND=y
+# CONFIG_XEN_TPMDEV_BACKEND is not set
 CONFIG_XEN_SCSI_BACKEND=m
+CONFIG_XEN_USB_BACKEND=m
 CONFIG_XEN_BLKDEV_FRONTEND=y
 CONFIG_XEN_NETDEV_FRONTEND=y
 CONFIG_XEN_NETDEV_ACCEL_SFC_FRONTEND=y
 CONFIG_XEN_SCSI_FRONTEND=m
+CONFIG_XEN_USB_FRONTEND=m
+CONFIG_XEN_USB_FRONTEND_HCD_STATS=y
+# CONFIG_XEN_USB_FRONTEND_HCD_PM is not set
 CONFIG_XEN_GRANT_DEV=y
 CONFIG_XEN_FRAMEBUFFER=y
 CONFIG_XEN_KEYBOARD=y
@@ -2781,16 +3255,99 @@ CONFIG_XEN_NR_GUEST_DEVICES=256
 # CONFIG_XEN_COMPAT_030004_AND_LATER is not set
 # CONFIG_XEN_COMPAT_030100_AND_LATER is not set
 CONFIG_XEN_COMPAT_030200_AND_LATER=y
+# CONFIG_XEN_COMPAT_030300_AND_LATER is not set
+# CONFIG_XEN_COMPAT_030400_AND_LATER is not set
 # CONFIG_XEN_COMPAT_LATEST_ONLY is not set
 CONFIG_XEN_COMPAT=0x030200
+CONFIG_XEN_VCPU_INFO_PLACEMENT=y
 CONFIG_HAVE_IRQ_IGNORE_UNHANDLED=y
-CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
 CONFIG_IRQ_PER_CPU=y
 CONFIG_NO_IDLE_HZ=y
 CONFIG_XEN_SMPBOOT=y
 CONFIG_XEN_DEVMEM=y
 CONFIG_XEN_BALLOON=y
 CONFIG_XEN_SCRUB_PAGES=y
+CONFIG_STAGING=y
+# CONFIG_STAGING_EXCLUDE_BUILD is not set
+CONFIG_ET131X=m
+# CONFIG_ET131X_DEBUG is not set
+CONFIG_SLICOSS=m
+# CONFIG_VIDEO_GO7007 is not set
+# CONFIG_VIDEO_CX25821 is not set
+# CONFIG_USB_IP_COMMON is not set
+# CONFIG_W35UND is not set
+# CONFIG_PRISM2_USB is not set
+# CONFIG_ECHO is not set
+# CONFIG_POCH is not set
+# CONFIG_OTUS is not set
+# CONFIG_RT2860 is not set
+# CONFIG_RT2870 is not set
+# CONFIG_RT3090 is not set
+# CONFIG_COMEDI is not set
+# CONFIG_ASUS_OLED is not set
+# CONFIG_PANEL is not set
+# CONFIG_ALTERA_PCIE_CHDMA is not set
+# CONFIG_RTL8187SE is not set
+# CONFIG_RTL8192SU is not set
+# CONFIG_RTL8192E is not set
+# CONFIG_TRANZPORT is not set
+
+#
+# Android
+#
+
+#
+# Qualcomm MSM Camera And Video
+#
+
+#
+# Camera Sensor Selection
+#
+# CONFIG_INPUT_GPIO is not set
+# CONFIG_DST is not set
+# CONFIG_POHMELFS is not set
+# CONFIG_B3DFG is not set
+# CONFIG_IDE_PHISON is not set
+# CONFIG_PLAN9AUTH is not set
+# CONFIG_LINE6_USB is not set
+# CONFIG_DRM_RADEON_KMS is not set
+# CONFIG_USB_SERIAL_QUATECH2 is not set
+# CONFIG_USB_SERIAL_QUATECH_USB2 is not set
+# CONFIG_VT6655 is not set
+# CONFIG_VT6656 is not set
+# CONFIG_FB_UDL is not set
+# CONFIG_VME_BUS is not set
+
+#
+# RAR Register Driver
+#
+# CONFIG_RAR_REGISTER is not set
+# CONFIG_IIO is not set
+CONFIG_X86_PLATFORM_DEVICES=y
+CONFIG_ACER_WMI=m
+CONFIG_ASUS_LAPTOP=m
+CONFIG_DELL_WMI=m
+CONFIG_FUJITSU_LAPTOP=m
+CONFIG_FUJITSU_LAPTOP_DEBUG=y
+CONFIG_TC1100_WMI=m
+CONFIG_HP_WMI=m
+CONFIG_MSI_LAPTOP=m
+CONFIG_PANASONIC_LAPTOP=m
+CONFIG_COMPAL_LAPTOP=m
+CONFIG_SONY_LAPTOP=m
+# CONFIG_SONYPI_COMPAT is not set
+CONFIG_THINKPAD_ACPI=m
+# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
+# CONFIG_THINKPAD_ACPI_DEBUG is not set
+# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
+CONFIG_THINKPAD_ACPI_VIDEO=y
+CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
+CONFIG_INTEL_MENLOW=m
+CONFIG_ACPI_WMI=m
+CONFIG_MSI_WMI=m
+CONFIG_ACPI_ASUS=m
+CONFIG_TOPSTAR_LAPTOP=m
+CONFIG_ACPI_TOSHIBA=m
 
 #
 # Firmware Drivers
@@ -2812,16 +3369,25 @@ CONFIG_EXT2_FS_POSIX_ACL=y
 CONFIG_EXT2_FS_SECURITY=y
 # CONFIG_EXT2_FS_XIP is not set
 CONFIG_EXT3_FS=m
+# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
 CONFIG_EXT3_FS_XATTR=y
 CONFIG_EXT3_FS_POSIX_ACL=y
 # CONFIG_EXT3_FS_NFS4ACL is not set
 CONFIG_EXT3_FS_SECURITY=y
-# CONFIG_EXT4DEV_FS is not set
+CONFIG_EXT4_FS=m
+CONFIG_EXT4_FS_XATTR=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+# CONFIG_EXT4_DEBUG is not set
 CONFIG_JBD=m
+CONFIG_JBD2=m
 CONFIG_FS_MBCACHE=m
+CONFIG_REISER4_FS=m
+# CONFIG_REISER4_DEBUG is not set
 CONFIG_REISERFS_FS=m
 # CONFIG_REISERFS_CHECK is not set
 CONFIG_REISERFS_PROC_INFO=y
+# CONFIG_REISERFS_DEFAULTS_TO_BARRIERS_ENABLED is not set
 CONFIG_REISERFS_FS_XATTR=y
 CONFIG_REISERFS_FS_POSIX_ACL=y
 CONFIG_REISERFS_FS_SECURITY=y
@@ -2840,6 +3406,10 @@ CONFIG_XFS_POSIX_ACL=y
 CONFIG_XFS_DEBUG=y
 # CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
+# CONFIG_BTRFS_FS is not set
+# CONFIG_NILFS2_FS is not set
+CONFIG_FILE_LOCKING=y
+CONFIG_FSNOTIFY=y
 CONFIG_DNOTIFY=y
 CONFIG_INOTIFY=y
 CONFIG_INOTIFY_USER=y
@@ -2854,13 +3424,19 @@ CONFIG_QUOTACTL=y
 CONFIG_AUTOFS_FS=m
 CONFIG_AUTOFS4_FS=m
 CONFIG_FUSE_FS=m
+CONFIG_CUSE=m
+
+#
+# Caches
+#
+# CONFIG_FSCACHE is not set
 
 #
 # CD-ROM/DVD Filesystems
 #
 CONFIG_ISO9660_FS=m
 CONFIG_JOLIET=y
-# CONFIG_ZISOFS is not set
+CONFIG_ZISOFS=y
 CONFIG_UDF_FS=m
 CONFIG_UDF_NLS=y
 
@@ -2880,15 +3456,13 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 CONFIG_PROC_FS=y
 # CONFIG_PROC_KCORE is not set
 CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
 CONFIG_SYSFS=y
 CONFIG_TMPFS=y
 # CONFIG_TMPFS_POSIX_ACL is not set
 # CONFIG_HUGETLB_PAGE is not set
 # CONFIG_CONFIGFS_FS is not set
-
-#
-# Miscellaneous filesystems
-#
+CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_ADFS_FS is not set
 # CONFIG_AFFS_FS is not set
 CONFIG_ECRYPT_FS=m
@@ -2915,6 +3489,7 @@ CONFIG_JFFS2_CMODE_PRIORITY=y
 # CONFIG_UBIFS_FS is not set
 # CONFIG_CRAMFS is not set
 CONFIG_SQUASHFS=y
+CONFIG_SQUASHFS_LZMA=y
 # CONFIG_SQUASHFS_EMBEDDED is not set
 CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
 # CONFIG_VXFS_FS is not set
@@ -2925,19 +3500,23 @@ CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
 # CONFIG_ROMFS_FS is not set
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
+# CONFIG_EXOFS_FS is not set
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=m
 CONFIG_NFS_V3=y
-# CONFIG_NFS_V3_ACL is not set
+CONFIG_NFS_V3_ACL=y
 CONFIG_NFS_V4=y
 # CONFIG_NFS_SWAP is not set
+# CONFIG_NFS_V4_1 is not set
 CONFIG_NFSD=m
+CONFIG_NFSD_V2_ACL=y
 CONFIG_NFSD_V3=y
-# CONFIG_NFSD_V3_ACL is not set
+CONFIG_NFSD_V3_ACL=y
 # CONFIG_NFSD_V4 is not set
 CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
 CONFIG_EXPORTFS=m
+CONFIG_NFS_ACL_SUPPORT=m
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=m
 CONFIG_SUNRPC_GSS=m
@@ -2952,8 +3531,9 @@ CONFIG_CIFS_STATS2=y
 # CONFIG_CIFS_WEAK_PW_HASH is not set
 # CONFIG_CIFS_UPCALL is not set
 CONFIG_CIFS_XATTR=y
-# CONFIG_CIFS_POSIX is not set
+CONFIG_CIFS_POSIX=y
 # CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_DFS_UPCALL is not set
 # CONFIG_CIFS_EXPERIMENTAL is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
@@ -2973,7 +3553,8 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_MINIX_SUBPARTITION is not set
 # CONFIG_SOLARIS_X86_PARTITION is not set
 # CONFIG_UNIXWARE_DISKLABEL is not set
-# CONFIG_LDM_PARTITION is not set
+CONFIG_LDM_PARTITION=y
+# CONFIG_LDM_DEBUG is not set
 # CONFIG_SGI_PARTITION is not set
 # CONFIG_ULTRIX_PARTITION is not set
 # CONFIG_SUN_PARTITION is not set
@@ -3031,29 +3612,38 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 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_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
 CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_DEBUG_MEMORY_INIT=y
+CONFIG_ARCH_WANT_FRAME_POINTERS=y
+CONFIG_FRAME_POINTER=y
+CONFIG_RCU_CPU_STALL_DETECTOR=y
 # CONFIG_LATENCYTOP is not set
 # CONFIG_SYSCTL_SYSCALL_CHECK is not set
-CONFIG_HAVE_FTRACE=y
+CONFIG_USER_STACKTRACE_SUPPORT=y
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
+CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
 CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_TRACING_SUPPORT=y
 # CONFIG_FTRACE is not set
-# CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_SYSPROF_TRACER is not set
-# CONFIG_SCHED_TRACER is not set
-# CONFIG_CONTEXT_SWITCH_TRACER is not set
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
 # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
-# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
+# CONFIG_DMA_API_DEBUG is not set
 # CONFIG_SAMPLES is not set
+CONFIG_HAVE_ARCH_KMEMCHECK=y
 # CONFIG_STRICT_DEVMEM is not set
 CONFIG_EARLY_PRINTK=y
 # CONFIG_EARLY_PRINTK_DBGP is not set
 # CONFIG_4KSTACKS is not set
+# CONFIG_IOMMU_STRESS is not set
 CONFIG_IO_DELAY_TYPE_0X80=0
 CONFIG_IO_DELAY_TYPE_0XED=1
 CONFIG_IO_DELAY_TYPE_UDELAY=2
@@ -3071,23 +3661,39 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
 CONFIG_KEYS=y
 # CONFIG_KEYS_DEBUG_PROC_KEYS is not set
 # CONFIG_SECURITY is not set
+# CONFIG_SECURITYFS is not set
 # CONFIG_SECURITY_FILE_CAPABILITIES is not set
+# CONFIG_IMA is not set
 CONFIG_XOR_BLOCKS=m
 CONFIG_ASYNC_CORE=m
 CONFIG_ASYNC_MEMCPY=m
 CONFIG_ASYNC_XOR=m
+CONFIG_ASYNC_PQ=m
+CONFIG_ASYNC_RAID6_RECOV=m
+CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y
+CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y
 CONFIG_CRYPTO=y
 
 #
 # Crypto core or helper
 #
+CONFIG_CRYPTO_FIPS=y
 CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
 CONFIG_CRYPTO_AEAD=m
+CONFIG_CRYPTO_AEAD2=y
 CONFIG_CRYPTO_BLKCIPHER=m
+CONFIG_CRYPTO_BLKCIPHER2=y
 CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG=m
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_PCOMP=y
 CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
 CONFIG_CRYPTO_GF128MUL=m
 # CONFIG_CRYPTO_NULL is not set
+CONFIG_CRYPTO_WORKQUEUE=y
 CONFIG_CRYPTO_CRYPTD=m
 CONFIG_CRYPTO_AUTHENC=m
 # CONFIG_CRYPTO_TEST is not set
@@ -3115,11 +3721,14 @@ CONFIG_CRYPTO_XTS=m
 #
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_XCBC=m
+CONFIG_CRYPTO_VMAC=m
 
 #
 # Digest
 #
 CONFIG_CRYPTO_CRC32C=m
+CONFIG_CRYPTO_CRC32C_INTEL=m
+CONFIG_CRYPTO_GHASH=m
 # CONFIG_CRYPTO_MD4 is not set
 CONFIG_CRYPTO_MD5=m
 CONFIG_CRYPTO_MICHAEL_MIC=m
@@ -3160,7 +3769,13 @@ CONFIG_CRYPTO_TWOFISH_586=m
 # Compression
 #
 CONFIG_CRYPTO_DEFLATE=y
+CONFIG_CRYPTO_ZLIB=m
 CONFIG_CRYPTO_LZO=m
+
+#
+# Random Number Generation
+#
+CONFIG_CRYPTO_ANSI_CPRNG=m
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
@@ -3168,6 +3783,7 @@ CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
 CONFIG_CRYPTO_DEV_GEODE=m
 CONFIG_CRYPTO_DEV_HIFN_795X=m
 CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
+# CONFIG_BINARY_PRINTF is not set
 
 #
 # Library routines
@@ -3175,6 +3791,7 @@ CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
 CONFIG_BITREVERSE=y
 CONFIG_GENERIC_FIND_FIRST_BIT=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
+CONFIG_GENERIC_FIND_LAST_BIT=y
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
 CONFIG_CRC_T10DIF=m
@@ -3187,12 +3804,16 @@ CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_LZO_COMPRESS=m
 CONFIG_LZO_DECOMPRESS=m
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_LZMA_NEEDED=y
 CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_KMP=m
 CONFIG_TEXTSEARCH_BM=m
 CONFIG_TEXTSEARCH_FSM=m
-CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y
 CONFIG_CHECK_SIGNATURE=y
+CONFIG_NLATTR=y

diff --git a/config/qos/makeqosscripts.pl b/config/qos/makeqosscripts.pl
index 66bdc4fa387b5896e6accda57c50ab33f3936a21..243cf85ff25c74461e43345ff5dc3d49abc2c22f 100644 (file)
--- a/config/qos/makeqosscripts.pl
+++ b/config/qos/makeqosscripts.pl
@@ -264,6 +264,9 @@ print <<END
        iptables -t mangle -I POSTROUTING -o $qossettings{'RED_DEV'} -j QOS-OUT
        iptables -t mangle -A POSTROUTING -o $qossettings{'RED_DEV'} -j QOS-TOS
 
+       ### Don't change mark on traffic for the ipsec tunnel
+       iptables -t mangle -A QOS-OUT -m mark --mark 50 -j RETURN
+
        ### MARK ACKs
        iptables -t mangle -A QOS-OUT -p tcp --tcp-flags SYN,RST SYN -j TOS --set-tos 4
        iptables -t mangle -A QOS-OUT -p tcp --tcp-flags SYN,RST SYN -j MARK --set-mark $qossettings{'ACK'}
@@ -514,7 +517,7 @@ print <<END
 
        ### ADD QOS-INC CHAIN TO THE MANGLE TABLE IN IPTABLES
        iptables -t mangle -N QOS-INC
-       iptables -t mangle -A POSTROUTING -m mark ! --mark 0 -o ! $qossettings{'RED_DEV'} -j IMQ --todev 0
+       iptables -t mangle -A POSTROUTING -m mark ! --mark 0 ! -o $qossettings{'RED_DEV'} -j IMQ --todev 0
        iptables -t mangle -I FORWARD -i $qossettings{'RED_DEV'} -j QOS-INC
        iptables -t mangle -A FORWARD -i $qossettings{'RED_DEV'} -j QOS-TOS
 
@@ -687,7 +690,7 @@ print <<END
        tc qdisc del dev $qossettings{'IMQ_DEV'} root >/dev/null 2>&1
        # STOP IMQ-DEVICE
        ip link set $qossettings{'IMQ_DEV'} down >/dev/null 2>&1
-       iptables -t mangle --delete POSTROUTING -m mark ! --mark 0 -o ! $qossettings{'RED_DEV'} -j IMQ --todev 0 >/dev/null 2>&1
+       iptables -t mangle --delete POSTROUTING -m mark ! --mark 0 ! -o $qossettings{'RED_DEV'} -j IMQ --todev 0 >/dev/null 2>&1
        iptables -t mangle --delete PREROUTING -i $qossettings{'RED_DEV'} -j IMQ --todev 0  >/dev/null 2>&1
        # rmmod imq # this crash on 2.6.25.xx
        # REMOVE & FLUSH CHAINS

diff --git a/config/rootfiles/common/bzip2 b/config/rootfiles/common/bzip2
index a0642f84ea026c7295194e46310333158e0472eb..550b9f1a9b05309e2ec1bc40e25e3eea3d838f92 100644 (file)
--- a/config/rootfiles/common/bzip2
+++ b/config/rootfiles/common/bzip2
@@ -17,6 +17,8 @@ usr/local/bin/bzip2
 #usr/local/bin/bzmore
 usr/local/include/bzlib.h
 usr/local/lib/libbz2.a
+#usr/local/man
+#usr/local/man/man1
 #usr/local/man/man1/bzcmp.1
 #usr/local/man/man1/bzdiff.1
 #usr/local/man/man1/bzegrep.1

diff --git a/config/rootfiles/common/collectd b/config/rootfiles/common/collectd
index 29160941da4dd74982d99d1d68231b0b136d4493..0fe7afc037263aa84335e841a6bb83045c3f7c22 100644 (file)
--- a/config/rootfiles/common/collectd
+++ b/config/rootfiles/common/collectd
@@ -1,113 +1,234 @@
 etc/collectd.conf
 etc/collectd.thermal
-etc/rc.d/init.d/collectd
 etc/rc.d/rc0.d/K50collectd
 etc/rc.d/rc3.d/S21collectd
 etc/rc.d/rc6.d/K50collectd
 #usr/bin/collectd-nagios
 #usr/etc/collectd.conf
-#usr/bin/collectd-nagios
-#usr/etc/collectd.conf
+#usr/include/collectd
+#usr/include/collectd/client.h
+#usr/include/collectd/lcc_features.h
 #usr/lib/collectd
+#usr/lib/collectd/apache.a
 #usr/lib/collectd/apache.la
 usr/lib/collectd/apache.so
+#usr/lib/collectd/apcups.a
 #usr/lib/collectd/apcups.la
 usr/lib/collectd/apcups.so
+#usr/lib/collectd/ascent.a
 #usr/lib/collectd/ascent.la
 usr/lib/collectd/ascent.so
+#usr/lib/collectd/battery.a
 #usr/lib/collectd/battery.la
 usr/lib/collectd/battery.so
+#usr/lib/collectd/bind.a
+#usr/lib/collectd/bind.la
+usr/lib/collectd/bind.so
+#usr/lib/collectd/conntrack.a
+#usr/lib/collectd/conntrack.la
+usr/lib/collectd/conntrack.so
+#usr/lib/collectd/contextswitch.a
+#usr/lib/collectd/contextswitch.la
+usr/lib/collectd/contextswitch.so
+#usr/lib/collectd/cpu.a
 #usr/lib/collectd/cpu.la
 usr/lib/collectd/cpu.so
+#usr/lib/collectd/cpufreq.a
 #usr/lib/collectd/cpufreq.la
 usr/lib/collectd/cpufreq.so
+#usr/lib/collectd/curl.a
+#usr/lib/collectd/curl.la
+usr/lib/collectd/curl.so
+#usr/lib/collectd/df.a
 #usr/lib/collectd/df.la
 usr/lib/collectd/df.so
+#usr/lib/collectd/disk.a
 #usr/lib/collectd/disk.la
 usr/lib/collectd/disk.so
+#usr/lib/collectd/dns.a
 #usr/lib/collectd/dns.la
 usr/lib/collectd/dns.so
+#usr/lib/collectd/email.a
 #usr/lib/collectd/email.la
 usr/lib/collectd/email.so
+#usr/lib/collectd/entropy.a
 #usr/lib/collectd/entropy.la
 usr/lib/collectd/entropy.so
+#usr/lib/collectd/exec.a
 #usr/lib/collectd/exec.la
 usr/lib/collectd/exec.so
-usr/lib/collectd/filecount.la
+#usr/lib/collectd/filecount.a
+#usr/lib/collectd/filecount.la
 usr/lib/collectd/filecount.so
+#usr/lib/collectd/fscache.a
+#usr/lib/collectd/fscache.la
+usr/lib/collectd/fscache.so
+#usr/lib/collectd/hddtemp.a
 #usr/lib/collectd/hddtemp.la
 usr/lib/collectd/hddtemp.so
+#usr/lib/collectd/interface.a
 #usr/lib/collectd/interface.la
 usr/lib/collectd/interface.so
+#usr/lib/collectd/iptables.a
 #usr/lib/collectd/iptables.la
 usr/lib/collectd/iptables.so
+#usr/lib/collectd/irq.a
 #usr/lib/collectd/irq.la
 usr/lib/collectd/irq.so
+#usr/lib/collectd/load.a
 #usr/lib/collectd/load.la
 usr/lib/collectd/load.so
+#usr/lib/collectd/logfile.a
 #usr/lib/collectd/logfile.la
 usr/lib/collectd/logfile.so
+#usr/lib/collectd/madwifi.a
+#usr/lib/collectd/madwifi.la
+usr/lib/collectd/madwifi.so
+#usr/lib/collectd/match_empty_counter.a
+#usr/lib/collectd/match_empty_counter.la
+usr/lib/collectd/match_empty_counter.so
+#usr/lib/collectd/match_hashed.a
+#usr/lib/collectd/match_hashed.la
+usr/lib/collectd/match_hashed.so
+#usr/lib/collectd/match_regex.a
+#usr/lib/collectd/match_regex.la
+usr/lib/collectd/match_regex.so
+#usr/lib/collectd/match_timediff.a
+#usr/lib/collectd/match_timediff.la
+usr/lib/collectd/match_timediff.so
+#usr/lib/collectd/match_value.a
+#usr/lib/collectd/match_value.la
+usr/lib/collectd/match_value.so
+#usr/lib/collectd/memory.a
 #usr/lib/collectd/memory.la
 usr/lib/collectd/memory.so
+#usr/lib/collectd/multimeter.a
 #usr/lib/collectd/multimeter.la
 usr/lib/collectd/multimeter.so
+#usr/lib/collectd/network.a
 #usr/lib/collectd/network.la
 usr/lib/collectd/network.so
+#usr/lib/collectd/nfs.a
 #usr/lib/collectd/nfs.la
 usr/lib/collectd/nfs.so
+#usr/lib/collectd/ntpd.a
 #usr/lib/collectd/ntpd.la
 usr/lib/collectd/ntpd.so
+#usr/lib/collectd/olsrd.a
+#usr/lib/collectd/olsrd.la
+usr/lib/collectd/olsrd.so
+#usr/lib/collectd/openvpn.a
+#usr/lib/collectd/openvpn.la
+usr/lib/collectd/openvpn.so
+#usr/lib/collectd/ping.a
 #usr/lib/collectd/ping.la
 usr/lib/collectd/ping.so
+#usr/lib/collectd/powerdns.a
 #usr/lib/collectd/powerdns.la
 usr/lib/collectd/powerdns.so
+#usr/lib/collectd/processes.a
 #usr/lib/collectd/processes.la
 usr/lib/collectd/processes.so
+#usr/lib/collectd/protocols.a
+#usr/lib/collectd/protocols.la
+usr/lib/collectd/protocols.so
+#usr/lib/collectd/python.a
+#usr/lib/collectd/python.la
+usr/lib/collectd/python.so
+#usr/lib/collectd/rrdtool.a
 #usr/lib/collectd/rrdtool.la
 usr/lib/collectd/rrdtool.so
+#usr/lib/collectd/sensors.a
 #usr/lib/collectd/sensors.la
 usr/lib/collectd/sensors.so
+#usr/lib/collectd/swap.a
 #usr/lib/collectd/swap.la
 usr/lib/collectd/swap.so
+#usr/lib/collectd/syslog.a
 #usr/lib/collectd/syslog.la
 usr/lib/collectd/syslog.so
+#usr/lib/collectd/table.a
+#usr/lib/collectd/table.la
+usr/lib/collectd/table.so
+#usr/lib/collectd/tail.a
 #usr/lib/collectd/tail.la
 usr/lib/collectd/tail.so
+#usr/lib/collectd/target_notification.a
+#usr/lib/collectd/target_notification.la
+usr/lib/collectd/target_notification.so
+#usr/lib/collectd/target_replace.a
+#usr/lib/collectd/target_replace.la
+usr/lib/collectd/target_replace.so
+#usr/lib/collectd/target_scale.a
+#usr/lib/collectd/target_scale.la
+usr/lib/collectd/target_scale.so
+#usr/lib/collectd/target_set.a
+#usr/lib/collectd/target_set.la
+usr/lib/collectd/target_set.so
+#usr/lib/collectd/tcpconns.a
 #usr/lib/collectd/tcpconns.la
 usr/lib/collectd/tcpconns.so
+#usr/lib/collectd/teamspeak2.a
 #usr/lib/collectd/teamspeak2.la
 usr/lib/collectd/teamspeak2.so
-usr/lib/collectd/thermal.la
+#usr/lib/collectd/ted.a
+#usr/lib/collectd/ted.la
+usr/lib/collectd/ted.so
+#usr/lib/collectd/thermal.a
+#usr/lib/collectd/thermal.la
 usr/lib/collectd/thermal.so
-usr/lib/collectd/types.db
+#usr/lib/collectd/unixsock.a
 #usr/lib/collectd/unixsock.la
 usr/lib/collectd/unixsock.so
+#usr/lib/collectd/uptime.a
+#usr/lib/collectd/uptime.la
+usr/lib/collectd/uptime.so
+#usr/lib/collectd/users.a
 #usr/lib/collectd/users.la
 usr/lib/collectd/users.so
+#usr/lib/collectd/uuid.a
 #usr/lib/collectd/uuid.la
 usr/lib/collectd/uuid.so
+#usr/lib/collectd/vmem.a
 #usr/lib/collectd/vmem.la
 usr/lib/collectd/vmem.so
+#usr/lib/collectd/wireless.a
 #usr/lib/collectd/wireless.la
 usr/lib/collectd/wireless.so
+#usr/lib/collectd/write_http.a
+#usr/lib/collectd/write_http.la
+usr/lib/collectd/write_http.so
+#usr/lib/libcollectdclient.a
+#usr/lib/libcollectdclient.la
+usr/lib/libcollectdclient.so
+usr/lib/libcollectdclient.so.0
+usr/lib/libcollectdclient.so.0.0.0
 #usr/lib/perl5/site_perl/5.8.8/Collectd
 #usr/lib/perl5/site_perl/5.8.8/Collectd.pm
+#usr/lib/perl5/site_perl/5.8.8/Collectd/Plugins
+#usr/lib/perl5/site_perl/5.8.8/Collectd/Plugins/Monitorus.pm
+#usr/lib/perl5/site_perl/5.8.8/Collectd/Plugins/OpenVZ.pm
 #usr/lib/perl5/site_perl/5.8.8/Collectd/Unixsock.pm
 #usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Collectd
 #usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Collectd/.packlist
+#usr/lib/pkgconfig/libcollectdclient.pc
 usr/sbin/collectd
 usr/sbin/collectdmon
 #usr/share/collectd
 #usr/share/collectd/postgresql_default.conf
+usr/share/collectd/types.db
 #usr/share/man/man1/collectd-nagios.1
 #usr/share/man/man1/collectd.1
 #usr/share/man/man1/collectdmon.1
 #usr/share/man/man3/Collectd::Unixsock.3
 #usr/share/man/man5/collectd-email.5
 #usr/share/man/man5/collectd-exec.5
+#usr/share/man/man5/collectd-java.5
 #usr/share/man/man5/collectd-perl.5
+#usr/share/man/man5/collectd-python.5
 #usr/share/man/man5/collectd-snmp.5
 #usr/share/man/man5/collectd-unixsock.5
 #usr/share/man/man5/collectd.conf.5
 #usr/share/man/man5/types.db.5
 #var/lib/collectd
+etc/rc.d/init.d/collectd

diff --git a/config/rootfiles/common/compat-wireless b/config/rootfiles/common/compat-wireless
deleted file mode 100644 (file)
index 7baef23..0000000
--- a/config/rootfiles/common/compat-wireless
+++ /dev/null
@@ -1,2 +0,0 @@
-etc/modprobe.d/cfg80211
-etc/modprobe.d/hostap

diff --git a/config/rootfiles/common/dosfstools b/config/rootfiles/common/dosfstools
index eba686f8461fc8dea90af2865b60614f48024565..2a1b0ef3cb2aaf69bc41ac9ca12cf9f1638b13fd 100644 (file)
--- a/config/rootfiles/common/dosfstools
+++ b/config/rootfiles/common/dosfstools
@@ -1,12 +1,25 @@
-#sbin/dosfsck
-#sbin/fsck.msdos
-#sbin/fsck.vfat
-#sbin/mkdosfs
-#sbin/mkfs.msdos
-#sbin/mkfs.vfat
-#usr/man/man8/dosfsck.8
-#usr/man/man8/fsck.msdos.8
-#usr/man/man8/fsck.vfat.8
-#usr/man/man8/mkdosfs.8
-#usr/man/man8/mkfs.msdos.8
-#usr/man/man8/mkfs.vfat.8
+sbin/dosfsck
+sbin/dosfslabel
+sbin/fsck.msdos
+sbin/fsck.vfat
+sbin/mkdosfs
+sbin/mkfs.msdos
+sbin/mkfs.vfat
+#share/doc
+#share/doc/dosfstools
+#share/doc/dosfstools/ANNOUNCE.mkdosfs
+#share/doc/dosfstools/ChangeLog
+#share/doc/dosfstools/ChangeLog.dosfsck
+#share/doc/dosfstools/ChangeLog.dosfstools-2.x
+#share/doc/dosfstools/ChangeLog.mkdosfs
+#share/doc/dosfstools/README.dosfsck
+#share/doc/dosfstools/README.dosfstools-2.x
+#share/doc/dosfstools/README.mkdosfs
+#share/doc/dosfstools/TODO.dosfstools-2.x
+#share/man/man8/dosfsck.8
+#share/man/man8/dosfslabel.8
+#share/man/man8/fsck.msdos.8
+#share/man/man8/fsck.vfat.8
+#share/man/man8/mkdosfs.8
+#share/man/man8/mkfs.msdos.8
+#share/man/man8/mkfs.vfat.8

diff --git a/config/rootfiles/common/e2fsprogs b/config/rootfiles/common/e2fsprogs
index 320f80ca561d7af26a5a32240899911d6c250749..a2932906d5b8e93a5fba4dffc9f62ffe8382f01b 100644 (file)
--- a/config/rootfiles/common/e2fsprogs
+++ b/config/rootfiles/common/e2fsprogs
@@ -18,21 +18,26 @@ sbin/dumpe2fs
 sbin/e2fsck
 sbin/e2image
 sbin/e2label
+sbin/e2undo
 sbin/findfs
 sbin/fsck
 sbin/fsck.ext2
 sbin/fsck.ext3
+sbin/fsck.ext4
+sbin/fsck.ext4dev
 #sbin/logsave
 sbin/mke2fs
 sbin/mkfs.ext2
 sbin/mkfs.ext3
-#sbin/resize2fs
+sbin/mkfs.ext4
+sbin/mkfs.ext4dev
+sbin/resize2fs
 sbin/tune2fs
 usr/bin/chattr
 #usr/bin/compile_et
 usr/bin/lsattr
 #usr/bin/mk_cmds
-#usr/bin/uuidgen
+usr/bin/uuidgen
 #usr/include/blkid
 #usr/include/blkid/blkid.h
 #usr/include/blkid/blkid_types.h
@@ -48,12 +53,13 @@ usr/bin/lsattr
 #usr/include/ext2fs/ext2_io.h
 #usr/include/ext2fs/ext2_types.h
 #usr/include/ext2fs/ext2fs.h
+#usr/include/ext2fs/ext3_extents.h
+#usr/include/ext2fs/tdb.h
 #usr/include/ss
 #usr/include/ss/ss.h
 #usr/include/ss/ss_err.h
 #usr/include/uuid
 #usr/include/uuid/uuid.h
-#usr/info/libext2fs.info.gz
 #usr/lib/e2initrd_helper
 #usr/lib/libblkid.a
 usr/lib/libblkid.so
@@ -74,51 +80,60 @@ usr/lib/libuuid.so
 #usr/lib/pkgconfig/ext2fs.pc
 #usr/lib/pkgconfig/ss.pc
 #usr/lib/pkgconfig/uuid.pc
-#usr/man/man1/chattr.1
-#usr/man/man1/compile_et.1
-#usr/man/man1/lsattr.1
-#usr/man/man1/mk_cmds.1
-#usr/man/man1/uuidgen.1
-#usr/man/man3/com_err.3
-#usr/man/man3/libblkid.3
-#usr/man/man3/uuid.3
-#usr/man/man3/uuid_clear.3
-#usr/man/man3/uuid_compare.3
-#usr/man/man3/uuid_copy.3
-#usr/man/man3/uuid_generate.3
-#usr/man/man3/uuid_generate_random.3
-#usr/man/man3/uuid_generate_time.3
-#usr/man/man3/uuid_is_null.3
-#usr/man/man3/uuid_parse.3
-#usr/man/man3/uuid_time.3
-#usr/man/man3/uuid_unparse.3
-#usr/man/man5/e2fsck.conf.5
-#usr/man/man5/mke2fs.conf.5
-#usr/man/man8
-#usr/man/man8/badblocks.8
-#usr/man/man8/blkid.8
-#usr/man/man8/debugfs.8
-#usr/man/man8/dumpe2fs.8
-#usr/man/man8/e2fsck.8
-#usr/man/man8/e2image.8
-#usr/man/man8/e2label.8
-#usr/man/man8/filefrag.8
-#usr/man/man8/findfs.8
-#usr/man/man8/fsck.8
-#usr/man/man8/fsck.ext2.8
-#usr/man/man8/fsck.ext3.8
-#usr/man/man8/logsave.8
-#usr/man/man8/mke2fs.8
-#usr/man/man8/mkfs.ext2.8
-#usr/man/man8/mkfs.ext3.8
-#usr/man/man8/mklost+found.8
-#usr/man/man8/resize2fs.8
-#usr/man/man8/tune2fs.8
-#usr/sbin/filefrag
+usr/sbin/e2freefrag
+usr/sbin/filefrag
 usr/sbin/mklost+found
+usr/sbin/uuidd
 #usr/share/et
 #usr/share/et/et_c.awk
 #usr/share/et/et_h.awk
+#usr/share/info/libext2fs.info.gz
+#usr/share/man/man1/chattr.1
+#usr/share/man/man1/compile_et.1
+#usr/share/man/man1/lsattr.1
+#usr/share/man/man1/mk_cmds.1
+#usr/share/man/man1/uuidgen.1
+#usr/share/man/man3/com_err.3
+#usr/share/man/man3/libblkid.3
+#usr/share/man/man3/uuid.3
+#usr/share/man/man3/uuid_clear.3
+#usr/share/man/man3/uuid_compare.3
+#usr/share/man/man3/uuid_copy.3
+#usr/share/man/man3/uuid_generate.3
+#usr/share/man/man3/uuid_generate_random.3
+#usr/share/man/man3/uuid_generate_time.3
+#usr/share/man/man3/uuid_is_null.3
+#usr/share/man/man3/uuid_parse.3
+#usr/share/man/man3/uuid_time.3
+#usr/share/man/man3/uuid_unparse.3
+#usr/share/man/man5/e2fsck.conf.5
+#usr/share/man/man5/mke2fs.conf.5
+#usr/share/man/man8/badblocks.8
+#usr/share/man/man8/blkid.8
+#usr/share/man/man8/debugfs.8
+#usr/share/man/man8/dumpe2fs.8
+#usr/share/man/man8/e2freefrag.8
+#usr/share/man/man8/e2fsck.8
+#usr/share/man/man8/e2image.8
+#usr/share/man/man8/e2label.8
+#usr/share/man/man8/e2undo.8
+#usr/share/man/man8/filefrag.8
+#usr/share/man/man8/findfs.8
+#usr/share/man/man8/fsck.8
+#usr/share/man/man8/fsck.ext2.8
+#usr/share/man/man8/fsck.ext3.8
+#usr/share/man/man8/fsck.ext4.8
+#usr/share/man/man8/fsck.ext4dev.8
+#usr/share/man/man8/logsave.8
+#usr/share/man/man8/mke2fs.8
+#usr/share/man/man8/mkfs.ext2.8
+#usr/share/man/man8/mkfs.ext3.8
+#usr/share/man/man8/mkfs.ext4.8
+#usr/share/man/man8/mkfs.ext4dev.8
+#usr/share/man/man8/mklost+found.8
+#usr/share/man/man8/resize2fs.8
+#usr/share/man/man8/tune2fs.8
+#usr/share/man/man8/uuidd.8
 #usr/share/ss
 #usr/share/ss/ct_c.awk
 #usr/share/ss/ct_c.sed

diff --git a/config/rootfiles/common/fuse b/config/rootfiles/common/fuse
index 153d40833a72f8b9eb37b06d8f69c0b2ec886593..3b7ad597f29f27da4cd9c925a0886075e2526257 100644 (file)
--- a/config/rootfiles/common/fuse
+++ b/config/rootfiles/common/fuse
@@ -6,6 +6,7 @@ usr/bin/fusermount
 usr/bin/ulockmgr_server
 #usr/include/fuse
 #usr/include/fuse.h
+#usr/include/fuse/cuse_lowlevel.h
 #usr/include/fuse/fuse.h
 #usr/include/fuse/fuse_common.h
 #usr/include/fuse/fuse_common_compat.h
@@ -18,7 +19,7 @@ usr/bin/ulockmgr_server
 #usr/lib/libfuse.la
 usr/lib/libfuse.so
 usr/lib/libfuse.so.2
-usr/lib/libfuse.so.2.7.4
+usr/lib/libfuse.so.2.8.3
 #usr/lib/libulockmgr.a
 #usr/lib/libulockmgr.la
 usr/lib/libulockmgr.so

diff --git a/config/rootfiles/common/grub b/config/rootfiles/common/grub
index 2324e1cfb5df09979a725a86f716ca6c5764abf1..e466ff0f57a73d364b0f57094b4925cdf3892493 100644 (file)
--- a/config/rootfiles/common/grub
+++ b/config/rootfiles/common/grub
@@ -1,5 +1,4 @@
 #boot/grub
-#boot/grub/default
 boot/grub/grub.conf
 boot/grub/ipfire.xpm.gz
 boot/grub/stage1
@@ -7,22 +6,6 @@ boot/grub/stage2
 #usr/bin/mbchk
 #usr/info/grub.info
 #usr/info/multiboot.info
-usr/lib/grub
-#usr/lib/grub/i386-pc
-#usr/lib/grub/i386-pc/e2fs_stage1_5
-#usr/lib/grub/i386-pc/fat_stage1_5
-#usr/lib/grub/i386-pc/ffs_stage1_5
-#usr/lib/grub/i386-pc/iso9660_stage1_5
-#usr/lib/grub/i386-pc/jfs_stage1_5
-#usr/lib/grub/i386-pc/minix_stage1_5
-#usr/lib/grub/i386-pc/reiserfs_stage1_5
-#usr/lib/grub/i386-pc/reiser4_stage1_5
-#usr/lib/grub/i386-pc/stage1
-#usr/lib/grub/i386-pc/stage2
-#usr/lib/grub/i386-pc/stage2_eltorito
-#usr/lib/grub/i386-pc/ufs2_stage1_5
-#usr/lib/grub/i386-pc/vstafs_stage1_5
-#usr/lib/grub/i386-pc/xfs_stage1_5
 #usr/man/man1/mbchk.1
 #usr/man/man8/grub-install.8
 #usr/man/man8/grub-md5-crypt.8
@@ -31,5 +14,19 @@ usr/lib/grub
 usr/sbin/grub
 usr/sbin/grub-install
 usr/sbin/grub-md5-crypt
-usr/sbin/grub-set-default
 usr/sbin/grub-terminfo
+usr/share/grub
+#usr/share/grub/i386-pc
+#usr/share/grub/i386-pc/e2fs_stage1_5
+#usr/share/grub/i386-pc/fat_stage1_5
+#usr/share/grub/i386-pc/ffs_stage1_5
+#usr/share/grub/i386-pc/iso9660_stage1_5
+#usr/share/grub/i386-pc/jfs_stage1_5
+#usr/share/grub/i386-pc/minix_stage1_5
+#usr/share/grub/i386-pc/reiserfs_stage1_5
+#usr/share/grub/i386-pc/stage1
+#usr/share/grub/i386-pc/stage2
+#usr/share/grub/i386-pc/stage2_eltorito
+#usr/share/grub/i386-pc/ufs2_stage1_5
+#usr/share/grub/i386-pc/vstafs_stage1_5
+#usr/share/grub/i386-pc/xfs_stage1_5

diff --git a/config/rootfiles/common/iptables b/config/rootfiles/common/iptables
index 9882c91e96eb83c8cb33dc4141aa98b64a6ef561..8e1a6e46fbf503d5f10cd2013672c4dd64b114a5 100644 (file)
--- a/config/rootfiles/common/iptables
+++ b/config/rootfiles/common/iptables
@@ -1,119 +1,65 @@
+#lib/libip4tc.la
+lib/libip4tc.so
+lib/libip4tc.so.0
+lib/libip4tc.so.0.0.0
+#lib/libip6tc.la
+lib/libip6tc.so
+lib/libip6tc.so.0
+lib/libip6tc.so.0.0.0
+#lib/libipq.a
+#lib/libiptc.la
+lib/libiptc.so
+lib/libiptc.so.0
+lib/libiptc.so.0.0.0
+#lib/libxtables.la
+lib/libxtables.so
+lib/libxtables.so.4
+lib/libxtables.so.4.0.0
+#lib/pkgconfig
+#lib/pkgconfig/libiptc.pc
+#lib/pkgconfig/xtables.pc
 lib/xtables
-#lib/xtables/libipt_CLASSIFY.so
-#lib/xtables/libipt_CONNMARK.so
+#lib/xtables/libip6t_HL.so
+#lib/xtables/libip6t_LOG.so
+#lib/xtables/libip6t_REJECT.so
+#lib/xtables/libip6t_ah.so
+#lib/xtables/libip6t_dst.so
+#lib/xtables/libip6t_eui64.so
+#lib/xtables/libip6t_frag.so
+#lib/xtables/libip6t_hbh.so
+#lib/xtables/libip6t_hl.so
+#lib/xtables/libip6t_icmp6.so
+#lib/xtables/libip6t_ipv6header.so
+#lib/xtables/libip6t_mh.so
+#lib/xtables/libip6t_rt.so
+#lib/xtables/libipt_CLUSTERIP.so
 #lib/xtables/libipt_DNAT.so
-#lib/xtables/libipt_DSCP.so
 #lib/xtables/libipt_ECN.so
 #lib/xtables/libipt_LOG.so
-#lib/xtables/libipt_MARK.so
 #lib/xtables/libipt_MASQUERADE.so
 #lib/xtables/libipt_MIRROR.so
 #lib/xtables/libipt_NETMAP.so
-#lib/xtables/libipt_NFQUEUE.so
-#lib/xtables/libipt_NOTRACK.so
 #lib/xtables/libipt_REDIRECT.so
 #lib/xtables/libipt_REJECT.so
 #lib/xtables/libipt_SAME.so
+#lib/xtables/libipt_SET.so
 #lib/xtables/libipt_SNAT.so
-#lib/xtables/libipt_TARPIT.so
-#lib/xtables/libipt_TCPMSS.so
-#lib/xtables/libipt_TOS.so
-#lib/xtables/libipt_TRACE.so
 #lib/xtables/libipt_TTL.so
 #lib/xtables/libipt_ULOG.so
 #lib/xtables/libipt_addrtype.so
 #lib/xtables/libipt_ah.so
-#lib/xtables/libipt_comment.so
-#lib/xtables/libipt_connlimit.so
-#lib/xtables/libipt_connmark.so
-#lib/xtables/libipt_conntrack.so
-#lib/xtables/libipt_dscp.so
 #lib/xtables/libipt_ecn.so
-#lib/xtables/libipt_esp.so
-#lib/xtables/libipt_hashlimit.so
-#lib/xtables/libipt_helper.so
 #lib/xtables/libipt_icmp.so
-#lib/xtables/libipt_iprange.so
-#lib/xtables/libipt_length.so
-#lib/xtables/libipt_limit.so
-#lib/xtables/libipt_mac.so
-#lib/xtables/libipt_mark.so
-#lib/xtables/libipt_multiport.so
-#lib/xtables/libipt_owner.so
-#lib/xtables/libipt_physdev.so
-#lib/xtables/libipt_pkttype.so
-#lib/xtables/libipt_policy.so
+#lib/xtables/libipt_ipp2p.so
 #lib/xtables/libipt_realm.so
-#lib/xtables/libipt_rpc.so
-#lib/xtables/libipt_sctp.so
-#lib/xtables/libipt_standard.so
-#lib/xtables/libipt_state.so
-#lib/xtables/libipt_tcp.so
-#lib/xtables/libipt_tcpmss.so
-#lib/xtables/libipt_tos.so
+#lib/xtables/libipt_set.so
 #lib/xtables/libipt_ttl.so
-#lib/xtables/libipt_udp.so
 #lib/xtables/libipt_unclean.so
-sbin/iptables
-#sbin/iptables-restore
-#sbin/iptables-save
-#usr/share/man/man8/iptables-restore.8
-#usr/share/man/man8/iptables-save.8
-#usr/share/man/man8/iptables.8
-#lib/iptables/libipt_IMQ.so
-#usr/include/libnetfilter_queue
-#usr/include/libnetfilter_queue/libipq.h
-#usr/include/libnetfilter_queue/libnetfilter_queue.h
-#usr/include/libnetfilter_queue/linux_nfnetlink_queue.h
-#usr/include/libnfnetlink
-#usr/include/libnfnetlink/libnfnetlink.h
-#usr/include/libnfnetlink/linux_nfnetlink.h
-#usr/lib/libnetfilter_queue.a
-#usr/lib/libnetfilter_queue.la
-usr/lib/libnetfilter_queue.so
-usr/lib/libnetfilter_queue.so.1
-usr/lib/libnetfilter_queue.so.1.1.0
-#usr/lib/libnetfilter_queue_libipq.a
-#usr/lib/libnetfilter_queue_libipq.la
-usr/lib/libnetfilter_queue_libipq.so
-usr/lib/libnetfilter_queue_libipq.so.1
-usr/lib/libnetfilter_queue_libipq.so.1.0.0
-#usr/lib/libnfnetlink.a
-#usr/lib/libnfnetlink.la
-usr/lib/libnfnetlink.so
-usr/lib/libnfnetlink.so.0
-usr/lib/libnfnetlink.so.0.2.0
-#usr/lib/pkgconfig/libnetfilter_queue.pc
-#usr/lib/pkgconfig/libnfnetlink.pc
-#lib/libip4tc.o
-#lib/libip6tc.o
-#lib/libipq.a
-#lib/libiptc.a
-#lib/xtables/libip6t_HL.so
-#lib/xtables/libip6t_IMQ.so
-#lib/xtables/libip6t_LOG.so
-#lib/xtables/libip6t_REJECT.so
-#lib/xtables/libip6t_ah.so
-#lib/xtables/libip6t_dst.so
-#lib/xtables/libip6t_eui64.so
-#lib/xtables/libip6t_frag.so
-#lib/xtables/libip6t_hbh.so
-#lib/xtables/libip6t_hl.so
-#lib/xtables/libip6t_icmp6.so
-#lib/xtables/libip6t_ipv6header.so
-#lib/xtables/libip6t_mh.so
-#lib/xtables/libip6t_policy.so
-#lib/xtables/libip6t_rt.so
-#lib/xtables/libipt_CLUSTERIP.so
-#lib/xtables/libipt_IMQ.so
-#lib/xtables/libipt_SET.so
-#lib/xtables/libipt_ipp2p.so
-#lib/xtables/libipt_recent.so
-#lib/xtables/libipt_set.so
 #lib/xtables/libxt_CLASSIFY.so
 #lib/xtables/libxt_CONNMARK.so
 #lib/xtables/libxt_CONNSECMARK.so
 #lib/xtables/libxt_DSCP.so
+#lib/xtables/libxt_IMQ.so
 #lib/xtables/libxt_MARK.so
 #lib/xtables/libxt_NFLOG.so
 #lib/xtables/libxt_NFQUEUE.so
@@ -123,7 +69,9 @@ usr/lib/libnfnetlink.so.0.2.0
 #lib/xtables/libxt_TCPMSS.so
 #lib/xtables/libxt_TCPOPTSTRIP.so
 #lib/xtables/libxt_TOS.so
+#lib/xtables/libxt_TPROXY.so
 #lib/xtables/libxt_TRACE.so
+#lib/xtables/libxt_cluster.so
 #lib/xtables/libxt_comment.so
 #lib/xtables/libxt_connbytes.so
 #lib/xtables/libxt_connlimit.so
@@ -140,12 +88,16 @@ usr/lib/libnfnetlink.so.0.2.0
 #lib/xtables/libxt_mac.so
 #lib/xtables/libxt_mark.so
 #lib/xtables/libxt_multiport.so
+#lib/xtables/libxt_osf.so
 #lib/xtables/libxt_owner.so
 #lib/xtables/libxt_physdev.so
 #lib/xtables/libxt_pkttype.so
+#lib/xtables/libxt_policy.so
 #lib/xtables/libxt_quota.so
 #lib/xtables/libxt_rateest.so
+#lib/xtables/libxt_recent.so
 #lib/xtables/libxt_sctp.so
+#lib/xtables/libxt_socket.so
 #lib/xtables/libxt_standard.so
 #lib/xtables/libxt_state.so
 #lib/xtables/libxt_statistic.so
@@ -160,13 +112,18 @@ usr/lib/libnfnetlink.so.0.2.0
 #sbin/ip6tables-multi
 #sbin/ip6tables-restore
 #sbin/ip6tables-save
-#sbin/iptables-multi
+sbin/iptables
+sbin/iptables-multi
+#sbin/iptables-restore
+#sbin/iptables-save
 #sbin/iptables-xml
-#usr/include/ip6tables.h
+#usr/include/asm-generic
+#usr/include/asm-generic/errno-base.h
+#usr/include/asm-generic/errno.h
+#usr/include/iptables
 #usr/include/iptables.h
-#usr/include/libipq
+#usr/include/iptables/internal.h
 #usr/include/libipq.h
-#usr/include/libipq/libipq.h
 #usr/include/libiptc
 #usr/include/libiptc/ipt_kernel_headers.h
 #usr/include/libiptc/libip6tc.h
@@ -174,17 +131,44 @@ usr/lib/libnfnetlink.so.0.2.0
 #usr/include/libiptc/libxtc.h
 #usr/include/libipulog
 #usr/include/libipulog/libipulog.h
+#usr/include/libnetfilter_queue
+#usr/include/libnetfilter_queue/libipq.h
+#usr/include/libnetfilter_queue/libnetfilter_queue.h
+#usr/include/libnetfilter_queue/linux_nfnetlink_queue.h
+#usr/include/libnfnetlink
+#usr/include/libnfnetlink/libnfnetlink.h
+#usr/include/libnfnetlink/linux_nfnetlink.h
 #usr/include/libnfnetlink/linux_nfnetlink_compat.h
 #usr/include/linux/netfilter
+#usr/include/linux/netfilter/Kbuild
+#usr/include/linux/netfilter/nf_conntrack_amanda.h
 #usr/include/linux/netfilter/nf_conntrack_common.h
-#usr/include/linux/netfilter/nf_conntrack_tuple.h
+#usr/include/linux/netfilter/nf_conntrack_dccp.h
+#usr/include/linux/netfilter/nf_conntrack_ftp.h
+#usr/include/linux/netfilter/nf_conntrack_h323.h
+#usr/include/linux/netfilter/nf_conntrack_h323_asn1.h
+#usr/include/linux/netfilter/nf_conntrack_h323_types.h
+#usr/include/linux/netfilter/nf_conntrack_irc.h
+#usr/include/linux/netfilter/nf_conntrack_pptp.h
+#usr/include/linux/netfilter/nf_conntrack_proto_gre.h
+#usr/include/linux/netfilter/nf_conntrack_sane.h
+#usr/include/linux/netfilter/nf_conntrack_sctp.h
+#usr/include/linux/netfilter/nf_conntrack_sip.h
+#usr/include/linux/netfilter/nf_conntrack_tcp.h
+#usr/include/linux/netfilter/nf_conntrack_tftp.h
 #usr/include/linux/netfilter/nf_conntrack_tuple_common.h
-#usr/include/linux/netfilter/nf_nat.h
+#usr/include/linux/netfilter/nfnetlink.h
+#usr/include/linux/netfilter/nfnetlink_compat.h
+#usr/include/linux/netfilter/nfnetlink_conntrack.h
+#usr/include/linux/netfilter/nfnetlink_log.h
+#usr/include/linux/netfilter/nfnetlink_queue.h
 #usr/include/linux/netfilter/x_tables.h
 #usr/include/linux/netfilter/xt_CLASSIFY.h
 #usr/include/linux/netfilter/xt_CONNMARK.h
 #usr/include/linux/netfilter/xt_CONNSECMARK.h
 #usr/include/linux/netfilter/xt_DSCP.h
+#usr/include/linux/netfilter/xt_IMQ.h
+#usr/include/linux/netfilter/xt_LED.h
 #usr/include/linux/netfilter/xt_MARK.h
 #usr/include/linux/netfilter/xt_NFLOG.h
 #usr/include/linux/netfilter/xt_NFQUEUE.h
@@ -192,6 +176,8 @@ usr/lib/libnfnetlink.so.0.2.0
 #usr/include/linux/netfilter/xt_SECMARK.h
 #usr/include/linux/netfilter/xt_TCPMSS.h
 #usr/include/linux/netfilter/xt_TCPOPTSTRIP.h
+#usr/include/linux/netfilter/xt_TPROXY.h
+#usr/include/linux/netfilter/xt_cluster.h
 #usr/include/linux/netfilter/xt_comment.h
 #usr/include/linux/netfilter/xt_connbytes.h
 #usr/include/linux/netfilter/xt_connlimit.h
@@ -203,11 +189,13 @@ usr/lib/libnfnetlink.so.0.2.0
 #usr/include/linux/netfilter/xt_hashlimit.h
 #usr/include/linux/netfilter/xt_helper.h
 #usr/include/linux/netfilter/xt_iprange.h
+#usr/include/linux/netfilter/xt_layer7.h
 #usr/include/linux/netfilter/xt_length.h
 #usr/include/linux/netfilter/xt_limit.h
 #usr/include/linux/netfilter/xt_mac.h
 #usr/include/linux/netfilter/xt_mark.h
 #usr/include/linux/netfilter/xt_multiport.h
+#usr/include/linux/netfilter/xt_osf.h
 #usr/include/linux/netfilter/xt_owner.h
 #usr/include/linux/netfilter/xt_physdev.h
 #usr/include/linux/netfilter/xt_pkttype.h
@@ -215,7 +203,9 @@ usr/lib/libnfnetlink.so.0.2.0
 #usr/include/linux/netfilter/xt_quota.h
 #usr/include/linux/netfilter/xt_rateest.h
 #usr/include/linux/netfilter/xt_realm.h
+#usr/include/linux/netfilter/xt_recent.h
 #usr/include/linux/netfilter/xt_sctp.h
+#usr/include/linux/netfilter/xt_socket.h
 #usr/include/linux/netfilter/xt_state.h
 #usr/include/linux/netfilter/xt_statistic.h
 #usr/include/linux/netfilter/xt_string.h
@@ -223,23 +213,27 @@ usr/lib/libnfnetlink.so.0.2.0
 #usr/include/linux/netfilter/xt_tcpudp.h
 #usr/include/linux/netfilter/xt_time.h
 #usr/include/linux/netfilter/xt_u32.h
-#usr/include/linux/netfilter_ipv4/ip_set.h
-#usr/include/linux/netfilter_ipv4/ipt_FTOS.h
-#usr/include/linux/netfilter_ipv4/ipt_TTL.h
-#usr/include/linux/netfilter_ipv4/ipt_connlimit.h
-#usr/include/linux/netfilter_ipv4/ipt_dstlimit.h
-#usr/include/linux/netfilter_ipv4/ipt_policy.h
-#usr/include/linux/netfilter_ipv4/ipt_rpc.h
-#usr/include/linux/netfilter_ipv4/ipt_set.h
-#usr/include/linux/netfilter_ipv6/ip6t_HL.h
-#usr/include/linux/netfilter_ipv6/ip6t_REJECT.h
-#usr/include/linux/netfilter_ipv6/ip6t_TCPMSS.h
-#usr/include/linux/netfilter_ipv6/ip6t_mh.h
-#usr/include/linux/netfilter_ipv6/ip6t_policy.h
-#usr/include/xtables
+#usr/include/net/netfilter
+#usr/include/net/netfilter/nf_conntrack_tuple.h
+#usr/include/net/netfilter/nf_nat.h
 #usr/include/xtables.h
-#usr/include/xtables.h.in
-#usr/include/xtables/internal.h
+#usr/lib/libnetfilter_queue.a
+#usr/lib/libnetfilter_queue.la
+usr/lib/libnetfilter_queue.so
+usr/lib/libnetfilter_queue.so.1
+usr/lib/libnetfilter_queue.so.1.1.0
+#usr/lib/libnetfilter_queue_libipq.a
+#usr/lib/libnetfilter_queue_libipq.la
+usr/lib/libnetfilter_queue_libipq.so
+usr/lib/libnetfilter_queue_libipq.so.1
+usr/lib/libnetfilter_queue_libipq.so.1.0.0
+#usr/lib/libnfnetlink.a
+#usr/lib/libnfnetlink.la
+usr/lib/libnfnetlink.so
+usr/lib/libnfnetlink.so.0
+usr/lib/libnfnetlink.so.0.2.0
+#usr/lib/pkgconfig/libnetfilter_queue.pc
+#usr/lib/pkgconfig/libnfnetlink.pc
 #usr/share/man/man3/ipq_create_handle.3
 #usr/share/man/man3/ipq_destroy_handle.3
 #usr/share/man/man3/ipq_errstr.3
@@ -254,10 +248,7 @@ usr/lib/libnfnetlink.so.0.2.0
 #usr/share/man/man8/ip6tables-restore.8
 #usr/share/man/man8/ip6tables-save.8
 #usr/share/man/man8/ip6tables.8
+#usr/share/man/man8/iptables-restore.8
+#usr/share/man/man8/iptables-save.8
 #usr/share/man/man8/iptables-xml.8
-#lib/libxtables.la
-lib/libxtables.so
-lib/libxtables.so.0
-lib/libxtables.so.0.0.0
-#lib/pkgconfig
-#lib/pkgconfig/xtables.pc
+#usr/share/man/man8/iptables.8

diff --git a/config/rootfiles/common/liboping b/config/rootfiles/common/liboping
new file mode 100644 (file)
index 0000000..40b0cc9
--- /dev/null
+++ b/config/rootfiles/common/liboping
@@ -0,0 +1,23 @@
+usr/bin/oping
+#usr/include/oping.h
+#usr/lib/liboping.a
+#usr/lib/liboping.la
+usr/lib/liboping.so
+usr/lib/liboping.so.0
+usr/lib/liboping.so.0.2.3
+usr/lib/perl5/site_perl/5.8.8/i586-linux/Net/Oping.pm
+usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/Oping
+usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/Oping/.packlist
+usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/Oping/Oping.bs
+usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/Oping/Oping.so
+#usr/share/man/man3/Net::Oping.3
+#usr/share/man/man3/liboping.3
+#usr/share/man/man3/ping_construct.3
+#usr/share/man/man3/ping_get_error.3
+#usr/share/man/man3/ping_host_add.3
+#usr/share/man/man3/ping_iterator_get.3
+#usr/share/man/man3/ping_iterator_get_context.3
+#usr/share/man/man3/ping_iterator_get_info.3
+#usr/share/man/man3/ping_send.3
+#usr/share/man/man3/ping_setopt.3
+#usr/share/man/man8/oping.8

diff --git a/config/rootfiles/common/linux b/config/rootfiles/common/linux
index dfd57f8623ca6d5fe7fefeaebfc22f4a8dd1a015..5175f05cf660afd201446e96a9497ae3bf282bad 100644 (file)
--- a/config/rootfiles/common/linux
+++ b/config/rootfiles/common/linux
@@ -3,75 +3,8 @@ boot/System.map-ipfire
 boot/config-KVER-ipfire
 boot/vmlinuz-KVER-ipfire
 boot/vmlinuz-ipfire
-#lib/firmware/atmsar11.fw
-#lib/firmware/cpia2
-#lib/firmware/cpia2/stv0672_vp4.bin
-#lib/firmware/dabusb
-#lib/firmware/dabusb/bitstream.bin
-#lib/firmware/dabusb/firmware.fw
-#lib/firmware/dsp56k
-#lib/firmware/dsp56k/bootstrap.bin
-#lib/firmware/edgeport
-#lib/firmware/edgeport/boot.fw
-#lib/firmware/edgeport/boot2.fw
-#lib/firmware/edgeport/down.fw
-#lib/firmware/edgeport/down2.fw
-#lib/firmware/edgeport/down3.bin
-#lib/firmware/emi26
-#lib/firmware/emi26/bitstream.fw
-#lib/firmware/emi26/firmware.fw
-#lib/firmware/emi26/loader.fw
-#lib/firmware/emi62
-#lib/firmware/emi62/bitstream.fw
-#lib/firmware/emi62/loader.fw
-#lib/firmware/emi62/midi.fw
-#lib/firmware/emi62/spdif.fw
-#lib/firmware/ess
-#lib/firmware/ess/maestro3_assp_kernel.fw
-#lib/firmware/ess/maestro3_assp_minisrc.fw
-#lib/firmware/intelliport2.bin
-#lib/firmware/kaweth
-#lib/firmware/kaweth/new_code.bin
-#lib/firmware/kaweth/new_code_fix.bin
-#lib/firmware/kaweth/trigger_code.bin
-#lib/firmware/kaweth/trigger_code_fix.bin
-#lib/firmware/keyspan
-#lib/firmware/keyspan/mpr.fw
-#lib/firmware/keyspan/usa18x.fw
-#lib/firmware/keyspan/usa19.fw
-#lib/firmware/keyspan/usa19qi.fw
-#lib/firmware/keyspan/usa19qw.fw
-#lib/firmware/keyspan/usa19w.fw
-#lib/firmware/keyspan/usa28.fw
-#lib/firmware/keyspan/usa28x.fw
-#lib/firmware/keyspan/usa28xa.fw
-#lib/firmware/keyspan/usa28xb.fw
-#lib/firmware/keyspan/usa49w.fw
-#lib/firmware/keyspan/usa49wlc.fw
-#lib/firmware/keyspan_pda
-#lib/firmware/keyspan_pda/keyspan_pda.fw
-#lib/firmware/keyspan_pda/xircom_pgs.fw
-#lib/firmware/korg
-#lib/firmware/korg/k1212.dsp
-#lib/firmware/sb16
-#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/ti_3410.fw
-#lib/firmware/ti_5052.fw
-#lib/firmware/tr_smctr.bin
-#lib/firmware/ttusb-budget
-#lib/firmware/ttusb-budget/dspbootcode.bin
-#lib/firmware/vicam
-#lib/firmware/vicam/firmware.fw
-#lib/firmware/whiteheat.fw
-#lib/firmware/whiteheat_loader.fw
-#lib/firmware/yamaha
-#lib/firmware/yamaha/ds1_ctrl.fw
-#lib/firmware/yamaha/ds1_dsp.fw
-#lib/firmware/yamaha/ds1e_ctrl.fw
+#lib/firmware/bnx2x-e1-5.0.21.0.fw
+#lib/firmware/bnx2x-e1h-5.0.21.0.fw
 lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/build
 #lib/modules/KVER-ipfire/kernel
@@ -79,6 +12,7 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/arch/x86
 #lib/modules/KVER-ipfire/kernel/arch/x86/crypto
 #lib/modules/KVER-ipfire/kernel/arch/x86/crypto/aes-i586.ko
+#lib/modules/KVER-ipfire/kernel/arch/x86/crypto/crc32c-intel.ko
 #lib/modules/KVER-ipfire/kernel/arch/x86/crypto/salsa20-i586.ko
 #lib/modules/KVER-ipfire/kernel/arch/x86/crypto/twofish-i586.ko
 #lib/modules/KVER-ipfire/kernel/arch/x86/kernel
@@ -100,7 +34,7 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/arch/x86/kernel/cpu/cpufreq/speedstep-lib.ko
 #lib/modules/KVER-ipfire/kernel/arch/x86/kernel/cpu/cpufreq/speedstep-smi.ko
 #lib/modules/KVER-ipfire/kernel/arch/x86/kernel/cpu/mcheck
-#lib/modules/KVER-ipfire/kernel/arch/x86/kernel/cpu/mcheck/non-fatal.ko
+#lib/modules/KVER-ipfire/kernel/arch/x86/kernel/cpu/mcheck/mce-inject.ko
 #lib/modules/KVER-ipfire/kernel/arch/x86/kernel/microcode.ko
 #lib/modules/KVER-ipfire/kernel/arch/x86/kernel/msr.ko
 #lib/modules/KVER-ipfire/kernel/arch/x86/kernel/scx200.ko
@@ -109,14 +43,17 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/arch/x86/kvm/kvm-intel.ko
 #lib/modules/KVER-ipfire/kernel/arch/x86/kvm/kvm.ko
 #lib/modules/KVER-ipfire/kernel/crypto
-#lib/modules/KVER-ipfire/kernel/crypto/aead.ko
 #lib/modules/KVER-ipfire/kernel/crypto/aes_generic.ko
+#lib/modules/KVER-ipfire/kernel/crypto/ansi_cprng.ko
 #lib/modules/KVER-ipfire/kernel/crypto/anubis.ko
 #lib/modules/KVER-ipfire/kernel/crypto/arc4.ko
 #lib/modules/KVER-ipfire/kernel/crypto/async_tx
 #lib/modules/KVER-ipfire/kernel/crypto/async_tx/async_memcpy.ko
+#lib/modules/KVER-ipfire/kernel/crypto/async_tx/async_pq.ko
+#lib/modules/KVER-ipfire/kernel/crypto/async_tx/async_raid6_recov.ko
 #lib/modules/KVER-ipfire/kernel/crypto/async_tx/async_tx.ko
 #lib/modules/KVER-ipfire/kernel/crypto/async_tx/async_xor.ko
+#lib/modules/KVER-ipfire/kernel/crypto/async_tx/raid6test.ko
 #lib/modules/KVER-ipfire/kernel/crypto/authenc.ko
 #lib/modules/KVER-ipfire/kernel/crypto/blowfish.ko
 #lib/modules/KVER-ipfire/kernel/crypto/camellia.ko
@@ -126,7 +63,6 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/crypto/ccm.ko
 #lib/modules/KVER-ipfire/kernel/crypto/crc32c.ko
 #lib/modules/KVER-ipfire/kernel/crypto/cryptd.ko
-#lib/modules/KVER-ipfire/kernel/crypto/crypto_blkcipher.ko
 #lib/modules/KVER-ipfire/kernel/crypto/ctr.ko
 #lib/modules/KVER-ipfire/kernel/crypto/cts.ko
 #lib/modules/KVER-ipfire/kernel/crypto/des_generic.ko
@@ -134,6 +70,7 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/crypto/fcrypt.ko
 #lib/modules/KVER-ipfire/kernel/crypto/gcm.ko
 #lib/modules/KVER-ipfire/kernel/crypto/gf128mul.ko
+#lib/modules/KVER-ipfire/kernel/crypto/ghash-generic.ko
 #lib/modules/KVER-ipfire/kernel/crypto/khazad.ko
 #lib/modules/KVER-ipfire/kernel/crypto/lrw.ko
 #lib/modules/KVER-ipfire/kernel/crypto/lzo.ko
@@ -155,28 +92,27 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/crypto/tgr192.ko
 #lib/modules/KVER-ipfire/kernel/crypto/twofish.ko
 #lib/modules/KVER-ipfire/kernel/crypto/twofish_common.ko
+#lib/modules/KVER-ipfire/kernel/crypto/vmac.ko
 #lib/modules/KVER-ipfire/kernel/crypto/wp512.ko
 #lib/modules/KVER-ipfire/kernel/crypto/xcbc.ko
 #lib/modules/KVER-ipfire/kernel/crypto/xor.ko
 #lib/modules/KVER-ipfire/kernel/crypto/xts.ko
+#lib/modules/KVER-ipfire/kernel/crypto/zlib.ko
 #lib/modules/KVER-ipfire/kernel/drivers
 #lib/modules/KVER-ipfire/kernel/drivers/acpi
 #lib/modules/KVER-ipfire/kernel/drivers/acpi/ac.ko
-#lib/modules/KVER-ipfire/kernel/drivers/acpi/asus_acpi.ko
+#lib/modules/KVER-ipfire/kernel/drivers/acpi/acpi_pad.ko
 #lib/modules/KVER-ipfire/kernel/drivers/acpi/battery.ko
-#lib/modules/KVER-ipfire/kernel/drivers/acpi/bay.ko
 #lib/modules/KVER-ipfire/kernel/drivers/acpi/button.ko
 #lib/modules/KVER-ipfire/kernel/drivers/acpi/container.ko
-#lib/modules/KVER-ipfire/kernel/drivers/acpi/dock.ko
 #lib/modules/KVER-ipfire/kernel/drivers/acpi/fan.ko
 #lib/modules/KVER-ipfire/kernel/drivers/acpi/pci_slot.ko
+#lib/modules/KVER-ipfire/kernel/drivers/acpi/power_meter.ko
 #lib/modules/KVER-ipfire/kernel/drivers/acpi/processor.ko
 #lib/modules/KVER-ipfire/kernel/drivers/acpi/sbs.ko
 #lib/modules/KVER-ipfire/kernel/drivers/acpi/sbshc.ko
 #lib/modules/KVER-ipfire/kernel/drivers/acpi/thermal.ko
-#lib/modules/KVER-ipfire/kernel/drivers/acpi/toshiba_acpi.ko
 #lib/modules/KVER-ipfire/kernel/drivers/acpi/video.ko
-#lib/modules/KVER-ipfire/kernel/drivers/acpi/wmi.ko
 #lib/modules/KVER-ipfire/kernel/drivers/ata
 #lib/modules/KVER-ipfire/kernel/drivers/ata/ahci.ko
 #lib/modules/KVER-ipfire/kernel/drivers/ata/ata_generic.ko
@@ -187,6 +123,7 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/ata/pata_amd.ko
 #lib/modules/KVER-ipfire/kernel/drivers/ata/pata_artop.ko
 #lib/modules/KVER-ipfire/kernel/drivers/ata/pata_atiixp.ko
+#lib/modules/KVER-ipfire/kernel/drivers/ata/pata_atp867x.ko
 #lib/modules/KVER-ipfire/kernel/drivers/ata/pata_cmd640.ko
 #lib/modules/KVER-ipfire/kernel/drivers/ata/pata_cmd64x.ko
 #lib/modules/KVER-ipfire/kernel/drivers/ata/pata_cs5520.ko
@@ -218,6 +155,7 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/ata/pata_pdc202xx_old.ko
 #lib/modules/KVER-ipfire/kernel/drivers/ata/pata_qdi.ko
 #lib/modules/KVER-ipfire/kernel/drivers/ata/pata_radisys.ko
+#lib/modules/KVER-ipfire/kernel/drivers/ata/pata_rdc.ko
 #lib/modules/KVER-ipfire/kernel/drivers/ata/pata_rz1000.ko
 #lib/modules/KVER-ipfire/kernel/drivers/ata/pata_sc1200.ko
 #lib/modules/KVER-ipfire/kernel/drivers/ata/pata_sch.ko
@@ -255,6 +193,7 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/atm/iphase.ko
 #lib/modules/KVER-ipfire/kernel/drivers/atm/lanai.ko
 #lib/modules/KVER-ipfire/kernel/drivers/atm/nicstar.ko
+#lib/modules/KVER-ipfire/kernel/drivers/atm/solos-pci.ko
 #lib/modules/KVER-ipfire/kernel/drivers/atm/suni.ko
 #lib/modules/KVER-ipfire/kernel/drivers/atm/uPD98402.ko
 #lib/modules/KVER-ipfire/kernel/drivers/atm/zatm.ko
@@ -267,6 +206,7 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/block/cryptoloop.ko
 #lib/modules/KVER-ipfire/kernel/drivers/block/floppy.ko
 #lib/modules/KVER-ipfire/kernel/drivers/block/nbd.ko
+#lib/modules/KVER-ipfire/kernel/drivers/block/osdblk.ko
 #lib/modules/KVER-ipfire/kernel/drivers/block/sx8.ko
 #lib/modules/KVER-ipfire/kernel/drivers/block/virtio_blk.ko
 #lib/modules/KVER-ipfire/kernel/drivers/bluetooth
@@ -275,6 +215,8 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/bluetooth/bluecard_cs.ko
 #lib/modules/KVER-ipfire/kernel/drivers/bluetooth/bpa10x.ko
 #lib/modules/KVER-ipfire/kernel/drivers/bluetooth/bt3c_cs.ko
+#lib/modules/KVER-ipfire/kernel/drivers/bluetooth/btmrvl.ko
+#lib/modules/KVER-ipfire/kernel/drivers/bluetooth/btmrvl_sdio.ko
 #lib/modules/KVER-ipfire/kernel/drivers/bluetooth/btsdio.ko
 #lib/modules/KVER-ipfire/kernel/drivers/bluetooth/btuart_cs.ko
 #lib/modules/KVER-ipfire/kernel/drivers/bluetooth/btusb.ko
@@ -303,6 +245,7 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/char/hw_random/geode-rng.ko
 #lib/modules/KVER-ipfire/kernel/drivers/char/hw_random/intel-rng.ko
 #lib/modules/KVER-ipfire/kernel/drivers/char/hw_random/rng-core.ko
+#lib/modules/KVER-ipfire/kernel/drivers/char/hw_random/timeriomem-rng.ko
 #lib/modules/KVER-ipfire/kernel/drivers/char/hw_random/via-rng.ko
 #lib/modules/KVER-ipfire/kernel/drivers/char/hw_random/virtio-rng.ko
 #lib/modules/KVER-ipfire/kernel/drivers/char/i8k.ko
@@ -344,9 +287,11 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/dca/dca.ko
 #lib/modules/KVER-ipfire/kernel/drivers/dma
 #lib/modules/KVER-ipfire/kernel/drivers/dma/dmatest.ko
-#lib/modules/KVER-ipfire/kernel/drivers/dma/ioatdma.ko
+#lib/modules/KVER-ipfire/kernel/drivers/dma/ioat
+#lib/modules/KVER-ipfire/kernel/drivers/dma/ioat/ioatdma.ko
 #lib/modules/KVER-ipfire/kernel/drivers/firewire
 #lib/modules/KVER-ipfire/kernel/drivers/firewire/firewire-core.ko
+#lib/modules/KVER-ipfire/kernel/drivers/firewire/firewire-net.ko
 #lib/modules/KVER-ipfire/kernel/drivers/firewire/firewire-ohci.ko
 #lib/modules/KVER-ipfire/kernel/drivers/firewire/firewire-sbp2.ko
 #lib/modules/KVER-ipfire/kernel/drivers/firmware
@@ -354,6 +299,7 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/gpu
 #lib/modules/KVER-ipfire/kernel/drivers/gpu/drm
 #lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/drm.ko
+#lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/drm_kms_helper.ko
 #lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/i810
 #lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/i810/i810.ko
 #lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/i830
@@ -372,9 +318,38 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/sis/sis.ko
 #lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/tdfx
 #lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/tdfx/tdfx.ko
+#lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/ttm
+#lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/ttm/ttm.ko
 #lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/via
 #lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/via/via.ko
 #lib/modules/KVER-ipfire/kernel/drivers/hid
+#lib/modules/KVER-ipfire/kernel/drivers/hid/hid-a4tech.ko
+#lib/modules/KVER-ipfire/kernel/drivers/hid/hid-apple.ko
+#lib/modules/KVER-ipfire/kernel/drivers/hid/hid-belkin.ko
+#lib/modules/KVER-ipfire/kernel/drivers/hid/hid-cherry.ko
+#lib/modules/KVER-ipfire/kernel/drivers/hid/hid-chicony.ko
+#lib/modules/KVER-ipfire/kernel/drivers/hid/hid-cypress.ko
+#lib/modules/KVER-ipfire/kernel/drivers/hid/hid-drff.ko
+#lib/modules/KVER-ipfire/kernel/drivers/hid/hid-ezkey.ko
+#lib/modules/KVER-ipfire/kernel/drivers/hid/hid-gaff.ko
+#lib/modules/KVER-ipfire/kernel/drivers/hid/hid-gyration.ko
+#lib/modules/KVER-ipfire/kernel/drivers/hid/hid-kensington.ko
+#lib/modules/KVER-ipfire/kernel/drivers/hid/hid-kye.ko
+#lib/modules/KVER-ipfire/kernel/drivers/hid/hid-logitech.ko
+#lib/modules/KVER-ipfire/kernel/drivers/hid/hid-microsoft.ko
+#lib/modules/KVER-ipfire/kernel/drivers/hid/hid-monterey.ko
+#lib/modules/KVER-ipfire/kernel/drivers/hid/hid-ntrig.ko
+#lib/modules/KVER-ipfire/kernel/drivers/hid/hid-petalynx.ko
+#lib/modules/KVER-ipfire/kernel/drivers/hid/hid-pl.ko
+#lib/modules/KVER-ipfire/kernel/drivers/hid/hid-samsung.ko
+#lib/modules/KVER-ipfire/kernel/drivers/hid/hid-sjoy.ko
+#lib/modules/KVER-ipfire/kernel/drivers/hid/hid-sony.ko
+#lib/modules/KVER-ipfire/kernel/drivers/hid/hid-sunplus.ko
+#lib/modules/KVER-ipfire/kernel/drivers/hid/hid-tmff.ko
+#lib/modules/KVER-ipfire/kernel/drivers/hid/hid-topseed.ko
+#lib/modules/KVER-ipfire/kernel/drivers/hid/hid-twinhan.ko
+#lib/modules/KVER-ipfire/kernel/drivers/hid/hid-wacom.ko
+#lib/modules/KVER-ipfire/kernel/drivers/hid/hid-zpff.ko
 #lib/modules/KVER-ipfire/kernel/drivers/hid/usbhid
 #lib/modules/KVER-ipfire/kernel/drivers/hid/usbhid/usbhid.ko
 #lib/modules/KVER-ipfire/kernel/drivers/hwmon
@@ -389,10 +364,13 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/hwmon/adm1031.ko
 #lib/modules/KVER-ipfire/kernel/drivers/hwmon/adm9240.ko
 #lib/modules/KVER-ipfire/kernel/drivers/hwmon/ads7828.ko
+#lib/modules/KVER-ipfire/kernel/drivers/hwmon/adt7462.ko
 #lib/modules/KVER-ipfire/kernel/drivers/hwmon/adt7470.ko
 #lib/modules/KVER-ipfire/kernel/drivers/hwmon/adt7473.ko
+#lib/modules/KVER-ipfire/kernel/drivers/hwmon/adt7475.ko
 #lib/modules/KVER-ipfire/kernel/drivers/hwmon/applesmc.ko
 #lib/modules/KVER-ipfire/kernel/drivers/hwmon/asb100.ko
+#lib/modules/KVER-ipfire/kernel/drivers/hwmon/asus_atk0110.ko
 #lib/modules/KVER-ipfire/kernel/drivers/hwmon/atxp1.ko
 #lib/modules/KVER-ipfire/kernel/drivers/hwmon/coretemp.ko
 #lib/modules/KVER-ipfire/kernel/drivers/hwmon/dme1737.ko
@@ -400,12 +378,12 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/hwmon/f71805f.ko
 #lib/modules/KVER-ipfire/kernel/drivers/hwmon/f71882fg.ko
 #lib/modules/KVER-ipfire/kernel/drivers/hwmon/f75375s.ko
-#lib/modules/KVER-ipfire/kernel/drivers/hwmon/fscher.ko
 #lib/modules/KVER-ipfire/kernel/drivers/hwmon/fschmd.ko
-#lib/modules/KVER-ipfire/kernel/drivers/hwmon/fscpos.ko
+#lib/modules/KVER-ipfire/kernel/drivers/hwmon/g760a.ko
 #lib/modules/KVER-ipfire/kernel/drivers/hwmon/gl518sm.ko
 #lib/modules/KVER-ipfire/kernel/drivers/hwmon/gl520sm.ko
 #lib/modules/KVER-ipfire/kernel/drivers/hwmon/hdaps.ko
+#lib/modules/KVER-ipfire/kernel/drivers/hwmon/hp_accel.ko
 #lib/modules/KVER-ipfire/kernel/drivers/hwmon/hwmon-vid.ko
 #lib/modules/KVER-ipfire/kernel/drivers/hwmon/hwmon.ko
 #lib/modules/KVER-ipfire/kernel/drivers/hwmon/i5k_amb.ko
@@ -413,6 +391,7 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/hwmon/ibmpex.ko
 #lib/modules/KVER-ipfire/kernel/drivers/hwmon/it87.ko
 #lib/modules/KVER-ipfire/kernel/drivers/hwmon/k8temp.ko
+#lib/modules/KVER-ipfire/kernel/drivers/hwmon/lis3lv02d.ko
 #lib/modules/KVER-ipfire/kernel/drivers/hwmon/lm63.ko
 #lib/modules/KVER-ipfire/kernel/drivers/hwmon/lm75.ko
 #lib/modules/KVER-ipfire/kernel/drivers/hwmon/lm77.ko
@@ -424,15 +403,21 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/hwmon/lm90.ko
 #lib/modules/KVER-ipfire/kernel/drivers/hwmon/lm92.ko
 #lib/modules/KVER-ipfire/kernel/drivers/hwmon/lm93.ko
+#lib/modules/KVER-ipfire/kernel/drivers/hwmon/lm95241.ko
+#lib/modules/KVER-ipfire/kernel/drivers/hwmon/ltc4215.ko
+#lib/modules/KVER-ipfire/kernel/drivers/hwmon/ltc4245.ko
 #lib/modules/KVER-ipfire/kernel/drivers/hwmon/max1619.ko
 #lib/modules/KVER-ipfire/kernel/drivers/hwmon/max6650.ko
 #lib/modules/KVER-ipfire/kernel/drivers/hwmon/pc87360.ko
 #lib/modules/KVER-ipfire/kernel/drivers/hwmon/pc87427.ko
+#lib/modules/KVER-ipfire/kernel/drivers/hwmon/pcf8591.ko
 #lib/modules/KVER-ipfire/kernel/drivers/hwmon/sis5595.ko
 #lib/modules/KVER-ipfire/kernel/drivers/hwmon/smsc47b397.ko
 #lib/modules/KVER-ipfire/kernel/drivers/hwmon/smsc47m1.ko
 #lib/modules/KVER-ipfire/kernel/drivers/hwmon/smsc47m192.ko
 #lib/modules/KVER-ipfire/kernel/drivers/hwmon/thmc50.ko
+#lib/modules/KVER-ipfire/kernel/drivers/hwmon/tmp401.ko
+#lib/modules/KVER-ipfire/kernel/drivers/hwmon/tmp421.ko
 #lib/modules/KVER-ipfire/kernel/drivers/hwmon/via686a.ko
 #lib/modules/KVER-ipfire/kernel/drivers/hwmon/vt1211.ko
 #lib/modules/KVER-ipfire/kernel/drivers/hwmon/vt8231.ko
@@ -444,6 +429,8 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/hwmon/w83793.ko
 #lib/modules/KVER-ipfire/kernel/drivers/hwmon/w83l785ts.ko
 #lib/modules/KVER-ipfire/kernel/drivers/hwmon/w83l786ng.ko
+#lib/modules/KVER-ipfire/kernel/drivers/hwmon/wm831x-hwmon.ko
+#lib/modules/KVER-ipfire/kernel/drivers/hwmon/wm8350-hwmon.ko
 #lib/modules/KVER-ipfire/kernel/drivers/i2c
 #lib/modules/KVER-ipfire/kernel/drivers/i2c/algos
 #lib/modules/KVER-ipfire/kernel/drivers/i2c/algos/i2c-algo-bit.ko
@@ -465,6 +452,7 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/i2c/busses/i2c-pca-isa.ko
 #lib/modules/KVER-ipfire/kernel/drivers/i2c/busses/i2c-pca-platform.ko
 #lib/modules/KVER-ipfire/kernel/drivers/i2c/busses/i2c-piix4.ko
+#lib/modules/KVER-ipfire/kernel/drivers/i2c/busses/i2c-scmi.ko
 #lib/modules/KVER-ipfire/kernel/drivers/i2c/busses/i2c-simtec.ko
 #lib/modules/KVER-ipfire/kernel/drivers/i2c/busses/i2c-sis5595.ko
 #lib/modules/KVER-ipfire/kernel/drivers/i2c/busses/i2c-sis630.ko
@@ -476,63 +464,54 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/i2c/busses/i2c-voodoo3.ko
 #lib/modules/KVER-ipfire/kernel/drivers/i2c/busses/scx200_acb.ko
 #lib/modules/KVER-ipfire/kernel/drivers/i2c/chips
-#lib/modules/KVER-ipfire/kernel/drivers/i2c/chips/at24.ko
 #lib/modules/KVER-ipfire/kernel/drivers/i2c/chips/ds1682.ko
-#lib/modules/KVER-ipfire/kernel/drivers/i2c/chips/eeprom.ko
-#lib/modules/KVER-ipfire/kernel/drivers/i2c/chips/max6875.ko
-#lib/modules/KVER-ipfire/kernel/drivers/i2c/chips/pca9539.ko
-#lib/modules/KVER-ipfire/kernel/drivers/i2c/chips/pcf8574.ko
-#lib/modules/KVER-ipfire/kernel/drivers/i2c/chips/pcf8575.ko
-#lib/modules/KVER-ipfire/kernel/drivers/i2c/chips/pcf8591.ko
 #lib/modules/KVER-ipfire/kernel/drivers/i2c/chips/tsl2550.ko
 #lib/modules/KVER-ipfire/kernel/drivers/i2c/i2c-core.ko
 #lib/modules/KVER-ipfire/kernel/drivers/i2c/i2c-dev.ko
 #lib/modules/KVER-ipfire/kernel/drivers/ide
+#lib/modules/KVER-ipfire/kernel/drivers/ide/aec62xx.ko
+#lib/modules/KVER-ipfire/kernel/drivers/ide/ali14xx.ko
+#lib/modules/KVER-ipfire/kernel/drivers/ide/alim15x3.ko
+#lib/modules/KVER-ipfire/kernel/drivers/ide/amd74xx.ko
+#lib/modules/KVER-ipfire/kernel/drivers/ide/atiixp.ko
+#lib/modules/KVER-ipfire/kernel/drivers/ide/cmd640.ko
+#lib/modules/KVER-ipfire/kernel/drivers/ide/cmd64x.ko
+#lib/modules/KVER-ipfire/kernel/drivers/ide/cs5520.ko
+#lib/modules/KVER-ipfire/kernel/drivers/ide/cs5530.ko
+#lib/modules/KVER-ipfire/kernel/drivers/ide/cs5535.ko
+#lib/modules/KVER-ipfire/kernel/drivers/ide/cs5536.ko
+#lib/modules/KVER-ipfire/kernel/drivers/ide/delkin_cb.ko
+#lib/modules/KVER-ipfire/kernel/drivers/ide/dtc2278.ko
+#lib/modules/KVER-ipfire/kernel/drivers/ide/hpt366.ko
+#lib/modules/KVER-ipfire/kernel/drivers/ide/ht6560b.ko
 #lib/modules/KVER-ipfire/kernel/drivers/ide/ide-cd.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/ide-core.ko
+#lib/modules/KVER-ipfire/kernel/drivers/ide/ide-cs.ko
 #lib/modules/KVER-ipfire/kernel/drivers/ide/ide-disk.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/ide-floppy.ko
 #lib/modules/KVER-ipfire/kernel/drivers/ide/ide-generic.ko
+#lib/modules/KVER-ipfire/kernel/drivers/ide/ide-pci-generic.ko
 #lib/modules/KVER-ipfire/kernel/drivers/ide/ide-pnp.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/legacy
-#lib/modules/KVER-ipfire/kernel/drivers/ide/legacy/ali14xx.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/legacy/dtc2278.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/legacy/ht6560b.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/legacy/ide-cs.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/legacy/ide_platform.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/legacy/qd65xx.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/legacy/umc8672.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/pci
-#lib/modules/KVER-ipfire/kernel/drivers/ide/pci/aec62xx.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/pci/alim15x3.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/pci/amd74xx.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/pci/atiixp.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/pci/cmd640.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/pci/cmd64x.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/pci/cs5520.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/pci/cs5530.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/pci/cs5535.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/pci/delkin_cb.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/pci/hpt366.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/pci/ide-pci-generic.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/pci/it8213.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/pci/it821x.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/pci/jmicron.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/pci/ns87415.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/pci/opti621.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/pci/pdc202xx_new.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/pci/pdc202xx_old.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/pci/piix.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/pci/rz1000.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/pci/sc1200.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/pci/serverworks.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/pci/siimage.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/pci/sis5513.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/pci/slc90e66.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/pci/tc86c001.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/pci/triflex.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/pci/trm290.ko
-#lib/modules/KVER-ipfire/kernel/drivers/ide/pci/via82cxxx.ko
+#lib/modules/KVER-ipfire/kernel/drivers/ide/ide_platform.ko
+#lib/modules/KVER-ipfire/kernel/drivers/ide/it8172.ko
+#lib/modules/KVER-ipfire/kernel/drivers/ide/it8213.ko
+#lib/modules/KVER-ipfire/kernel/drivers/ide/it821x.ko
+#lib/modules/KVER-ipfire/kernel/drivers/ide/jmicron.ko
+#lib/modules/KVER-ipfire/kernel/drivers/ide/ns87415.ko
+#lib/modules/KVER-ipfire/kernel/drivers/ide/opti621.ko
+#lib/modules/KVER-ipfire/kernel/drivers/ide/pdc202xx_new.ko
+#lib/modules/KVER-ipfire/kernel/drivers/ide/pdc202xx_old.ko
+#lib/modules/KVER-ipfire/kernel/drivers/ide/piix.ko
+#lib/modules/KVER-ipfire/kernel/drivers/ide/qd65xx.ko
+#lib/modules/KVER-ipfire/kernel/drivers/ide/rz1000.ko
+#lib/modules/KVER-ipfire/kernel/drivers/ide/sc1200.ko
+#lib/modules/KVER-ipfire/kernel/drivers/ide/serverworks.ko
+#lib/modules/KVER-ipfire/kernel/drivers/ide/siimage.ko
+#lib/modules/KVER-ipfire/kernel/drivers/ide/sis5513.ko
+#lib/modules/KVER-ipfire/kernel/drivers/ide/slc90e66.ko
+#lib/modules/KVER-ipfire/kernel/drivers/ide/tc86c001.ko
+#lib/modules/KVER-ipfire/kernel/drivers/ide/triflex.ko
+#lib/modules/KVER-ipfire/kernel/drivers/ide/trm290.ko
+#lib/modules/KVER-ipfire/kernel/drivers/ide/umc8672.ko
+#lib/modules/KVER-ipfire/kernel/drivers/ide/via82cxxx.ko
 #lib/modules/KVER-ipfire/kernel/drivers/ieee1394
 #lib/modules/KVER-ipfire/kernel/drivers/ieee1394/eth1394.ko
 #lib/modules/KVER-ipfire/kernel/drivers/ieee1394/ieee1394.ko
@@ -541,11 +520,18 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/ieee1394/raw1394.ko
 #lib/modules/KVER-ipfire/kernel/drivers/ieee1394/sbp2.ko
 #lib/modules/KVER-ipfire/kernel/drivers/ieee1394/video1394.ko
+#lib/modules/KVER-ipfire/kernel/drivers/ieee802154
+#lib/modules/KVER-ipfire/kernel/drivers/ieee802154/fakehard.ko
 #lib/modules/KVER-ipfire/kernel/drivers/input
+#lib/modules/KVER-ipfire/kernel/drivers/input/ff-memless.ko
 #lib/modules/KVER-ipfire/kernel/drivers/input/input-polldev.ko
 #lib/modules/KVER-ipfire/kernel/drivers/input/keyboard
+#lib/modules/KVER-ipfire/kernel/drivers/input/keyboard/adp5588-keys.ko
 #lib/modules/KVER-ipfire/kernel/drivers/input/keyboard/lkkbd.ko
+#lib/modules/KVER-ipfire/kernel/drivers/input/keyboard/lm8323.ko
+#lib/modules/KVER-ipfire/kernel/drivers/input/keyboard/max7359_keypad.ko
 #lib/modules/KVER-ipfire/kernel/drivers/input/keyboard/newtonkbd.ko
+#lib/modules/KVER-ipfire/kernel/drivers/input/keyboard/opencores-kbd.ko
 #lib/modules/KVER-ipfire/kernel/drivers/input/keyboard/stowaway.ko
 #lib/modules/KVER-ipfire/kernel/drivers/input/keyboard/sunkbd.ko
 #lib/modules/KVER-ipfire/kernel/drivers/input/keyboard/xtkbd.ko
@@ -553,14 +539,29 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/input/misc/apanel.ko
 #lib/modules/KVER-ipfire/kernel/drivers/input/misc/ati_remote.ko
 #lib/modules/KVER-ipfire/kernel/drivers/input/misc/ati_remote2.ko
+#lib/modules/KVER-ipfire/kernel/drivers/input/misc/cm109.ko
 #lib/modules/KVER-ipfire/kernel/drivers/input/misc/keyspan_remote.ko
+#lib/modules/KVER-ipfire/kernel/drivers/input/misc/pcf50633-input.ko
+#lib/modules/KVER-ipfire/kernel/drivers/input/misc/pcspkr.ko
 #lib/modules/KVER-ipfire/kernel/drivers/input/misc/powermate.ko
+#lib/modules/KVER-ipfire/kernel/drivers/input/misc/winbond-cir.ko
+#lib/modules/KVER-ipfire/kernel/drivers/input/misc/wm831x-on.ko
 #lib/modules/KVER-ipfire/kernel/drivers/input/misc/yealink.ko
 #lib/modules/KVER-ipfire/kernel/drivers/isdn
+#lib/modules/KVER-ipfire/kernel/drivers/isdn/act2000
+#lib/modules/KVER-ipfire/kernel/drivers/isdn/act2000/act2000.ko
 #lib/modules/KVER-ipfire/kernel/drivers/isdn/capi
 #lib/modules/KVER-ipfire/kernel/drivers/isdn/capi/capi.ko
+#lib/modules/KVER-ipfire/kernel/drivers/isdn/capi/capidrv.ko
 #lib/modules/KVER-ipfire/kernel/drivers/isdn/capi/capifs.ko
 #lib/modules/KVER-ipfire/kernel/drivers/isdn/capi/kernelcapi.ko
+#lib/modules/KVER-ipfire/kernel/drivers/isdn/divert
+#lib/modules/KVER-ipfire/kernel/drivers/isdn/divert/dss1_divert.ko
+#lib/modules/KVER-ipfire/kernel/drivers/isdn/gigaset
+#lib/modules/KVER-ipfire/kernel/drivers/isdn/gigaset/bas_gigaset.ko
+#lib/modules/KVER-ipfire/kernel/drivers/isdn/gigaset/gigaset.ko
+#lib/modules/KVER-ipfire/kernel/drivers/isdn/gigaset/ser_gigaset.ko
+#lib/modules/KVER-ipfire/kernel/drivers/isdn/gigaset/usb_gigaset.ko
 #lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware
 #lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/avm
 #lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/avm/avm_cs.ko
@@ -578,14 +579,57 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/eicon/divacapi.ko
 #lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/eicon/divadidd.ko
 #lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/eicon/divas.ko
+#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN
+#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN/avmfritz.ko
+#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN/hfcmulti.ko
+#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN/hfcpci.ko
+#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN/hfcsusb.ko
+#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN/mISDNinfineon.ko
+#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN/mISDNipac.ko
+#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN/mISDNisar.ko
+#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN/netjet.ko
+#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN/speedfax.ko
+#lib/modules/KVER-ipfire/kernel/drivers/isdn/hardware/mISDN/w6692.ko
+#lib/modules/KVER-ipfire/kernel/drivers/isdn/hisax
+#lib/modules/KVER-ipfire/kernel/drivers/isdn/hisax/avma1_cs.ko
+#lib/modules/KVER-ipfire/kernel/drivers/isdn/hisax/elsa_cs.ko
+#lib/modules/KVER-ipfire/kernel/drivers/isdn/hisax/hfc4s8s_l1.ko
+#lib/modules/KVER-ipfire/kernel/drivers/isdn/hisax/hfc_usb.ko
+#lib/modules/KVER-ipfire/kernel/drivers/isdn/hisax/hisax.ko
+#lib/modules/KVER-ipfire/kernel/drivers/isdn/hisax/hisax_fcpcipnp.ko
+#lib/modules/KVER-ipfire/kernel/drivers/isdn/hisax/hisax_isac.ko
+#lib/modules/KVER-ipfire/kernel/drivers/isdn/hisax/hisax_st5481.ko
+#lib/modules/KVER-ipfire/kernel/drivers/isdn/hisax/sedlbauer_cs.ko
+#lib/modules/KVER-ipfire/kernel/drivers/isdn/hisax/teles_cs.ko
+#lib/modules/KVER-ipfire/kernel/drivers/isdn/hysdn
+#lib/modules/KVER-ipfire/kernel/drivers/isdn/hysdn/hysdn.ko
+#lib/modules/KVER-ipfire/kernel/drivers/isdn/i4l
+#lib/modules/KVER-ipfire/kernel/drivers/isdn/i4l/isdn.ko
+#lib/modules/KVER-ipfire/kernel/drivers/isdn/i4l/isdn_bsdcomp.ko
+#lib/modules/KVER-ipfire/kernel/drivers/isdn/i4l/isdnhdlc.ko
+#lib/modules/KVER-ipfire/kernel/drivers/isdn/icn
+#lib/modules/KVER-ipfire/kernel/drivers/isdn/icn/icn.ko
+#lib/modules/KVER-ipfire/kernel/drivers/isdn/mISDN
+#lib/modules/KVER-ipfire/kernel/drivers/isdn/mISDN/l1oip.ko
+#lib/modules/KVER-ipfire/kernel/drivers/isdn/mISDN/mISDN_core.ko
+#lib/modules/KVER-ipfire/kernel/drivers/isdn/mISDN/mISDN_dsp.ko
+#lib/modules/KVER-ipfire/kernel/drivers/isdn/pcbit
+#lib/modules/KVER-ipfire/kernel/drivers/isdn/pcbit/pcbit.ko
+#lib/modules/KVER-ipfire/kernel/drivers/isdn/sc
+#lib/modules/KVER-ipfire/kernel/drivers/isdn/sc/sc.ko
 #lib/modules/KVER-ipfire/kernel/drivers/leds
 #lib/modules/KVER-ipfire/kernel/drivers/leds/led-class.ko
-#lib/modules/KVER-ipfire/kernel/drivers/leds/leds-alix.ko
+#lib/modules/KVER-ipfire/kernel/drivers/leds/leds-alix2.ko
+#lib/modules/KVER-ipfire/kernel/drivers/leds/leds-bd2802.ko
 #lib/modules/KVER-ipfire/kernel/drivers/leds/leds-clevo-mail.ko
+#lib/modules/KVER-ipfire/kernel/drivers/leds/leds-lp3944.ko
 #lib/modules/KVER-ipfire/kernel/drivers/leds/leds-net48xx.ko
 #lib/modules/KVER-ipfire/kernel/drivers/leds/leds-pca9532.ko
 #lib/modules/KVER-ipfire/kernel/drivers/leds/leds-pca955x.ko
+#lib/modules/KVER-ipfire/kernel/drivers/leds/leds-wm831x-status.ko
+#lib/modules/KVER-ipfire/kernel/drivers/leds/leds-wm8350.ko
 #lib/modules/KVER-ipfire/kernel/drivers/leds/leds-wrap.ko
+#lib/modules/KVER-ipfire/kernel/drivers/leds/ledtrig-backlight.ko
 #lib/modules/KVER-ipfire/kernel/drivers/leds/ledtrig-default-on.ko
 #lib/modules/KVER-ipfire/kernel/drivers/leds/ledtrig-heartbeat.ko
 #lib/modules/KVER-ipfire/kernel/drivers/leds/ledtrig-timer.ko
@@ -594,11 +638,15 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/md
 #lib/modules/KVER-ipfire/kernel/drivers/md/dm-crypt.ko
 #lib/modules/KVER-ipfire/kernel/drivers/md/dm-delay.ko
+#lib/modules/KVER-ipfire/kernel/drivers/md/dm-log-userspace.ko
 #lib/modules/KVER-ipfire/kernel/drivers/md/dm-log.ko
 #lib/modules/KVER-ipfire/kernel/drivers/md/dm-mirror.ko
 #lib/modules/KVER-ipfire/kernel/drivers/md/dm-mod.ko
 #lib/modules/KVER-ipfire/kernel/drivers/md/dm-multipath.ko
+#lib/modules/KVER-ipfire/kernel/drivers/md/dm-queue-length.ko
+#lib/modules/KVER-ipfire/kernel/drivers/md/dm-region-hash.ko
 #lib/modules/KVER-ipfire/kernel/drivers/md/dm-round-robin.ko
+#lib/modules/KVER-ipfire/kernel/drivers/md/dm-service-time.ko
 #lib/modules/KVER-ipfire/kernel/drivers/md/dm-snapshot.ko
 #lib/modules/KVER-ipfire/kernel/drivers/md/dm-zero.ko
 #lib/modules/KVER-ipfire/kernel/drivers/md/linear.ko
@@ -608,12 +656,24 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/md/raid1.ko
 #lib/modules/KVER-ipfire/kernel/drivers/md/raid10.ko
 #lib/modules/KVER-ipfire/kernel/drivers/md/raid456.ko
+#lib/modules/KVER-ipfire/kernel/drivers/md/raid6_pq.ko
 #lib/modules/KVER-ipfire/kernel/drivers/media
+#lib/modules/KVER-ipfire/kernel/drivers/media/common
+#lib/modules/KVER-ipfire/kernel/drivers/media/common/tuners
+#lib/modules/KVER-ipfire/kernel/drivers/media/common/tuners/mc44s803.ko
+#lib/modules/KVER-ipfire/kernel/drivers/media/common/tuners/mt20xx.ko
+#lib/modules/KVER-ipfire/kernel/drivers/media/common/tuners/tda8290.ko
+#lib/modules/KVER-ipfire/kernel/drivers/media/common/tuners/tda9887.ko
+#lib/modules/KVER-ipfire/kernel/drivers/media/common/tuners/tea5761.ko
+#lib/modules/KVER-ipfire/kernel/drivers/media/common/tuners/tea5767.ko
+#lib/modules/KVER-ipfire/kernel/drivers/media/common/tuners/tuner-simple.ko
+#lib/modules/KVER-ipfire/kernel/drivers/media/common/tuners/tuner-types.ko
+#lib/modules/KVER-ipfire/kernel/drivers/media/common/tuners/tuner-xc2028.ko
+#lib/modules/KVER-ipfire/kernel/drivers/media/common/tuners/xc5000.ko
 #lib/modules/KVER-ipfire/kernel/drivers/media/dvb
 #lib/modules/KVER-ipfire/kernel/drivers/media/dvb/dvb-core
 #lib/modules/KVER-ipfire/kernel/drivers/media/dvb/dvb-core/dvb-core.ko
 #lib/modules/KVER-ipfire/kernel/drivers/media/video
-#lib/modules/KVER-ipfire/kernel/drivers/media/video/compat_ioctl32.ko
 #lib/modules/KVER-ipfire/kernel/drivers/media/video/v4l1-compat.ko
 #lib/modules/KVER-ipfire/kernel/drivers/media/video/v4l2-common.ko
 #lib/modules/KVER-ipfire/kernel/drivers/media/video/v4l2-int-device.ko
@@ -634,23 +694,33 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/message/fusion/mptscsih.ko
 #lib/modules/KVER-ipfire/kernel/drivers/message/fusion/mptspi.ko
 #lib/modules/KVER-ipfire/kernel/drivers/mfd
+#lib/modules/KVER-ipfire/kernel/drivers/mfd/ab3100-core.ko
+#lib/modules/KVER-ipfire/kernel/drivers/mfd/ab3100-otp.ko
 #lib/modules/KVER-ipfire/kernel/drivers/mfd/htc-pasic3.ko
+#lib/modules/KVER-ipfire/kernel/drivers/mfd/mfd-core.ko
+#lib/modules/KVER-ipfire/kernel/drivers/mfd/pcf50633-adc.ko
+#lib/modules/KVER-ipfire/kernel/drivers/mfd/pcf50633-core.ko
+#lib/modules/KVER-ipfire/kernel/drivers/mfd/pcf50633-gpio.ko
 #lib/modules/KVER-ipfire/kernel/drivers/mfd/sm501.ko
+#lib/modules/KVER-ipfire/kernel/drivers/mfd/wm831x.ko
+#lib/modules/KVER-ipfire/kernel/drivers/mfd/wm8350-i2c.ko
+#lib/modules/KVER-ipfire/kernel/drivers/mfd/wm8350.ko
+#lib/modules/KVER-ipfire/kernel/drivers/mfd/wm8400-core.ko
 #lib/modules/KVER-ipfire/kernel/drivers/misc
-#lib/modules/KVER-ipfire/kernel/drivers/misc/acer-wmi.ko
-#lib/modules/KVER-ipfire/kernel/drivers/misc/asus-laptop.ko
-#lib/modules/KVER-ipfire/kernel/drivers/misc/compal-laptop.ko
-#lib/modules/KVER-ipfire/kernel/drivers/misc/eeepc-laptop.ko
-#lib/modules/KVER-ipfire/kernel/drivers/misc/eeprom_93cx6.ko
+#lib/modules/KVER-ipfire/kernel/drivers/misc/c2port
+#lib/modules/KVER-ipfire/kernel/drivers/misc/c2port/c2port-duramar2150.ko
+#lib/modules/KVER-ipfire/kernel/drivers/misc/c2port/core.ko
+#lib/modules/KVER-ipfire/kernel/drivers/misc/cb710
+#lib/modules/KVER-ipfire/kernel/drivers/misc/cb710/cb710.ko
+#lib/modules/KVER-ipfire/kernel/drivers/misc/eeprom
+#lib/modules/KVER-ipfire/kernel/drivers/misc/eeprom/at24.ko
+#lib/modules/KVER-ipfire/kernel/drivers/misc/eeprom/eeprom.ko
+#lib/modules/KVER-ipfire/kernel/drivers/misc/eeprom/eeprom_93cx6.ko
+#lib/modules/KVER-ipfire/kernel/drivers/misc/eeprom/max6875.ko
 #lib/modules/KVER-ipfire/kernel/drivers/misc/enclosure.ko
-#lib/modules/KVER-ipfire/kernel/drivers/misc/fujitsu-laptop.ko
-#lib/modules/KVER-ipfire/kernel/drivers/misc/hp-wmi.ko
 #lib/modules/KVER-ipfire/kernel/drivers/misc/hpilo.ko
-#lib/modules/KVER-ipfire/kernel/drivers/misc/intel_menlow.ko
-#lib/modules/KVER-ipfire/kernel/drivers/misc/msi-laptop.ko
-#lib/modules/KVER-ipfire/kernel/drivers/misc/sony-laptop.ko
-#lib/modules/KVER-ipfire/kernel/drivers/misc/tc1100-wmi.ko
-#lib/modules/KVER-ipfire/kernel/drivers/misc/thinkpad_acpi.ko
+#lib/modules/KVER-ipfire/kernel/drivers/misc/ics932s401.ko
+#lib/modules/KVER-ipfire/kernel/drivers/misc/isl29003.ko
 #lib/modules/KVER-ipfire/kernel/drivers/misc/tifm_7xx1.ko
 #lib/modules/KVER-ipfire/kernel/drivers/misc/tifm_core.ko
 #lib/modules/KVER-ipfire/kernel/drivers/mmc
@@ -661,21 +731,37 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/mmc/core
 #lib/modules/KVER-ipfire/kernel/drivers/mmc/core/mmc_core.ko
 #lib/modules/KVER-ipfire/kernel/drivers/mmc/host
+#lib/modules/KVER-ipfire/kernel/drivers/mmc/host/cb710-mmc.ko
 #lib/modules/KVER-ipfire/kernel/drivers/mmc/host/ricoh_mmc.ko
 #lib/modules/KVER-ipfire/kernel/drivers/mmc/host/sdhci-pci.ko
+#lib/modules/KVER-ipfire/kernel/drivers/mmc/host/sdhci-pltfm.ko
 #lib/modules/KVER-ipfire/kernel/drivers/mmc/host/sdhci.ko
 #lib/modules/KVER-ipfire/kernel/drivers/mmc/host/sdricoh_cs.ko
 #lib/modules/KVER-ipfire/kernel/drivers/mmc/host/tifm_sd.ko
+#lib/modules/KVER-ipfire/kernel/drivers/mmc/host/via-sdmmc.ko
 #lib/modules/KVER-ipfire/kernel/drivers/mmc/host/wbsd.ko
 #lib/modules/KVER-ipfire/kernel/drivers/mtd
 #lib/modules/KVER-ipfire/kernel/drivers/mtd/ar7part.ko
 #lib/modules/KVER-ipfire/kernel/drivers/mtd/chips
 #lib/modules/KVER-ipfire/kernel/drivers/mtd/chips/chipreg.ko
+#lib/modules/KVER-ipfire/kernel/drivers/mtd/lpddr
+#lib/modules/KVER-ipfire/kernel/drivers/mtd/lpddr/lpddr_cmds.ko
+#lib/modules/KVER-ipfire/kernel/drivers/mtd/lpddr/qinfo_probe.ko
+#lib/modules/KVER-ipfire/kernel/drivers/mtd/maps
+#lib/modules/KVER-ipfire/kernel/drivers/mtd/maps/physmap.ko
 #lib/modules/KVER-ipfire/kernel/drivers/mtd/mtd.ko
 #lib/modules/KVER-ipfire/kernel/drivers/mtd/mtd_blkdevs.ko
 #lib/modules/KVER-ipfire/kernel/drivers/mtd/mtdblock.ko
 #lib/modules/KVER-ipfire/kernel/drivers/mtd/mtdchar.ko
 #lib/modules/KVER-ipfire/kernel/drivers/mtd/mtdconcat.ko
+#lib/modules/KVER-ipfire/kernel/drivers/mtd/tests
+#lib/modules/KVER-ipfire/kernel/drivers/mtd/tests/mtd_oobtest.ko
+#lib/modules/KVER-ipfire/kernel/drivers/mtd/tests/mtd_pagetest.ko
+#lib/modules/KVER-ipfire/kernel/drivers/mtd/tests/mtd_readtest.ko
+#lib/modules/KVER-ipfire/kernel/drivers/mtd/tests/mtd_speedtest.ko
+#lib/modules/KVER-ipfire/kernel/drivers/mtd/tests/mtd_stresstest.ko
+#lib/modules/KVER-ipfire/kernel/drivers/mtd/tests/mtd_subpagetest.ko
+#lib/modules/KVER-ipfire/kernel/drivers/mtd/tests/mtd_torturetest.ko
 #lib/modules/KVER-ipfire/kernel/drivers/mtd/ubi
 #lib/modules/KVER-ipfire/kernel/drivers/mtd/ubi/ubi.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net
@@ -697,12 +783,17 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/net/acenic.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/amd8111e.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/at1700.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/atl1c
+#lib/modules/KVER-ipfire/kernel/drivers/net/atl1c/atl1c.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/atl1e
 #lib/modules/KVER-ipfire/kernel/drivers/net/atl1e/atl1e.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/atlx
 #lib/modules/KVER-ipfire/kernel/drivers/net/atlx/atl1.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/atlx/atl2.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/atp.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/b44.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/benet
+#lib/modules/KVER-ipfire/kernel/drivers/net/benet/be2net.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/bnx2.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/bnx2x.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/bonding
@@ -711,6 +802,7 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/net/cassini.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/chelsio
 #lib/modules/KVER-ipfire/kernel/drivers/net/chelsio/cxgb.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/cnic.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/cs89x0.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/cxgb3
 #lib/modules/KVER-ipfire/kernel/drivers/net/cxgb3/cxgb3.ko
@@ -718,6 +810,7 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/net/de620.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/depca.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/dl2k.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/dnet.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/dummy.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/e100.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/e1000
@@ -726,12 +819,14 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/net/e1000e/e1000e.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/e2100.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/eepro.ko
-#lib/modules/KVER-ipfire/kernel/drivers/net/eepro100.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/eexpress.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/enic
+#lib/modules/KVER-ipfire/kernel/drivers/net/enic/enic.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/epic100.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/eql.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/es3210.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/eth16i.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/ethoc.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/ewrk3.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/fealnx.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/forcedeth.ko
@@ -743,6 +838,8 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/net/ifb.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/igb
 #lib/modules/KVER-ipfire/kernel/drivers/net/igb/igb.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/igbvf
+#lib/modules/KVER-ipfire/kernel/drivers/net/igbvf/igbvf.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/imq.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/ipg.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/irda
@@ -765,11 +862,18 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/net/ixgb/ixgb.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/ixgbe
 #lib/modules/KVER-ipfire/kernel/drivers/net/ixgbe/ixgbe.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/jme.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/ks8842.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/ks8851_mll.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/lance.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/lne390.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/lp486e.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/macvlan.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/mdio.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/mii.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/mlx4
+#lib/modules/KVER-ipfire/kernel/drivers/net/mlx4/mlx4_core.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/mlx4/mlx4_en.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/myri10ge
 #lib/modules/KVER-ipfire/kernel/drivers/net/myri10ge/myri10ge.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/natsemi.ko
@@ -797,14 +901,16 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/net/phy/broadcom.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/phy/cicada.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/phy/davicom.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/phy/et1011c.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/phy/icplus.ko
-#lib/modules/KVER-ipfire/kernel/drivers/net/phy/libphy.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/phy/lxt.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/phy/marvell.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/phy/mdio-bitbang.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/phy/national.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/phy/qsemi.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/phy/realtek.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/phy/smsc.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/phy/ste10Xp.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/phy/vitesse.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/ppp_async.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/ppp_deflate.ko
@@ -815,6 +921,8 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/net/pppol2tp.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/pppox.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/qla3xxx.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/qlge
+#lib/modules/KVER-ipfire/kernel/drivers/net/qlge/qlge.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/r6040.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/r8169.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/s2io.ko
@@ -833,6 +941,7 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/net/smc-ultra.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/smc-ultra32.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/smc9194.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/smsc9420.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/starfire.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/sundance.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/sungem.ko
@@ -854,11 +963,14 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/net/usb
 #lib/modules/KVER-ipfire/kernel/drivers/net/usb/asix.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/usb/catc.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/usb/cdc-phonet.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/usb/cdc_eem.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/usb/cdc_ether.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/usb/cdc_subset.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/usb/dm9601.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/usb/gl620a.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/usb/hso.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/usb/int51x1.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/usb/kaweth.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/usb/mcs7830.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/usb/net1080.ko
@@ -866,19 +978,59 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/net/usb/plusb.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/usb/rndis_host.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/usb/rtl8150.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/usb/smsc95xx.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/usb/usbnet.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/usb/zaurus.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/veth.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/via-rhine.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/via-velocity.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/virtio_net.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/vmxnet3
+#lib/modules/KVER-ipfire/kernel/drivers/net/vmxnet3/vmxnet3.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/vxge
+#lib/modules/KVER-ipfire/kernel/drivers/net/vxge/vxge.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/wan
+#lib/modules/KVER-ipfire/kernel/drivers/net/wan/c101.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/wan/cosa.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/wan/dlci.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/wan/dscc4.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/wan/farsync.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/wan/hdlc.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/wan/hdlc_cisco.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/wan/hdlc_fr.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/wan/hdlc_ppp.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/wan/hdlc_raw.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/wan/hdlc_raw_eth.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/wan/hostess_sv11.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/wan/lmc
+#lib/modules/KVER-ipfire/kernel/drivers/net/wan/lmc/lmc.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/wan/n2.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/wan/pc300too.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/wan/pci200syn.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/wan/sbni.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/wan/sdla.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/wan/sealevel.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/wan/wanxl.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/wan/z85230.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/wd.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/wimax
+#lib/modules/KVER-ipfire/kernel/drivers/net/wimax/i2400m
+#lib/modules/KVER-ipfire/kernel/drivers/net/wimax/i2400m/i2400m-sdio.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/wimax/i2400m/i2400m-usb.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/wimax/i2400m/i2400m.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/wireless
 #lib/modules/KVER-ipfire/kernel/drivers/net/wireless/adm8211.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/wireless/airo.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/wireless/airo_cs.ko
-#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/ath9k
-#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/ath9k/ath9k.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/at76c50x-usb.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/ath
+#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/ath/ar9170
+#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/ath/ar9170/ar9170usb.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/ath/ath.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/ath/ath5k
+#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/ath/ath5k/ath5k.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/ath/ath9k
+#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/ath/ath9k/ath9k.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/wireless/atmel.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/wireless/atmel_cs.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/wireless/atmel_pci.ko
@@ -886,30 +1038,38 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/net/wireless/b43/b43.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/wireless/b43legacy
 #lib/modules/KVER-ipfire/kernel/drivers/net/wireless/b43legacy/b43legacy.ko
-#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/hermes.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/wireless/hostap
 #lib/modules/KVER-ipfire/kernel/drivers/net/wireless/hostap/hostap.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/wireless/hostap/hostap_cs.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/wireless/hostap/hostap_pci.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/wireless/hostap/hostap_plx.ko
-#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/ipw2100.ko
-#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/ipw2200.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/ipw2x00
+#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/ipw2x00/ipw2100.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/ipw2x00/ipw2200.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/ipw2x00/libipw.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/wireless/iwlwifi
 #lib/modules/KVER-ipfire/kernel/drivers/net/wireless/iwlwifi/iwl3945.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/wireless/iwlwifi/iwlagn.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/wireless/iwlwifi/iwlcore.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/iwmc3200wifi
+#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/iwmc3200wifi/iwmc3200wifi.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/wireless/libertas
 #lib/modules/KVER-ipfire/kernel/drivers/net/wireless/libertas/libertas.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/wireless/libertas/libertas_cs.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/wireless/libertas/libertas_sdio.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/wireless/libertas/usb8xxx.ko
-#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/mac80211_hwsim.ko
-#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/orinoco.ko
-#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/orinoco_cs.ko
-#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/orinoco_nortel.ko
-#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/orinoco_pci.ko
-#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/orinoco_plx.ko
-#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/orinoco_tmd.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/libertas_tf
+#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/libertas_tf/libertas_tf.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/libertas_tf/libertas_tf_usb.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/mwl8k.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/orinoco
+#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/orinoco/orinoco.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_cs.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_nortel.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_pci.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_plx.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_tmd.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/orinoco/spectrum_cs.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/wireless/p54
 #lib/modules/KVER-ipfire/kernel/drivers/net/wireless/p54/p54common.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/wireless/p54/p54pci.ko
@@ -922,14 +1082,18 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/net/wireless/rt2x00/rt2400pci.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/wireless/rt2x00/rt2500pci.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/wireless/rt2x00/rt2500usb.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/rt2x00/rt2800usb.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/wireless/rt2x00/rt2x00lib.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/wireless/rt2x00/rt2x00pci.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/wireless/rt2x00/rt2x00usb.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/wireless/rt2x00/rt61pci.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/wireless/rt2x00/rt73usb.ko
-#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/rtl8180.ko
-#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/rtl8187.ko
-#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/spectrum_cs.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/rtl818x
+#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/rtl818x/rtl8180.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/rtl818x/rtl8187.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/wl12xx
+#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/wl12xx/wl1251.ko
+#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/wl12xx/wl1251_sdio.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/wireless/wl3501_cs.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/wireless/zd1201.ko
 #lib/modules/KVER-ipfire/kernel/drivers/net/wireless/zd1211rw
@@ -942,6 +1106,8 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/parport/parport_cs.ko
 #lib/modules/KVER-ipfire/kernel/drivers/parport/parport_pc.ko
 #lib/modules/KVER-ipfire/kernel/drivers/parport/parport_serial.ko
+#lib/modules/KVER-ipfire/kernel/drivers/pci
+#lib/modules/KVER-ipfire/kernel/drivers/pci/pci-stub.ko
 #lib/modules/KVER-ipfire/kernel/drivers/pcmcia
 #lib/modules/KVER-ipfire/kernel/drivers/pcmcia/i82092.ko
 #lib/modules/KVER-ipfire/kernel/drivers/pcmcia/i82365.ko
@@ -951,9 +1117,39 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/pcmcia/rsrc_nonstatic.ko
 #lib/modules/KVER-ipfire/kernel/drivers/pcmcia/tcic.ko
 #lib/modules/KVER-ipfire/kernel/drivers/pcmcia/yenta_socket.ko
+#lib/modules/KVER-ipfire/kernel/drivers/platform
+#lib/modules/KVER-ipfire/kernel/drivers/platform/x86
+#lib/modules/KVER-ipfire/kernel/drivers/platform/x86/acer-wmi.ko
+#lib/modules/KVER-ipfire/kernel/drivers/platform/x86/asus-laptop.ko
+#lib/modules/KVER-ipfire/kernel/drivers/platform/x86/asus_acpi.ko
+#lib/modules/KVER-ipfire/kernel/drivers/platform/x86/compal-laptop.ko
+#lib/modules/KVER-ipfire/kernel/drivers/platform/x86/dell-wmi.ko
+#lib/modules/KVER-ipfire/kernel/drivers/platform/x86/fujitsu-laptop.ko
+#lib/modules/KVER-ipfire/kernel/drivers/platform/x86/hp-wmi.ko
+#lib/modules/KVER-ipfire/kernel/drivers/platform/x86/intel_menlow.ko
+#lib/modules/KVER-ipfire/kernel/drivers/platform/x86/msi-laptop.ko
+#lib/modules/KVER-ipfire/kernel/drivers/platform/x86/panasonic-laptop.ko
+#lib/modules/KVER-ipfire/kernel/drivers/platform/x86/sony-laptop.ko
+#lib/modules/KVER-ipfire/kernel/drivers/platform/x86/tc1100-wmi.ko
+#lib/modules/KVER-ipfire/kernel/drivers/platform/x86/thinkpad_acpi.ko
+#lib/modules/KVER-ipfire/kernel/drivers/platform/x86/topstar-laptop.ko
+#lib/modules/KVER-ipfire/kernel/drivers/platform/x86/toshiba_acpi.ko
+#lib/modules/KVER-ipfire/kernel/drivers/platform/x86/wmi.ko
+#lib/modules/KVER-ipfire/kernel/drivers/power
+#lib/modules/KVER-ipfire/kernel/drivers/power/bq27x00_battery.ko
+#lib/modules/KVER-ipfire/kernel/drivers/power/ds2782_battery.ko
+#lib/modules/KVER-ipfire/kernel/drivers/power/max17040_battery.ko
+#lib/modules/KVER-ipfire/kernel/drivers/power/pcf50633-charger.ko
+#lib/modules/KVER-ipfire/kernel/drivers/power/wm831x_power.ko
+#lib/modules/KVER-ipfire/kernel/drivers/power/wm8350_power.ko
+#lib/modules/KVER-ipfire/kernel/drivers/pps
+#lib/modules/KVER-ipfire/kernel/drivers/pps/pps_core.ko
 #lib/modules/KVER-ipfire/kernel/drivers/rtc
+#lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-ab3100.ko
+#lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-bq4802.ko
 #lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-cmos.ko
 #lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-core.ko
+#lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-ds1286.ko
 #lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-ds1307.ko
 #lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-ds1374.ko
 #lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-ds1511.ko
@@ -964,16 +1160,22 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-isl1208.ko
 #lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-lib.ko
 #lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-m41t80.ko
+#lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-m48t35.ko
 #lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-m48t59.ko
 #lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-m48t86.ko
 #lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-max6900.ko
+#lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-pcf50633.ko
 #lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-pcf8563.ko
 #lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-pcf8583.ko
 #lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-rs5c372.ko
+#lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-rx8025.ko
+#lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-rx8581.ko
 #lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-s35390a.ko
 #lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-stk17ta8.ko
 #lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-test.ko
 #lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-v3020.ko
+#lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-wm831x.ko
+#lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-wm8350.ko
 #lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-x1205.ko
 #lib/modules/KVER-ipfire/kernel/drivers/scsi
 #lib/modules/KVER-ipfire/kernel/drivers/scsi/3w-9xxx.ko
@@ -998,7 +1200,15 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/scsi/arcmsr
 #lib/modules/KVER-ipfire/kernel/drivers/scsi/arcmsr/arcmsr.ko
 #lib/modules/KVER-ipfire/kernel/drivers/scsi/atp870u.ko
+#lib/modules/KVER-ipfire/kernel/drivers/scsi/be2iscsi
+#lib/modules/KVER-ipfire/kernel/drivers/scsi/be2iscsi/be2iscsi.ko
+#lib/modules/KVER-ipfire/kernel/drivers/scsi/bfa
+#lib/modules/KVER-ipfire/kernel/drivers/scsi/bfa/bfa.ko
+#lib/modules/KVER-ipfire/kernel/drivers/scsi/bnx2i
+#lib/modules/KVER-ipfire/kernel/drivers/scsi/bnx2i/bnx2i.ko
 #lib/modules/KVER-ipfire/kernel/drivers/scsi/ch.ko
+#lib/modules/KVER-ipfire/kernel/drivers/scsi/cxgb3i
+#lib/modules/KVER-ipfire/kernel/drivers/scsi/cxgb3i/cxgb3i.ko
 #lib/modules/KVER-ipfire/kernel/drivers/scsi/dc395x.ko
 #lib/modules/KVER-ipfire/kernel/drivers/scsi/device_handler
 #lib/modules/KVER-ipfire/kernel/drivers/scsi/device_handler/scsi_dh.ko
@@ -1010,8 +1220,13 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/scsi/dpt_i2o.ko
 #lib/modules/KVER-ipfire/kernel/drivers/scsi/dtc.ko
 #lib/modules/KVER-ipfire/kernel/drivers/scsi/eata.ko
+#lib/modules/KVER-ipfire/kernel/drivers/scsi/fcoe
+#lib/modules/KVER-ipfire/kernel/drivers/scsi/fcoe/fcoe.ko
+#lib/modules/KVER-ipfire/kernel/drivers/scsi/fcoe/libfcoe.ko
 #lib/modules/KVER-ipfire/kernel/drivers/scsi/fd_mcs.ko
 #lib/modules/KVER-ipfire/kernel/drivers/scsi/fdomain.ko
+#lib/modules/KVER-ipfire/kernel/drivers/scsi/fnic
+#lib/modules/KVER-ipfire/kernel/drivers/scsi/fnic/fnic.ko
 #lib/modules/KVER-ipfire/kernel/drivers/scsi/g_NCR5380.ko
 #lib/modules/KVER-ipfire/kernel/drivers/scsi/g_NCR5380_mmio.ko
 #lib/modules/KVER-ipfire/kernel/drivers/scsi/gdth.ko
@@ -1023,7 +1238,10 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/scsi/ipr.ko
 #lib/modules/KVER-ipfire/kernel/drivers/scsi/ips.ko
 #lib/modules/KVER-ipfire/kernel/drivers/scsi/iscsi_tcp.ko
+#lib/modules/KVER-ipfire/kernel/drivers/scsi/libfc
+#lib/modules/KVER-ipfire/kernel/drivers/scsi/libfc/libfc.ko
 #lib/modules/KVER-ipfire/kernel/drivers/scsi/libiscsi.ko
+#lib/modules/KVER-ipfire/kernel/drivers/scsi/libiscsi_tcp.ko
 #lib/modules/KVER-ipfire/kernel/drivers/scsi/libsas
 #lib/modules/KVER-ipfire/kernel/drivers/scsi/libsas/libsas.ko
 #lib/modules/KVER-ipfire/kernel/drivers/scsi/lpfc
@@ -1033,8 +1251,14 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/scsi/megaraid/megaraid_mbox.ko
 #lib/modules/KVER-ipfire/kernel/drivers/scsi/megaraid/megaraid_mm.ko
 #lib/modules/KVER-ipfire/kernel/drivers/scsi/megaraid/megaraid_sas.ko
-#lib/modules/KVER-ipfire/kernel/drivers/scsi/mvsas.ko
+#lib/modules/KVER-ipfire/kernel/drivers/scsi/mpt2sas
+#lib/modules/KVER-ipfire/kernel/drivers/scsi/mpt2sas/mpt2sas.ko
+#lib/modules/KVER-ipfire/kernel/drivers/scsi/mvsas
+#lib/modules/KVER-ipfire/kernel/drivers/scsi/mvsas/mvsas.ko
 #lib/modules/KVER-ipfire/kernel/drivers/scsi/nsp32.ko
+#lib/modules/KVER-ipfire/kernel/drivers/scsi/osd
+#lib/modules/KVER-ipfire/kernel/drivers/scsi/osd/libosd.ko
+#lib/modules/KVER-ipfire/kernel/drivers/scsi/osd/osd.ko
 #lib/modules/KVER-ipfire/kernel/drivers/scsi/pas16.ko
 #lib/modules/KVER-ipfire/kernel/drivers/scsi/pcmcia
 #lib/modules/KVER-ipfire/kernel/drivers/scsi/pcmcia/aha152x_cs.ko
@@ -1042,6 +1266,7 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/scsi/pcmcia/nsp_cs.ko
 #lib/modules/KVER-ipfire/kernel/drivers/scsi/pcmcia/qlogic_cs.ko
 #lib/modules/KVER-ipfire/kernel/drivers/scsi/pcmcia/sym53c500_cs.ko
+#lib/modules/KVER-ipfire/kernel/drivers/scsi/pmcraid.ko
 #lib/modules/KVER-ipfire/kernel/drivers/scsi/ppa.ko
 #lib/modules/KVER-ipfire/kernel/drivers/scsi/qla1280.ko
 #lib/modules/KVER-ipfire/kernel/drivers/scsi/qla2xxx
@@ -1080,11 +1305,26 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/serial/serial_cs.ko
 #lib/modules/KVER-ipfire/kernel/drivers/ssb
 #lib/modules/KVER-ipfire/kernel/drivers/ssb/ssb.ko
+#lib/modules/KVER-ipfire/kernel/drivers/staging
+#lib/modules/KVER-ipfire/kernel/drivers/staging/et131x
+#lib/modules/KVER-ipfire/kernel/drivers/staging/et131x/et131x.ko
+#lib/modules/KVER-ipfire/kernel/drivers/staging/hv
+#lib/modules/KVER-ipfire/kernel/drivers/staging/hv/hv_blkvsc.ko
+#lib/modules/KVER-ipfire/kernel/drivers/staging/hv/hv_netvsc.ko
+#lib/modules/KVER-ipfire/kernel/drivers/staging/hv/hv_storvsc.ko
+#lib/modules/KVER-ipfire/kernel/drivers/staging/hv/hv_vmbus.ko
+#lib/modules/KVER-ipfire/kernel/drivers/staging/phison
+#lib/modules/KVER-ipfire/kernel/drivers/staging/phison/phison.ko
+#lib/modules/KVER-ipfire/kernel/drivers/staging/slicoss
+#lib/modules/KVER-ipfire/kernel/drivers/staging/slicoss/slicoss.ko
 #lib/modules/KVER-ipfire/kernel/drivers/uio
 #lib/modules/KVER-ipfire/kernel/drivers/uio/uio.ko
+#lib/modules/KVER-ipfire/kernel/drivers/uio/uio_aec.ko
 #lib/modules/KVER-ipfire/kernel/drivers/uio/uio_cif.ko
+#lib/modules/KVER-ipfire/kernel/drivers/uio/uio_pci_generic.ko
 #lib/modules/KVER-ipfire/kernel/drivers/uio/uio_pdrv.ko
 #lib/modules/KVER-ipfire/kernel/drivers/uio/uio_pdrv_genirq.ko
+#lib/modules/KVER-ipfire/kernel/drivers/uio/uio_sercos3.ko
 #lib/modules/KVER-ipfire/kernel/drivers/uio/uio_smx.ko
 #lib/modules/KVER-ipfire/kernel/drivers/usb
 #lib/modules/KVER-ipfire/kernel/drivers/usb/atm
@@ -1097,16 +1337,23 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/usb/class/cdc-acm.ko
 #lib/modules/KVER-ipfire/kernel/drivers/usb/class/cdc-wdm.ko
 #lib/modules/KVER-ipfire/kernel/drivers/usb/class/usblp.ko
+#lib/modules/KVER-ipfire/kernel/drivers/usb/class/usbtmc.ko
 #lib/modules/KVER-ipfire/kernel/drivers/usb/core
 #lib/modules/KVER-ipfire/kernel/drivers/usb/core/usbcore.ko
 #lib/modules/KVER-ipfire/kernel/drivers/usb/host
 #lib/modules/KVER-ipfire/kernel/drivers/usb/host/ehci-hcd.ko
+#lib/modules/KVER-ipfire/kernel/drivers/usb/host/hwa-hc.ko
 #lib/modules/KVER-ipfire/kernel/drivers/usb/host/isp116x-hcd.ko
+#lib/modules/KVER-ipfire/kernel/drivers/usb/host/isp1362-hcd.ko
 #lib/modules/KVER-ipfire/kernel/drivers/usb/host/ohci-hcd.ko
+#lib/modules/KVER-ipfire/kernel/drivers/usb/host/oxu210hp-hcd.ko
 #lib/modules/KVER-ipfire/kernel/drivers/usb/host/r8a66597-hcd.ko
 #lib/modules/KVER-ipfire/kernel/drivers/usb/host/sl811-hcd.ko
 #lib/modules/KVER-ipfire/kernel/drivers/usb/host/u132-hcd.ko
 #lib/modules/KVER-ipfire/kernel/drivers/usb/host/uhci-hcd.ko
+#lib/modules/KVER-ipfire/kernel/drivers/usb/host/whci
+#lib/modules/KVER-ipfire/kernel/drivers/usb/host/whci/whci-hcd.ko
+#lib/modules/KVER-ipfire/kernel/drivers/usb/host/xhci.ko
 #lib/modules/KVER-ipfire/kernel/drivers/usb/misc
 #lib/modules/KVER-ipfire/kernel/drivers/usb/misc/berry_charge.ko
 #lib/modules/KVER-ipfire/kernel/drivers/usb/misc/cypress_cy7c63.ko
@@ -1120,13 +1367,17 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/usb/misc/sisusbvga/sisusbvga.ko
 #lib/modules/KVER-ipfire/kernel/drivers/usb/misc/usblcd.ko
 #lib/modules/KVER-ipfire/kernel/drivers/usb/misc/usbled.ko
+#lib/modules/KVER-ipfire/kernel/drivers/usb/misc/usbsevseg.ko
 #lib/modules/KVER-ipfire/kernel/drivers/usb/misc/uss720.ko
+#lib/modules/KVER-ipfire/kernel/drivers/usb/misc/vstusb.ko
+#lib/modules/KVER-ipfire/kernel/drivers/usb/otg
+#lib/modules/KVER-ipfire/kernel/drivers/usb/otg/nop-usb-xceiv.ko
 #lib/modules/KVER-ipfire/kernel/drivers/usb/serial
 #lib/modules/KVER-ipfire/kernel/drivers/usb/serial/aircable.ko
 #lib/modules/KVER-ipfire/kernel/drivers/usb/serial/ark3116.ko
 #lib/modules/KVER-ipfire/kernel/drivers/usb/serial/belkin_sa.ko
 #lib/modules/KVER-ipfire/kernel/drivers/usb/serial/ch341.ko
-#lib/modules/KVER-ipfire/kernel/drivers/usb/serial/cp2101.ko
+#lib/modules/KVER-ipfire/kernel/drivers/usb/serial/cp210x.ko
 #lib/modules/KVER-ipfire/kernel/drivers/usb/serial/cypress_m8.ko
 #lib/modules/KVER-ipfire/kernel/drivers/usb/serial/digi_acceleport.ko
 #lib/modules/KVER-ipfire/kernel/drivers/usb/serial/empeg.ko
@@ -1141,17 +1392,49 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/usb/serial/mos7720.ko
 #lib/modules/KVER-ipfire/kernel/drivers/usb/serial/mos7840.ko
 #lib/modules/KVER-ipfire/kernel/drivers/usb/serial/moto_modem.ko
+#lib/modules/KVER-ipfire/kernel/drivers/usb/serial/opticon.ko
 #lib/modules/KVER-ipfire/kernel/drivers/usb/serial/option.ko
 #lib/modules/KVER-ipfire/kernel/drivers/usb/serial/oti6858.ko
 #lib/modules/KVER-ipfire/kernel/drivers/usb/serial/pl2303.ko
+#lib/modules/KVER-ipfire/kernel/drivers/usb/serial/qcserial.ko
 #lib/modules/KVER-ipfire/kernel/drivers/usb/serial/safe_serial.ko
+#lib/modules/KVER-ipfire/kernel/drivers/usb/serial/siemens_mpi.ko
 #lib/modules/KVER-ipfire/kernel/drivers/usb/serial/sierra.ko
 #lib/modules/KVER-ipfire/kernel/drivers/usb/serial/spcp8x5.ko
+#lib/modules/KVER-ipfire/kernel/drivers/usb/serial/symbolserial.ko
 #lib/modules/KVER-ipfire/kernel/drivers/usb/serial/ti_usb_3410_5052.ko
 #lib/modules/KVER-ipfire/kernel/drivers/usb/serial/usbserial.ko
 #lib/modules/KVER-ipfire/kernel/drivers/usb/serial/whiteheat.ko
 #lib/modules/KVER-ipfire/kernel/drivers/usb/storage
+#lib/modules/KVER-ipfire/kernel/drivers/usb/storage/ums-alauda.ko
+#lib/modules/KVER-ipfire/kernel/drivers/usb/storage/ums-cypress.ko
+#lib/modules/KVER-ipfire/kernel/drivers/usb/storage/ums-freecom.ko
+#lib/modules/KVER-ipfire/kernel/drivers/usb/storage/ums-isd200.ko
+#lib/modules/KVER-ipfire/kernel/drivers/usb/storage/ums-jumpshot.ko
+#lib/modules/KVER-ipfire/kernel/drivers/usb/storage/ums-karma.ko
+#lib/modules/KVER-ipfire/kernel/drivers/usb/storage/ums-onetouch.ko
+#lib/modules/KVER-ipfire/kernel/drivers/usb/storage/ums-sddr09.ko
+#lib/modules/KVER-ipfire/kernel/drivers/usb/storage/ums-sddr55.ko
+#lib/modules/KVER-ipfire/kernel/drivers/usb/storage/ums-usbat.ko
 #lib/modules/KVER-ipfire/kernel/drivers/usb/storage/usb-storage.ko
+#lib/modules/KVER-ipfire/kernel/drivers/usb/wusbcore
+#lib/modules/KVER-ipfire/kernel/drivers/usb/wusbcore/wusb-cbaf.ko
+#lib/modules/KVER-ipfire/kernel/drivers/usb/wusbcore/wusb-wa.ko
+#lib/modules/KVER-ipfire/kernel/drivers/usb/wusbcore/wusbcore.ko
+#lib/modules/KVER-ipfire/kernel/drivers/uwb
+#lib/modules/KVER-ipfire/kernel/drivers/uwb/hwa-rc.ko
+#lib/modules/KVER-ipfire/kernel/drivers/uwb/i1480
+#lib/modules/KVER-ipfire/kernel/drivers/uwb/i1480/dfu
+#lib/modules/KVER-ipfire/kernel/drivers/uwb/i1480/dfu/i1480-dfu-usb.ko
+#lib/modules/KVER-ipfire/kernel/drivers/uwb/i1480/i1480-est.ko
+#lib/modules/KVER-ipfire/kernel/drivers/uwb/i1480/i1480u-wlp
+#lib/modules/KVER-ipfire/kernel/drivers/uwb/i1480/i1480u-wlp/i1480u-wlp.ko
+#lib/modules/KVER-ipfire/kernel/drivers/uwb/umc.ko
+#lib/modules/KVER-ipfire/kernel/drivers/uwb/uwb.ko
+#lib/modules/KVER-ipfire/kernel/drivers/uwb/whc-rc.ko
+#lib/modules/KVER-ipfire/kernel/drivers/uwb/whci.ko
+#lib/modules/KVER-ipfire/kernel/drivers/uwb/wlp
+#lib/modules/KVER-ipfire/kernel/drivers/uwb/wlp/wlp.ko
 #lib/modules/KVER-ipfire/kernel/drivers/video
 #lib/modules/KVER-ipfire/kernel/drivers/video/arkfb.ko
 #lib/modules/KVER-ipfire/kernel/drivers/video/aty
@@ -1159,26 +1442,26 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/video/aty/atyfb.ko
 #lib/modules/KVER-ipfire/kernel/drivers/video/aty/radeonfb.ko
 #lib/modules/KVER-ipfire/kernel/drivers/video/backlight
-#lib/modules/KVER-ipfire/kernel/drivers/video/backlight/corgi_bl.ko
 #lib/modules/KVER-ipfire/kernel/drivers/video/backlight/cr_bllcd.ko
+#lib/modules/KVER-ipfire/kernel/drivers/video/backlight/generic_bl.ko
+#lib/modules/KVER-ipfire/kernel/drivers/video/backlight/kb3886_bl.ko
 #lib/modules/KVER-ipfire/kernel/drivers/video/backlight/lcd.ko
 #lib/modules/KVER-ipfire/kernel/drivers/video/backlight/mbp_nvidia_bl.ko
 #lib/modules/KVER-ipfire/kernel/drivers/video/backlight/platform_lcd.ko
 #lib/modules/KVER-ipfire/kernel/drivers/video/backlight/progear_bl.ko
+#lib/modules/KVER-ipfire/kernel/drivers/video/backlight/wm831x_bl.ko
 #lib/modules/KVER-ipfire/kernel/drivers/video/cirrusfb.ko
 #lib/modules/KVER-ipfire/kernel/drivers/video/cyber2000fb.ko
-#lib/modules/KVER-ipfire/kernel/drivers/video/cyblafb.ko
 #lib/modules/KVER-ipfire/kernel/drivers/video/display
 #lib/modules/KVER-ipfire/kernel/drivers/video/display/display.ko
 #lib/modules/KVER-ipfire/kernel/drivers/video/fb_ddc.ko
+#lib/modules/KVER-ipfire/kernel/drivers/video/fb_sys_fops.ko
 #lib/modules/KVER-ipfire/kernel/drivers/video/geode
 #lib/modules/KVER-ipfire/kernel/drivers/video/geode/gx1fb.ko
 #lib/modules/KVER-ipfire/kernel/drivers/video/geode/gxfb.ko
 #lib/modules/KVER-ipfire/kernel/drivers/video/geode/lxfb.ko
 #lib/modules/KVER-ipfire/kernel/drivers/video/i810
 #lib/modules/KVER-ipfire/kernel/drivers/video/i810/i810fb.ko
-#lib/modules/KVER-ipfire/kernel/drivers/video/intelfb
-#lib/modules/KVER-ipfire/kernel/drivers/video/intelfb/intelfb.ko
 #lib/modules/KVER-ipfire/kernel/drivers/video/kyro
 #lib/modules/KVER-ipfire/kernel/drivers/video/kyro/kyrofb.ko
 #lib/modules/KVER-ipfire/kernel/drivers/video/macmodes.ko
@@ -1193,6 +1476,7 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/video/matrox/matroxfb_g450.ko
 #lib/modules/KVER-ipfire/kernel/drivers/video/matrox/matroxfb_maven.ko
 #lib/modules/KVER-ipfire/kernel/drivers/video/matrox/matroxfb_misc.ko
+#lib/modules/KVER-ipfire/kernel/drivers/video/metronomefb.ko
 #lib/modules/KVER-ipfire/kernel/drivers/video/neofb.ko
 #lib/modules/KVER-ipfire/kernel/drivers/video/nvidia
 #lib/modules/KVER-ipfire/kernel/drivers/video/nvidia/nvidiafb.ko
@@ -1209,13 +1493,19 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/video/sm501fb.ko
 #lib/modules/KVER-ipfire/kernel/drivers/video/sstfb.ko
 #lib/modules/KVER-ipfire/kernel/drivers/video/svgalib.ko
+#lib/modules/KVER-ipfire/kernel/drivers/video/syscopyarea.ko
+#lib/modules/KVER-ipfire/kernel/drivers/video/sysfillrect.ko
+#lib/modules/KVER-ipfire/kernel/drivers/video/sysimgblt.ko
 #lib/modules/KVER-ipfire/kernel/drivers/video/tdfxfb.ko
+#lib/modules/KVER-ipfire/kernel/drivers/video/tmiofb.ko
 #lib/modules/KVER-ipfire/kernel/drivers/video/tridentfb.ko
 #lib/modules/KVER-ipfire/kernel/drivers/video/uvesafb.ko
 #lib/modules/KVER-ipfire/kernel/drivers/video/vermilion
 #lib/modules/KVER-ipfire/kernel/drivers/video/vermilion/crvml.ko
 #lib/modules/KVER-ipfire/kernel/drivers/video/vermilion/vmlfb.ko
 #lib/modules/KVER-ipfire/kernel/drivers/video/vgastate.ko
+#lib/modules/KVER-ipfire/kernel/drivers/video/via
+#lib/modules/KVER-ipfire/kernel/drivers/video/via/viafb.ko
 #lib/modules/KVER-ipfire/kernel/drivers/video/vt8623fb.ko
 #lib/modules/KVER-ipfire/kernel/drivers/virtio
 #lib/modules/KVER-ipfire/kernel/drivers/virtio/virtio_balloon.ko
@@ -1226,6 +1516,8 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/w1/masters/ds2490.ko
 #lib/modules/KVER-ipfire/kernel/drivers/w1/masters/matrox_w1.ko
 #lib/modules/KVER-ipfire/kernel/drivers/w1/slaves
+#lib/modules/KVER-ipfire/kernel/drivers/w1/slaves/w1_bq27000.ko
+#lib/modules/KVER-ipfire/kernel/drivers/w1/slaves/w1_ds2431.ko
 #lib/modules/KVER-ipfire/kernel/drivers/w1/slaves/w1_ds2433.ko
 #lib/modules/KVER-ipfire/kernel/drivers/w1/slaves/w1_ds2760.ko
 #lib/modules/KVER-ipfire/kernel/drivers/w1/slaves/w1_smem.ko
@@ -1244,6 +1536,7 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/watchdog/ib700wdt.ko
 #lib/modules/KVER-ipfire/kernel/drivers/watchdog/ibmasr.ko
 #lib/modules/KVER-ipfire/kernel/drivers/watchdog/it8712f_wdt.ko
+#lib/modules/KVER-ipfire/kernel/drivers/watchdog/it87_wdt.ko
 #lib/modules/KVER-ipfire/kernel/drivers/watchdog/machzwd.ko
 #lib/modules/KVER-ipfire/kernel/drivers/watchdog/pc87413_wdt.ko
 #lib/modules/KVER-ipfire/kernel/drivers/watchdog/pcwd_pci.ko
@@ -1252,22 +1545,29 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/watchdog/sbc7240_wdt.ko
 #lib/modules/KVER-ipfire/kernel/drivers/watchdog/sbc8360.ko
 #lib/modules/KVER-ipfire/kernel/drivers/watchdog/sbc_epx_c3.ko
+#lib/modules/KVER-ipfire/kernel/drivers/watchdog/sbc_fitpc2_wdt.ko
 #lib/modules/KVER-ipfire/kernel/drivers/watchdog/sc1200wdt.ko
 #lib/modules/KVER-ipfire/kernel/drivers/watchdog/sc520_wdt.ko
+#lib/modules/KVER-ipfire/kernel/drivers/watchdog/sch311x_wdt.ko
 #lib/modules/KVER-ipfire/kernel/drivers/watchdog/scx200_wdt.ko
 #lib/modules/KVER-ipfire/kernel/drivers/watchdog/smsc37b787_wdt.ko
 #lib/modules/KVER-ipfire/kernel/drivers/watchdog/softdog.ko
 #lib/modules/KVER-ipfire/kernel/drivers/watchdog/w83627hf_wdt.ko
 #lib/modules/KVER-ipfire/kernel/drivers/watchdog/w83697hf_wdt.ko
+#lib/modules/KVER-ipfire/kernel/drivers/watchdog/w83697ug_wdt.ko
 #lib/modules/KVER-ipfire/kernel/drivers/watchdog/w83877f_wdt.ko
 #lib/modules/KVER-ipfire/kernel/drivers/watchdog/w83977f_wdt.ko
 #lib/modules/KVER-ipfire/kernel/drivers/watchdog/wafer5823wdt.ko
 #lib/modules/KVER-ipfire/kernel/drivers/watchdog/wdt_pci.ko
+#lib/modules/KVER-ipfire/kernel/drivers/watchdog/wm831x_wdt.ko
+#lib/modules/KVER-ipfire/kernel/drivers/watchdog/wm8350_wdt.ko
 #lib/modules/KVER-ipfire/kernel/fs
 #lib/modules/KVER-ipfire/kernel/fs/autofs
 #lib/modules/KVER-ipfire/kernel/fs/autofs/autofs.ko
 #lib/modules/KVER-ipfire/kernel/fs/autofs4
 #lib/modules/KVER-ipfire/kernel/fs/autofs4/autofs4.ko
+#lib/modules/KVER-ipfire/kernel/fs/cachefiles
+#lib/modules/KVER-ipfire/kernel/fs/cachefiles/cachefiles.ko
 #lib/modules/KVER-ipfire/kernel/fs/cifs
 #lib/modules/KVER-ipfire/kernel/fs/cifs/cifs.ko
 #lib/modules/KVER-ipfire/kernel/fs/ecryptfs
@@ -1278,14 +1578,22 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/fs/ext2/ext2.ko
 #lib/modules/KVER-ipfire/kernel/fs/ext3
 #lib/modules/KVER-ipfire/kernel/fs/ext3/ext3.ko
+#lib/modules/KVER-ipfire/kernel/fs/ext4
+#lib/modules/KVER-ipfire/kernel/fs/ext4/ext4.ko
 #lib/modules/KVER-ipfire/kernel/fs/fat
 #lib/modules/KVER-ipfire/kernel/fs/fat/fat.ko
+#lib/modules/KVER-ipfire/kernel/fs/fat/vfat.ko
+#lib/modules/KVER-ipfire/kernel/fs/fscache
+#lib/modules/KVER-ipfire/kernel/fs/fscache/fscache.ko
 #lib/modules/KVER-ipfire/kernel/fs/fuse
+#lib/modules/KVER-ipfire/kernel/fs/fuse/cuse.ko
 #lib/modules/KVER-ipfire/kernel/fs/fuse/fuse.ko
 #lib/modules/KVER-ipfire/kernel/fs/isofs
 #lib/modules/KVER-ipfire/kernel/fs/isofs/isofs.ko
 #lib/modules/KVER-ipfire/kernel/fs/jbd
 #lib/modules/KVER-ipfire/kernel/fs/jbd/jbd.ko
+#lib/modules/KVER-ipfire/kernel/fs/jbd2
+#lib/modules/KVER-ipfire/kernel/fs/jbd2/jbd2.ko
 #lib/modules/KVER-ipfire/kernel/fs/jffs2
 #lib/modules/KVER-ipfire/kernel/fs/jffs2/jffs2.ko
 #lib/modules/KVER-ipfire/kernel/fs/jfs
@@ -1295,8 +1603,14 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/fs/mbcache.ko
 #lib/modules/KVER-ipfire/kernel/fs/nfs
 #lib/modules/KVER-ipfire/kernel/fs/nfs/nfs.ko
+#lib/modules/KVER-ipfire/kernel/fs/nfs_common
+#lib/modules/KVER-ipfire/kernel/fs/nfs_common/nfs_acl.ko
 #lib/modules/KVER-ipfire/kernel/fs/nfsd
 #lib/modules/KVER-ipfire/kernel/fs/nfsd/nfsd.ko
+#lib/modules/KVER-ipfire/kernel/fs/quota
+#lib/modules/KVER-ipfire/kernel/fs/quota/quota_tree.ko
+#lib/modules/KVER-ipfire/kernel/fs/quota/quota_v1.ko
+#lib/modules/KVER-ipfire/kernel/fs/quota/quota_v2.ko
 #lib/modules/KVER-ipfire/kernel/fs/reiser4
 #lib/modules/KVER-ipfire/kernel/fs/reiser4/reiser4.ko
 #lib/modules/KVER-ipfire/kernel/fs/reiserfs
@@ -1305,8 +1619,6 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/fs/smbfs/smbfs.ko
 #lib/modules/KVER-ipfire/kernel/fs/udf
 #lib/modules/KVER-ipfire/kernel/fs/udf/udf.ko
-#lib/modules/KVER-ipfire/kernel/fs/vfat
-#lib/modules/KVER-ipfire/kernel/fs/vfat/vfat.ko
 #lib/modules/KVER-ipfire/kernel/fs/xfs
 #lib/modules/KVER-ipfire/kernel/fs/xfs/xfs.ko
 #lib/modules/KVER-ipfire/kernel/lib
@@ -1371,17 +1683,14 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/net/bridge/netfilter/ebtable_filter.ko
 #lib/modules/KVER-ipfire/kernel/net/bridge/netfilter/ebtable_nat.ko
 #lib/modules/KVER-ipfire/kernel/net/bridge/netfilter/ebtables.ko
-#lib/modules/KVER-ipfire/kernel/net/ieee80211
-#lib/modules/KVER-ipfire/kernel/net/ieee80211/ieee80211.ko
-#lib/modules/KVER-ipfire/kernel/net/ieee80211/ieee80211_crypt.ko
-#lib/modules/KVER-ipfire/kernel/net/ieee80211/ieee80211_crypt_ccmp.ko
-#lib/modules/KVER-ipfire/kernel/net/ieee80211/ieee80211_crypt_tkip.ko
-#lib/modules/KVER-ipfire/kernel/net/ieee80211/ieee80211_crypt_wep.ko
+#lib/modules/KVER-ipfire/kernel/net/ieee802154
+#lib/modules/KVER-ipfire/kernel/net/ieee802154/af_802154.ko
+#lib/modules/KVER-ipfire/kernel/net/ieee802154/nl802154.ko
+#lib/modules/KVER-ipfire/kernel/net/ieee802154/wpan-class.ko
 #lib/modules/KVER-ipfire/kernel/net/ipv4
 #lib/modules/KVER-ipfire/kernel/net/ipv4/ah4.ko
 #lib/modules/KVER-ipfire/kernel/net/ipv4/esp4.ko
 #lib/modules/KVER-ipfire/kernel/net/ipv4/inet_diag.ko
-#lib/modules/KVER-ipfire/kernel/net/ipv4/inet_lro.ko
 #lib/modules/KVER-ipfire/kernel/net/ipv4/ip_gre.ko
 #lib/modules/KVER-ipfire/kernel/net/ipv4/ipcomp.ko
 #lib/modules/KVER-ipfire/kernel/net/ipv4/ipip.ko
@@ -1398,19 +1707,17 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/net/ipv4/netfilter/ipt_NETMAP.ko
 #lib/modules/KVER-ipfire/kernel/net/ipv4/netfilter/ipt_REDIRECT.ko
 #lib/modules/KVER-ipfire/kernel/net/ipv4/netfilter/ipt_REJECT.ko
-#lib/modules/KVER-ipfire/kernel/net/ipv4/netfilter/ipt_TTL.ko
 #lib/modules/KVER-ipfire/kernel/net/ipv4/netfilter/ipt_ULOG.ko
 #lib/modules/KVER-ipfire/kernel/net/ipv4/netfilter/ipt_addrtype.ko
 #lib/modules/KVER-ipfire/kernel/net/ipv4/netfilter/ipt_ah.ko
 #lib/modules/KVER-ipfire/kernel/net/ipv4/netfilter/ipt_ecn.ko
 #lib/modules/KVER-ipfire/kernel/net/ipv4/netfilter/ipt_ipp2p.ko
-#lib/modules/KVER-ipfire/kernel/net/ipv4/netfilter/ipt_recent.ko
-#lib/modules/KVER-ipfire/kernel/net/ipv4/netfilter/ipt_ttl.ko
 #lib/modules/KVER-ipfire/kernel/net/ipv4/netfilter/iptable_filter.ko
 #lib/modules/KVER-ipfire/kernel/net/ipv4/netfilter/iptable_mangle.ko
 #lib/modules/KVER-ipfire/kernel/net/ipv4/netfilter/iptable_nat.ko
 #lib/modules/KVER-ipfire/kernel/net/ipv4/netfilter/iptable_raw.ko
 #lib/modules/KVER-ipfire/kernel/net/ipv4/netfilter/nf_conntrack_ipv4.ko
+#lib/modules/KVER-ipfire/kernel/net/ipv4/netfilter/nf_defrag_ipv4.ko
 #lib/modules/KVER-ipfire/kernel/net/ipv4/netfilter/nf_nat.ko
 #lib/modules/KVER-ipfire/kernel/net/ipv4/netfilter/nf_nat_amanda.ko
 #lib/modules/KVER-ipfire/kernel/net/ipv4/netfilter/nf_nat_ftp.ko
@@ -1470,6 +1777,7 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/net/netfilter/nf_conntrack_sane.ko
 #lib/modules/KVER-ipfire/kernel/net/netfilter/nf_conntrack_sip.ko
 #lib/modules/KVER-ipfire/kernel/net/netfilter/nf_conntrack_tftp.ko
+#lib/modules/KVER-ipfire/kernel/net/netfilter/nf_tproxy_core.ko
 #lib/modules/KVER-ipfire/kernel/net/netfilter/nfnetlink.ko
 #lib/modules/KVER-ipfire/kernel/net/netfilter/nfnetlink_log.ko
 #lib/modules/KVER-ipfire/kernel/net/netfilter/nfnetlink_queue.ko
@@ -1477,7 +1785,9 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/net/netfilter/xt_CLASSIFY.ko
 #lib/modules/KVER-ipfire/kernel/net/netfilter/xt_CONNMARK.ko
 #lib/modules/KVER-ipfire/kernel/net/netfilter/xt_DSCP.ko
+#lib/modules/KVER-ipfire/kernel/net/netfilter/xt_HL.ko
 #lib/modules/KVER-ipfire/kernel/net/netfilter/xt_IMQ.ko
+#lib/modules/KVER-ipfire/kernel/net/netfilter/xt_LED.ko
 #lib/modules/KVER-ipfire/kernel/net/netfilter/xt_MARK.ko
 #lib/modules/KVER-ipfire/kernel/net/netfilter/xt_NFLOG.ko
 #lib/modules/KVER-ipfire/kernel/net/netfilter/xt_NFQUEUE.ko
@@ -1485,7 +1795,9 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/net/netfilter/xt_RATEEST.ko
 #lib/modules/KVER-ipfire/kernel/net/netfilter/xt_TCPMSS.ko
 #lib/modules/KVER-ipfire/kernel/net/netfilter/xt_TCPOPTSTRIP.ko
+#lib/modules/KVER-ipfire/kernel/net/netfilter/xt_TPROXY.ko
 #lib/modules/KVER-ipfire/kernel/net/netfilter/xt_TRACE.ko
+#lib/modules/KVER-ipfire/kernel/net/netfilter/xt_cluster.ko
 #lib/modules/KVER-ipfire/kernel/net/netfilter/xt_comment.ko
 #lib/modules/KVER-ipfire/kernel/net/netfilter/xt_connbytes.ko
 #lib/modules/KVER-ipfire/kernel/net/netfilter/xt_connlimit.ko
@@ -1496,6 +1808,7 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/net/netfilter/xt_esp.ko
 #lib/modules/KVER-ipfire/kernel/net/netfilter/xt_hashlimit.ko
 #lib/modules/KVER-ipfire/kernel/net/netfilter/xt_helper.ko
+#lib/modules/KVER-ipfire/kernel/net/netfilter/xt_hl.ko
 #lib/modules/KVER-ipfire/kernel/net/netfilter/xt_iprange.ko
 #lib/modules/KVER-ipfire/kernel/net/netfilter/xt_layer7.ko
 #lib/modules/KVER-ipfire/kernel/net/netfilter/xt_length.ko
@@ -1503,6 +1816,7 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/net/netfilter/xt_mac.ko
 #lib/modules/KVER-ipfire/kernel/net/netfilter/xt_mark.ko
 #lib/modules/KVER-ipfire/kernel/net/netfilter/xt_multiport.ko
+#lib/modules/KVER-ipfire/kernel/net/netfilter/xt_osf.ko
 #lib/modules/KVER-ipfire/kernel/net/netfilter/xt_owner.ko
 #lib/modules/KVER-ipfire/kernel/net/netfilter/xt_physdev.ko
 #lib/modules/KVER-ipfire/kernel/net/netfilter/xt_pkttype.ko
@@ -1510,7 +1824,9 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/net/netfilter/xt_quota.ko
 #lib/modules/KVER-ipfire/kernel/net/netfilter/xt_rateest.ko
 #lib/modules/KVER-ipfire/kernel/net/netfilter/xt_realm.ko
+#lib/modules/KVER-ipfire/kernel/net/netfilter/xt_recent.ko
 #lib/modules/KVER-ipfire/kernel/net/netfilter/xt_sctp.ko
+#lib/modules/KVER-ipfire/kernel/net/netfilter/xt_socket.ko
 #lib/modules/KVER-ipfire/kernel/net/netfilter/xt_state.ko
 #lib/modules/KVER-ipfire/kernel/net/netfilter/xt_statistic.ko
 #lib/modules/KVER-ipfire/kernel/net/netfilter/xt_string.ko
@@ -1518,8 +1834,13 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/net/netfilter/xt_tcpudp.ko
 #lib/modules/KVER-ipfire/kernel/net/netfilter/xt_time.ko
 #lib/modules/KVER-ipfire/kernel/net/netfilter/xt_u32.ko
+#lib/modules/KVER-ipfire/kernel/net/phonet
+#lib/modules/KVER-ipfire/kernel/net/phonet/phonet.ko
+#lib/modules/KVER-ipfire/kernel/net/phonet/pn_pep.ko
+#lib/modules/KVER-ipfire/kernel/net/rds
+#lib/modules/KVER-ipfire/kernel/net/rds/rds.ko
+#lib/modules/KVER-ipfire/kernel/net/rds/rds_tcp.ko
 #lib/modules/KVER-ipfire/kernel/net/rfkill
-#lib/modules/KVER-ipfire/kernel/net/rfkill/rfkill-input.ko
 #lib/modules/KVER-ipfire/kernel/net/rfkill/rfkill.ko
 #lib/modules/KVER-ipfire/kernel/net/rxrpc
 #lib/modules/KVER-ipfire/kernel/net/rxrpc/af-rxrpc.ko
@@ -1531,6 +1852,7 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/net/sched/act_nat.ko
 #lib/modules/KVER-ipfire/kernel/net/sched/act_pedit.ko
 #lib/modules/KVER-ipfire/kernel/net/sched/act_police.ko
+#lib/modules/KVER-ipfire/kernel/net/sched/act_skbedit.ko
 #lib/modules/KVER-ipfire/kernel/net/sched/cls_basic.ko
 #lib/modules/KVER-ipfire/kernel/net/sched/cls_flow.ko
 #lib/modules/KVER-ipfire/kernel/net/sched/cls_fw.ko
@@ -1545,11 +1867,13 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/net/sched/em_u32.ko
 #lib/modules/KVER-ipfire/kernel/net/sched/sch_atm.ko
 #lib/modules/KVER-ipfire/kernel/net/sched/sch_cbq.ko
+#lib/modules/KVER-ipfire/kernel/net/sched/sch_drr.ko
 #lib/modules/KVER-ipfire/kernel/net/sched/sch_dsmark.ko
 #lib/modules/KVER-ipfire/kernel/net/sched/sch_gred.ko
 #lib/modules/KVER-ipfire/kernel/net/sched/sch_hfsc.ko
 #lib/modules/KVER-ipfire/kernel/net/sched/sch_htb.ko
 #lib/modules/KVER-ipfire/kernel/net/sched/sch_ingress.ko
+#lib/modules/KVER-ipfire/kernel/net/sched/sch_multiq.ko
 #lib/modules/KVER-ipfire/kernel/net/sched/sch_netem.ko
 #lib/modules/KVER-ipfire/kernel/net/sched/sch_prio.ko
 #lib/modules/KVER-ipfire/kernel/net/sched/sch_red.ko
@@ -1561,8 +1885,14 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/net/sunrpc/auth_gss/auth_rpcgss.ko
 #lib/modules/KVER-ipfire/kernel/net/sunrpc/auth_gss/rpcsec_gss_krb5.ko
 #lib/modules/KVER-ipfire/kernel/net/sunrpc/sunrpc.ko
+#lib/modules/KVER-ipfire/kernel/net/wimax
+#lib/modules/KVER-ipfire/kernel/net/wimax/wimax.ko
 #lib/modules/KVER-ipfire/kernel/net/wireless
 #lib/modules/KVER-ipfire/kernel/net/wireless/cfg80211.ko
+#lib/modules/KVER-ipfire/kernel/net/wireless/lib80211.ko
+#lib/modules/KVER-ipfire/kernel/net/wireless/lib80211_crypt_ccmp.ko
+#lib/modules/KVER-ipfire/kernel/net/wireless/lib80211_crypt_tkip.ko
+#lib/modules/KVER-ipfire/kernel/net/wireless/lib80211_crypt_wep.ko
 #lib/modules/KVER-ipfire/kernel/net/xfrm
 #lib/modules/KVER-ipfire/kernel/net/xfrm/xfrm_ipcomp.ko
 #lib/modules/KVER-ipfire/kernel/net/xfrm/xfrm_user.ko

diff --git a/config/rootfiles/common/linux-firmware b/config/rootfiles/common/linux-firmware
index c0e8a6890374eaf3ec98228d6863357db4cac767..4a41ef696f9d3e13bb155a41d343e443130b0c71 100644 (file)
--- a/config/rootfiles/common/linux-firmware
+++ b/config/rootfiles/common/linux-firmware
@@ -1,12 +1,91 @@
+#lib/firmware/3com
+lib/firmware/3com/3C359.bin
+lib/firmware/3com/typhoon.bin
+lib/firmware/LICENCE.agere
+lib/firmware/LICENCE.atheros_firmware
+lib/firmware/LICENCE.i2400m
+lib/firmware/LICENCE.iwlwifi_firmware
+lib/firmware/LICENCE.libertas
+lib/firmware/LICENCE.mwl8k
+lib/firmware/LICENCE.qla2xxx
+lib/firmware/LICENCE.ralink-firmware.txt
+lib/firmware/LICENCE.xc5000
+lib/firmware/LICENSE.dib0700
+lib/firmware/LICENSE.radeon_rlc
+lib/firmware/WHENCE
+#lib/firmware/acenic
+lib/firmware/acenic/tg1.bin
+lib/firmware/acenic/tg2.bin
+#lib/firmware/adaptec
+lib/firmware/adaptec/starfire_rx.bin
+lib/firmware/adaptec/starfire_tx.bin
+#lib/firmware/advansys
+lib/firmware/advansys/3550.bin
+lib/firmware/advansys/38C0800.bin
+lib/firmware/advansys/38C1600.bin
+lib/firmware/advansys/mcode.bin
+lib/firmware/agere_ap_fw.bin
+lib/firmware/agere_sta_fw.bin
+lib/firmware/ar9170-1.fw
+lib/firmware/ar9170-2.fw
+lib/firmware/ar9271.fw
+lib/firmware/ath3k-1.fw
 lib/firmware/atmsar11.fw
-#lib/firmware/cpia2
+#lib/firmware/av7110
 lib/firmware/av7110/bootcode.bin
+#lib/firmware/bnx2
+lib/firmware/bnx2/bnx2-mips-06-4.6.16.fw
+lib/firmware/bnx2/bnx2-mips-06-5.0.0.j3.fw
+lib/firmware/bnx2/bnx2-mips-09-4.6.17.fw
+lib/firmware/bnx2/bnx2-mips-09-5.0.0.j3.fw
+lib/firmware/bnx2/bnx2-rv2p-06-4.6.16.fw
+lib/firmware/bnx2/bnx2-rv2p-06-5.0.0.j3.fw
+lib/firmware/bnx2/bnx2-rv2p-09-4.6.15.fw
+lib/firmware/bnx2/bnx2-rv2p-09-5.0.0.j3.fw
+lib/firmware/bnx2/bnx2-rv2p-09ax-5.0.0.j3.fw
+lib/firmware/bnx2x-e1-4.8.53.0.fw
+lib/firmware/bnx2x-e1-5.2.7.0.fw
+lib/firmware/bnx2x-e1h-4.8.53.0.fw
+lib/firmware/bnx2x-e1h-5.2.7.0.fw
+#lib/firmware/cis
+lib/firmware/cis/3CCFEM556.cis
+lib/firmware/cis/3CXEM556.cis
+lib/firmware/cis/COMpad2.cis
+lib/firmware/cis/COMpad4.cis
+lib/firmware/cis/DP83903.cis
+lib/firmware/cis/LA-PCM.cis
+lib/firmware/cis/MT5634ZLX.cis
+lib/firmware/cis/NE2K.cis
+lib/firmware/cis/PCMLM28.cis
+lib/firmware/cis/PE-200.cis
+lib/firmware/cis/RS-COM-2P.cis
+lib/firmware/cis/SW_555_SER.cis
+lib/firmware/cis/SW_7xx_SER.cis
+lib/firmware/cis/SW_8xx_SER.cis
+lib/firmware/cis/tamarack.cis
+#lib/firmware/cpia2
 lib/firmware/cpia2/stv0672_vp4.bin
+#lib/firmware/cxgb3
+lib/firmware/cxgb3/ael2005_opt_edc.bin
+lib/firmware/cxgb3/ael2005_twx_edc.bin
+lib/firmware/cxgb3/ael2020_twx_edc.bin
+lib/firmware/cxgb3/t3b_psram-1.1.0.bin
+lib/firmware/cxgb3/t3c_psram-1.1.0.bin
+lib/firmware/cxgb3/t3fw-7.0.0.bin
+lib/firmware/cxgb3/t3fw-7.1.0.bin
+lib/firmware/cxgb3/t3fw-7.4.0.bin
 #lib/firmware/dabusb
 lib/firmware/dabusb/bitstream.bin
 lib/firmware/dabusb/firmware.fw
 #lib/firmware/dsp56k
+#lib/firmware/dsp56k/bootstrap.asm
 lib/firmware/dsp56k/bootstrap.bin
+lib/firmware/dvb-fe-xc5000-1.6.114.fw
+lib/firmware/dvb-usb-dib0700-1.20.fw
+#lib/firmware/e100
+lib/firmware/e100/d101m_ucode.bin
+lib/firmware/e100/d101s_ucode.bin
+lib/firmware/e100/d102e_ucode.bin
 #lib/firmware/edgeport
 lib/firmware/edgeport/boot.fw
 lib/firmware/edgeport/boot2.fw
@@ -25,7 +104,17 @@ lib/firmware/emi62/spdif.fw
 #lib/firmware/ess
 lib/firmware/ess/maestro3_assp_kernel.fw
 lib/firmware/ess/maestro3_assp_minisrc.fw
+lib/firmware/f2255usb.bin
+lib/firmware/i2400m-fw-usb-1.3.sbcf
+lib/firmware/i2400m-fw-usb-1.4.sbcf
 lib/firmware/intelliport2.bin
+lib/firmware/iwlwifi-1000-3.ucode
+lib/firmware/iwlwifi-3945-2.ucode
+lib/firmware/iwlwifi-4965-2.ucode
+lib/firmware/iwlwifi-5000-1.ucode
+lib/firmware/iwlwifi-5000-2.ucode
+lib/firmware/iwlwifi-5150-2.ucode
+lib/firmware/iwlwifi-6000-4.ucode
 #lib/firmware/kaweth
 lib/firmware/kaweth/new_code.bin
 lib/firmware/kaweth/new_code_fix.bin
@@ -45,27 +134,158 @@ lib/firmware/keyspan/usa28xb.fw
 lib/firmware/keyspan/usa49w.fw
 lib/firmware/keyspan/usa49wlc.fw
 #lib/firmware/keyspan_pda
+#lib/firmware/keyspan_pda/keyspan_pda.S
 lib/firmware/keyspan_pda/keyspan_pda.fw
+#lib/firmware/keyspan_pda/xircom_pgs.S
 lib/firmware/keyspan_pda/xircom_pgs.fw
 #lib/firmware/korg
 lib/firmware/korg/k1212.dsp
+#lib/firmware/libertas
+lib/firmware/libertas/cf8385.bin
+lib/firmware/libertas/cf8385_helper.bin
+lib/firmware/libertas/gspi8682.bin
+lib/firmware/libertas/gspi8682_helper.bin
+lib/firmware/libertas/gspi8686_v9.bin
+lib/firmware/libertas/gspi8686_v9_helper.bin
+lib/firmware/libertas/gspi8688.bin
+lib/firmware/libertas/gspi8688_helper.bin
+lib/firmware/libertas/sd8385.bin
+lib/firmware/libertas/sd8385_helper.bin
+lib/firmware/libertas/sd8682.bin
+lib/firmware/libertas/sd8682_helper.bin
+lib/firmware/libertas/sd8686_v8.bin
+lib/firmware/libertas/sd8686_v8_helper.bin
+lib/firmware/libertas/sd8686_v9.bin
+lib/firmware/libertas/sd8686_v9_helper.bin
+lib/firmware/libertas/sd8688.bin
+lib/firmware/libertas/sd8688_helper.bin
+lib/firmware/libertas/usb8388_v5.bin
+lib/firmware/libertas/usb8388_v9.bin
+lib/firmware/libertas/usb8682.bin
+#lib/firmware/matrox
+lib/firmware/matrox/g200_warp.fw
+lib/firmware/matrox/g400_warp.fw
+lib/firmware/mts_cdma.fw
+lib/firmware/mts_edge.fw
+lib/firmware/mts_gsm.fw
+#lib/firmware/mwl8k
+lib/firmware/mwl8k/fmimage_8687.fw
+lib/firmware/mwl8k/helper_8687.fw
+#lib/firmware/myricom
+lib/firmware/myricom/lanai.bin
+#lib/firmware/ositech
+lib/firmware/ositech/Xilinx7OD.bin
+lib/firmware/ql2100_fw.bin
+lib/firmware/ql2200_fw.bin
+lib/firmware/ql2300_fw.bin
+lib/firmware/ql2322_fw.bin
+lib/firmware/ql2400_fw.bin
+lib/firmware/ql2500_fw.bin
+#lib/firmware/qlogic
+lib/firmware/qlogic/1040.bin
+lib/firmware/qlogic/12160.bin
+lib/firmware/qlogic/1280.bin
+lib/firmware/qlogic/isp1000.bin
+#lib/firmware/r128
+lib/firmware/r128/r128_cce.bin
+#lib/firmware/radeon
+lib/firmware/radeon/R100_cp.bin
+lib/firmware/radeon/R200_cp.bin
+lib/firmware/radeon/R300_cp.bin
+lib/firmware/radeon/R420_cp.bin
+lib/firmware/radeon/R520_cp.bin
+lib/firmware/radeon/R600_me.bin
+lib/firmware/radeon/R600_pfp.bin
+lib/firmware/radeon/R600_rlc.bin
+lib/firmware/radeon/R700_rlc.bin
+lib/firmware/radeon/RS600_cp.bin
+lib/firmware/radeon/RS690_cp.bin
+lib/firmware/radeon/RS780_me.bin
+lib/firmware/radeon/RS780_pfp.bin
+lib/firmware/radeon/RV610_me.bin
+lib/firmware/radeon/RV610_pfp.bin
+lib/firmware/radeon/RV620_me.bin
+lib/firmware/radeon/RV620_pfp.bin
+lib/firmware/radeon/RV630_me.bin
+lib/firmware/radeon/RV630_pfp.bin
+lib/firmware/radeon/RV635_me.bin
+lib/firmware/radeon/RV635_pfp.bin
+lib/firmware/radeon/RV670_me.bin
+lib/firmware/radeon/RV670_pfp.bin
+lib/firmware/radeon/RV710_me.bin
+lib/firmware/radeon/RV710_pfp.bin
+lib/firmware/radeon/RV730_me.bin
+lib/firmware/radeon/RV730_pfp.bin
+lib/firmware/radeon/RV770_me.bin
+lib/firmware/radeon/RV770_pfp.bin
+lib/firmware/rt2561.bin
+lib/firmware/rt2561s.bin
+lib/firmware/rt2661.bin
+lib/firmware/rt2860.bin
+lib/firmware/rt2870.bin
+lib/firmware/rt73.bin
+lib/firmware/s2250.fw
+lib/firmware/s2250_loader.fw
 #lib/firmware/sb16
 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/slicoss
+lib/firmware/slicoss/gbdownload.sys
+lib/firmware/slicoss/gbrcvucode.sys
+lib/firmware/slicoss/oasisdbgdownload.sys
+lib/firmware/slicoss/oasisdownload.sys
+lib/firmware/slicoss/oasisrcvucode.sys
+#lib/firmware/sun
+lib/firmware/sun/cassini.bin
+#lib/firmware/sxg
+lib/firmware/sxg/saharadbgdownloadB.sys
+lib/firmware/sxg/saharadownloadB.sys
+#lib/firmware/tehuti
+lib/firmware/tehuti/bdx.bin
 lib/firmware/ti_3410.fw
 lib/firmware/ti_5052.fw
+#lib/firmware/tigon
+lib/firmware/tigon/tg3.bin
+lib/firmware/tigon/tg3_tso.bin
+lib/firmware/tigon/tg3_tso5.bin
 lib/firmware/tr_smctr.bin
 #lib/firmware/ttusb-budget
 lib/firmware/ttusb-budget/dspbootcode.bin
-lib/firmware/av7110/bootcode.bin
+#lib/firmware/usbdux
+#lib/firmware/usbdux/Makefile_dux
+#lib/firmware/usbdux/README.dux
+#lib/firmware/usbdux/fx2-include.asm
+#lib/firmware/usbdux/usbdux_firmware.asm
+#lib/firmware/usbdux/usbduxfast_firmware.asm
+lib/firmware/usbdux_firmware.bin
+lib/firmware/usbduxfast_firmware.bin
+lib/firmware/v4l-cx231xx-avcore-01.fw
+lib/firmware/v4l-cx23418-apu.fw
+lib/firmware/v4l-cx23418-cpu.fw
+lib/firmware/v4l-cx23418-dig.fw
+lib/firmware/v4l-cx23885-avcore-01.fw
+lib/firmware/v4l-cx23885-enc.fw
+lib/firmware/v4l-cx25840.fw
 #lib/firmware/vicam
 lib/firmware/vicam/firmware.fw
 lib/firmware/whiteheat.fw
 lib/firmware/whiteheat_loader.fw
+#lib/firmware/yam
+lib/firmware/yam/1200.bin
+lib/firmware/yam/9600.bin
 #lib/firmware/yamaha
 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/firmware/bnx2/bnx2-mips-06-5.0.0.j6.fw
+lib/firmware/bnx2/bnx2-mips-09-5.0.0.j9.fw
+lib/firmware/bnx2/bnx2-rv2p-09-5.0.0.j10.fw
+lib/firmware/bnx2/bnx2-rv2p-09ax-5.0.0.j10.fw
+lib/firmware/bnx2x-e1-5.0.21.0.fw
+lib/firmware/bnx2x-e1-5.2.13.0.fw
+lib/firmware/bnx2x-e1h-5.0.21.0.fw
+lib/firmware/bnx2x-e1h-5.2.13.0.fw

diff --git a/config/rootfiles/common/mtools b/config/rootfiles/common/mtools
index 9de61c4be44255b2bdf9754877be18a7f1a5ccdd..d4c5421799e24cb154d08dba8cb51f6269d32840 100644 (file)
--- a/config/rootfiles/common/mtools
+++ b/config/rootfiles/common/mtools
@@ -23,7 +23,7 @@
 #usr/bin/mrd
 #usr/bin/mren
 #usr/bin/mshowfat
-#usr/bin/mtools
+usr/bin/mtools
 #usr/bin/mtoolstest
 #usr/bin/mtype
 #usr/bin/mxtar

diff --git a/config/rootfiles/common/openswan b/config/rootfiles/common/openswan
deleted file mode 100644 (file)
index 378792a..0000000
--- a/config/rootfiles/common/openswan
+++ /dev/null
@@ -1,304 +0,0 @@
-etc/ipsec.conf
-#etc/ipsec.d
-etc/ipsec.d/aacerts
-etc/ipsec.d/cacerts
-etc/ipsec.d/certs
-etc/ipsec.d/crls
-#etc/ipsec.d/examples
-#etc/ipsec.d/examples/hub-spoke.conf
-#etc/ipsec.d/examples/ipv6.conf
-#etc/ipsec.d/examples/l2tp-cert.conf
-#etc/ipsec.d/examples/l2tp-psk.conf
-#etc/ipsec.d/examples/linux-linux.conf
-#etc/ipsec.d/examples/oe-exclude-dns.conf
-#etc/ipsec.d/examples/sysctl.conf
-#etc/ipsec.d/examples/xauth.conf
-etc/ipsec.d/ocspcerts
-etc/ipsec.d/policies
-#etc/ipsec.d/policies/block
-#etc/ipsec.d/policies/clear
-#etc/ipsec.d/policies/clear-or-private
-#etc/ipsec.d/policies/private
-#etc/ipsec.d/policies/private-or-clear
-etc/ipsec.d/private
-etc/ipsec.secrets
-#etc/rc.d/init.d/ipsec.old
-#etc/rc.d/rc0.d/K76ipsec
-#etc/rc.d/rc1.d
-#etc/rc.d/rc1.d/K76ipsec
-#etc/rc.d/rc2.d
-#etc/rc.d/rc2.d/S47ipsec
-#etc/rc.d/rc3.d/S47ipsec
-#etc/rc.d/rc4.d
-#etc/rc.d/rc4.d/S47ipsec
-#etc/rc.d/rc5.d
-#etc/rc.d/rc5.d/S47ipsec
-#etc/rc.d/rc6.d/K76ipsec
-usr/lib/ipsec
-#usr/lib/ipsec/_confread
-#usr/lib/ipsec/_copyright
-#usr/lib/ipsec/_include
-#usr/lib/ipsec/_keycensor
-#usr/lib/ipsec/_plutoload
-#usr/lib/ipsec/_plutorun
-#usr/lib/ipsec/_realsetup
-#usr/lib/ipsec/_secretcensor
-#usr/lib/ipsec/_startklips
-#usr/lib/ipsec/_startklips.old
-#usr/lib/ipsec/_startnetkey
-#usr/lib/ipsec/_updown
-#usr/lib/ipsec/_updown.klips
-#usr/lib/ipsec/_updown.klips.old
-#usr/lib/ipsec/_updown.klips~
-#usr/lib/ipsec/_updown.mast
-#usr/lib/ipsec/_updown.mast.old
-#usr/lib/ipsec/_updown.netkey
-usr/libexec/ipsec
-#usr/libexec/ipsec/_pluto_adns
-#usr/libexec/ipsec/addconn
-#usr/libexec/ipsec/auto
-#usr/libexec/ipsec/barf
-#usr/libexec/ipsec/eroute
-#usr/libexec/ipsec/ikeping
-#usr/libexec/ipsec/klipsdebug
-#usr/libexec/ipsec/look
-#usr/libexec/ipsec/newhostkey
-#usr/libexec/ipsec/pf_key
-#usr/libexec/ipsec/pluto
-#usr/libexec/ipsec/ranbits
-#usr/libexec/ipsec/rsasigkey
-#usr/libexec/ipsec/secrets
-#usr/libexec/ipsec/setup
-#usr/libexec/ipsec/showdefaults
-#usr/libexec/ipsec/showhostkey
-#usr/libexec/ipsec/showpolicy
-#usr/libexec/ipsec/spi
-#usr/libexec/ipsec/spigrp
-#usr/libexec/ipsec/tncfg
-#usr/libexec/ipsec/verify
-#usr/libexec/ipsec/whack
-#usr/man/man3/ipsec_addrbytesof.3
-#usr/man/man3/ipsec_addrbytesptr.3
-#usr/man/man3/ipsec_addrcmp.3
-#usr/man/man3/ipsec_addrinsubnet.3
-#usr/man/man3/ipsec_addrlenof.3
-#usr/man/man3/ipsec_addrtoa.3
-#usr/man/man3/ipsec_addrtosubnet.3
-#usr/man/man3/ipsec_addrtot.3
-#usr/man/man3/ipsec_addrtypeof.3
-#usr/man/man3/ipsec_anyaddr.3
-#usr/man/man3/ipsec_atoaddr.3
-#usr/man/man3/ipsec_atoasr.3
-#usr/man/man3/ipsec_atosubnet.3
-#usr/man/man3/ipsec_atoul.3
-#usr/man/man3/ipsec_bitstomask.3
-#usr/man/man3/ipsec_broadcastof.3
-#usr/man/man3/ipsec_copyright_notice.3
-#usr/man/man3/ipsec_goodmask.3
-#usr/man/man3/ipsec_hostof.3
-#usr/man/man3/ipsec_initaddr.3
-#usr/man/man3/ipsec_initsaid.3
-#usr/man/man3/ipsec_initsubnet.3
-#usr/man/man3/ipsec_isanyaddr.3
-#usr/man/man3/ipsec_isloopbackaddr.3
-#usr/man/man3/ipsec_isunspecaddr.3
-#usr/man/man3/ipsec_loopbackaddr.3
-#usr/man/man3/ipsec_maskof.3
-#usr/man/man3/ipsec_masktobits.3
-#usr/man/man3/ipsec_masktocount.3
-#usr/man/man3/ipsec_networkof.3
-#usr/man/man3/ipsec_optionsfrom.3
-#usr/man/man3/ipsec_portof.3
-#usr/man/man3/ipsec_rangetoa.3
-#usr/man/man3/ipsec_rangetosubnet.3
-#usr/man/man3/ipsec_sameaddr.3
-#usr/man/man3/ipsec_sameaddrtype.3
-#usr/man/man3/ipsec_samesaid.3
-#usr/man/man3/ipsec_samesubnet.3
-#usr/man/man3/ipsec_samesubnettype.3
-#usr/man/man3/ipsec_satot.3
-#usr/man/man3/ipsec_setportof.3
-#usr/man/man3/ipsec_sockaddrlenof.3
-#usr/man/man3/ipsec_sockaddrof.3
-#usr/man/man3/ipsec_subnetinsubnet.3
-#usr/man/man3/ipsec_subnetishost.3
-#usr/man/man3/ipsec_subnetof.3
-#usr/man/man3/ipsec_subnettoa.3
-#usr/man/man3/ipsec_subnettot.3
-#usr/man/man3/ipsec_subnettypeof.3
-#usr/man/man3/ipsec_tnatoaddr.3
-#usr/man/man3/ipsec_ttoaddr.3
-#usr/man/man3/ipsec_ttodata.3
-#usr/man/man3/ipsec_ttosa.3
-#usr/man/man3/ipsec_ttosubnet.3
-#usr/man/man3/ipsec_ttoul.3
-#usr/man/man3/ipsec_unspecaddr.3
-#usr/man/man3/ipsec_version.3
-#usr/man/man3/ipsec_version_code.3
-#usr/man/man3/ipsec_version_string.3
-#usr/man/man5/ipsec_eroute.5
-#usr/man/man5/ipsec_klipsdebug.5
-#usr/man/man5/ipsec_showpolicy.8
-#usr/man/man5/ipsec_spi.5
-#usr/man/man5/ipsec_spigrp.5
-#usr/man/man5/ipsec_tncfg.5
-#usr/man/man5/ipsec_trap_count.5
-#usr/man/man5/ipsec_trap_sendcount.5
-#usr/man/man5/ipsec_version.5
-#usr/man/man5/pf_key.5
-#usr/man/man8/ipsec.8
-#usr/man/man8/ipsec__copyright.8
-#usr/man/man8/ipsec__include.8
-#usr/man/man8/ipsec__keycensor.8
-#usr/man/man8/ipsec__plutoload.8
-#usr/man/man8/ipsec__plutorun.8
-#usr/man/man8/ipsec__realsetup.8
-#usr/man/man8/ipsec__secretcensor.8
-#usr/man/man8/ipsec__startklips.8
-#usr/man/man8/ipsec__startnetkey.8
-#usr/man/man8/ipsec__updown.8
-#usr/man/man8/ipsec__updown.klips.8
-#usr/man/man8/ipsec__updown.mast.8
-#usr/man/man8/ipsec__updown.netkey.8
-#usr/man/man8/ipsec_addconn.8
-#usr/man/man8/ipsec_auto.8
-#usr/man/man8/ipsec_barf.8
-#usr/man/man8/ipsec_eroute.8
-#usr/man/man8/ipsec_ikeping.8
-#usr/man/man8/ipsec_klipsdebug.8
-#usr/man/man8/ipsec_look.8
-#usr/man/man8/ipsec_newhostkey.8
-#usr/man/man8/ipsec_pf_key.8
-#usr/man/man8/ipsec_ranbits.8
-#usr/man/man8/ipsec_rsasigkey.8
-#usr/man/man8/ipsec_secrets.8
-#usr/man/man8/ipsec_setup.8
-#usr/man/man8/ipsec_showdefaults.8
-#usr/man/man8/ipsec_showhostkey.8
-#usr/man/man8/ipsec_showpolicy.8
-#usr/man/man8/ipsec_spi.8
-#usr/man/man8/ipsec_spigrp.8
-#usr/man/man8/ipsec_tncfg.8
-#usr/man/man8/ipsec_verify.8
-usr/sbin/ipsec
-#usr/share/doc/openswan
-#usr/share/doc/openswan/index.html
-#usr/share/doc/openswan/ipsec.8.html
-#usr/share/doc/openswan/ipsec.conf-sample
-#usr/share/doc/openswan/ipsec.secrets.5.html
-#usr/share/doc/openswan/ipsec__confread.8.html
-#usr/share/doc/openswan/ipsec__copyright.8.html
-#usr/share/doc/openswan/ipsec__include.8.html
-#usr/share/doc/openswan/ipsec__keycensor.8.html
-#usr/share/doc/openswan/ipsec__plutoload.8.html
-#usr/share/doc/openswan/ipsec__plutorun.8.html
-#usr/share/doc/openswan/ipsec__realsetup.8.html
-#usr/share/doc/openswan/ipsec__secretcensor.8.html
-#usr/share/doc/openswan/ipsec__startklips.8.html
-#usr/share/doc/openswan/ipsec__startnetkey.8.html
-#usr/share/doc/openswan/ipsec__updown.8.html
-#usr/share/doc/openswan/ipsec__updown.klips.8.html
-#usr/share/doc/openswan/ipsec__updown.mast.8.html
-#usr/share/doc/openswan/ipsec__updown.netkey.8.html
-#usr/share/doc/openswan/ipsec_addconn.8.html
-#usr/share/doc/openswan/ipsec_addrbytesof.3.html
-#usr/share/doc/openswan/ipsec_addrbytesptr.3.html
-#usr/share/doc/openswan/ipsec_addrcmp.3.html
-#usr/share/doc/openswan/ipsec_addrinsubnet.3.html
-#usr/share/doc/openswan/ipsec_addrlenof.3.html
-#usr/share/doc/openswan/ipsec_addrtoa.3.html
-#usr/share/doc/openswan/ipsec_addrtosubnet.3.html
-#usr/share/doc/openswan/ipsec_addrtot.3.html
-#usr/share/doc/openswan/ipsec_addrtypeof.3.html
-#usr/share/doc/openswan/ipsec_anyaddr.3.html
-#usr/share/doc/openswan/ipsec_atoaddr.3.html
-#usr/share/doc/openswan/ipsec_atoasr.3.html
-#usr/share/doc/openswan/ipsec_atosubnet.3.html
-#usr/share/doc/openswan/ipsec_atoul.3.html
-#usr/share/doc/openswan/ipsec_auto.8.html
-#usr/share/doc/openswan/ipsec_barf.8.html
-#usr/share/doc/openswan/ipsec_bitstomask.3.html
-#usr/share/doc/openswan/ipsec_broadcastof.3.html
-#usr/share/doc/openswan/ipsec_copyright_notice.3.html
-#usr/share/doc/openswan/ipsec_eroute.5.html
-#usr/share/doc/openswan/ipsec_eroute.8.html
-#usr/share/doc/openswan/ipsec_goodmask.3.html
-#usr/share/doc/openswan/ipsec_hostof.3.html
-#usr/share/doc/openswan/ipsec_ikeping.8.html
-#usr/share/doc/openswan/ipsec_initaddr.3.html
-#usr/share/doc/openswan/ipsec_initsaid.3.html
-#usr/share/doc/openswan/ipsec_initsubnet.3.html
-#usr/share/doc/openswan/ipsec_isanyaddr.3.html
-#usr/share/doc/openswan/ipsec_isloopbackaddr.3.html
-#usr/share/doc/openswan/ipsec_isunspecaddr.3.html
-#usr/share/doc/openswan/ipsec_keyblobtoid.3.html
-#usr/share/doc/openswan/ipsec_klipsdebug.5.html
-#usr/share/doc/openswan/ipsec_klipsdebug.8.html
-#usr/share/doc/openswan/ipsec_livetest.8.html
-#usr/share/doc/openswan/ipsec_look.8.html
-#usr/share/doc/openswan/ipsec_loopbackaddr.3.html
-#usr/share/doc/openswan/ipsec_lwdnsq.8.html
-#usr/share/doc/openswan/ipsec_mailkey.8.html
-#usr/share/doc/openswan/ipsec_manual.8.html
-#usr/share/doc/openswan/ipsec_maskof.3.html
-#usr/share/doc/openswan/ipsec_masktobits.3.html
-#usr/share/doc/openswan/ipsec_masktocount.3.html
-#usr/share/doc/openswan/ipsec_networkof.3.html
-#usr/share/doc/openswan/ipsec_newhostkey.8.html
-#usr/share/doc/openswan/ipsec_optionsfrom.3.html
-#usr/share/doc/openswan/ipsec_pf_key.5.html
-#usr/share/doc/openswan/ipsec_pf_key.8.html
-#usr/share/doc/openswan/ipsec_pluto.8.html
-#usr/share/doc/openswan/ipsec_portof.3.html
-#usr/share/doc/openswan/ipsec_prng.3.html
-#usr/share/doc/openswan/ipsec_prng_bytes.3.html
-#usr/share/doc/openswan/ipsec_prng_final.3.html
-#usr/share/doc/openswan/ipsec_prng_init.3.html
-#usr/share/doc/openswan/ipsec_ranbits.8.html
-#usr/share/doc/openswan/ipsec_rangetoa.3.html
-#usr/share/doc/openswan/ipsec_rangetosubnet.3.html
-#usr/share/doc/openswan/ipsec_readwriteconf.8.html
-#usr/share/doc/openswan/ipsec_rsasigkey.8.html
-#usr/share/doc/openswan/ipsec_sameaddr.3.html
-#usr/share/doc/openswan/ipsec_sameaddrtype.3.html
-#usr/share/doc/openswan/ipsec_samesaid.3.html
-#usr/share/doc/openswan/ipsec_samesubnet.3.html
-#usr/share/doc/openswan/ipsec_samesubnettype.3.html
-#usr/share/doc/openswan/ipsec_satot.3.html
-#usr/share/doc/openswan/ipsec_secrets.8.html
-#usr/share/doc/openswan/ipsec_set_policy.3.html
-#usr/share/doc/openswan/ipsec_setportof.3.html
-#usr/share/doc/openswan/ipsec_setup.8.html
-#usr/share/doc/openswan/ipsec_showdefaults.8.html
-#usr/share/doc/openswan/ipsec_showhostkey.8.html
-#usr/share/doc/openswan/ipsec_showpolicy.8.html
-#usr/share/doc/openswan/ipsec_sockaddrlenof.3.html
-#usr/share/doc/openswan/ipsec_sockaddrof.3.html
-#usr/share/doc/openswan/ipsec_spi.5.html
-#usr/share/doc/openswan/ipsec_spi.8.html
-#usr/share/doc/openswan/ipsec_spigrp.5.html
-#usr/share/doc/openswan/ipsec_spigrp.8.html
-#usr/share/doc/openswan/ipsec_strerror.3.html
-#usr/share/doc/openswan/ipsec_subnetinsubnet.3.html
-#usr/share/doc/openswan/ipsec_subnetishost.3.html
-#usr/share/doc/openswan/ipsec_subnetof.3.html
-#usr/share/doc/openswan/ipsec_subnettoa.3.html
-#usr/share/doc/openswan/ipsec_subnettot.3.html
-#usr/share/doc/openswan/ipsec_subnettypeof.3.html
-#usr/share/doc/openswan/ipsec_tnatoaddr.3.html
-#usr/share/doc/openswan/ipsec_tncfg.5.html
-#usr/share/doc/openswan/ipsec_tncfg.8.html
-#usr/share/doc/openswan/ipsec_trap_count.5.html
-#usr/share/doc/openswan/ipsec_trap_sendcount.5.html
-#usr/share/doc/openswan/ipsec_ttoaddr.3.html
-#usr/share/doc/openswan/ipsec_ttodata.3.html
-#usr/share/doc/openswan/ipsec_ttosa.3.html
-#usr/share/doc/openswan/ipsec_ttosubnet.3.html
-#usr/share/doc/openswan/ipsec_ttoul.3.html
-#usr/share/doc/openswan/ipsec_unspecaddr.3.html
-#usr/share/doc/openswan/ipsec_verify.8.html
-#usr/share/doc/openswan/ipsec_version.3.html
-#usr/share/doc/openswan/ipsec_version.5.html
-#usr/share/doc/openswan/ipsec_version_code.3.html
-#usr/share/doc/openswan/ipsec_version_string.3.html
-var/run/pluto

diff --git a/config/rootfiles/common/reiser4progs b/config/rootfiles/common/reiser4progs
index 668e70922624351552c5354e4f18d2fa95f9e8be..e01e4f8b86dbad427e60a6ec7cb347c44098140f 100644 (file)
--- a/config/rootfiles/common/reiser4progs
+++ b/config/rootfiles/common/reiser4progs
@@ -40,7 +40,6 @@ sbin/mkfs.reiser4
 #usr/include/repair/format.h
 #usr/include/repair/item.h
 #usr/include/repair/journal.h
-#usr/include/repair/key.h
 #usr/include/repair/librepair.h
 #usr/include/repair/lost_found.h
 #usr/include/repair/master.h
@@ -49,26 +48,28 @@ sbin/mkfs.reiser4
 #usr/include/repair/oid.h
 #usr/include/repair/place.h
 #usr/include/repair/plugin.h
+#usr/include/repair/pset.h
 #usr/include/repair/repair.h
 #usr/include/repair/semantic.h
 #usr/include/repair/status.h
 #usr/include/repair/tree.h
 #usr/include/repair/twig_scan.h
-usr/lib/libreiser4-1.0.so.5
-usr/lib/libreiser4-1.0.so.5.0.0
-usr/lib/libreiser4-minimal-1.0.so.5
-usr/lib/libreiser4-minimal-1.0.so.5.0.0
+usr/lib/libreiser4-1.0.so.6
+usr/lib/libreiser4-1.0.so.6.0.0
+usr/lib/libreiser4-minimal-1.0.so.6
+usr/lib/libreiser4-minimal-1.0.so.6.0.0
 #usr/lib/libreiser4-minimal.a
 #usr/lib/libreiser4-minimal.la
 usr/lib/libreiser4-minimal.so
 #usr/lib/libreiser4.a
 #usr/lib/libreiser4.la
 usr/lib/libreiser4.so
-usr/lib/librepair-1.0.so.5
-usr/lib/librepair-1.0.so.5.0.0
+usr/lib/librepair-1.0.so.6
+usr/lib/librepair-1.0.so.6.0.0
 #usr/lib/librepair.a
 #usr/lib/librepair.la
 usr/lib/librepair.so
+#usr/man/man8
 #usr/man/man8/debugfs.reiser4.8
 #usr/man/man8/fsck.reiser4.8
 #usr/man/man8/measurefs.reiser4.8

diff --git a/config/rootfiles/common/reiserfsprogs b/config/rootfiles/common/reiserfsprogs
index 266c423f42c13472674d2f0c4eba9bb4675e1bf6..f5cfca2feaa4a4b38eae2e8150c4113aeb01c934 100644 (file)
--- a/config/rootfiles/common/reiserfsprogs
+++ b/config/rootfiles/common/reiserfsprogs
@@ -5,8 +5,8 @@ sbin/mkreiserfs
 sbin/reiserfsck
 sbin/reiserfstune
 sbin/resize_reiserfs
-#usr/man/man8/debugreiserfs.8
-#usr/man/man8/mkreiserfs.8
-#usr/man/man8/reiserfsck.8
-#usr/man/man8/reiserfstune.8
-#usr/man/man8/resize_reiserfs.8
+#usr/share/man/man8/debugreiserfs.8
+#usr/share/man/man8/mkreiserfs.8
+#usr/share/man/man8/reiserfsck.8
+#usr/share/man/man8/reiserfstune.8
+#usr/share/man/man8/resize_reiserfs.8

diff --git a/config/rootfiles/common/rrdtool b/config/rootfiles/common/rrdtool
index c57a8ca78850fd16549fcec87036a768aa6e3dbc..b895ac3f191d320d870a7f5190a7c49c807d18bb 100644 (file)
--- a/config/rootfiles/common/rrdtool
+++ b/config/rootfiles/common/rrdtool
@@ -6,12 +6,21 @@ usr/bin/rrdupdate
 #usr/lib/librrd.la
 usr/lib/librrd.so
 usr/lib/librrd.so.2
-usr/lib/librrd.so.2.0.8
+usr/lib/librrd.so.2.0.15
 #usr/lib/librrd_th.a
 #usr/lib/librrd_th.la
 usr/lib/librrd_th.so
 usr/lib/librrd_th.so.2
-usr/lib/librrd_th.so.2.0.8
+usr/lib/librrd_th.so.2.0.13
+usr/lib/perl5/site_perl/5.8.8/RRDp.pm
+usr/lib/perl5/site_perl/5.8.8/i586-linux/RRDs.pm
+#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/RRDp
+#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/RRDp/.packlist
+#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/RRDs
+#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/RRDs/.packlist
+usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/RRDs/RRDs.bs
+usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/RRDs/RRDs.so
+usr/lib/perl5/site_perl/5.8.8/i586-linux/ntmake.pl
 #usr/share/man/man1/bin_dec_hex.1
 #usr/share/man/man1/cdeftutorial.1
 #usr/share/man/man1/rpntutorial.1
@@ -29,6 +38,7 @@ usr/lib/librrd_th.so.2.0.8
 #usr/share/man/man1/rrdgraph_rpn.1
 #usr/share/man/man1/rrdinfo.1
 #usr/share/man/man1/rrdlast.1
+#usr/share/man/man1/rrdlastupdate.1
 #usr/share/man/man1/rrdresize.1
 #usr/share/man/man1/rrdrestore.1
 #usr/share/man/man1/rrdthreads.1
@@ -39,114 +49,105 @@ usr/lib/librrd_th.so.2.0.8
 #usr/share/man/man1/rrdxport.1
 #usr/share/man/man3/RRDp.3
 #usr/share/man/man3/RRDs.3
-#usr/share/rrdtool-1.2.15
-#usr/share/rrdtool-1.2.15/include
-#usr/share/rrdtool-1.2.15/include/rrd.h
-usr/lib/perl5/site_perl/5.8.8/RRDp.pm
-usr/lib/perl5/site_perl/5.8.8/i586-linux/RRDs.pm
-#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/RRDp
-#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/RRDp/.packlist
-#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/RRDs
-#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/RRDs/.packlist
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/RRDs/RRDs.bs
-usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/RRDs/RRDs.so
-usr/lib/perl5/site_perl/5.8.8/i586-linux/ntmake.pl
-#usr/share/rrdtool-1.2.15/share
-#usr/share/rrdtool-1.2.15/share/doc
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/html
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/html/RRDp.html
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/html/RRDs.html
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/html/bin_dec_hex.html
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/html/cdeftutorial.html
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/html/index.html
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/html/rpntutorial.html
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/html/rrd-beginners.html
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/html/rrdbuild.html
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/html/rrdcgi.html
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/html/rrdcreate.html
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/html/rrddump.html
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/html/rrdfetch.html
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/html/rrdfirst.html
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/html/rrdgraph.html
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/html/rrdgraph_data.html
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/html/rrdgraph_examples.html
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/html/rrdgraph_graph.html
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/html/rrdgraph_rpn.html
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/html/rrdinfo.html
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/html/rrdlast.html
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/html/rrdresize.html
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/html/rrdrestore.html
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/html/rrdthreads.html
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/html/rrdtool.html
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/html/rrdtune.html
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/html/rrdtutorial.html
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/html/rrdupdate.html
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/html/rrdxport.html
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/bin_dec_hex.pod
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/bin_dec_hex.txt
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/cdeftutorial.pod
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/cdeftutorial.txt
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rpntutorial.pod
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rpntutorial.txt
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrd-beginners.pod
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrd-beginners.txt
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdbuild.pod
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdbuild.txt
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdcgi.pod
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdcgi.txt
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdcreate.pod
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdcreate.txt
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrddump.pod
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrddump.txt
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdfetch.pod
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdfetch.txt
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdfirst.pod
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdfirst.txt
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdgraph.pod
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdgraph.txt
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdgraph_data.pod
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdgraph_data.txt
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdgraph_examples.pod
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdgraph_examples.txt
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdgraph_graph.pod
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdgraph_graph.txt
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdgraph_rpn.pod
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdgraph_rpn.txt
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdinfo.pod
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdinfo.txt
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdlast.pod
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdlast.txt
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdresize.pod
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdresize.txt
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdrestore.pod
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdrestore.txt
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdthreads.pod
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdthreads.txt
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdtool.pod
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdtool.txt
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdtune.pod
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdtune.txt
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdtutorial.pod
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdtutorial.txt
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdupdate.pod
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdupdate.txt
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdxport.pod
-#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdxport.txt
-#usr/share/rrdtool-1.2.15/share/man
-#usr/share/rrdtool-1.2.15/share/man/man3
-#usr/share/rrdtool-1.2.15/share/man/man3/RRDp.3
-#usr/share/rrdtool-1.2.15/share/man/man3/RRDs.3
-#usr/share/rrdtool-1.2.15/share/rrdtool
-#usr/share/rrdtool-1.2.15/share/rrdtool/examples
-#usr/share/rrdtool-1.2.15/share/rrdtool/examples/4charts.pl
-#usr/share/rrdtool-1.2.15/share/rrdtool/examples/bigtops.pl
-#usr/share/rrdtool-1.2.15/share/rrdtool/examples/cgi-demo.cgi
-#usr/share/rrdtool-1.2.15/share/rrdtool/examples/minmax.pl
-#usr/share/rrdtool-1.2.15/share/rrdtool/examples/piped-demo.pl
-#usr/share/rrdtool-1.2.15/share/rrdtool/examples/shared-demo.pl
-#usr/share/rrdtool-1.2.15/share/rrdtool/examples/stripes.pl
-#usr/share/rrdtool-1.2.15/share/rrdtool/fonts
-usr/share/rrdtool-1.2.15/share/rrdtool/fonts/DejaVuSansMono-Roman.ttf
+#usr/share/rrdtool-1.2.30
+#usr/share/rrdtool-1.2.30/include
+#usr/share/rrdtool-1.2.30/include/rrd.h
+#usr/share/rrdtool-1.2.30/share
+#usr/share/rrdtool-1.2.30/share/doc
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html/RRDp.html
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html/RRDs.html
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html/bin_dec_hex.html
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html/cdeftutorial.html
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html/index.html
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html/rpntutorial.html
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html/rrd-beginners.html
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html/rrdbuild.html
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html/rrdcgi.html
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html/rrdcreate.html
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html/rrddump.html
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html/rrdfetch.html
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html/rrdfirst.html
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html/rrdgraph.html
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html/rrdgraph_data.html
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html/rrdgraph_examples.html
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html/rrdgraph_graph.html
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html/rrdgraph_rpn.html
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html/rrdinfo.html
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html/rrdlast.html
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html/rrdlastupdate.html
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html/rrdresize.html
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html/rrdrestore.html
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html/rrdthreads.html
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html/rrdtool.html
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html/rrdtune.html
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html/rrdtutorial.html
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html/rrdupdate.html
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html/rrdxport.html
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/bin_dec_hex.pod
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/bin_dec_hex.txt
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/cdeftutorial.pod
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/cdeftutorial.txt
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rpntutorial.pod
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rpntutorial.txt
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrd-beginners.pod
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrd-beginners.txt
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdbuild.pod
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdbuild.txt
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdcgi.pod
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdcgi.txt
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdcreate.pod
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdcreate.txt
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrddump.pod
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrddump.txt
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdfetch.pod
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdfetch.txt
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdfirst.pod
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdfirst.txt
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdgraph.pod
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdgraph.txt
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdgraph_data.pod
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdgraph_data.txt
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdgraph_examples.pod
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdgraph_examples.txt
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdgraph_graph.pod
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdgraph_graph.txt
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdgraph_rpn.pod
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdgraph_rpn.txt
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdinfo.pod
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdinfo.txt
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdlast.pod
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdlast.txt
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdlastupdate.pod
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdlastupdate.txt
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdresize.pod
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdresize.txt
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdrestore.pod
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdrestore.txt
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdthreads.pod
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdthreads.txt
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdtool.pod
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdtool.txt
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdtune.pod
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdtune.txt
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdtutorial.pod
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdtutorial.txt
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdupdate.pod
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdupdate.txt
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdxport.pod
+#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdxport.txt
+#usr/share/rrdtool-1.2.30/share/rrdtool
+#usr/share/rrdtool-1.2.30/share/rrdtool/examples
+#usr/share/rrdtool-1.2.30/share/rrdtool/examples/4charts.pl
+#usr/share/rrdtool-1.2.30/share/rrdtool/examples/bigtops.pl
+#usr/share/rrdtool-1.2.30/share/rrdtool/examples/cgi-demo.cgi
+#usr/share/rrdtool-1.2.30/share/rrdtool/examples/minmax.pl
+#usr/share/rrdtool-1.2.30/share/rrdtool/examples/perftest.pl
+#usr/share/rrdtool-1.2.30/share/rrdtool/examples/piped-demo.pl
+#usr/share/rrdtool-1.2.30/share/rrdtool/examples/shared-demo.pl
+#usr/share/rrdtool-1.2.30/share/rrdtool/examples/stripes.pl
+#usr/share/rrdtool-1.2.30/share/rrdtool/fonts
+usr/share/rrdtool-1.2.30/share/rrdtool/fonts/DejaVuSansMono-Roman.ttf
 var/log/rrd

diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2
index 7702cf356c6a46eb9b57c5bc88ce88db9991581a..6a7a09972466bd25cdd2fb5c674ab757aa00e953 100644 (file)
--- a/config/rootfiles/common/stage2
+++ b/config/rootfiles/common/stage2
@@ -19,6 +19,7 @@ etc/ld.so.conf
 etc/logrotate.conf
 etc/mime.types
 etc/modprobe.d
+etc/modprobe.d/cfg80211
 etc/modules.conf
 etc/mtab
 etc/nsswitch.conf

diff --git a/config/rootfiles/common/strongswan b/config/rootfiles/common/strongswan
new file mode 100644 (file)
index 0000000..1130cc5
--- /dev/null
+++ b/config/rootfiles/common/strongswan
@@ -0,0 +1,123 @@
+etc/ipsec.conf
+#etc/ipsec.d
+etc/ipsec.d/aacerts
+etc/ipsec.d/acerts
+etc/ipsec.d/cacerts
+etc/ipsec.d/certs
+etc/ipsec.d/crls
+etc/ipsec.d/ocspcerts
+etc/ipsec.d/private
+etc/ipsec.d/reqs
+etc/ipsec.secrets
+etc/strongswan.conf
+#usr/lib/libstrongswan.a
+#usr/lib/libstrongswan.la
+usr/lib/libstrongswan.so
+usr/lib/libstrongswan.so.0
+usr/lib/libstrongswan.so.0.0.0
+#usr/libexec/ipsec
+usr/libexec/ipsec/_copyright
+usr/libexec/ipsec/_pluto_adns
+usr/libexec/ipsec/_updown
+usr/libexec/ipsec/_updown_espmark
+usr/libexec/ipsec/charon
+usr/libexec/ipsec/openac
+usr/libexec/ipsec/pki
+#usr/libexec/ipsec/plugins
+#usr/libexec/ipsec/plugins/libstrongswan-aes.a
+#usr/libexec/ipsec/plugins/libstrongswan-aes.la
+usr/libexec/ipsec/plugins/libstrongswan-aes.so
+#usr/libexec/ipsec/plugins/libstrongswan-attr.a
+#usr/libexec/ipsec/plugins/libstrongswan-attr.la
+usr/libexec/ipsec/plugins/libstrongswan-attr.so
+#usr/libexec/ipsec/plugins/libstrongswan-des.a
+#usr/libexec/ipsec/plugins/libstrongswan-des.la
+usr/libexec/ipsec/plugins/libstrongswan-des.so
+#usr/libexec/ipsec/plugins/libstrongswan-dnskey.a
+#usr/libexec/ipsec/plugins/libstrongswan-dnskey.la
+usr/libexec/ipsec/plugins/libstrongswan-dnskey.so
+#usr/libexec/ipsec/plugins/libstrongswan-fips-prf.a
+#usr/libexec/ipsec/plugins/libstrongswan-fips-prf.la
+usr/libexec/ipsec/plugins/libstrongswan-fips-prf.so
+#usr/libexec/ipsec/plugins/libstrongswan-gmp.a
+#usr/libexec/ipsec/plugins/libstrongswan-gmp.la
+usr/libexec/ipsec/plugins/libstrongswan-gmp.so
+#usr/libexec/ipsec/plugins/libstrongswan-hmac.a
+#usr/libexec/ipsec/plugins/libstrongswan-hmac.la
+usr/libexec/ipsec/plugins/libstrongswan-hmac.so
+#usr/libexec/ipsec/plugins/libstrongswan-kernel-netlink.a
+#usr/libexec/ipsec/plugins/libstrongswan-kernel-netlink.la
+usr/libexec/ipsec/plugins/libstrongswan-kernel-netlink.so
+#usr/libexec/ipsec/plugins/libstrongswan-md5.a
+#usr/libexec/ipsec/plugins/libstrongswan-md5.la
+usr/libexec/ipsec/plugins/libstrongswan-md5.so
+#usr/libexec/ipsec/plugins/libstrongswan-pem.a
+#usr/libexec/ipsec/plugins/libstrongswan-pem.la
+usr/libexec/ipsec/plugins/libstrongswan-pem.so
+#usr/libexec/ipsec/plugins/libstrongswan-pgp.a
+#usr/libexec/ipsec/plugins/libstrongswan-pgp.la
+usr/libexec/ipsec/plugins/libstrongswan-pgp.so
+#usr/libexec/ipsec/plugins/libstrongswan-pkcs1.a
+#usr/libexec/ipsec/plugins/libstrongswan-pkcs1.la
+usr/libexec/ipsec/plugins/libstrongswan-pkcs1.so
+#usr/libexec/ipsec/plugins/libstrongswan-pubkey.a
+#usr/libexec/ipsec/plugins/libstrongswan-pubkey.la
+usr/libexec/ipsec/plugins/libstrongswan-pubkey.so
+#usr/libexec/ipsec/plugins/libstrongswan-random.a
+#usr/libexec/ipsec/plugins/libstrongswan-random.la
+usr/libexec/ipsec/plugins/libstrongswan-random.so
+#usr/libexec/ipsec/plugins/libstrongswan-resolve.a
+#usr/libexec/ipsec/plugins/libstrongswan-resolve.la
+usr/libexec/ipsec/plugins/libstrongswan-resolve.so
+#usr/libexec/ipsec/plugins/libstrongswan-sha1.a
+#usr/libexec/ipsec/plugins/libstrongswan-sha1.la
+usr/libexec/ipsec/plugins/libstrongswan-sha1.so
+#usr/libexec/ipsec/plugins/libstrongswan-sha2.a
+#usr/libexec/ipsec/plugins/libstrongswan-sha2.la
+usr/libexec/ipsec/plugins/libstrongswan-sha2.so
+#usr/libexec/ipsec/plugins/libstrongswan-stroke.a
+#usr/libexec/ipsec/plugins/libstrongswan-stroke.la
+usr/libexec/ipsec/plugins/libstrongswan-stroke.so
+#usr/libexec/ipsec/plugins/libstrongswan-updown.a
+#usr/libexec/ipsec/plugins/libstrongswan-updown.la
+usr/libexec/ipsec/plugins/libstrongswan-updown.so
+#usr/libexec/ipsec/plugins/libstrongswan-x509.a
+#usr/libexec/ipsec/plugins/libstrongswan-x509.la
+usr/libexec/ipsec/plugins/libstrongswan-x509.so
+#usr/libexec/ipsec/plugins/libstrongswan-xcbc.a
+#usr/libexec/ipsec/plugins/libstrongswan-xcbc.la
+usr/libexec/ipsec/plugins/libstrongswan-xcbc.so
+usr/libexec/ipsec/pluto
+usr/libexec/ipsec/scepclient
+usr/libexec/ipsec/starter
+usr/libexec/ipsec/stroke
+usr/libexec/ipsec/whack
+usr/sbin/ipsec
+#usr/share/man/man3/anyaddr.3
+#usr/share/man/man3/atoaddr.3
+#usr/share/man/man3/atoasr.3
+#usr/share/man/man3/atosa.3
+#usr/share/man/man3/atoul.3
+#usr/share/man/man3/goodmask.3
+#usr/share/man/man3/initaddr.3
+#usr/share/man/man3/initsubnet.3
+#usr/share/man/man3/keyblobtoid.3
+#usr/share/man/man3/portof.3
+#usr/share/man/man3/prng.3
+#usr/share/man/man3/rangetosubnet.3
+#usr/share/man/man3/sameaddr.3
+#usr/share/man/man3/subnetof.3
+#usr/share/man/man3/ttoaddr.3
+#usr/share/man/man3/ttodata.3
+#usr/share/man/man3/ttosa.3
+#usr/share/man/man3/ttoul.3
+#usr/share/man/man5/ipsec.conf.5
+#usr/share/man/man5/ipsec.secrets.5
+#usr/share/man/man8/_copyright.8
+#usr/share/man/man8/_updown.8
+#usr/share/man/man8/_updown_espmark.8
+#usr/share/man/man8/ipsec.8
+#usr/share/man/man8/openac.8
+#usr/share/man/man8/pluto.8
+#usr/share/man/man8/scepclient.8
+#usr/share/man/man8/starter.8

diff --git a/config/rootfiles/common/uClibc b/config/rootfiles/common/uClibc
index b87e2cbeabb8e290462a9bead5c68ac2c3c05c53..cdce6aef188cf279eb7f56b030e6a3457f3f42e3 100644 (file)
--- a/config/rootfiles/common/uClibc
+++ b/config/rootfiles/common/uClibc
@@ -15,6 +15,9 @@
 #opt/i586-uClibc/include/arpa/telnet.h
 #opt/i586-uClibc/include/arpa/tftp.h
 #opt/i586-uClibc/include/asm
+#opt/i586-uClibc/include/asm-generic
+#opt/i586-uClibc/include/asm-generic/errno-base.h
+#opt/i586-uClibc/include/asm-generic/errno.h
 #opt/i586-uClibc/include/asm/8253pit.h
 #opt/i586-uClibc/include/asm/a.out.h
 #opt/i586-uClibc/include/asm/agp.h
@@ -54,10 +57,6 @@
 #opt/i586-uClibc/include/asm/irq.h
 #opt/i586-uClibc/include/asm/kdebug.h
 #opt/i586-uClibc/include/asm/kprobes.h
-#opt/i586-uClibc/include/asm/kvm.h
-#opt/i586-uClibc/include/asm/kvm_host.h
-#opt/i586-uClibc/include/asm/kvm_para.h
-#opt/i586-uClibc/include/asm/kvm_x86_emulate.h
 #opt/i586-uClibc/include/asm/ldt.h
 #opt/i586-uClibc/include/asm/linkage.h
 #opt/i586-uClibc/include/asm/mach-bigsmp
@@ -171,7 +170,6 @@
 #opt/i586-uClibc/include/asm/srat.h
 #opt/i586-uClibc/include/asm/stat.h
 #opt/i586-uClibc/include/asm/suspend.h
-#opt/i586-uClibc/include/asm/svm.h
 #opt/i586-uClibc/include/asm/system.h
 #opt/i586-uClibc/include/asm/termbits.h
 #opt/i586-uClibc/include/asm/termios.h
@@ -185,9 +183,7 @@
 #opt/i586-uClibc/include/asm/user.h
 #opt/i586-uClibc/include/asm/vga.h
 #opt/i586-uClibc/include/asm/vic.h
-#opt/i586-uClibc/include/asm/virtext.h
 #opt/i586-uClibc/include/asm/vm86.h
-#opt/i586-uClibc/include/asm/vmx.h
 #opt/i586-uClibc/include/asm/voyager.h
 #opt/i586-uClibc/include/assert.h
 #opt/i586-uClibc/include/atomic.h
@@ -403,6 +399,7 @@
 #opt/i586-uClibc/include/linux/cramfs_fs_sb.h
 #opt/i586-uClibc/include/linux/crc32.h
 #opt/i586-uClibc/include/linux/crypto.h
+#opt/i586-uClibc/include/linux/cryptodev.h
 #opt/i586-uClibc/include/linux/ctype.h
 #opt/i586-uClibc/include/linux/cuda.h
 #opt/i586-uClibc/include/linux/cyclades.h
@@ -597,10 +594,6 @@
 #opt/i586-uClibc/include/linux/kmalloc_sizes.h
 #opt/i586-uClibc/include/linux/kmod.h
 #opt/i586-uClibc/include/linux/kprobes.h
-#opt/i586-uClibc/include/linux/kvm.h
-#opt/i586-uClibc/include/linux/kvm_host.h
-#opt/i586-uClibc/include/linux/kvm_para.h
-#opt/i586-uClibc/include/linux/kvm_types.h
 #opt/i586-uClibc/include/linux/lapb.h
 #opt/i586-uClibc/include/linux/lcd.h
 #opt/i586-uClibc/include/linux/libata.h
@@ -672,17 +665,35 @@
 #opt/i586-uClibc/include/linux/netdevice.h
 #opt/i586-uClibc/include/linux/netfilter
 #opt/i586-uClibc/include/linux/netfilter.h
+#opt/i586-uClibc/include/linux/netfilter/Kbuild
+#opt/i586-uClibc/include/linux/netfilter/nf_conntrack_amanda.h
 #opt/i586-uClibc/include/linux/netfilter/nf_conntrack_common.h
-#opt/i586-uClibc/include/linux/netfilter/nf_conntrack_tuple.h
+#opt/i586-uClibc/include/linux/netfilter/nf_conntrack_dccp.h
+#opt/i586-uClibc/include/linux/netfilter/nf_conntrack_ftp.h
+#opt/i586-uClibc/include/linux/netfilter/nf_conntrack_h323.h
+#opt/i586-uClibc/include/linux/netfilter/nf_conntrack_h323_asn1.h
+#opt/i586-uClibc/include/linux/netfilter/nf_conntrack_h323_types.h
+#opt/i586-uClibc/include/linux/netfilter/nf_conntrack_irc.h
+#opt/i586-uClibc/include/linux/netfilter/nf_conntrack_pptp.h
+#opt/i586-uClibc/include/linux/netfilter/nf_conntrack_proto_gre.h
+#opt/i586-uClibc/include/linux/netfilter/nf_conntrack_sane.h
+#opt/i586-uClibc/include/linux/netfilter/nf_conntrack_sctp.h
+#opt/i586-uClibc/include/linux/netfilter/nf_conntrack_sip.h
+#opt/i586-uClibc/include/linux/netfilter/nf_conntrack_tcp.h
+#opt/i586-uClibc/include/linux/netfilter/nf_conntrack_tftp.h
 #opt/i586-uClibc/include/linux/netfilter/nf_conntrack_tuple_common.h
-#opt/i586-uClibc/include/linux/netfilter/nf_nat.h
 #opt/i586-uClibc/include/linux/netfilter/nfnetlink.h
 #opt/i586-uClibc/include/linux/netfilter/nfnetlink_compat.h
+#opt/i586-uClibc/include/linux/netfilter/nfnetlink_conntrack.h
+#opt/i586-uClibc/include/linux/netfilter/nfnetlink_log.h
+#opt/i586-uClibc/include/linux/netfilter/nfnetlink_queue.h
 #opt/i586-uClibc/include/linux/netfilter/x_tables.h
 #opt/i586-uClibc/include/linux/netfilter/xt_CLASSIFY.h
 #opt/i586-uClibc/include/linux/netfilter/xt_CONNMARK.h
 #opt/i586-uClibc/include/linux/netfilter/xt_CONNSECMARK.h
 #opt/i586-uClibc/include/linux/netfilter/xt_DSCP.h
+#opt/i586-uClibc/include/linux/netfilter/xt_IMQ.h
+#opt/i586-uClibc/include/linux/netfilter/xt_LED.h
 #opt/i586-uClibc/include/linux/netfilter/xt_MARK.h
 #opt/i586-uClibc/include/linux/netfilter/xt_NFLOG.h
 #opt/i586-uClibc/include/linux/netfilter/xt_NFQUEUE.h
@@ -690,6 +701,8 @@
 #opt/i586-uClibc/include/linux/netfilter/xt_SECMARK.h
 #opt/i586-uClibc/include/linux/netfilter/xt_TCPMSS.h
 #opt/i586-uClibc/include/linux/netfilter/xt_TCPOPTSTRIP.h
+#opt/i586-uClibc/include/linux/netfilter/xt_TPROXY.h
+#opt/i586-uClibc/include/linux/netfilter/xt_cluster.h
 #opt/i586-uClibc/include/linux/netfilter/xt_comment.h
 #opt/i586-uClibc/include/linux/netfilter/xt_connbytes.h
 #opt/i586-uClibc/include/linux/netfilter/xt_connlimit.h
@@ -701,11 +714,13 @@
 #opt/i586-uClibc/include/linux/netfilter/xt_hashlimit.h
 #opt/i586-uClibc/include/linux/netfilter/xt_helper.h
 #opt/i586-uClibc/include/linux/netfilter/xt_iprange.h
+#opt/i586-uClibc/include/linux/netfilter/xt_layer7.h
 #opt/i586-uClibc/include/linux/netfilter/xt_length.h
 #opt/i586-uClibc/include/linux/netfilter/xt_limit.h
 #opt/i586-uClibc/include/linux/netfilter/xt_mac.h
 #opt/i586-uClibc/include/linux/netfilter/xt_mark.h
 #opt/i586-uClibc/include/linux/netfilter/xt_multiport.h
+#opt/i586-uClibc/include/linux/netfilter/xt_osf.h
 #opt/i586-uClibc/include/linux/netfilter/xt_owner.h
 #opt/i586-uClibc/include/linux/netfilter/xt_physdev.h
 #opt/i586-uClibc/include/linux/netfilter/xt_pkttype.h
@@ -713,7 +728,9 @@
 #opt/i586-uClibc/include/linux/netfilter/xt_quota.h
 #opt/i586-uClibc/include/linux/netfilter/xt_rateest.h
 #opt/i586-uClibc/include/linux/netfilter/xt_realm.h
+#opt/i586-uClibc/include/linux/netfilter/xt_recent.h
 #opt/i586-uClibc/include/linux/netfilter/xt_sctp.h
+#opt/i586-uClibc/include/linux/netfilter/xt_socket.h
 #opt/i586-uClibc/include/linux/netfilter/xt_state.h
 #opt/i586-uClibc/include/linux/netfilter/xt_statistic.h
 #opt/i586-uClibc/include/linux/netfilter/xt_string.h
@@ -764,30 +781,25 @@
 #opt/i586-uClibc/include/linux/netfilter_ipv4/ip_nat_protocol.h
 #opt/i586-uClibc/include/linux/netfilter_ipv4/ip_nat_rule.h
 #opt/i586-uClibc/include/linux/netfilter_ipv4/ip_queue.h
-#opt/i586-uClibc/include/linux/netfilter_ipv4/ip_set.h
 #opt/i586-uClibc/include/linux/netfilter_ipv4/ip_tables.h
 #opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_CLASSIFY.h
 #opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h
 #opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_CONNMARK.h
 #opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_DSCP.h
 #opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_ECN.h
-#opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_FTOS.h
 #opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_LOG.h
 #opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_MARK.h
 #opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_REJECT.h
 #opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_SAME.h
 #opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_TCPMSS.h
 #opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_TOS.h
-#opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_TTL.h
 #opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_ULOG.h
 #opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_addrtype.h
 #opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_ah.h
 #opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_comment.h
-#opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_connlimit.h
 #opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_connmark.h
 #opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_conntrack.h
 #opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_dscp.h
-#opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_dstlimit.h
 #opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_ecn.h
 #opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_esp.h
 #opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_hashlimit.h
@@ -801,12 +813,9 @@
 #opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_owner.h
 #opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_physdev.h
 #opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_pkttype.h
-#opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_policy.h
 #opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_realm.h
 #opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_recent.h
-#opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_rpc.h
 #opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_sctp.h
-#opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_set.h
 #opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_state.h
 #opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_tcpmss.h
 #opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_tos.h
@@ -816,11 +825,8 @@
 #opt/i586-uClibc/include/linux/netfilter_ipv6
 #opt/i586-uClibc/include/linux/netfilter_ipv6.h
 #opt/i586-uClibc/include/linux/netfilter_ipv6/ip6_tables.h
-#opt/i586-uClibc/include/linux/netfilter_ipv6/ip6t_HL.h
 #opt/i586-uClibc/include/linux/netfilter_ipv6/ip6t_LOG.h
 #opt/i586-uClibc/include/linux/netfilter_ipv6/ip6t_MARK.h
-#opt/i586-uClibc/include/linux/netfilter_ipv6/ip6t_REJECT.h
-#opt/i586-uClibc/include/linux/netfilter_ipv6/ip6t_TCPMSS.h
 #opt/i586-uClibc/include/linux/netfilter_ipv6/ip6t_ah.h
 #opt/i586-uClibc/include/linux/netfilter_ipv6/ip6t_esp.h
 #opt/i586-uClibc/include/linux/netfilter_ipv6/ip6t_frag.h
@@ -830,12 +836,10 @@
 #opt/i586-uClibc/include/linux/netfilter_ipv6/ip6t_limit.h
 #opt/i586-uClibc/include/linux/netfilter_ipv6/ip6t_mac.h
 #opt/i586-uClibc/include/linux/netfilter_ipv6/ip6t_mark.h
-#opt/i586-uClibc/include/linux/netfilter_ipv6/ip6t_mh.h
 #opt/i586-uClibc/include/linux/netfilter_ipv6/ip6t_multiport.h
 #opt/i586-uClibc/include/linux/netfilter_ipv6/ip6t_opts.h
 #opt/i586-uClibc/include/linux/netfilter_ipv6/ip6t_owner.h
 #opt/i586-uClibc/include/linux/netfilter_ipv6/ip6t_physdev.h
-#opt/i586-uClibc/include/linux/netfilter_ipv6/ip6t_policy.h
 #opt/i586-uClibc/include/linux/netfilter_ipv6/ip6t_rt.h
 #opt/i586-uClibc/include/linux/netlink.h
 #opt/i586-uClibc/include/linux/netrom.h

diff --git a/config/rootfiles/common/xz b/config/rootfiles/common/xz
new file mode 100644 (file)
index 0000000..ef419c5
--- /dev/null
+++ b/config/rootfiles/common/xz
@@ -0,0 +1,80 @@
+usr/bin/lzcat
+usr/bin/lzcmp
+usr/bin/lzdiff
+usr/bin/lzegrep
+usr/bin/lzfgrep
+usr/bin/lzgrep
+usr/bin/lzless
+usr/bin/lzma
+usr/bin/lzmadec
+usr/bin/lzmainfo
+usr/bin/lzmore
+usr/bin/unlzma
+usr/bin/unxz
+usr/bin/xz
+usr/bin/xzcat
+usr/bin/xzcmp
+usr/bin/xzdec
+usr/bin/xzdiff
+usr/bin/xzegrep
+usr/bin/xzfgrep
+usr/bin/xzgrep
+usr/bin/xzless
+usr/bin/xzmore
+#usr/include/lzma
+#usr/include/lzma.h
+#usr/include/lzma/base.h
+#usr/include/lzma/bcj.h
+#usr/include/lzma/block.h
+#usr/include/lzma/check.h
+#usr/include/lzma/container.h
+#usr/include/lzma/delta.h
+#usr/include/lzma/filter.h
+#usr/include/lzma/index.h
+#usr/include/lzma/index_hash.h
+#usr/include/lzma/lzma.h
+#usr/include/lzma/stream_flags.h
+#usr/include/lzma/subblock.h
+#usr/include/lzma/version.h
+#usr/include/lzma/vli.h
+#usr/lib/liblzma.a
+#usr/lib/liblzma.la
+usr/lib/liblzma.so
+usr/lib/liblzma.so.0
+usr/lib/liblzma.so.0.0.0
+#usr/lib/pkgconfig/liblzma.pc
+#usr/share/doc/xz
+#usr/share/doc/xz/AUTHORS
+#usr/share/doc/xz/COPYING
+#usr/share/doc/xz/COPYING.GPLv2
+#usr/share/doc/xz/NEWS
+#usr/share/doc/xz/README
+#usr/share/doc/xz/THANKS
+#usr/share/doc/xz/TODO
+#usr/share/doc/xz/faq.txt
+#usr/share/doc/xz/history.txt
+#usr/share/doc/xz/lzma-file-format.txt
+#usr/share/doc/xz/xz-file-format.txt
+#usr/share/man/man1/lzcat.1
+#usr/share/man/man1/lzcmp.1
+#usr/share/man/man1/lzdiff.1
+#usr/share/man/man1/lzegrep.1
+#usr/share/man/man1/lzfgrep.1
+#usr/share/man/man1/lzgrep.1
+#usr/share/man/man1/lzless.1
+#usr/share/man/man1/lzma.1
+#usr/share/man/man1/lzmadec.1
+#usr/share/man/man1/lzmainfo.1
+#usr/share/man/man1/lzmore.1
+#usr/share/man/man1/unlzma.1
+#usr/share/man/man1/unxz.1
+#usr/share/man/man1/xz.1
+#usr/share/man/man1/xzcat.1
+#usr/share/man/man1/xzcmp.1
+#usr/share/man/man1/xzdec.1
+#usr/share/man/man1/xzdiff.1
+#usr/share/man/man1/xzegrep.1
+#usr/share/man/man1/xzfgrep.1
+#usr/share/man/man1/xzgrep.1
+#usr/share/man/man1/xzless.1
+#usr/share/man/man1/xzmore.1

diff --git a/config/rootfiles/core/37/filelists/apache2 b/config/rootfiles/core/37/filelists/apache2
deleted file mode 120000 (symlink)
index eef95ef..0000000
--- a/config/rootfiles/core/37/filelists/apache2
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/apache2
\ No newline at end of file

diff --git a/config/rootfiles/core/37/filelists/eject b/config/rootfiles/core/37/filelists/eject
deleted file mode 120000 (symlink)
index c1c2d7b..0000000
--- a/config/rootfiles/core/37/filelists/eject
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/eject
\ No newline at end of file

diff --git a/config/rootfiles/core/37/filelists/files b/config/rootfiles/core/37/filelists/files
deleted file mode 100644 (file)
index 951fc81..0000000
--- a/config/rootfiles/core/37/filelists/files
+++ /dev/null
@@ -1,25 +0,0 @@
-etc/system-release
-etc/collectd.conf
-lib/modules/2.6.27.42-ipfire/kernel/net
-lib/modules/2.6.27.42-ipfire-xen/kernel/net
-lib/modules/2.6.27.42-ipfire/mISDN/hfcsusb.ko
-lib/modules/2.6.27.42-ipfire-xen/mISDN/hfcsusb.ko
-lib/modules/2.6.27.42-ipfire/kernel/drivers/hwmon/coretemp.ko
-lib/modules/2.6.27.42-ipfire-xen/kernel/drivers/hwmon/coretemp.ko
-lib/modules/2.6.27.42-ipfire/kernel/drivers/net/et131x.ko
-lib/modules/2.6.27.42-ipfire-xen/kernel/drivers/net/et131x.ko
-lib/modules/2.6.27.42-ipfire/kernel/arch/x86/kernel/cpu/cpufreq/p4-clockmod.ko
-lib/modules/2.6.27.42-ipfire/kernel/drivers/net/wireless/ath/ath5k/ath5k.ko
-lib/modules/2.6.27.42-ipfire-xen/kernel/drivers/net/wireless/ath/ath5k/ath5k.ko
-srv/web/ipfire/cgi-bin/urlfilter.cgi
-srv/web/ipfire/cgi-bin/outgoingfw.cgi
-srv/web/ipfire/cgi-bin/remote.cgi
-srv/web/ipfire/cgi-bin/media.cgi
-srv/web/ipfire/cgi-bin/qos.cgi
-srv/web/ipfire/cgi-bin/hardwaregraphs.cgi
-usr/local/bin/sshctrl
-var/ipfire/langs/de.pl
-var/ipfire/langs/en.pl
-var/ipfire/langs/fr.pl
-opt/pakfire/lib/functions.pl
-opt/pakfire/lib/functions.sh

diff --git a/config/rootfiles/core/37/filelists/squid b/config/rootfiles/core/37/filelists/squid
deleted file mode 120000 (symlink)
index 2dc8372..0000000
--- a/config/rootfiles/core/37/filelists/squid
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/squid
\ No newline at end of file

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

diff --git a/config/rootfiles/core/38/filelists/collectd b/config/rootfiles/core/38/filelists/collectd
new file mode 120000 (symlink)
index 0000000..871b32f
--- /dev/null
+++ b/config/rootfiles/core/38/filelists/collectd
@@ -0,0 +1 @@
+../../../common/collectd
\ No newline at end of file

diff --git a/config/rootfiles/core/38/filelists/dosfstools b/config/rootfiles/core/38/filelists/dosfstools
new file mode 120000 (symlink)
index 0000000..087ccb0
--- /dev/null
+++ b/config/rootfiles/core/38/filelists/dosfstools
@@ -0,0 +1 @@
+../../../common/dosfstools
\ No newline at end of file

diff --git a/config/rootfiles/core/38/filelists/e2fsprogs b/config/rootfiles/core/38/filelists/e2fsprogs
new file mode 120000 (symlink)
index 0000000..37b55de
--- /dev/null
+++ b/config/rootfiles/core/38/filelists/e2fsprogs
@@ -0,0 +1 @@
+../../../common/e2fsprogs
\ No newline at end of file

diff --git a/config/rootfiles/core/38/filelists/files b/config/rootfiles/core/38/filelists/files
new file mode 100644 (file)
index 0000000..a830c95
--- /dev/null
+++ b/config/rootfiles/core/38/filelists/files
@@ -0,0 +1,21 @@
+etc/system-release
+var/ipfire/backup/bin/backup.pl
+var/ipfire/header.pl
+etc/modprobe.d/cfg80211
+var/ipfire/qos/bin/makeqosscripts.pl
+srv/web/ipfire/cgi-bin/connections.cgi
+srv/web/ipfire/cgi-bin/index.cgi
+srv/web/ipfire/cgi-bin/iptables.cgi
+srv/web/ipfire/cgi-bin/logs.cgi/config.dat
+srv/web/ipfire/cgi-bin/netother.cgi
+srv/web/ipfire/cgi-bin/vpnmain.cgi
+var/ipfire/langs/de.pl
+var/ipfire/langs/en.pl
+var/ipfire/langs/fr.pl
+etc/rc.d/init.d/firewall
+etc/rc.d/init.d/ipsec
+usr/local/bin/ipsecctrl
+usr/local/bin/syslogdctrl
+usr/local/bin/wirelessctrl
+opt/pakfire/lib/functions.sh
+

diff --git a/config/rootfiles/core/38/filelists/fuse b/config/rootfiles/core/38/filelists/fuse
new file mode 120000 (symlink)
index 0000000..570edaa
--- /dev/null
+++ b/config/rootfiles/core/38/filelists/fuse
@@ -0,0 +1 @@
+../../../common/fuse
\ No newline at end of file

diff --git a/config/rootfiles/core/38/filelists/grub b/config/rootfiles/core/38/filelists/grub
new file mode 120000 (symlink)
index 0000000..050745c
--- /dev/null
+++ b/config/rootfiles/core/38/filelists/grub
@@ -0,0 +1 @@
+../../../common/grub
\ No newline at end of file

diff --git a/config/rootfiles/core/38/filelists/iptables b/config/rootfiles/core/38/filelists/iptables
new file mode 120000 (symlink)
index 0000000..8caf12b
--- /dev/null
+++ b/config/rootfiles/core/38/filelists/iptables
@@ -0,0 +1 @@
+../../../common/iptables
\ No newline at end of file

diff --git a/config/rootfiles/core/38/filelists/liboping b/config/rootfiles/core/38/filelists/liboping
new file mode 120000 (symlink)
index 0000000..3ae1904
--- /dev/null
+++ b/config/rootfiles/core/38/filelists/liboping
@@ -0,0 +1 @@
+../../../common/liboping
\ No newline at end of file

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

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

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

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

diff --git a/config/rootfiles/core/38/filelists/reiser4progs b/config/rootfiles/core/38/filelists/reiser4progs
new file mode 120000 (symlink)
index 0000000..f5ea556
--- /dev/null
+++ b/config/rootfiles/core/38/filelists/reiser4progs
@@ -0,0 +1 @@
+../../../common/reiser4progs
\ No newline at end of file

diff --git a/config/rootfiles/core/38/filelists/reiserfsprogs b/config/rootfiles/core/38/filelists/reiserfsprogs
new file mode 120000 (symlink)
index 0000000..008c3e8
--- /dev/null
+++ b/config/rootfiles/core/38/filelists/reiserfsprogs
@@ -0,0 +1 @@
+../../../common/reiserfsprogs
\ No newline at end of file

diff --git a/config/rootfiles/core/38/filelists/rrdtool b/config/rootfiles/core/38/filelists/rrdtool
new file mode 120000 (symlink)
index 0000000..7a82e41
--- /dev/null
+++ b/config/rootfiles/core/38/filelists/rrdtool
@@ -0,0 +1 @@
+../../../common/rrdtool
\ No newline at end of file

diff --git a/config/rootfiles/core/38/filelists/strongswan b/config/rootfiles/core/38/filelists/strongswan
new file mode 120000 (symlink)
index 0000000..90c727e
--- /dev/null
+++ b/config/rootfiles/core/38/filelists/strongswan
@@ -0,0 +1 @@
+../../../common/strongswan
\ No newline at end of file

diff --git a/config/rootfiles/core/38/filelists/sysklogd b/config/rootfiles/core/38/filelists/sysklogd
new file mode 120000 (symlink)
index 0000000..e166ef2
--- /dev/null
+++ b/config/rootfiles/core/38/filelists/sysklogd
@@ -0,0 +1 @@
+../../../common/sysklogd
\ No newline at end of file

diff --git a/config/rootfiles/core/38/filelists/xz b/config/rootfiles/core/38/filelists/xz
new file mode 120000 (symlink)
index 0000000..734e926
--- /dev/null
+++ b/config/rootfiles/core/38/filelists/xz
@@ -0,0 +1 @@
+../../../common/xz
\ No newline at end of file

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

diff --git a/config/rootfiles/core/38/update.sh b/config/rootfiles/core/38/update.sh
new file mode 100644 (file)
index 0000000..a8ce42f
--- /dev/null
+++ b/config/rootfiles/core/38/update.sh
@@ -0,0 +1,143 @@
+#!/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
+#
+KVER="2.6.32.10"
+ROOT=`grep "root=" /boot/grub/grub.conf | cut -d"=" -f2 | cut -d" " -f1 | tail -n 1`
+MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1`
+# Nur den letzten Parameter verwenden
+echo $MOUNT > /dev/null
+MOUNT=$_
+if [ ! $MOUNT == "rw" ]; then
+       MOUNT="ro"
+fi
+#
+# check if we the backup file already exist
+if [ -e /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 ]; then
+    echo Moving backup to backup-old ...
+    mv -f /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 \
+       /var/ipfire/backup/core-upgrade_$KVER-old.tar.bz2
+fi
+echo First we made a backup of all files that was inside of the
+echo update archive. This may take a while ...
+# Add some files that are not in the package to backup
+echo lib/modules >> /opt/pakfire/tmp/ROOTFILES
+echo boot >> /opt/pakfire/tmp/ROOTFILES
+echo etc/sysconfig/lm_sensors >> /opt/pakfire/tmp/ROOTFILES
+#
+# Todo: add openswan libs for backup ...
+#
+tar cjvf /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 \
+    -C / -T /opt/pakfire/tmp/ROOTFILES --exclude='#*' > /dev/null 2>&1
+echo
+echo Update Kernel to $KVER ...
+# Remove old kernel, configs, initrd, modules ...
+#
+rm -rf /boot/System.map-*
+rm -rf /boot/config-*
+rm -rf /boot/ipfirerd-*
+rm -rf /boot/vmlinuz-*
+# Don't remove old xen modules. Kernel may stored outside.
+rm -rf /lib/modules/*-ipfire
+#
+# Todo: remove openswan libs ...
+#
+
+#
+# Backup grub.conf
+#
+cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org
+#
+# Unpack the updated files
+#
+echo
+echo Unpack the updated files ...
+#
+tar xvf /opt/pakfire/tmp/files --preserve --numeric-owner -C / \
+       --no-overwrite-dir
+#
+# Modify grub.conf
+#
+echo
+echo Update grub configuration ...
+sed -i "s|ROOT|$ROOT|g" /boot/grub/grub.conf
+sed -i "s|KVER|$KVER|g" /boot/grub/grub.conf
+sed -i "s|MOUNT|$MOUNT|g" /boot/grub/grub.conf
+
+if [ "$(grep "^serial" /boot/grub/grub.conf.org)" == "" ]; then
+       echo "grub use default console ..."
+else
+       echo "grub use serial console ..."
+       sed -i -e "s|splashimage|#splashimage|g" /boot/grub/grub.conf
+       sed -i -e "s|#serial|serial|g" /boot/grub/grub.conf
+       sed -i -e "s|#terminal|terminal|g" /boot/grub/grub.conf
+       sed -i -e "s| panic=10 | console=ttyS0,38400n8 panic=10 |g" /boot/grub/grub.conf
+fi
+#
+# Made emergency - initramdisk
+#
+echo
+echo Create new Initramdisks ...
+cp -f /etc/mkinitcpio.conf /etc/mkinitcpio.conf.org
+sed -i "s| autodetect | |g" /etc/mkinitcpio.conf
+mkinitcpio -k $KVER-ipfire -g /boot/ipfirerd-$KVER-emergency.img
+cp -f /etc/mkinitcpio.conf.org /etc/mkinitcpio.conf
+#
+# Made initramdisk
+#
+if [ "${ROOT:0:7}" == "/dev/sd" ]; then
+    # Remove ide hook if root is on sda
+    sed -i "s| ide | |g" /etc/mkinitcpio.conf
+else
+if [ "${ROOT:0:7}" == "/dev/hd" ]; then
+    # Remove pata & sata hook if root is on hda
+    sed -i "s| pata | |g" /etc/mkinitcpio.conf
+    sed -i "s| sata | |g" /etc/mkinitcpio.conf
+fi
+fi
+mkinitcpio -k $KVER-ipfire -g /boot/ipfirerd-$KVER.img
+#
+# ReInstall grub
+#
+grub-install --no-floppy ${ROOT::`expr length $ROOT`-1} --recheck
+#
+# Rebuild Language
+#
+perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+#
+# Todo: rebuild qosscript if enabled...
+#
+#
+# Todo convert ipsec.conf from open to strongswan...
+#
+#
+# Delete old lm-sensor modullist...
+#
+rm -rf /etc/sysconfig/lm_sensors
+#
+# This core-update need a reboot
+/usr/bin/logger -p syslog.emerg -t core-upgrade-38 "Upgrade finished. If you use a customized grub.cfg"
+/usr/bin/logger -p syslog.emerg -t core-upgrade-38 "Check it before reboot !!!"
+/usr/bin/logger -p syslog.emerg -t core-upgrade-38 " *** Please reboot... *** "

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

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

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

diff --git a/config/rootfiles/oldcore/34/filelists/linux b/config/rootfiles/oldcore/34/filelists/linux
new file mode 120000 (symlink)
index 0000000..c469fe1
--- /dev/null
+++ b/config/rootfiles/oldcore/34/filelists/linux
@@ -0,0 +1 @@
+../../../common/linux
\ No newline at end of file

diff --git a/config/rootfiles/oldcore/34/filelists/linux-firmware b/config/rootfiles/oldcore/34/filelists/linux-firmware
new file mode 120000 (symlink)
index 0000000..4bf91bc
--- /dev/null
+++ b/config/rootfiles/oldcore/34/filelists/linux-firmware
@@ -0,0 +1 @@
+../../../common/linux-firmware
\ No newline at end of file

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

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

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

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

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

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

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

diff --git a/config/rootfiles/oldcore/35/exclude b/config/rootfiles/oldcore/35/exclude
new file mode 100644 (file)
index 0000000..c58d738
--- /dev/null
+++ b/config/rootfiles/oldcore/35/exclude
@@ -0,0 +1,2 @@
+etc/ipsec.conf
+etc/ipsec.secrets

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

diff --git a/config/rootfiles/oldcore/35/filelists/openswan b/config/rootfiles/oldcore/35/filelists/openswan
new file mode 120000 (symlink)
index 0000000..2b72682
--- /dev/null
+++ b/config/rootfiles/oldcore/35/filelists/openswan
@@ -0,0 +1 @@
+../../../common/openswan
\ No newline at end of file

diff --git a/config/rootfiles/oldcore/35/filelists/openswan-modules b/config/rootfiles/oldcore/35/filelists/openswan-modules
new file mode 100644 (file)
index 0000000..afee737
--- /dev/null
+++ b/config/rootfiles/oldcore/35/filelists/openswan-modules
@@ -0,0 +1,2 @@
+lib/modules/2.6.27.42-ipfire-xen/kernel/net/ipsec/ipsec.ko
+lib/modules/2.6.27.42-ipfire/kernel/net/ipsec/ipsec.ko

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

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

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

diff --git a/config/rootfiles/core/36/filelists/cyrus-sasl b/config/rootfiles/oldcore/36/filelists/cyrus-sasl
similarity index 100%
rename from config/rootfiles/core/36/filelists/cyrus-sasl
rename to config/rootfiles/oldcore/36/filelists/cyrus-sasl

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

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

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

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

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

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

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

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

diff --git a/config/rootfiles/oldcore/37/meta b/config/rootfiles/oldcore/37/meta
new file mode 100644 (file)
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/oldcore/37/meta
@@ -0,0 +1 @@
+DEPS=""

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

diff --git a/config/rootfiles/packages/dahdi b/config/rootfiles/packages/dahdi
index 4f40b71db48b12b32eb3601ed4e9a969b2d65dd1..896a8a1435896919fdca7bbc77c0b57ca3d9b4f6 100644 (file)
--- a/config/rootfiles/packages/dahdi
+++ b/config/rootfiles/packages/dahdi
@@ -65,6 +65,7 @@ usr/lib/perl5/site_perl/5.8.8/Dahdi/Xpp/Xbus.pm
 usr/lib/perl5/site_perl/5.8.8/Dahdi/Xpp/Xpd.pm
 usr/sbin/astribank_allow
 usr/sbin/astribank_hexload
+usr/sbin/astribank_is_starting
 usr/sbin/astribank_tool
 usr/sbin/dahdi_cfg
 usr/sbin/dahdi_genconf
@@ -79,6 +80,7 @@ usr/sbin/fpga_load
 usr/sbin/fxotune
 usr/sbin/lsdahdi
 usr/sbin/sethdlc
+usr/sbin/twinstar
 usr/sbin/xpp_blink
 usr/sbin/xpp_sync
 #usr/share/dahdi
@@ -101,6 +103,7 @@ usr/share/dahdi/waitfor_xpds
 usr/share/dahdi/xpp_fxloader
 #usr/share/man/man8/astribank_allow.8
 #usr/share/man/man8/astribank_hexload.8
+#usr/share/man/man8/astribank_is_starting.8
 #usr/share/man/man8/astribank_tool.8
 #usr/share/man/man8/dahdi_cfg.8
 #usr/share/man/man8/dahdi_genconf.8
@@ -113,6 +116,7 @@ usr/share/dahdi/xpp_fxloader
 #usr/share/man/man8/fpga_load.8
 #usr/share/man/man8/fxotune.8
 #usr/share/man/man8/lsdahdi.8
+#usr/share/man/man8/twinstar.8
 #usr/share/man/man8/xpp_blink.8
 #usr/share/man/man8/xpp_sync.8
 #var/ipfire/asterisk

diff --git a/config/rootfiles/packages/gutenprint b/config/rootfiles/packages/gutenprint
index 6ebaae5d5b1cc3e29883c2358d6a8a80cf6c37f8..a65efb46eef56f6d8e7219dff3c7e41bcb335770 100644 (file)
--- a/config/rootfiles/packages/gutenprint
+++ b/config/rootfiles/packages/gutenprint
@@ -249,13 +249,13 @@ usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_yellowdensity-1.xml
 usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_yellowgamma-1.xml
 usr/share/foomatic/kitload.log
 #usr/share/gutenprint
-usr/share/gutenprint/5.2
-usr/share/gutenprint/5.2/xml
+#usr/share/gutenprint/5.2
+#usr/share/gutenprint/5.2/xml
 usr/share/gutenprint/5.2/xml/dither-matrix-1x1.xml
 usr/share/gutenprint/5.2/xml/dither-matrix-2x1.xml
 usr/share/gutenprint/5.2/xml/dither-matrix-4x1.xml
-usr/share/gutenprint/5.2/xml/escp2
-usr/share/gutenprint/5.2/xml/escp2/inks
+#usr/share/gutenprint/5.2/xml/escp2
+#usr/share/gutenprint/5.2/xml/escp2/inks
 usr/share/gutenprint/5.2/xml/escp2/inks/artisan.xml
 usr/share/gutenprint/5.2/xml/escp2/inks/b500.xml
 usr/share/gutenprint/5.2/xml/escp2/inks/c120.xml
@@ -295,7 +295,7 @@ usr/share/gutenprint/5.2/xml/escp2/inks/ultrachrome.xml
 usr/share/gutenprint/5.2/xml/escp2/inks/wf40.xml
 usr/share/gutenprint/5.2/xml/escp2/inks/wf500.xml
 usr/share/gutenprint/5.2/xml/escp2/inks/x80.xml
-usr/share/gutenprint/5.2/xml/escp2/inputslots
+#usr/share/gutenprint/5.2/xml/escp2/inputslots
 usr/share/gutenprint/5.2/xml/escp2/inputslots/artisan.xml
 usr/share/gutenprint/5.2/xml/escp2/inputslots/b500.xml
 usr/share/gutenprint/5.2/xml/escp2/inputslots/cd.xml
@@ -311,7 +311,7 @@ usr/share/gutenprint/5.2/xml/escp2/inputslots/rx680.xml
 usr/share/gutenprint/5.2/xml/escp2/inputslots/rx700.xml
 usr/share/gutenprint/5.2/xml/escp2/inputslots/spro5000.xml
 usr/share/gutenprint/5.2/xml/escp2/inputslots/standard_roll_feed.xml
-usr/share/gutenprint/5.2/xml/escp2/media
+#usr/share/gutenprint/5.2/xml/escp2/media
 usr/share/gutenprint/5.2/xml/escp2/media/artisan.xml
 usr/share/gutenprint/5.2/xml/escp2/media/b500.xml
 usr/share/gutenprint/5.2/xml/escp2/media/c120.xml
@@ -351,9 +351,9 @@ usr/share/gutenprint/5.2/xml/escp2/media/standard_gen0.xml
 usr/share/gutenprint/5.2/xml/escp2/media/ultrachrome.xml
 usr/share/gutenprint/5.2/xml/escp2/media/wf500.xml
 usr/share/gutenprint/5.2/xml/escp2/media/x80.xml
-usr/share/gutenprint/5.2/xml/escp2/mediasizes
+#usr/share/gutenprint/5.2/xml/escp2/mediasizes
 usr/share/gutenprint/5.2/xml/escp2/mediasizes/standard.xml
-usr/share/gutenprint/5.2/xml/escp2/model
+#usr/share/gutenprint/5.2/xml/escp2/model
 usr/share/gutenprint/5.2/xml/escp2/model/model_0.xml
 usr/share/gutenprint/5.2/xml/escp2/model/model_1.xml
 usr/share/gutenprint/5.2/xml/escp2/model/model_10.xml
@@ -455,13 +455,13 @@ usr/share/gutenprint/5.2/xml/escp2/model/model_96.xml
 usr/share/gutenprint/5.2/xml/escp2/model/model_97.xml
 usr/share/gutenprint/5.2/xml/escp2/model/model_98.xml
 usr/share/gutenprint/5.2/xml/escp2/model/model_99.xml
-usr/share/gutenprint/5.2/xml/escp2/qualitypresets
+#usr/share/gutenprint/5.2/xml/escp2/qualitypresets
 usr/share/gutenprint/5.2/xml/escp2/qualitypresets/p1_5.xml
 usr/share/gutenprint/5.2/xml/escp2/qualitypresets/picturemate.xml
 usr/share/gutenprint/5.2/xml/escp2/qualitypresets/standard.xml
 usr/share/gutenprint/5.2/xml/escp2/qualitypresets/v2880.xml
 usr/share/gutenprint/5.2/xml/escp2/qualitypresets/wf40.xml
-usr/share/gutenprint/5.2/xml/escp2/weaves
+#usr/share/gutenprint/5.2/xml/escp2/weaves
 usr/share/gutenprint/5.2/xml/escp2/weaves/pro7000.xml
 usr/share/gutenprint/5.2/xml/escp2/weaves/pro7500.xml
 usr/share/gutenprint/5.2/xml/escp2/weaves/pro7600.xml
@@ -512,12 +512,12 @@ usr/share/locale/de/LC_MESSAGES/gutenprint.mo
 usr/share/locale/de/gutenprint_de.po
 #usr/share/locale/el/LC_MESSAGES/gutenprint.mo
 #usr/share/locale/el/gutenprint_el.po
-usr/share/locale/en_GB/LC_MESSAGES/gutenprint.mo
-usr/share/locale/en_GB/gutenprint_en_GB.po
-usr/share/locale/es/LC_MESSAGES/gutenprint.mo
-usr/share/locale/es/gutenprint_es.po
-usr/share/locale/fr/LC_MESSAGES/gutenprint.mo
-usr/share/locale/fr/gutenprint_fr.po
+#usr/share/locale/en_GB/LC_MESSAGES/gutenprint.mo
+#usr/share/locale/en_GB/gutenprint_en_GB.po
+#usr/share/locale/es/LC_MESSAGES/gutenprint.mo
+#usr/share/locale/es/gutenprint_es.po
+#usr/share/locale/fr/LC_MESSAGES/gutenprint.mo
+#usr/share/locale/fr/gutenprint_fr.po
 #usr/share/locale/hu/LC_MESSAGES/gutenprint.mo
 #usr/share/locale/hu/gutenprint_hu.po
 #usr/share/locale/it/LC_MESSAGES/gutenprint.mo
@@ -532,8 +532,8 @@ usr/share/locale/fr/gutenprint_fr.po
 #usr/share/locale/pl/gutenprint_pl.po
 #usr/share/locale/pt/LC_MESSAGES/gutenprint.mo
 #usr/share/locale/pt/gutenprint_pt.po
-usr/share/locale/ru/LC_MESSAGES/gutenprint.mo
-usr/share/locale/ru/gutenprint_ru.po
+#usr/share/locale/ru/LC_MESSAGES/gutenprint.mo
+#usr/share/locale/ru/gutenprint_ru.po
 #usr/share/locale/sk/LC_MESSAGES/gutenprint.mo
 #usr/share/locale/sk/gutenprint_sk.po
 #usr/share/locale/sv/LC_MESSAGES/gutenprint.mo

diff --git a/config/rootfiles/packages/ipfireseeder b/config/rootfiles/packages/ipfireseeder
index dd96016bfc5bac923159060bde841d9554c16ff1..5a0ce0d2ddaca663a309b2f072941fdd4003f0ef 100644 (file)
--- a/config/rootfiles/packages/ipfireseeder
+++ b/config/rootfiles/packages/ipfireseeder
@@ -1,5 +1,5 @@
 etc/rc.d/init.d/ipfireseeder
 #var/ipfire/seeder
-var/ipfire/seeder/ipfire-2.5.i586-full-core36.iso.torrent
+var/ipfire/seeder/ipfire-2.5.i586-full-core37.iso.torrent
 #var/log/seeder
 var/log/seeder/info

diff --git a/config/rootfiles/packages/linux-xen b/config/rootfiles/packages/linux-xen
index b3f9383aae764a3474e3694a2b0b2582e94de3b1..3e1f01a1edf3221783c610b5ba17d2c0559f6d96 100644 (file)
--- a/config/rootfiles/packages/linux-xen
+++ b/config/rootfiles/packages/linux-xen
@@ -3,75 +3,12 @@ boot/System.map-ipfire-xen
 boot/config-KVER-ipfire-xen
 boot/vmlinuz-KVER-ipfire-xen
 boot/vmlinuz-ipfire-xen
-#lib/firmware/atmsar11.fw
-#lib/firmware/cpia2
-#lib/firmware/cpia2/stv0672_vp4.bin
-#lib/firmware/dabusb
-#lib/firmware/dabusb/bitstream.bin
-#lib/firmware/dabusb/firmware.fw
-#lib/firmware/dsp56k
-#lib/firmware/dsp56k/bootstrap.bin
-#lib/firmware/edgeport
-#lib/firmware/edgeport/boot.fw
-#lib/firmware/edgeport/boot2.fw
-#lib/firmware/edgeport/down.fw
-#lib/firmware/edgeport/down2.fw
-#lib/firmware/edgeport/down3.bin
-#lib/firmware/emi26
-#lib/firmware/emi26/bitstream.fw
-#lib/firmware/emi26/firmware.fw
-#lib/firmware/emi26/loader.fw
-#lib/firmware/emi62
-#lib/firmware/emi62/bitstream.fw
-#lib/firmware/emi62/loader.fw
-#lib/firmware/emi62/midi.fw
-#lib/firmware/emi62/spdif.fw
-#lib/firmware/ess
-#lib/firmware/ess/maestro3_assp_kernel.fw
-#lib/firmware/ess/maestro3_assp_minisrc.fw
-#lib/firmware/intelliport2.bin
-#lib/firmware/kaweth
-#lib/firmware/kaweth/new_code.bin
-#lib/firmware/kaweth/new_code_fix.bin
-#lib/firmware/kaweth/trigger_code.bin
-#lib/firmware/kaweth/trigger_code_fix.bin
-#lib/firmware/keyspan
-#lib/firmware/keyspan/mpr.fw
-#lib/firmware/keyspan/usa18x.fw
-#lib/firmware/keyspan/usa19.fw
-#lib/firmware/keyspan/usa19qi.fw
-#lib/firmware/keyspan/usa19qw.fw
-#lib/firmware/keyspan/usa19w.fw
-#lib/firmware/keyspan/usa28.fw
-#lib/firmware/keyspan/usa28x.fw
-#lib/firmware/keyspan/usa28xa.fw
-#lib/firmware/keyspan/usa28xb.fw
-#lib/firmware/keyspan/usa49w.fw
-#lib/firmware/keyspan/usa49wlc.fw
-#lib/firmware/keyspan_pda
-#lib/firmware/keyspan_pda/keyspan_pda.fw
-#lib/firmware/keyspan_pda/xircom_pgs.fw
-#lib/firmware/korg
-#lib/firmware/korg/k1212.dsp
-#lib/firmware/sb16
-#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/ti_3410.fw
-#lib/firmware/ti_5052.fw
-#lib/firmware/tr_smctr.bin
-#lib/firmware/ttusb-budget
-#lib/firmware/ttusb-budget/dspbootcode.bin
-#lib/firmware/vicam
-#lib/firmware/vicam/firmware.fw
-#lib/firmware/whiteheat.fw
-#lib/firmware/whiteheat_loader.fw
-#lib/firmware/yamaha
-#lib/firmware/yamaha/ds1_ctrl.fw
-#lib/firmware/yamaha/ds1_dsp.fw
-#lib/firmware/yamaha/ds1e_ctrl.fw
+#lib/firmware/bnx2/bnx2-mips-06-5.0.0.j6.fw
+#lib/firmware/bnx2/bnx2-mips-09-5.0.0.j9.fw
+#lib/firmware/bnx2/bnx2-rv2p-09-5.0.0.j10.fw
+#lib/firmware/bnx2/bnx2-rv2p-09ax-5.0.0.j10.fw
+#lib/firmware/bnx2x-e1-5.2.13.0.fw
+#lib/firmware/bnx2x-e1h-5.2.13.0.fw
 #lib/modules
 lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/build
@@ -80,6 +17,7 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/arch/x86
 #lib/modules/KVER-ipfire-xen/kernel/arch/x86/crypto
 #lib/modules/KVER-ipfire-xen/kernel/arch/x86/crypto/aes-i586.ko
+#lib/modules/KVER-ipfire-xen/kernel/arch/x86/crypto/crc32c-intel.ko
 #lib/modules/KVER-ipfire-xen/kernel/arch/x86/crypto/salsa20-i586.ko
 #lib/modules/KVER-ipfire-xen/kernel/arch/x86/crypto/twofish-i586.ko
 #lib/modules/KVER-ipfire-xen/kernel/arch/x86/kernel
@@ -87,12 +25,14 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/arch/x86/kernel/msr.ko
 #lib/modules/KVER-ipfire-xen/kernel/arch/x86/kernel/scx200.ko
 #lib/modules/KVER-ipfire-xen/kernel/crypto
-#lib/modules/KVER-ipfire-xen/kernel/crypto/aead.ko
 #lib/modules/KVER-ipfire-xen/kernel/crypto/aes_generic.ko
+#lib/modules/KVER-ipfire-xen/kernel/crypto/ansi_cprng.ko
 #lib/modules/KVER-ipfire-xen/kernel/crypto/anubis.ko
 #lib/modules/KVER-ipfire-xen/kernel/crypto/arc4.ko
 #lib/modules/KVER-ipfire-xen/kernel/crypto/async_tx
 #lib/modules/KVER-ipfire-xen/kernel/crypto/async_tx/async_memcpy.ko
+#lib/modules/KVER-ipfire-xen/kernel/crypto/async_tx/async_pq.ko
+#lib/modules/KVER-ipfire-xen/kernel/crypto/async_tx/async_raid6_recov.ko
 #lib/modules/KVER-ipfire-xen/kernel/crypto/async_tx/async_tx.ko
 #lib/modules/KVER-ipfire-xen/kernel/crypto/async_tx/async_xor.ko
 #lib/modules/KVER-ipfire-xen/kernel/crypto/authenc.ko
@@ -104,7 +44,6 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/crypto/ccm.ko
 #lib/modules/KVER-ipfire-xen/kernel/crypto/crc32c.ko
 #lib/modules/KVER-ipfire-xen/kernel/crypto/cryptd.ko
-#lib/modules/KVER-ipfire-xen/kernel/crypto/crypto_blkcipher.ko
 #lib/modules/KVER-ipfire-xen/kernel/crypto/ctr.ko
 #lib/modules/KVER-ipfire-xen/kernel/crypto/cts.ko
 #lib/modules/KVER-ipfire-xen/kernel/crypto/des_generic.ko
@@ -112,6 +51,7 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/crypto/fcrypt.ko
 #lib/modules/KVER-ipfire-xen/kernel/crypto/gcm.ko
 #lib/modules/KVER-ipfire-xen/kernel/crypto/gf128mul.ko
+#lib/modules/KVER-ipfire-xen/kernel/crypto/ghash-generic.ko
 #lib/modules/KVER-ipfire-xen/kernel/crypto/khazad.ko
 #lib/modules/KVER-ipfire-xen/kernel/crypto/lrw.ko
 #lib/modules/KVER-ipfire-xen/kernel/crypto/lzo.ko
@@ -133,27 +73,27 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/crypto/tgr192.ko
 #lib/modules/KVER-ipfire-xen/kernel/crypto/twofish.ko
 #lib/modules/KVER-ipfire-xen/kernel/crypto/twofish_common.ko
+#lib/modules/KVER-ipfire-xen/kernel/crypto/vmac.ko
 #lib/modules/KVER-ipfire-xen/kernel/crypto/wp512.ko
 #lib/modules/KVER-ipfire-xen/kernel/crypto/xcbc.ko
 #lib/modules/KVER-ipfire-xen/kernel/crypto/xor.ko
 #lib/modules/KVER-ipfire-xen/kernel/crypto/xts.ko
+#lib/modules/KVER-ipfire-xen/kernel/crypto/zlib.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers
 #lib/modules/KVER-ipfire-xen/kernel/drivers/acpi
 #lib/modules/KVER-ipfire-xen/kernel/drivers/acpi/ac.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/acpi/asus_acpi.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/acpi/acpi_pad.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/acpi/battery.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/acpi/button.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/acpi/container.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/acpi/dock.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/acpi/fan.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/acpi/pci_slot.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/acpi/power_meter.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/acpi/processor.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/acpi/sbs.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/acpi/sbshc.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/acpi/thermal.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/acpi/toshiba_acpi.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/acpi/video.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/acpi/wmi.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/ata
 #lib/modules/KVER-ipfire-xen/kernel/drivers/ata/ahci.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/ata/ata_generic.ko
@@ -164,6 +104,7 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_amd.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_artop.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_atiixp.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_atp867x.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_cmd640.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_cmd64x.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_cs5520.ko
@@ -192,6 +133,7 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_pdc2027x.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_pdc202xx_old.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_radisys.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_rdc.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_rz1000.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_sc1200.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_sch.ko
@@ -228,6 +170,7 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/drivers/atm/iphase.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/atm/lanai.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/atm/nicstar.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/atm/solos-pci.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/atm/suni.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/atm/uPD98402.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/atm/zatm.ko
@@ -240,6 +183,7 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/drivers/block/cryptoloop.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/block/floppy.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/block/nbd.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/block/osdblk.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/block/sx8.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/bluetooth
 #lib/modules/KVER-ipfire-xen/kernel/drivers/bluetooth/bcm203x.ko
@@ -247,6 +191,8 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/drivers/bluetooth/bluecard_cs.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/bluetooth/bpa10x.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/bluetooth/bt3c_cs.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/bluetooth/btmrvl.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/bluetooth/btmrvl_sdio.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/bluetooth/btsdio.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/bluetooth/btuart_cs.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/bluetooth/btusb.ko
@@ -273,6 +219,7 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/drivers/char/hw_random/geode-rng.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/char/hw_random/intel-rng.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/char/hw_random/rng-core.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/char/hw_random/timeriomem-rng.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/char/hw_random/via-rng.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/char/i8k.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/char/ipmi
@@ -306,9 +253,11 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/drivers/dca/dca.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/dma
 #lib/modules/KVER-ipfire-xen/kernel/drivers/dma/dmatest.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/dma/ioatdma.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/dma/ioat
+#lib/modules/KVER-ipfire-xen/kernel/drivers/dma/ioat/ioatdma.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/firewire
 #lib/modules/KVER-ipfire-xen/kernel/drivers/firewire/firewire-core.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/firewire/firewire-net.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/firewire/firewire-ohci.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/firewire/firewire-sbp2.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/firmware
@@ -316,6 +265,7 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/drivers/gpu
 #lib/modules/KVER-ipfire-xen/kernel/drivers/gpu/drm
 #lib/modules/KVER-ipfire-xen/kernel/drivers/gpu/drm/drm.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/gpu/drm/drm_kms_helper.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/gpu/drm/i810
 #lib/modules/KVER-ipfire-xen/kernel/drivers/gpu/drm/i810/i810.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/gpu/drm/i830
@@ -334,11 +284,38 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/drivers/gpu/drm/sis/sis.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/gpu/drm/tdfx
 #lib/modules/KVER-ipfire-xen/kernel/drivers/gpu/drm/tdfx/tdfx.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/gpu/drm/ttm
+#lib/modules/KVER-ipfire-xen/kernel/drivers/gpu/drm/ttm/ttm.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/gpu/drm/via
 #lib/modules/KVER-ipfire-xen/kernel/drivers/gpu/drm/via/via.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/gpu/drm/via_chrome9
-#lib/modules/KVER-ipfire-xen/kernel/drivers/gpu/drm/via_chrome9/via_chrome9.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/hid
+#lib/modules/KVER-ipfire-xen/kernel/drivers/hid/hid-a4tech.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/hid/hid-apple.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/hid/hid-belkin.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/hid/hid-cherry.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/hid/hid-chicony.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/hid/hid-cypress.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/hid/hid-drff.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/hid/hid-ezkey.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/hid/hid-gaff.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/hid/hid-gyration.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/hid/hid-kensington.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/hid/hid-kye.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/hid/hid-logitech.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/hid/hid-microsoft.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/hid/hid-monterey.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/hid/hid-ntrig.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/hid/hid-petalynx.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/hid/hid-pl.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/hid/hid-samsung.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/hid/hid-sjoy.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/hid/hid-sony.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/hid/hid-sunplus.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/hid/hid-tmff.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/hid/hid-topseed.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/hid/hid-twinhan.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/hid/hid-wacom.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/hid/hid-zpff.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/hid/usbhid
 #lib/modules/KVER-ipfire-xen/kernel/drivers/hid/usbhid/usbhid.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon
@@ -353,10 +330,13 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/adm1031.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/adm9240.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/ads7828.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/adt7462.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/adt7470.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/adt7473.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/adt7475.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/applesmc.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/asb100.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/asus_atk0110.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/atxp1.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/coretemp.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/dme1737.ko
@@ -364,12 +344,12 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/f71805f.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/f71882fg.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/f75375s.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/fscher.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/fschmd.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/fscpos.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/g760a.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/gl518sm.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/gl520sm.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/hdaps.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/hp_accel.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/hwmon-vid.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/hwmon.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/i5k_amb.ko
@@ -377,6 +357,7 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/ibmpex.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/it87.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/k8temp.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/lis3lv02d.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/lm63.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/lm75.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/lm77.ko
@@ -388,15 +369,21 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/lm90.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/lm92.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/lm93.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/lm95241.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/ltc4215.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/ltc4245.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/max1619.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/max6650.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/pc87360.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/pc87427.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/pcf8591.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/sis5595.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/smsc47b397.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/smsc47m1.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/smsc47m192.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/thmc50.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/tmp401.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/tmp421.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/via686a.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/vt1211.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/vt8231.ko
@@ -408,6 +395,8 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/w83793.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/w83l785ts.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/w83l786ng.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/wm831x-hwmon.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/wm8350-hwmon.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/i2c
 #lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/algos
 #lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/algos/i2c-algo-bit.ko
@@ -428,6 +417,7 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/busses/i2c-parport.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/busses/i2c-pca-platform.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/busses/i2c-piix4.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/busses/i2c-scmi.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/busses/i2c-simtec.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/busses/i2c-sis5595.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/busses/i2c-sis630.ko
@@ -439,58 +429,49 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/busses/i2c-voodoo3.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/busses/scx200_acb.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/chips
-#lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/chips/at24.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/chips/ds1682.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/chips/eeprom.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/chips/max6875.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/chips/pca9539.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/chips/pcf8574.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/chips/pcf8575.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/chips/pcf8591.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/chips/tsl2550.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/i2c-core.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/i2c-dev.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/ide
+#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/aec62xx.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/alim15x3.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/amd74xx.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/atiixp.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/cmd640.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/cmd64x.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/cs5520.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/cs5530.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/cs5535.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/cs5536.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/delkin_cb.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/hpt366.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/ide/ide-cd.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/ide-core.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/ide-cs.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/ide/ide-disk.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/ide-floppy.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/ide/ide-generic.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/ide-pci-generic.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/ide/ide-pnp.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/legacy
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/legacy/ide-cs.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/legacy/ide_platform.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/pci
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/pci/aec62xx.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/pci/alim15x3.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/pci/amd74xx.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/pci/atiixp.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/pci/cmd640.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/pci/cmd64x.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/pci/cs5520.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/pci/cs5530.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/pci/cs5535.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/pci/delkin_cb.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/pci/hpt366.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/pci/ide-pci-generic.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/pci/it8213.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/pci/it821x.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/pci/jmicron.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/pci/ns87415.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/pci/opti621.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/pci/pdc202xx_new.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/pci/pdc202xx_old.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/pci/piix.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/pci/rz1000.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/pci/sc1200.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/pci/serverworks.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/pci/siimage.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/pci/sis5513.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/pci/slc90e66.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/pci/tc86c001.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/pci/triflex.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/pci/trm290.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/pci/via82cxxx.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/ide_platform.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/it8172.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/it8213.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/it821x.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/jmicron.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/ns87415.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/opti621.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/pdc202xx_new.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/pdc202xx_old.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/piix.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/rz1000.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/sc1200.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/serverworks.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/siimage.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/sis5513.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/slc90e66.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/tc86c001.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/triflex.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/trm290.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/ide/via82cxxx.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/ieee1394
 #lib/modules/KVER-ipfire-xen/kernel/drivers/ieee1394/eth1394.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/ieee1394/ieee1394.ko
@@ -499,11 +480,18 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/drivers/ieee1394/raw1394.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/ieee1394/sbp2.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/ieee1394/video1394.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/ieee802154
+#lib/modules/KVER-ipfire-xen/kernel/drivers/ieee802154/fakehard.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/input
+#lib/modules/KVER-ipfire-xen/kernel/drivers/input/ff-memless.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/input/input-polldev.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/input/keyboard
+#lib/modules/KVER-ipfire-xen/kernel/drivers/input/keyboard/adp5588-keys.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/input/keyboard/lkkbd.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/input/keyboard/lm8323.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/input/keyboard/max7359_keypad.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/input/keyboard/newtonkbd.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/input/keyboard/opencores-kbd.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/input/keyboard/stowaway.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/input/keyboard/sunkbd.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/input/keyboard/xtkbd.ko
@@ -511,13 +499,26 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/drivers/input/misc/apanel.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/input/misc/ati_remote.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/input/misc/ati_remote2.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/input/misc/cm109.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/input/misc/keyspan_remote.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/input/misc/pcf50633-input.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/input/misc/pcspkr.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/input/misc/powermate.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/input/misc/winbond-cir.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/input/misc/wm831x-on.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/input/misc/yealink.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/isdn
 #lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/capi
 #lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/capi/capi.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/capi/capidrv.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/capi/kernelcapi.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/divert
+#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/divert/dss1_divert.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/gigaset
+#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/gigaset/bas_gigaset.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/gigaset/gigaset.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/gigaset/ser_gigaset.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/gigaset/usb_gigaset.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware
 #lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/avm
 #lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/avm/avm_cs.ko
@@ -533,14 +534,51 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/eicon/divacapi.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/eicon/divadidd.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/eicon/divas.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/mISDN
+#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/mISDN/avmfritz.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/mISDN/hfcmulti.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/mISDN/hfcpci.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/mISDN/hfcsusb.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/mISDN/mISDNinfineon.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/mISDN/mISDNipac.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/mISDN/mISDNisar.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/mISDN/netjet.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/mISDN/speedfax.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/mISDN/w6692.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hisax
+#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hisax/avma1_cs.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hisax/elsa_cs.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hisax/hfc4s8s_l1.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hisax/hfc_usb.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hisax/hisax.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hisax/hisax_fcpcipnp.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hisax/hisax_isac.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hisax/hisax_st5481.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hisax/sedlbauer_cs.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hisax/teles_cs.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hysdn
+#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hysdn/hysdn.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/i4l
+#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/i4l/isdn.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/i4l/isdn_bsdcomp.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/i4l/isdnhdlc.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/mISDN
+#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/mISDN/l1oip.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/mISDN/mISDN_core.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/mISDN/mISDN_dsp.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/leds
 #lib/modules/KVER-ipfire-xen/kernel/drivers/leds/led-class.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/leds/leds-alix.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/leds/leds-alix2.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/leds/leds-bd2802.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/leds/leds-clevo-mail.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/leds/leds-lp3944.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/leds/leds-net48xx.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/leds/leds-pca9532.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/leds/leds-pca955x.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/leds/leds-wm831x-status.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/leds/leds-wm8350.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/leds/leds-wrap.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/leds/ledtrig-backlight.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/leds/ledtrig-default-on.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/leds/ledtrig-heartbeat.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/leds/ledtrig-timer.ko
@@ -548,15 +586,15 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-crypt.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-delay.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-least-pending.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-log-userspace.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-log.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-memcache.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-message.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-mirror.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-mod.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-multipath.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-queue-length.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-raid45.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-regions.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-region-hash.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-round-robin.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-service-time.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-snapshot.ko
@@ -568,12 +606,25 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/drivers/md/raid1.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/md/raid10.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/md/raid456.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/md/raid6_pq.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/media
+#lib/modules/KVER-ipfire-xen/kernel/drivers/media/common
+#lib/modules/KVER-ipfire-xen/kernel/drivers/media/common/tuners
+#lib/modules/KVER-ipfire-xen/kernel/drivers/media/common/tuners/mc44s803.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/media/common/tuners/mt20xx.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/media/common/tuners/tda8290.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/media/common/tuners/tda9887.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/media/common/tuners/tea5761.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/media/common/tuners/tea5767.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/media/common/tuners/tuner-simple.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/media/common/tuners/tuner-types.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/media/common/tuners/tuner-xc2028.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/media/common/tuners/xc5000.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/media/dvb
 #lib/modules/KVER-ipfire-xen/kernel/drivers/media/dvb/dvb-core
 #lib/modules/KVER-ipfire-xen/kernel/drivers/media/dvb/dvb-core/dvb-core.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/media/video
-#lib/modules/KVER-ipfire-xen/kernel/drivers/media/video/compat_ioctl32.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/media/video/v4l1-compat.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/media/video/v4l2-common.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/media/video/v4l2-int-device.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/media/video/videodev.ko
@@ -593,23 +644,33 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/drivers/message/fusion/mptscsih.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/message/fusion/mptspi.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/mfd
+#lib/modules/KVER-ipfire-xen/kernel/drivers/mfd/ab3100-core.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/mfd/ab3100-otp.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/mfd/htc-pasic3.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/mfd/mfd-core.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/mfd/pcf50633-adc.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/mfd/pcf50633-core.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/mfd/pcf50633-gpio.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/mfd/sm501.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/mfd/wm831x.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/mfd/wm8350-i2c.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/mfd/wm8350.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/mfd/wm8400-core.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/misc
-#lib/modules/KVER-ipfire-xen/kernel/drivers/misc/acer-wmi.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/misc/asus-laptop.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/misc/compal-laptop.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/misc/eeepc-laptop.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/misc/eeprom_93cx6.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/misc/c2port
+#lib/modules/KVER-ipfire-xen/kernel/drivers/misc/c2port/c2port-duramar2150.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/misc/c2port/core.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/misc/cb710
+#lib/modules/KVER-ipfire-xen/kernel/drivers/misc/cb710/cb710.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/misc/eeprom
+#lib/modules/KVER-ipfire-xen/kernel/drivers/misc/eeprom/at24.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/misc/eeprom/eeprom.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/misc/eeprom/eeprom_93cx6.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/misc/eeprom/max6875.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/misc/enclosure.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/misc/fujitsu-laptop.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/misc/hp-wmi.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/misc/hpilo.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/misc/intel_menlow.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/misc/msi-laptop.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/misc/sony-laptop.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/misc/tc1100-wmi.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/misc/thinkpad_acpi.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/misc/ics932s401.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/misc/isl29003.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/misc/tifm_7xx1.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/misc/tifm_core.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/mmc
@@ -620,21 +681,37 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/drivers/mmc/core
 #lib/modules/KVER-ipfire-xen/kernel/drivers/mmc/core/mmc_core.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/mmc/host
+#lib/modules/KVER-ipfire-xen/kernel/drivers/mmc/host/cb710-mmc.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/mmc/host/ricoh_mmc.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/mmc/host/sdhci-pci.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/mmc/host/sdhci-pltfm.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/mmc/host/sdhci.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/mmc/host/sdricoh_cs.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/mmc/host/tifm_sd.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/mmc/host/via-sdmmc.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/mmc/host/wbsd.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/mtd
 #lib/modules/KVER-ipfire-xen/kernel/drivers/mtd/ar7part.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/mtd/chips
 #lib/modules/KVER-ipfire-xen/kernel/drivers/mtd/chips/chipreg.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/mtd/lpddr
+#lib/modules/KVER-ipfire-xen/kernel/drivers/mtd/lpddr/lpddr_cmds.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/mtd/lpddr/qinfo_probe.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/mtd/maps
+#lib/modules/KVER-ipfire-xen/kernel/drivers/mtd/maps/physmap.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/mtd/mtd.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/mtd/mtd_blkdevs.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/mtd/mtdblock.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/mtd/mtdchar.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/mtd/mtdconcat.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/mtd/tests
+#lib/modules/KVER-ipfire-xen/kernel/drivers/mtd/tests/mtd_oobtest.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/mtd/tests/mtd_pagetest.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/mtd/tests/mtd_readtest.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/mtd/tests/mtd_speedtest.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/mtd/tests/mtd_stresstest.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/mtd/tests/mtd_subpagetest.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/mtd/tests/mtd_torturetest.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/mtd/ubi
 #lib/modules/KVER-ipfire-xen/kernel/drivers/mtd/ubi/ubi.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net
@@ -644,12 +721,17 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/8390.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/acenic.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/amd8111e.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/atl1c
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/atl1c/atl1c.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/atl1e
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/atl1e/atl1e.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/atlx
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/atlx/atl1.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/atlx/atl2.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/atp.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/b44.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/benet
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/benet/be2net.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/bnx2.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/bnx2x.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/bonding
@@ -658,20 +740,24 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/cassini.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/chelsio
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/chelsio/cxgb.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/cnic.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/cxgb3
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/cxgb3/cxgb3.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/de600.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/de620.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/dl2k.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/dnet.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/dummy.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/e100.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/e1000
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/e1000/e1000.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/e1000e
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/e1000e/e1000e.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/net/eepro100.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/enic
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/enic/enic.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/epic100.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/eql.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/ethoc.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/fealnx.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/forcedeth.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/hamachi.ko
@@ -679,6 +765,8 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/ifb.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/igb
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/igb/igb.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/igbvf
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/igbvf/igbvf.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/imq.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/ipg.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/irda
@@ -701,8 +789,15 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/ixgb/ixgb.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/ixgbe
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/ixgbe/ixgbe.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/jme.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/ks8842.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/ks8851_mll.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/macvlan.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/mdio.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/mii.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/mlx4
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/mlx4/mlx4_core.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/mlx4/mlx4_en.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/myri10ge
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/myri10ge/myri10ge.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/natsemi.ko
@@ -725,14 +820,16 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/phy/broadcom.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/phy/cicada.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/phy/davicom.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/phy/et1011c.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/phy/icplus.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/net/phy/libphy.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/phy/lxt.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/phy/marvell.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/phy/mdio-bitbang.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/phy/national.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/phy/qsemi.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/phy/realtek.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/phy/smsc.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/phy/ste10Xp.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/phy/vitesse.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/ppp_async.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/ppp_deflate.ko
@@ -743,21 +840,20 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/pppol2tp.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/pppox.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/qla3xxx.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/qlge
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/qlge/qlge.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/r6040.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/r8169.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/s2io.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/sb1000.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/sc92031.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/net/sfc
-#lib/modules/KVER-ipfire-xen/kernel/drivers/net/sfc/sfc.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/net/sfc/sfc_resource
-#lib/modules/KVER-ipfire-xen/kernel/drivers/net/sfc/sfc_resource/sfc_resource.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/sis190.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/sis900.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/skge.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/sky2.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/slhc.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/slip.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/smsc9420.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/starfire.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/sundance.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/sungem.ko
@@ -779,11 +875,14 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/usb
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/usb/asix.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/usb/catc.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/usb/cdc-phonet.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/usb/cdc_eem.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/usb/cdc_ether.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/usb/cdc_subset.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/usb/dm9601.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/usb/gl620a.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/usb/hso.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/usb/int51x1.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/usb/kaweth.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/usb/mcs7830.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/usb/net1080.ko
@@ -791,42 +890,107 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/usb/plusb.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/usb/rndis_host.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/usb/rtl8150.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/usb/smsc95xx.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/usb/usbnet.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/usb/zaurus.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/veth.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/via-rhine.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/via-velocity.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/vxge
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/vxge/vxge.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wimax
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wimax/i2400m
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wimax/i2400m/i2400m-sdio.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wimax/i2400m/i2400m-usb.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wimax/i2400m/i2400m.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/adm8211.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/airo.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/airo_cs.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/at76c50x-usb.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/ath
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/ath/ar9170
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/ath/ar9170/ar9170usb.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/ath/ath.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/ath/ath5k
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/ath/ath5k/ath5k.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/ath/ath9k
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/ath/ath9k/ath9k.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/atmel.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/atmel_cs.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/atmel_pci.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/hermes.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/b43
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/b43/b43.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/b43legacy
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/b43legacy/b43legacy.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/hostap
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/hostap/hostap.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/hostap/hostap_cs.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/hostap/hostap_pci.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/hostap/hostap_plx.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/orinoco.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/orinoco_cs.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/orinoco_nortel.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/orinoco_pci.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/orinoco_plx.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/orinoco_tmd.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/ipw2x00
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/ipw2x00/ipw2100.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/ipw2x00/ipw2200.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/ipw2x00/libipw.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/iwlwifi
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/iwlwifi/iwl3945.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/iwlwifi/iwlagn.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/iwlwifi/iwlcore.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/iwmc3200wifi
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/iwmc3200wifi/iwmc3200wifi.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/libertas
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/libertas/libertas.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/libertas/libertas_cs.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/libertas/libertas_sdio.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/libertas/usb8xxx.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/libertas_tf
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/libertas_tf/libertas_tf.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/libertas_tf/libertas_tf_usb.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/mwl8k.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/orinoco
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_cs.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_nortel.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_pci.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_plx.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_tmd.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/orinoco/spectrum_cs.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/p54
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/p54/p54common.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/p54/p54pci.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/p54/p54usb.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/prism54
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/prism54/prism54.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/ray_cs.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/rndis_wlan.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/spectrum_cs.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/rt2x00
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2400pci.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2500pci.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2500usb.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2800usb.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2x00lib.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2x00pci.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2x00usb.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt61pci.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt73usb.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/rtl818x
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/rtl818x/rtl8180.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/rtl818x/rtl8187.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/wl12xx
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/wl12xx/wl1251.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/wl12xx/wl1251_sdio.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/wl3501_cs.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/zd1201.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/zd1211rw
+#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/zd1211rw/zd1211rw.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/net/yellowfin.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/parport
 #lib/modules/KVER-ipfire-xen/kernel/drivers/parport/parport.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/parport/parport_ax88796.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/parport/parport_cs.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/parport/parport_pc.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/pci
+#lib/modules/KVER-ipfire-xen/kernel/drivers/pci/pci-stub.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/pcmcia
 #lib/modules/KVER-ipfire-xen/kernel/drivers/pcmcia/i82092.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/pcmcia/pcmcia.ko
@@ -834,9 +998,40 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/drivers/pcmcia/pd6729.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/pcmcia/rsrc_nonstatic.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/pcmcia/yenta_socket.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/platform
+#lib/modules/KVER-ipfire-xen/kernel/drivers/platform/x86
+#lib/modules/KVER-ipfire-xen/kernel/drivers/platform/x86/acer-wmi.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/platform/x86/asus-laptop.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/platform/x86/asus_acpi.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/platform/x86/compal-laptop.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/platform/x86/dell-wmi.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/platform/x86/fujitsu-laptop.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/platform/x86/hp-wmi.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/platform/x86/intel_menlow.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/platform/x86/msi-laptop.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/platform/x86/msi-wmi.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/platform/x86/panasonic-laptop.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/platform/x86/sony-laptop.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/platform/x86/tc1100-wmi.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/platform/x86/thinkpad_acpi.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/platform/x86/topstar-laptop.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/platform/x86/toshiba_acpi.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/platform/x86/wmi.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/power
+#lib/modules/KVER-ipfire-xen/kernel/drivers/power/bq27x00_battery.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/power/ds2782_battery.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/power/max17040_battery.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/power/pcf50633-charger.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/power/wm831x_power.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/power/wm8350_power.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/pps
+#lib/modules/KVER-ipfire-xen/kernel/drivers/pps/pps_core.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/rtc
+#lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-ab3100.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-bq4802.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-cmos.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-core.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-ds1286.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-ds1307.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-ds1374.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-ds1511.ko
@@ -847,16 +1042,22 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-isl1208.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-lib.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-m41t80.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-m48t35.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-m48t59.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-m48t86.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-max6900.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-pcf50633.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-pcf8563.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-pcf8583.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-rs5c372.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-rx8025.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-rx8581.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-s35390a.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-stk17ta8.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-test.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-v3020.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-wm831x.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-wm8350.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-x1205.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/scsi
 #lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/3w-9xxx.ko
@@ -874,7 +1075,15 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/arcmsr
 #lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/arcmsr/arcmsr.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/atp870u.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/be2iscsi
+#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/be2iscsi/be2iscsi.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/bfa
+#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/bfa/bfa.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/bnx2i
+#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/bnx2i/bnx2i.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/ch.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/cxgb3i
+#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/cxgb3i/cxgb3i.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/dc395x.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/device_handler
 #lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/device_handler/scsi_dh.ko
@@ -885,15 +1094,24 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/dmx3191d.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/dpt_i2o.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/eata.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/fcoe
+#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/fcoe/fcoe.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/fcoe/libfcoe.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/fdomain.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/fnic
+#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/fnic/fnic.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/gdth.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/hpsa.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/hptiop.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/imm.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/initio.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/ipr.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/ips.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/iscsi_tcp.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/libfc
+#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/libfc/libfc.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/libiscsi.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/libiscsi_tcp.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/libsas
 #lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/libsas/libsas.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/lpfc
@@ -903,14 +1121,19 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/megaraid/megaraid_mbox.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/megaraid/megaraid_mm.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/megaraid/megaraid_sas.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/mvsas.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/mvsas
+#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/mvsas/mvsas.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/nsp32.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/osd
+#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/osd/libosd.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/osd/osd.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/pcmcia
 #lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/pcmcia/aha152x_cs.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/pcmcia/fdomain_cs.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/pcmcia/nsp_cs.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/pcmcia/qlogic_cs.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/pcmcia/sym53c500_cs.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/pmcraid.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/ppa.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/qla1280.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/qla2xxx
@@ -939,11 +1162,19 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/drivers/serial/serial_core.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/ssb
 #lib/modules/KVER-ipfire-xen/kernel/drivers/ssb/ssb.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/staging
+#lib/modules/KVER-ipfire-xen/kernel/drivers/staging/et131x
+#lib/modules/KVER-ipfire-xen/kernel/drivers/staging/et131x/et131x.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/staging/slicoss
+#lib/modules/KVER-ipfire-xen/kernel/drivers/staging/slicoss/slicoss.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/uio
 #lib/modules/KVER-ipfire-xen/kernel/drivers/uio/uio.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/uio/uio_aec.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/uio/uio_cif.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/uio/uio_pci_generic.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/uio/uio_pdrv.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/uio/uio_pdrv_genirq.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/uio/uio_sercos3.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/uio/uio_smx.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/usb
 #lib/modules/KVER-ipfire-xen/kernel/drivers/usb/atm
@@ -956,16 +1187,23 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/drivers/usb/class/cdc-acm.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/usb/class/cdc-wdm.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/usb/class/usblp.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/class/usbtmc.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/usb/core
 #lib/modules/KVER-ipfire-xen/kernel/drivers/usb/core/usbcore.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/usb/host
 #lib/modules/KVER-ipfire-xen/kernel/drivers/usb/host/ehci-hcd.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/host/hwa-hc.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/usb/host/isp116x-hcd.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/host/isp1362-hcd.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/usb/host/ohci-hcd.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/host/oxu210hp-hcd.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/usb/host/r8a66597-hcd.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/usb/host/sl811-hcd.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/usb/host/u132-hcd.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/usb/host/uhci-hcd.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/host/whci
+#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/host/whci/whci-hcd.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/host/xhci.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/usb/misc
 #lib/modules/KVER-ipfire-xen/kernel/drivers/usb/misc/berry_charge.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/usb/misc/cypress_cy7c63.ko
@@ -979,13 +1217,17 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/drivers/usb/misc/sisusbvga/sisusbvga.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/usb/misc/usblcd.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/usb/misc/usbled.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/misc/usbsevseg.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/usb/misc/uss720.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/misc/vstusb.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/otg
+#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/otg/nop-usb-xceiv.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/usb/serial
 #lib/modules/KVER-ipfire-xen/kernel/drivers/usb/serial/aircable.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/usb/serial/ark3116.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/usb/serial/belkin_sa.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/usb/serial/ch341.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/serial/cp2101.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/serial/cp210x.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/usb/serial/cypress_m8.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/usb/serial/digi_acceleport.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/usb/serial/empeg.ko
@@ -1000,17 +1242,48 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/drivers/usb/serial/mos7720.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/usb/serial/mos7840.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/usb/serial/moto_modem.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/serial/opticon.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/usb/serial/option.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/usb/serial/oti6858.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/usb/serial/pl2303.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/usb/serial/safe_serial.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/serial/siemens_mpi.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/usb/serial/sierra.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/usb/serial/spcp8x5.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/serial/symbolserial.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/usb/serial/ti_usb_3410_5052.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/usb/serial/usbserial.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/usb/serial/whiteheat.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/usb/storage
+#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/storage/ums-alauda.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/storage/ums-cypress.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/storage/ums-freecom.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/storage/ums-isd200.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/storage/ums-jumpshot.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/storage/ums-karma.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/storage/ums-onetouch.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/storage/ums-sddr09.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/storage/ums-sddr55.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/storage/ums-usbat.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/usb/storage/usb-storage.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/wusbcore
+#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/wusbcore/wusb-cbaf.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/wusbcore/wusb-wa.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/wusbcore/wusbcore.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/uwb
+#lib/modules/KVER-ipfire-xen/kernel/drivers/uwb/hwa-rc.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/uwb/i1480
+#lib/modules/KVER-ipfire-xen/kernel/drivers/uwb/i1480/dfu
+#lib/modules/KVER-ipfire-xen/kernel/drivers/uwb/i1480/dfu/i1480-dfu-usb.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/uwb/i1480/i1480-est.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/uwb/i1480/i1480u-wlp
+#lib/modules/KVER-ipfire-xen/kernel/drivers/uwb/i1480/i1480u-wlp/i1480u-wlp.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/uwb/umc.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/uwb/uwb.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/uwb/whc-rc.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/uwb/whci.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/uwb/wlp
+#lib/modules/KVER-ipfire-xen/kernel/drivers/uwb/wlp/wlp.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/video
 #lib/modules/KVER-ipfire-xen/kernel/drivers/video/arkfb.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/video/aty
@@ -1018,26 +1291,27 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/drivers/video/aty/atyfb.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/video/aty/radeonfb.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/video/backlight
-#lib/modules/KVER-ipfire-xen/kernel/drivers/video/backlight/corgi_bl.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/video/backlight/cr_bllcd.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/video/backlight/generic_bl.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/video/backlight/kb3886_bl.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/video/backlight/lcd.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/video/backlight/mbp_nvidia_bl.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/video/backlight/platform_lcd.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/video/backlight/progear_bl.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/video/backlight/wm831x_bl.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/video/broadsheetfb.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/video/cirrusfb.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/video/cyber2000fb.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/video/cyblafb.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/video/display
 #lib/modules/KVER-ipfire-xen/kernel/drivers/video/display/display.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/video/fb_ddc.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/video/fb_sys_fops.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/video/geode
 #lib/modules/KVER-ipfire-xen/kernel/drivers/video/geode/gx1fb.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/video/geode/gxfb.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/video/geode/lxfb.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/video/i810
 #lib/modules/KVER-ipfire-xen/kernel/drivers/video/i810/i810fb.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/video/intelfb
-#lib/modules/KVER-ipfire-xen/kernel/drivers/video/intelfb/intelfb.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/video/kyro
 #lib/modules/KVER-ipfire-xen/kernel/drivers/video/kyro/kyrofb.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/video/macmodes.ko
@@ -1052,6 +1326,9 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/drivers/video/matrox/matroxfb_g450.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/video/matrox/matroxfb_maven.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/video/matrox/matroxfb_misc.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/video/mb862xx
+#lib/modules/KVER-ipfire-xen/kernel/drivers/video/mb862xx/mb862xxfb.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/video/metronomefb.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/video/neofb.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/video/nvidia
 #lib/modules/KVER-ipfire-xen/kernel/drivers/video/nvidia/nvidiafb.ko
@@ -1068,13 +1345,19 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/drivers/video/sm501fb.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/video/sstfb.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/video/svgalib.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/video/syscopyarea.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/video/sysfillrect.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/video/sysimgblt.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/video/tdfxfb.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/video/tmiofb.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/video/tridentfb.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/video/uvesafb.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/video/vermilion
 #lib/modules/KVER-ipfire-xen/kernel/drivers/video/vermilion/crvml.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/video/vermilion/vmlfb.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/video/vgastate.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/video/via
+#lib/modules/KVER-ipfire-xen/kernel/drivers/video/via/viafb.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/video/vt8623fb.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/w1
 #lib/modules/KVER-ipfire-xen/kernel/drivers/w1/masters
@@ -1082,6 +1365,8 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/drivers/w1/masters/ds2490.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/w1/masters/matrox_w1.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/w1/slaves
+#lib/modules/KVER-ipfire-xen/kernel/drivers/w1/slaves/w1_bq27000.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/w1/slaves/w1_ds2431.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/w1/slaves/w1_ds2433.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/w1/slaves/w1_ds2760.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/w1/slaves/w1_smem.ko
@@ -1100,6 +1385,7 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/ib700wdt.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/ibmasr.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/it8712f_wdt.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/it87_wdt.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/machzwd.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/pc87413_wdt.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/pcwd_pci.ko
@@ -1108,24 +1394,33 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/sbc7240_wdt.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/sbc8360.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/sbc_epx_c3.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/sbc_fitpc2_wdt.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/sc1200wdt.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/sc520_wdt.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/sch311x_wdt.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/scx200_wdt.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/smsc37b787_wdt.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/softdog.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/w83627hf_wdt.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/w83697hf_wdt.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/w83697ug_wdt.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/w83877f_wdt.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/w83977f_wdt.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/wafer5823wdt.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/wdt_pci.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/wm831x_wdt.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/wm8350_wdt.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/xen
+#lib/modules/KVER-ipfire-xen/kernel/drivers/xen/blktap2
+#lib/modules/KVER-ipfire-xen/kernel/drivers/xen/blktap2/blktap2.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/xen/scsiback
 #lib/modules/KVER-ipfire-xen/kernel/drivers/xen/scsiback/xen-scsibk.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/xen/scsifront
 #lib/modules/KVER-ipfire-xen/kernel/drivers/xen/scsifront/xenscsi.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/xen/sfc_netback
-#lib/modules/KVER-ipfire-xen/kernel/drivers/xen/sfc_netback/sfc_netback.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/xen/usbback
+#lib/modules/KVER-ipfire-xen/kernel/drivers/xen/usbback/usbbk.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/xen/usbfront
+#lib/modules/KVER-ipfire-xen/kernel/drivers/xen/usbfront/xen-hcd.ko
 #lib/modules/KVER-ipfire-xen/kernel/fs
 #lib/modules/KVER-ipfire-xen/kernel/fs/autofs
 #lib/modules/KVER-ipfire-xen/kernel/fs/autofs/autofs.ko
@@ -1141,14 +1436,20 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/fs/ext2/ext2.ko
 #lib/modules/KVER-ipfire-xen/kernel/fs/ext3
 #lib/modules/KVER-ipfire-xen/kernel/fs/ext3/ext3.ko
+#lib/modules/KVER-ipfire-xen/kernel/fs/ext4
+#lib/modules/KVER-ipfire-xen/kernel/fs/ext4/ext4.ko
 #lib/modules/KVER-ipfire-xen/kernel/fs/fat
 #lib/modules/KVER-ipfire-xen/kernel/fs/fat/fat.ko
+#lib/modules/KVER-ipfire-xen/kernel/fs/fat/vfat.ko
 #lib/modules/KVER-ipfire-xen/kernel/fs/fuse
+#lib/modules/KVER-ipfire-xen/kernel/fs/fuse/cuse.ko
 #lib/modules/KVER-ipfire-xen/kernel/fs/fuse/fuse.ko
 #lib/modules/KVER-ipfire-xen/kernel/fs/isofs
 #lib/modules/KVER-ipfire-xen/kernel/fs/isofs/isofs.ko
 #lib/modules/KVER-ipfire-xen/kernel/fs/jbd
 #lib/modules/KVER-ipfire-xen/kernel/fs/jbd/jbd.ko
+#lib/modules/KVER-ipfire-xen/kernel/fs/jbd2
+#lib/modules/KVER-ipfire-xen/kernel/fs/jbd2/jbd2.ko
 #lib/modules/KVER-ipfire-xen/kernel/fs/jffs2
 #lib/modules/KVER-ipfire-xen/kernel/fs/jffs2/jffs2.ko
 #lib/modules/KVER-ipfire-xen/kernel/fs/jfs
@@ -1158,19 +1459,22 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/fs/mbcache.ko
 #lib/modules/KVER-ipfire-xen/kernel/fs/nfs
 #lib/modules/KVER-ipfire-xen/kernel/fs/nfs/nfs.ko
+#lib/modules/KVER-ipfire-xen/kernel/fs/nfs_common
+#lib/modules/KVER-ipfire-xen/kernel/fs/nfs_common/nfs_acl.ko
 #lib/modules/KVER-ipfire-xen/kernel/fs/nfsd
 #lib/modules/KVER-ipfire-xen/kernel/fs/nfsd/nfsd.ko
-#lib/modules/KVER-ipfire-xen/kernel/fs/quota_tree.ko
-#lib/modules/KVER-ipfire-xen/kernel/fs/quota_v1.ko
-#lib/modules/KVER-ipfire-xen/kernel/fs/quota_v2.ko
+#lib/modules/KVER-ipfire-xen/kernel/fs/quota
+#lib/modules/KVER-ipfire-xen/kernel/fs/quota/quota_tree.ko
+#lib/modules/KVER-ipfire-xen/kernel/fs/quota/quota_v1.ko
+#lib/modules/KVER-ipfire-xen/kernel/fs/quota/quota_v2.ko
+#lib/modules/KVER-ipfire-xen/kernel/fs/reiser4
+#lib/modules/KVER-ipfire-xen/kernel/fs/reiser4/reiser4.ko
 #lib/modules/KVER-ipfire-xen/kernel/fs/reiserfs
 #lib/modules/KVER-ipfire-xen/kernel/fs/reiserfs/reiserfs.ko
 #lib/modules/KVER-ipfire-xen/kernel/fs/smbfs
 #lib/modules/KVER-ipfire-xen/kernel/fs/smbfs/smbfs.ko
 #lib/modules/KVER-ipfire-xen/kernel/fs/udf
 #lib/modules/KVER-ipfire-xen/kernel/fs/udf/udf.ko
-#lib/modules/KVER-ipfire-xen/kernel/fs/vfat
-#lib/modules/KVER-ipfire-xen/kernel/fs/vfat/vfat.ko
 #lib/modules/KVER-ipfire-xen/kernel/fs/xfs
 #lib/modules/KVER-ipfire-xen/kernel/fs/xfs/xfs.ko
 #lib/modules/KVER-ipfire-xen/kernel/lib
@@ -1235,17 +1539,14 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/net/bridge/netfilter/ebtable_filter.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/bridge/netfilter/ebtable_nat.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/bridge/netfilter/ebtables.ko
-#lib/modules/KVER-ipfire-xen/kernel/net/ieee80211
-#lib/modules/KVER-ipfire-xen/kernel/net/ieee80211/ieee80211.ko
-#lib/modules/KVER-ipfire-xen/kernel/net/ieee80211/ieee80211_crypt.ko
-#lib/modules/KVER-ipfire-xen/kernel/net/ieee80211/ieee80211_crypt_ccmp.ko
-#lib/modules/KVER-ipfire-xen/kernel/net/ieee80211/ieee80211_crypt_tkip.ko
-#lib/modules/KVER-ipfire-xen/kernel/net/ieee80211/ieee80211_crypt_wep.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ieee802154
+#lib/modules/KVER-ipfire-xen/kernel/net/ieee802154/af_802154.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ieee802154/nl802154.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ieee802154/wpan-class.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/ipv4
 #lib/modules/KVER-ipfire-xen/kernel/net/ipv4/ah4.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/ipv4/esp4.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/ipv4/inet_diag.ko
-#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/inet_lro.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/ipv4/ip_gre.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/ipv4/ipcomp.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/ipv4/ipip.ko
@@ -1262,20 +1563,18 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/ipt_NETMAP.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/ipt_REDIRECT.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/ipt_REJECT.ko
-#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/ipt_TTL.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/ipt_ULOG.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/ipt_addrtype.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/ipt_ah.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/ipt_ecn.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/ipt_ipp2p.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/ipt_ipv4options.ko
-#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/ipt_recent.ko
-#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/ipt_ttl.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/iptable_filter.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/iptable_mangle.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/iptable_nat.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/iptable_raw.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/nf_conntrack_ipv4.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/nf_defrag_ipv4.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/nf_nat.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/nf_nat_amanda.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/nf_nat_ftp.ko
@@ -1336,6 +1635,7 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/net/netfilter/nf_conntrack_sip.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/netfilter/nf_conntrack_slp.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/netfilter/nf_conntrack_tftp.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/nf_tproxy_core.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/netfilter/nfnetlink.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/netfilter/nfnetlink_log.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/netfilter/nfnetlink_queue.ko
@@ -1343,7 +1643,9 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_CLASSIFY.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_CONNMARK.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_DSCP.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_HL.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_IMQ.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_LED.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_MARK.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_NFLOG.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_NFQUEUE.ko
@@ -1351,7 +1653,9 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_RATEEST.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_TCPMSS.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_TCPOPTSTRIP.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_TPROXY.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_TRACE.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_cluster.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_comment.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_connbytes.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_connlimit.ko
@@ -1362,6 +1666,7 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_esp.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_hashlimit.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_helper.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_hl.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_iprange.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_layer7.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_length.ko
@@ -1369,6 +1674,7 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_mac.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_mark.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_multiport.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_osf.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_owner.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_physdev.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_pkttype.ko
@@ -1376,7 +1682,9 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_quota.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_rateest.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_realm.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_recent.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_sctp.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_socket.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_state.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_statistic.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_string.ko
@@ -1384,8 +1692,13 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_tcpudp.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_time.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_u32.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/phonet
+#lib/modules/KVER-ipfire-xen/kernel/net/phonet/phonet.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/phonet/pn_pep.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/rds
+#lib/modules/KVER-ipfire-xen/kernel/net/rds/rds.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/rds/rds_tcp.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/rfkill
-#lib/modules/KVER-ipfire-xen/kernel/net/rfkill/rfkill-input.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/rfkill/rfkill.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/rxrpc
 #lib/modules/KVER-ipfire-xen/kernel/net/rxrpc/af-rxrpc.ko
@@ -1397,6 +1710,7 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/net/sched/act_nat.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/sched/act_pedit.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/sched/act_police.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/sched/act_skbedit.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/sched/cls_basic.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/sched/cls_flow.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/sched/cls_fw.ko
@@ -1411,6 +1725,7 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/net/sched/em_u32.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/sched/sch_atm.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/sched/sch_cbq.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/sched/sch_drr.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/sched/sch_dsmark.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/sched/sch_gred.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/sched/sch_hfsc.ko
@@ -1428,8 +1743,14 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/net/sunrpc/auth_gss/auth_rpcgss.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/sunrpc/auth_gss/rpcsec_gss_krb5.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/sunrpc/sunrpc.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/wimax
+#lib/modules/KVER-ipfire-xen/kernel/net/wimax/wimax.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/wireless
 #lib/modules/KVER-ipfire-xen/kernel/net/wireless/cfg80211.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/wireless/lib80211.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/wireless/lib80211_crypt_ccmp.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/wireless/lib80211_crypt_tkip.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/wireless/lib80211_crypt_wep.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/xfrm
 #lib/modules/KVER-ipfire-xen/kernel/net/xfrm/xfrm_ipcomp.ko
 #lib/modules/KVER-ipfire-xen/kernel/net/xfrm/xfrm_user.ko
@@ -1497,6 +1818,8 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/sound/pci/cs46xx/snd-cs46xx.ko
 #lib/modules/KVER-ipfire-xen/kernel/sound/pci/cs5535audio
 #lib/modules/KVER-ipfire-xen/kernel/sound/pci/cs5535audio/snd-cs5535audio.ko
+#lib/modules/KVER-ipfire-xen/kernel/sound/pci/ctxfi
+#lib/modules/KVER-ipfire-xen/kernel/sound/pci/ctxfi/snd-ctxfi.ko
 #lib/modules/KVER-ipfire-xen/kernel/sound/pci/echoaudio
 #lib/modules/KVER-ipfire-xen/kernel/sound/pci/echoaudio/snd-darla20.ko
 #lib/modules/KVER-ipfire-xen/kernel/sound/pci/echoaudio/snd-darla24.ko
@@ -1505,7 +1828,9 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/sound/pci/echoaudio/snd-gina24.ko
 #lib/modules/KVER-ipfire-xen/kernel/sound/pci/echoaudio/snd-indigo.ko
 #lib/modules/KVER-ipfire-xen/kernel/sound/pci/echoaudio/snd-indigodj.ko
+#lib/modules/KVER-ipfire-xen/kernel/sound/pci/echoaudio/snd-indigodjx.ko
 #lib/modules/KVER-ipfire-xen/kernel/sound/pci/echoaudio/snd-indigoio.ko
+#lib/modules/KVER-ipfire-xen/kernel/sound/pci/echoaudio/snd-indigoiox.ko
 #lib/modules/KVER-ipfire-xen/kernel/sound/pci/echoaudio/snd-layla20.ko
 #lib/modules/KVER-ipfire-xen/kernel/sound/pci/echoaudio/snd-layla24.ko
 #lib/modules/KVER-ipfire-xen/kernel/sound/pci/echoaudio/snd-mia.ko
@@ -1515,6 +1840,19 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/sound/pci/emu10k1/snd-emu10k1.ko
 #lib/modules/KVER-ipfire-xen/kernel/sound/pci/emu10k1/snd-emu10k1x.ko
 #lib/modules/KVER-ipfire-xen/kernel/sound/pci/hda
+#lib/modules/KVER-ipfire-xen/kernel/sound/pci/hda/snd-hda-codec-analog.ko
+#lib/modules/KVER-ipfire-xen/kernel/sound/pci/hda/snd-hda-codec-atihdmi.ko
+#lib/modules/KVER-ipfire-xen/kernel/sound/pci/hda/snd-hda-codec-ca0110.ko
+#lib/modules/KVER-ipfire-xen/kernel/sound/pci/hda/snd-hda-codec-cirrus.ko
+#lib/modules/KVER-ipfire-xen/kernel/sound/pci/hda/snd-hda-codec-cmedia.ko
+#lib/modules/KVER-ipfire-xen/kernel/sound/pci/hda/snd-hda-codec-conexant.ko
+#lib/modules/KVER-ipfire-xen/kernel/sound/pci/hda/snd-hda-codec-idt.ko
+#lib/modules/KVER-ipfire-xen/kernel/sound/pci/hda/snd-hda-codec-intelhdmi.ko
+#lib/modules/KVER-ipfire-xen/kernel/sound/pci/hda/snd-hda-codec-nvhdmi.ko
+#lib/modules/KVER-ipfire-xen/kernel/sound/pci/hda/snd-hda-codec-realtek.ko
+#lib/modules/KVER-ipfire-xen/kernel/sound/pci/hda/snd-hda-codec-si3054.ko
+#lib/modules/KVER-ipfire-xen/kernel/sound/pci/hda/snd-hda-codec-via.ko
+#lib/modules/KVER-ipfire-xen/kernel/sound/pci/hda/snd-hda-codec.ko
 #lib/modules/KVER-ipfire-xen/kernel/sound/pci/hda/snd-hda-intel.ko
 #lib/modules/KVER-ipfire-xen/kernel/sound/pci/ice1712
 #lib/modules/KVER-ipfire-xen/kernel/sound/pci/ice1712/snd-ice1712.ko
@@ -1522,6 +1860,8 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/sound/pci/ice1712/snd-ice17xx-ak4xxx.ko
 #lib/modules/KVER-ipfire-xen/kernel/sound/pci/korg1212
 #lib/modules/KVER-ipfire-xen/kernel/sound/pci/korg1212/snd-korg1212.ko
+#lib/modules/KVER-ipfire-xen/kernel/sound/pci/lx6464es
+#lib/modules/KVER-ipfire-xen/kernel/sound/pci/lx6464es/snd-lx6464es.ko
 #lib/modules/KVER-ipfire-xen/kernel/sound/pci/mixart
 #lib/modules/KVER-ipfire-xen/kernel/sound/pci/mixart/snd-mixart.ko
 #lib/modules/KVER-ipfire-xen/kernel/sound/pci/nm256
@@ -1574,6 +1914,42 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/sound/pcmcia/vx
 #lib/modules/KVER-ipfire-xen/kernel/sound/pcmcia/vx/snd-vxpocket.ko
 #lib/modules/KVER-ipfire-xen/kernel/sound/soc
+#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs
+#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-ad73311.ko
+#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-ak4535.ko
+#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-ak4642.ko
+#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-cs4270.ko
+#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-l3.ko
+#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-max9877.ko
+#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-pcm3008.ko
+#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-spdif.ko
+#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-ssm2602.ko
+#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-tlv320aic23.ko
+#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-tlv320aic3x.ko
+#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-uda134x.ko
+#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-uda1380.ko
+#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm-hubs.ko
+#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8350.ko
+#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8400.ko
+#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8510.ko
+#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8523.ko
+#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8580.ko
+#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8728.ko
+#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8731.ko
+#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8750.ko
+#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8753.ko
+#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8776.ko
+#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8900.ko
+#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8903.ko
+#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8940.ko
+#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8960.ko
+#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8961.ko
+#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8971.ko
+#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8974.ko
+#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8988.ko
+#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8990.ko
+#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8993.ko
+#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm9081.ko
 #lib/modules/KVER-ipfire-xen/kernel/sound/soc/snd-soc-core.ko
 #lib/modules/KVER-ipfire-xen/kernel/sound/soundcore.ko
 #lib/modules/KVER-ipfire-xen/kernel/sound/synth
@@ -1586,6 +1962,7 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/sound/usb/snd-usb-audio.ko
 #lib/modules/KVER-ipfire-xen/kernel/sound/usb/snd-usb-lib.ko
 #lib/modules/KVER-ipfire-xen/kernel/sound/usb/usx2y
+#lib/modules/KVER-ipfire-xen/kernel/sound/usb/usx2y/snd-usb-us122l.ko
 #lib/modules/KVER-ipfire-xen/kernel/sound/usb/usx2y/snd-usb-usx2y.ko
 #lib/modules/KVER-ipfire-xen/modules.alias
 #lib/modules/KVER-ipfire-xen/modules.alias.bin

diff --git a/config/rootfiles/packages/pound b/config/rootfiles/packages/pound
new file mode 100644 (file)
index 0000000..9416223
--- /dev/null
+++ b/config/rootfiles/packages/pound
@@ -0,0 +1,10 @@
+#etc/pound.cfg
+usr/sbin/pound
+usr/sbin/poundctl
+#usr/share/man/man8/pound.8
+#usr/share/man/man8/poundctl.8
+var/ipfire/backup/addons/includes/pound
+etc/rc.d/init.d/pound
+usr/lib/libpcreposix.so
+usr/lib/libpcreposix.so.0
+usr/lib/libpcreposix.so.0.0.0
\ No newline at end of file

diff --git a/config/uClibc/busybox.config b/config/uClibc/busybox.config
index dfe2a3003d2094bd56bdf17cd7cf72fe954e2330..9682385133e282e0df62f99c84e003667657ecc9 100644 (file)
--- a/config/uClibc/busybox.config
+++ b/config/uClibc/busybox.config
@@ -86,7 +86,7 @@ CONFIG_GZIP=y
 CONFIG_TAR=y
 # CONFIG_FEATURE_TAR_CREATE is not set
 CONFIG_FEATURE_TAR_BZIP2=y
-# CONFIG_FEATURE_TAR_LZMA is not set
+CONFIG_FEATURE_TAR_LZMA=y
 # CONFIG_FEATURE_TAR_FROM is not set
 CONFIG_FEATURE_TAR_GZIP=y
 # CONFIG_FEATURE_TAR_COMPRESS is not set

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index f06d008f412a235daf56a04ba652a4f129370123..416113e1f80dcf486160d08e88f4dc7032e98c96 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -1,4 +1,4 @@
-== List of softwares used to build IPFire Version: 2.5 ==
+== List of softwares used to build IPFire Version: 2.6 ==
 * Archive-Tar-1.29
 * Archive-Zip-1.16
 * BerkeleyDB-0.27
@@ -36,17 +36,13 @@
 * Unix-Syslog-0.100
 * XML-Parser-2.34
 * alsa-lib-1.0.22
-* alsa-lib-1.0.22-kmod-2.6.27.42-ipfire
+* alsa-lib-1.0.22-kmod-2.6.32.10-ipfire
 * amavisd-new-2.5.2
 * apcupsd-3.14.4
 * applejuice-0.31
 * arping-2.05
 * as86-0.16.17
 * asterisk-1.4.28
-* atl1c-kmod-2.6.27.42-ipfire
-* atl1c-kmod-2.6.27.42-ipfire-xen
-* atl2-2.0.5-kmod-2.6.27.42-ipfire
-* atl2-2.0.5-kmod-2.6.27.42-ipfire-xen
 * autoconf-2.59
 * automake-1.9.6
 * backup-ipfire
@@ -65,42 +61,38 @@
 * cacti-0.8.7e
 * calamaris-2.59
 * capi4k-utils-2005-07-18
-* ccache-2.4
+* ccache-3.0pre0
 * cdrtools-2.01.01
 * centerim-4.22.1
 * clamav-0.95.3
 * cmake-2.4.8
-* collectd-4.5.3
-* compat-wireless-2.6.32.2-kmod-2.6.27.42-ipfire
-* compat-wireless-2.6.32.2-kmod-2.6.27.42-ipfire-xen
+* collectd-4.9.1
 * coreutils-5.96
 * cpio-2.6
 * cpufrequtils-007
+* cryptodev-20091126-kmod-2.6.32.10-ipfire
+* cryptodev-20091126-kmod-2.6.32.10-ipfire-xen
 * cups-1.4.2
 * curl-7.19.5
 * cyrus-imapd-2.2.12
 * cyrus-sasl-2.1.21
-* dahdi-2.2.0.2
-* dahdi-2.2.0.2-kmod-2.6.27.42-ipfire
-* dahdi-2.2.0.2-kmod-2.6.27.42-ipfire-xen
+* dahdi-2.2.1
+* dahdi-2.2.1-kmod-2.6.32.10-ipfire
+* dahdi-2.2.1-kmod-2.6.32.10-ipfire-xen
 * db-4.4.20
 * dbus-1.0.3
 * dhcp-3.1.0
 * dhcpcd-5.1.3
 * diffutils-2.8.1
 * dnsmasq-2.45
-* dosfstools-2.11
-* e1000e-1.0.2.5-kmod-2.6.27.42-ipfire
-* e1000e-1.0.2.5-kmod-2.6.27.42-ipfire-xen
-* e2fsprogs-1.39
+* dosfstools-3.0.9
+* e2fsprogs-1.41.11
 * ebtables-v2.0.8-2
 * ed-0.2
 * eject-2.1.5
 * elinks-0.11.6
 * esniper-2-19-0
 * espgs-8.15.1
-* et131x-kmod-2.6.27.42-ipfire
-* et131x-kmod-2.6.27.42-ipfire-xen
 * etherwake-1.09
 * ethtool-3
 * expat-2.0.0
@@ -118,7 +110,7 @@
 * foomatic-3.0-20070813
 * freefont-20060126
 * freetype-2.1.10
-* fuse-2.7.4
+* fuse-2.8.3
 * fwhits
 * gawk-3.1.5
 * gcc-4.0.4
@@ -141,8 +133,6 @@
 * hdparm-8.9
 * hostapd-0.7.1
 * hplip-2.7.10
-* hso-1.9-kmod-2.6.27.42-ipfire
-* hso-1.9-kmod-2.6.27.42-ipfire-xen
 * htop-0.8.1
 * httpd-2.2.15
 * hwdata
@@ -157,7 +147,7 @@
 * iperf-2.0.4
 * ipfireseeder-1.00
 * iproute2-2.6.16-060323
-* iptables-1.4.2
+* iptables-1.4.6
 * iptstate-2.1
 * iputils-ss020927
 * iw-0.9.15
@@ -166,10 +156,9 @@
 * jpegsrc.v6b
 * kbd-1.12
 * klibc-1.5.14
-* kqemu-1.4.0pre1-kmod-2.6.27.42-ipfire
-* kqemu-1.4.0pre1-kmod-2.6.27.42-ipfire-xen
+* kqemu-1.4.0pre1-kmod-2.6.32.10-ipfire
+* kqemu-1.4.0pre1-kmod-2.6.32.10-ipfire-xen
 * kudzu-1.2.64
-* kvm-kmod-2.6.31.5-kmod-2.6.27.42-ipfire
 * l7-protocols-2009-05-10
 * lame-3.97
 * lcd4linux-0.10.1-RC2
@@ -186,6 +175,7 @@
 * libnet-1.1.2.1
 * libnl-1.1
 * libogg-1.1.4
+* liboping-1.3.4
 * libpcap-1.0.0
 * libpng-1.2.12
 * libpri-1.4.10.2
@@ -200,9 +190,10 @@
 * libwww-perl-5.803
 * libxml2-2.6.26
 * libxslt-1.1.17
-* linux-2.6.27.42-ipfire
-* linux-2.6.27.42-ipfire-xen
+* linux-2.6.32.10-ipfire
+* linux-2.6.32.10-ipfire-xen
 * linux-atm-2.4.1
+* linux-firmware-20100318
 * linux-libc-headers-2.6.12.0
 * lm_sensors-3.1.2
 * logrotate-3.7.1
@@ -211,11 +202,9 @@
 * lynis-1.2.9
 * lzo-2.02
 * m4-1.4.4
-* mISDN_20090906-kmod-2.6.27.42-ipfire
-* mISDN_20090906-kmod-2.6.27.42-ipfire-xen
 * mISDNuser_20090906
-* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.27.42-ipfire
-* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.27.42-ipfire-xen
+* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.10-ipfire
+* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.10-ipfire-xen
 * make-3.81
 * man-db-2.4.3
 * man-pages-2.34
@@ -263,9 +252,6 @@
 * openmailadmin-1.0.0
 * openssh-5.4p1
 * openssl-0.9.8n
-* openswan-2.6.23
-* openswan-2.6.23-kmod-2.6.27.42-ipfire
-* openswan-2.6.23-kmod-2.6.27.42-ipfire-xen
 * openvpn-2.1_rc20
 * p7zip_4.65
 * pam_mysql-0.7RC1
@@ -287,17 +273,11 @@
 * psmisc-22.2
 * qemu-0.11.0-kqemu
 * qemu-0.12.2
-* r8101-kmod-2.6.27.42-ipfire
-* r8101-kmod-2.6.27.42-ipfire-xen
-* r8168-8.014.00-kmod-2.6.27.42-ipfire
-* r8168-8.014.00-kmod-2.6.27.42-ipfire-xen
-* r8169-6.011.00-kmod-2.6.27.42-ipfire
-* r8169-6.011.00-kmod-2.6.27.42-ipfire-xen
 * readline-5.1
-* reiser4progs-1.0.5
-* reiserfsprogs-3.6.19
+* reiser4progs-1.0.6
+* reiserfsprogs-3.6.21
 * rp-pppoe-3.8
-* rrdtool-1.2.15
+* rrdtool-1.2.30
 * rssdler-0.4.0a
 * rsync-3.0.7
 * rtorrent-0.8.6
@@ -316,16 +296,17 @@
 * spandsp-0.0.6pre12
 * splix-2.0.0-rc2
 * sqlite-3.6.10
-* squashfs3.4
+* squashfs-lzma-cvs20100214
 * squid-2.7.STABLE7
 * squidGuard-1.4.1
 * squidclamav-5.2
 * sshfs-fuse-2.2
 * sslh-1.7a
 * streamripper-1.63.5
+* strongswan-4.3.6
 * sudo-1.6.8p12
 * sysfsutils-1.3.0
-* sysklogd-1.4.1
+* sysklogd-1.5
 * syslinux-3.62
 * sysstat-6.0.2
 * sysvinit-2.86
@@ -348,8 +329,8 @@
 * usb_modeswitch-1.0.6
 * usbutils-0.72
 * util-linux-2.12r
-* v4l-dvb-9defbd461e5f-kmod-2.6.27.42-ipfire
-* v4l-dvb-9defbd461e5f-kmod-2.6.27.42-ipfire-xen
+* v4l-dvb-690055993011-kmod-2.6.32.10-ipfire
+* v4l-dvb-690055993011-kmod-2.6.32.10-ipfire-xen
 * vdr-1.6.0
 * vdradmin-am-3.6.5
 * vim-7.0
@@ -367,5 +348,6 @@
 * wpa_supplicant-0.6.9
 * xfsprogs-2.9.4
 * xvidcore-1.2.1
+* xz-4.999.9beta
 * zerofree-1.0.1
 * zlib-1.2.3

diff --git a/html/cgi-bin/connections.cgi b/html/cgi-bin/connections.cgi
index 9cf4f68520fd8742b1aaeb1bb9ef1c1de4c0bfbc..b370d12881ef8bec2bf208c0d64efc013d66e8bb 100644 (file)
--- a/html/cgi-bin/connections.cgi
+++ b/html/cgi-bin/connections.cgi
@@ -57,7 +57,7 @@ if (open(IP, "${General::swroot}/red/local-ipaddress")) {
         push(@colour, ${Header::colourfw} );
 }
 
-my @vpn = ` route -n | grep ipsec | awk '{ print \$1" "\$3}'`;
+my @vpn = `grep "rightsubnet=" /etc/ipsec.conf | cut -f2 -d"=" | sed "s|/| |g"`;
   foreach my $route (@vpn) {
                 chomp($route);
                 my @temp = split(/[\t ]+/, $route);

diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi
index 6a78baa9bc12bba26eee9b70f2552e2ed01f9840..dfe65bf81be1f9a8e3b053bd8aff1fecd5403d51 100644 (file)
--- a/html/cgi-bin/index.cgi
+++ b/html/cgi-bin/index.cgi
@@ -337,7 +337,7 @@ END
        if ( `cat /var/ipfire/vpn/settings | grep ^ENABLED=on` ||
             `cat /var/ipfire/vpn/settings | grep ^ENABLED_BLUE=on` ) { 
                my $ipsecip = `cat /var/ipfire/vpn/settings | grep ^VPN_IP= | cut -c 8-`;
-               my @status = `/usr/sbin/ipsec auto --status`;
+               my @status = `/usr/local/bin/ipsecctrl I`;
                my %confighash = ();
                &General::readhasharray("${General::swroot}/vpn/config", \%confighash);
                print <<END;

diff --git a/html/cgi-bin/iptables.cgi b/html/cgi-bin/iptables.cgi
index 7f29365a898e56669ebfbacc12bc4ced436f9219..080371b375c6aee211fb5a27e4a39686c2c243f8 100644 (file)
--- a/html/cgi-bin/iptables.cgi
+++ b/html/cgi-bin/iptables.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2010  IPFire Team                                             #
 #                                                                             #
 # 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        #
@@ -23,100 +23,414 @@ require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
 
+#use warnings;
+#use CGI::Carp 'fatalsToBrowser';
+
+my $debug = 0;
 my @iplines;
+my $string = "";
 my $lines = 0;
 my @ipmanlines;
 my $manlines = 0;
 my @ipnatlines;
 my $natlines = 0;
+my %chains;
+my %chainsman;
+my %chainsnat;
+my $chainname;
+my $selectedchain;
+my %netsettings = ();
+my %cgiparams=();
+
+&Header::getcgihash(\%cgiparams);
 
 system('/usr/local/bin/getipstat');
 
 &Header::showhttpheaders();
 &Header::openpage($Lang::tr{'ipts'}, 1, '');
 &Header::openbigbox('100%', 'LEFT');
+
+# This debug is used to see what inputs are done via the cgi and
+# what parameters are to be executed
+
+if ( $debug ){
+       &Header::openbox('100%', 'center', 'DEBUG');
+       my $debugCount = 0;
+       foreach my $line (sort keys %cgiparams) {
+               print "$line = '$cgiparams{$line}'<br />\n";
+               $debugCount++;
+       }
+       print "&nbsp;Count: $debugCount\n";
+       &Header::closebox();
+}
+
 &Header::openbox('100%', 'LEFT', $Lang::tr{'ipts'}.':');
+
+# If the cgi is called the first time the default chain is
+# used, otherwise if user selected a chains in the selectboxes
+# those one are displayed, it is possible to change all 3 at
+# the same time
+
+if ( $cgiparams{'selectedchain'} ne "" ){
+       my @multi = split(/\|/,$cgiparams{'selectedchain'});
+       $selectedchain = $multi[0];
+} else {
+       $selectedchain = "INPUT";
+}
+
 print <<END
 
-    <DIV align='left'>
-    <PRE>
+<DIV align='left'>
 END
 ;
+
+# We´ll open the txt files and extract each line, if the line
+# start with an Chain the the name, start- and endline of the
+# chain is extracted into a hash
+
        open (FILE, '/srv/web/ipfire/html/iptables.txt');
-       while (<FILE>)
-       {
-               $iplines[$lines] = $_;
+       while (<FILE>){
+
+               $iplines[$lines] = $_;
+
+               if ( $_ =~ /^Chain/  ){
+
+                       my @chainstring = split(/ /,$_);
+
+                       if ( $chainname ne "" ){
+                               $chains{$chainname."end"} = $lines-2;
+                       }
+
+                       $chainname = $chainstring[1];
+                       $chains{$chainname."start"} = $lines; 
+               }
+
                $lines++;
-       }
+          
+       }
        close (FILE);
-       foreach $_ (@iplines) {
-               print "$_"; }
 
-print <<END
-    </PRE>
-    </DIV>
-    <BR> 
+# now the chain hash is extracted to get the correct name of the chain
+# all chains are displayed as a select box and can be choosen for display
+# after this all corresponding lines for the chain are extraced and seperated
+# into table rows, sometimes we need to handle leading blank so the offset is
+# needed, some lines need to chomp trailing seperators. The interfaces and
+# network addresses should be colorized by an extra function to make a nice
+# colored gui
 
-END
-;
+       print "<form method='post' action='$ENV{'SCRIPT_NAME'}'>\n<select name='selectedchain' style='width: 250px'>\n";
+       foreach (keys(%chains)){
+
+               if ( $_ =~ /end$/ ){
+                       next;
+               } else {
+                       $_ =~ s/start$//gi;
+               }
+
+               print "   <option value='".$_;
+               if ( $_ eq $selectedchain ){
+                       print "' selected='selected' >".$_."</option>\n";
+               } else {
+                       print "'>".$_."</option>\n";
+               }
+       }
+       print "</select><input type='submit' name='ACTION' value='$Lang::tr{'update'}' /><form><br /><br />\n\n";
+
+       $string = $iplines[$chains{$selectedchain."start"}];
+       $string =~ s/\s$//gi;
+
+       print "<strong>".$string."</strong><br />\n\n";
+       print "<table width='100%' cellspacing='1'>\n<tr>\n";
+       foreach (split(/ +/,$iplines[$chains{$selectedchain."start"}+1])){
+               if ( $_  =~ /[^a-zA-Z]/ ){chomp($_);}
+               print "   <th align='left'><strong>".$_."</strong></th>\n";
+       }
+
+       print "</tr>\n";
+
+       print "<tr>\n";
+       print "   <td width='0'></td>\n   <td width='35'></td>\n   <td width='35'></td>\n";
+       print "   <td width='130'></td>\n   <td width='30'></td>\n";
+       print "   <td width='30'></td>\n   <td width='40'></td>\n";
+       print "   <td width='40'></td>\n   <td width='95'></td>\n";
+       print "   <td width='95'></td>\n   <td width='260'></td>\n";
+       print "</tr>\n";
+
+
+       for(my $i = $chains{$selectedchain."start"}+2; $i <= $chains{$selectedchain."end"}; $i++) {
+               print "<tr>\n";
+
+               my @iptablesline = split(/ +/,$iplines[$i]);
+               my $offset=0;
+
+                if ( $iptablesline[0] eq "" ){
+                       $offset=1;
+                }
+
+               print "   <td></td>\n   <td>".$iptablesline[0+$offset]."</td>\n   <td>".$iptablesline[1+$offset]."</td>\n";
+               print "   <td>".$iptablesline[2+$offset]."</td>\n   <td>".$iptablesline[3+$offset]."</td>\n";
+               print "   <td>".$iptablesline[4+$offset]."</td>\n   <td>".&Header::colorize($iptablesline[5+$offset])."</td>\n";
+               print "   <td>".&Header::colorize($iptablesline[6+$offset])."</td>\n";
+               print "   <td>".&Header::colorize($iptablesline[7+$offset])."</td>\n";
+               print "   <td>".&Header::colorize($iptablesline[8+$offset])."</td>\n   <td>";
+
+               for (my $i=9+$offset; $i <= $#iptablesline; $i++){
+                       $string = $iptablesline[$i];
+                       $string =~ s/\s$//gi;
+                       print " ".$string;
+               }
+               print "</td>\n</tr>\n";
+       }
+print "</table></DIV><br />";
 &Header::closebox();
 
 ## MANGLE
 &Header::openbox('100%', 'LEFT', $Lang::tr{'iptmangles'}.':');
+
+# If the cgi is called the first time the default chain is
+# used, otherwise if user selected a chains in the selectboxes
+# those one are displayed, it is possible to change all 3 at
+# the same time
+
+if ( $cgiparams{'selectedchain'} ne "" ){
+       my @multi = split(/\|/,$cgiparams{'selectedchain'});
+       $selectedchain = $multi[1];
+} else {
+       $selectedchain = "PREROUTING";
+}
+
 print <<END
 
-    <DIV align='left'>
-    <PRE>
+<DIV align='left'>
 END
 ;
-       open (FILEMAN, '/srv/web/ipfire/html/iptablesmangle.txt');
-       while (<FILEMAN>)
-       {
-               $ipmanlines[$manlines] = $_;
+
+# We´ll open the txt files and extract each line, if the line
+# start with an Chain the the name, start- and endline of the
+# chain is extracted into a hash
+
+       open (FILE, '/srv/web/ipfire/html/iptablesmangle.txt');
+       while (<FILE>){
+
+               $ipmlines[$manlines] = $_;
+
+               if ( $_ =~ /^Chain/  ){
+
+                       my @chainstring = split(/ /,$_);
+
+                       if ( $chainname ne "" ){
+                               $chainsman{$chainname."end"} = $manlines-2;
+                       }
+
+                       $chainname = $chainstring[1];
+                       $chainsman{$chainname."start"} = $manlines; 
+               }
+
                $manlines++;
-       }
-       close (FILEMAN);
-       foreach $_ (@ipmanlines) {
-               print "$_"; }
+          
+       }
+       close (FILE);
 
-print <<END
-    </PRE>
-    </DIV>
-    <BR> 
+# now the chain hash is extracted to get the correct name of the chain
+# all chains are displayed as a select box and can be choosen for display
+# after this all corresponding lines for the chain are extraced and seperated
+# into table rows, sometimes we need to handle leading blank so the offset is
+# needed, some lines need to chomp trailing seperators. The interfaces and
+# network addresses should be colorized by an extra function to make a nice
+# colored gui
 
-END
-;
+       print "<form method='post' action='$ENV{'SCRIPT_NAME'}'>\n<select name='selectedchain' style='width: 250px'>\n";
+       foreach (keys(%chainsman)){
+
+               if ( $_ =~ /end$/ ){
+                       next;
+               } else {
+                       $_ =~ s/start$//gi;
+               }
+
+               print "   <option value='".$_;
+               if ( $_ eq $selectedchain ){
+                       print "' selected='selected' >".$_."</option>\n";
+               } else {
+                       print "'>".$_."</option>\n";
+               }
+       }
+       print "</select><input type='submit' name='ACTION' value='$Lang::tr{'update'}' /><form><br /><br />\n\n";
+
+       $string = $ipmanlines[$chainsman{$selectedchain."start"}];
+       $string =~ s/\s$//gi;
+
+       print "<strong>".$string."</strong><br />\n\n";
+       print "<table width='100%' cellspacing='1'>\n<tr>\n";
+       foreach (split(/ +/,$ipmlines[$chainsman{$selectedchain."start"}+1])){
+               if ( $_  =~ /[^a-zA-Z]/ ){chomp($_);}
+               print "   <th align='left'><strong>".$_."</strong></th>\n";
+       }
+
+       print "</tr>\n";
+
+       print "<tr>\n";
+       print "   <td width='0'></td>\n   <td width='35'></td>\n   <td width='35'></td>\n";
+       print "   <td width='130'></td>\n   <td width='30'></td>\n";
+       print "   <td width='30'></td>\n   <td width='40'></td>\n";
+       print "   <td width='40'></td>\n   <td width='95'></td>\n";
+       print "   <td width='95'></td>\n   <td width='260'></td>\n";
+       print "</tr>\n";
+
+       for(my $i = $chainsman{$selectedchain."start"}+2; $i <= $chainsman{$selectedchain."end"}; $i++) {
+               print "<tr>\n";
+               my @iptablesline = split(/ +/,$ipmlines[$i]);
+               my $offset=0;
+
+                if ( $iptablesline[0] eq "" ){
+                       $offset=1;
+               }
+
+               print "   <td></td>\n   <td>".$iptablesline[0+$offset]."</td>\n   <td>".$iptablesline[1+$offset]."</td>\n";
+               print "   <td>".$iptablesline[2+$offset]."</td>\n   <td>".$iptablesline[3+$offset]."</td>\n";
+               print "   <td>".$iptablesline[4+$offset]."</td>\n   <td>".&Header::colorize($iptablesline[5+$offset])."</td>\n";
+               print "   <td>".&Header::colorize($iptablesline[6+$offset])."</td>\n";
+               print "   <td>".&Header::colorize($iptablesline[7+$offset])."</td>\n";
+               print "   <td>".&Header::colorize($iptablesline[8+$offset])."</td>\n   <td>";
+
+               for (my $i=9+$offset; $i <= $#iptablesline; $i++){
+                       $string = $iptablesline[$i];
+                       $string =~ s/\s$//gi;
+
+# mangles with marks need to be converted from hex to number to show the correct qos class
+
+                       if ( $string =~ /^0x/){
+                               $string = hex($string);
+                       }
+
+                       print " ".$string;
+               }
+               print "</td>\n</tr>\n";
+       }
+print "</table></DIV><br />";
 &Header::closebox();
 
 ## NAT
 &Header::openbox('100%', 'LEFT', $Lang::tr{'iptnats'}.':');
+
+# If the cgi is called the first time the default chain is
+# used, otherwise if user selected a chains in the selectboxes
+# those one are displayed, it is possible to change all 3 at
+# the same time
+
+if ( $cgiparams{'selectedchain'} ne "" ){
+       my @multi = split(/\|/,$cgiparams{'selectedchain'});
+       $selectedchain = $multi[2];
+} else {
+       $selectedchain = "PREROUTING";
+}
+
 print <<END
 
-    <DIV align='left'>
-    <PRE>
+<DIV align='left'>
 END
 ;
-       open (FILENAT, '/srv/web/ipfire/html/iptablesnat.txt');
-       while (<FILENAT>)
-       {
-               $ipnatlines[$natlines] = $_;
+
+# We´ll open the txt files and extract each line, if the line
+# start with an Chain the the name, start- and endline of the
+# chain is extracted into a hash
+
+       open (FILE, '/srv/web/ipfire/html/iptablesnat.txt');
+       while (<FILE>){
+
+               $ipnatlines[$natlines] = $_;
+
+               if ( $_ =~ /^Chain/  ){
+
+                       my @chainstring = split(/ /,$_);
+
+                       if ( $chainname ne "" ){
+                               $chainsnat{$chainname."end"} = $natlines-2;
+                       }
+
+                       $chainname = $chainstring[1];
+                       $chainsnat{$chainname."start"} = $natlines; 
+               }
+
                $natlines++;
-       }
-       close (FILENAT);
-       foreach $_ (@ipnatlines) {
-               print "$_"; }
+          
+       }
+       close (FILE);
 
-print <<END
-    </PRE>
-    </DIV>
-    <BR> 
+# now the chain hash is extracted to get the correct name of the chain
+# all chains are displayed as a select box and can be choosen for display
+# after this all corresponding lines for the chain are extraced and seperated
+# into table rows, sometimes we need to handle leading blank so the offset is
+# needed, some lines need to chomp trailing seperators. The interfaces and
+# network addresses should be colorized by an extra function to make a nice
+# colored gui
 
-END
-;
+       print "<form method='post' action='$ENV{'SCRIPT_NAME'}'>\n<select name='selectedchain' style='width: 250px'>\n";
+       foreach (keys(%chainsnat)){
+
+               if ( $_ =~ /end$/ ){
+                       next;
+               } else {
+                       $_ =~ s/start$//gi;
+               }
+
+               print "   <option value='".$_;
+               if ( $_ eq $selectedchain ){
+                       print "' selected='selected' >".$_."</option>\n";
+               } else {
+                       print "'>".$_."</option>\n";
+               }
+       }
+       print "</select><input type='submit' name='ACTION' value='$Lang::tr{'update'}' /><form><br /><br />\n\n";
+
+       $string = $ipnatlines[$chainsnat{$selectedchain."start"}];
+       $string =~ s/\s$//gi;
+
+       print "<strong>".$string."</strong><br />\n\n";
+       print "<table width='100%' cellspacing='1'>\n<tr>\n";
+       foreach (split(/ +/,$ipnatlines[$chainsnat{$selectedchain."start"}+1])){
+               if ( $_  =~ /[^a-zA-Z]/ ){chomp($_);}
+               print "<th align='left'><strong>".$_."</strong></th>\n";
+       }
+
+       print "</tr>\n";
+
+       print "<tr>\n";
+       print "   <td width='0'></td>\n   <td width='35'></td>\n   <td width='35'></td>\n";
+       print "   <td width='130'></td>\n   <td width='30'></td>\n";
+       print "   <td width='30'></td>\n   <td width='40'></td>\n";
+       print "   <td width='40'></td>\n   <td width='95'></td>\n";
+       print "   <td width='95'></td>\n   <td width='260'></td>\n";
+       print "</tr>\n";
+
+       for(my $i = $chainsnat{$selectedchain."start"}+2; $i <= $chainsnat{$selectedchain."end"}; $i++) {
+               print "<tr>\n";
+               my @iptablesline = split(/ +/,$ipnatlines[$i]);
+               my $offset=0;
+
+                if ( $iptablesline[0] eq "" ){
+                       $offset=1;
+               }
+
+               print "   <td></td>\n<td>".$iptablesline[0+$offset]."</td>\n   <td>".$iptablesline[1+$offset]."</td>\n";
+               print "   <td>".$iptablesline[2+$offset]."</td>\n   <td>".$iptablesline[3+$offset]."</td>\n";
+               print "   <td>".$iptablesline[4+$offset]."</td>\n   <td>".&Header::colorize($iptablesline[5+$offset])."</td>\n";
+               print "   <td>".&Header::colorize($iptablesline[6+$offset])."</td>\n";
+               print "   <td>".&Header::colorize($iptablesline[7+$offset])."</td>\n";
+               print "   <td>".&Header::colorize($iptablesline[8+$offset])."</td>\n   <td>";
+
+               for (my $i=9+$offset; $i <= $#iptablesline; $i++){
+                       $string = $iptablesline[$i];
+                       $string =~ s/\s$//gi;
+                       print " ".$string;
+               }
+               print "</td>\n</tr>\n";
+       }
+print "</table></DIV><br />";
 &Header::closebox();
 &Header::closebigbox();
 &Header::closepage();
 
 system(rm -f "/srv/web/ipfire/html/iptables.txt");
 system(rm -f "/srv/web/ipfire/html/iptablesmangle.txt");
-system(rm -f "/srv/web/ipfire/html/iptablesnat.txt");
+system(rm -f "/srv/web/ipfire/html/iptablesnat.txt");
\ No newline at end of file

diff --git a/html/cgi-bin/logs.cgi/config.dat b/html/cgi-bin/logs.cgi/config.dat
index f39981ed0ea3eb391e7de19f2a4e1a7168261baa..1f97a170b1259e9e2ad9955db06523852c677b30 100644 (file)
--- a/html/cgi-bin/logs.cgi/config.dat
+++ b/html/cgi-bin/logs.cgi/config.dat
@@ -32,6 +32,7 @@ $logsettings{'LOGWATCH_LEVEL'} = 'Low';
 $logsettings{'LOGWATCH_KEEP'} = '56';
 my @VS = ('15','50','100','150','250','500');
 $logsettings{'ENABLE_REMOTELOG'} = 'off';
+$logsettings{'ENABLE_ASYNCLOG'} = 'off';
 $logsettings{'REMOTELOG_ADDR'} = '';
 $logsettings{'VARMESSAGES'} = 'cron.none;daemon.*;local0.*;local2.*;*.info;mail.none;authpriv.*';
 $logsettings{'ACTION'} = '';
@@ -66,6 +67,10 @@ if ($logsettings{'ACTION'} eq $Lang::tr{'save'})
 
 &General::readhash("${General::swroot}/logging/settings", \%logsettings);
 
+$checked{'ENABLE_ASYNCLOG'}{'off'} = '';
+$checked{'ENABLE_ASYNCLOG'}{'on'} = '';
+$checked{'ENABLE_ASYNCLOG'}{$logsettings{'ENABLE_ASYNCLOG'}} = "checked='checked'";
+
 $checked{'ENABLE_REMOTELOG'}{'off'} = '';
 $checked{'ENABLE_REMOTELOG'}{'on'} = '';
 $checked{'ENABLE_REMOTELOG'}{$logsettings{'ENABLE_REMOTELOG'}} = "checked='checked'";
@@ -150,6 +155,9 @@ END
 print <<END
 <table width='100%'>
 <tr>
+  <td class='base' colspan='2'><input type='checkbox' name='ENABLE_ASYNCLOG' $checked{'ENABLE_ASYNCLOG'}{'on'} />$Lang::tr{'Async logging enabled'}</td>
+<tr>
+</tr>
   <td>$Lang::tr{'log var messages'}</td><td><input type='text' name='VARMESSAGES' size='50' value='$logsettings{'VARMESSAGES'}' /></td>
 </tr>
 </table>

diff --git a/html/cgi-bin/netother.cgi b/html/cgi-bin/netother.cgi
index e09fe8a9a200d93bc9b13a8cb1e37aee28be3e5d..1809abfdabf5d571f9d860e6757166a677d842ca 100644 (file)
--- a/html/cgi-bin/netother.cgi
+++ b/html/cgi-bin/netother.cgi
@@ -55,7 +55,7 @@ if ( $querry[0] =~ "fwhits"){
        &Header::openpage($Lang::tr{'network traffic graphs others'}, 1, '');
        &Header::openbigbox('100%', 'left');
        
-       my @pinggraphs = `ls -dA /var/log/rrd/collectd/localhost/ping/*`;
+       my @pinggraphs = `ls -dA /var/log/rrd/collectd/localhost/ping/ping-*`;
        foreach (@pinggraphs){
                $_ =~ /(.*)\/ping\/ping-(.*)\.rrd/;
                push(@pings,$2);

diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi
index d19f22e6bc3db565d0e6608172e4277c644cc461..280055ebae473bde00babf9f134e06303fc1c74d 100644 (file)
--- a/html/cgi-bin/vpnmain.cgi
+++ b/html/cgi-bin/vpnmain.cgi
@@ -248,9 +248,9 @@ sub writeipsecfiles {
     foreach my $key (keys %lconfighash) {
        next if ($lconfighash{$key}[0] ne 'on');
         $interfaces .= "%defaultroute "                    if ($interfaces !~ /defaultroute/ && $lconfighash{$key}[26] eq 'RED');
-       $interfaces .= "ipsec1=$netsettings{'GREEN_DEV'} "  if ($interfaces !~ /ipsec1/       && $lconfighash{$key}[26] eq 'GREEN');
-       $interfaces .= "ipsec2=$netsettings{'BLUE_DEV'} "   if ($interfaces !~ /ipsec2/       && $lconfighash{$key}[26] eq 'BLUE');
-       $interfaces .= "ipsec3=$netsettings{'ORANGE_DEV'} " if ($interfaces !~ /ipsec3/       && $lconfighash{$key}[26] eq 'ORANGE');
+       #$interfaces .= "ipsec1=$netsettings{'GREEN_DEV'} "  if ($interfaces !~ /ipsec1/              && $lconfighash{$key}[26] eq 'GREEN');
+       #$interfaces .= "ipsec2=$netsettings{'BLUE_DEV'} "   if ($interfaces !~ /ipsec2/              && $lconfighash{$key}[26] eq 'BLUE');
+       #$interfaces .= "ipsec3=$netsettings{'ORANGE_DEV'} " if ($interfaces !~ /ipsec3/              && $lconfighash{$key}[26] eq 'ORANGE');
     }
     print CONF $interfaces . "\"\n";
 
@@ -264,6 +264,8 @@ sub writeipsecfiles {
     # deprecated in ipsec.conf version 2
     #print CONF "\tplutoload=%search\n";
     #print CONF "\tplutostart=%search\n";
+    #Disable IKEv2 deamon
+    print CONF "\tcharonstart=no\n";
     print CONF "\tuniqueids=yes\n";
     print CONF "\tnat_traversal=yes\n";
     print CONF "\toverridemtu=$lvpnsettings{'VPN_OVERRIDE_MTU'}\n" if ($lvpnsettings{'VPN_OVERRIDE_MTU'} ne '');
@@ -283,7 +285,8 @@ sub writeipsecfiles {
     print CONF "\n\n";
     print CONF "conn %default\n";
     print CONF "\tkeyingtries=0\n";
-    print CONF "\tdisablearrivalcheck=no\n";
+    #strongswan doesn't know this
+    #print CONF "\tdisablearrivalcheck=no\n";
     print CONF "\n";
 
     if (-f "${General::swroot}/certs/hostkey.pem") {
@@ -312,6 +315,7 @@ sub writeipsecfiles {
        print CONF "\tleft=$localside\n";
        print CONF "\tleftnexthop=%defaultroute\n" if ($lconfighash{$key}[26] eq 'RED' && $lvpnsettings{'VPN_IP'} ne '%defaultroute');
        print CONF "\tleftsubnet=$lconfighash{$key}[8]\n";
+       print CONF "\tleftfirewall=yes\n";
 
        print CONF "\tright=$lconfighash{$key}[10]\n";
        if ($lconfighash{$key}[3] eq 'net') {
@@ -2383,7 +2387,7 @@ EOF
     &General::readhasharray("${General::swroot}/vpn/config", \%confighash);
     $cgiparams{'CA_NAME'} = '';
 
-    my @status = `/usr/sbin/ipsec auto --status`;
+    my @status = `/usr/local/bin/ipsecctrl I`;
 
     # suggest a default name for this side
     if ($cgiparams{'VPN_IP'} eq '' && -e "${General::swroot}/red/active") {

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 138dfde2af7d51463a82a604d97d719108728099..52ba6a34e5776f2e89c92a622bc06135ba690f7e 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -4,6 +4,7 @@
 'Act as' => 'Konfiguriert als',
 'Add Port Rule' => 'Port Regel hinzufügen',
 'Add Rule' => 'Regel hinzufügen',
+'Async logging enabled' => 'Aktiviere asynchrones schreiben des Syslogs',
 'optional at cmd' => 'zusätzlicher Modembefehl',
 'Choose Rule' => 'Wählen sie <u>eine</u> der untenstehenden Regeln aus.',
 'Class' => 'Klasse',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 490809742c782bc470d7aae4d69c7d8a41e4cd33..14d6ceef39ba6a681320ea04c61fac17e1dfb47f 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -4,6 +4,7 @@
 'Act as' => 'Act as:',
 'Add Port Rule' => 'Add port rule',
 'Add Rule' => 'Add rule',
+'Async logging enabled' => 'Enable asynchronous writing of the syslog file',
 'optional at cmd' => 'optional AT command',
 'Choose Rule' => 'Choose <u>one</u> of the following rules.',
 'Class' => 'Class',

diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl
index 490809742c782bc470d7aae4d69c7d8a41e4cd33..704e0b9bdcc42a8b623f8605179ac467a19a47bb 100644 (file)
--- a/langs/fr/cgi-bin/fr.pl
+++ b/langs/fr/cgi-bin/fr.pl
@@ -4,6 +4,7 @@
 'Act as' => 'Act as:',
 'Add Port Rule' => 'Add port rule',
 'Add Rule' => 'Add rule',
+'Async logging enabled' => 'Activer écriture asynchrone de syslogs',
 'optional at cmd' => 'optional AT command',
 'Choose Rule' => 'Choose <u>one</u> of the following rules.',
 'Class' => 'Class',

diff --git a/lfs/Config b/lfs/Config
index 41cea22b5170cca459b68390a8290174f97653e9..bc9375ac638c181a3d5b72086a768af0975ae7d7 100644 (file)
--- a/lfs/Config
+++ b/lfs/Config
@@ -194,12 +194,12 @@ define PAK
        sed -e 's/KVER/$(KVER)/g' -i /install/packages/package/ROOTFILES
        chmod 755 /install/packages/package/{{,un}install,update}.sh
        cd / && tar cf /install/packages/package/files.tmp --files-from=/install/packages/package/ROOTFILES --exclude='#*' \
-               --preserve --numeric-owner
+               -p --numeric-owner
        # Double tar to remove double files
        tar xf /install/packages/package/files.tmp -C /install/packages/package/tmp/ \
-               --preserve --numeric-owner
+               -p --numeric-owner
        rm -f /install/packages/package/files.tmp
-       cd /install/packages/package/tmp/ && tar -c --preserve --numeric-owner -f /install/packages/package/files *             
+       cd /install/packages/package/tmp/ && tar -c -p --numeric-owner -f /install/packages/package/files *             
        rm -r /install/packages/package/tmp
        -cat /install/packages/package/ROOTFILES | grep -v "#" > /install/packages/package/ROOTFILES.tmp
        mv /install/packages/package/ROOTFILES.tmp /install/packages/package/ROOTFILES

diff --git a/lfs/ccache b/lfs/ccache
index 83ed803eb0998037ad6d06d98a6dd627e9ee6e96..2fc0c3d50e39567ec1801ef644421476ce3c6087 100644 (file)
--- a/lfs/ccache
+++ b/lfs/ccache
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 2.4
+VER        = 3.0pre0
 
 THISAPP    = ccache-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 73c1ed1e767c1752dd0f548ec1e66ce7
+$(DL_FILE)_MD5 = 3704f1cd486b1e63638fd17910c42e9f
 
 install : $(TARGET)
 
@@ -69,9 +69,9 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && patch -p0 < $(DIR_SRC)/src/patches/$(THISAPP).patch
-       cd $(DIR_APP) && CFLAGS="-O2 -static" ./configure --prefix=$(ROOT)/usr/local
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && patch -p1 < $(DIR_SRC)/src/patches/$(THISAPP)-no_compiler_mtime.patch
+       cd $(DIR_APP) && CFLAGS="-O2 -static -DDEFAULT_MAXSIZE=2097152" ./configure --prefix=$(ROOT)/usr/local
        cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        ln -sf ccache $(ROOT)/usr/local/bin/gcc

diff --git a/lfs/cdrom b/lfs/cdrom
index 5fa6730f2277133e50c76fc7dd10fb4e66c6e0a3..d5df330c41bd344072b4855833e0f49440aa2c00 100644 (file)
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -66,7 +66,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        tar -x -C /tmp -f /$(SNAME).tar
        rm -f /$(SNAME).tar
        @mkdir /tmp/sys
-       cd /tmp && tar jcf /install/cdrom/$(SNAME)-$(VERSION).tbz2 * && rm -rf *
+       cd /tmp && tar  cf /install/cdrom/$(SNAME)-$(VERSION).tlz --lzma * && rm -rf *
 
        # Other files
        sed 's/VERSION/$(VERSION)/' $(DIR_SRC)/config/cdrom/README.txt > /install/cdrom/README.txt

diff --git a/lfs/collectd b/lfs/collectd
index 07dc4d96ed1315f2e4bb3a9291f4f27176b10c2e..78840563c9b10fab419c3a858b04539834f443b5 100644 (file)
--- a/lfs/collectd
+++ b/lfs/collectd
@@ -25,7 +25,7 @@
 include Config
 
 PKG_NAME   = collectd
-VER        = 4.5.3
+VER        = 4.9.1
 
 THISAPP    = collectd-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = f368200c4bedd64baba46094906e81ee
+$(DL_FILE)_MD5 = 5753496651c8c84afaea1fe290876bfc
 
 install : $(TARGET)
 
@@ -77,8 +77,8 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && sed -i 's|with_libiptc="no (Linux iptables header.*|with_libiptc="yes"|g' \
-                               ./configure
+       #cd $(DIR_APP) && sed -i 's|with_libiptc="no (Linux iptables header.*|with_libiptc="yes"|g' \
+       #                       ./configure
        cd $(DIR_APP) && ./configure --prefix=/usr --localstatedir=/var \
                --disable-{apple_sensors,csv,ipvs,mbmon,memcached,mysql} \
                --disable-{netlink,nginx,nut,perl,serial,snmp,tape,vserver,xmms} \
@@ -87,7 +87,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                --enable-{interface,iptables,irq,load,logfile,memory,multimeter} \
                --enable-{network,nfs,ntpd,ping,processes,rrdtool,sensors,swap,syslog} \
                --enable-{tcpconns,unixsock,users,wireless} \
-               --with-rrdtool=/usr/share/rrdtool-1.2.15
+               --with-librrd=/usr/share/rrdtool-1.2.30
        cd $(DIR_APP) && make install
        cp -vf $(DIR_SRC)/config/collectd/collectd.* /etc/
        ln -f -s ../init.d/collectd /etc/rc.d/rc0.d/K50collectd 

diff --git a/lfs/core-updates b/lfs/core-updates
index e0962bd079c2f9b563a21a35b83343a9b7eb11e7..f7f50cf5d9f502d2301deeaa70545c87e9d36e37 100644 (file)
--- a/lfs/core-updates
+++ b/lfs/core-updates
@@ -70,7 +70,7 @@ core/%:
                --exclude='proc/*' --exclude='tmp/ROOTFILES' \
                --exclude-from=$(DIR_SRC)/config/rootfiles/$@/exclude
        mv -f /tmp/ROOTFILES /install/packages/package/ROOTFILES
-       tar --preserve --numeric-owner -x  -C /tmp -f /$(SNAME).tar
+       tar -p --numeric-owner -x  -C /tmp -f /$(SNAME).tar
        rm -f /$(SNAME).tar
        cd /tmp && tar cf /install/packages/package/files * && rm -rf *
        cat /install/packages/package/ROOTFILES | grep -v "#" > /install/packages/package/ROOTFILES.tmp

diff --git a/lfs/cryptodev b/lfs/cryptodev
new file mode 100644 (file)
index 0000000..5c1646b
--- /dev/null
+++ b/lfs/cryptodev
@@ -0,0 +1,90 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# 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        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+ifeq "$(XEN)" "1"
+       VERSUFIX=ipfire-xen
+else
+       VERSUFIX=ipfire
+endif
+
+VER        = 20091126
+
+THISAPP    = cryptodev-$(VER)
+DL_FILE    = $(THISAPP).tar.bz2
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 26ffa32ef75bea7e980ab66166616e95
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+       $(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && make build \
+               KERNEL_DIR=/lib/modules/$(KVER)-$(VERSUFIX)/build
+
+       -mkdir -pv /usr/include/crypto
+       cd $(DIR_APP) && make install \
+               KERNEL_DIR=/lib/modules/$(KVER)-$(VERSUFIX)/build
+       ln -svf ../crypto/cryptodev.h /usr/include/linux/cryptodev.h
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/lfs/cyrus-imapd b/lfs/cyrus-imapd
index c9969d291247301b440a942ad2ee68c43256de3f..d5f4322eda0daa730014a5602b19c18b77533539 100644 (file)
--- a/lfs/cyrus-imapd
+++ b/lfs/cyrus-imapd
@@ -85,7 +85,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                                --with-auth=unix --with-perl --with-sasl --with-idle=idled \
                                --with-syslogfacility=MAIL --enable-listext --without-snmp
        cd $(DIR_APP) && make depend
-       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
+       cd $(DIR_APP) && make $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        -mkdir /var/imap
        chown cyrus:mail /var/imap

diff --git a/lfs/dahdi b/lfs/dahdi
index c7a65b061c15406579c4484de277e7f4fc937a82..e4062843c3f8a5838a631b35f81dc06a8ab4b894 100644 (file)
--- a/lfs/dahdi
+++ b/lfs/dahdi
@@ -30,10 +30,10 @@ else
        VERSUFIX=ipfire
 endif
 
-VER        = 2.2.0.2
-TVER       = 2.2.0
+VER        = 2.2.1
+TVER       = 2.2.1
 
-DL_FILE    = dahdi-linux-$(VER)-with-vpmadt032-1.17.0.tar.gz
+DL_FILE    = dahdi-linux-$(VER).tar.gz
 DL_FILE1   = dahdi-tools-$(TVER).tar.gz
 
 THISAPP    = dahdi-$(VER)
@@ -58,16 +58,16 @@ endif
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE) $(DL_FILE1) dahdi-linux-2.2.0.2-firmware.tar.bz2
+objects = $(DL_FILE) $(DL_FILE1) dahdi-linux-2.2.1-firmware.tar.bz2
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 $(DL_FILE1) = $(DL_FROM)/$(DL_FILE1)
-dahdi-linux-2.2.0.2-firmware.tar.bz2 = $(DL_FROM)/dahdi-linux-2.2.0.2-firmware.tar.bz2
+dahdi-linux-2.2.1-firmware.tar.bz2 = $(DL_FROM)/dahdi-linux-2.2.1-firmware.tar.bz2
+
+$(DL_FILE)_MD5 = 46e4abbe743830045364fc716d293e88
+$(DL_FILE1)_MD5 = 04e7097929851f744f777400125180db
+dahdi-linux-2.2.1-firmware.tar.bz2_MD5 = ccc50ded1641cd619e8d3a4615a6ad19
 
-$(DL_FILE)_MD5 = 5cbabd47cf780305e2cba6ccec42c754
-$(DL_FILE1)_MD5 = a018f452f3851a312ff51705ac44de37
-dahdi-linux-2.2.0.2-firmware.tar.bz2_MD5 = 7d7c774d214a528b49c9a08b5350a652
- 
 
 install : $(TARGET)
 
@@ -100,15 +100,14 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
 
-ifeq "$(KMOD)" "1"
        rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_SRC) && tar jxf $(DIR_DL)/dahdi-linux-2.2.1-firmware.tar.bz2
        cd $(DIR_APP) && make $(MAKETUNING) clean all KVERS=$(KVER)
+
+ifeq "$(KMOD)" "1"
        cd $(DIR_APP) && make install-modules KVERS=$(KVER)-$(VERSUFIX)
        @rm -rf $(DIR_APP)
 else
-       rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_SRC) && tar jxf $(DIR_DL)/dahdi-linux-2.2.0.2-firmware.tar.bz2
-       cd $(DIR_APP) && make $(MAKETUNING) clean all KVERS=$(KVER)
        cd $(DIR_APP) && make install-devices install-include \
                install-firmware install-xpp-firm KVERS=$(KVER)-$(VERSUFIX)
        @rm -rf $(DIR_APP)

diff --git a/lfs/dosfstools b/lfs/dosfstools
index 007d94748e31e26879e021b4e8596ba8b811ff68..01d72b917a3b7a2bcb13483120522b8a4d48b052 100644 (file)
--- a/lfs/dosfstools
+++ b/lfs/dosfstools
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 2.11
+VER        = 3.0.9
 
 THISAPP    = dosfstools-$(VER)
-DL_FILE    = $(THISAPP).src.tar.gz
+DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 407d405ade410f7597d364ab5dc8c9f6
+$(DL_FILE)_MD5 = bd273cf8aa6341c0b52cbac72050bcf4
 
 install : $(TARGET)
 
@@ -70,6 +70,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && sed -i -e "s|PREFIX = /usr/local||g" Makefile
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)

diff --git a/lfs/e2fsprogs b/lfs/e2fsprogs
index 309ccf898061486b684842cfb6e6dd9a8c8e66d0..6844d3be69fd4307e25ffef48d582f14f36e10c8 100644 (file)
--- a/lfs/e2fsprogs
+++ b/lfs/e2fsprogs
@@ -24,7 +24,7 @@
 
 include Config
 
-VER      = 1.39
+VER      = 1.41.11
 
 THISAPP    = e2fsprogs-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 06f7806782e357797fad1d34b7ced0c6
+$(DL_FILE)_MD5 = fb507a40c2706bc38306f150d069e345
 
 install : $(TARGET)
 

diff --git a/lfs/flash-images b/lfs/flash-images
index 29061409405ba76cbcfe84b816fc34eb0864a63d..5eff02a8242b111fa401db9f3df0f84fce8e67d7 100644 (file)
--- a/lfs/flash-images
+++ b/lfs/flash-images
@@ -81,7 +81,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        mount -o loop $(IMGvar)  $(MNThdd)/var
 
        # Install IPFire
-       tar -C $(MNThdd)/ -xvjf /install/cdrom/$(SNAME)-$(VERSION).tbz2
+       tar -C $(MNThdd)/ -xvf /install/cdrom/$(SNAME)-$(VERSION).tlz --lzma
        echo "LANGUAGE=en" >> $(MNThdd)/var/ipfire/main/settings
        echo "HOSTNAME=$(SNAME)" >> $(MNThdd)/var/ipfire/main/settings
        echo "THEME=ipfire" >> $(MNThdd)/var/ipfire/main/settings
@@ -106,8 +106,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        ln -s ipfirerd-$(KVER)-emergency.img $(MNThdd)/boot/ipfirerd-$(KVER).img
 
        # Copy grub files manually
-       cp -f $(MNThdd)/usr/lib/grub/i386-pc/* $(MNThdd)/boot/grub/
-       chroot $(MNThdd) /usr/sbin/grub-set-default 0
+       cp -f $(MNThdd)/usr/share/grub/i386-pc/* $(MNThdd)/boot/grub/
+       #chroot $(MNThdd) /usr/sbin/grub-set-default 0
 
        # Create a script for rebuild-initrd and setup
        echo "#!/bin/bash"                                   > $(MNThdd)/etc/rc.d/rcsysinit.d/S75firstsetup

diff --git a/lfs/fuse b/lfs/fuse
index 9669b24bcd236e75e8164053ac9baab49757fce1..69e8f0103692390cd44896a84ac3856614c06277 100644 (file)
--- a/lfs/fuse
+++ b/lfs/fuse
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.7.4
+VER        = 2.8.3
 
 THISAPP    = fuse-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 4879f06570d2225667534c37fea04213
+$(DL_FILE)_MD5 = 517c8384f915e40647bda9f71579fd97
 
 install : $(TARGET)
 

diff --git a/lfs/grub b/lfs/grub
index ed801f8e8af7db9d043cb2e3667ae8abcdc012ed..8b9f0ebddc8b7b81db481e21b3583fd55f1365c6 100644 (file)
--- a/lfs/grub
+++ b/lfs/grub
@@ -73,15 +73,45 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97-disk_geometry-1.patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.95-graphics.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.90-append.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.90-symlinkmenulst.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.91-splashimagehelp.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.93-configfile.patch
+       cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/grub-0.93-endedit.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.93-graphics-bootterm.patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.95-xpmjunk.patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.95-splash-error-term.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.93-special-device-names.patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.95-moreraid.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.94-i2o.patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97_grub-install_virtio.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.95-graphics.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.95-hiddenmenu-tweak.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.95-md.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.95-md-rework.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.95-md-mbr.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.95-moreraid.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.95-nonmbr.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.95-odirect.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.95-recheck-bad.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.95-staticcurses.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.95-xpmjunk.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97-cmdline-size.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97-datadir.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97-dmraid.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97-dmraid-partition-names.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97-install.in.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97-mactel-kbd.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97-mpath.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97-nxstack.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97-nx-multiinstall.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97-once.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.95-splash-error-term.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.94-installcopyonly.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97-prototypes.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97-stderr.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97-bz429187-cciss.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97-dmraid-recheck-bad.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97-mdadm-path.patch
+
+       # XXX Does not work anymore
+       #cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97_grub-install_virtio.patch
 
        cd $(DIR_APP) && perl -pi -e 's,/usr/lib/grub/i386-pc,/usr/share/grub/i386-pc,' docs/grub.texi
        cd $(DIR_APP) && sed -i 's/AM_INIT_AUTOMAKE/&\nAM_PROG_AS/' configure.ac
@@ -94,7 +124,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
        # grub files
        mkdir -vp /boot/grub
-       cp -v /usr/lib/grub/i386-pc/stage{1,2} /boot/grub
+       cp -v /usr/share/grub/i386-pc/stage{1,2} /boot/grub
        for i in $(DIR_SRC)/config/grub/*; do \
            [ -f $$i ] && cp -f $$i /boot/grub; \
        done

diff --git a/lfs/initrd b/lfs/initrd
index 24835003e8004d48d9f0a8f014bb2354452368cd..ad8b135a638a8740079bc6685c9da0d706f063bc 100644 (file)
--- a/lfs/initrd
+++ b/lfs/initrd
@@ -70,9 +70,9 @@ $(TARGET) :
                /install/initrd/lib/modules/$(KVER)-ipfire/dahdi
 
        # ... acpi/dock.ko is needed for libata
-       -mkdir -p /install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/acpi
-       cp -a /lib/modules/$(KVER)-ipfire/kernel/drivers/acpi/dock.ko \
-               /install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/acpi/dock.ko
+#      -mkdir -p /install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/acpi
+#      cp -a /lib/modules/$(KVER)-ipfire/kernel/drivers/acpi/dock.ko \
+#              /install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/acpi/dock.ko
 
        cp /opt/$(MACHINE)-uClibc/lib/libgcc_s.so.1 /install/initrd/lib/
 

diff --git a/lfs/ipfireseeder b/lfs/ipfireseeder
index d74546c98400438b422e93415ae674595b25f8e0..8c7584849299d74607a474817f188216ee863768 100644 (file)
--- a/lfs/ipfireseeder
+++ b/lfs/ipfireseeder
@@ -27,13 +27,13 @@ include Config
 VER        = 1.00
 
 THISAPP    = ipfireseeder-$(VER)
-DL_FILE    = ipfire-2.5.i586-full-core36.iso.torrent
+DL_FILE    = ipfire-2.5.i586-full-core37.iso.torrent
 
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = ipfireseeder
-PAK_VER    = 10
+PAK_VER    = 11
 
 DEPS       = "rtorrent"
 
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = c46a39464f4ec1f71913ddcb2b5a049e
+$(DL_FILE)_MD5 = 2f984c777a487f5f7642f3abbe6aee31
 
 install : $(TARGET)
 

diff --git a/lfs/iptables b/lfs/iptables
index 99afe2bfc8754dc3836fc4e8484bf73ea59ad754..6d369909bc2a9e6913138a1208a6d5ed9eb1eba5 100644 (file)
--- a/lfs/iptables
+++ b/lfs/iptables
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.4.2
+VER        = 1.4.6
 
 THISAPP    = iptables-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -36,18 +36,18 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 # Top-level Rules
 ###############################################################################
 objects =      $(DL_FILE) \
-                       netfilter-layer7-v2.21.tar.gz \
-                       libnfnetlink-0.0.41.tar.bz2 \
+                       netfilter-layer7-v2.22.tar.gz \
+                       libnfnetlink-1.0.0.tar.bz2 \
                        libnetfilter_queue-0.0.17.tar.bz2
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-netfilter-layer7-v2.21.tar.gz          = $(URL_IPFIRE)/netfilter-layer7-v2.21.tar.gz
-libnfnetlink-0.0.41.tar.bz2            = $(URL_IPFIRE)/libnfnetlink-0.0.41.tar.bz2
+netfilter-layer7-v2.22.tar.gz          = $(URL_IPFIRE)/netfilter-layer7-v2.22.tar.gz
+libnfnetlink-1.0.0.tar.bz2             = $(URL_IPFIRE)/libnfnetlink-1.0.0.tar.bz2
 libnetfilter_queue-0.0.17.tar.bz2      = $(URL_IPFIRE)/libnetfilter_queue-0.0.17.tar.bz2
 
-$(DL_FILE)_MD5 = a138d1c2e74321e0e4e228a9fb301c9a
-netfilter-layer7-v2.21.tar.gz_MD5 = 838422e7d9a06b42e682e9064e5210b5
-libnfnetlink-0.0.41.tar.bz2_MD5 = 5d844ea1f557bad0364d5b85cd10c796
+$(DL_FILE)_MD5 = c67cf30e281a924def6426be0973df56
+netfilter-layer7-v2.22.tar.gz_MD5 = 98dff8a3d5a31885b73341633f69501f
+libnfnetlink-1.0.0.tar.bz2_MD5 = 016fdec8389242615024c529acc1adb8
 libnetfilter_queue-0.0.17.tar.bz2_MD5 = 2cde35e678ead3a8f9eb896bf807a159
 
 install : $(TARGET)
@@ -77,21 +77,24 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-0.0.41 $(DIR_SRC)/netfilter-layer7* $(DIR_SRC)/libnetfilter_queue-0.0.17
+       @rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-1.0.0 $(DIR_SRC)/netfilter-layer7* $(DIR_SRC)/libnetfilter_queue-0.0.17
 
        @cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_SRC) && tar zxf $(DIR_DL)/netfilter-layer7-v2.21.tar.gz
-       cd $(DIR_APP) && cp -vf $(DIR_SRC)/netfilter-layer7-v2.21/iptables-1.4.1.1-for-kernel-2.6.20forward/* \
+       -cd /usr/include && patch -Np1 < $(DIR_SRC)/src/patches/iptables-1.4.6-errorno_includes.patch
+       cp -rf /usr/src/linux/include/linux/netfilter /usr/include/linux
+
+       # Layer7
+       cd $(DIR_SRC) && tar zxf $(DIR_DL)/netfilter-layer7-v2.22.tar.gz
+       cd $(DIR_APP) && cp -vf $(DIR_SRC)/netfilter-layer7-v2.22/iptables-1.4.3forward-for-kernel-2.6.20forward/* \
                         ./extensions/
 
        # ipp2p 0.8.2-pomng
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/iptables-1.4.1.1-ipp2p-0.8.2-pomng.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/iptables-1.4.6-ipp2p-0.8.2-pomng.patch
 
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/iptables-1.4.2-imq.patch
+       # imq
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/iptables-1.4.6-imq_test1.patch
        chmod +x $(DIR_APP)/extensions/.IMQ-test*
 
-       # hack to disable IPv6 compilation as the configuration variable does not work when ip6.h is present
-       # cd $(DIR_APP) && sed -i -e 's/DO_IPV6:=1/DO_IPV6:=0/' Makefile
        cd $(DIR_APP) && ./configure  --prefix=/usr --with-ksource=/usr/src/linux \
                                    --libdir=/lib --includedir=/usr/include --enable-libipq \
                                    --libexecdir=/lib --bindir=/sbin \
@@ -99,21 +102,26 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
 
-       cd $(DIR_APP) && cp -fva include/* /usr/include
-       -mkdir /usr/include/libiptc
-       cd $(DIR_APP) && cp -vf include/libiptc/{libiptc.h,ipt_kernel_headers.h} \
-               /usr/include/libiptc
-       cd $(DIR_APP) && cp -vf libiptc/{*.o,*.a} \
-               /lib
-
-       cd $(DIR_SRC) && tar xfj $(DIR_DL)/libnfnetlink-0.0.41.tar.bz2
-       cd $(DIR_SRC)/libnfnetlink-0.0.41 && ./configure --prefix=/usr
-       cd $(DIR_SRC)/libnfnetlink-0.0.41 && make $(MAKETUNING) $(EXTRA_MAKE)
-       cd $(DIR_SRC)/libnfnetlink-0.0.41 && make install
+       # Iptables doesn't install all headers
+       mkdir -p /usr/include/net/netfilter
+       cp -f $(DIR_APP)/include/net/netfilter/*.h /usr/include/net/netfilter/
+       mkdir -p /usr/include/iptables
+       cp -f $(DIR_APP)/include/iptables/*.h /usr/include/iptables/
+       cp -f $(DIR_APP)/include/iptables.h /usr/include/
+       mkdir -p /usr/include/libipulog
+       cp -f $(DIR_APP)/include/libipulog/*.h /usr/include/libipulog/
+       mkdir -p /usr/include/libiptc
+       cp -f $(DIR_APP)/include/libiptc/*.h /usr/include/libiptc/
+
+       cd $(DIR_SRC) && tar xfj $(DIR_DL)/libnfnetlink-1.0.0.tar.bz2
+       cd $(DIR_SRC)/libnfnetlink-1.0.0 && ./configure --prefix=/usr
+       cd $(DIR_SRC)/libnfnetlink-1.0.0 && make $(MAKETUNING) $(EXTRA_MAKE)
+       cd $(DIR_SRC)/libnfnetlink-1.0.0 && make install
 
        cd $(DIR_SRC) && tar xfj $(DIR_DL)/libnetfilter_queue-0.0.17.tar.bz2
        cd $(DIR_SRC)/libnetfilter_queue-0.0.17 && ./configure --prefix=/usr
        cd $(DIR_SRC)/libnetfilter_queue-0.0.17 && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_SRC)/libnetfilter_queue-0.0.17 && make install
-       @rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-0.0.41 $(DIR_SRC)/netfilter-layer7* $(DIR_SRC)/libnetfilter_queue-0.0.17
+
+       @rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-1.0.0 $(DIR_SRC)/netfilter-layer7* $(DIR_SRC)/libnetfilter_queue-0.0.17
        @$(POSTBUILD)

diff --git a/lfs/klibc b/lfs/klibc
index 0ff12f3ee05145127fa151a1742af826a9f89e52..1ab1215f7f6d540e6148c21acbe61ffb95386332 100644 (file)
--- a/lfs/klibc
+++ b/lfs/klibc
@@ -37,13 +37,16 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 ###############################################################################
 
 objects = $(DL_FILE) \
-               klibc-extras-2.2.tar.gz
+               klibc-extras-2.2.tar.gz \
+               klibc-1.5.14-linux2.6.27-includes.tar.bz2
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 klibc-extras-2.2.tar.gz = $(DL_FROM)/klibc-extras-2.2.tar.gz
+klibc-1.5.14-linux2.6.27-includes.tar.bz2 = $(DL_FROM)/klibc-1.5.14-linux2.6.27-includes.tar.bz2
 
 $(DL_FILE)_MD5 = 030d978a7f16800e8ccae12d6fb5e7ba
 klibc-extras-2.2.tar.gz_MD5 = 7e5042978531048c369f59ca1a13055b
+klibc-1.5.14-linux2.6.27-includes.tar.bz2_MD5 = 1f875129d35193e35d27ed2b61a80bb6
 
 install : $(TARGET)
 
@@ -74,14 +77,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) $(DIR_SRC)/klibc* && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) && \
                tar zxf $(DIR_DL)/klibc-extras-2.2.tar.gz
-       cd $(DIR_APP) && ln -fs ../linux linux
+       cd $(DIR_SRC) && tar jxf $(DIR_DL)/klibc-1.5.14-linux2.6.27-includes.tar.bz2
+
        cd $(DIR_SRC)/klibc-extras && sed -i "s|^INSTALL = .*|INSTALL = /usr/bin/install -c -m 755|g" Makefile
        cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        cd $(DIR_SRC)/klibc-extras && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_SRC)/klibc-extras && make install
        ln -sf sh.shared /usr/lib/klibc/bin/sh
-       #mv /lib/klibc-*.so /lib/klibc-pFXBYGYRiBAAryaZ7Zw_ISKpcTk.so
-       #mv /usr/lib/klibc/lib/klibc-*.so /usr/lib/klibc/lib/klibc-pFXBYGYRiBAAryaZ7Zw_ISKpcTk.so
        @rm -rf $(DIR_APP) $(DIR_SRC)/klibc*
        @$(POSTBUILD)

diff --git a/lfs/liboping b/lfs/liboping
new file mode 100644 (file)
index 0000000..cfe985c
--- /dev/null
+++ b/lfs/liboping
@@ -0,0 +1,77 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# 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        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 1.3.4
+
+THISAPP    = liboping-$(VER)
+DL_FILE    = $(THISAPP).tar.bz2
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 208e185f75f9f8ac96e508bd9e17ef61
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && ./configure --prefix=/usr
+       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make install
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/lfs/linux b/lfs/linux
index 1a7cfedbb0c27ffa75a849322c5b80ce49a8ec70..fe968720cb1a8b4432e222ddcd7a94bb98c927f4 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,8 +24,8 @@
 
 include Config
 
-PATCHLEVEL = .42
-VER        = 2.6.27.42
+PATCHLEVEL = .10
+VER        = 2.6.32.10
 
 THISAPP    = linux-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -35,42 +35,44 @@ CFLAGS     =
 CXXFLAGS   =
 
 PROG      = linux-xen
-PAK_VER    = 7
+PAK_VER    = 8
 DEPS      = ""
 
 # Normal build or XEN build.
 #
+
 ifeq "$(XEN)" "1"
        VERSUFIX=ipfire-xen
 else
        VERSUFIX=ipfire
 endif
+
 TARGET = $(DIR_INFO)/linux-$(VER)-$(VERSUFIX)
 
 ###############################################################################
 # Top-level Rules
 ###############################################################################
 objects =$(DL_FILE) \
-       squashfs3.4.tar.gz \
-       netfilter-layer7-v2.21.tar.gz \
+       netfilter-layer7-v2.22.tar.gz \
        patch-2.6.16-nath323-1.3.bz2 \
-       reiser4-for-2.6.27.19.patch.bz2 \
+       reiser4-for-2.6.32.patch.bz2 \
+       squashfs-lzma-linux-2.6.32-kernel-patches.tar.bz2 \
        linux-$(VER)-suse_xen_patches-1.tar.bz2
 
 $(DL_FILE)                             = $(URL_IPFIRE)/$(DL_FILE)
-netfilter-layer7-v2.21.tar.gz          = $(URL_IPFIRE)/netfilter-layer7-v2.21.tar.gz
+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
-squashfs3.4.tar.gz                     = $(URL_IPFIRE)/squashfs3.4.tar.gz
-reiser4-for-2.6.27.19.patch.bz2                = $(URL_IPFIRE)/reiser4-for-2.6.27.19.patch.bz2
+reiser4-for-2.6.32.patch.bz2           = $(URL_IPFIRE)/reiser4-for-2.6.32.patch.bz2
+squashfs-lzma-linux-2.6.32-kernel-patches.tar.bz2 = $(URL_IPFIRE)/squashfs-lzma-linux-2.6.32-kernel-patches.tar.bz2
 linux-$(VER)-suse_xen_patches-1.tar.bz2        = $(URL_IPFIRE)/linux-$(VER)-suse_xen_patches-1.tar.bz2
 
 
-$(DL_FILE)_MD5                         = a33e6b22d70dd010525fc43cdda36792
-netfilter-layer7-v2.21.tar.gz_MD5      = 838422e7d9a06b42e682e9064e5210b5
+$(DL_FILE)_MD5                         = 5d996507ad482a3a8c8e6b2d48e7994b
+netfilter-layer7-v2.22.tar.gz_MD5      = 98dff8a3d5a31885b73341633f69501f
 patch-2.6.16-nath323-1.3.bz2_MD5       = f926409ff703a307baf54b57ab75d138
-squashfs3.4.tar.gz_MD5                 = 2a4d2995ad5aa6840c95a95ffa6b1da6
-reiser4-for-2.6.27.19.patch.bz2_MD5    = 22988387f64f299489b90b484b2642cc
-linux-$(VER)-suse_xen_patches-1.tar.bz2_MD5 = ddbde50f3bc303d947531402017a3055
+reiser4-for-2.6.32.patch.bz2_MD5       = 3246397973d9271eb8e6d7c97c5d2d91
+squashfs-lzma-linux-2.6.32-kernel-patches.tar.bz2_MD5 = d2a84311081023c7ffd28cdca67c45d4
+linux-$(VER)-suse_xen_patches-1.tar.bz2_MD5 = 96b0dc50256ced7c5c2b6d03a7f2d386
 
 install : $(TARGET)
 
@@ -102,6 +104,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) $(DIR_SRC)/linux $(DIR_SRC)/linux-*-suse_xen_patches $(DIR_SRC)/xen-* && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+
        ln -s linux-$(VER) /usr/src/linux
 
 ifeq "$(XEN)" "1"
@@ -115,50 +118,37 @@ ifeq "$(XEN)" "1"
                done
        rm -rf $(DIR_SRC)/linux-*-suse_xen_patches
 
+       # Fix strange patchset errors
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.8-xen-patch-fixes.patch
+
        # Linux Intermediate Queueing Device
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/imq-skbuff.patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.27.21-imq-test3-xen.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.8-xen-imq-test2.patch
 else
        # Linux Intermediate Queueing Device
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.27.21-imq-test3.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32-imq-test2.patch
 endif
 
-       # Add Vodafone K3565-Z USB ID's to option driver
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.27.25-option_add_vf-k3565-z_usbids.patch
-
-       # Add Alix to Led Driver
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.24-leds-alix.patch
-
-       # Patch to fix Intel e100 wake on lan
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.27.39_e100-wakeonlan-fix.patch
+       # Add patch to fix ath5k "no txbuf available"
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32-ath5k_fix_setup_for_CAB_queue.patch
 
        # Not report deprecated syscall 1.23 (for kudzu)
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.25.18-not_report_sysctl_1.23.patch
-ifeq "$(XEN)" ""
-       # Reiser4
-       -cd $(DIR_APP) && bzip2 -d -c $(DIR_DL)/reiser4-for-2.6.27.19.patch.bz2 | patch -Np1
 
-       # SquashFS (already in Suse Patchset)
-       cd $(DIR_SRC) && rm -rf squashfs*
-       cd $(DIR_SRC) && tar xfz $(DIR_DL)/squashfs3.4.tar.gz
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/squashfs3.4/kernel-patches/linux-2.6.27-rc4/squashfs3.4-patch
-endif
+       # Reiser4 (don't check if fail (some patches are already in xen patchset)
+       -cd $(DIR_APP) && bzcat $(DIR_DL)/reiser4-for-2.6.32.patch.bz2 | patch -Np1
 
        # ipp2p 0.8.2-pomng
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.27.19-ipp2p-0.8.2-pomng.patch
-
-       # Intel Atom Coretemp Patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.27-atom-coretemp.patch
-       # Intel Atom P4-clockmod Patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.27-atom-clockmod.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.8-ipp2p-0.8.2-pomng.patch
 
        # Layer7-patch
-       cd $(DIR_SRC) && rm -rf $(DIR_SRC)/netfilter-layer7-v2.21
-       cd $(DIR_SRC) && tar xzf $(DIR_DL)/netfilter-layer7-v2.21.tar.gz
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/netfilter-layer7-v2.21/kernel-2.6.25-2.6.28-layer7-2.21.patch
+       cd $(DIR_SRC) && rm -rf $(DIR_SRC)/netfilter-layer7-v2.22
+       cd $(DIR_SRC) && tar xzf $(DIR_DL)/netfilter-layer7-v2.22.tar.gz
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/netfilter-layer7-v2.22/kernel-2.6.25-2.6.28-layer7-2.22.patch
+
+       # Squashfs LZMA support
+       cd $(DIR_APP) && bzcat $(DIR_DL)/squashfs-lzma-linux-2.6.32-kernel-patches.tar.bz2 | patch -Np1
 
        # Cleanup kernel source
-       cd $(DIR_APP) && make mrproper
 
        cp $(DIR_SRC)/config/kernel/kernel.config.$(MACHINE)-$(VERSUFIX) $(DIR_APP)/.config
        cd $(DIR_APP) && make CC="$(KGCC)" oldconfig
@@ -188,10 +178,12 @@ endif
        # Rename ide-cd module to match with old kernel
        mv /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/ide/ide-cd_mod.ko \
           /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/ide/ide-cd.ko
+       mv /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/ide/ide-gd_mod.ko \
+          /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/ide/ide-disk.ko
 
-       # Remove mISDN modules
-       rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/mISDN
-       rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/hardware/mISDN
+#      # Remove mISDN modules
+#      rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/mISDN
+#      rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/hardware/mISDN
 
        @rm -rf $(DIR_SRC)/patch-o-matic* $(DIR_SRC)/iptables* $(DIR_SRC)/squashfs* $(DIR_SRC)/netfilter-layer7-*
        @$(POSTBUILD)

diff --git a/lfs/linux-firmware b/lfs/linux-firmware
new file mode 100644 (file)
index 0000000..eb9c4ff
--- /dev/null
+++ b/lfs/linux-firmware
@@ -0,0 +1,76 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2010  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# 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        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 20100318
+
+THISAPP    = linux-firmware-$(VER)
+DL_FILE    = $(THISAPP).tar.bz2
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 57e3ec91c81eee2443b0ab6d83c43633
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+       mkdir -p /lib/firmware
+       cd $(DIR_APP) && cp -vr * /lib/firmware
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/lfs/mkinitcpio b/lfs/mkinitcpio
index 636589403d1e6a11df911b1371c7f17ac6da111c..47de3ea68aaa72bd41bcf183d00caac2d9c86cde 100644 (file)
--- a/lfs/mkinitcpio
+++ b/lfs/mkinitcpio
@@ -76,6 +76,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        sed -i 's|^HOOKS=.*|HOOKS="base udev autodetect ide usb scsi pata sata virtio filesystems"|g' /etc/mkinitcpio.conf
        sed -i 's|^MODULES=.*|MODULES="reiser4 reiserfs ext3 ehci_hcd"|g' /etc/mkinitcpio.conf
        sed -i 's|ide-cd|ide-cd ide-generic|g' /lib/initcpio/install/ide
-
+       sed -i 's| gzip -9 | lzma |g' /sbin/mkinitcpio
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/openssl b/lfs/openssl
index 5d14bd61148a900360bd6f520f5da3acaaba0adc..1599c7b568d8dc1dde57ead22e665b4b5ff88a0e 100644 (file)
--- a/lfs/openssl
+++ b/lfs/openssl
@@ -70,13 +70,15 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-0.9.8n-cryptodev.diff
 ifeq "$(PADLOCK)" "1"
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-0.9.8g-engine-padlock.patch
 endif
        @rm -rf /etc/ssl
        cd $(DIR_APP) && sed -i -e 's/mcpu/march/' config
        cd $(DIR_APP) && sed -i -e 's/-O3/-O2/' -e 's/-march=i486/-march=i586/' Configure
-       cd $(DIR_APP) && ./config --openssldir=/etc/ssl --prefix=/usr shared
+       cd $(DIR_APP) && ./Configure --openssldir=/etc/ssl --prefix=/usr shared linux-elf \
+               zlib-dynamic no-asm 386
        cd $(DIR_APP) && make MANDIR=/usr/share/man
        cd $(DIR_APP) && make MANDIR=/usr/share/man install
        rm -rf /etc/ssl/lib

diff --git a/lfs/openswan b/lfs/openswan
index f3e3a2fca9a6384935befd7eeb29e69620076b01..a5d6520b738b282ed1dd2bed8aebc390f3482c4e 100644 (file)
--- a/lfs/openswan
+++ b/lfs/openswan
@@ -30,10 +30,10 @@ else
        VERSUFIX=ipfire
 endif
 
-VER        = 2.6.23
+VER        = git-20100309
 
-THISAPP    = openswan-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+THISAPP    = openswan.git
+DL_FILE    = openswan.$(VER).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
@@ -51,7 +51,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = c83053471e639bf3b97e3cf7796b7e83
+$(DL_FILE)_MD5 = f23b716b8ffb242436d8e713d93d209c
 
 install : $(TARGET)
 
@@ -92,7 +92,7 @@ else
                -e 's%^KLIPSCOMPILE.*$$%KLIPSCOMPILE=$(CFLAGS)%' \
                -e 's%^XMLTO.*$$%#&%' Makefile.inc
 
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/openswan-2.6.20_noxmlto.patch
+       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/openswan-2.6.24_noxmlto.patch
 
        cd $(DIR_APP) && sed -i 's/-Werror//' programs/Makefile.program
        

diff --git a/lfs/pound b/lfs/pound
new file mode 100644 (file)
index 0000000..673ba39
--- /dev/null
+++ b/lfs/pound
@@ -0,0 +1,87 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2009  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# 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        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 2.5
+
+THISAPP    = Pound-$(VER)
+DL_FILE    = $(THISAPP).tgz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = pound
+PAK_VER    = 2
+
+DEPS       = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 8a39f5902094619afcda7d12d9d8342c
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+       @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc --enable-cert1l
+       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make install
+       -mkdir -p /var/run/pound
+       install -v -m 644 $(DIR_SRC)/config/backup/includes/pound \
+                        /var/ipfire/backup/addons/includes/pound
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/lfs/reiser4progs b/lfs/reiser4progs
index 389bfbc699070708fc50d0681f5e94a74bc68751..92a9338d78c4ce581a0933c4aa583ea5dbb48b1b 100644 (file)
--- a/lfs/reiser4progs
+++ b/lfs/reiser4progs
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 1.0.5
+VER        = 1.0.6
 
 THISAPP    = reiser4progs-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 ifeq "$(LFS_PASS)" "install"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = b0756831e16b2395d5f443526d640792
+$(DL_FILE)_MD5 = d408cfeac40c266623bd51afa008caf6
 
 install : $(TARGET)
 
@@ -73,7 +73,7 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 ifeq "$(LFS_PASS)" "install"
        cd $(DIR_APP) && ./configure --prefix=/opt/$(MACHINE)-uClibc \
                        --with-libaal=/opt/$(MACHINE)-uClibc \

diff --git a/lfs/reiserfsprogs b/lfs/reiserfsprogs
index 9e37caf8c5e7b6c4e75309234631b580c207b367..b78baefbfd46fc04cb6c0cb8690c585436e602b7 100644 (file)
--- a/lfs/reiserfsprogs
+++ b/lfs/reiserfsprogs
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 3.6.19
+VER        = 3.6.21
 
 THISAPP    = reiserfsprogs-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 ifeq "$(LFS_PASS)" "install"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = b42cf15f6651c3ceff5cb84996c0d539
+$(DL_FILE)_MD5 = 0639cefac8f8150536cfa7531c2aa2d2
 
 install : $(TARGET)
 
@@ -73,7 +73,7 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 ifeq "$(LFS_PASS)" "install"
        cd $(DIR_APP) && ./configure --prefix=/ --sbindir=/sbin
        cd $(DIR_APP) && make $(MAKETUNING)

diff --git a/lfs/rrdtool b/lfs/rrdtool
index 4aade20e3ebe17d79ad18e5d39b3e3e7e5901561..db44716093ea8a79c24a607fa11a0a5742916d39 100644 (file)
--- a/lfs/rrdtool
+++ b/lfs/rrdtool
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.2.15
+VER        = 1.2.30
 
 THISAPP    = rrdtool-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = bde8b12c202bc4e27fb9a9588a0aaddf
+$(DL_FILE)_MD5 = 19b24f7184a8dbf7b48c1bbb565ad9fb
 
 install : $(TARGET)
 

diff --git a/lfs/squashfstools b/lfs/squashfstools
index 07143e17cdec65692c5afd6dc39fe99c4efeea51..bc1eb65d109252010d789d83fe4f3bea176a9e9d 100644 (file)
--- a/lfs/squashfstools
+++ b/lfs/squashfstools
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 3.4
+VER        = cvs20100214
 
-THISAPP    = squashfs$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+THISAPP    = squashfs-lzma-$(VER)
+DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 2a4d2995ad5aa6840c95a95ffa6b1da6
+$(DL_FILE)_MD5 = 6bcc0500dd126cb8cafa85f111f8496e
 
 install : $(TARGET)
 
@@ -69,7 +69,7 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP)/squashfs-tools && make mksquashfs
        cd $(DIR_APP)/squashfs-tools && cp -f mksquashfs /bin
        @rm -rf $(DIR_APP)

diff --git a/lfs/stage2 b/lfs/stage2
index 59cb947b44b31a7d8fa7835e03b5c546ca3b2a72..b2be2d6ca7bc74858a8c5ddf52fabd1124c877f6 100644 (file)
--- a/lfs/stage2
+++ b/lfs/stage2
@@ -69,9 +69,7 @@ $(TARGET) :
        -ln -sv bash /bin/sh
 
        # Config files
-       for i in $(DIR_SRC)/config/etc/*; do \
-           [ -f $$i ] && cp $$i /etc; \
-       done
+       cp -rvf $(DIR_SRC)/config/etc/* /etc;
        touch /etc/mtab
        echo "$(NAME) v$(VERSION) - $(SLOGAN)" >  /etc/issue
        echo "===============================" >> /etc/issue

diff --git a/lfs/strongswan b/lfs/strongswan
new file mode 100644 (file)
index 0000000..29290f9
--- /dev/null
+++ b/lfs/strongswan
@@ -0,0 +1,98 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2010  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# 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        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+ifeq "$(XEN)" "1"
+       VERSUFIX=ipfire-xen
+else
+       VERSUFIX=ipfire
+endif
+
+VER        = 4.3.6
+
+THISAPP    = strongswan-$(VER)
+DL_FILE    = $(THISAPP).tar.bz2
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = e071f46b6c463ce76900758734e6143e
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+
+       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-4.3.6_ipfire.patch
+
+       cd $(DIR_APP) && ./configure --prefix="/usr" --sysconfdir="/etc"
+       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make install
+
+       -rm -rfv /etc/rc*.d/*ipsec
+       cd $(DIR_SRC) && cp src/initscripts/init.d/ipsec /etc/rc.d/init.d/ipsec
+       rm -f /etc/ipsec.conf /etc/ipsec.secrets
+       ln -sf $(CONFIG_ROOT)/vpn/ipsec.conf /etc/ipsec.conf
+       ln -sf $(CONFIG_ROOT)/vpn/ipsec.secrets /etc/ipsec.secrets
+
+       rm -rf /etc/ipsec.d/{cacerts,certs,crls}
+       ln -sf $(CONFIG_ROOT)/ca    /etc/ipsec.d/cacerts
+       ln -sf $(CONFIG_ROOT)/certs /etc/ipsec.d/certs
+       ln -sf $(CONFIG_ROOT)/crls  /etc/ipsec.d/crls
+
+       #@rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/lfs/sysklogd b/lfs/sysklogd
index 9a4fda9daff8b93ec8dc380d1f78435fa1854d3e..9c9dd0d556808565f3838edbd9ffd0f2211ca884 100644 (file)
--- a/lfs/sysklogd
+++ b/lfs/sysklogd
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 1.4.1
+VER        = 1.5
 
 THISAPP    = sysklogd-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = f587720988bc1670071f31d3694ca0fb
+$(DL_FILE)_MD5 = e053094e8103165f98ddafe828f6ae4b
 
 install : $(TARGET)
 
@@ -69,10 +69,10 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-fixes-1.patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-8bit-1.patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)_xen_empty_buffer_check.patch
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       #cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-fixes-1.patch
+       #cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-8bit-1.patch
+       #cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)_xen_empty_buffer_check.patch
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        touch /var/log/{dhcpcd.log,messages,ovpnserver.log}

diff --git a/lfs/v4l-dvb b/lfs/v4l-dvb
index 2f3c2a5152b92ced3c7a5aeb539ef02a4a1fe286..bdc8ffe7000bd7b3e5bbe3e404f392bd80a58c85 100644 (file)
--- a/lfs/v4l-dvb
+++ b/lfs/v4l-dvb
@@ -30,7 +30,7 @@ else
        VERSUFIX=ipfire
 endif
 
-VER        = 9defbd461e5f
+VER        = 690055993011
 
 THISAPP    = v4l-dvb-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -47,8 +47,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 31eab30f5882b5d9342b71ddbead2915
-
+$(DL_FILE)_MD5 = 830f055b637afbb4f131246c313a6e05
 install : $(TARGET)
 
 check : $(patsubst %,$(DIR_CHK)/%,$(objects))

diff --git a/lfs/xen-image b/lfs/xen-image
index c632b032fcf0bc0771fffd25d98bfe5b9c1bcc89..a6e4f36428416d7378efd14b0b2079db6c6c47c3 100644 (file)
--- a/lfs/xen-image
+++ b/lfs/xen-image
@@ -86,7 +86,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        mount -o loop $(IMGvar) $(MNThdd)/var
 
        # Install IPFire without kernel modules
-       tar -C $(MNThdd)/ -xvjf /install/cdrom/$(SNAME)-$(VERSION).tbz2 \
+       tar -C $(MNThdd)/ -xvf /install/cdrom/$(SNAME)-$(VERSION).tlz --lzma \
                --exclude=lib/modules* --exclude=boot*
 
        #Install Xen Kernel
@@ -130,9 +130,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cp -f $(MNThdd)/etc/mkinitcpio.conf $(MNThdd)/etc/mkinitcpio.conf.org
        sed -i -e "s| autodetect | |g" $(MNThdd)/etc/mkinitcpio.conf
 
-       #Remove reiser4 because it is not work with xen-kernel
-       sed -i -e "s|reiser4 | |g" $(MNThdd)/etc/mkinitcpio.conf
-
        chroot $(MNThdd) /sbin/mkinitcpio -g /boot/ipfirerd-$(KVER)-xen.img -k $(KVER)-ipfire-xen
        cp -f $(MNThdd)/etc/mkinitcpio.conf.org $(MNThdd)/etc/mkinitcpio.conf
 

diff --git a/lfs/xz b/lfs/xz
new file mode 100644 (file)
index 0000000..4845227
--- /dev/null
+++ b/lfs/xz
@@ -0,0 +1,79 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# 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        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 4.999.9beta
+
+THISAPP    = xz-$(VER)
+DL_FILE    = $(THISAPP).tar.bz2
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+
+TARGET = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = cc4044fcc073b8bcf3164d1d0df82161
+
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && ./configure --prefix=/usr
+       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make install
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index 40a9e4b02ef90eee6c9c4197fed6e9a8941e9743..9c7369c7425ad389777e4c8ee53a89db4787bac4 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -24,8 +24,8 @@
 
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
-VERSION="2.5"                                                  # Version number
-CORE="37"                                                      # Core Level (Filename)
+VERSION="2.6"                                                  # Version number
+CORE="38"                                                      # Core Level (Filename)
 PAKFIRE_CORE="37"                                              # Core Level (PAKFIRE)
 GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`             # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan
@@ -36,7 +36,7 @@ KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
 MACHINE=`uname -m`
 GIT_TAG=$(git tag | tail -1)                                   # Git Tag
 GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8) # Last commit
-TOOLCHAINVER=1
+TOOLCHAINVER=2
 IPFVER="full"                          # Which versions should be compiled? (full|devel)
 
 # Debian specific settings
@@ -340,42 +340,30 @@ buildipfire() {
   ipfiremake pptp
   ipfiremake unzip
   ipfiremake which
+  ipfiremake xz
+  ipfiremake linux-firmware
   ipfiremake linux                     XEN=1
-  ipfiremake atl1c                     XEN=1
-  ipfiremake atl2                      XEN=1
-  ipfiremake hso                       XEN=1
-  ipfiremake e1000e                    XEN=1
-  ipfiremake et131x                    XEN=1
-  ipfiremake r8101                     XEN=1
-  ipfiremake r8169                     XEN=1
-  ipfiremake r8168                     XEN=1
   ipfiremake kqemu                     XEN=1
   #ipfiremake kvm-kmod                 XEN=1
   ipfiremake v4l-dvb                   XEN=1
   ipfiremake madwifi                   XEN=1
   #ipfiremake alsa                     XEN=1 KMOD=1
   ipfiremake dahdi                     XEN=1 KMOD=1
-  ipfiremake openswan                  XEN=1 KMOD=1
-  ipfiremake mISDN                     XEN=1
-  ipfiremake compat-wireless           XEN=1
+#  ipfiremake openswan                 XEN=1 KMOD=1
+  #ipfiremake mISDN                    XEN=1
+  #ipfiremake compat-wireless          XEN=1
+  ipfiremake cryptodev                 XEN=1
   ipfiremake linux
-  ipfiremake atl1c
-  ipfiremake atl2
-  ipfiremake hso
-  ipfiremake e1000e
-  ipfiremake et131x
-  ipfiremake r8101
-  ipfiremake r8169
-  ipfiremake r8168
   ipfiremake kqemu
-  ipfiremake kvm-kmod
+  #ipfiremake kvm-kmod
   ipfiremake v4l-dvb
   ipfiremake madwifi
   ipfiremake alsa                      KMOD=1
   ipfiremake dahdi                     KMOD=1
-  ipfiremake openswan                  KMOD=1
-  ipfiremake mISDN
-  ipfiremake compat-wireless
+#  ipfiremake openswan                 KMOD=1
+  #ipfiremake mISDN
+  #ipfiremake compat-wireless
+  ipfiremake cryptodev
   ipfiremake pkg-config
   ipfiremake linux-atm
   ipfiremake cpio
@@ -559,12 +547,14 @@ buildipfire() {
   ipfiremake tripwire
   ipfiremake sysstat
   ipfiremake vsftpd
-  ipfiremake openswan
+#  ipfiremake openswan
+  ipfiremake strongswan
   ipfiremake lsof
   ipfiremake centerim
   ipfiremake br2684ctl
   ipfiremake pcmciautils
   ipfiremake lm_sensors
+  ipfiremake liboping
   ipfiremake collectd
   ipfiremake lcd4linux
   ipfiremake tcptrack
@@ -658,7 +648,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/initscripts/init.d/firewall b/src/initscripts/init.d/firewall
index 0392e9f67d7509c8867b5b387486d940f16ddbba..9b708697f3b5a9bd48d0abf2e6f7545c6e2dd906 100644 (file)
--- a/src/initscripts/init.d/firewall
+++ b/src/initscripts/init.d/firewall
@@ -101,8 +101,7 @@ iptables_red() {
                # This rule enables a host on ORANGE network to connect to the outside
                # (only if we have a red connection)
                if [ "$IFACE" != "" ]; then
-                       /sbin/iptables -A REDFORWARD -i $ORANGE_DEV -p tcp -o $IFACE -j ACCEPT
-                       /sbin/iptables -A REDFORWARD -i $ORANGE_DEV -p udp -o $IFACE -j ACCEPT
+                       /sbin/iptables -A REDFORWARD -i $ORANGE_DEV -o $IFACE -j ACCEPT
                fi
        fi
 
@@ -117,7 +116,8 @@ iptables_red() {
                        /sbin/iptables -A REDINPUT -p udp --source-port 67 --destination-port 68 -i $IFACE -j ACCEPT
                fi
 
-               # Outgoing masquerading
+               # Outgoing masquerading (don't masqerade IPSEC (mark 50))
+               /sbin/iptables -t nat -A REDNAT -m mark --mark 50 -o $IFACE -j RETURN
                /sbin/iptables -t nat -A REDNAT -o $IFACE -j MASQUERADE
 
        fi
@@ -132,7 +132,7 @@ case "$1" in
        # original do nothing line
        #/sbin/iptables -A INPUT -p tcp -m tcp --tcp-flags SYN,RST,ACK SYN -m limit --limit 10/sec
        # the correct one, but the negative '!' do nothing...
-       #/sbin/iptables -A INPUT -p tcp -m tcp --tcp-flags SYN,RST,ACK SYN -m limit ! --limit 10/sec -j DROP
+       #/sbin/iptables -A INPUT -p tcp -m tcp --tcp-flags SYN,RST,ACK SYN ! -m limit --limit 10/sec -j DROP
 
        # Fix for braindead ISP's
        /sbin/iptables -A FORWARD -p tcp --tcp-flags SYN,RST SYN -j TCPMSS --clamp-mss-to-pmtu
@@ -167,14 +167,17 @@ case "$1" in
        /sbin/iptables -A FORWARD -m state --state ESTABLISHED,RELATED -j ACCEPT
        
        # trafic from ipsecX/TUN/TAP interfaces, before "-i GREEN_DEV" accept everything
-       /sbin/iptables -N IPSECVIRTUAL
+       /sbin/iptables -N IPSECINPUT
+       /sbin/iptables -N IPSECFORWARD
+       /sbin/iptables -N IPSECOUTPUT
        /sbin/iptables -N OPENSSLVIRTUAL
-       /sbin/iptables -A INPUT -j IPSECVIRTUAL -m comment --comment "IPSECVIRTUAL INPUT"
+       /sbin/iptables -A INPUT -j IPSECINPUT
        /sbin/iptables -A INPUT -j OPENSSLVIRTUAL -m comment --comment "OPENSSLVIRTUAL INPUT"
-       /sbin/iptables -A FORWARD -j IPSECVIRTUAL -m comment --comment "IPSECVIRTUAL FORWARD"
+       /sbin/iptables -A FORWARD -j IPSECFORWARD
        /sbin/iptables -A FORWARD -j OPENSSLVIRTUAL -m comment --comment "OPENSSLVIRTUAL FORWARD"
-       /sbin/iptables -t nat -N IPSECNAT
-       /sbin/iptables -t nat -A POSTROUTING -j IPSECNAT
+       /sbin/iptables -A OUTPUT -j IPSECOUTPUT
+       #/sbin/iptables -t nat -N IPSECNAT
+       #/sbin/iptables -t nat -A POSTROUTING -j IPSECNAT
 
        # Outgoing Firewall
        /sbin/iptables -A FORWARD -j OUTGOINGFW
@@ -186,7 +189,7 @@ case "$1" in
        /sbin/iptables -A FORWARD -i lo          -m state --state NEW -j ACCEPT
        /sbin/iptables -A FORWARD -s 127.0.0.0/8 -m state --state NEW -j DROP
        /sbin/iptables -A FORWARD -d 127.0.0.0/8 -m state --state NEW -j DROP
-       /sbin/iptables -A INPUT   -i $GREEN_DEV  -m state --state NEW -j ACCEPT -p ! icmp
+       /sbin/iptables -A INPUT   -i $GREEN_DEV  -m state --state NEW -j ACCEPT ! -p icmp
        /sbin/iptables -A FORWARD -i $GREEN_DEV  -m state --state NEW -j ACCEPT
 
        # If a host on orange tries to initiate a connection to IPFire's red IP and
@@ -198,10 +201,6 @@ case "$1" in
        /sbin/iptables -N DHCPBLUEINPUT 
        /sbin/iptables -A INPUT -j DHCPBLUEINPUT
 
-       # IPSec
-       /sbin/iptables -N IPSECPHYSICAL
-       /sbin/iptables -A INPUT -j IPSECPHYSICAL
-
        # OPenSSL
        /sbin/iptables -N OPENSSLPHYSICAL
        /sbin/iptables -A INPUT -j OPENSSLPHYSICAL

diff --git a/src/initscripts/init.d/ipsec b/src/initscripts/init.d/ipsec
index e37074742ca3ec6a074b25f1a19f7aa046148528..0c62db503738621d99bb08911accde7de7e0f548 100644 (file)
--- a/src/initscripts/init.d/ipsec
+++ b/src/initscripts/init.d/ipsec
@@ -1,178 +1,2 @@
 #!/bin/sh
-# IPsec startup and shutdown script
-# Copyright (C) 1998, 1999, 2001  Henry Spencer.
-# Copyright (C) 2002              Michael Richardson <mcr@freeswan.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 the
-# Free Software Foundation; either version 2 of the License, or (at your
-# option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
-# 
-# This program 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.
-#
-# RCSID $Id: setup.in,v 1.122.6.3 2006/10/26 23:54:32 paul Exp $
-#
-# ipsec         init.d script for starting and stopping
-#               the IPsec security subsystem (KLIPS and Pluto).
-#
-# This script becomes /etc/rc.d/init.d/ipsec (or possibly /etc/init.d/ipsec)
-# and is also accessible as "ipsec setup" (the preferred route for human
-# invocation).
-#
-# The startup and shutdown times are a difficult compromise (in particular,
-# it is almost impossible to reconcile them with the insanely early/late
-# times of NFS filesystem startup/shutdown).  Startup is after startup of
-# syslog and pcmcia support; shutdown is just before shutdown of syslog.
-#
-# chkconfig: 2345 47 76
-# description: IPsec provides encrypted and authenticated communications; \
-# KLIPS is the kernel half of it, Pluto is the user-level management daemon.
-
-me='ipsec setup'               # for messages
-
-# where the private directory and the config files are
-IPSEC_EXECDIR="${IPSEC_EXECDIR-/usr/libexec/ipsec}"
-IPSEC_LIBDIR="${IPSEC_LIBDIR-/usr/lib/ipsec}"
-IPSEC_SBINDIR="${IPSEC_SBINDIR-/usr/sbin}"
-IPSEC_CONFS="${IPSEC_CONFS-/etc}"
-
-if test " $IPSEC_DIR" = " "    # if we were not called by the ipsec command
-then
-    # we must establish a suitable PATH ourselves
-    PATH="${IPSEC_SBINDIR}":/sbin:/usr/sbin:/usr/local/bin:/bin:/usr/bin
-    export PATH
-
-    IPSEC_DIR="$IPSEC_LIBDIR"
-    export IPSEC_DIR IPSEC_CONFS IPSEC_LIBDIR IPSEC_EXECDIR
-fi
-
-# Check that the ipsec command is available.
-found=
-for dir in `echo $PATH | tr ':' ' '`
-do
-       if test -f $dir/ipsec -a -x $dir/ipsec
-       then
-               found=yes
-               break                   # NOTE BREAK OUT
-       fi
-done
-if ! test "$found"
-then
-       echo "cannot find ipsec command -- \`$1' aborted" |
-               logger -s -p daemon.error -t ipsec_setup
-       exit 1
-fi
-
-# accept a few flags
-
-export IPSEC_setupflags
-IPSEC_setupflags=""
-
-config=""
-
-for dummy
-do
-       case "$1" in
-       --showonly|--show)  IPSEC_setupflags="$1" ;;
-       --config)  config="--config $2" ; shift ;;
-       *) break ;;
-       esac
-       shift
-done
-
-
-# Pick up IPsec configuration (until we have done this, successfully, we
-# do not know where errors should go, hence the explicit "daemon.error"s.)
-# Note the "--export", which exports the variables created.
-eval `ipsec _confread $config --optional --varprefix IPSEC --export --type config setup`
-
-if test " $IPSEC_confreadstatus" != " "
-then
-    case $1 in 
-    stop|--stop|_autostop) 
-       echo "$IPSEC_confreadstatus -- \`$1' may not work" |
-               logger -s -p daemon.error -t ipsec_setup;;
-               
-    *) echo "$IPSEC_confreadstatus -- \`$1' aborted" |
-           logger -s -p daemon.error -t ipsec_setup;
-       exit 1;;
-    esac
-fi
-
-IPSEC_confreadsection=${IPSEC_confreadsection:-setup}
-export IPSEC_confreadsection
-
-IPSECsyslog=${IPSECsyslog-daemon.error}
-export IPSECsyslog
-
-# misc setup
-umask 022
-
-mkdir -p /var/run/pluto
-
-
-# do it
-case "$1" in
-  start|--start|stop|--stop|_autostop|_autostart)
-       if test " `id -u`" != " 0"
-       then
-               echo "permission denied (must be superuser)" |
-                       logger -s -p $IPSECsyslog -t ipsec_setup 2>&1
-               exit 1
-       fi
-       tmp=/var/run/pluto/ipsec_setup.st
-       outtmp=/var/run/pluto/ipsec_setup.out
-       (
-               ipsec _realsetup $1
-               echo "$?" >$tmp
-       ) > ${outtmp} 2>&1
-       st=$?
-       if test -f $tmp
-       then
-               st=`cat $tmp`
-               rm -f $tmp
-       fi
-       if [ -f ${outtmp} ]; then
-               cat ${outtmp} | logger -s -p $IPSECsyslog -t ipsec_setup 2>&1
-               rm -f ${outtmp}
-       fi
-       sleep 20 && chown root:nobody  /var/run/pluto -R && chmod 770 /var/run/pluto -R && ln -sf /var/run/pluto/pluto.pid /var/run/pluto.pid 2>&1 &
-       exit $st
-       ;;
-
-  restart|--restart|force-reload)
-       $0 $IPSEC_setupflags stop
-       $0 $IPSEC_setupflags start
-       ;;
-
-  _autorestart)                        # for internal use only
-       $0 $IPSEC_setupflags _autostop
-       $0 $IPSEC_setupflags _autostart
-       ;;
-
-  status|--status)
-       ipsec _realsetup $1
-       exit
-       ;;
-
-  --version)
-       echo "$me $IPSEC_VERSION"
-       exit 0
-       ;;
-
-  --help)
-       echo "Usage: $me [ --showonly ] {--start|--stop|--restart}"
-       echo "       $me --status"
-       exit 0
-       ;;
-
-  *)
-       echo "Usage: $me [ --showonly ] {--start|--stop|--restart}"
-       echo "       $me --status"
-       exit 2
-esac
-
-exit 0
+ipsec $*

diff --git a/src/initscripts/init.d/pound b/src/initscripts/init.d/pound
new file mode 100644 (file)
index 0000000..185ad61
--- /dev/null
+++ b/src/initscripts/init.d/pound
@@ -0,0 +1,58 @@
+#!/bin/sh
+
+. /etc/sysconfig/rc
+. ${rc_functions}
+
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+
+test -x /usr/sbin/pound || exit 0
+
+# For configuration of the init script use the file
+# /etc/sysconfig/pound, do not edit this init script.
+
+# Set run_pound to 1 to start pound or 0 to disable it.
+run_pound=0
+
+# Specify additional pound options here (see manpage).
+pound_options=""
+
+# Specify module to load
+pound_module="none"
+
+[ -e /etc/sysconfig/pound ] && . /etc/sysconfig/pound
+
+DAEMON=/usr/sbin/pound
+
+case "${1}" in
+       start)
+               boot_mesg "Starting pound ..."
+               if [ $run_pound = 1 ]
+               then
+                       # do we have to load a module?
+                       [ ${pound_module:-none} != "none" ] && /sbin/modprobe $pound_module
+
+                       loadproc $DAEMON $pound_options
+               fi
+               ;;
+
+       stop)
+               boot_mesg "Stopping pound ..."
+               killproc $DAEMON
+               ;;
+
+       restart)
+               ${0} stop
+               sleep 1
+               ${0} start
+               ;;
+
+       status)
+               statusproc $DAEMON
+               ;;
+
+       *)
+               echo "Usage: ${0} {start|stop|restart|status}"
+               exit 1
+               ;;
+esac
+

diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c
index 74f2974655de6f4cef989c5166584305609047c5..c16bde8f707a03bf7b7f8382855936bb49bcc25e 100644 (file)
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -14,9 +14,9 @@
 #define INST_FILECOUNT 6200
 #define UNATTENDED_CONF "/cdrom/boot/unattended.conf"
 
-#define REISER4 0
-#define REISERFS 1
-#define EXT3 2
+#define EXT2 0
+#define REISERFS 2
+#define EXT3 1
 
 FILE *flog = NULL;
 char *mylog;
@@ -43,7 +43,7 @@ int main(int argc, char *argv[])
        int rc = 0;
        char commandstring[STRING_SIZE];
        char mkfscommand[STRING_SIZE];
-       char *fstypes[] = { "Reiser4", "ReiserFS", "ext3", NULL };
+       char *fstypes[] = { "ext2", "ext3", "ReiserFS", NULL };
        int fstype = REISERFS;
        int choice;
        int i;
@@ -125,6 +125,7 @@ int main(int argc, char *argv[])
        mysystem("/sbin/modprobe sr_mod");
        mysystem("/sbin/modprobe usb-storage");
        mysystem("/sbin/modprobe usbhid");
+       mysystem("/sbin/modprobe ahci");
 
        mysystem("/sbin/modprobe iso9660"); // CDROM
        mysystem("/sbin/modprobe ext2"); // Boot patition
@@ -303,10 +304,10 @@ int main(int argc, char *argv[])
         /* Calculating Swap-Size dependend of Ram Size */
        if (memory < 128)
                swap_file = 32;
-       else if (memory >= 1024)
-               swap_file = 512;
+       else if (memory > 512)
+               swap_file = 256;
        else 
-               swap_file = memory;
+               swap_file = memory / 4;
        
   /* Calculating Root-Size dependend of Max Disk Space */
   if ( disk < 756 )
@@ -365,9 +366,9 @@ int main(int argc, char *argv[])
                goto EXIT;
        }
        
-       if (fstype == REISER4) {
-               mysystem("/sbin/modprobe reiser4");
-               sprintf(mkfscommand, "/sbin/mkfs.reiser4 -y");
+       if (fstype == EXT2) {
+               mysystem("/sbin/modprobe ext2");
+               sprintf(mkfscommand, "/sbin/mke2fs -T ext2 -c");
        } else if (fstype == REISERFS) {
                mysystem("/sbin/modprobe reiserfs");
                sprintf(mkfscommand, "/sbin/mkreiserfs -f");
@@ -439,7 +440,7 @@ int main(int argc, char *argv[])
        }
 
        snprintf(commandstring, STRING_SIZE,
-               "/bin/tar -C /harddisk -xvjf /cdrom/" SNAME "-" VERSION ".tbz2");
+               "/bin/tar -C /harddisk  -xvf /cdrom/" SNAME "-" VERSION ".tlz --lzma");
        
        if (runcommandwithprogress(60, 4, title, commandstring, INST_FILECOUNT,
                ctr[TR_INSTALLING_FILES]))
@@ -482,9 +483,9 @@ int main(int argc, char *argv[])
        /* Update /etc/fstab */
        replace("/harddisk/etc/fstab", "DEVICE", hdparams.devnode_part_run);
        
-       if (fstype == REISER4) {
-               replace("/harddisk/etc/fstab", "FSTYPE", "reiser4");
-               replace("/harddisk/boot/grub/grub.conf", "MOUNT", "rw");
+       if (fstype == EXT2) {
+               replace("/harddisk/etc/fstab", "FSTYPE", "ext2");
+               replace("/harddisk/boot/grub/grub.conf", "MOUNT", "ro");
        } else if (fstype == REISERFS) {
                replace("/harddisk/etc/fstab", "FSTYPE", "reiserfs");
                replace("/harddisk/boot/grub/grub.conf", "MOUNT", "ro");

diff --git a/src/install+setup/install/mountdest.sh b/src/install+setup/install/mountdest.sh
index 11fd80056210ac7e56e9c2f2ca6c9ec66602a3d5..00243a99b2066b1794491502e9f986348bb563b3 100644 (file)
--- a/src/install+setup/install/mountdest.sh
+++ b/src/install+setup/install/mountdest.sh
@@ -24,8 +24,13 @@ echo "Scanning for possible destination drives"
 # scan IDE devices
 echo "--> IDE"
 for DEVICE in $(kudzu -qps -t 30 -c HD -b IDE | grep device: | cut -d ' ' -f 2 | sort | uniq); do
+               if [ "$(grep ${DEVICE} /proc/partitions)" = "" ]; then
+                       umount /harddisk 2> /dev/null
+                       echo "${DEVICE} is empty - SKIP"
+                       continue
+               fi
                mount /dev/${DEVICE}1 /harddisk 2> /dev/null
-               if [ -n "$(ls /harddisk/ipfire-*.tbz2 2>/dev/null)" ]; then
+               if [ -n "$(ls /harddisk/ipfire-*.tlz 2>/dev/null)" ]; then
                        umount /harddisk 2> /dev/null
                        echo "${DEVICE}1 is source drive - SKIP"
                        continue
@@ -40,15 +45,20 @@ done
 # scan USB/SCSI devices
 echo "--> USB/SCSI"
 for DEVICE in $(kudzu -qps -t 30 -c HD -b SCSI | grep device: | cut -d ' ' -f 2 | sort | uniq); do
-               mount /dev/${DEVICE} /harddisk 2> /dev/null
-               if [ -n "$(ls /harddisk/ipfire-*.tbz2 2>/dev/null)" ]; then
+               if [ "$(grep ${DEVICE} /proc/partitions)" = "" ]; then
+                       umount /harddisk 2> /dev/null
+                       echo "${DEVICE} is empty - SKIP"
+                       continue
+               fi
+               mount /dev/${DEVICE} /harddisk 2> /dev/null
+               if [ -n "$(ls /harddisk/ipfire-*.tlz 2>/dev/null)" ]; then
                        umount /harddisk 2> /dev/null
                        echo "${DEVICE} is source drive - SKIP"
                        continue
                else
                        umount /harddisk 2> /dev/null
                        mount /dev/${DEVICE}1 /harddisk 2> /dev/null
-                       if [ -n "$(ls /harddisk/ipfire-*.tbz2 2>/dev/null)" ]; then
+                       if [ -n "$(ls /harddisk/ipfire-*.tlz 2>/dev/null)" ]; then
                                umount /harddisk 2> /dev/null
                                echo "${DEVICE}1 is source drive - SKIP"
                                continue
@@ -64,22 +74,32 @@ done
 # scan RAID devices
 echo "--> RAID"
 for DEVICE in $(kudzu -qps -t 30 -c HD -b RAID | grep device: | cut -d ' ' -f 2 | sort | uniq); do
+               if [ "$(grep ${DEVICE}p1 /proc/partitions)" = "" ]; then
+                       umount /harddisk 2> /dev/null
+                       echo "${DEVICE}p1 is empty - SKIP"
+                       continue
+               fi
                mount /dev/${DEVICE}p1 /harddisk 2> /dev/null
-               if [ -n "$(ls /harddisk/ipfire-*.tbz2 2>/dev/null)" ]; then
+               if [ -n "$(ls /harddisk/ipfire-*.tlz 2>/dev/null)" ]; then
                        umount /harddisk 2> /dev/null
                        echo "${DEVICE}p1 is source drive - SKIP"
                        continue
                else
                        umount /harddisk 2> /dev/null
+                       if [ "$(grep ${DEVICE} /proc/partitions)" = "" ]; then
+                               umount /harddisk 2> /dev/null
+                               echo "${DEVICE} is empty - SKIP"
+                               continue
+                       fi
                        mount /dev/${DEVICE}1 /harddisk 2> /dev/null
-                       if [ -n "$(ls /harddisk/ipfire-*.tbz2 2>/dev/null)" ]; then
+                       if [ -n "$(ls /harddisk/ipfire-*.tlz 2>/dev/null)" ]; then
                                umount /harddisk 2> /dev/null
                                echo "${DEVICE}1 is source drive - SKIP"
                                continue
                        else
                                umount /harddisk 2> /dev/null
                                mount /dev/${DEVICE} /harddisk 2> /dev/null
-                               if [ -n "$(ls /harddisk/ipfire-*.tbz2 2>/dev/null)" ]; then
+                               if [ -n "$(ls /harddisk/ipfire-*.tlz 2>/dev/null)" ]; then
                                        umount /harddisk 2> /dev/null
                                        echo "${DEVICE} is source drive - SKIP"
                                        continue
@@ -98,15 +118,20 @@ for DEVICE in vda vdb vdc vdd; do
                if [ ! -e /dev/${DEVICE} ]; then
                        continue
                else
+                       if [ "$(grep ${DEVICE} /proc/partitions)" = "" ]; then
+                               umount /harddisk 2> /dev/null
+                               echo "${DEVICE} is empty - SKIP"
+                               continue
+                       fi
                        mount /dev/${DEVICE} /harddisk 2> /dev/null
-                       if [ -n "$(ls /harddisk/ipfire-*.tbz2 2>/dev/null)" ]; then
+                       if [ -n "$(ls /harddisk/ipfire-*.tlz 2>/dev/null)" ]; then
                                umount /harddisk 2> /dev/null
                                echo "${DEVICE} is source drive - SKIP"
                                continue
                        else
                                umount /harddisk 2> /dev/null
                                mount /dev/${DEVICE}1 /harddisk 2> /dev/null
-                               if [ -n "$(ls /harddisk/ipfire-*.tbz2 2>/dev/null)" ]; then
+                               if [ -n "$(ls /harddisk/ipfire-*.tlz 2>/dev/null)" ]; then
                                        umount /harddisk 2> /dev/null
                                        echo "${DEVICE}1 is source drive - SKIP"
                                        continue

diff --git a/src/install+setup/install/mountsource.sh b/src/install+setup/install/mountsource.sh
index 5c654a11f1ed88b24e7ebb413f3ddc3f87fd05ff..bb7a7e2fda2c798f694dc749d7e10fba87ac7b4c 100644 (file)
--- a/src/install+setup/install/mountsource.sh
+++ b/src/install+setup/install/mountsource.sh
@@ -24,7 +24,7 @@ echo "Scanning source media"
 # scan CDROM devices
 for DEVICE in $(kudzu -qps -t 30 -c CDROM | grep device: | cut -d ' ' -f 2 | sort | uniq); do
                mount /dev/${DEVICE} /cdrom 2> /dev/null
-               if [ -n "$(ls /cdrom/ipfire-*.tbz2 2>/dev/null)" ]; then
+               if [ -n "$(ls /cdrom/ipfire-*.tlz 2>/dev/null)" ]; then
                        echo -n ${DEVICE} > /tmp/source_device
                        echo "Found tarball on ${DEVICE}"
                        exit 0
@@ -37,7 +37,7 @@ done
 # scan HD device part1 (usb sticks, etc.)
 for DEVICE in $(kudzu -qps -t 30 -c HD | grep device: | cut -d ' ' -f 2 | sort | uniq); do
                mount /dev/${DEVICE}1 /cdrom 2> /dev/null
-               if [ -n "$(ls /cdrom/ipfire-*.tbz2 2>/dev/null)" ]; then
+               if [ -n "$(ls /cdrom/ipfire-*.tlz 2>/dev/null)" ]; then
                        echo -n ${DEVICE}1 > /tmp/source_device
                        echo "Found tarball on ${DEVICE}1"
                        exit 0
@@ -50,7 +50,7 @@ done
 # scan HD device unpart (usb sticks, etc.)
 for DEVICE in $(kudzu -qps -t 30 -c HD | grep device: | cut -d ' ' -f 2 | sort | uniq); do
                mount /dev/${DEVICE} /cdrom 2> /dev/null
-               if [ -n "$(ls /cdrom/ipfire-*.tbz2 2>/dev/null)" ]; then
+               if [ -n "$(ls /cdrom/ipfire-*.tlz 2>/dev/null)" ]; then
                        echo -n ${DEVICE} > /tmp/source_device
                        echo "Found tarball on ${DEVICE}"
                        exit 0

diff --git a/src/misc-progs/Makefile b/src/misc-progs/Makefile
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/misc-progs/ipsecctrl.c b/src/misc-progs/ipsecctrl.c
index 763b81f96d25d27bd4eb350460ed5e095814ee50..d443edccfc8c151501da47642dbdaf6147afce9b 100644 (file)
--- a/src/misc-progs/ipsecctrl.c
+++ b/src/misc-progs/ipsecctrl.c
@@ -30,21 +30,16 @@
 
 */
 
-#define phystable       "IPSECPHYSICAL"
-#define virtualtable    "IPSECVIRTUAL"
-
 void usage() {
         fprintf (stderr, "Usage:\n");
         fprintf (stderr, "\tipsecctrl S [connectionkey]\n");
         fprintf (stderr, "\tipsecctrl D [connectionkey]\n");
         fprintf (stderr, "\tipsecctrl R\n");
+        fprintf (stderr, "\tipsecctrl I\n");
         fprintf (stderr, "\t\tS : Start/Restart Connection\n");
         fprintf (stderr, "\t\tD : Stop Connection\n");
         fprintf (stderr, "\t\tR : Reload Certificates and Secrets\n");
-}
-
-void load_modules() {
-        safe_system("/sbin/modprobe ipsec");
+        fprintf (stderr, "\t\tI : Print Statusinfo\n");
 }
 
 /*
@@ -54,108 +49,31 @@ void open_physical (char *interface, int nat_traversal_port) {
         char str[STRING_SIZE];
 
         // GRE ???
-        sprintf(str, "/sbin/iptables -A " phystable " -p 47  -i %s -j ACCEPT", interface);
-        safe_system(str);
+//        sprintf(str, "/sbin/iptables -A " phystable " -p 47  -i %s -j ACCEPT", interface);
+//        safe_system(str);
         // ESP
-        sprintf(str, "/sbin/iptables -A " phystable " -p 50  -i %s -j ACCEPT", interface);
-        safe_system(str);
+//        sprintf(str, "/sbin/iptables -A " phystable " -p 50  -i %s -j ACCEPT", interface);
+//        safe_system(str);
         // AH
-        sprintf(str, "/sbin/iptables -A " phystable " -p 51  -i %s -j ACCEPT", interface);
-        safe_system(str);
+//        sprintf(str, "/sbin/iptables -A " phystable " -p 51  -i %s -j ACCEPT", interface);
+//        safe_system(str);
         // IKE
-        sprintf(str, "/sbin/iptables -A " phystable " -p udp -i %s --sport 500 --dport 500 -j ACCEPT", interface);
+        sprintf(str, "/sbin/iptables -A IPSECINPUT -p udp -i %s --sport 500 --dport 500 -j ACCEPT", interface);
         safe_system(str);
 
         if (! nat_traversal_port) 
             return;
 
-        sprintf(str, "/sbin/iptables -A " phystable " -p udp -i %s --dport %i -j ACCEPT", interface, nat_traversal_port);
+        sprintf(str, "/sbin/iptables -A IPSECINPUT -p udp -i %s --dport %i -j ACCEPT", interface, nat_traversal_port);
         safe_system(str);
 }
 
-/*
-    Basic control for what can flow from/to ipsecX interfaces.
-
-    rc.firewall call this chain just before ACCEPTing everything
-    from green (-i DEV_GREEN -j ACCEPT).
-*/
-void open_virtual (void) {
-        // allow anything from any ipsec to go on all interface, including other ipsec
-        safe_system("/sbin/iptables -A " virtualtable " -i ipsec+ -j ACCEPT");
-        //todo: BOT extension?; allowing ipsec0<<==port-list-filter==>>GREEN ?
-}
-
 void ipsec_norules() {
         /* clear input rules */
-        safe_system("/sbin/iptables -F " phystable);
-        safe_system("/sbin/iptables -F " virtualtable);
+        safe_system("/sbin/iptables -F IPSECINPUT");
+        safe_system("/sbin/iptables -F IPSECFORWARD");
+        safe_system("/sbin/iptables -F IPSECOUTPUT");
 
-        // unmap red alias ????
-}
-
-
-void add_alias_interfaces(char *configtype,
-                          char *redtype,
-                          char *redif,
-                          int offset)           //reserve room for ipsec0=red, ipsec1=green, ipsec2=orange,ipsec3=blue
-{
-        FILE *file = NULL;
-        char s[STRING_SIZE];
-        int alias=0;
-
-        /* Check for CONFIG_TYPE=2 or 3 i.e. RED ethernet present. If not,
-        * exit gracefully.  This is not an error... */
-        if (!((strcmp(configtype, "1")==0) || (strcmp(configtype, "2")==0) || (strcmp(configtype, "3")==0) || (strcmp(configtype, "4")==0)))
-                return;
-
-        /* Now check the RED_TYPE - aliases only work with STATIC. */
-        if (!(strcmp(redtype, "STATIC")==0))
-                return;
-
-        /* Now set up the new aliases from the config file */
-        if (!(file = fopen(CONFIG_ROOT "/ethernet/aliases", "r")))
-        {
-                fprintf(stderr, "Unable to open aliases configuration file\n");
-                return;
-        }
-        while (fgets(s, STRING_SIZE, file) != NULL && (offset+alias) < 16 )
-        {
-                if (s[strlen(s) - 1] == '\n')
-                        s[strlen(s) - 1] = '\0';
-                int count = 0;
-                char *aliasip=NULL;
-                char *enabled=NULL;
-                char *comment=NULL;
-                char *sptr = strtok(s, ",");
-                while (sptr)
-                {
-                        if (count == 0)
-                                aliasip = sptr;
-                        if (count == 1)
-                                enabled = sptr;
-                        else
-                                comment = sptr;
-                        count++;
-                        sptr = strtok(NULL, ",");
-                }
-
-                if (!(aliasip && enabled))
-                        continue;
-
-                if (!VALID_IP(aliasip))
-                {
-                        fprintf(stderr, "Bad alias : %s\n", aliasip);
-                        return;
-                }
-
-                if (strcmp(enabled, "on") == 0)
-                {
-                        memset(s, 0, STRING_SIZE);
-                        snprintf(s, STRING_SIZE-1, "/usr/sbin/ipsec tncfg --attach --virtual ipsec%d --physical %s:%d >/dev/null", offset+alias, redif, alias);
-                        safe_system(s);
-                        alias++;
-                }
-        }
 }
 
 /*
@@ -220,7 +138,7 @@ int decode_line (char *s,
 void turn_connection_on (char *name, char *type) {
         char command[STRING_SIZE];
 
-        safe_system("/usr/sbin/ipsec auto --rereadsecrets >/dev/null");
+        safe_system("/usr/sbin/ipsec whack --rereadsecrets >/dev/null");
         memset(command, 0, STRING_SIZE);
         snprintf(command, STRING_SIZE - 1, 
                 "/usr/sbin/ipsec auto --replace %s >/dev/null", name);
@@ -228,7 +146,7 @@ void turn_connection_on (char *name, char *type) {
         if (strcmp(type, "net") == 0) {
                 memset(command, 0, STRING_SIZE);
                 snprintf(command, STRING_SIZE - 1, 
-                "/usr/sbin/ipsec auto --asynchronous --up %s >/dev/null", name);
+                "/usr/sbin/ipsec whack --asynchronous --name %s --initiate >/dev/null", name);
                 safe_system(command);
         }
 }
@@ -240,13 +158,13 @@ void turn_connection_off (char *name) {
 
         memset(command, 0, STRING_SIZE);
         snprintf(command, STRING_SIZE - 1, 
-                "/usr/sbin/ipsec auto --down %s >/dev/null", name);
+                "/usr/sbin/ipsec whack --name %s --terminate >/dev/null", name);
         safe_system(command);
         memset(command, 0, STRING_SIZE);
         snprintf(command, STRING_SIZE - 1, 
-                "/usr/sbin/ipsec auto --delete %s >/dev/null", name);
+                "/usr/sbin/ipsec whack --delete --name %s >/dev/null", name);
         safe_system(command);
-        safe_system("/usr/sbin/ipsec auto --rereadsecrets >/dev/null");
+        safe_system("/usr/sbin/ipsec whack --rereadsecrets >/dev/null");
 }
 
 
@@ -291,9 +209,15 @@ int main(int argc, char *argv[]) {
                 }
 
                 if (strcmp(argv[1], "R") == 0) {
-                        safe_system("/usr/sbin/ipsec auto --rereadall");
+                        safe_system("/usr/sbin/ipsec whack --rereadall");
+                        exit(0);
+                }
+
+                if (strcmp(argv[1], "I") == 0) {
+                        safe_system("/usr/sbin/ipsec whack --status");
                         exit(0);
                 }
+
         }
 
         /* clear iptables vpn rules */
@@ -422,15 +346,9 @@ int main(int argc, char *argv[]) {
         if (enable_blue==2)
                 open_physical(if_blue, 4500);
 
-        // then open the ipsecX
-        open_virtual();
-
         // start the system
         if ((argc == 2) && strcmp(argv[1], "S") == 0) {
-                load_modules();
-                safe_system("/usr/sbin/ipsec tncfg --clear >/dev/null");
                 safe_system("/etc/rc.d/init.d/ipsec restart >/dev/null");
-                add_alias_interfaces(configtype, redtype, if_red, (enable_red+enable_green+enable_orange+enable_blue) >>1 );
                 safe_system("/usr/local/bin/vpn-watch &");
                 exit(0);
         }

diff --git a/src/misc-progs/setaliases.c b/src/misc-progs/setaliases.c
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/misc-progs/syslogdctrl.c b/src/misc-progs/syslogdctrl.c
index 9880ee2ee60d7af4ab0168843d6a87abd944b53a..a470e47edbf50a61eb54d2348ebd8c1a72b739b3 100644 (file)
--- a/src/misc-progs/syslogdctrl.c
+++ b/src/misc-progs/syslogdctrl.c
@@ -30,7 +30,8 @@
 
 int main(void)
 {
-   char buffer[STRING_SIZE], command[STRING_SIZE], hostname[STRING_SIZE], varmessages[STRING_SIZE];
+   char buffer[STRING_SIZE], command[STRING_SIZE], hostname[STRING_SIZE];
+   char varmessages[STRING_SIZE], enable_asynclog[STRING_SIZE];
    int config_fd,rc,fd,pid;
    struct stat st;
    struct keyvalue *kv = NULL;
@@ -62,6 +63,13 @@ int main(void)
       fprintf(stderr, "Cannot read REMOTELOG_ADDR\n");
       exit(ERR_SETTINGS);
    }
+
+   if (!findkey(kv, "ENABLE_ASYNCLOG", enable_asynclog))
+   {
+      fprintf(stderr, "Cannot read ENABLE_ASYNCLOG\n");
+      exit(ERR_SETTINGS);
+   }
+
    
    if (!findkey(kv, "VARMESSAGES", varmessages))
    {
@@ -123,9 +131,13 @@ int main(void)
    close(config_fd);
    
    /* Replace the logging option*/
-
      safe_system("grep -v '/var/log/messages' < /etc/syslog.conf.new > /etc/syslog.conf.tmp && mv /etc/syslog.conf.tmp /etc/syslog.conf.new");
+   
+   if (strcmp(enable_asynclog,"on"))
+     snprintf(command, STRING_SIZE-1, "printf '%s     -/var/log/messages' >> /etc/syslog.conf.new", varmessages );
+   else
      snprintf(command, STRING_SIZE-1, "printf '%s     /var/log/messages' >> /etc/syslog.conf.new", varmessages );
+
      safe_system(command);
 
    if (rename("/etc/syslog.conf.new", "/etc/syslog.conf") == -1)

diff --git a/src/misc-progs/wirelessctrl.c b/src/misc-progs/wirelessctrl.c
index 01743a7662f450c069076c231289d95207375544..bfd4527041fe437c5658998b8851eb87aa66b8d1 100644 (file)
--- a/src/misc-progs/wirelessctrl.c
+++ b/src/misc-progs/wirelessctrl.c
@@ -151,7 +151,7 @@ int main(void)
                                                                        (VALID_IP(ipaddress))) {
                                                                        snprintf(command, STRING_SIZE-1, "/sbin/iptables -A WIRELESSINPUT -m mac --mac-source %s -s %s -i %s -j ACCEPT", macaddress, ipaddress, blue_dev);
                                                                        safe_system(command);
-                                                                       snprintf(command, STRING_SIZE-1, "/sbin/iptables -A WIRELESSFORWARD -m mac --mac-source %s -s %s -i %s -o ! %s -j ACCEPT", macaddress, ipaddress, blue_dev, green_dev);
+                                                                       snprintf(command, STRING_SIZE-1, "/sbin/iptables -A WIRELESSFORWARD -m mac --mac-source %s -s %s -i %s ! -o %s -j ACCEPT", macaddress, ipaddress, blue_dev, green_dev);
                                                                        safe_system(command);
                                                                        snprintf(command, STRING_SIZE-1, "/sbin/iptables -A WIRELESSFORWARD -m mac --mac-source %s -s %s -i %s -j DMZHOLES", macaddress, ipaddress, blue_dev);
                                                                        safe_system(command);
@@ -161,7 +161,7 @@ int main(void)
                                                                        if (strlen(macaddress) == 17) {
                                                                                                        snprintf(command, STRING_SIZE-1, "/sbin/iptables -A WIRELESSINPUT -m mac --mac-source %s -i %s -j ACCEPT", macaddress, blue_dev);
                                                                                                        safe_system(command);
-                                                                                                       snprintf(command, STRING_SIZE-1, "/sbin/iptables -A WIRELESSFORWARD -m mac --mac-source %s -i %s -o ! %s -j ACCEPT", macaddress, blue_dev, green_dev);
+                                                                                                       snprintf(command, STRING_SIZE-1, "/sbin/iptables -A WIRELESSFORWARD -m mac --mac-source %s -i %s ! -o %s -j ACCEPT", macaddress, blue_dev, green_dev);
                                                                                                        safe_system(command);
                                                                                                        snprintf(command, STRING_SIZE-1, "/sbin/iptables -A WIRELESSFORWARD -m mac --mac-source %s -i %s -j DMZHOLES", macaddress, blue_dev);
                                                                                                        safe_system(command);
@@ -170,7 +170,7 @@ int main(void)
                                                                        if (VALID_IP(ipaddress)) {
                                                                                                        snprintf(command, STRING_SIZE-1, "/sbin/iptables -A WIRELESSINPUT -s %s -i %s -j ACCEPT", ipaddress, blue_dev);
                                                                                                        safe_system(command);
-                                                                                                       snprintf(command, STRING_SIZE-1, "/sbin/iptables -A WIRELESSFORWARD -s %s -i %s -o ! %s -j ACCEPT", ipaddress, blue_dev, green_dev);
+                                                                                                       snprintf(command, STRING_SIZE-1, "/sbin/iptables -A WIRELESSFORWARD -s %s -i %s ! -o %s -j ACCEPT", ipaddress, blue_dev, green_dev);
                                                                                                        safe_system(command);
                                                                                                        snprintf(command, STRING_SIZE-1, "/sbin/iptables -A WIRELESSFORWARD -s %s -i %s -j DMZHOLES", ipaddress, blue_dev);
                                                                                                        safe_system(command);

diff --git a/src/pakfire/lib/functions.sh b/src/pakfire/lib/functions.sh
index e4e3d5bc09bbe7f7b076d8c5b494609ddd0a76e9..2f6491f28e3b4a7862a775787ae30cca8061bb78 100644 (file)
--- a/src/pakfire/lib/functions.sh
+++ b/src/pakfire/lib/functions.sh
@@ -24,7 +24,7 @@
 
 extract_files() {
        echo "Extracting files..."
-       tar xvf /opt/pakfire/tmp/files --no-overwrite-dir --preserve --numeric-owner -C /
+       tar xvf /opt/pakfire/tmp/files --no-overwrite-dir -p --numeric-owner -C /
        echo "...Finished."
 }
 

diff --git a/src/paks/linux-xen/install.sh b/src/paks/linux-xen/install.sh
index 900bcf7eb1b405a4c493180f67a137b55edd5b8a..539c2fa8d881d33fdb9c85851f31c0bf09cc25d3 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.27.42
+KVER=2.6.32.10
 ROOT=`grep "root=" /boot/grub/grub.conf | cut -d"=" -f2 | cut -d" " -f1 | tail -n 1`
 MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1`
 # Nur den letzten Parameter verwenden
@@ -64,8 +64,6 @@ fi
 #
 cp -f /etc/mkinitcpio.conf.org /etc/mkinitcpio.conf
 sed -i -e "s| autodetect | |g" /etc/mkinitcpio.conf
-# Remove Reiser4 (not working with xen)
-sed -i -e "s|reiser4 | |g" /etc/mkinitcpio.conf
 mkinitcpio -k $KVER-ipfire-xen -g /boot/ipfirerd-$KVER-xen.img
 #
 # Create new module depency

diff --git a/src/paks/linux-xen/uninstall.sh b/src/paks/linux-xen/uninstall.sh
index 6c07f7e12eab397fa924541388166dd2522a982d..ca65ef7c47b420d20bd0a90d77b4c546b3f59c3d 100644 (file)
--- a/src/paks/linux-xen/uninstall.sh
+++ b/src/paks/linux-xen/uninstall.sh
@@ -23,4 +23,4 @@
 #
 . /opt/pakfire/lib/functions.sh
 remove_files
-mv -f /boot/grub/grub-backup-2.6.27.*.-xen.conf /boot/grub/grub.conf
+mv -f /boot/grub/grub-backup-2.6.32.*.-xen.conf /boot/grub/grub.conf

diff --git a/src/paks/pound/install.sh b/src/paks/pound/install.sh
new file mode 100644 (file)
index 0000000..c1748b0
--- /dev/null
+++ b/src/paks/pound/install.sh
@@ -0,0 +1,32 @@
+#!/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 2 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) 2007 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+extract_files
+restore_backup ${NAME}
+
+ln -svf  ../init.d/pound /etc/rc.d/rc0.d/K20pound
+ln -svf  ../init.d/pound /etc/rc.d/rc3.d/S40pound
+ln -svf  ../init.d/pound /etc/rc.d/rc6.d/K20pound
+
+start_service --background ${NAME}

diff --git a/src/paks/pound/uninstall.sh b/src/paks/pound/uninstall.sh
new file mode 100644 (file)
index 0000000..aa2c63b
--- /dev/null
+++ b/src/paks/pound/uninstall.sh
@@ -0,0 +1,29 @@
+#!/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 2 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) 2007 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+stop_service ${NAME}
+make_backup ${NAME}
+remove_files
+
+rm -rf /etc/rc.d/rc*.d/*pound

diff --git a/src/paks/pound/update.sh b/src/paks/pound/update.sh
new file mode 100644 (file)
index 0000000..89c40d0
--- /dev/null
+++ b/src/paks/pound/update.sh
@@ -0,0 +1,26 @@
+#!/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 2 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) 2007 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+./uninstall.sh
+./install.sh

diff --git a/src/patches/ccache-3.0pre0-no_compiler_mtime.patch b/src/patches/ccache-3.0pre0-no_compiler_mtime.patch
new file mode 100644 (file)
index 0000000..4bdc8d4
--- /dev/null
+++ b/src/patches/ccache-3.0pre0-no_compiler_mtime.patch
@@ -0,0 +1,19 @@
+diff -Naur ccache-3.0pre0.org/ccache.c ccache-3.0pre0/ccache.c
+--- ccache-3.0pre0.org/ccache.c        2010-02-28 21:14:39.000000000 +0100
++++ ccache-3.0pre0/ccache.c    2010-03-22 08:08:43.000000000 +0100
+@@ -849,12 +849,14 @@
+ 
+       compilercheck = getenv("CCACHE_COMPILERCHECK");
+       if (!compilercheck) {
+-              compilercheck = "mtime";
++              compilercheck = "size";
+       }
+       if (strcmp(compilercheck, "none") == 0) {
+               /* Do nothing. */
+       } else if (strcmp(compilercheck, "content") == 0) {
+               hash_file(&hash, args->argv[0]);
++      } else if (strcmp(compilercheck, "size") == 0){
++              hash_int(&hash, st.st_size);
+       } else { /* mtime */
+               hash_int(&hash, st.st_size);
+               hash_int(&hash, st.st_mtime);

diff --git a/src/patches/grub-0.90-append.patch b/src/patches/grub-0.90-append.patch
new file mode 100644 (file)
index 0000000..88f79d0
--- /dev/null
+++ b/src/patches/grub-0.90-append.patch
@@ -0,0 +1,111 @@
+--- grub-0.90/stage2/stage2.c.append   Thu Dec 20 08:20:48 2001
++++ grub-0.90/stage2/stage2.c  Thu Dec 20 17:01:20 2001
+@@ -500,7 +500,8 @@
+         if (config_entries)
+           printf ("\
+       Press enter to boot the selected OS, \'e\' to edit the\n\
+-      commands before booting, or \'c\' for a command-line.");
++      commands before booting, \'a\' to modify the kernel arguments\n\
++      before booting, or \'c\' for a command-line.");
+         else
+           printf ("\
+       Press \'b\' to boot, \'e\' to edit the selected command in the\n\
+@@ -787,6 +788,98 @@
+                 enter_cmdline (heap, 0);
+                 goto restart;
+               }
++            if (config_entries && c == 'a')
++              {
++                int new_num_entries = 0, i = 0, j;
++                int needs_padding, amount;
++                char *new_heap;
++                char * entries;
++                char * entry_copy;
++                char * append_line;
++                char * start;
++
++                entry_copy = new_heap = heap;
++                cur_entry = get_entry (config_entries, first_entry + entryno,
++                                       1);
++                
++                do
++                  {
++                    while ((*(new_heap++) = cur_entry[i++]) != 0);
++                    new_num_entries++;
++                  }
++                while (config_entries && cur_entry[i]);
++
++                /* this only needs to be done if config_entries is non-NULL,
++                   but it doesn't hurt to do it always */
++                *(new_heap++) = 0;
++
++                new_heap = heap + NEW_HEAPSIZE + 1;
++
++                entries = entry_copy;
++                while (*entries) 
++                  {
++                    if ((strstr(entries, "kernel") == entries) &&
++                        isspace(entries[6])) 
++                        break;
++
++                    while (*entries) entries++;
++                    entries++;
++                  }
++
++                if (!*entries)
++                    goto restart;
++
++                start = entries + 6;
++
++                /* skip the white space */
++                while (*start && isspace(*start)) start++;
++                /* skip the kernel name */
++                while (*start && !isspace(*start)) start++;
++
++                /* skip the white space */
++                needs_padding = (!*start || !isspace(*start));
++                while (*start && isspace(*start)) start++;
++
++                append_line = new_heap;
++                grub_strcpy(append_line, start);
++
++                cls();
++                print_cmdline_message (CMDLINE_EDIT_MODE);
++
++                if (get_cmdline(PACKAGE " append> ", 
++                                  append_line, NEW_HEAPSIZE + 1, 
++                                  0, 1))
++                    goto restart;
++
++                /* have new args; append_line points to the
++                   new args and start points to the old
++                   args */
++
++                i = grub_strlen(start);
++                j = grub_strlen(append_line);
++
++                if (i > (j + needs_padding))
++                    amount = i;
++                else
++                    amount = j + needs_padding;
++
++                /* align rest of commands properly */
++                memmove (start + j + needs_padding, start + i,
++                     ((int) append_line) - ((int) start) - (amount));
++
++                if (needs_padding)
++                    *start = ' ';
++
++                /* copy command to correct area */
++                memmove (start + needs_padding, append_line, j);
++
++                /* set up this entry to boot */
++                config_entries = NULL;
++                cur_entry = entry_copy;
++                heap = new_heap;
++
++                break;
++              }
+ #ifdef GRUB_UTIL
+             if (c == 'q')
+               {

diff --git a/src/patches/grub-0.90-symlinkmenulst.patch b/src/patches/grub-0.90-symlinkmenulst.patch
new file mode 100644 (file)
index 0000000..553d15a
--- /dev/null
+++ b/src/patches/grub-0.90-symlinkmenulst.patch
@@ -0,0 +1,16 @@
+Only in grub: ChangeLog~
+diff -ur grub-0.90/util/grub-install.in grub/util/grub-install.in
+--- grub-0.90/util/grub-install.in     Wed Sep  5 15:50:06 2001
++++ grub/util/grub-install.in  Wed Sep  5 15:50:24 2001
+@@ -320,6 +320,10 @@
+     exit 1
+ fi
+ 
++if ! test -e ${grubdir}/grub.conf ; then
++    test -e ${grubdir}/menu.lst && ln -s ./menu.lst ${grubdir}/grub.conf
++fi
++
+ # Create a safe temporary file.
+ test -x /bin/mktemp && log_file=`/bin/mktemp /tmp/grub-install.log.XXXXXX`
+ 
+Only in grub/util: grub-install.in.orig

diff --git a/src/patches/grub-0.93-configfile.patch b/src/patches/grub-0.93-configfile.patch
new file mode 100644 (file)
index 0000000..9cb1182
--- /dev/null
+++ b/src/patches/grub-0.93-configfile.patch
@@ -0,0 +1,75 @@
+--- grub-0.93/stage2/asm.S.config      2002-12-02 18:18:56.000000000 -0500
++++ grub-0.93/stage2/asm.S     2002-12-28 22:01:24.000000000 -0500
+@@ -97,7 +97,7 @@
+       .string VERSION
+ VARIABLE(config_file)
+ #ifndef STAGE1_5
+-      .string "/boot/grub/menu.lst"
++      .string "/boot/grub/grub.conf"
+ #else   /* STAGE1_5 */
+       .long   0xffffffff
+       .string "/boot/grub/stage2"
+--- grub-0.93/stage2/builtins.c.config 2002-12-03 23:41:57.000000000 -0500
++++ grub-0.93/stage2/builtins.c        2002-12-28 22:01:24.000000000 -0500
+@@ -3838,7 +3838,7 @@
+ 
+   /* The prefix was determined.  */
+   grub_sprintf (stage2, "%s%s", prefix, "/stage2");
+-  grub_sprintf (config_filename, "%s%s", prefix, "/menu.lst");
++  grub_sprintf (config_filename, "%s%s", prefix, "/grub.conf");
+   *real_config_filename = 0;
+ 
+   /* Check if stage2 exists.  */
+--- grub-0.93/grub/asmstub.c.config    2002-12-02 18:20:45.000000000 -0500
++++ grub-0.93/grub/asmstub.c   2002-12-28 22:01:24.000000000 -0500
+@@ -71,7 +71,7 @@
+ unsigned long boot_drive = 0;
+ int saved_entryno = 0;
+ char version_string[] = VERSION;
+-char config_file[128] = "/boot/grub/menu.lst"; /* FIXME: arbitrary */
++char config_file[128] = "/boot/grub/grub.conf"; /* FIXME: arbitrary */
+ unsigned long linux_text_len = 0;
+ char *linux_data_tmp_addr = 0;
+ char *linux_data_real_addr = 0;
+--- grub-0.93/docs/grub.8.config       2002-12-07 22:17:59.000000000 -0500
++++ grub-0.93/docs/grub.8      2002-12-28 22:01:24.000000000 -0500
+@@ -15,7 +15,7 @@
+ specify stage2 boot_drive [default=0x0]
+ .TP
+ \fB\-\-config\-file\fR=\fIFILE\fR
+-specify stage2 config_file [default=/boot/grub/menu.lst]
++specify stage2 config_file [default=/boot/grub/grub.conf]
+ .TP
+ \fB\-\-device\-map\fR=\fIFILE\fR
+ use the device map file FILE
+--- grub-0.93/docs/grub.texi.config    2002-12-02 17:35:28.000000000 -0500
++++ grub-0.93/docs/grub.texi   2002-12-28 22:01:24.000000000 -0500
+@@ -989,7 +989,7 @@
+ keys) that will do everything to boot an OS.
+ 
+ To enable the menu, you need a configuration file,
+-@file{menu.lst} under the boot directory. We'll analyze an example
++@file{grub.conf} under the boot directory. We'll analyze an example
+ file.
+ 
+ The file first contains some general settings, the menu interface
+@@ -1596,8 +1596,8 @@
+ 
+ An absolute file name resembles a Unix absolute file name, using
+ @samp{/} for the directory separator (not @samp{\} as in DOS). One
+-example is @samp{(hd0,0)/boot/grub/menu.lst}. This means the file
+-@file{/boot/grub/menu.lst} in the first partition of the first hard
++example is @samp{(hd0,0)/boot/grub/grub.conf}. This means the file
++@file{/boot/grub/grub.conf} in the first partition of the first hard
+ disk. If you omit the device name in an absolute file name, GRUB uses
+ GRUB's @dfn{root device} implicitly. So if you set the root device to,
+ say, @samp{(hd1,0)} by the command @command{root} (@pxref{root}), then
+@@ -3249,7 +3249,7 @@
+ 
+ @item --config-file=@var{file}
+ Read the configuration file @var{file} instead of
+-@file{/boot/grub/menu.lst}. The format is the same as the normal GRUB
++@file{/boot/grub/grub.conf}. The format is the same as the normal GRUB
+ syntax. See @ref{Filesystem}, for more information.
+ 
+ @item --boot-drive=@var{drive}

diff --git a/src/patches/grub-0.93-endedit.patch b/src/patches/grub-0.93-endedit.patch
new file mode 100644 (file)
index 0000000..eb0463c
--- /dev/null
+++ b/src/patches/grub-0.93-endedit.patch
@@ -0,0 +1,77 @@
+Index: stage2/cmdline.c
+===================================================================
+RCS file: /cvsroot/grub/grub/stage2/cmdline.c,v
+retrieving revision 1.27
+diff -u -r1.27 cmdline.c
+--- stage2/cmdline.c   3 Dec 2002 00:02:53 -0000       1.27
++++ stage2/cmdline.c   6 Jan 2003 05:33:33 -0000
+@@ -48,12 +48,17 @@
+ 
+ /* Print a helpful message for the command-line interface.  */
+ void
+-print_cmdline_message (int forever)
++print_cmdline_message (int type)
+ {
+   printf (" [ Minimal BASH-like line editing is supported.  For the first word, TAB\n"
+         "   lists possible command completions.  Anywhere else TAB lists the possible\n"
+-        "   completions of a device/filename.%s ]\n",
+-        (forever ? "" : "  ESC at any time exits."));
++        "   completions of a device/filename.");
++  if (type == CMDLINE_NORMAL_MODE)
++    printf("  ESC at any time exits.");
++  if (type == CMDLINE_EDIT_MODE)
++    printf("  ESC at any time cancels.  ENTER \n"
++           "   at any time accepts your changes.");
++  printf("]\n");
+ }
+ 
+ /* Find the builtin whose command name is COMMAND and return the
+@@ -128,7 +133,7 @@
+   print_network_configuration ();
+   grub_putchar ('\n');
+ #endif
+-  print_cmdline_message (forever);
++  print_cmdline_message (forever ? CMDLINE_FOREVER_MODE : CMDLINE_NORMAL_MODE);
+   
+   while (1)
+     {
+Index: stage2/shared.h
+===================================================================
+RCS file: /cvsroot/grub/grub/stage2/shared.h,v
+retrieving revision 1.90
+diff -u -r1.90 shared.h
+--- stage2/shared.h    3 Dec 2002 00:02:53 -0000       1.90
++++ stage2/shared.h    6 Jan 2003 05:33:33 -0000
+@@ -843,9 +843,15 @@
+ void init_config (void);
+ char *skip_to (int after_equal, char *cmdline);
+ struct builtin *find_command (char *command);
+-void print_cmdline_message (int forever);
+ void enter_cmdline (char *heap, int forever);
+ int run_script (char *script, char *heap);
++
++/* the flags for the cmdline message */
++#define CMDLINE_FOREVER_MODE 0x0
++#define CMDLINE_NORMAL_MODE 0x1
++#define CMDLINE_EDIT_MODE 0x2
++
++void print_cmdline_message (int type);
+ #endif
+ 
+ /* C library replacement functions with identical semantics. */
+Index: stage2/stage2.c
+===================================================================
+RCS file: /cvsroot/grub/grub/stage2/stage2.c,v
+retrieving revision 1.42
+diff -u -r1.42 stage2.c
+--- stage2/stage2.c    4 Dec 2002 00:55:45 -0000       1.42
++++ stage2/stage2.c    6 Jan 2003 05:33:33 -0000
+@@ -655,7 +655,7 @@
+                 else
+                   {
+                     cls ();
+-                    print_cmdline_message (0);
++                    print_cmdline_message (CMDLINE_EDIT_MODE);
+ 
+                     new_heap = heap + NEW_HEAPSIZE + 1;
+ 

diff --git a/src/patches/grub-0.94-installcopyonly.patch b/src/patches/grub-0.94-installcopyonly.patch
new file mode 100644 (file)
index 0000000..a2e38fb
--- /dev/null
+++ b/src/patches/grub-0.94-installcopyonly.patch
@@ -0,0 +1,85 @@
+--- grub-0.94/util/grub-install.in.copyonly    2004-02-02 16:33:29.172127985 -0500
++++ grub-0.94/util/grub-install.in     2004-02-02 16:34:26.027454320 -0500
+@@ -40,6 +40,7 @@
+ force_lba=
+ recheck=no
+ debug=no
++justcopy=no
+ 
+ # look for secure tempfile creation wrappers on this platform
+ if test -x /bin/tempfile; then
+@@ -221,6 +222,17 @@
+     echo "$tmp_fname"
+ }
+ 
++copy_images() {
++    # Copy the GRUB images to the GRUB directory.
++    for file in ${grubdir}/stage1 ${grubdir}/stage2 ${grubdir}/*stage1_5; do
++      rm -f $file || exit 1
++    done
++    for file in \
++      ${pkgdatadir}/stage1 ${pkgdatadir}/stage2 ${pkgdatadir}/*stage1_5; do
++      cp -f $file ${grubdir} || exit 1
++    done
++}
++
+ # Check the arguments.
+ for option in "$@"; do
+     case "$option" in
+@@ -240,6 +252,8 @@
+       force_lba="--force-lba" ;;
+     --recheck)
+       recheck=yes ;;
++    --just-copy)
++        justcopy=yes ;;
+     # This is an undocumented feature...
+     --debug)
+       debug=yes ;;
+@@ -258,12 +272,6 @@
+     esac
+ done
+ 
+-if test "x$install_device" = x; then
+-    echo "install_device not specified." 1>&2
+-    usage
+-    exit 1
+-fi
+-
+ # If the debugging feature is enabled, print commands.
+ if test $debug = yes; then
+     set -x
+@@ -286,6 +294,18 @@
+ grubdir=${bootdir}/grub
+ device_map=${grubdir}/device.map
+ 
++# if they just want the images copied, copy the images and then exit
++if test $justcopy = yes; then
++    copy_images
++    exit 0
++fi
++
++if test "x$install_device" = x; then
++    echo "install_device not specified." 1>&2
++    usage
++    exit 1
++fi
++
+ # Check if GRUB is installed.
+ # This is necessary, because the user can specify "grub --read-only".
+ set $grub_shell dummy
+@@ -317,14 +337,7 @@
+ test -d "$bootdir" || mkdir "$bootdir" || exit 1
+ test -d "$grubdir" || mkdir "$grubdir" || exit 1
+ 
+-# Copy the GRUB images to the GRUB directory.
+-for file in ${grubdir}/stage1 ${grubdir}/stage2 ${grubdir}/*stage1_5; do
+-    rm -f $file || exit 1
+-done
+-for file in \
+-    ${pkgdatadir}/stage1 ${pkgdatadir}/stage2 ${pkgdatadir}/*stage1_5; do
+-    cp -f $file ${grubdir} || exit 1
+-done
++copy_images
+ 
+ # If --recheck is specified, remove the device map, if present.
+ if test $recheck = yes; then

diff --git a/src/patches/grub-0.95-hiddenmenu-tweak.patch b/src/patches/grub-0.95-hiddenmenu-tweak.patch
new file mode 100644 (file)
index 0000000..56fb083
--- /dev/null
+++ b/src/patches/grub-0.95-hiddenmenu-tweak.patch
@@ -0,0 +1,39 @@
+--- grub-0.95/stage2/stage2.c.hidden   2004-09-30 16:39:38.028893664 -0400
++++ grub-0.95/stage2/stage2.c  2004-09-30 16:42:07.981097464 -0400
+@@ -235,6 +235,8 @@
+   char *cur_entry = 0;
+   struct term_entry *prev_term = NULL;
+ 
++  cls();
++
+   /*
+    *  Main loop for menu UI.
+    */
+@@ -262,14 +264,16 @@
+       /* Get current time.  */
+       while ((time1 = getrtsecs ()) == 0xFF)
+       ;
++      grub_printf("\rPress any key to enter the menu\n\n\n");
+ 
+       while (1)
+       {
+         /* Check if ESC is pressed.  */
+-        if (checkkey () != -1 && ASCII_CHAR (getkey ()) == '\e')
++        if (checkkey () != -1)
+           {
+             grub_timeout = -1;
+             show_menu = 1;
++            getkey ();
+             break;
+           }
+ 
+@@ -288,7 +292,8 @@
+             grub_timeout--;
+             
+             /* Print a message.  */
+-            grub_printf ("\rPress `ESC' to enter the menu... %d   ",
++            grub_printf ("\rBooting %s in %d seconds...",
++                         get_entry(menu_entries, first_entry + entryno, 0),
+                          grub_timeout);
+           }
+       }

diff --git a/src/patches/grub-0.95-md-mbr.patch b/src/patches/grub-0.95-md-mbr.patch
new file mode 100644 (file)
index 0000000..1aaa3e9
--- /dev/null
+++ b/src/patches/grub-0.95-md-mbr.patch
@@ -0,0 +1,11 @@
+--- grub-0.95/util/grub-install.in.md-mbr      2005-02-20 17:56:48.000000000 -0500
++++ grub-0.95/util/grub-install.in     2005-02-20 17:57:12.000000000 -0500
+@@ -444,7 +444,7 @@
+ /dev/*)
+     install_device=`resolve_symlink "$install_device"`
+     for install_drive in `find_real_devs $install_device` ; do
+-      install_drive=`convert $install_drive`
++      install_drive=`convert $install_drive | sed 's/,[0-9]*)/)/'`
+       if [ "x$install_drive" = "x" ]; then
+           exit 1
+       fi

diff --git a/src/patches/grub-0.95-md-rework.patch b/src/patches/grub-0.95-md-rework.patch
new file mode 100644 (file)
index 0000000..cff1977
--- /dev/null
+++ b/src/patches/grub-0.95-md-rework.patch
@@ -0,0 +1,183 @@
+--- grub-0.95/util/grub-install.in.md2 2005-01-03 14:49:18.133866107 -0500
++++ grub-0.95/util/grub-install.in     2005-01-03 16:35:44.923732271 -0500
+@@ -35,6 +35,7 @@
+ rootdir=
+ grub_prefix=/boot/grub
+ 
++install_drives=
+ install_device=
+ no_floppy=
+ force_lba=
+@@ -272,6 +273,30 @@
+     done
+ }
+ 
++
++dump_boot_block () {
++    sync
++    $grub_shell --batch $no_floppy --device-map=$device_map <<EOF >$log_file
++dump ${root_drive}${tmp} ${img_file}
++quit
++EOF
++}
++
++
++install_boot_block () {
++    # Before all invocations of the grub shell, call sync to make sure
++    # the raw device is in sync with any bufferring in filesystems.
++    sync
++
++    # Now perform the installation.
++    $grub_shell --batch $no_floppy --device-map=$device_map <<EOF >>$log_file
++root $1
++setup $force_lba --stage2=$grubdir/stage2 --prefix=$grub_prefix $2
++quit
++EOF
++}
++
++
+ # Check the arguments.
+ for option in "$@"; do
+     case "$option" in
+@@ -416,28 +441,32 @@
+ # Check for INSTALL_DEVICE.
+ case "$install_device" in
+ /dev/*)
+-    # If we are running md on a Linux box, just use the first physical device
+-    # at this point.
+     install_device=`resolve_symlink "$install_device"`
+-    install_device=`find_real_devs $install_device | awk '{print $1}'`
+-
+-    install_drive=`convert "$install_device"`
+-    # I don't know why, but some shells wouldn't die if exit is
+-    # called in a function.
+-    if test "x$install_drive" = x; then
++    for install_drive in `find_real_devs $install_device` ; do
++      install_drive=`convert $install_drive`
++      if [ "x$install_drive" = "x" ]; then
++          exit 1
++      fi
++      install_drives="${install_drives} ${install_drive}"
++    done
++    unset install_drive
++      
++    if test "x$install_drives" = x ; then
+       exit 1
+     fi ;;
+ \([hf]d[0-9]*\))
+-    install_drive="$install_device" ;;
++    install_drives="$install_device" ;;
+ [hf]d[0-9]*)
+     # The GRUB format with no parenthesis.
+-    install_drive="($install_device)" ;;
++    install_drives="($install_device)" ;;
+ *)
+     echo "Format of install_device not recognized." 1>&2
+     usage
+     exit 1 ;;
+ esac
+ 
++unset install_device
++
+ # Get the root drive.
+ root_device=`find_device ${rootdir}`
+ bootdir_device=`find_device ${bootdir}`
+@@ -465,41 +494,39 @@
+ test -n "$mkimg" && img_file=`$mkimg`
+ test -n "$mklog" && log_file=`$mklog`
+ 
+-for real_device in `find_real_devs $root_device`; do
+-    # Convert the root deviceto a GRUB drive.
+-    root_drive=`convert "$real_device"`
+-    if [ "x$root_drive" = x ]; then
+-      exit 1
+-    fi
++# There's not a real root device, so just pick the first
++if is_raid1_device $root_device ; then
++    root_device=`find_real_devs $root_device | awk '{print $1}'`
++fi
+ 
+-    for file in ${grubdir}/stage1 ${grubdir}/stage2 ${grubdir}/*stage1_5; do
+-      count=5
+-      tmp=`echo $file | sed "s|^${grubdir}|${grub_prefix}|"`
+-      while test $count -gt 0; do
+-          sync
+-          $grub_shell --batch $no_floppy --device-map=$device_map \
+-              <<EOF >$log_file
+-dump ${root_drive}${tmp} ${img_file}
+-quit
+-EOF
+-          if grep "Error [0-9]*: " $log_file >/dev/null; then
+-              :
+-          elif cmp $file $img_file >/dev/null; then
+-              break
+-          fi
+-          sleep 1
+-          count=`expr $count - 1`    
+-      done
+-      if test $count -eq 0; then
+-          echo "The file $file not read correctly." 1>&2
+-          exit 1
+-      fi
+-    done
++# Convert the root deviceto a GRUB drive.
++root_drive=`convert "$root_device"`
++if [ "x$root_drive" = x ]; then
++    exit 1
++fi
+ 
+-    rm -f $img_file
+-    rm -f $log_file
++for file in ${grubdir}/stage1 ${grubdir}/stage2 ${grubdir}/*stage1_5; do
++    count=5
++    tmp=`echo $file | sed "s|^${grubdir}|${grub_prefix}|"`
++    while test $count -gt 0; do
++        dump_boot_block $root_drive $img_file
++        if grep "Error [0-9]*: " $log_file >/dev/null; then
++      :
++        elif cmp $file $img_file >/dev/null; then
++      break
++        fi
++        sleep 1
++        count=`expr $count - 1`    
++    done
++    if test $count -eq 0; then
++        echo "The file $file not read correctly." 1>&2
++        exit 1
++    fi
+ done
+ 
++rm -f $img_file
++rm -f $log_file
++
+ if ! test -e ${grubdir}/grub.conf ; then
+     test -e ${grubdir}/menu.lst && ln -s ./menu.lst ${grubdir}/grub.conf
+ fi
+@@ -507,24 +534,13 @@
+ # Create a safe temporary file.
+ test -n "$mklog" && log_file=`$mklog`
+ 
+-for real_device in `find_real_devs $root_device`; do
++for install_drive in $install_drives; do 
+     # Convert the root deviceto a GRUB drive.
+-    root_drive=`convert "$real_device"`
++    root_drive=`convert "$root_device"`
+     if [ "x$root_drive" = x ]; then
+       exit 1
+     fi
+-
+-    # Before all invocations of the grub shell, call sync to make sure
+-    # the raw device is in sync with any bufferring in filesystems.
+-    sync
+-
+-    # Now perform the installation.
+-    $grub_shell --batch $no_floppy --device-map=$device_map <<EOF >>$log_file
+-root $root_drive
+-setup $force_lba --stage2=$grubdir/stage2 --prefix=$grub_prefix $root_drive
+-quit
+-EOF
+-
++    install_boot_block $root_drive $install_drive
+ done
+ 
+ if grep "Error [0-9]*: " $log_file >/dev/null ; then

diff --git a/src/patches/grub-0.95-md.patch b/src/patches/grub-0.95-md.patch
new file mode 100644 (file)
index 0000000..9e4ff89
--- /dev/null
+++ b/src/patches/grub-0.95-md.patch
@@ -0,0 +1,183 @@
+--- grub-0.95/util/grub-install.in.support_md  2004-12-17 17:50:45.000000000 -0500
++++ grub-0.95/util/grub-install.in     2004-12-19 19:19:20.509409160 -0500
+@@ -207,6 +207,43 @@
+       echo "$tmp_fname"
+ }
+ 
++# Usage: is_raid1_device devicename
++# Returns 0 if devicename is a raid1 md device, 1 if it is not.
++is_raid1_device () {
++    case "$host_os" in
++    linux*)
++      level=`mdadm --query --detail $1 2>/dev/null | \
++              awk '/Raid Level :/ {print $4}'` 
++      if [ "$level" = "raid1" ]; then
++          return 0
++      fi
++    ;;
++    esac
++    return 1
++}
++
++# Usage: find_real_devs device
++# Returns space separated list of devices for linux if device is 
++# a raid1 device. In all other cases, the provided value is returned.
++find_real_devs () {
++    source_device=$1
++    case "$host_os" in
++    linux*)
++      if is_raid1_device $source_device ; then
++          list=""
++          for device in `mdadm --query --detail "${source_device}" | \
++                  awk '/\/dev\/[^(md)]/ {print $7}'` ; do
++              list="$list $device"
++          done
++          echo $list
++          return 0
++      fi
++    ;;
++    esac
++    echo $source_device
++    return 0
++}
++
+ # Usage: find_device file
+ # Find block device on which the file resides.
+ find_device () {
+@@ -219,7 +256,7 @@
+       exit 1
+     fi
+ 
+-      tmp_fname=`resolve_symlink $tmp_fname`
++    tmp_fname=`resolve_symlink $tmp_fname`
+ 
+     echo "$tmp_fname"
+ }
+@@ -379,7 +416,11 @@
+ # Check for INSTALL_DEVICE.
+ case "$install_device" in
+ /dev/*)
++    # If we are running md on a Linux box, just use the first physical device
++    # at this point.
+     install_device=`resolve_symlink "$install_device"`
++    install_device=`find_real_devs $install_device | awk '{print $1}'`
++
+     install_drive=`convert "$install_device"`
+     # I don't know why, but some shells wouldn't die if exit is
+     # called in a function.
+@@ -408,14 +449,7 @@
+     grub_prefix="/grub"
+ fi
+ 
+-# Convert the root device to a GRUB drive.
+-root_drive=`convert "$root_device"`
+-if test "x$root_drive" = x; then
+-    exit 1
+-fi
+-
+-# Check if the root directory exists in the same device as the grub
+-# directory.
++# Check if the root directory exists in the same device as the grub directory.
+ grubdir_device=`find_device ${grubdir}`
+ 
+ if test "x$grubdir_device" != "x$root_device"; then
+@@ -431,30 +465,40 @@
+ test -n "$mkimg" && img_file=`$mkimg`
+ test -n "$mklog" && log_file=`$mklog`
+ 
+-for file in ${grubdir}/stage1 ${grubdir}/stage2 ${grubdir}/*stage1_5; do
+-    count=5
+-    tmp=`echo $file | sed "s|^${grubdir}|${grub_prefix}|"`
+-    while test $count -gt 0; do
+-      $grub_shell --batch $no_floppy --device-map=$device_map <<EOF >$log_file
++for real_device in `find_real_devs $root_device`; do
++    # Convert the root deviceto a GRUB drive.
++    root_drive=`convert "$real_device"`
++    if [ "x$root_drive" = x ]; then
++      exit 1
++    fi
++
++    for file in ${grubdir}/stage1 ${grubdir}/stage2 ${grubdir}/*stage1_5; do
++      count=5
++      tmp=`echo $file | sed "s|^${grubdir}|${grub_prefix}|"`
++      while test $count -gt 0; do
++          sync
++          $grub_shell --batch $no_floppy --device-map=$device_map \
++              <<EOF >$log_file
+ dump ${root_drive}${tmp} ${img_file}
+ quit
+ EOF
+-      if grep "Error [0-9]*: " $log_file >/dev/null; then
+-          :
+-      elif cmp $file $img_file >/dev/null; then
+-          break
++          if grep "Error [0-9]*: " $log_file >/dev/null; then
++              :
++          elif cmp $file $img_file >/dev/null; then
++              break
++          fi
++          sleep 1
++          count=`expr $count - 1`    
++      done
++      if test $count -eq 0; then
++          echo "The file $file not read correctly." 1>&2
++          exit 1
+       fi
+-      sleep 1
+-      count=`expr $count - 1`    
+     done
+-    if test $count -eq 0; then
+-      echo "The file $file not read correctly." 1>&2
+-      exit 1
+-    fi
+-done
+ 
+-rm -f $img_file
+-rm -f $log_file
++    rm -f $img_file
++    rm -f $log_file
++done
+ 
+ if ! test -e ${grubdir}/grub.conf ; then
+     test -e ${grubdir}/menu.lst && ln -s ./menu.lst ${grubdir}/grub.conf
+@@ -463,21 +507,33 @@
+ # Create a safe temporary file.
+ test -n "$mklog" && log_file=`$mklog`
+ 
+-# Before all invocations of the grub shell, call sync to make sure
+-# the raw device is in sync with any bufferring in filesystems.
+-sync
++for real_device in `find_real_devs $root_device`; do
++    # Convert the root deviceto a GRUB drive.
++    root_drive=`convert "$real_device"`
++    if [ "x$root_drive" = x ]; then
++      exit 1
++    fi
++
++    # Before all invocations of the grub shell, call sync to make sure
++    # the raw device is in sync with any bufferring in filesystems.
++    sync
+ 
+-# Now perform the installation.
+-$grub_shell --batch $no_floppy --device-map=$device_map <<EOF >$log_file
++    # Now perform the installation.
++    $grub_shell --batch $no_floppy --device-map=$device_map <<EOF >>$log_file
+ root $root_drive
+-setup $force_lba --stage2=$grubdir/stage2 --prefix=$grub_prefix $install_drive
++setup $force_lba --stage2=$grubdir/stage2 --prefix=$grub_prefix $root_drive
+ quit
+ EOF
+ 
+-if grep "Error [0-9]*: " $log_file >/dev/null || test $debug = yes; then
++done
++
++if grep "Error [0-9]*: " $log_file >/dev/null ; then
+     cat $log_file 1>&2
+     exit 1
+ fi
++if test $debug = yes; then
++    cat $log_file 1>&2
++fi
+ 
+ rm -f $log_file
+ 

diff --git a/src/patches/grub-0.95-nonmbr.patch b/src/patches/grub-0.95-nonmbr.patch
new file mode 100644 (file)
index 0000000..35bd5f3
--- /dev/null
+++ b/src/patches/grub-0.95-nonmbr.patch
@@ -0,0 +1,14 @@
+--- grub-0.95/util/grub-install.in.nonmbr      2005-03-16 10:02:50.000000000 -0500
++++ grub-0.95/util/grub-install.in     2005-03-16 10:02:13.000000000 -0500
+@@ -444,7 +444,10 @@
+ /dev/*)
+     install_device=`resolve_symlink "$install_device"`
+     for install_drive in `find_real_devs $install_device` ; do
+-      install_drive=`convert $install_drive | sed 's/,[0-9]*)/)/'`
++      install_drive=`convert $install_drive`
++      if is_raid1_device $install_device; then
++              install_drive=`echo $install_drive | sed 's/,[0-9]*)/)/'`
++      fi
+       if [ "x$install_drive" = "x" ]; then
+           exit 1
+       fi

diff --git a/src/patches/grub-0.95-odirect.patch b/src/patches/grub-0.95-odirect.patch
new file mode 100644 (file)
index 0000000..12dd9d9
--- /dev/null
+++ b/src/patches/grub-0.95-odirect.patch
@@ -0,0 +1,115 @@
+--- grub-0.95/grub/asmstub.c.odirect   2004-11-30 16:58:06.577019488 -0500
++++ grub-0.95/grub/asmstub.c   2004-11-30 16:59:56.057375944 -0500
+@@ -53,6 +53,9 @@
+ # ifndef BLKFLSBUF
+ #  define BLKFLSBUF   _IO (0x12,97)   /* flush buffer cache */
+ # endif /* ! BLKFLSBUF */
++# ifndef O_DIRECT
++#   define O_DIRECT 040000
++# endif /* ! O_DIRECT */
+ #endif /* __linux__ */
+ 
+ /* We want to prevent any circularararity in our stubs, as well as
+@@ -764,7 +767,7 @@
+     {
+       /* The unpartitioned device name: /dev/XdX */
+       char *devname = device_map[drive];
+-      char buf[512];
++      char * buf, * buf_unaligned;
+ 
+       if (! devname)
+       return -1;
+@@ -775,13 +778,13 @@
+ 
+       /* Open read/write, or read-only if that failed. */
+       if (! read_only)
+-      disks[drive].flags = open (devname, O_RDWR);
++      disks[drive].flags = open (devname, O_RDWR | O_DIRECT);
+ 
+       if (disks[drive].flags == -1)
+       {
+         if (read_only || errno == EACCES || errno == EROFS || errno == EPERM)
+           {
+-            disks[drive].flags = open (devname, O_RDONLY);
++            disks[drive].flags = open (devname, O_RDONLY | O_DIRECT);
+             if (disks[drive].flags == -1)
+               {
+                 assign_device_name (drive, 0);
+@@ -795,6 +798,10 @@
+           }
+       }
+ 
++      buf_unaligned = malloc((512 * sizeof(char)) + 4095);
++      buf = (char *) (((unsigned long)buf_unaligned + 4096 - 1) &
++                      (~(4096-1)));
++
+       /* Attempt to read the first sector.  */
+       if (read (disks[drive].flags, buf, 512) != 512)
+       {
+@@ -806,6 +813,7 @@
+ 
+       if (disks[drive].flags != -1)
+       get_drive_geometry (&disks[drive], device_map, drive);
++      free(buf_unaligned);
+     }
+ 
+   if (disks[drive].flags == -1)
+@@ -827,24 +835,34 @@
+ nread (int fd, char *buf, size_t len)
+ {
+   int size = len;
++  char * buf_unaligned, * buff, * obuff;
++  int ret;
++
++  buf_unaligned = malloc((len * sizeof(char)) + 4095);
++  obuff = buff = (char *) (((unsigned long)buf_unaligned + 4096 - 1) &
++                           (~(4096-1)));
++
+ 
+   while (len)
+     {
+-      int ret = read (fd, buf, len);
++      ret = read (fd, buff, len);
+ 
+       if (ret <= 0)
+       {
+         if (errno == EINTR)
+           continue;
+         else
+-          return ret;
++            break;
+       }
+ 
+       len -= ret;
+-      buf += ret;
++      buff += ret;
+     }
+ 
+-  return size;
++  if (!len) ret = size;
++
++  buf = memcpy(buf, obuff, size);
++  return ret;
+ }
+ 
+ /* Write LEN bytes from BUF to FD. Return less than or equal to zero if an
+@@ -853,10 +871,18 @@
+ nwrite (int fd, char *buf, size_t len)
+ {
+   int size = len;
++  char * buf_unaligned, * buff;
++
++  buf_unaligned = malloc((len * sizeof(char)) + 4095);
++  buff = (char *) (((unsigned long)buf_unaligned + 4096 - 1) &
++                   (~(4096-1)));
+ 
+   while (len)
+     {
+-      int ret = write (fd, buf, len);
++      int ret;
++
++      memcpy(buff, buf, len);
++      ret = write (fd, buff, len);
+ 
+       if (ret <= 0)
+       {

diff --git a/src/patches/grub-0.95-recheck-bad.patch b/src/patches/grub-0.95-recheck-bad.patch
new file mode 100644 (file)
index 0000000..b55c6ae
--- /dev/null
+++ b/src/patches/grub-0.95-recheck-bad.patch
@@ -0,0 +1,83 @@
+--- grub-0.95/docs/grub.texi.recheck-bad       2005-07-25 17:55:57.000000000 -0400
++++ grub-0.95/docs/grub.texi   2005-07-25 17:58:00.000000000 -0400
+@@ -3417,8 +3417,9 @@
+ 
+ @item --recheck
+ Recheck the device map, even if @file{/boot/grub/device.map} already
+-exists. You should use this option whenever you add/remove a disk
+-into/from your computer.
++exists.
++
++This option is unreliable and its use is strongly discouraged.
+ @end table
+ 
+ 
+--- grub-0.95/util/grub-install.in.recheck-bad 2005-07-25 17:58:19.000000000 -0400
++++ grub-0.95/util/grub-install.in     2005-07-25 18:05:14.000000000 -0400
+@@ -68,6 +68,8 @@
+   --force-lba             force GRUB to use LBA mode even for a buggy
+                           BIOS
+   --recheck               probe a device map even if it already exists
++                          This flag is unreliable and its use is
++                          strongly discouraged.
+ 
+ INSTALL_DEVICE can be a GRUB device name or a system device filename.
+ 
+@@ -328,7 +330,7 @@
+ 
+ # If --recheck is specified, remove the device map, if present.
+ if test $recheck = yes; then
+-    rm -f $device_map
++    mv $device_map ${device_map}.backup
+ fi
+ 
+ # Create the device map file if it is not present.
+@@ -357,7 +359,22 @@
+ tmp=`sed -n '/^([fh]d[0-9]*)/s/\(^(.*)\).*/\1/p' $device_map \
+     | sort | uniq -d | sed -n 1p`
+ if test -n "$tmp"; then
+-    echo "The drive $tmp is defined multiple times in the device map $device_map" 1>&2
++    echo "The drive $tmp is defined multiple times in the new device map." 1>&2
++    if test $recheck = yes; then
++        echo "Reverting to backed up copy." 1>&2
++        mv ${device_map}.backup $device_map
++    fi
++    exit 1
++fi
++
++# Make sure device.map has at least one hd device
++grep -q "^(hd[0-9]\+)" $device_map
++if [ "x$?" != "x0" ]; then
++    echo "No suitable drive was found in the generated device map." 1>&2
++    if test $recheck = yes; then
++        echo "Reverting to backed up copy." 1>&2
++        mv ${device_map}.backup $device_map
++    fi
+     exit 1
+ fi
+ 
+--- grub-0.95/docs/grub-install.8.recheck-bad  2004-06-13 13:44:59.000000000 -0400
++++ grub-0.95/docs/grub-install.8      2005-07-25 18:15:02.000000000 -0400
+@@ -30,6 +30,8 @@
+ .TP
+ \fB\-\-recheck\fR
+ probe a device map even if it already exists
++
++This option is unreliable and its use is strongly discouraged.
+ .PP
+ INSTALL_DEVICE can be a GRUB device name or a system device filename.
+ .SH "REPORTING BUGS"
+--- grub-0.95/docs/grub.info.recheck-bad       2004-05-11 08:22:54.000000000 -0400
++++ grub-0.95/docs/grub.info   2005-07-25 18:16:09.000000000 -0400
+@@ -3373,9 +3373,9 @@
+ 
+ `--recheck'
+      Recheck the device map, even if `/boot/grub/device.map' already
+-     exists. You should use this option whenever you add/remove a disk
+-     into/from your computer.
++     exists.
+ 
++     This option is unreliable and its use is strongly discouraged.
+ \1f
+ File: grub.info,  Node: Invoking grub-md5-crypt,  Next: Invoking grub-terminfo,  Prev: Invoking grub-install,  Up: Top
+ 

diff --git a/src/patches/grub-0.95-staticcurses.patch b/src/patches/grub-0.95-staticcurses.patch
new file mode 100644 (file)
index 0000000..ff87dd3
--- /dev/null
+++ b/src/patches/grub-0.95-staticcurses.patch
@@ -0,0 +1,14 @@
+--- grub-0.95/configure.ac.static      2004-06-13 13:38:17.000000000 -0400
++++ grub-0.95/configure.ac     2004-06-18 17:35:23.513374336 -0400
+@@ -207,9 +207,9 @@
+ 
+ # Unless the user specify --without-curses, check for curses.
+ if test "x$with_curses" != "xno"; then
+-  AC_CHECK_LIB(ncurses, wgetch, [GRUB_LIBS="$GRUB_LIBS -lncurses"
++  AC_CHECK_LIB(ncurses, wgetch, [GRUB_LIBS="$GRUB_LIBS -Wl,-Bstatic -lncurses -Wl,-Bdynamic"
+   AC_DEFINE(HAVE_LIBCURSES, 1, [Define if you have a curses library])],
+-    [AC_CHECK_LIB(curses, wgetch, [GRUB_LIBS="$GRUB_LIBS -lcurses"
++    [AC_CHECK_LIB(curses, wgetch, [GRUB_LIBS="$GRUB_LIBS -Wl,-Bstatic -lcurses -Wl,-Bdynamic"
+        AC_DEFINE(HAVE_LIBCURSES, 1, [Define if you have a curses library])])])
+ fi
+ 

diff --git a/src/patches/grub-0.97-bz429187-cciss.patch b/src/patches/grub-0.97-bz429187-cciss.patch
new file mode 100644 (file)
index 0000000..32f18bc
--- /dev/null
+++ b/src/patches/grub-0.97-bz429187-cciss.patch
@@ -0,0 +1,75 @@
+diff -up grub-0.97/util/grub-install.in.cciss grub-0.97/util/grub-install.in
+--- grub-0.97/util/grub-install.in.cciss       2008-02-04 14:30:31.000000000 -0500
++++ grub-0.97/util/grub-install.in     2008-02-07 18:34:14.000000000 -0500
+@@ -100,25 +100,56 @@ convert () {
+     # Break the device name into the disk part and the partition part.
+     case "$host_os" in
+     linux*)
++      # formats that need to be handled (disk name -> partition name):
++      # floppies: /dev/fd0
++      # normal sd/hd devices: /dev/hda -> /dev/hda3
++      # md: /dev/md0 -> /dev/md0p0
++      # ide raid devs: /dev/ide/host0/bus0/target0/lun0/disc
++      #             -> /dev/ide/host0/bus0/target0/lun0/part1
++      # cciss: /dev/cciss/c0d0 -> /dev/cciss/c0d0p1
++      # mpath devs: /dev/mapper/mpath0 -> /dev/mapper/mpath0p1
++      #             /dev/mapper/lalala -> /dev/mapper/lalalap1
++      # dmraid devs: /dev/mapper/via_abcdef -> /dev/mapper/via_abcdefp1
++      #    /dev/mapper/isw_Volume0_abcdef -> /dev/mapper/isw_Volume0_abcdefp1
++      #  the known list (to me) is (X means we should handle it):
++      #       X asr_[unfettered crap]
++      #         hpt[0-9]+x_[0-9]+-[0-9]+
++      #       X hpt[0-9]+x_[0-9]+
++      #         hpt[0-9]+x_SPARE
++      #         isw_[a-z]+_[a-z]+[0-9]+
++      #       X isw_[a-z]+
++      #         jm_[0-9]+-[0-9]+
++      #       X jm_[0-9]+
++      #         lsi_[0-9]+-[0-9]+
++      #       X lsi_[0-9]+
++      #         nvidia_[a-z]+-[0-9]+
++      #       X nvidia_[a-z]+
++      #         pdc_[a-z]+-[0-9]+
++      #       X pdc_[a-z]+
++      #         sil_[0-9]+-[0-9]+
++      #       X sil_[0-9]+
++      #         via_[a-z]+-[0-9]+
++      #       X via_[a-z]+
++      #
++      # more? 
+       tmp_disk=`echo "$1" | grep -v '/mapper/control$' |
+-              grep -v '/mapper/[[:alnum:]]\+-[[:alnum:]]\+$' | uniq |
++              grep -v '/mapper/[[:alnum:]_]\+-[[:digit:]]\+$' | uniq |
+               sed -e 's%\([sh]d[a-z]\)[0-9]*$%\1%' \
+-                                -e 's%\(d[0-9]*\)p[0-9]*$%\1%' \
+-                                -e 's%\(fd[0-9]*\)$%\1%' \
+-                                -e 's%/part[0-9]*$%/disc%' \
+-                                -e 's%\(c[0-7]d[0-9]*\).*$%\1%' \
+-        -e 's%\(/mapper/[[:alpha:]]\+[[:digit:]]\+\)p[[:digit:]]\+$%\1%' \
+-        -e 's%\(/mapper/[[:alpha:]]\+_[[:alpha:]]\+\)[[:digit:]]\+$%\1%'`
++                        -e 's%\(/c[0-9]\+d[0-9]\+\).*$%\1%' \
++                        -e 's%\(fd[0-9]*\)$%\1%' \
++                        -e 's%/part[0-9]*$%/disc%' \
++  -e 's%\(/mapper/[[:alnum:]_-]\+\)\+p[[:digit:]]\+$%\1%'\
++  -e 's%\(/mapper/[[:alnum:]]\+\(_[[:alnum:]]\+\)\+\)\p[[:digit:]]\+$%\1%'`
+       tmp_part=`echo "$1" | grep -v '/mapper/control$' |
+-              grep -v '/mapper/[[:alnum:]]\+-[[:alnum:]]\+$' | uniq |
++              grep -v '/mapper/[[:alnum:]_]\+-[[:digit:]]\+$' | uniq |
+               sed -e 's%.*/[sh]d[a-z]\([0-9]*\)$%\1%' \
+-                                -e 's%.*d[0-9]*p%%' \
+-                                -e 's%.*/fd[0-9]*$%%' \
+-                                -e 's%.*/floppy/[0-9]*$%%' \
+-                                -e 's%.*/\(disc\|part\([0-9]*\)\)$%\2%' \
+-                                -e 's%.*c[0-7]d[0-9]*p%%' \
+-        -e 's%.*/mapper/[[:alpha:]]\+[[:digit:]]\+p\([[:digit:]]\+\)$%\1%' \
+-        -e 's%.*/mapper/[[:alpha:]]\+_[[:alpha:]]\+\([[:digit:]]\+\)$%\1%' |
++                        -e 's%.*/c[0-9]\+d[0-9]\+p\([[:digit:]]\+\)%\1%' \
++                        -e 's%.*/c[0-9]\+d[0-9]\+$%%' \
++                        -e 's%.*/fd[0-9]\+$%%' \
++                        -e 's%.*/floppy/[0-9]*$%%' \
++                        -e 's%.*/\(disc\|part\([0-9]*\)\)$%\2%' \
++  -e 's%.*/mapper/[[:alpha:]]\+[[:digit:]]\+p\([[:digit:]]\+\)$%\1%' \
++  -e 's%.*/mapper/[[:alnum:]]\+\(_[[:alpha:]]\+[[:digit:]]*\)\+p\([[:digit:]]\+\)$%\2%' |
+               grep -v '.*/mapper/.*'`
+       ;;
+     gnu*)

diff --git a/src/patches/grub-0.97-cmdline-size.patch b/src/patches/grub-0.97-cmdline-size.patch
new file mode 100644 (file)
index 0000000..e93aa98
--- /dev/null
+++ b/src/patches/grub-0.97-cmdline-size.patch
@@ -0,0 +1,45 @@
+diff --git a/stage2/boot.c b/stage2/boot.c
+index bf442e1..a6872e0 100644
+--- a/stage2/boot.c
++++ b/stage2/boot.c
+@@ -241,6 +241,7 @@ load_image (char *kernel, char *arg, kernel_t suggested_type,
+           }
+ 
+         if (lh->version >= 0x0202)
++          /* version 0x0202 and higher can handle 4096 */
+           lh->cmd_line_ptr = linux_data_real_addr + LINUX_CL_OFFSET;
+         else
+           {
+@@ -403,8 +404,10 @@ load_image (char *kernel, char *arg, kernel_t suggested_type,
+         {
+           char *src = skip_to (0, arg);
+           char *dest = linux_data_tmp_addr + LINUX_CL_OFFSET;
+-      
+-          while (dest < linux_data_tmp_addr + LINUX_CL_END_OFFSET && *src)
++            unsigned long cl_end_offset = lh->version < 0x0202 ? 
++                LINUX_CL_END_OFFSET : LINUX_CL_END_OFFSET_202;
++
++          while (dest < linux_data_tmp_addr + cl_end_offset && *src)
+             *(dest++) = *(src++);
+       
+           /* Old Linux kernels have problems determining the amount of
+diff --git a/stage2/shared.h b/stage2/shared.h
+index d05644b..c052480 100644
+--- a/stage2/shared.h
++++ b/stage2/shared.h
+@@ -160,10 +160,13 @@ extern void *grub_scratch_mem;
+ #define LINUX_VID_MODE_ASK            0xFFFD
+ 
+ #define LINUX_CL_OFFSET                       0x9000
+-#define LINUX_CL_END_OFFSET           0x90FF
+-#define LINUX_SETUP_MOVE_SIZE         0x9100
+ #define LINUX_CL_MAGIC                        0xA33F
+ 
++#define LINUX_CL_END_OFFSET           0x90FF
++#define LINUX_CL_END_OFFSET_202               0x9FFF /* version 0x0202 or higher */
++#define LINUX_SETUP_MOVE_SIZE         0xA000 /* where am I putting it? */
++
++
+ /*
+  *  General disk stuff
+  */

diff --git a/src/patches/grub-0.97-datadir.patch b/src/patches/grub-0.97-datadir.patch
new file mode 100644 (file)
index 0000000..eaa89f0
--- /dev/null
+++ b/src/patches/grub-0.97-datadir.patch
@@ -0,0 +1,229 @@
+--- grub-0.97/stage1/Makefile.am.datadir       2005-12-14 11:07:01.000000000 -0500
++++ grub-0.97/stage1/Makefile.am       2005-12-14 11:07:21.000000000 -0500
+@@ -1,7 +1,7 @@
+-pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
+-nodist_pkglib_DATA = stage1
++pkgdatadir = $(datadir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
++nodist_pkgdata_DATA = stage1
+ 
+-CLEANFILES = $(nodist_pkglib_DATA)
++CLEANFILES = $(nodist_pkgdata_DATA)
+ 
+ # We can't use builtins or standard includes.
+ AM_CCASFLAGS = $(STAGE1_CFLAGS) -fno-builtin -nostdinc
+--- grub-0.97/stage1/Makefile.in.datadir       2005-05-07 22:42:36.000000000 -0400
++++ grub-0.97/stage1/Makefile.in       2005-12-14 11:08:13.000000000 -0500
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.4 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,8 +15,6 @@
+ @SET_MAKE@
+ 
+ 
+-SOURCES = $(stage1_exec_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -67,13 +65,13 @@
+     *) f=$$p;; \
+   esac;
+ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(pkglibdir)"
+-nodist_pkglibDATA_INSTALL = $(INSTALL_DATA)
+-DATA = $(nodist_pkglib_DATA)
++am__installdirs = "$(DESTDIR)$(pkgdatadir)"
++nodist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
++DATA = $(nodist_pkgdata_DATA)
+ ETAGS = etags
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
++pkgdatadir = $(datadir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -102,6 +100,8 @@
+ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
+ FSYS_CFLAGS = @FSYS_CFLAGS@
++GRAPHICS_SUPPORT_FALSE = @GRAPHICS_SUPPORT_FALSE@
++GRAPHICS_SUPPORT_TRUE = @GRAPHICS_SUPPORT_TRUE@
+ GRUB_CFLAGS = @GRUB_CFLAGS@
+ GRUB_LIBS = @GRUB_LIBS@
+ HERCULES_SUPPORT_FALSE = @HERCULES_SUPPORT_FALSE@
+@@ -172,6 +172,7 @@
+ infodir = @infodir@
+ install_sh = @install_sh@
+ libdir = @libdir@
++datadir = @datadir@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+@@ -183,8 +184,8 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-nodist_pkglib_DATA = stage1
+-CLEANFILES = $(nodist_pkglib_DATA)
++nodist_pkgdata_DATA = stage1
++CLEANFILES = $(nodist_pkgdata_DATA)
+ 
+ # We can't use builtins or standard includes.
+ AM_CCASFLAGS = $(STAGE1_CFLAGS) -fno-builtin -nostdinc
+@@ -242,22 +243,22 @@
+ .S.obj:
+       $(CCASCOMPILE) -c `$(CYGPATH_W) '$<'`
+ uninstall-info-am:
+-install-nodist_pkglibDATA: $(nodist_pkglib_DATA)
++install-nodist_pkgdataDATA: $(nodist_pkgdata_DATA)
+       @$(NORMAL_INSTALL)
+-      test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
+-      @list='$(nodist_pkglib_DATA)'; for p in $$list; do \
++      test -z "$(pkgdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgdatadir)"
++      @list='$(nodist_pkgdata_DATA)'; for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         f=$(am__strip_dir) \
+-        echo " $(nodist_pkglibDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
+-        $(nodist_pkglibDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
++        echo " $(nodist_pkgdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgdatadir)/$$f'"; \
++        $(nodist_pkgdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
+       done
+ 
+-uninstall-nodist_pkglibDATA:
++uninstall-nodist_pkgdataDATA:
+       @$(NORMAL_UNINSTALL)
+-      @list='$(nodist_pkglib_DATA)'; for p in $$list; do \
++      @list='$(nodist_pkgdata_DATA)'; for p in $$list; do \
+         f=$(am__strip_dir) \
+-        echo " rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \
+-        rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \
++        echo " rm -f '$(DESTDIR)$(pkgdatadir)/$$f'"; \
++        rm -f "$(DESTDIR)$(pkgdatadir)/$$f"; \
+       done
+ 
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+@@ -339,7 +340,7 @@
+ check: check-am
+ all-am: Makefile $(PROGRAMS) $(DATA)
+ installdirs:
+-      for dir in "$(DESTDIR)$(pkglibdir)"; do \
++      for dir in "$(DESTDIR)$(pkgdatadir)"; do \
+         test -z "$$dir" || $(mkdir_p) "$$dir"; \
+       done
+ install: install-am
+@@ -388,7 +389,7 @@
+ 
+ install-data-am:
+ 
+-install-exec-am: install-nodist_pkglibDATA
++install-exec-am: install-nodist_pkgdataDATA
+ 
+ install-info: install-info-am
+ 
+@@ -412,19 +413,19 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am uninstall-nodist_pkglibDATA
++uninstall-am: uninstall-info-am uninstall-nodist_pkgdataDATA
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+       clean-noinstPROGRAMS ctags distclean distclean-compile \
+       distclean-generic distclean-tags distdir dvi dvi-am html \
+       html-am info info-am install install-am install-data \
+       install-data-am install-exec install-exec-am install-info \
+-      install-info-am install-man install-nodist_pkglibDATA \
++      install-info-am install-man install-nodist_pkgdataDATA \
+       install-strip installcheck installcheck-am installdirs \
+       maintainer-clean maintainer-clean-generic mostlyclean \
+       mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
+       tags uninstall uninstall-am uninstall-info-am \
+-      uninstall-nodist_pkglibDATA
++      uninstall-nodist_pkgdataDATA
+ 
+ .exec:
+       $(OBJCOPY) -O binary $< $@
+--- grub-0.97/util/grub-install.in.datadir     2005-12-14 11:00:21.000000000 -0500
++++ grub-0.97/util/grub-install.in     2005-12-14 11:00:21.000000000 -0500
+@@ -21,13 +21,13 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ sbindir=@sbindir@
+-libdir=@libdir@
++datadir=@datadir@
+ PACKAGE=@PACKAGE@
+ VERSION=@VERSION@
+ host_cpu=@host_cpu@
+ host_os=@host_os@
+ host_vendor=@host_vendor@
+-pkglibdir=${libdir}/${PACKAGE}/${host_cpu}-${host_vendor}
++pkgdatadir=${datadir}/${PACKAGE}/${host_cpu}-${host_vendor}
+ 
+ grub_shell=${sbindir}/grub
+ mdadm=${sbindir}/mdadm
+@@ -388,17 +388,17 @@
+     exit 1
+ fi
+ 
+-if test -f "$pkglibdir/stage1"; then
++if test -f "$pkgdatadir/stage1"; then
+     :
+ else
+-    echo "${pkglibdir}/stage1: Not found." 1>&2
++    echo "${pkgdatadir}/stage1: Not found." 1>&2
+     exit 1
+ fi
+ 
+-if test -f "$pkglibdir/stage2"; then
++if test -f "$pkgdatadir/stage2"; then
+     :
+ else
+-    echo "${pkglibdir}/stage2: Not found." 1>&2
++    echo "${pkgdatadir}/stage2: Not found." 1>&2
+     exit 1
+ fi
+ 
+--- grub-0.97/stage2/Makefile.am.datadir       2005-12-14 11:03:54.000000000 -0500
++++ grub-0.97/stage2/Makefile.am       2005-12-14 11:05:04.000000000 -0500
+@@ -27,12 +27,12 @@
+       -DUSE_MD5_PASSWORDS=1 -DSUPPORT_SERIAL=1 -DSUPPORT_HERCULES=1
+ 
+ # Stage 2 and Stage 1.5's.
+-pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
++pkgdatadir = $(datadir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
+ 
+ EXTRA_PROGRAMS = nbloader.exec pxeloader.exec diskless.exec
+ 
+ if DISKLESS_SUPPORT
+-pkglib_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
++pkgdata_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
+       ffs_stage1_5 iso9660_stage1_5 jfs_stage1_5 minix_stage1_5 \
+       reiserfs_stage1_5 ufs2_stage1_5 vstafs_stage1_5 xfs_stage1_5 \
+       nbgrub pxegrub
+@@ -43,7 +43,7 @@
+       reiserfs_stage1_5.exec ufs2_stage1_5.exec vstafs_stage1_5.exec \
+       xfs_stage1_5.exec nbloader.exec pxeloader.exec diskless.exec
+ else
+-pkglib_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
++pkgdata_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
+       ffs_stage1_5 iso9660_stage1_5 jfs_stage1_5 minix_stage1_5 \
+       reiserfs_stage1_5 ufs2_stage1_5 vstafs_stage1_5 xfs_stage1_5
+ noinst_DATA = pre_stage2 start start_eltorito
+@@ -112,7 +112,7 @@
+ BUILT_SOURCES = stage2_size.h
+ endif
+ 
+-CLEANFILES = $(pkglib_DATA) $(noinst_DATA) $(BUILT_SOURCES)
++CLEANFILES = $(pkgdata_DATA) $(noinst_DATA) $(BUILT_SOURCES)
+ 
+ stage2_size.h: pre_stage2
+       -rm -f stage2_size.h

diff --git a/src/patches/grub-0.97-dmraid-partition-names.patch b/src/patches/grub-0.97-dmraid-partition-names.patch
new file mode 100644 (file)
index 0000000..9390b29
--- /dev/null
+++ b/src/patches/grub-0.97-dmraid-partition-names.patch
@@ -0,0 +1,10 @@
+--- grub-0.97/lib/device.c.dmraid-partition-names      2006-02-13 18:53:59.000000000 -0500
++++ grub-0.97/lib/device.c     2006-02-13 18:56:04.000000000 -0500
+@@ -1106,6 +1106,7 @@
+          /* Compaq smart and others */
+          (strncmp(dev, "/dev/ida/", 9) == 0 ||
+           strncmp(dev, "/dev/ataraid/", 13) == 0 ||
++          strncmp(dev, "/dev/mapper/", 12) == 0 || 
+           strncmp(dev, "/dev/cciss/", 11) == 0 ||
+           strncmp(dev, "/dev/rd/", 8) == 0) ? "p" : "",
+          ((partition >> 16) & 0xFF) + 1);

diff --git a/src/patches/grub-0.97-dmraid-recheck-bad.patch b/src/patches/grub-0.97-dmraid-recheck-bad.patch
new file mode 100644 (file)
index 0000000..49b33ae
--- /dev/null
+++ b/src/patches/grub-0.97-dmraid-recheck-bad.patch
@@ -0,0 +1,17 @@
+--- grub-0.97/util/grub-install.in.dmraid-recheck-bad  2006-01-13 17:04:26.000000000 -0500
++++ grub-0.97/util/grub-install.in     2006-01-13 17:05:00.000000000 -0500
+@@ -415,6 +415,14 @@
+ grubdir=${bootdir}/grub
+ device_map=${grubdir}/device.map
+ 
++if [ "$recheck" == "yes" ]; then
++    if grep 'mapper' ${device_map} >/dev/null; then
++      echo 'grub-install does not support reprobing of device.map when' 1>&2
++      echo 'using a device-mapper based boot device.' 1>&2
++      exit 1
++    fi
++fi
++
+ # if they just want the images copied, copy the images and then exit
+ if test $justcopy = yes; then
+     copy_images

diff --git a/src/patches/grub-0.97-dmraid.patch b/src/patches/grub-0.97-dmraid.patch
new file mode 100644 (file)
index 0000000..5aad8c4
--- /dev/null
+++ b/src/patches/grub-0.97-dmraid.patch
@@ -0,0 +1,92 @@
+--- grub-0.97/util/grub-install.in.dmraid      2006-01-13 16:40:24.000000000 -0500
++++ grub-0.97/util/grub-install.in     2006-01-13 16:40:37.000000000 -0500
+@@ -101,17 +101,24 @@
+     # Break the device name into the disk part and the partition part.
+     case "$host_os" in
+     linux*)
+-      tmp_disk=`echo "$1" | sed -e 's%\([sh]d[a-z]\)[0-9]*$%\1%' \
++      tmp_disk=`echo "$1" | grep -v '/mapper/control$' |
++              grep -v '/mapper/[[:alnum:]]\+-[[:alnum:]]\+$' | uniq |
++              sed -e 's%\([sh]d[a-z]\)[0-9]*$%\1%' \
+                                 -e 's%\(d[0-9]*\)p[0-9]*$%\1%' \
+                                 -e 's%\(fd[0-9]*\)$%\1%' \
+                                 -e 's%/part[0-9]*$%/disc%' \
+-                                -e 's%\(c[0-7]d[0-9]*\).*$%\1%'`
+-      tmp_part=`echo "$1" | sed -e 's%.*/[sh]d[a-z]\([0-9]*\)$%\1%' \
++                                -e 's%\(c[0-7]d[0-9]*\).*$%\1%' \
++        -e 's%\(/mapper/[[:alpha:]]\+_[[:alpha:]]\+\)[[:digit:]]\+$%\1%'`
++      tmp_part=`echo "$1" | grep -v '/mapper/control$' |
++              grep -v '/mapper/[[:alnum:]]\+-[[:alnum:]]\+$' | uniq |
++              sed -e 's%.*/[sh]d[a-z]\([0-9]*\)$%\1%' \
+                                 -e 's%.*d[0-9]*p%%' \
+                                 -e 's%.*/fd[0-9]*$%%' \
+                                 -e 's%.*/floppy/[0-9]*$%%' \
+                                 -e 's%.*/\(disc\|part\([0-9]*\)\)$%\2%' \
+-                                -e 's%.*c[0-7]d[0-9]*p%%'`
++                                -e 's%.*c[0-7]d[0-9]*p%%' \
++        -e 's%.*/mapper/[[:alpha:]]\+_[[:alpha:]]\+\([[:digit:]]\+\)$%\1%' |
++              grep -v '.*/mapper/.*'`
+       ;;
+     gnu*)
+       tmp_disk=`echo "$1" | sed 's%\([sh]d[0-9]*\).*%\1%'`
+@@ -253,6 +260,43 @@
+     return 0
+ }
+ 
++# Usage: stat_device file
++# Find major:minor of a device node.
++stat_device() {
++    majmin=`stat -c "%t:%T" "$1" 2>/dev/null`
++    if test -z "$majmin"; then
++      echo "Could not find device for $1" 2>&1
++      exit 1
++    fi
++
++    echo "$majmin"
++}
++
++# Usage: find_mapper_device file
++# Find a file in /dev/mapper with the same major:minor as the specified node.
++find_mapper_device() {
++    if [ -b "$1" ]; then
++      dev="$1"
++    else
++      mntpnt=`echo "$1" | sed 's,/,\\\\/,g'`
++      dev=`awk '($2 ~ /'$mntpnt'/) { print $1 }' /etc/mtab`
++    fi
++    if test -z "$dev"; then
++      echo "Could not find device for $1" 2>&1
++      exit 1
++    fi
++      
++    majmin=`stat_device $dev`
++    for x in /dev/mapper/* ; do
++      devmajmin=`stat_device "$x"`
++      if [ "$majmin" == "$devmajmin" ]; then
++          echo "$x"
++          return 0
++      fi
++    done
++    return 1
++}
++
+ # Usage: find_device file
+ # Find block device on which the file resides.
+ find_device () {
+@@ -265,9 +309,14 @@
+       exit 1
+     fi
+ 
+-    tmp_fname=`resolve_symlink $tmp_fname`
++    ret_fname=`resolve_symlink $tmp_fname`
++    tmp_fname=`find_mapper_device $ret_fname`
++    if test -n "$tmp_fname"; then
++      ret_fname="$tmp_fname"
++    fi
+ 
+-    echo "$tmp_fname"
++    echo "$ret_fname"
++    return 0
+ }
+ 
+ copy_images() {

diff --git a/src/patches/grub-0.97-install.in.patch b/src/patches/grub-0.97-install.in.patch
new file mode 100644 (file)
index 0000000..a9f2aef
--- /dev/null
+++ b/src/patches/grub-0.97-install.in.patch
@@ -0,0 +1,34 @@
+--- grub-0.97/util/grub-install.in.install     2005-12-12 18:15:45.000000000 -0500
++++ grub-0.97/util/grub-install.in     2005-12-12 18:18:11.000000000 -0500
+@@ -324,6 +324,15 @@
+ test -d "$bootdir" || mkdir "$bootdir" || exit 1
+ test -d "$grubdir" || mkdir "$grubdir" || exit 1
+ 
++# Copy the GRUB images to the GRUB directory.
++for file in ${grubdir}/stage1 ${grubdir}/stage2 ${grubdir}/*stage1_5; do
++    rm -f $file || exit 1
++done
++for file in \
++    ${pkgdatadir}/stage1 ${pkgdatadir}/stage2 ${pkgdatadir}/*stage1_5; do
++    cp -f $file ${grubdir} || exit 1
++done
++
+ # If --recheck is specified, remove the device map, if present.
+ if test $recheck = yes; then
+     rm -f $device_map
+@@ -406,15 +415,6 @@
+     exit 1
+ fi
+ 
+-# Copy the GRUB images to the GRUB directory.
+-for file in ${grubdir}/stage1 ${grubdir}/stage2 ${grubdir}/*stage1_5; do
+-    rm -f $file || exit 1
+-done
+-for file in \
+-    ${pkglibdir}/stage1 ${pkglibdir}/stage2 ${pkglibdir}/*stage1_5; do
+-    cp -f $file ${grubdir} || exit 1
+-done
+-
+ # Make a default file.
+ ${grub_set_default} --root-directory=${rootdir} default
+ 

diff --git a/src/patches/grub-0.97-mactel-kbd.patch b/src/patches/grub-0.97-mactel-kbd.patch
new file mode 100644 (file)
index 0000000..f1de19f
--- /dev/null
+++ b/src/patches/grub-0.97-mactel-kbd.patch
@@ -0,0 +1,100 @@
+--- grub-0.97/stage2/asm.S.mactel-kbd  2006-06-12 17:00:10.000000000 -0400
++++ grub-0.97/stage2/asm.S     2006-06-12 17:03:38.000000000 -0400
+@@ -1651,7 +1651,30 @@
+       jnz     3f
+       ret
+ 
+-3:    /* use keyboard controller */
++3:    /*
++      * try to switch gateA20 using PORT92, the "Fast A20 and Init"
++      * register
++      */
++      mov     $0x92, %dx
++      inb     %dx, %al
++      /* skip the port92 code if it's unimplemented (read returns 0xff) */
++      cmpb    $0xff, %al
++      jz      6f
++
++      /* set or clear bit1, the ALT_A20_GATE bit */
++      movb    4(%esp), %ah
++      testb   %ah, %ah
++      jz      4f
++      orb     $2, %al
++      jmp     5f
++4:    and     $0xfd, %al
++
++      /* clear the INIT_NOW bit; don't accidently reset the machine */
++5:    and     $0xfe, %al
++      outb    %al, %dx
++
++
++6:    /* use keyboard controller */
+       pushl   %eax
+ 
+       call    gloop1
+@@ -1661,9 +1684,12 @@
+ 
+ gloopint1:
+       inb     $K_STATUS
++      cmpb    $0xff, %al
++      jz      gloopint1_done
+       andb    $K_IBUF_FUL, %al
+       jnz     gloopint1
+ 
++gloopint1_done:
+       movb    $KB_OUTPUT_MASK, %al
+       cmpb    $0, 0x8(%esp)
+       jz      gdoit
+@@ -1684,6 +1710,8 @@
+ 
+ gloop1:
+       inb     $K_STATUS
++      cmpb    $0xff, %al
++      jz      gloop2ret
+       andb    $K_IBUF_FUL, %al
+       jnz     gloop1
+ 
+@@ -1994,8 +2022,25 @@
+       call    EXT_C(prot_to_real)
+       .code16
+ 
++.again:
++      mov     $0x11, %ah              /* poll kbd */
+       int     $0x16
+ 
++      jz      .again
++#if 0
++/* XXX handle serial here? -- pj */
++      jnz     .kbd
++#endif
++.kbd:
++      mov     $0x10, %ah
++      int     $0x16
++      cmp     $0xe0, %al
++      jnz     .not_ext
++      xor     %al, %al
++.not_ext:
++      and     %al, %al
++      jz      .func_key
++.func_key:
+       movw    %ax, %dx                /* real_to_prot uses %eax */
+       call    translate_keycode
+       call    remap_ascii_char
+@@ -2003,7 +2048,7 @@
+       DATA32  call    EXT_C(real_to_prot)
+       .code32
+ 
+-      movw    %dx, %ax
++      mov     %dx, %ax
+ 
+       pop     %ebp
+       ret
+@@ -2029,7 +2074,7 @@
+       call    EXT_C(prot_to_real)     /* enter real mode */
+       .code16
+ 
+-      movb    $0x1, %ah
++      movb    $0x11, %ah
+       int     $0x16
+ 
+       DATA32  jz      notpending

diff --git a/src/patches/grub-0.97-mdadm-path.patch b/src/patches/grub-0.97-mdadm-path.patch
new file mode 100644 (file)
index 0000000..fff301c
--- /dev/null
+++ b/src/patches/grub-0.97-mdadm-path.patch
@@ -0,0 +1,27 @@
+--- grub-0.97/util/grub-install.in.mdadm-path  2005-12-12 18:42:23.000000000 -0500
++++ grub-0.97/util/grub-install.in     2005-12-12 18:44:15.000000000 -0500
+@@ -30,5 +30,6 @@
+ pkglibdir=${libdir}/${PACKAGE}/${host_cpu}-${host_vendor}
+ 
+ grub_shell=${sbindir}/grub
++mdadm=${sbindir}/mdadm
+ log_file=/tmp/grub-install.log.$$
+ img_file=/tmp/grub-install.img.$$
+@@ -217,7 +218,7 @@
+ is_raid1_device () {
+     case "$host_os" in
+     linux*)
+-      level=`mdadm --query --detail $1 2>/dev/null | \
++      level=`$mdadm --query --detail $1 2>/dev/null | \
+               awk '/Raid Level :/ {print $4}'` 
+       if [ "$level" = "raid1" ]; then
+           return 0
+@@ -236,7 +237,7 @@
+     linux*)
+       if is_raid1_device $source_device ; then
+           list=""
+-          for device in `mdadm --query --detail "${source_device}" | \
++          for device in `$mdadm --query --detail "${source_device}" | \
+                   awk '/\/dev\/[^(md)]/ {print $7}'` ; do
+               list="$list $device"
+           done

diff --git a/src/patches/grub-0.97-mpath.patch b/src/patches/grub-0.97-mpath.patch
new file mode 100644 (file)
index 0000000..4b7edf3
--- /dev/null
+++ b/src/patches/grub-0.97-mpath.patch
@@ -0,0 +1,18 @@
+--- grub-0.97/util/grub-install.in.mpath       2006-08-02 17:21:53.000000000 -0400
++++ grub-0.97/util/grub-install.in     2006-08-02 17:23:23.000000000 -0400
+@@ -107,6 +107,7 @@
+                                 -e 's%\(fd[0-9]*\)$%\1%' \
+                                 -e 's%/part[0-9]*$%/disc%' \
+                                 -e 's%\(c[0-7]d[0-9]*\).*$%\1%' \
++        -e 's%\(/mapper/[[:alpha:]]\+[[:digit:]]\+\)p[[:digit:]]\+$%\1%' \
+         -e 's%\(/mapper/[[:alpha:]]\+_[[:alpha:]]\+\)[[:digit:]]\+$%\1%'`
+       tmp_part=`echo "$1" | grep -v '/mapper/control$' |
+               grep -v '/mapper/[[:alnum:]]\+-[[:alnum:]]\+$' | uniq |
+@@ -116,6 +117,7 @@
+                                 -e 's%.*/floppy/[0-9]*$%%' \
+                                 -e 's%.*/\(disc\|part\([0-9]*\)\)$%\2%' \
+                                 -e 's%.*c[0-7]d[0-9]*p%%' \
++        -e 's%.*/mapper/[[:alpha:]]\+[[:digit:]]\+p\([[:digit:]]\+\)$%\1%' \
+         -e 's%.*/mapper/[[:alpha:]]\+_[[:alpha:]]\+\([[:digit:]]\+\)$%\1%' |
+               grep -v '.*/mapper/.*'`
+       ;;

diff --git a/src/patches/grub-0.97-nx-multiinstall.patch b/src/patches/grub-0.97-nx-multiinstall.patch
new file mode 100644 (file)
index 0000000..f0e4ec0
--- /dev/null
+++ b/src/patches/grub-0.97-nx-multiinstall.patch
@@ -0,0 +1,60 @@
+2006-03-09  Alexandre Oliva  <oliva@gnu.org>
+
+       * lib/builtins.c (install_blocklist_helper): Move static
+       last_lenght...
+       (install_func_context): ... here.
+       (install_func): Reset it.
+
+Index: grub-0.97/stage2/builtins.c
+===================================================================
+--- grub-0.97.orig/stage2/builtins.c   2006-03-09 10:26:41.000000000 -0300
++++ grub-0.97/stage2/builtins.c        2006-03-09 11:36:18.000000000 -0300
+@@ -1926,11 +1926,13 @@ static struct {
+       int saved_sector;
+       int installaddr;
+       int installlist;
++      int last_length;
+       char *stage2_first_buffer;
+ } install_func_context = {
+       .saved_sector = 0,
+       .installaddr = 0,
+       .installlist = 0,
++      .last_length = SECTOR_SIZE,
+       .stage2_first_buffer = NULL,
+ };
+ 
+@@ -1960,19 +1962,19 @@ install_blocklist_helper (int sector, in
+   int *installlist = &install_func_context.installlist;
+   char **stage2_first_buffer = &install_func_context.stage2_first_buffer;
+   /* Was the last sector full? */
+-  static int last_length = SECTOR_SIZE;
++  int *last_length = &install_func_context.last_length;
+ 
+   if (debug)
+     printf("[%d]", sector);
+ 
+-  if (offset != 0 || last_length != SECTOR_SIZE)
++  if (offset != 0 || *last_length != SECTOR_SIZE)
+     {
+       /* We found a non-sector-aligned data block. */
+       errnum = ERR_UNALIGNED;
+       return;
+     }
+ 
+-  last_length = length;
++  *last_length = length;
+ 
+   if (*((unsigned long *) (*installlist - 4))
+       + *((unsigned short *) *installlist) != sector
+@@ -2027,7 +2029,11 @@ install_func (char *arg, int flags)
+   int is_open = 0;
+   /* If LBA is forced?  */
+   int is_force_lba = 0;
++  int *last_length = &install_func_context.last_length;
+   
++  /* Reset state.  */
++  *last_length = SECTOR_SIZE;
++
+   *stage2_first_buffer = old_sect + SECTOR_SIZE;
+ #ifdef GRUB_UTIL
+   /* If the Stage 2 is in a partition mounted by an OS, this will store

diff --git a/src/patches/grub-0.97-nxstack.patch b/src/patches/grub-0.97-nxstack.patch
new file mode 100644 (file)
index 0000000..92742cd
--- /dev/null
+++ b/src/patches/grub-0.97-nxstack.patch
@@ -0,0 +1,615 @@
+--- grub-0.97/stage2/shared.h.nxstack  2005-12-12 18:31:41.000000000 -0500
++++ grub-0.97/stage2/shared.h  2005-12-12 18:31:42.000000000 -0500
+@@ -36,8 +36,8 @@
+ 
+ /* Maybe redirect memory requests through grub_scratch_mem. */
+ #ifdef GRUB_UTIL
+-extern char *grub_scratch_mem;
+-# define RAW_ADDR(x) ((x) + (int) grub_scratch_mem)
++extern void *grub_scratch_mem;
++# define RAW_ADDR(x) ((x) + (unsigned long) grub_scratch_mem)
+ # define RAW_SEG(x) (RAW_ADDR ((x) << 4) >> 4)
+ #else
+ # define RAW_ADDR(x) (x)
+--- grub-0.97/stage2/builtins.c.nxstack        2005-12-12 18:31:41.000000000 -0500
++++ grub-0.97/stage2/builtins.c        2005-12-12 18:41:47.000000000 -0500
+@@ -131,62 +131,97 @@
+ }
+ 
+ \f
++/* blocklist_read_helper nee disk_read_blocklist_func was a nested
++ * function, to which pointers were taken and exposed globally.  Even
++ * in the GNU-C nested functions extension, they have local linkage,
++ * and aren't guaranteed to be accessable *at all* outside of their 
++ * containing scope.
++ *
++ * Above and beyond all of that, the variables within blocklist_func_context
++ * are originally local variables, with local (not even static) linkage,
++ * from within blocklist_func.  These were each referenced by
++ * disk_read_blocklist_func, which is only called from other functions
++ * through a globally scoped pointer.
++ * 
++ * The documentation in GCC actually uses the words "all hell will break
++ * loose" to describe this scenario.
++ *
++ * Also, "start_sector" was also used uninitialized, but gcc doesn't warn
++ * about it (possibly because of the scoping madness?)
++ */
++   
++static struct {
++      int start_sector;
++      int num_sectors;
++      int num_entries;
++      int last_length;
++} blocklist_func_context = {
++      .start_sector = 0,
++      .num_sectors = 0,
++      .num_entries = 0,
++      .last_length = 0
++};
++
++/* Collect contiguous blocks into one entry as many as possible,
++   and print the blocklist notation on the screen.  */
++static void
++blocklist_read_helper (int sector, int offset, int length)
++{
++  int *start_sector = &blocklist_func_context.start_sector;
++  int *num_sectors = &blocklist_func_context.num_sectors;
++  int *num_entries = &blocklist_func_context.num_entries;
++  int *last_length = &blocklist_func_context.last_length;
++
++  if (*num_sectors > 0)
++  {
++    if (*start_sector + *num_sectors == sector
++      && offset == 0 && *last_length == SECTOR_SIZE)
++    {
++      *num_sectors++;
++      *last_length = length;
++      return;
++    }
++    else
++    {
++      if (*last_length == SECTOR_SIZE)
++        grub_printf ("%s%d+%d", *num_entries ? "," : "",
++          *start_sector - part_start, *num_sectors);
++      else if (*num_sectors > 1)
++        grub_printf ("%s%d+%d,%d[0-%d]", *num_entries ? "," : "",
++          *start_sector - part_start, *num_sectors-1,
++          *start_sector + *num_sectors-1 - part_start, 
++          *last_length);
++      else
++        grub_printf ("%s%d[0-%d]", *num_entries ? "," : "",
++          *start_sector - part_start, *last_length);
++      *num_entries++;
++      *num_sectors = 0;
++    }
++  }
++
++  if (offset > 0)
++  {
++    grub_printf("%s%d[%d-%d]", *num_entries ? "," : "",
++          sector-part_start, offset, offset+length);
++    *num_entries++;
++  }
++  else
++  {
++    *start_sector = sector;
++    *num_sectors = 1;
++    *last_length = length;
++  }
++}
++
+ /* blocklist */
+ static int
+ blocklist_func (char *arg, int flags)
+ {
+   char *dummy = (char *) RAW_ADDR (0x100000);
+-  int start_sector;
+-  int num_sectors = 0;
+-  int num_entries = 0;
+-  int last_length = 0;
+ 
+-  auto void disk_read_blocklist_func (int sector, int offset, int length);
+-  
+-  /* Collect contiguous blocks into one entry as many as possible,
+-     and print the blocklist notation on the screen.  */
+-  auto void disk_read_blocklist_func (int sector, int offset, int length)
+-    {
+-      if (num_sectors > 0)
+-      {
+-        if (start_sector + num_sectors == sector
+-            && offset == 0 && last_length == SECTOR_SIZE)
+-          {
+-            num_sectors++;
+-            last_length = length;
+-            return;
+-          }
+-        else
+-          {
+-            if (last_length == SECTOR_SIZE)
+-              grub_printf ("%s%d+%d", num_entries ? "," : "",
+-                           start_sector - part_start, num_sectors);
+-            else if (num_sectors > 1)
+-              grub_printf ("%s%d+%d,%d[0-%d]", num_entries ? "," : "",
+-                           start_sector - part_start, num_sectors-1,
+-                           start_sector + num_sectors-1 - part_start, 
+-                           last_length);
+-            else
+-              grub_printf ("%s%d[0-%d]", num_entries ? "," : "",
+-                           start_sector - part_start, last_length);
+-            num_entries++;
+-            num_sectors = 0;
+-          }
+-      }
+-
+-      if (offset > 0)
+-      {
+-        grub_printf("%s%d[%d-%d]", num_entries ? "," : "",
+-                    sector-part_start, offset, offset+length);
+-        num_entries++;
+-      }
+-      else
+-      {
+-        start_sector = sector;
+-        num_sectors = 1;
+-        last_length = length;
+-      }
+-    }
++  int *start_sector = &blocklist_func_context.start_sector;
++  int *num_sectors = &blocklist_func_context.num_sectors;
++  int *num_entries = &blocklist_func_context.num_entries;
+ 
+   /* Open the file.  */
+   if (! grub_open (arg))
+@@ -206,15 +241,15 @@
+   grub_printf (")");
+ 
+   /* Read in the whole file to DUMMY.  */
+-  disk_read_hook = disk_read_blocklist_func;
++  disk_read_hook = blocklist_read_helper;
+   if (! grub_read (dummy, -1))
+     goto fail;
+ 
+   /* The last entry may not be printed yet.  Don't check if it is a
+    * full sector, since it doesn't matter if we read too much. */
+-  if (num_sectors > 0)
+-    grub_printf ("%s%d+%d", num_entries ? "," : "",
+-               start_sector - part_start, num_sectors);
++  if (*num_sectors > 0)
++    grub_printf ("%s%d+%d", *num_entries ? "," : "",
++               *start_sector - part_start, *num_sectors);
+ 
+   grub_printf ("\n");
+   
+@@ -1889,6 +1924,77 @@
+ 
+ \f
+ /* install */
++static struct {
++      int saved_sector;
++      int installaddr;
++      int installlist;
++      char *stage2_first_buffer;
++} install_func_context = {
++      .saved_sector = 0,
++      .installaddr = 0,
++      .installlist = 0,
++      .stage2_first_buffer = NULL,
++};
++
++/* Save the first sector of Stage2 in STAGE2_SECT.  */
++/* Formerly disk_read_savesect_func with local scope inside install_func */
++static void
++install_savesect_helper(int sector, int offset, int length)
++{
++  if (debug)
++    printf ("[%d]", sector);
++
++  /* ReiserFS has files which sometimes contain data not aligned
++     on sector boundaries.  Returning an error is better than
++     silently failing. */
++  if (offset != 0 || length != SECTOR_SIZE)
++    errnum = ERR_UNALIGNED;
++
++  install_func_context.saved_sector = sector;
++}
++
++/* Write SECTOR to INSTALLLIST, and update INSTALLADDR and  INSTALLSECT.  */
++/* Formerly disk_read_blocklist_func with local scope inside install_func */
++static void
++install_blocklist_helper (int sector, int offset, int length)
++{
++  int *installaddr = &install_func_context.installaddr;
++  int *installlist = &install_func_context.installlist;
++  char **stage2_first_buffer = &install_func_context.stage2_first_buffer;
++  /* Was the last sector full? */
++  static int last_length = SECTOR_SIZE;
++
++  if (debug)
++    printf("[%d]", sector);
++
++  if (offset != 0 || last_length != SECTOR_SIZE)
++    {
++      /* We found a non-sector-aligned data block. */
++      errnum = ERR_UNALIGNED;
++      return;
++    }
++
++  last_length = length;
++
++  if (*((unsigned long *) (*installlist - 4))
++      + *((unsigned short *) *installlist) != sector
++      || *installlist == (int) *stage2_first_buffer + SECTOR_SIZE + 4)
++    {
++      *installlist -= 8;
++
++      if (*((unsigned long *) (*installlist - 8)))
++        errnum = ERR_WONT_FIT;
++      else
++        {
++          *((unsigned short *) (*installlist + 2)) = (*installaddr >> 4);
++          *((unsigned long *) (*installlist - 4)) = sector;
++        }
++    }
++
++  *((unsigned short *) *installlist) += 1;
++  *installaddr += 512;
++}
++
+ static int
+ install_func (char *arg, int flags)
+ {
+@@ -1896,8 +2002,12 @@
+   char *stage1_buffer = (char *) RAW_ADDR (0x100000);
+   char *stage2_buffer = stage1_buffer + SECTOR_SIZE;
+   char *old_sect = stage2_buffer + SECTOR_SIZE;
+-  char *stage2_first_buffer = old_sect + SECTOR_SIZE;
+-  char *stage2_second_buffer = stage2_first_buffer + SECTOR_SIZE;
++  /* stage2_first_buffer used to be defined as:
++   * char *stage2_first_buffer = old_sect + SECTOR_SIZE;  */
++  char **stage2_first_buffer = &install_func_context.stage2_first_buffer;
++  /* and stage2_second_buffer was:
++   * char *stage2_second_buffer = stage2_first_buffer + SECTOR_SIZE; */
++  char *stage2_second_buffer = old_sect + SECTOR_SIZE + SECTOR_SIZE;
+   /* XXX: Probably SECTOR_SIZE is reasonable.  */
+   char *config_filename = stage2_second_buffer + SECTOR_SIZE;
+   char *dummy = config_filename + SECTOR_SIZE;
+@@ -1906,10 +2016,11 @@
+   int src_drive, src_partition, src_part_start;
+   int i;
+   struct geometry dest_geom, src_geom;
+-  int saved_sector;
++  int *saved_sector = &install_func_context.saved_sector;
+   int stage2_first_sector, stage2_second_sector;
+   char *ptr;
+-  int installaddr, installlist;
++  int *installaddr = &install_func_context.installaddr;
++  int *installlist = &install_func_context.installlist;
+   /* Point to the location of the name of a configuration file in Stage 2.  */
+   char *config_file_location;
+   /* If FILE is a Stage 1.5?  */
+@@ -1918,68 +2029,14 @@
+   int is_open = 0;
+   /* If LBA is forced?  */
+   int is_force_lba = 0;
+-  /* Was the last sector full? */
+-  int last_length = SECTOR_SIZE;
+   
++  *stage2_first_buffer = old_sect + SECTOR_SIZE;
+ #ifdef GRUB_UTIL
+   /* If the Stage 2 is in a partition mounted by an OS, this will store
+      the filename under the OS.  */
+   char *stage2_os_file = 0;
+ #endif /* GRUB_UTIL */
+   
+-  auto void disk_read_savesect_func (int sector, int offset, int length);
+-  auto void disk_read_blocklist_func (int sector, int offset, int length);
+-  
+-  /* Save the first sector of Stage2 in STAGE2_SECT.  */
+-  auto void disk_read_savesect_func (int sector, int offset, int length)
+-    {
+-      if (debug)
+-      printf ("[%d]", sector);
+-
+-      /* ReiserFS has files which sometimes contain data not aligned
+-         on sector boundaries.  Returning an error is better than
+-         silently failing. */
+-      if (offset != 0 || length != SECTOR_SIZE)
+-      errnum = ERR_UNALIGNED;
+-
+-      saved_sector = sector;
+-    }
+-
+-  /* Write SECTOR to INSTALLLIST, and update INSTALLADDR and
+-     INSTALLSECT.  */
+-  auto void disk_read_blocklist_func (int sector, int offset, int length)
+-    {
+-      if (debug)
+-      printf("[%d]", sector);
+-
+-      if (offset != 0 || last_length != SECTOR_SIZE)
+-      {
+-        /* We found a non-sector-aligned data block. */
+-        errnum = ERR_UNALIGNED;
+-        return;
+-      }
+-
+-      last_length = length;
+-
+-      if (*((unsigned long *) (installlist - 4))
+-        + *((unsigned short *) installlist) != sector
+-        || installlist == (int) stage2_first_buffer + SECTOR_SIZE + 4)
+-      {
+-        installlist -= 8;
+-
+-        if (*((unsigned long *) (installlist - 8)))
+-          errnum = ERR_WONT_FIT;
+-        else
+-          {
+-            *((unsigned short *) (installlist + 2)) = (installaddr >> 4);
+-            *((unsigned long *) (installlist - 4)) = sector;
+-          }
+-      }
+-
+-      *((unsigned short *) installlist) += 1;
+-      installaddr += 512;
+-    }
+-
+   /* First, check the GNU-style long option.  */
+   while (1)
+     {
+@@ -2011,10 +2068,10 @@
+   addr = skip_to (0, file);
+ 
+   /* Get the installation address.  */
+-  if (! safe_parse_maxint (&addr, &installaddr))
++  if (! safe_parse_maxint (&addr, installaddr))
+     {
+       /* ADDR is not specified.  */
+-      installaddr = 0;
++      *installaddr = 0;
+       ptr = addr;
+       errnum = 0;
+     }
+@@ -2110,17 +2167,17 @@
+       = 0x9090;
+   
+   /* Read the first sector of Stage 2.  */
+-  disk_read_hook = disk_read_savesect_func;
+-  if (grub_read (stage2_first_buffer, SECTOR_SIZE) != SECTOR_SIZE)
++  disk_read_hook = install_savesect_helper;
++  if (grub_read (*stage2_first_buffer, SECTOR_SIZE) != SECTOR_SIZE)
+     goto fail;
+ 
+-  stage2_first_sector = saved_sector;
++  stage2_first_sector = *saved_sector;
+   
+   /* Read the second sector of Stage 2.  */
+   if (grub_read (stage2_second_buffer, SECTOR_SIZE) != SECTOR_SIZE)
+     goto fail;
+ 
+-  stage2_second_sector = saved_sector;
++  stage2_second_sector = *saved_sector;
+   
+   /* Check for the version of Stage 2.  */
+   if (*((short *) (stage2_second_buffer + STAGE2_VER_MAJ_OFFS))
+@@ -2136,27 +2193,27 @@
+ 
+   /* If INSTALLADDR is not specified explicitly in the command-line,
+      determine it by the Stage 2 id.  */
+-  if (! installaddr)
++  if (! *installaddr)
+     {
+       if (! is_stage1_5)
+       /* Stage 2.  */
+-      installaddr = 0x8000;
++      *installaddr = 0x8000;
+       else
+       /* Stage 1.5.  */
+-      installaddr = 0x2000;
++      *installaddr = 0x2000;
+     }
+ 
+   *((unsigned long *) (stage1_buffer + STAGE1_STAGE2_SECTOR))
+     = stage2_first_sector;
+   *((unsigned short *) (stage1_buffer + STAGE1_STAGE2_ADDRESS))
+-    = installaddr;
++    = *installaddr;
+   *((unsigned short *) (stage1_buffer + STAGE1_STAGE2_SEGMENT))
+-    = installaddr >> 4;
++    = *installaddr >> 4;
+ 
+-  i = (int) stage2_first_buffer + SECTOR_SIZE - 4;
++  i = (int) *stage2_first_buffer + SECTOR_SIZE - 4;
+   while (*((unsigned long *) i))
+     {
+-      if (i < (int) stage2_first_buffer
++      if (i < (int) *stage2_first_buffer
+         || (*((int *) (i - 4)) & 0x80000000)
+         || *((unsigned short *) i) >= 0xA00
+         || *((short *) (i + 2)) == 0)
+@@ -2170,13 +2227,13 @@
+       i -= 8;
+     }
+ 
+-  installlist = (int) stage2_first_buffer + SECTOR_SIZE + 4;
+-  installaddr += SECTOR_SIZE;
++  *installlist = (int) *stage2_first_buffer + SECTOR_SIZE + 4;
++  *installaddr += SECTOR_SIZE;
+   
+   /* Read the whole of Stage2 except for the first sector.  */
+   grub_seek (SECTOR_SIZE);
+ 
+-  disk_read_hook = disk_read_blocklist_func;
++  disk_read_hook = install_blocklist_helper;
+   if (! grub_read (dummy, -1))
+     goto fail;
+   
+@@ -2259,7 +2316,7 @@
+         /* Skip the first sector.  */
+         grub_seek (SECTOR_SIZE);
+         
+-        disk_read_hook = disk_read_savesect_func;
++        disk_read_hook = install_savesect_helper;
+         if (grub_read (stage2_buffer, SECTOR_SIZE) != SECTOR_SIZE)
+           goto fail;
+         
+@@ -2329,7 +2386,7 @@
+         else
+ #endif /* GRUB_UTIL */
+           {
+-            if (! devwrite (saved_sector - part_start, 1, stage2_buffer))
++            if (! devwrite (*saved_sector - part_start, 1, stage2_buffer))
+               goto fail;
+           }
+       }
+@@ -2351,7 +2408,7 @@
+         goto fail;
+       }
+ 
+-      if (fwrite (stage2_first_buffer, 1, SECTOR_SIZE, fp) != SECTOR_SIZE)
++      if (fwrite (*stage2_first_buffer, 1, SECTOR_SIZE, fp) != SECTOR_SIZE)
+       {
+         fclose (fp);
+         errnum = ERR_WRITE;
+@@ -2378,7 +2435,7 @@
+       goto fail;
+ 
+       if (! devwrite (stage2_first_sector - src_part_start, 1,
+-                    stage2_first_buffer))
++                    *stage2_first_buffer))
+       goto fail;
+ 
+       if (! devwrite (stage2_second_sector - src_part_start, 1,
+--- grub-0.97/grub/asmstub.c.nxstack   2005-12-12 18:31:41.000000000 -0500
++++ grub-0.97/grub/asmstub.c   2005-12-12 18:31:42.000000000 -0500
+@@ -42,6 +42,7 @@
+ #include <sys/time.h>
+ #include <termios.h>
+ #include <signal.h>
++#include <sys/mman.h>
+ 
+ #ifdef __linux__
+ # include <sys/ioctl.h>               /* ioctl */
+@@ -82,7 +83,7 @@
+ struct apm_info apm_bios_info;
+ 
+ /* Emulation requirements. */
+-char *grub_scratch_mem = 0;
++void *grub_scratch_mem = 0;
+ 
+ struct geometry *disks = 0;
+ 
+@@ -106,14 +107,62 @@
+ static unsigned int serial_speed;
+ #endif /* SIMULATE_SLOWNESS_OF_SERIAL */
+ 
++/* This allocates page-aligned storage of the specified size, which must be
++ * a multiple of the page size as determined by calling sysconf(_SC_PAGESIZE)
++ */
++#ifdef __linux__
++static void *
++grub_mmap_alloc(size_t len)
++{
++  int mmap_flags = MAP_ANONYMOUS|MAP_PRIVATE|MAP_EXECUTABLE;
++
++#ifdef MAP_32BIT
++  mmap_flags |= MAP_32BIT;
++#endif
++  /* Mark the simulated stack executable, as GCC uses stack trampolines
++   * to implement nested functions. */
++  return mmap(NULL, len, PROT_READ|PROT_WRITE|PROT_EXEC, mmap_flags, -1, 0);
++}
++#else /* !defined(__linux__) */
++static void *
++grub_mmap_alloc(size_t len)
++{
++  int fd = 0, offset = 0, ret = 0;
++  void *pa = MAP_FAILED; 
++  char template[] = "/tmp/grub_mmap_alloc_XXXXXX";
++  errno_t e;
++
++  fd = mkstemp(template);
++  if (fd < 0)
++    return pa;
++
++  unlink(template);
++
++  ret = ftruncate(fd, len);
++  if (ret < 0)
++    return pa;
++
++  /* Mark the simulated stack executable, as GCC uses stack trampolines
++   * to implement nested functions. */
++  pa = mmap(NULL, len, PROT_READ|PROT_WRITE|PROT_EXEC,
++                  MAP_PRIVATE|MAP_EXECUTABLE, fd, offset);
++
++  e = errno;
++  close(fd);
++  errno = e;
++  return pa;
++}
++#endif /* defined(__linux__) */
++
+ /* The main entry point into this mess. */
+ int
+ grub_stage2 (void)
+ {
+   /* These need to be static, because they survive our stack transitions. */
+   static int status = 0;
+-  static char *realstack;
+-  char *scratch, *simstack;
++  static void *realstack;
++  void *simstack_alloc_base, *simstack;
++  size_t simstack_size, page_size;
+   int i;
+ 
+   auto void doit (void);
+@@ -145,9 +194,35 @@
+     }
+ 
+   assert (grub_scratch_mem == 0);
+-  scratch = malloc (0x100000 + EXTENDED_MEMSIZE + 15);
+-  assert (scratch);
+-  grub_scratch_mem = (char *) ((((int) scratch) >> 4) << 4);
++
++  /* Allocate enough pages for 0x100000 + EXTENDED_SIZE + 15, and
++   * make sure the memory is aligned to a multiple of the system's
++   * page size */
++  page_size = sysconf (_SC_PAGESIZE);
++  simstack_size = ( 0x100000 + EXTENDED_MEMSIZE + 15);
++  if (simstack_size % page_size)
++    {
++      /* If we're not on a page_size boundary, round up to the next one */
++      simstack_size &= ~(page_size-1);
++      simstack_size += page_size;
++    }
++
++  /* Add one for a PROT_NONE boundary page at each end. */
++  simstack_size += 2 * page_size;
++
++  simstack_alloc_base = grub_mmap_alloc(simstack_size);
++  assert (simstack_alloc_base != MAP_FAILED);
++
++  /* mark pages above and below our simstack area as innaccessable.
++   * If the implementation we're using doesn't support that, then the
++   * new protection modes are undefined.  It's safe to just ignore
++   * them, though.  It'd be nice if we knew that we'd get a SEGV for
++   * touching the area, but that's all.  it'd be nice to have. */
++  mprotect (simstack_alloc_base, page_size, PROT_NONE);
++  mprotect ((void *)((unsigned long)simstack_alloc_base +
++                        simstack_size - page_size),  page_size, PROT_NONE);
++
++  grub_scratch_mem = (void *)((unsigned long)simstack_alloc_base + page_size);
+ 
+   /* FIXME: simulate the memory holes using mprot, if available. */
+ 
+@@ -220,7 +295,7 @@
+   device_map = 0;
+   free (disks);
+   disks = 0;
+-  free (scratch);
++  munmap(simstack_alloc_base, simstack_size);
+   grub_scratch_mem = 0;
+ 
+   if (serial_device)

diff --git a/src/patches/grub-0.97-once.patch b/src/patches/grub-0.97-once.patch
new file mode 100644 (file)
index 0000000..6fb9a8d
--- /dev/null
+++ b/src/patches/grub-0.97-once.patch
@@ -0,0 +1,513 @@
+--- grub-0.97/stage2/builtins.c.bootonce       2005-12-12 18:23:12.000000000 -0500
++++ grub-0.97/stage2/builtins.c        2005-12-12 18:29:20.000000000 -0500
+@@ -3217,146 +3217,175 @@
+ };
+ 
+ \f
+-/* savedefault */
++
++#if !defined(SUPPORT_DISKLESS) && !defined(GRUB_UTIL)
++/* Write specified default entry number into stage2 file. */
+ static int
+-savedefault_func (char *arg, int flags)
++savedefault_helper(int new_default)
+ {
+-#if !defined(SUPPORT_DISKLESS) && !defined(GRUB_UTIL)
+-  unsigned long tmp_drive = saved_drive;
+-  unsigned long tmp_partition = saved_partition;
+-  char *default_file = (char *) DEFAULT_FILE_BUF;
+-  char buf[10];
+-  char sect[SECTOR_SIZE];
+-  int entryno;
+-  int sector_count = 0;
+-  int saved_sectors[2];
+-  int saved_offsets[2];
+-  int saved_lengths[2];
+-
+-  /* Save sector information about at most two sectors.  */
+-  auto void disk_read_savesect_func (int sector, int offset, int length);
+-  void disk_read_savesect_func (int sector, int offset, int length)
+-    {
+-      if (sector_count < 2)
+-      {
+-        saved_sectors[sector_count] = sector;
+-        saved_offsets[sector_count] = offset;
+-        saved_lengths[sector_count] = length;
+-      }
+-      sector_count++;
+-    }
+-  
+-  /* This command is only useful when you boot an entry from the menu
+-     interface.  */
+-  if (! (flags & BUILTIN_SCRIPT))
++  char buffer[512];
++  int *entryno_ptr;
++
++  /* Get the geometry of the boot drive (i.e. the disk which contains
++     this stage2).  */
++  if (get_diskinfo (boot_drive, &buf_geom))
+     {
+-      errnum = ERR_UNRECOGNIZED;
++      errnum = ERR_NO_DISK;
+       return 1;
+     }
+ 
+-  /* Determine a saved entry number.  */
+-  if (*arg)
++  /* Load the second sector of this stage2.  */
++  if (! rawread (boot_drive, install_second_sector, 0, SECTOR_SIZE, buffer))
+     {
+-      if (grub_memcmp (arg, "fallback", sizeof ("fallback") - 1) == 0)
+-      {
+-        int i;
+-        int index = 0;
+-        
+-        for (i = 0; i < MAX_FALLBACK_ENTRIES; i++)
+-          {
+-            if (fallback_entries[i] < 0)
+-              break;
+-            if (fallback_entries[i] == current_entryno)
+-              {
+-                index = i + 1;
+-                break;
+-              }
+-          }
+-        
+-        if (index >= MAX_FALLBACK_ENTRIES || fallback_entries[index] < 0)
+-          {
+-            /* This is the last.  */
+-            errnum = ERR_BAD_ARGUMENT;
+-            return 1;
+-          }
++      return 1;
++    }
+ 
+-        entryno = fallback_entries[index];
+-      }
+-      else if (! safe_parse_maxint (&arg, &entryno))
+-      return 1;
++  /* Sanity check.  */
++  if (buffer[STAGE2_STAGE2_ID] != STAGE2_ID_STAGE2
++      || *((short *) (buffer + STAGE2_VER_MAJ_OFFS)) != COMPAT_VERSION)
++    {
++      errnum = ERR_BAD_VERSION;
++      return 1;
+     }
+-  else
+-    entryno = current_entryno;
++  
++  entryno_ptr = (int *) (buffer + STAGE2_SAVED_ENTRYNO);
+ 
+-  /* Open the default file.  */
+-  saved_drive = boot_drive;
+-  saved_partition = install_partition;
+-  if (grub_open (default_file))
++  /* Check if the saved entry number differs from current entry number.  */
++  if (*entryno_ptr != new_default)
+     {
+-      int len;
++      /* Overwrite the saved entry number.  */
++      *entryno_ptr = new_default;
+       
+-      disk_read_hook = disk_read_savesect_func;
+-      len = grub_read (buf, sizeof (buf));
+-      disk_read_hook = 0;
+-      grub_close ();
++      /* Save the image in the disk.  */
++      if (! rawwrite (boot_drive, install_second_sector, buffer))
++      return 1;
+       
+-      if (len != sizeof (buf))
+-      {
+-        /* This is too small. Do not modify the file manually, please!  */
+-        errnum = ERR_READ;
+-        goto fail;
+-      }
++      /* Clear the cache.  */
++      buf_track = -1;
++    }
+ 
+-      if (sector_count > 2)
+-      {
+-        /* Is this possible?! Too fragmented!  */
+-        errnum = ERR_FSYS_CORRUPT;
+-        goto fail;
+-      }
+-      
+-      /* Set up a string to be written.  */
+-      grub_memset (buf, '\n', sizeof (buf));
+-      grub_sprintf (buf, "%d", entryno);
+-      
+-      if (saved_lengths[0] < sizeof (buf))
+-      {
+-        /* The file is anchored to another file and the first few bytes
+-           are spanned in two sectors. Uggh...  */
+-        if (! rawread (current_drive, saved_sectors[0], 0, SECTOR_SIZE,
+-                       sect))
+-          goto fail;
+-        grub_memmove (sect + saved_offsets[0], buf, saved_lengths[0]);
+-        if (! rawwrite (current_drive, saved_sectors[0], sect))
+-          goto fail;
++  return 0;
++}
++#endif
+ 
+-        if (! rawread (current_drive, saved_sectors[1], 0, SECTOR_SIZE,
+-                       sect))
+-          goto fail;
+-        grub_memmove (sect + saved_offsets[1],
+-                      buf + saved_lengths[0],
+-                      sizeof (buf) - saved_lengths[0]);
+-        if (! rawwrite (current_drive, saved_sectors[1], sect))
+-          goto fail;
+-      }
++#if !defined(SUPPORT_DISKLESS) && defined(GRUB_UTIL)
++/*
++ * Full implementation of new `savedefault' for GRUB shell.
++ * XXX This needs fixing for stage2 files which aren't accessible
++ *     through a mounted filesystem.
++ */
++static int
++savedefault_shell(char *arg, int flags)
++{
++  char *stage2_os_file = "/boot/grub/stage2"; /* Default filename */
++  FILE *fp;
++  char buffer[512];
++  int *entryno_ptr;
++  int new_default = 0;
++  int old_default = 0;
++
++  while (1)
++    {
++      if (grub_memcmp ("--stage2=", arg, sizeof ("--stage2=") - 1) == 0)
++        {
++          stage2_os_file = arg + sizeof ("--stage2=") - 1;
++          arg = skip_to (0, arg);
++          nul_terminate (stage2_os_file);
++        }
++      else if (grub_memcmp ("--default=", arg, sizeof ("--default=") - 1) == 0)
++        {
++          char *p = arg + sizeof ("--default=") - 1;
++          if (! safe_parse_maxint (&p, &new_default))
++            return 1;
++          arg = skip_to (0, arg);
++        }
++      else if (grub_memcmp ("--once", arg, sizeof ("--once") - 1) == 0)
++        {
++          new_default <<= 8;
++          new_default |= STAGE2_ONCEONLY_ENTRY;
++          arg = skip_to (0, arg);
++        }
+       else
+-      {
+-        /* This is a simple case. It fits into a single sector.  */
+-        if (! rawread (current_drive, saved_sectors[0], 0, SECTOR_SIZE,
+-                       sect))
+-          goto fail;
+-        grub_memmove (sect + saved_offsets[0], buf, sizeof (buf));
+-        if (! rawwrite (current_drive, saved_sectors[0], sect))
+-          goto fail;
+-      }
++        break;
++    }
+ 
+-      /* Clear the cache.  */
+-      buf_track = -1;
++  if (! (fp = fopen(stage2_os_file, "r+")))
++    {
++      errnum = ERR_FILE_NOT_FOUND;
++      return 1;
++    }
++  
++  if (fseek (fp, SECTOR_SIZE, SEEK_SET) != 0)
++    {
++      fclose (fp);
++      errnum = ERR_BAD_VERSION;
++      return 1;
++    }
++  
++  if (fread (buffer, 1, SECTOR_SIZE, fp) != SECTOR_SIZE)
++    {
++      fclose (fp);
++      errnum = ERR_READ;
++      return 1;
+     }
+ 
+- fail:
+-  saved_drive = tmp_drive;
+-  saved_partition = tmp_partition;
+-  return errnum;
++  /* Sanity check.  */
++  if (buffer[STAGE2_STAGE2_ID] != STAGE2_ID_STAGE2
++      || *((short *) (buffer + STAGE2_VER_MAJ_OFFS)) != COMPAT_VERSION)
++    {
++      errnum = ERR_BAD_VERSION;
++      return 1;
++    }
++  
++  entryno_ptr = (int *) (buffer + STAGE2_SAVED_ENTRYNO);
++  if (new_default & STAGE2_ONCEONLY_ENTRY)
++    {
++      old_default=*entryno_ptr;
++      *entryno_ptr = new_default + (old_default & 0xFF);
++    }
++  else
++    {
++      *entryno_ptr = new_default;
++    }
++
++  if (fseek (fp, SECTOR_SIZE, SEEK_SET) != 0)
++    {
++      fclose (fp);
++      errnum = ERR_BAD_VERSION;
++      return 1;
++    }
++  
++  if (fwrite (buffer, 1, SECTOR_SIZE, fp) != SECTOR_SIZE)
++    {
++      fclose (fp);
++      errnum = ERR_WRITE;
++      return 1;
++    }
++  
++  (void)fflush (fp);
++  fclose (fp);
++  return 0;
++}
++#endif
++
++/* savedefault */
++static int
++savedefault_func (char *arg, int flags)
++{
++#if !defined(SUPPORT_DISKLESS)
++#if !defined(GRUB_UTIL)
++  /* This command is only useful when you boot an entry from the menu
++     interface.  */
++  if (! (flags & BUILTIN_SCRIPT))
++    {
++      errnum = ERR_UNRECOGNIZED;
++      return 1;
++    }
++
++  return savedefault_helper(current_entryno);
++#else /* defined(GRUB_UTIL) */
++  return savedefault_shell(arg, flags);
++#endif
+ #else /* ! SUPPORT_DISKLESS && ! GRUB_UTIL */
+   errnum = ERR_UNRECOGNIZED;
+   return 1;
+@@ -3368,10 +3397,14 @@
+   "savedefault",
+   savedefault_func,
+   BUILTIN_CMDLINE,
+-  "savedefault [NUM | `fallback']",
+-  "Save the current entry as the default boot entry if no argument is"
+-  " specified. If a number is specified, this number is saved. If"
+-  " `fallback' is used, next fallback entry is saved."
++#ifdef GRUB_UTIL
++  "savedefault [--stage2=STAGE2_FILE] [--default=DEFAULT] [--once]",
++  "Save DEFAULT as the default boot entry in STAGE2_FILE. If '--once'"
++  " is specified, the default is reset after the next reboot."
++#else
++  "savedefault",
++  "Save the current entry as the default boot entry."
++#endif
+ };
+ 
+ \f
+@@ -4598,6 +4631,15 @@
+ static int
+ timeout_func (char *arg, int flags)
+ {
++  /* One-shot default shenanigans -- don't piss around with the menu! */
++  if (grub_timeout != -1)
++    return 0;
++  if ((saved_entryno & STAGE2_ONCEONLY_ENTRY) != 0)
++    {
++      grub_timeout = 0;
++      return 0;
++    }
++
+   if (! safe_parse_maxint (&arg, &grub_timeout))
+     return 1;
+ 
+--- grub-0.97/stage2/shared.h.bootonce 2005-12-12 18:23:13.000000000 -0500
++++ grub-0.97/stage2/shared.h  2005-12-12 18:23:13.000000000 -0500
+@@ -200,6 +200,8 @@
+ #define STAGE2_FORCE_LBA      0x11
+ #define STAGE2_VER_STR_OFFS   0x12
+ 
++#define STAGE2_ONCEONLY_ENTRY   0x10000
++
+ /* Stage 2 identifiers */
+ #define STAGE2_ID_STAGE2              0
+ #define STAGE2_ID_FFS_STAGE1_5                1
+--- grub-0.97/stage2/builtins.c.bootonce       2006-03-13 16:55:11.000000000 -0500
++++ grub-0.97/stage2/builtins.c        2006-03-13 16:56:01.000000000 -0500
+@@ -761,11 +761,25 @@
+ };
+ 
+ \f
++#if !defined(SUPPORT_DISKLESS) && !defined(GRUB_UTIL)
++static int savedefault_helper(int);
++#endif
+ /* default */
+ static int
+ default_func (char *arg, int flags)
+ {
+ #ifndef SUPPORT_DISKLESS
++#ifndef GRUB_UTIL
++  /* Has a forced once-only default been specified? */
++  if ((saved_entryno & STAGE2_ONCEONLY_ENTRY) != 0)
++    {
++      int old_defaults=saved_entryno & ~STAGE2_ONCEONLY_ENTRY;
++      grub_timeout = 0;
++      default_entry = old_defaults >> 8;
++      savedefault_helper(old_defaults & 0xff);
++      return 0;
++    }
++#endif
+   if (grub_strcmp (arg, "saved") == 0)
+     {
+       default_entry = saved_entryno;
+--- grub-0.97/stage2/stage2.c.bootonce 2006-03-13 17:27:40.000000000 -0500
++++ grub-0.97/stage2/stage2.c  2006-03-13 17:29:11.000000000 -0500
+@@ -960,38 +960,8 @@
+       if (use_config_file)
+ #endif /* GRUB_UTIL */
+       {
+-        char *default_file = (char *) DEFAULT_FILE_BUF;
+         int i;
+-        
+-        /* Get a saved default entry if possible.  */
+-        saved_entryno = 0;
+-        *default_file = 0;
+-        grub_strncat (default_file, config_file, DEFAULT_FILE_BUFLEN);
+-        for (i = grub_strlen(default_file); i >= 0; i--)
+-          if (default_file[i] == '/')
+-            {
+-              i++;
+-              break;
+-            }
+-        default_file[i] = 0;
+-        grub_strncat (default_file + i, "default", DEFAULT_FILE_BUFLEN - i);
+-        if (grub_open (default_file))
+-          {
+-            char buf[10]; /* This is good enough.  */
+-            char *p = buf;
+-            int len;
+-            
+-            len = grub_read (buf, sizeof (buf));
+-            if (len > 0)
+-              {
+-                buf[sizeof (buf) - 1] = 0;
+-                safe_parse_maxint (&p, &saved_entryno);
+-              }
+ 
+-            grub_close ();
+-          }
+-        errnum = ERR_NONE;
+-        
+         do
+           {
+             /* STATE 0:  Before any title command.
+--- grub-0.97/util/grub-install.in.bootonce    2006-03-13 17:39:35.000000000 -0500
++++ grub-0.97/util/grub-install.in     2006-03-13 17:39:50.000000000 -0500
+@@ -30,7 +30,6 @@
+ pkglibdir=${libdir}/${PACKAGE}/${host_cpu}-${host_vendor}
+ 
+ grub_shell=${sbindir}/grub
+-grub_set_default=${sbindir}/grub-set-default
+ log_file=/tmp/grub-install.log.$$
+ img_file=/tmp/grub-install.img.$$
+ rootdir=
+@@ -432,9 +431,6 @@
+     exit 1
+ fi
+ 
+-# Make a default file.
+-${grub_set_default} --root-directory=${rootdir} default
+-
+ # Make sure that GRUB reads the same images as the host OS.
+ test -n "$mkimg" && img_file=`$mkimg`
+ test -n "$mklog" && log_file=`$mklog`
+--- grub-0.97/configure.bootonce       2006-03-13 17:49:05.000000000 -0500
++++ grub-0.97/configure        2006-03-13 17:49:16.000000000 -0500
+@@ -6135,7 +6135,7 @@
+ 
+ 
+ 
+-                                                                                                                                  ac_config_files="$ac_config_files Makefile stage1/Makefile stage2/Makefile docs/Makefile lib/Makefile util/Makefile grub/Makefile netboot/Makefile util/grub-image util/grub-install util/grub-md5-crypt util/grub-terminfo util/grub-set-default"
++                                                                                                                                  ac_config_files="$ac_config_files Makefile stage1/Makefile stage2/Makefile docs/Makefile lib/Makefile util/Makefile grub/Makefile netboot/Makefile util/grub-image util/grub-install util/grub-md5-crypt util/grub-terminfo"
+ 
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+@@ -6754,7 +6754,6 @@
+   "util/grub-install" ) CONFIG_FILES="$CONFIG_FILES util/grub-install" ;;
+   "util/grub-md5-crypt" ) CONFIG_FILES="$CONFIG_FILES util/grub-md5-crypt" ;;
+   "util/grub-terminfo" ) CONFIG_FILES="$CONFIG_FILES util/grub-terminfo" ;;
+-  "util/grub-set-default" ) CONFIG_FILES="$CONFIG_FILES util/grub-set-default" ;;
+   "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+   "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+--- grub-0.97/configure.ac.bootonce    2006-03-13 17:47:24.000000000 -0500
++++ grub-0.97/configure.ac     2006-03-13 17:47:37.000000000 -0500
+@@ -666,5 +666,5 @@
+                docs/Makefile lib/Makefile util/Makefile \
+                grub/Makefile netboot/Makefile util/grub-image \
+                util/grub-install util/grub-md5-crypt \
+-               util/grub-terminfo util/grub-set-default])
++               util/grub-terminfo])
+ AC_OUTPUT
+--- grub-0.97/util/Makefile.am.bootonce        2006-03-13 17:48:39.000000000 -0500
++++ grub-0.97/util/Makefile.am 2006-03-13 17:48:45.000000000 -0500
+@@ -1,6 +1,5 @@
+ bin_PROGRAMS = mbchk
+-sbin_SCRIPTS = grub-install grub-md5-crypt grub-terminfo \
+-      grub-set-default
++sbin_SCRIPTS = grub-install grub-md5-crypt grub-terminfo
+ noinst_SCRIPTS = grub-image mkbimage
+ 
+ EXTRA_DIST = mkbimage
+--- grub-0.97/util/Makefile.in.bootonce        2006-03-13 17:47:56.000000000 -0500
++++ grub-0.97/util/Makefile.in 2006-03-13 17:48:34.000000000 -0500
+@@ -43,8 +43,7 @@
+ subdir = util
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+       $(srcdir)/grub-image.in $(srcdir)/grub-install.in \
+-      $(srcdir)/grub-md5-crypt.in $(srcdir)/grub-set-default.in \
+-      $(srcdir)/grub-terminfo.in
++      $(srcdir)/grub-md5-crypt.in $(srcdir)/grub-terminfo.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+       $(top_srcdir)/configure.ac
+@@ -52,8 +51,7 @@
+       $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES = grub-image grub-install grub-md5-crypt \
+-      grub-terminfo grub-set-default
++CONFIG_CLEAN_FILES = grub-image grub-install grub-md5-crypt grub-terminfo 
+ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)"
+ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ PROGRAMS = $(bin_PROGRAMS)
+@@ -183,8 +181,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-sbin_SCRIPTS = grub-install grub-md5-crypt grub-terminfo \
+-      grub-set-default
++sbin_SCRIPTS = grub-install grub-md5-crypt grub-terminfo
+ 
+ noinst_SCRIPTS = grub-image mkbimage
+ EXTRA_DIST = mkbimage
+@@ -234,8 +231,6 @@
+       cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ grub-terminfo: $(top_builddir)/config.status $(srcdir)/grub-terminfo.in
+       cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+-grub-set-default: $(top_builddir)/config.status $(srcdir)/grub-set-default.in
+-      cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ install-binPROGRAMS: $(bin_PROGRAMS)
+       @$(NORMAL_INSTALL)
+       test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"

diff --git a/src/patches/grub-0.97-prototypes.patch b/src/patches/grub-0.97-prototypes.patch
new file mode 100644 (file)
index 0000000..21d65d5
--- /dev/null
+++ b/src/patches/grub-0.97-prototypes.patch
@@ -0,0 +1,11 @@
+--- grub-0.97/acinclude.m4.prototypes  2005-12-12 19:07:24.000000000 -0500
++++ grub-0.97/acinclude.m4     2005-12-12 19:07:56.000000000 -0500
+@@ -44,6 +44,8 @@
+ [AC_MSG_CHECKING([whether ${OBJCOPY} works for absolute addresses])
+ AC_CACHE_VAL(grub_cv_prog_objcopy_absolute,
+ [cat > conftest.c <<\EOF
++void cmain(void);
++
+ void
+ cmain (void)
+ {

diff --git a/src/patches/grub-0.97-stderr.patch b/src/patches/grub-0.97-stderr.patch
new file mode 100644 (file)
index 0000000..71d20ad
--- /dev/null
+++ b/src/patches/grub-0.97-stderr.patch
@@ -0,0 +1,102 @@
+--- grub-0.97/util/grub-install.in.stderr      2006-07-07 10:56:37.000000000 -0400
++++ grub-0.97/util/grub-install.in     2006-07-07 11:01:35.000000000 -0400
+@@ -207,7 +207,7 @@
+       while test -L $tmp_fname; do
+               tmp_new_fname=`ls -al $tmp_fname | sed -n 's%.*-> \(.*\)%\1%p'`
+               if test -z "$tmp_new_fname"; then
+-                      echo "Unrecognized ls output" 2>&1
++                      echo "Unrecognized ls output" 1>&2
+                       exit 1
+               fi
+ 
+@@ -264,7 +264,7 @@
+ stat_device() {
+     majmin=`stat -c "%t:%T" "$1" 2>/dev/null`
+     if test -z "$majmin"; then
+-      echo "Could not find device for $1" 2>&1
++      echo "Could not find device for $1" 1>&2
+       exit 1
+     fi
+ 
+@@ -281,7 +281,7 @@
+       dev=`awk '($2 ~ /'$mntpnt'/) { print $1 }' /etc/mtab`
+     fi
+     if test -z "$dev"; then
+-      echo "Could not find device for $1" 2>&1
++      echo "Could not find device for $1" 1>&2
+       exit 1
+     fi
+       
+@@ -304,11 +304,11 @@
+     tmp_fname=`df $1/ | sed -n 's%.*\(/dev/[^         ]*\).*%\1%p'`
+ 
+     if test -z "$tmp_fname"; then
+-      echo "Could not find device for $1" 2>&1
++      echo "Could not find device for $1" 1>&2
+       exit 1
+     fi
+ 
+-    ret_fname=`resolve_symlink $tmp_fname`
++    ret_fname=`resolve_symlink $tmp_fname` || exit 1
+     tmp_fname=`find_mapper_device $ret_fname`
+     if test -n "$tmp_fname"; then
+       ret_fname="$tmp_fname"
+@@ -325,7 +325,7 @@
+     done
+     for file in \
+       ${pkgdatadir}/stage1 ${pkgdatadir}/stage2 ${pkgdatadir}/*stage1_5; do
+-      cp -f $file ${grubdir} || exit 1
++      cp -f $file ${grubdir} 1>&2 || exit 1
+     done
+ }
+ 
+@@ -520,9 +520,9 @@
+ # Check for INSTALL_DEVICE.
+ case "$install_device" in
+ /dev/*)
+-    install_device=`resolve_symlink "$install_device"`
++    install_device=`resolve_symlink "$install_device"` || exit 1
+     for install_drive in `find_real_devs $install_device` ; do
+-      install_drive=`convert $install_drive`
++      install_drive=`convert $install_drive` || exit 1
+       if is_raid1_device $install_device; then
+               install_drive=`echo $install_drive | sed 's/,[0-9]*)/)/'`
+       fi
+@@ -550,8 +550,8 @@
+ unset install_device
+ 
+ # Get the root drive.
+-root_device=`find_device ${rootdir}`
+-bootdir_device=`find_device ${bootdir}`
++root_device=`find_device ${rootdir}` || exit 1
++bootdir_device=`find_device ${bootdir}` || exit 1
+ 
+ # Check if the boot directory is in the same device as the root directory.
+ if test "x$root_device" != "x$bootdir_device"; then
+@@ -561,7 +561,7 @@
+ fi
+ 
+ # Check if the root directory exists in the same device as the grub directory.
+-grubdir_device=`find_device ${grubdir}`
++grubdir_device=`find_device ${grubdir}` || exit 1
+ 
+ if test "x$grubdir_device" != "x$root_device"; then
+     # For now, cannot deal with this situation.
+@@ -582,7 +582,7 @@
+ fi
+ 
+ # Convert the root deviceto a GRUB drive.
+-root_drive=`convert "$root_device"`
++root_drive=`convert "$root_device"` || exit 1
+ if [ "x$root_drive" = x ]; then
+     exit 1
+ fi
+@@ -618,7 +618,7 @@
+ 
+ for install_drive in $install_drives; do 
+     # Convert the root deviceto a GRUB drive.
+-    root_drive=`convert "$root_device"`
++    root_drive=`convert "$root_device"` || exit 1
+     if [ "x$root_drive" = x ]; then
+       exit 1
+     fi

diff --git a/src/patches/iptables-1.4.6-errorno_includes.patch b/src/patches/iptables-1.4.6-errorno_includes.patch
new file mode 100644 (file)
index 0000000..a25c5a3
--- /dev/null
+++ b/src/patches/iptables-1.4.6-errorno_includes.patch
@@ -0,0 +1,170 @@
+diff -Naur include.org/asm/errno.h include/asm/errno.h
+--- include.org/asm/errno.h    2010-02-12 18:21:40.000000000 +0100
++++ include/asm/errno.h        2010-02-12 18:19:41.000000000 +0100
+@@ -5,4 +5,8 @@
+  #include <linux/errno.h>
+ #endif
+ 
++#ifndef _ASM_GENERIC_ERRNO_H
++ #include <asm-generic/errno.h>
++#endif
++
+ #endif
+diff -Naur include.org/asm-generic/errno-base.h include/asm-generic/errno-base.h
+--- include.org/asm-generic/errno-base.h       1970-01-01 01:00:00.000000000 +0100
++++ include/asm-generic/errno-base.h   2010-02-09 13:57:19.000000000 +0100
+@@ -0,0 +1,39 @@
++#ifndef _ASM_GENERIC_ERRNO_BASE_H
++#define _ASM_GENERIC_ERRNO_BASE_H
++
++#define       EPERM            1      /* Operation not permitted */
++#define       ENOENT           2      /* No such file or directory */
++#define       ESRCH            3      /* No such process */
++#define       EINTR            4      /* Interrupted system call */
++#define       EIO              5      /* I/O error */
++#define       ENXIO            6      /* No such device or address */
++#define       E2BIG            7      /* Argument list too long */
++#define       ENOEXEC          8      /* Exec format error */
++#define       EBADF            9      /* Bad file number */
++#define       ECHILD          10      /* No child processes */
++#define       EAGAIN          11      /* Try again */
++#define       ENOMEM          12      /* Out of memory */
++#define       EACCES          13      /* Permission denied */
++#define       EFAULT          14      /* Bad address */
++#define       ENOTBLK         15      /* Block device required */
++#define       EBUSY           16      /* Device or resource busy */
++#define       EEXIST          17      /* File exists */
++#define       EXDEV           18      /* Cross-device link */
++#define       ENODEV          19      /* No such device */
++#define       ENOTDIR         20      /* Not a directory */
++#define       EISDIR          21      /* Is a directory */
++#define       EINVAL          22      /* Invalid argument */
++#define       ENFILE          23      /* File table overflow */
++#define       EMFILE          24      /* Too many open files */
++#define       ENOTTY          25      /* Not a typewriter */
++#define       ETXTBSY         26      /* Text file busy */
++#define       EFBIG           27      /* File too large */
++#define       ENOSPC          28      /* No space left on device */
++#define       ESPIPE          29      /* Illegal seek */
++#define       EROFS           30      /* Read-only file system */
++#define       EMLINK          31      /* Too many links */
++#define       EPIPE           32      /* Broken pipe */
++#define       EDOM            33      /* Math argument out of domain of func */
++#define       ERANGE          34      /* Math result not representable */
++
++#endif
+diff -Naur include.org/asm-generic/errno.h include/asm-generic/errno.h
+--- include.org/asm-generic/errno.h    1970-01-01 01:00:00.000000000 +0100
++++ include/asm-generic/errno.h        2010-02-09 13:57:19.000000000 +0100
+@@ -0,0 +1,111 @@
++#ifndef _ASM_GENERIC_ERRNO_H
++#define _ASM_GENERIC_ERRNO_H
++
++#include <asm-generic/errno-base.h>
++
++#define       EDEADLK         35      /* Resource deadlock would occur */
++#define       ENAMETOOLONG    36      /* File name too long */
++#define       ENOLCK          37      /* No record locks available */
++#define       ENOSYS          38      /* Function not implemented */
++#define       ENOTEMPTY       39      /* Directory not empty */
++#define       ELOOP           40      /* Too many symbolic links encountered */
++#define       EWOULDBLOCK     EAGAIN  /* Operation would block */
++#define       ENOMSG          42      /* No message of desired type */
++#define       EIDRM           43      /* Identifier removed */
++#define       ECHRNG          44      /* Channel number out of range */
++#define       EL2NSYNC        45      /* Level 2 not synchronized */
++#define       EL3HLT          46      /* Level 3 halted */
++#define       EL3RST          47      /* Level 3 reset */
++#define       ELNRNG          48      /* Link number out of range */
++#define       EUNATCH         49      /* Protocol driver not attached */
++#define       ENOCSI          50      /* No CSI structure available */
++#define       EL2HLT          51      /* Level 2 halted */
++#define       EBADE           52      /* Invalid exchange */
++#define       EBADR           53      /* Invalid request descriptor */
++#define       EXFULL          54      /* Exchange full */
++#define       ENOANO          55      /* No anode */
++#define       EBADRQC         56      /* Invalid request code */
++#define       EBADSLT         57      /* Invalid slot */
++
++#define       EDEADLOCK       EDEADLK
++
++#define       EBFONT          59      /* Bad font file format */
++#define       ENOSTR          60      /* Device not a stream */
++#define       ENODATA         61      /* No data available */
++#define       ETIME           62      /* Timer expired */
++#define       ENOSR           63      /* Out of streams resources */
++#define       ENONET          64      /* Machine is not on the network */
++#define       ENOPKG          65      /* Package not installed */
++#define       EREMOTE         66      /* Object is remote */
++#define       ENOLINK         67      /* Link has been severed */
++#define       EADV            68      /* Advertise error */
++#define       ESRMNT          69      /* Srmount error */
++#define       ECOMM           70      /* Communication error on send */
++#define       EPROTO          71      /* Protocol error */
++#define       EMULTIHOP       72      /* Multihop attempted */
++#define       EDOTDOT         73      /* RFS specific error */
++#define       EBADMSG         74      /* Not a data message */
++#define       EOVERFLOW       75      /* Value too large for defined data type */
++#define       ENOTUNIQ        76      /* Name not unique on network */
++#define       EBADFD          77      /* File descriptor in bad state */
++#define       EREMCHG         78      /* Remote address changed */
++#define       ELIBACC         79      /* Can not access a needed shared library */
++#define       ELIBBAD         80      /* Accessing a corrupted shared library */
++#define       ELIBSCN         81      /* .lib section in a.out corrupted */
++#define       ELIBMAX         82      /* Attempting to link in too many shared libraries */
++#define       ELIBEXEC        83      /* Cannot exec a shared library directly */
++#define       EILSEQ          84      /* Illegal byte sequence */
++#define       ERESTART        85      /* Interrupted system call should be restarted */
++#define       ESTRPIPE        86      /* Streams pipe error */
++#define       EUSERS          87      /* Too many users */
++#define       ENOTSOCK        88      /* Socket operation on non-socket */
++#define       EDESTADDRREQ    89      /* Destination address required */
++#define       EMSGSIZE        90      /* Message too long */
++#define       EPROTOTYPE      91      /* Protocol wrong type for socket */
++#define       ENOPROTOOPT     92      /* Protocol not available */
++#define       EPROTONOSUPPORT 93      /* Protocol not supported */
++#define       ESOCKTNOSUPPORT 94      /* Socket type not supported */
++#define       EOPNOTSUPP      95      /* Operation not supported on transport endpoint */
++#define       EPFNOSUPPORT    96      /* Protocol family not supported */
++#define       EAFNOSUPPORT    97      /* Address family not supported by protocol */
++#define       EADDRINUSE      98      /* Address already in use */
++#define       EADDRNOTAVAIL   99      /* Cannot assign requested address */
++#define       ENETDOWN        100     /* Network is down */
++#define       ENETUNREACH     101     /* Network is unreachable */
++#define       ENETRESET       102     /* Network dropped connection because of reset */
++#define       ECONNABORTED    103     /* Software caused connection abort */
++#define       ECONNRESET      104     /* Connection reset by peer */
++#define       ENOBUFS         105     /* No buffer space available */
++#define       EISCONN         106     /* Transport endpoint is already connected */
++#define       ENOTCONN        107     /* Transport endpoint is not connected */
++#define       ESHUTDOWN       108     /* Cannot send after transport endpoint shutdown */
++#define       ETOOMANYREFS    109     /* Too many references: cannot splice */
++#define       ETIMEDOUT       110     /* Connection timed out */
++#define       ECONNREFUSED    111     /* Connection refused */
++#define       EHOSTDOWN       112     /* Host is down */
++#define       EHOSTUNREACH    113     /* No route to host */
++#define       EALREADY        114     /* Operation already in progress */
++#define       EINPROGRESS     115     /* Operation now in progress */
++#define       ESTALE          116     /* Stale NFS file handle */
++#define       EUCLEAN         117     /* Structure needs cleaning */
++#define       ENOTNAM         118     /* Not a XENIX named type file */
++#define       ENAVAIL         119     /* No XENIX semaphores available */
++#define       EISNAM          120     /* Is a named type file */
++#define       EREMOTEIO       121     /* Remote I/O error */
++#define       EDQUOT          122     /* Quota exceeded */
++
++#define       ENOMEDIUM       123     /* No medium found */
++#define       EMEDIUMTYPE     124     /* Wrong medium type */
++#define       ECANCELED       125     /* Operation Canceled */
++#define       ENOKEY          126     /* Required key not available */
++#define       EKEYEXPIRED     127     /* Key has expired */
++#define       EKEYREVOKED     128     /* Key has been revoked */
++#define       EKEYREJECTED    129     /* Key was rejected by service */
++
++/* for robust mutexes */
++#define       EOWNERDEAD      130     /* Owner died */
++#define       ENOTRECOVERABLE 131     /* State not recoverable */
++
++#define ERFKILL               132     /* Operation not possible due to RF-kill */
++
++#endif

diff --git a/src/patches/iptables-1.4.6-imq_test1.patch b/src/patches/iptables-1.4.6-imq_test1.patch
new file mode 100644 (file)
index 0000000..2b4fb79
--- /dev/null
+++ b/src/patches/iptables-1.4.6-imq_test1.patch
@@ -0,0 +1,126 @@
+diff -Naurw iptables-1.4.1/extensions/.IMQ-testx iptables-1.4.1.imq/extensions/.IMQ-testx
+--- iptables-1.4.1/extensions/.IMQ-testx       1969-12-31 21:00:00.000000000 -0300
++++ iptables-1.4.1.imq/extensions/.IMQ-testx   2008-06-24 22:20:06.000000000 -0300
+@@ -0,0 +1,3 @@
++#!/bin/sh
++# True if IMQ target patch is applied.
++[ -f $KERNEL_DIR/include/linux/netfilter/xt_IMQ.h ] && echo IMQ
+diff -Naurw iptables-1.4.1/extensions/libxt_IMQ.c iptables-1.4.1.imq/extensions/libxt_IMQ.c
+--- iptables-1.4.1/extensions/libxt_IMQ.c      1969-12-31 21:00:00.000000000 -0300
++++ iptables-1.4.1.imq/extensions/libxt_IMQ.c  2008-06-24 22:31:02.000000000 -0300
+@@ -0,0 +1,103 @@
++/* Shared library add-on to iptables to add IMQ target support. */
++#include <stdio.h>
++#include <string.h>
++#include <stdlib.h>
++#include <getopt.h>
++
++#include <xtables.h>
++#include <linux/netfilter/x_tables.h>
++#include <linux/netfilter/xt_IMQ.h>
++
++/* Function which prints out usage message. */
++static void IMQ_help(void)
++{
++      printf(
++"IMQ target options:\n"
++"  --todev <N>                enqueue to imq<N>, defaults to 0\n");
++
++}
++
++static struct option IMQ_opts[] = {
++      { "todev", 1, 0, '1' },
++      { 0 }
++};
++
++/* Initialize the target. */
++static void IMQ_init(struct xt_entry_target *t)
++{
++      struct xt_imq_info *mr = (struct xt_imq_info*)t->data;
++
++      mr->todev = 0;
++}
++
++/* Function which parses command options; returns true if it
++   ate an option */
++static int IMQ_parse(int c, char **argv, int invert, unsigned int *flags,
++      const void *entry, struct xt_entry_target **target)
++{
++      struct xt_imq_info *mr = (struct xt_imq_info*)(*target)->data;
++      
++      switch(c) {
++      case '1':
++              if (xtables_check_inverse(optarg, &invert, NULL, 0, argv))
++                      xtables_error(PARAMETER_PROBLEM,
++                                 "Unexpected `!' for --todev");
++              mr->todev=atoi(optarg);
++              break;
++      default:
++              return 0;
++      }
++      return 1;
++}
++
++/* Prints out the targinfo. */
++static void IMQ_print(const void *ip,
++      const struct xt_entry_target *target,
++      int numeric)
++{
++      struct xt_imq_info *mr = (struct xt_imq_info*)target->data;
++
++      printf("IMQ: todev %u ", mr->todev);
++}
++
++/* Saves the union ipt_targinfo in parsable form to stdout. */
++static void IMQ_save(const void *ip, const struct xt_entry_target *target)
++{
++      struct xt_imq_info *mr = (struct xt_imq_info*)target->data;
++
++      printf("--todev %u", mr->todev);
++}
++
++static struct xtables_target imq_target = {
++      .name           = "IMQ",
++      .version        = XTABLES_VERSION,
++      .family         = NFPROTO_IPV4,
++      .size           = XT_ALIGN(sizeof(struct xt_imq_info)),
++      .userspacesize  = XT_ALIGN(sizeof(struct xt_imq_info)),
++      .help           = IMQ_help,
++      .init           = IMQ_init,
++      .parse          = IMQ_parse,
++      .print          = IMQ_print,
++      .save           = IMQ_save,
++      .extra_opts     = IMQ_opts,
++};
++
++static struct xtables_target imq_target6 = {
++      .name           = "IMQ",
++      .version        = XTABLES_VERSION,
++      .family         = NFPROTO_IPV6,
++      .size           = XT_ALIGN(sizeof(struct xt_imq_info)),
++      .userspacesize  = XT_ALIGN(sizeof(struct xt_imq_info)),
++      .help           = IMQ_help,
++      .init           = IMQ_init,
++      .parse          = IMQ_parse,
++      .print          = IMQ_print,
++      .save           = IMQ_save,
++      .extra_opts     = IMQ_opts,
++};
++
++// void __attribute((constructor)) nf_ext_init(void){
++void _init(void){
++      xtables_register_target(&imq_target);
++      xtables_register_target(&imq_target6);
++}
+--- iptables-1.4.1.1/include/linux/netfilter/xt_IMQ.h  1970-01-01 02:00:00.000000000 +0200
++++ iptables-1.4.1.1.new/include/linux/netfilter/xt_IMQ.h      2008-08-05 00:41:28.000000000 +0300
+@@ -0,0 +1,9 @@
++#ifndef _XT_IMQ_H
++#define _XT_IMQ_H
++
++struct xt_imq_info {
++      unsigned int todev;     /* target imq device */
++};
++
++#endif /* _XT_IMQ_H */
++

diff --git a/src/patches/iptables-1.4.6-ipp2p-0.8.2-pomng.patch b/src/patches/iptables-1.4.6-ipp2p-0.8.2-pomng.patch
new file mode 100644 (file)
index 0000000..5f9c307
--- /dev/null
+++ b/src/patches/iptables-1.4.6-ipp2p-0.8.2-pomng.patch
@@ -0,0 +1,481 @@
+diff -Naur iptables-1.4.6.org/extensions/.ipp2p-test iptables-1.4.6/extensions/.ipp2p-test
+--- iptables-1.4.6.org/extensions/.ipp2p-test  1970-01-01 01:00:00.000000000 +0100
++++ iptables-1.4.6/extensions/.ipp2p-test      2010-02-13 20:02:52.000000000 +0100
+@@ -0,0 +1,2 @@
++#! /bin/sh
++[ -f $KERNEL_DIR/include/linux/netfilter_ipv4/ipt_ipp2p.h ] && echo ipp2p
+diff -Naur iptables-1.4.6.org/extensions/libipt_ipp2p.c iptables-1.4.6/extensions/libipt_ipp2p.c
+--- iptables-1.4.6.org/extensions/libipt_ipp2p.c       1970-01-01 01:00:00.000000000 +0100
++++ iptables-1.4.6/extensions/libipt_ipp2p.c   2010-02-13 20:02:52.000000000 +0100
+@@ -0,0 +1,424 @@
++#include <stdio.h>
++#include <netdb.h>
++#include <string.h>
++#include <stdlib.h>
++#include <getopt.h>
++#include <ctype.h>
++
++#include <iptables.h>
++
++#include <linux/netfilter_ipv4/ipt_ipp2p.h>
++
++#ifndef XTABLES_VERSION
++#define XTABLES_VERSION IPTABLES_VERSION
++#endif
++
++#ifdef IPT_LIB_DIR
++#define xtables_target iptables_target
++#define xtables_register_target register_target
++#endif
++
++static void
++help(void)
++{
++    printf(
++    "IPP2P v%s options:\n"
++    " --ipp2p Grab all known p2p packets\n"
++    " --edk           [TCP&UDP]       All known eDonkey/eMule/Overnet packets\n"
++    " --dc            [TCP]           All known Direct Connect packets\n"
++    " --kazaa [TCP&UDP]       All known KaZaA packets\n"
++    " --gnu           [TCP&UDP]       All known Gnutella packets\n"
++    " --bit           [TCP&UDP]       All known BitTorrent packets\n"
++    " --apple [TCP]           All known AppleJuice packets\n"
++    " --winmx [TCP]           All known WinMX\n"
++    " --soul          [TCP]           All known SoulSeek\n"
++    " --ares          [TCP]           All known Ares\n\n"
++    " EXPERIMENTAL protocols (please send feedback to: ipp2p@ipp2p.org) :\n"
++    " --mute          [TCP]           All known Mute packets\n"
++    " --waste [TCP]           All known Waste packets\n"
++    " --xdcc          [TCP]           All known XDCC packets (only xdcc login)\n\n"
++    " DEBUG SUPPPORT, use only if you know why\n"
++    " --debug         Generate kernel debug output, THIS WILL SLOW DOWN THE FILTER\n"
++    "\nNote that the follwing options will have the same meaning:\n"
++    " '--ipp2p' is equal to '--edk --dc --kazaa --gnu --bit --apple --winmx --soul --ares'\n"
++    "\nIPP2P was intended for TCP only. Due to increasing usage of UDP we needed to change this.\n"
++    "You can now use -p udp to search UDP packets only or without -p switch to search UDP and TCP packets.\n"
++    "\nSee README included with this package for more details or visit http://www.ipp2p.org\n"
++    "\nExamples:\n"
++    " iptables -A FORWARD -m ipp2p --ipp2p -j MARK --set-mark 0x01\n"
++    " iptables -A FORWARD -p udp -m ipp2p --kazaa --bit -j DROP\n"
++    " iptables -A FORWARD -p tcp -m ipp2p --edk --soul -j DROP\n\n"
++    , IPP2P_VERSION);
++}
++
++static struct option opts[] = {
++        { "ipp2p", 0, 0, '1' },
++        { "edk", 0, 0, '2' }, 
++      { "dc", 0, 0, '7' },
++      { "gnu", 0, 0, '9' },
++      { "kazaa", 0, 0, 'a' },
++      { "bit", 0, 0, 'b' },
++      { "apple", 0, 0, 'c' }, 
++      { "soul", 0, 0, 'd' },  
++      { "winmx", 0, 0, 'e' }, 
++      { "ares", 0, 0, 'f' },
++      { "mute", 0, 0, 'g' },
++      { "waste", 0, 0, 'h' },
++      { "xdcc", 0, 0, 'i' },
++      { "debug", 0, 0, 'j' },
++        {0}
++};
++
++
++static void
++#ifdef _XTABLES_H
++init(struct xt_entry_match *m)
++#else
++init(struct ipt_entry_match *t, unsigned int *nfcache)
++#endif
++{
++    struct ipt_p2p_info *info = (struct ipt_p2p_info *)m->data;
++
++#ifndef _XTABLES_H
++    *nfcache |= NFC_UNKNOWN;
++#endif
++
++    /*init the module with default values*/
++    info->cmd = 0;
++    info->debug = 0;
++
++}
++
++
++static int
++parse(int c, char **argv, int invert, unsigned int *flags,
++#ifdef _XTABLES_H
++      const void *entry, struct xt_entry_match **match)
++#else
++      const struct ipt_entry *entry, unsigned int *nfcache, struct ipt_entry_match **match)
++#endif
++{
++    struct ipt_p2p_info *info = (struct ipt_p2p_info *)(*match)->data;
++    
++    switch (c) {
++      case '1':               /*cmd: ipp2p*/
++          if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
++                  exit_error(PARAMETER_PROBLEM,
++                              "ipp2p: `--ipp2p' may only be "
++                              "specified once!");
++
++/*        if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA)
++                  exit_error(PARAMETER_PROBLEM,
++                              "ipp2p: `--ipp2p-data' may only be "
++                              "specified alone!");
++*/
++
++          if ((*flags) != 0)
++                  exit_error(PARAMETER_PROBLEM,
++                              "ipp2p: `--ipp2p' may only be "
++                              "specified alone!");
++          if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
++          *flags += SHORT_HAND_IPP2P;
++          info->cmd = *flags;
++          break;
++          
++      case '2':               /*cmd: edk*/
++          if ((*flags & IPP2P_EDK) == IPP2P_EDK)
++                  exit_error(PARAMETER_PROBLEM,
++                              "ipp2p: `--edk' may only be "
++                              "specified once");
++          if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
++                  exit_error(PARAMETER_PROBLEM,
++                              "ipp2p: `--ipp2p' may only be "
++                              "specified alone!");
++/*        if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA)
++                  exit_error(PARAMETER_PROBLEM,
++                              "ipp2p: `--ipp2p-data' may only be "
++                              "specified alone!");*/
++            if ((*flags & IPP2P_DATA_EDK) == IPP2P_DATA_EDK)
++            exit_error(PARAMETER_PROBLEM,
++                                "ipp2p: use `--edk' OR `--edk-data' but not both of them!");
++          if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
++          *flags += IPP2P_EDK;
++          info->cmd = *flags;     
++          break;
++
++
++      case '7':               /*cmd: dc*/
++            if ((*flags & IPP2P_DC) == IPP2P_DC)
++            exit_error(PARAMETER_PROBLEM,
++                                "ipp2p: `--dc' may only be "
++                                "specified once!");
++          if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
++                  exit_error(PARAMETER_PROBLEM,
++                              "ipp2p: `--ipp2p' may only be "
++                              "specified alone!");
++/*        if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA)
++                  exit_error(PARAMETER_PROBLEM,
++                              "ipp2p: `--ipp2p-data' may only be "
++                              "specified alone!");*/
++            if ((*flags & IPP2P_DATA_DC) == IPP2P_DATA_DC)
++            exit_error(PARAMETER_PROBLEM,
++                                "ipp2p: use `--dc' OR `--dc-data' but not both of them!");
++          if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
++            *flags += IPP2P_DC;
++          info->cmd = *flags;
++          break;
++
++
++      case '9':               /*cmd: gnu*/
++            if ((*flags & IPP2P_GNU) == IPP2P_GNU)
++            exit_error(PARAMETER_PROBLEM,
++                                "ipp2p: `--gnu' may only be "
++                                "specified once!");
++/*        if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA)
++                  exit_error(PARAMETER_PROBLEM,
++                              "ipp2p: `--ipp2p-data' may only be "
++                              "specified alone!");*/
++          if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
++                  exit_error(PARAMETER_PROBLEM,
++                              "ipp2p: `--ipp2p' may only be "
++                              "specified alone!");
++            if ((*flags & IPP2P_DATA_GNU) == IPP2P_DATA_GNU)
++            exit_error(PARAMETER_PROBLEM,
++                                "ipp2p: use `--gnu' OR `--gnu-data' but not both of them!");
++          if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
++            *flags += IPP2P_GNU;
++          info->cmd = *flags;
++          break;
++
++      case 'a':               /*cmd: kazaa*/
++            if ((*flags & IPP2P_KAZAA) == IPP2P_KAZAA)
++            exit_error(PARAMETER_PROBLEM,
++                                "ipp2p: `--kazaa' may only be "
++                                "specified once!");
++/*        if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA)
++                  exit_error(PARAMETER_PROBLEM,
++                              "ipp2p: `--ipp2p-data' may only be "
++                              "specified alone!");*/
++          if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
++                  exit_error(PARAMETER_PROBLEM,
++                              "ipp2p: `--ipp2p' may only be "
++                              "specified alone!");
++            if ((*flags & IPP2P_DATA_KAZAA) == IPP2P_DATA_KAZAA)
++            exit_error(PARAMETER_PROBLEM,
++                                "ipp2p: use `--kazaa' OR `--kazaa-data' but not both of them!");
++          if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
++            *flags += IPP2P_KAZAA;
++          info->cmd = *flags;
++          break;                                                                                                                                                                                                                      
++
++      case 'b':               /*cmd: bit*/
++            if ((*flags & IPP2P_BIT) == IPP2P_BIT)
++            exit_error(PARAMETER_PROBLEM,
++                                "ipp2p: `--bit' may only be "
++                                "specified once!");
++          if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
++                  exit_error(PARAMETER_PROBLEM,
++                              "ipp2p: `--ipp2p' may only be "
++                              "specified alone!");
++          if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
++            *flags += IPP2P_BIT;
++          info->cmd = *flags;
++          break;                                                                                                                                                                                                                      
++
++      case 'c':               /*cmd: apple*/
++            if ((*flags & IPP2P_APPLE) == IPP2P_APPLE)
++            exit_error(PARAMETER_PROBLEM,
++                                "ipp2p: `--apple' may only be "
++                                "specified once!");
++          if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
++                  exit_error(PARAMETER_PROBLEM,
++                              "ipp2p: `--ipp2p' may only be "
++                              "specified alone!");
++          if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
++            *flags += IPP2P_APPLE;
++          info->cmd = *flags;
++          break;                                                                                                                                                                                                                      
++
++
++      case 'd':               /*cmd: soul*/
++            if ((*flags & IPP2P_SOUL) == IPP2P_SOUL)
++            exit_error(PARAMETER_PROBLEM,
++                                "ipp2p: `--soul' may only be "
++                                "specified once!");
++          if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
++                  exit_error(PARAMETER_PROBLEM,
++                              "ipp2p: `--ipp2p' may only be "
++                              "specified alone!");
++          if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
++            *flags += IPP2P_SOUL;
++          info->cmd = *flags;
++          break;                                                                                                                                                                                                                      
++
++
++      case 'e':               /*cmd: winmx*/
++            if ((*flags & IPP2P_WINMX) == IPP2P_WINMX)
++            exit_error(PARAMETER_PROBLEM,
++                                "ipp2p: `--winmx' may only be "
++                                "specified once!");
++          if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
++                  exit_error(PARAMETER_PROBLEM,
++                              "ipp2p: `--ipp2p' may only be "
++                              "specified alone!");
++          if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
++            *flags += IPP2P_WINMX;
++          info->cmd = *flags;
++          break;                                                                                                                                                                                                                      
++
++      case 'f':               /*cmd: ares*/
++            if ((*flags & IPP2P_ARES) == IPP2P_ARES)
++            exit_error(PARAMETER_PROBLEM,
++                                "ipp2p: `--ares' may only be "
++                                "specified once!");
++          if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
++                  exit_error(PARAMETER_PROBLEM,
++                              "ipp2p: `--ipp2p' may only be "
++                              "specified alone!");
++          if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
++            *flags += IPP2P_ARES;
++          info->cmd = *flags;
++          break;                                                                                                                                                                                                                      
++      
++      case 'g':               /*cmd: mute*/
++            if ((*flags & IPP2P_MUTE) == IPP2P_MUTE)
++            exit_error(PARAMETER_PROBLEM,
++                                "ipp2p: `--mute' may only be "
++                                "specified once!");
++          if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
++            *flags += IPP2P_MUTE;
++          info->cmd = *flags;
++          break;                                                                                                                                                                                                                      
++      case 'h':               /*cmd: waste*/
++            if ((*flags & IPP2P_WASTE) == IPP2P_WASTE)
++            exit_error(PARAMETER_PROBLEM,
++                                "ipp2p: `--waste' may only be "
++                                "specified once!");
++          if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
++            *flags += IPP2P_WASTE;
++          info->cmd = *flags;
++          break;                                                                                                                                                                                                                      
++      case 'i':               /*cmd: xdcc*/
++            if ((*flags & IPP2P_XDCC) == IPP2P_XDCC)
++            exit_error(PARAMETER_PROBLEM,
++                                "ipp2p: `--ares' may only be "
++                                "specified once!");
++          if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
++            *flags += IPP2P_XDCC;
++          info->cmd = *flags;
++          break;                                                                                                                                                                                                                      
++
++      case 'j':               /*cmd: debug*/
++          if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
++          info->debug = 1;
++          break;                                                                                                                                                                                                                      
++
++      default:
++//            exit_error(PARAMETER_PROBLEM,
++//        "\nipp2p-parameter problem: for ipp2p usage type: iptables -m ipp2p --help\n");
++          return 0;
++    }
++    return 1;
++}
++
++
++static void
++final_check(unsigned int flags)
++{
++    if (!flags)
++            exit_error(PARAMETER_PROBLEM,
++          "\nipp2p-parameter problem: for ipp2p usage type: iptables -m ipp2p --help\n");
++}
++
++static void
++#ifdef _XTABLES_H
++print(const void *ip,
++      const struct xt_entry_match *match,
++#else
++print(const struct ipt_ip *ip,
++      const struct ipt_entry_match *match,
++#endif
++      int numeric)
++{
++    struct ipt_p2p_info *info = (struct ipt_p2p_info *)match->data;
++    
++    printf("ipp2p v%s", IPP2P_VERSION);
++    if ((info->cmd & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P) printf(" --ipp2p");
++//    if ((info->cmd & SHORT_HAND_DATA) == SHORT_HAND_DATA) printf(" --ipp2p-data");
++    if ((info->cmd & IPP2P_KAZAA) == IPP2P_KAZAA) printf(" --kazaa");
++//    if ((info->cmd & IPP2P_DATA_KAZAA) == IPP2P_DATA_KAZAA) printf(" --kazaa-data");
++//    if ((info->cmd & IPP2P_DATA_GNU) == IPP2P_DATA_GNU) printf(" --gnu-data");
++    if ((info->cmd & IPP2P_GNU) == IPP2P_GNU) printf(" --gnu");
++    if ((info->cmd & IPP2P_EDK) == IPP2P_EDK) printf(" --edk");
++//    if ((info->cmd & IPP2P_DATA_EDK) == IPP2P_DATA_EDK) printf(" --edk-data");
++//    if ((info->cmd & IPP2P_DATA_DC) == IPP2P_DATA_DC) printf(" --dc-data");
++    if ((info->cmd & IPP2P_DC) == IPP2P_DC) printf(" --dc");
++    if ((info->cmd & IPP2P_BIT) == IPP2P_BIT) printf(" --bit");
++    if ((info->cmd & IPP2P_APPLE) == IPP2P_APPLE) printf(" --apple");
++    if ((info->cmd & IPP2P_SOUL) == IPP2P_SOUL) printf(" --soul");
++    if ((info->cmd & IPP2P_WINMX) == IPP2P_WINMX) printf(" --winmx");
++    if ((info->cmd & IPP2P_ARES) == IPP2P_ARES) printf(" --ares");
++    if ((info->cmd & IPP2P_MUTE) == IPP2P_MUTE) printf(" --mute");
++    if ((info->cmd & IPP2P_WASTE) == IPP2P_WASTE) printf(" --waste");
++    if ((info->cmd & IPP2P_XDCC) == IPP2P_XDCC) printf(" --xdcc");
++    if (info->debug != 0) printf(" --debug");
++    printf(" ");
++}
++
++static void
++#ifdef _XTABLES_H
++save(const void *ip,
++     const struct xt_entry_match *match)
++#else
++save(const struct ipt_ip *ip,
++     const struct ipt_entry_match *match)
++#endif
++{
++    struct ipt_p2p_info *info = (struct ipt_p2p_info *)match->data;
++    
++    if ((info->cmd & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P) printf("--ipp2p ");
++//    if ((info->cmd & SHORT_HAND_DATA) == SHORT_HAND_DATA) printf("--ipp2p-data ");
++    if ((info->cmd & IPP2P_KAZAA) == IPP2P_KAZAA) printf("--kazaa ");
++//    if ((info->cmd & IPP2P_DATA_KAZAA) == IPP2P_DATA_KAZAA) printf("--kazaa-data ");
++//    if ((info->cmd & IPP2P_DATA_GNU) == IPP2P_DATA_GNU) printf("--gnu-data ");
++    if ((info->cmd & IPP2P_GNU) == IPP2P_GNU) printf("--gnu ");
++    if ((info->cmd & IPP2P_EDK) == IPP2P_EDK) printf("--edk ");
++//    if ((info->cmd & IPP2P_DATA_EDK) == IPP2P_DATA_EDK) printf("--edk-data ");
++//    if ((info->cmd & IPP2P_DATA_DC) == IPP2P_DATA_DC) printf("--dc-data ");
++    if ((info->cmd & IPP2P_DC) == IPP2P_DC) printf("--dc ");
++    if ((info->cmd & IPP2P_BIT) == IPP2P_BIT) printf("--bit ");
++    if ((info->cmd & IPP2P_APPLE) == IPP2P_APPLE) printf("--apple ");
++    if ((info->cmd & IPP2P_SOUL) == IPP2P_SOUL) printf("--soul ");
++    if ((info->cmd & IPP2P_WINMX) == IPP2P_WINMX) printf("--winmx ");
++    if ((info->cmd & IPP2P_ARES) == IPP2P_ARES) printf("--ares ");
++    if ((info->cmd & IPP2P_MUTE) == IPP2P_MUTE) printf(" --mute");
++    if ((info->cmd & IPP2P_WASTE) == IPP2P_WASTE) printf(" --waste");
++    if ((info->cmd & IPP2P_XDCC) == IPP2P_XDCC) printf(" --xdcc");
++    if (info->debug != 0) printf("--debug ");
++}
++
++              
++static 
++struct xtables_match ipp2p= 
++{ 
++    .next           = NULL,
++    .name           = "ipp2p",
++    .version        = XTABLES_VERSION,
++    .size           = IPT_ALIGN(sizeof(struct ipt_p2p_info)),
++    .userspacesize  = IPT_ALIGN(sizeof(struct ipt_p2p_info)),
++    .help           = &help,
++    .init           = &init,
++    .parse          = &parse,
++    .final_check    = &final_check,
++    .print          = &print,
++    .save           = &save,
++    .extra_opts     = opts
++};
++                                          
++
++
++void _init(void)
++{
++    xtables_register_match(&ipp2p);
++}
++
+diff -Naur iptables-1.4.6.org/extensions/libipt_ipp2p.man iptables-1.4.6/extensions/libipt_ipp2p.man
+--- iptables-1.4.6.org/extensions/libipt_ipp2p.man     1970-01-01 01:00:00.000000000 +0100
++++ iptables-1.4.6/extensions/libipt_ipp2p.man 2010-02-13 20:02:52.000000000 +0100
+@@ -0,0 +1,43 @@
++This module matches certain packets in P2P flows. It is not
++designed to match all packets belonging to a P2P connection - 
++use IPP2P together with CONNMARK for this purpose. Also visit
++http://www.ipp2p.org for detailed information.
++
++Use it together with -p tcp or -p udp to search these protocols
++only or without -p switch to search packets of both protocols.
++
++IPP2P provides the following options:
++.TP
++.B "--edk "
++Matches as many eDonkey/eMule packets as possible.
++.TP
++.B "--kazaa "
++Matches as many KaZaA packets as possible.
++.TP
++.B "--gnu "
++Matches as many Gnutella packets as possible.
++.TP
++.B "--dc "
++Matches as many Direct Connect packets as possible.
++.TP
++.B "--bit "
++Matches BitTorrent packets.
++.TP
++.B "--apple "
++Matches AppleJuice packets.
++.TP
++.B "--soul "
++Matches some SoulSeek packets. Considered as beta, use careful!
++.TP
++.B "--winmx "
++Matches some WinMX packets. Considered as beta, use careful!
++.TP
++.B "--ares "
++Matches Ares and AresLite packets. Use together with -j DROP only.
++.TP
++.B "--ipp2p "
++Short hand for: --edk --kazaa --gnu --dc
++.TP
++.B "--debug "
++Prints some information about each hit into kernel logfile. May 
++produce huge logfiles so beware!

diff --git a/src/patches/linux-2.6.32-ath5k_fix_setup_for_CAB_queue.patch b/src/patches/linux-2.6.32-ath5k_fix_setup_for_CAB_queue.patch
new file mode 100644 (file)
index 0000000..fbe3098
--- /dev/null
+++ b/src/patches/linux-2.6.32-ath5k_fix_setup_for_CAB_queue.patch
@@ -0,0 +1,75 @@
+diff --git a/drivers/net/wireless/ath/ath5k/ath5k.h b/drivers/net/wireless/ath/ath5k/ath5k.h
+index 66bcb50..ad4d446 100644
+--- a/drivers/net/wireless/ath/ath5k/ath5k.h
++++ b/drivers/net/wireless/ath/ath5k/ath5k.h
+@@ -535,7 +535,7 @@  struct ath5k_txq_info {
+       u32     tqi_cbr_period; /* Constant bit rate period */
+       u32     tqi_cbr_overflow_limit;
+       u32     tqi_burst_time;
+-      u32     tqi_ready_time; /* Not used */
++      u32     tqi_ready_time; /* Time queue waits after an event */
+ };
+ 
+ /*
+diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c
+index b501537..535a6af 100644
+--- a/drivers/net/wireless/ath/ath5k/base.c
++++ b/drivers/net/wireless/ath/ath5k/base.c
+@@ -1516,7 +1516,8 @@  ath5k_beaconq_config(struct ath5k_softc *sc)
+ 
+       ret = ath5k_hw_get_tx_queueprops(ah, sc->bhalq, &qi);
+       if (ret)
+-              return ret;
++              goto err;
++
+       if (sc->opmode == NL80211_IFTYPE_AP ||
+               sc->opmode == NL80211_IFTYPE_MESH_POINT) {
+               /*
+@@ -1543,10 +1544,25 @@  ath5k_beaconq_config(struct ath5k_softc *sc)
+       if (ret) {
+               ATH5K_ERR(sc, "%s: unable to update parameters for beacon "
+                       "hardware queue!\n", __func__);
+-              return ret;
++              goto err;
+       }
++      ret = ath5k_hw_reset_tx_queue(ah, sc->bhalq); /* push to h/w */
++      if (ret)
++              goto err;
+ 
+-      return ath5k_hw_reset_tx_queue(ah, sc->bhalq); /* push to h/w */;
++      /* reconfigure cabq with ready time to 80% of beacon_interval */
++      ret = ath5k_hw_get_tx_queueprops(ah, AR5K_TX_QUEUE_ID_CAB, &qi);
++      if (ret)
++              goto err;
++
++      qi.tqi_ready_time = (sc->bintval * 80) / 100;
++      ret = ath5k_hw_set_tx_queueprops(ah, AR5K_TX_QUEUE_ID_CAB, &qi);
++      if (ret)
++              goto err;
++
++      ret = ath5k_hw_reset_tx_queue(ah, AR5K_TX_QUEUE_ID_CAB);
++err:
++      return ret;
+ }
+ 
+ static void
+diff --git a/drivers/net/wireless/ath/ath5k/qcu.c b/drivers/net/wireless/ath/ath5k/qcu.c
+index abe36c0..9122a85 100644
+--- a/drivers/net/wireless/ath/ath5k/qcu.c
++++ b/drivers/net/wireless/ath/ath5k/qcu.c
+@@ -408,12 +408,13 @@  int ath5k_hw_reset_tx_queue(struct ath5k_hw *ah, unsigned int queue)
+                       break;
+ 
+               case AR5K_TX_QUEUE_CAB:
++                      /* XXX: use BCN_SENT_GT, if we can figure out how */
+                       AR5K_REG_ENABLE_BITS(ah, AR5K_QUEUE_MISC(queue),
+-                              AR5K_QCU_MISC_FRSHED_BCN_SENT_GT |
++                              AR5K_QCU_MISC_FRSHED_DBA_GT |
+                               AR5K_QCU_MISC_CBREXP_DIS |
+                               AR5K_QCU_MISC_CBREXP_BCN_DIS);
+ 
+-                      ath5k_hw_reg_write(ah, ((AR5K_TUNE_BEACON_INTERVAL -
++                      ath5k_hw_reg_write(ah, ((tq->tqi_ready_time -
+                               (AR5K_TUNE_SW_BEACON_RESP -
+                               AR5K_TUNE_DMA_BEACON_RESP) -
+                               AR5K_TUNE_ADDITIONAL_SWBA_BACKOFF) * 1024) |

diff --git a/src/patches/linux-2.6.32-imq-test2.patch b/src/patches/linux-2.6.32-imq-test2.patch
new file mode 100644 (file)
index 0000000..17f85c3
--- /dev/null
+++ b/src/patches/linux-2.6.32-imq-test2.patch
@@ -0,0 +1,1462 @@
+diff -U 5 -Nr linux-2.6.32/drivers/net/imq.c linux-2.6.32-imq/drivers/net/imq.c
+--- linux-2.6.32/drivers/net/imq.c     1970-01-01 02:00:00.000000000 +0200
++++ linux-2.6.32-imq/drivers/net/imq.c 2009-12-11 15:08:01.958734740 +0200
+@@ -0,0 +1,632 @@
++/*
++ *             Pseudo-driver for the intermediate queue device.
++ *
++ *             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 the Free Software Foundation; either version
++ *             2 of the License, or (at your option) any later version.
++ *
++ * Authors:    Patrick McHardy, <kaber@trash.net>
++ *
++ *            The first version was written by Martin Devera, <devik@cdi.cz>
++ *
++ * Credits:    Jan Rafaj <imq2t@cedric.vabo.cz>
++ *              - Update patch to 2.4.21
++ *             Sebastian Strollo <sstrollo@nortelnetworks.com>
++ *              - Fix "Dead-loop on netdevice imq"-issue
++ *             Marcel Sebek <sebek64@post.cz>
++ *              - Update to 2.6.2-rc1
++ *
++ *           After some time of inactivity there is a group taking care
++ *           of IMQ again: http://www.linuximq.net
++ *
++ *
++ *           2004/06/30 - New version of IMQ patch to kernels <=2.6.7
++ *             including the following changes:
++ *
++ *           - Correction of ipv6 support "+"s issue (Hasso Tepper)
++ *           - Correction of imq_init_devs() issue that resulted in
++ *           kernel OOPS unloading IMQ as module (Norbert Buchmuller)
++ *           - Addition of functionality to choose number of IMQ devices
++ *           during kernel config (Andre Correa)
++ *           - Addition of functionality to choose how IMQ hooks on
++ *           PRE and POSTROUTING (after or before NAT) (Andre Correa)
++ *           - Cosmetic corrections (Norbert Buchmuller) (Andre Correa)
++ *
++ *
++ *             2005/12/16 - IMQ versions between 2.6.7 and 2.6.13 were
++ *             released with almost no problems. 2.6.14-x was released
++ *             with some important changes: nfcache was removed; After
++ *             some weeks of trouble we figured out that some IMQ fields
++ *             in skb were missing in skbuff.c - skb_clone and copy_skb_header.
++ *             These functions are correctly patched by this new patch version.
++ *
++ *             Thanks for all who helped to figure out all the problems with
++ *             2.6.14.x: Patrick McHardy, Rune Kock, VeNoMouS, Max CtRiX,
++ *             Kevin Shanahan, Richard Lucassen, Valery Dachev (hopefully
++ *             I didn't forget anybody). I apologize again for my lack of time.
++ *
++ *
++ *             2008/06/17 - 2.6.25 - Changed imq.c to use qdisc_run() instead 
++ *             of qdisc_restart() and moved qdisc_run() to tasklet to avoid
++ *             recursive locking. New initialization routines to fix 'rmmod' not
++ *             working anymore. Used code from ifb.c. (Jussi Kivilinna)
++ *
++ *             2008/08/06 - 2.6.26 - (JK)
++ *              - Replaced tasklet with 'netif_schedule()'.
++ *              - Cleaned up and added comments for imq_nf_queue().
++ *
++ *             2009/04/12
++ *              - Add skb_save_cb/skb_restore_cb helper functions for backuping
++ *                control buffer. This is needed because qdisc-layer on kernels
++ *                2.6.27 and newer overwrite control buffer. (Jussi Kivilinna)
++ *              - Add better locking for IMQ device. Hopefully this will solve
++ *                SMP issues. (Jussi Kivilinna)
++ *              - Port to 2.6.27
++ *              - Port to 2.6.28
++ *              - Port to 2.6.29 + fix rmmod not working
++ *
++ *             2009/04/20 - (Jussi Kivilinna)
++ *              - Use netdevice feature flags to avoid extra packet handling
++ *                by core networking layer and possibly increase performance.
++ *
++ *             2009/09/26 - (Jussi Kivilinna)
++ *              - Add imq_nf_reinject_lockless to fix deadlock with
++ *                imq_nf_queue/imq_nf_reinject.
++ *
++ *             2009/12/08 - (Jussi Kivilinna)
++ *              - Port to 2.6.32
++ *              - Add check for skb->nf_queue_entry==NULL in imq_dev_xmit()
++ *              - Also add better error checking for skb->nf_queue_entry usage
++ *
++ *           Also, many thanks to pablo Sebastian Greco for making the initial
++ *           patch and to those who helped the testing.
++ *
++ *             More info at: http://www.linuximq.net/ (Andre Correa)
++ */
++
++#include <linux/module.h>
++#include <linux/kernel.h>
++#include <linux/moduleparam.h>
++#include <linux/list.h>
++#include <linux/skbuff.h>
++#include <linux/netdevice.h>
++#include <linux/etherdevice.h>
++#include <linux/rtnetlink.h>
++#include <linux/if_arp.h>
++#include <linux/netfilter.h>
++#include <linux/netfilter_ipv4.h>
++#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
++      #include <linux/netfilter_ipv6.h>
++#endif
++#include <linux/imq.h>
++#include <net/pkt_sched.h>
++#include <net/netfilter/nf_queue.h>
++
++static nf_hookfn imq_nf_hook;
++
++static struct nf_hook_ops imq_ingress_ipv4 = {
++      .hook           = imq_nf_hook,
++      .owner          = THIS_MODULE,
++      .pf             = PF_INET,
++      .hooknum        = NF_INET_PRE_ROUTING,
++#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB)
++      .priority       = NF_IP_PRI_MANGLE + 1
++#else
++      .priority       = NF_IP_PRI_NAT_DST + 1
++#endif
++};
++
++static struct nf_hook_ops imq_egress_ipv4 = {
++      .hook           = imq_nf_hook,
++      .owner          = THIS_MODULE,
++      .pf             = PF_INET,
++      .hooknum        = NF_INET_POST_ROUTING,
++#if defined(CONFIG_IMQ_BEHAVIOR_AA) || defined(CONFIG_IMQ_BEHAVIOR_BA)
++      .priority       = NF_IP_PRI_LAST
++#else
++      .priority       = NF_IP_PRI_NAT_SRC - 1
++#endif
++};
++
++#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
++static struct nf_hook_ops imq_ingress_ipv6 = {
++      .hook           = imq_nf_hook,
++      .owner          = THIS_MODULE,
++      .pf             = PF_INET6,
++      .hooknum        = NF_INET_PRE_ROUTING,
++#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB)
++      .priority       = NF_IP6_PRI_MANGLE + 1
++#else
++      .priority       = NF_IP6_PRI_NAT_DST + 1
++#endif
++};
++
++static struct nf_hook_ops imq_egress_ipv6 = {
++      .hook           = imq_nf_hook,
++      .owner          = THIS_MODULE,
++      .pf             = PF_INET6,
++      .hooknum        = NF_INET_POST_ROUTING,
++#if defined(CONFIG_IMQ_BEHAVIOR_AA) || defined(CONFIG_IMQ_BEHAVIOR_BA)
++      .priority       = NF_IP6_PRI_LAST
++#else
++      .priority       = NF_IP6_PRI_NAT_SRC - 1
++#endif
++};
++#endif
++
++#if defined(CONFIG_IMQ_NUM_DEVS)
++static unsigned int numdevs = CONFIG_IMQ_NUM_DEVS;
++#else
++static unsigned int numdevs = IMQ_MAX_DEVS;
++#endif
++
++static DEFINE_SPINLOCK(imq_nf_queue_lock);
++
++static struct net_device *imq_devs_cache[IMQ_MAX_DEVS];
++
++
++static struct net_device_stats *imq_get_stats(struct net_device *dev)
++{
++      return &dev->stats;
++}
++
++/* called for packets kfree'd in qdiscs at places other than enqueue */
++static void imq_skb_destructor(struct sk_buff *skb)
++{
++      struct nf_queue_entry *entry = skb->nf_queue_entry;
++
++      skb->nf_queue_entry = NULL;
++
++      if (entry) {
++              nf_queue_entry_release_refs(entry);
++              kfree(entry);
++      }
++
++      skb_restore_cb(skb); /* kfree backup */
++}
++
++/* locking not needed when called from imq_nf_queue */
++static void imq_nf_reinject_lockless(struct nf_queue_entry *entry,
++                                              unsigned int verdict)
++{
++      int status;
++
++      if (!entry->next_outfn) {
++              nf_reinject(entry, verdict);
++              return;
++      }
++
++      status = entry->next_outfn(entry, entry->next_queuenum);
++      if (status < 0) {
++              nf_queue_entry_release_refs(entry);
++              kfree_skb(entry->skb);
++              kfree(entry);
++      }
++}
++
++static void imq_nf_reinject(struct nf_queue_entry *entry, unsigned int verdict)
++{
++      int status;
++
++      if (!entry->next_outfn) {
++              spin_lock_bh(&imq_nf_queue_lock);
++              nf_reinject(entry, verdict);
++              spin_unlock_bh(&imq_nf_queue_lock);
++              return;
++      }
++
++      rcu_read_lock();
++      local_bh_disable();
++      status = entry->next_outfn(entry, entry->next_queuenum);
++      local_bh_enable();
++      if (status < 0) {
++              nf_queue_entry_release_refs(entry);
++              kfree_skb(entry->skb);
++              kfree(entry);
++      }
++
++      rcu_read_unlock();
++}
++
++static netdev_tx_t imq_dev_xmit(struct sk_buff *skb, struct net_device *dev)
++{
++      struct nf_queue_entry *entry = skb->nf_queue_entry;
++
++      skb->nf_queue_entry = NULL;
++      dev->trans_start = jiffies;
++
++      dev->stats.tx_bytes += skb->len;
++      dev->stats.tx_packets++;
++
++      if (entry == NULL) {
++              /* We don't know what is going on here.. packet is queued for
++               * imq device, but (probably) not by us.
++               *
++               * If this packet was not send here by imq_nf_queue(), then
++               * skb_save_cb() was not used and skb_free() should not show:
++               *   WARNING: IMQ: kfree_skb: skb->cb_next:..
++               * and/or
++               *   WARNING: IMQ: kfree_skb: skb->nf_queue_entry...
++               *
++               * However if this message is shown, then IMQ is somehow broken
++               * and you should report this to linuximq.net.
++               */
++
++              /* imq_dev_xmit is black hole that eats all packets, report that
++               * we eat this packet happily and increase dropped counters.
++               */
++
++              dev->stats.tx_dropped++;
++              dev_kfree_skb(skb);
++
++              return NETDEV_TX_OK;
++      }
++
++      skb_restore_cb(skb); /* restore skb->cb */
++
++      skb->imq_flags = 0;
++      skb->destructor = NULL;
++
++      imq_nf_reinject(entry, NF_ACCEPT);
++
++      return NETDEV_TX_OK;
++}
++
++static int imq_nf_queue(struct nf_queue_entry *entry, unsigned queue_num)
++{
++      struct net_device *dev;
++      struct sk_buff *skb_orig, *skb, *skb_shared;
++      struct Qdisc *q;
++      struct netdev_queue *txq;
++      int users, index;
++      int retval = -EINVAL;
++
++      index = entry->skb->imq_flags & IMQ_F_IFMASK;
++      if (unlikely(index > numdevs - 1)) {
++              if (net_ratelimit())
++                      printk(KERN_WARNING
++                             "IMQ: invalid device specified, highest is %u\n",
++                             numdevs - 1);
++              retval = -EINVAL;
++              goto out;
++      }
++
++      /* check for imq device by index from cache */
++      dev = imq_devs_cache[index];
++      if (unlikely(!dev)) {
++              char buf[8];
++
++              /* get device by name and cache result */
++              snprintf(buf, sizeof(buf), "imq%d", index);
++              dev = dev_get_by_name(&init_net, buf);
++              if (!dev) {
++                      /* not found ?!*/
++                      BUG();
++                      retval = -ENODEV;
++                      goto out;
++              }
++
++              imq_devs_cache[index] = dev;
++              dev_put(dev);
++      }
++
++      if (unlikely(!(dev->flags & IFF_UP))) {
++              entry->skb->imq_flags = 0;
++              imq_nf_reinject_lockless(entry, NF_ACCEPT);
++              retval = 0;
++              goto out;
++      }
++      dev->last_rx = jiffies;
++
++      skb = entry->skb;
++      skb_orig = NULL;
++
++      /* skb has owner? => make clone */
++      if (unlikely(skb->destructor)) {
++              skb_orig = skb;
++              skb = skb_clone(skb, GFP_ATOMIC);
++              if (!skb) {
++                      retval = -ENOMEM;
++                      goto out;
++              }
++              entry->skb = skb;
++      }
++
++      skb->nf_queue_entry = entry;
++
++      dev->stats.rx_bytes += skb->len;
++      dev->stats.rx_packets++;
++
++      txq = dev_pick_tx(dev, skb);
++
++      q = rcu_dereference(txq->qdisc);
++      if (unlikely(!q->enqueue))
++              goto packet_not_eaten_by_imq_dev;
++
++      spin_lock_bh(qdisc_lock(q));
++
++      users = atomic_read(&skb->users);
++
++      skb_shared = skb_get(skb); /* increase reference count by one */
++      skb_save_cb(skb_shared); /* backup skb->cb, as qdisc layer will
++                                      overwrite it */
++      qdisc_enqueue_root(skb_shared, q); /* might kfree_skb */
++
++      if (likely(atomic_read(&skb_shared->users) == users + 1)) {
++              kfree_skb(skb_shared); /* decrease reference count by one */
++
++              skb->destructor = &imq_skb_destructor;
++
++              /* cloned? */
++              if (skb_orig)
++                      kfree_skb(skb_orig); /* free original */
++
++              spin_unlock_bh(qdisc_lock(q));
++
++              /* schedule qdisc dequeue */
++              __netif_schedule(q);
++
++              retval = 0;
++              goto out;
++      } else {
++              skb_restore_cb(skb_shared); /* restore skb->cb */
++              skb->nf_queue_entry = NULL;
++              /* qdisc dropped packet and decreased skb reference count of
++               * skb, so we don't really want to and try refree as that would
++               * actually destroy the skb. */
++              spin_unlock_bh(qdisc_lock(q));
++              goto packet_not_eaten_by_imq_dev;
++      }
++
++packet_not_eaten_by_imq_dev:
++      /* cloned? restore original */
++      if (skb_orig) {
++              kfree_skb(skb);
++              entry->skb = skb_orig;
++      }
++      retval = -1;
++out:
++      return retval;
++}
++
++static struct nf_queue_handler nfqh = {
++      .name  = "imq",
++      .outfn = imq_nf_queue,
++};
++
++static unsigned int imq_nf_hook(unsigned int hook, struct sk_buff *pskb,
++                              const struct net_device *indev,
++                              const struct net_device *outdev,
++                              int (*okfn)(struct sk_buff *))
++{
++      if (pskb->imq_flags & IMQ_F_ENQUEUE)
++              return NF_QUEUE;
++
++      return NF_ACCEPT;
++}
++
++static int imq_close(struct net_device *dev)
++{
++      netif_stop_queue(dev);
++      return 0;
++}
++
++static int imq_open(struct net_device *dev)
++{
++      netif_start_queue(dev);
++      return 0;
++}
++
++static const struct net_device_ops imq_netdev_ops = {
++      .ndo_open               = imq_open,
++      .ndo_stop               = imq_close,
++      .ndo_start_xmit         = imq_dev_xmit,
++      .ndo_get_stats          = imq_get_stats,
++};
++
++static void imq_setup(struct net_device *dev)
++{
++      dev->netdev_ops         = &imq_netdev_ops;
++      dev->type               = ARPHRD_VOID;
++      dev->mtu                = 16000;
++      dev->tx_queue_len       = 11000;
++      dev->flags              = IFF_NOARP;
++      dev->features           = NETIF_F_SG | NETIF_F_FRAGLIST |
++                                NETIF_F_GSO | NETIF_F_HW_CSUM |
++                                NETIF_F_HIGHDMA;
++      dev->priv_flags         &= ~IFF_XMIT_DST_RELEASE;
++}
++
++static int imq_validate(struct nlattr *tb[], struct nlattr *data[])
++{
++      int ret = 0;
++
++      if (tb[IFLA_ADDRESS]) {
++              if (nla_len(tb[IFLA_ADDRESS]) != ETH_ALEN) {
++                      ret = -EINVAL;
++                      goto end;
++              }
++              if (!is_valid_ether_addr(nla_data(tb[IFLA_ADDRESS]))) {
++                      ret = -EADDRNOTAVAIL;
++                      goto end;
++              }
++      }
++      return 0;
++end:
++      printk(KERN_WARNING "IMQ: imq_validate failed (%d)\n", ret);
++      return ret;
++}
++
++static struct rtnl_link_ops imq_link_ops __read_mostly = {
++      .kind           = "imq",
++      .priv_size      = 0,
++      .setup          = imq_setup,
++      .validate       = imq_validate,
++};
++
++static int __init imq_init_hooks(void)
++{
++      int err;
++
++      nf_register_queue_imq_handler(&nfqh);
++
++      err = nf_register_hook(&imq_ingress_ipv4);
++      if (err)
++              goto err1;
++
++      err = nf_register_hook(&imq_egress_ipv4);
++      if (err)
++              goto err2;
++
++#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
++      err = nf_register_hook(&imq_ingress_ipv6);
++      if (err)
++              goto err3;
++
++      err = nf_register_hook(&imq_egress_ipv6);
++      if (err)
++              goto err4;
++#endif
++
++      return 0;
++
++#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
++err4:
++      nf_unregister_hook(&imq_ingress_ipv6);
++err3:
++      nf_unregister_hook(&imq_egress_ipv4);
++#endif
++err2:
++      nf_unregister_hook(&imq_ingress_ipv4);
++err1:
++      nf_unregister_queue_imq_handler();
++      return err;
++}
++
++static int __init imq_init_one(int index)
++{
++      struct net_device *dev;
++      int ret;
++
++      dev = alloc_netdev(0, "imq%d", imq_setup);
++      if (!dev)
++              return -ENOMEM;
++
++      ret = dev_alloc_name(dev, dev->name);
++      if (ret < 0)
++              goto fail;
++
++      dev->rtnl_link_ops = &imq_link_ops;
++      ret = register_netdevice(dev);
++      if (ret < 0)
++              goto fail;
++
++      return 0;
++fail:
++      free_netdev(dev);
++      return ret;
++}
++
++static int __init imq_init_devs(void)
++{
++      int err, i;
++
++      if (numdevs < 1 || numdevs > IMQ_MAX_DEVS) {
++              printk(KERN_ERR "IMQ: numdevs has to be betweed 1 and %u\n",
++                     IMQ_MAX_DEVS);
++              return -EINVAL;
++      }
++
++      rtnl_lock();
++      err = __rtnl_link_register(&imq_link_ops);
++
++      for (i = 0; i < numdevs && !err; i++)
++              err = imq_init_one(i);
++
++      if (err) {
++              __rtnl_link_unregister(&imq_link_ops);
++              memset(imq_devs_cache, 0, sizeof(imq_devs_cache));
++      }
++      rtnl_unlock();
++
++      return err;
++}
++
++static int __init imq_init_module(void)
++{
++      int err;
++
++#if defined(CONFIG_IMQ_NUM_DEVS)
++      BUILD_BUG_ON(CONFIG_IMQ_NUM_DEVS > 16);
++      BUILD_BUG_ON(CONFIG_IMQ_NUM_DEVS < 2);
++      BUILD_BUG_ON(CONFIG_IMQ_NUM_DEVS - 1 > IMQ_F_IFMASK);
++#endif
++
++      err = imq_init_devs();
++      if (err) {
++              printk(KERN_ERR "IMQ: Error trying imq_init_devs(net)\n");
++              return err;
++      }
++
++      err = imq_init_hooks();
++      if (err) {
++              printk(KERN_ERR "IMQ: Error trying imq_init_hooks()\n");
++              rtnl_link_unregister(&imq_link_ops);
++              memset(imq_devs_cache, 0, sizeof(imq_devs_cache));
++              return err;
++      }
++
++      printk(KERN_INFO "IMQ driver loaded successfully.\n");
++
++#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB)
++      printk(KERN_INFO "\tHooking IMQ before NAT on PREROUTING.\n");
++#else
++      printk(KERN_INFO "\tHooking IMQ after NAT on PREROUTING.\n");
++#endif
++#if defined(CONFIG_IMQ_BEHAVIOR_AB) || defined(CONFIG_IMQ_BEHAVIOR_BB)
++      printk(KERN_INFO "\tHooking IMQ before NAT on POSTROUTING.\n");
++#else
++      printk(KERN_INFO "\tHooking IMQ after NAT on POSTROUTING.\n");
++#endif
++
++      return 0;
++}
++
++static void __exit imq_unhook(void)
++{
++#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
++      nf_unregister_hook(&imq_ingress_ipv6);
++      nf_unregister_hook(&imq_egress_ipv6);
++#endif
++      nf_unregister_hook(&imq_ingress_ipv4);
++      nf_unregister_hook(&imq_egress_ipv4);
++
++      nf_unregister_queue_imq_handler();
++}
++
++static void __exit imq_cleanup_devs(void)
++{
++      rtnl_link_unregister(&imq_link_ops);
++      memset(imq_devs_cache, 0, sizeof(imq_devs_cache));
++}
++
++static void __exit imq_exit_module(void)
++{
++      imq_unhook();
++      imq_cleanup_devs();
++      printk(KERN_INFO "IMQ driver unloaded successfully.\n");
++}
++
++module_init(imq_init_module);
++module_exit(imq_exit_module);
++
++module_param(numdevs, int, 0);
++MODULE_PARM_DESC(numdevs, "number of IMQ devices (how many imq* devices will "
++                      "be created)");
++MODULE_AUTHOR("http://www.linuximq.net");
++MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See "
++                      "http://www.linuximq.net/ for more information.");
++MODULE_LICENSE("GPL");
++MODULE_ALIAS_RTNL_LINK("imq");
++
+diff -U 5 -Nr linux-2.6.32/drivers/net/Kconfig linux-2.6.32-imq/drivers/net/Kconfig
+--- linux-2.6.32/drivers/net/Kconfig   2009-12-03 05:51:21.000000000 +0200
++++ linux-2.6.32-imq/drivers/net/Kconfig       2009-12-11 14:16:42.678730699 +0200
+@@ -107,10 +107,133 @@
+         <http://www.tldp.org/docs.html#howto>.
+ 
+         To compile this driver as a module, choose M here: the module
+         will be called eql.  If unsure, say N.
+ 
++config IMQ
++      tristate "IMQ (intermediate queueing device) support"
++      depends on NETDEVICES && NETFILTER
++      ---help---
++        The IMQ device(s) is used as placeholder for QoS queueing
++        disciplines. Every packet entering/leaving the IP stack can be
++        directed through the IMQ device where it's enqueued/dequeued to the
++        attached qdisc. This allows you to treat network devices as classes
++        and distribute bandwidth among them. Iptables is used to specify
++        through which IMQ device, if any, packets travel.
++
++        More information at: http://www.linuximq.net/
++
++        To compile this driver as a module, choose M here: the module
++        will be called imq.  If unsure, say N.
++
++choice
++      prompt "IMQ behavior (PRE/POSTROUTING)"
++      depends on IMQ
++      default IMQ_BEHAVIOR_AB
++      help
++
++              This settings defines how IMQ behaves in respect to its
++              hooking in PREROUTING and POSTROUTING.
++
++              IMQ can work in any of the following ways:
++
++                  PREROUTING   |      POSTROUTING
++              -----------------|-------------------
++              #1  After NAT    |      After NAT
++              #2  After NAT    |      Before NAT
++              #3  Before NAT   |      After NAT
++              #4  Before NAT   |      Before NAT
++
++              The default behavior is to hook before NAT on PREROUTING
++              and after NAT on POSTROUTING (#3).
++
++              This settings are specially usefull when trying to use IMQ
++              to shape NATed clients.
++
++              More information can be found at: www.linuximq.net
++
++              If not sure leave the default settings alone.
++
++config IMQ_BEHAVIOR_AA
++      bool "IMQ AA"
++      help
++              This settings defines how IMQ behaves in respect to its
++              hooking in PREROUTING and POSTROUTING.
++
++              Choosing this option will make IMQ hook like this:
++
++              PREROUTING:   After NAT
++              POSTROUTING:  After NAT
++
++              More information can be found at: www.linuximq.net
++
++              If not sure leave the default settings alone.
++
++config IMQ_BEHAVIOR_AB
++      bool "IMQ AB"
++      help
++              This settings defines how IMQ behaves in respect to its
++              hooking in PREROUTING and POSTROUTING.
++
++              Choosing this option will make IMQ hook like this:
++
++              PREROUTING:   After NAT
++              POSTROUTING:  Before NAT
++
++              More information can be found at: www.linuximq.net
++
++              If not sure leave the default settings alone.
++
++config IMQ_BEHAVIOR_BA
++      bool "IMQ BA"
++      help
++              This settings defines how IMQ behaves in respect to its
++              hooking in PREROUTING and POSTROUTING.
++
++              Choosing this option will make IMQ hook like this:
++
++              PREROUTING:   Before NAT
++              POSTROUTING:  After NAT
++
++              More information can be found at: www.linuximq.net
++
++              If not sure leave the default settings alone.
++
++config IMQ_BEHAVIOR_BB
++      bool "IMQ BB"
++      help
++              This settings defines how IMQ behaves in respect to its
++              hooking in PREROUTING and POSTROUTING.
++
++              Choosing this option will make IMQ hook like this:
++
++              PREROUTING:   Before NAT
++              POSTROUTING:  Before NAT
++
++              More information can be found at: www.linuximq.net
++
++              If not sure leave the default settings alone.
++
++endchoice
++
++config IMQ_NUM_DEVS
++
++      int "Number of IMQ devices"
++      range 2 16
++      depends on IMQ
++      default "16"
++      help
++
++              This settings defines how many IMQ devices will be
++              created.
++
++              The default value is 16.
++
++              More information can be found at: www.linuximq.net
++
++              If not sure leave the default settings alone.
++
+ config TUN
+       tristate "Universal TUN/TAP device driver support"
+       select CRC32
+       ---help---
+         TUN/TAP provides packet reception and transmission for user space
+diff -U 5 -Nr linux-2.6.32/drivers/net/Makefile linux-2.6.32-imq/drivers/net/Makefile
+--- linux-2.6.32/drivers/net/Makefile  2009-12-03 05:51:21.000000000 +0200
++++ linux-2.6.32-imq/drivers/net/Makefile      2009-12-11 14:16:42.678730699 +0200
+@@ -163,10 +163,11 @@
+ obj-$(CONFIG_SLHC) += slhc.o
+ 
+ obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o
+ 
+ obj-$(CONFIG_DUMMY) += dummy.o
++obj-$(CONFIG_IMQ) += imq.o
+ obj-$(CONFIG_IFB) += ifb.o
+ obj-$(CONFIG_MACVLAN) += macvlan.o
+ obj-$(CONFIG_DE600) += de600.o
+ obj-$(CONFIG_DE620) += de620.o
+ obj-$(CONFIG_LANCE) += lance.o
+diff -U 5 -Nr linux-2.6.32/include/linux/imq.h linux-2.6.32-imq/include/linux/imq.h
+--- linux-2.6.32/include/linux/imq.h   1970-01-01 02:00:00.000000000 +0200
++++ linux-2.6.32-imq/include/linux/imq.h       2009-12-11 14:16:42.678730699 +0200
+@@ -0,0 +1,13 @@
++#ifndef _IMQ_H
++#define _IMQ_H
++
++/* IFMASK (16 device indexes, 0 to 15) and flag(s) fit in 5 bits */
++#define IMQ_F_BITS    5
++
++#define IMQ_F_IFMASK  0x0f
++#define IMQ_F_ENQUEUE 0x10
++
++#define IMQ_MAX_DEVS  (IMQ_F_IFMASK + 1)
++
++#endif /* _IMQ_H */
++
+diff -U 5 -Nr linux-2.6.32/include/linux/netdevice.h linux-2.6.32-imq/include/linux/netdevice.h
+--- linux-2.6.32/include/linux/netdevice.h     2009-12-03 05:51:21.000000000 +0200
++++ linux-2.6.32-imq/include/linux/netdevice.h 2009-12-11 14:16:42.679730960 +0200
+@@ -1112,10 +1112,11 @@
+ extern struct net_device      *__dev_get_by_name(struct net *net, const char *name);
+ extern int            dev_alloc_name(struct net_device *dev, const char *name);
+ extern int            dev_open(struct net_device *dev);
+ extern int            dev_close(struct net_device *dev);
+ extern void           dev_disable_lro(struct net_device *dev);
++extern struct netdev_queue *dev_pick_tx(struct net_device *dev, struct sk_buff *skb);
+ extern int            dev_queue_xmit(struct sk_buff *skb);
+ extern int            register_netdevice(struct net_device *dev);
+ extern void           unregister_netdevice(struct net_device *dev);
+ extern void           free_netdev(struct net_device *dev);
+ extern void           synchronize_net(void);
+diff -U 5 -Nr linux-2.6.32/include/linux/netfilter/xt_IMQ.h linux-2.6.32-imq/include/linux/netfilter/xt_IMQ.h
+--- linux-2.6.32/include/linux/netfilter/xt_IMQ.h      1970-01-01 02:00:00.000000000 +0200
++++ linux-2.6.32-imq/include/linux/netfilter/xt_IMQ.h  2009-12-11 14:16:42.679730960 +0200
+@@ -0,0 +1,9 @@
++#ifndef _XT_IMQ_H
++#define _XT_IMQ_H
++
++struct xt_imq_info {
++      unsigned int todev;     /* target imq device */
++};
++
++#endif /* _XT_IMQ_H */
++
+diff -U 5 -Nr linux-2.6.32/include/linux/netfilter_ipv4/ipt_IMQ.h linux-2.6.32-imq/include/linux/netfilter_ipv4/ipt_IMQ.h
+--- linux-2.6.32/include/linux/netfilter_ipv4/ipt_IMQ.h        1970-01-01 02:00:00.000000000 +0200
++++ linux-2.6.32-imq/include/linux/netfilter_ipv4/ipt_IMQ.h    2009-12-11 14:16:42.679730960 +0200
+@@ -0,0 +1,10 @@
++#ifndef _IPT_IMQ_H
++#define _IPT_IMQ_H
++
++/* Backwards compatibility for old userspace */
++#include <linux/netfilter/xt_IMQ.h>
++
++#define ipt_imq_info xt_imq_info
++
++#endif /* _IPT_IMQ_H */
++
+diff -U 5 -Nr linux-2.6.32/include/linux/netfilter_ipv6/ip6t_IMQ.h linux-2.6.32-imq/include/linux/netfilter_ipv6/ip6t_IMQ.h
+--- linux-2.6.32/include/linux/netfilter_ipv6/ip6t_IMQ.h       1970-01-01 02:00:00.000000000 +0200
++++ linux-2.6.32-imq/include/linux/netfilter_ipv6/ip6t_IMQ.h   2009-12-11 14:16:42.679730960 +0200
+@@ -0,0 +1,10 @@
++#ifndef _IP6T_IMQ_H
++#define _IP6T_IMQ_H
++
++/* Backwards compatibility for old userspace */
++#include <linux/netfilter/xt_IMQ.h>
++
++#define ip6t_imq_info xt_imq_info
++
++#endif /* _IP6T_IMQ_H */
++
+diff -U 5 -Nr linux-2.6.32/include/linux/skbuff.h linux-2.6.32-imq/include/linux/skbuff.h
+--- linux-2.6.32/include/linux/skbuff.h        2009-12-03 05:51:21.000000000 +0200
++++ linux-2.6.32-imq/include/linux/skbuff.h    2009-12-11 14:16:42.680730834 +0200
+@@ -27,10 +27,13 @@
+ #include <linux/textsearch.h>
+ #include <net/checksum.h>
+ #include <linux/rcupdate.h>
+ #include <linux/dmaengine.h>
+ #include <linux/hrtimer.h>
++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
++#include <linux/imq.h>
++#endif
+ 
+ /* Don't change this without changing skb_csum_unnecessary! */
+ #define CHECKSUM_NONE 0
+ #define CHECKSUM_UNNECESSARY 1
+ #define CHECKSUM_COMPLETE 2
+@@ -328,10 +331,13 @@
+        * layer. Please put your private variables there. If you
+        * want to keep them across layers you have to do a skb_clone()
+        * first. This is owned by whoever has the skb queued ATM.
+        */
+       char                    cb[48];
++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
++      void                    *cb_next;
++#endif
+ 
+       unsigned int            len,
+                               data_len;
+       __u16                   mac_len,
+                               hdr_len;
+@@ -360,10 +366,13 @@
+       void                    (*destructor)(struct sk_buff *skb);
+ #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
+       struct nf_conntrack     *nfct;
+       struct sk_buff          *nfct_reasm;
+ #endif
++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
++      struct nf_queue_entry   *nf_queue_entry;
++#endif
+ #ifdef CONFIG_BRIDGE_NETFILTER
+       struct nf_bridge_info   *nf_bridge;
+ #endif
+ 
+       int                     iif;
+@@ -381,10 +390,14 @@
+ #endif
+       kmemcheck_bitfield_end(flags2);
+ 
+       /* 0/14 bit hole */
+ 
++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
++      __u8                    imq_flags:IMQ_F_BITS;
++#endif
++
+ #ifdef CONFIG_NET_DMA
+       dma_cookie_t            dma_cookie;
+ #endif
+ #ifdef CONFIG_NETWORK_SECMARK
+       __u32                   secmark;
+@@ -435,10 +448,16 @@
+ static inline struct rtable *skb_rtable(const struct sk_buff *skb)
+ {
+       return (struct rtable *)skb_dst(skb);
+ }
+ 
++
++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
++extern int skb_save_cb(struct sk_buff *skb);
++extern int skb_restore_cb(struct sk_buff *skb);
++#endif
++
+ extern void kfree_skb(struct sk_buff *skb);
+ extern void consume_skb(struct sk_buff *skb);
+ extern void          __kfree_skb(struct sk_buff *skb);
+ extern struct sk_buff *__alloc_skb(unsigned int size,
+                                  gfp_t priority, int fclone, int node);
+@@ -1970,10 +1989,14 @@
+       nf_conntrack_get(src->nfct);
+       dst->nfctinfo = src->nfctinfo;
+       dst->nfct_reasm = src->nfct_reasm;
+       nf_conntrack_get_reasm(src->nfct_reasm);
+ #endif
++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
++      dst->imq_flags = src->imq_flags;
++      dst->nf_queue_entry = src->nf_queue_entry;
++#endif
+ #ifdef CONFIG_BRIDGE_NETFILTER
+       dst->nf_bridge  = src->nf_bridge;
+       nf_bridge_get(src->nf_bridge);
+ #endif
+ }
+diff -U 5 -Nr linux-2.6.32/include/net/netfilter/nf_queue.h linux-2.6.32-imq/include/net/netfilter/nf_queue.h
+--- linux-2.6.32/include/net/netfilter/nf_queue.h      2009-12-03 05:51:21.000000000 +0200
++++ linux-2.6.32-imq/include/net/netfilter/nf_queue.h  2009-12-11 14:16:42.680730834 +0200
+@@ -11,10 +11,16 @@
+       u_int8_t                pf;
+       unsigned int            hook;
+       struct net_device       *indev;
+       struct net_device       *outdev;
+       int                     (*okfn)(struct sk_buff *);
++
++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
++      int                     (*next_outfn)(struct nf_queue_entry *entry,
++                                            unsigned int queuenum);
++      unsigned int            next_queuenum;
++#endif
+ };
+ 
+ #define nf_queue_entry_reroute(x) ((void *)x + sizeof(struct nf_queue_entry))
+ 
+ /* Packet queuing */
+@@ -28,7 +34,13 @@
+                                    const struct nf_queue_handler *qh);
+ extern int nf_unregister_queue_handler(u_int8_t pf,
+                                      const struct nf_queue_handler *qh);
+ extern void nf_unregister_queue_handlers(const struct nf_queue_handler *qh);
+ extern void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict);
++extern void nf_queue_entry_release_refs(struct nf_queue_entry *entry);
++
++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
++extern void nf_register_queue_imq_handler(const struct nf_queue_handler *qh);
++extern void nf_unregister_queue_imq_handler(void);
++#endif
+ 
+ #endif /* _NF_QUEUE_H */
+diff -U 5 -Nr linux-2.6.32/net/core/dev.c linux-2.6.32-imq/net/core/dev.c
+--- linux-2.6.32/net/core/dev.c        2009-12-03 05:51:21.000000000 +0200
++++ linux-2.6.32-imq/net/core/dev.c    2009-12-11 14:16:42.681731014 +0200
+@@ -94,10 +94,13 @@
+ #include <linux/notifier.h>
+ #include <linux/skbuff.h>
+ #include <net/net_namespace.h>
+ #include <net/sock.h>
+ #include <linux/rtnetlink.h>
++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
++#include <linux/imq.h>
++#endif
+ #include <linux/proc_fs.h>
+ #include <linux/seq_file.h>
+ #include <linux/stat.h>
+ #include <linux/if_bridge.h>
+ #include <linux/if_macvlan.h>
+@@ -1702,11 +1705,15 @@
+ {
+       const struct net_device_ops *ops = dev->netdev_ops;
+       int rc;
+ 
+       if (likely(!skb->next)) {
+-              if (!list_empty(&ptype_all))
++              if (!list_empty(&ptype_all)
++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
++                  && !(skb->imq_flags & IMQ_F_ENQUEUE)
++#endif
++                  )
+                       dev_queue_xmit_nit(skb, dev);
+ 
+               if (netif_needs_gso(dev, skb)) {
+                       if (unlikely(dev_gso_segment(skb)))
+                               goto out_kfree_skb;
+@@ -1787,12 +1794,11 @@
+ 
+       return (u16) (((u64) hash * dev->real_num_tx_queues) >> 32);
+ }
+ EXPORT_SYMBOL(skb_tx_hash);
+ 
+-static struct netdev_queue *dev_pick_tx(struct net_device *dev,
+-                                      struct sk_buff *skb)
++struct netdev_queue *dev_pick_tx(struct net_device *dev, struct sk_buff *skb)
+ {
+       const struct net_device_ops *ops = dev->netdev_ops;
+       u16 queue_index = 0;
+ 
+       if (ops->ndo_select_queue)
+@@ -1801,10 +1807,11 @@
+               queue_index = skb_tx_hash(dev, skb);
+ 
+       skb_set_queue_mapping(skb, queue_index);
+       return netdev_get_tx_queue(dev, queue_index);
+ }
++EXPORT_SYMBOL(dev_pick_tx);
+ 
+ static inline int __dev_xmit_skb(struct sk_buff *skb, struct Qdisc *q,
+                                struct net_device *dev,
+                                struct netdev_queue *txq)
+ {
+diff -U 5 -Nr linux-2.6.32/net/core/skbuff.c linux-2.6.32-imq/net/core/skbuff.c
+--- linux-2.6.32/net/core/skbuff.c     2009-12-03 05:51:21.000000000 +0200
++++ linux-2.6.32-imq/net/core/skbuff.c 2009-12-11 15:12:39.294981618 +0200
+@@ -70,10 +70,13 @@
+ 
+ #include "kmap_skb.h"
+ 
+ static struct kmem_cache *skbuff_head_cache __read_mostly;
+ static struct kmem_cache *skbuff_fclone_cache __read_mostly;
++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
++static struct kmem_cache *skbuff_cb_store_cache __read_mostly;
++#endif
+ 
+ static void sock_pipe_buf_release(struct pipe_inode_info *pipe,
+                                 struct pipe_buffer *buf)
+ {
+       put_page(buf->page);
+@@ -89,10 +92,87 @@
+                              struct pipe_buffer *buf)
+ {
+       return 1;
+ }
+ 
++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
++/* Control buffer save/restore for IMQ devices */
++struct skb_cb_table {
++      void                    *cb_next;
++      atomic_t                refcnt;
++      char                    cb[48];
++};
++
++static DEFINE_SPINLOCK(skb_cb_store_lock);
++
++int skb_save_cb(struct sk_buff *skb)
++{
++      struct skb_cb_table *next;
++
++      next = kmem_cache_alloc(skbuff_cb_store_cache, GFP_ATOMIC);
++      if (!next)
++              return -ENOMEM;
++
++      BUILD_BUG_ON(sizeof(skb->cb) != sizeof(next->cb));
++
++      memcpy(next->cb, skb->cb, sizeof(skb->cb));
++      next->cb_next = skb->cb_next;
++
++      atomic_set(&next->refcnt, 1);
++
++      skb->cb_next = next;
++      return 0;
++}
++EXPORT_SYMBOL(skb_save_cb);
++
++int skb_restore_cb(struct sk_buff *skb)
++{
++      struct skb_cb_table *next;
++
++      if (!skb->cb_next)
++              return 0;
++
++      next = skb->cb_next;
++
++      BUILD_BUG_ON(sizeof(skb->cb) != sizeof(next->cb));
++
++      memcpy(skb->cb, next->cb, sizeof(skb->cb));
++      skb->cb_next = next->cb_next;
++
++      spin_lock(&skb_cb_store_lock);
++
++      if (atomic_dec_and_test(&next->refcnt)) {
++              kmem_cache_free(skbuff_cb_store_cache, next);
++      }
++
++      spin_unlock(&skb_cb_store_lock);
++
++      return 0;
++}
++EXPORT_SYMBOL(skb_restore_cb);
++
++static void skb_copy_stored_cb(struct sk_buff *new, const struct sk_buff *__old)
++{
++      struct skb_cb_table *next;
++      struct sk_buff *old;
++
++      if (!__old->cb_next) {
++              new->cb_next = NULL;
++              return;
++      }
++
++      spin_lock(&skb_cb_store_lock);
++
++      old = (struct sk_buff *)__old;
++
++      next = old->cb_next;
++      atomic_inc(&next->refcnt);
++      new->cb_next = next;
++
++      spin_unlock(&skb_cb_store_lock);
++}
++#endif
+ 
+ /* Pipe buffer operations for a socket. */
+ static struct pipe_buf_operations sock_pipe_buf_ops = {
+       .can_merge = 0,
+       .map = generic_pipe_buf_map,
+@@ -396,10 +476,30 @@
+ #endif
+       if (skb->destructor) {
+               WARN_ON(in_irq());
+               skb->destructor(skb);
+       }
++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
++      /* This should not happen. When it does, avoid memleak by restoring
++      the chain of cb-backups. */
++      while(skb->cb_next != NULL) {
++              if (net_ratelimit())
++                      printk(KERN_WARNING "IMQ: kfree_skb: skb->cb_next: "
++                              "%08x\n", (unsigned int)skb->cb_next);
++
++              skb_restore_cb(skb);
++      }
++      /* This should not happen either, nf_queue_entry is nullified in
++       * imq_dev_xmit(). If we have non-NULL nf_queue_entry then we are
++       * leaking entry pointers, maybe memory. We don't know if this is
++       * pointer to already freed memory, or should this be freed.
++       * If this happens we need to add refcounting, etc for nf_queue_entry.
++       */
++      if (skb->nf_queue_entry && net_ratelimit())
++              printk(KERN_WARNING
++                              "IMQ: kfree_skb: skb->nf_queue_entry != NULL");
++#endif
+ #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
+       nf_conntrack_put(skb->nfct);
+       nf_conntrack_put_reasm(skb->nfct_reasm);
+ #endif
+ #ifdef CONFIG_BRIDGE_NETFILTER
+@@ -533,10 +633,13 @@
+       skb_dst_set(new, dst_clone(skb_dst(old)));
+ #ifdef CONFIG_XFRM
+       new->sp                 = secpath_get(old->sp);
+ #endif
+       memcpy(new->cb, old->cb, sizeof(old->cb));
++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
++      skb_copy_stored_cb(new, old);
++#endif
+       new->csum               = old->csum;
+       new->local_df           = old->local_df;
+       new->pkt_type           = old->pkt_type;
+       new->ip_summed          = old->ip_summed;
+       skb_copy_queue_mapping(new, old);
+@@ -2774,10 +2877,17 @@
+                                               (2*sizeof(struct sk_buff)) +
+                                               sizeof(atomic_t),
+                                               0,
+                                               SLAB_HWCACHE_ALIGN|SLAB_PANIC,
+                                               NULL);
++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
++      skbuff_cb_store_cache = kmem_cache_create("skbuff_cb_store_cache",
++                                                sizeof(struct skb_cb_table),
++                                                0,
++                                                SLAB_HWCACHE_ALIGN|SLAB_PANIC,
++                                                NULL);
++#endif
+ }
+ 
+ /**
+  *    skb_to_sgvec - Fill a scatter-gather list from a socket buffer
+  *    @skb: Socket buffer containing the buffers to be mapped
+diff -U 5 -Nr linux-2.6.32/net/netfilter/Kconfig linux-2.6.32-imq/net/netfilter/Kconfig
+--- linux-2.6.32/net/netfilter/Kconfig 2009-12-03 05:51:21.000000000 +0200
++++ linux-2.6.32-imq/net/netfilter/Kconfig     2009-12-11 14:16:42.681731014 +0200
+@@ -394,10 +394,22 @@
+           echo netfilter-ssh > /sys/class/leds/<ledname>/trigger
+ 
+         For more information on the LEDs available on your system, see
+         Documentation/leds-class.txt
+ 
++config NETFILTER_XT_TARGET_IMQ
++        tristate '"IMQ" target support'
++      depends on NETFILTER_XTABLES
++      depends on IP_NF_MANGLE || IP6_NF_MANGLE
++      select IMQ
++      default m if NETFILTER_ADVANCED=n
++        help
++          This option adds a `IMQ' target which is used to specify if and
++          to which imq device packets should get enqueued/dequeued.
++
++          To compile it as a module, choose M here.  If unsure, say N.
++
+ config NETFILTER_XT_TARGET_MARK
+       tristate '"MARK" target support'
+       default m if NETFILTER_ADVANCED=n
+       help
+         This option adds a `MARK' target, which allows you to create rules
+diff -U 5 -Nr linux-2.6.32/net/netfilter/Makefile linux-2.6.32-imq/net/netfilter/Makefile
+--- linux-2.6.32/net/netfilter/Makefile        2009-12-03 05:51:21.000000000 +0200
++++ linux-2.6.32-imq/net/netfilter/Makefile    2009-12-11 14:16:42.681731014 +0200
+@@ -44,10 +44,11 @@
+ obj-$(CONFIG_NETFILTER_XT_TARGET_CLASSIFY) += xt_CLASSIFY.o
+ obj-$(CONFIG_NETFILTER_XT_TARGET_CONNMARK) += xt_CONNMARK.o
+ obj-$(CONFIG_NETFILTER_XT_TARGET_CONNSECMARK) += xt_CONNSECMARK.o
+ obj-$(CONFIG_NETFILTER_XT_TARGET_DSCP) += xt_DSCP.o
+ obj-$(CONFIG_NETFILTER_XT_TARGET_HL) += xt_HL.o
++obj-$(CONFIG_NETFILTER_XT_TARGET_IMQ) += xt_IMQ.o
+ obj-$(CONFIG_NETFILTER_XT_TARGET_LED) += xt_LED.o
+ obj-$(CONFIG_NETFILTER_XT_TARGET_MARK) += xt_MARK.o
+ obj-$(CONFIG_NETFILTER_XT_TARGET_NFLOG) += xt_NFLOG.o
+ obj-$(CONFIG_NETFILTER_XT_TARGET_NFQUEUE) += xt_NFQUEUE.o
+ obj-$(CONFIG_NETFILTER_XT_TARGET_NOTRACK) += xt_NOTRACK.o
+diff -U 5 -Nr linux-2.6.32/net/netfilter/nf_queue.c linux-2.6.32-imq/net/netfilter/nf_queue.c
+--- linux-2.6.32/net/netfilter/nf_queue.c      2009-12-03 05:51:21.000000000 +0200
++++ linux-2.6.32-imq/net/netfilter/nf_queue.c  2009-12-11 14:16:42.681731014 +0200
+@@ -18,10 +18,30 @@
+  */
+ static const struct nf_queue_handler *queue_handler[NFPROTO_NUMPROTO] __read_mostly;
+ 
+ static DEFINE_MUTEX(queue_handler_mutex);
+ 
++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
++static const struct nf_queue_handler *queue_imq_handler;
++
++void nf_register_queue_imq_handler(const struct nf_queue_handler *qh)
++{
++      mutex_lock(&queue_handler_mutex);
++      rcu_assign_pointer(queue_imq_handler, qh);
++      mutex_unlock(&queue_handler_mutex);
++}
++EXPORT_SYMBOL(nf_register_queue_imq_handler);
++
++void nf_unregister_queue_imq_handler(void)
++{
++      mutex_lock(&queue_handler_mutex);
++      rcu_assign_pointer(queue_imq_handler, NULL);
++      mutex_unlock(&queue_handler_mutex);
++}
++EXPORT_SYMBOL(nf_unregister_queue_imq_handler);
++#endif
++
+ /* return EBUSY when somebody else is registered, return EEXIST if the
+  * same handler is registered, return 0 in case of success. */
+ int nf_register_queue_handler(u_int8_t pf, const struct nf_queue_handler *qh)
+ {
+       int ret;
+@@ -78,11 +98,11 @@
+ 
+       synchronize_rcu();
+ }
+ EXPORT_SYMBOL_GPL(nf_unregister_queue_handlers);
+ 
+-static void nf_queue_entry_release_refs(struct nf_queue_entry *entry)
++void nf_queue_entry_release_refs(struct nf_queue_entry *entry)
+ {
+       /* Release those devices we held, or Alexey will kill me. */
+       if (entry->indev)
+               dev_put(entry->indev);
+       if (entry->outdev)
+@@ -98,10 +118,11 @@
+       }
+ #endif
+       /* Drop reference to owner of hook which queued us. */
+       module_put(entry->elem->owner);
+ }
++EXPORT_SYMBOL_GPL(nf_queue_entry_release_refs);
+ 
+ /*
+  * Any packet that leaves via this function must come back
+  * through nf_reinject().
+  */
+@@ -119,16 +140,30 @@
+       struct net_device *physindev;
+       struct net_device *physoutdev;
+ #endif
+       const struct nf_afinfo *afinfo;
+       const struct nf_queue_handler *qh;
++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
++      const struct nf_queue_handler *qih = NULL;
++#endif
+ 
+       /* QUEUE == DROP if noone is waiting, to be safe. */
+       rcu_read_lock();
+ 
+       qh = rcu_dereference(queue_handler[pf]);
++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
++#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
++      if (pf == PF_INET || pf == PF_INET6)
++#else
++      if (pf == PF_INET)
++#endif
++              qih = rcu_dereference(queue_imq_handler);
++
++      if (!qh && !qih)
++#else /* !IMQ */
+       if (!qh)
++#endif
+               goto err_unlock;
+ 
+       afinfo = nf_get_afinfo(pf);
+       if (!afinfo)
+               goto err_unlock;
+@@ -143,10 +178,14 @@
+               .pf     = pf,
+               .hook   = hook,
+               .indev  = indev,
+               .outdev = outdev,
+               .okfn   = okfn,
++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
++              .next_outfn = qh ? qh->outfn : NULL,
++              .next_queuenum = queuenum,
++#endif
+       };
+ 
+       /* If it's going away, ignore hook. */
+       if (!try_module_get(entry->elem->owner)) {
+               rcu_read_unlock();
+@@ -168,12 +207,23 @@
+               if (physoutdev)
+                       dev_hold(physoutdev);
+       }
+ #endif
+       afinfo->saveroute(skb, entry);
++
++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
++      if (qih) {
++              status = qih->outfn(entry, queuenum);
++              goto imq_skip_queue;
++      }
++#endif
++
+       status = qh->outfn(entry, queuenum);
+ 
++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
++imq_skip_queue:
++#endif
+       rcu_read_unlock();
+ 
+       if (status < 0) {
+               nf_queue_entry_release_refs(entry);
+               goto err;
+diff -U 5 -Nr linux-2.6.32/net/netfilter/xt_IMQ.c linux-2.6.32-imq/net/netfilter/xt_IMQ.c
+--- linux-2.6.32/net/netfilter/xt_IMQ.c        1970-01-01 02:00:00.000000000 +0200
++++ linux-2.6.32-imq/net/netfilter/xt_IMQ.c    2009-12-11 14:16:42.681731014 +0200
+@@ -0,0 +1,73 @@
++/*
++ * This target marks packets to be enqueued to an imq device
++ */
++#include <linux/module.h>
++#include <linux/skbuff.h>
++#include <linux/netfilter/x_tables.h>
++#include <linux/netfilter/xt_IMQ.h>
++#include <linux/imq.h>
++
++static unsigned int imq_target(struct sk_buff *pskb,
++                              const struct xt_target_param *par)
++{
++      const struct xt_imq_info *mr = par->targinfo;
++
++      pskb->imq_flags = (mr->todev & IMQ_F_IFMASK) | IMQ_F_ENQUEUE;
++
++      return XT_CONTINUE;
++}
++
++static bool imq_checkentry(const struct xt_tgchk_param *par)
++{
++      struct xt_imq_info *mr = par->targinfo;
++
++      if (mr->todev > IMQ_MAX_DEVS - 1) {
++              printk(KERN_WARNING
++                     "IMQ: invalid device specified, highest is %u\n",
++                     IMQ_MAX_DEVS - 1);
++              return 0;
++      }
++
++      return 1;
++}
++
++static struct xt_target xt_imq_reg[] __read_mostly = {
++      {
++              .name           = "IMQ",
++              .family         = AF_INET,
++              .checkentry     = imq_checkentry,
++              .target         = imq_target,
++              .targetsize     = sizeof(struct xt_imq_info),
++              .table          = "mangle",
++              .me             = THIS_MODULE
++      },
++      {
++              .name           = "IMQ",
++              .family         = AF_INET6,
++              .checkentry     = imq_checkentry,
++              .target         = imq_target,
++              .targetsize     = sizeof(struct xt_imq_info),
++              .table          = "mangle",
++              .me             = THIS_MODULE
++      },
++};
++
++static int __init imq_init(void)
++{
++      return xt_register_targets(xt_imq_reg, ARRAY_SIZE(xt_imq_reg));
++}
++
++static void __exit imq_fini(void)
++{
++      xt_unregister_targets(xt_imq_reg, ARRAY_SIZE(xt_imq_reg));
++}
++
++module_init(imq_init);
++module_exit(imq_fini);
++
++MODULE_AUTHOR("http://www.linuximq.net");
++MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information.");
++MODULE_LICENSE("GPL");
++MODULE_ALIAS("ipt_IMQ");
++MODULE_ALIAS("ip6t_IMQ");
++

diff --git a/src/patches/linux-2.6.32.8-ipp2p-0.8.2-pomng.patch b/src/patches/linux-2.6.32.8-ipp2p-0.8.2-pomng.patch
new file mode 100644 (file)
index 0000000..359892f
--- /dev/null
+++ b/src/patches/linux-2.6.32.8-ipp2p-0.8.2-pomng.patch
@@ -0,0 +1,1033 @@
+diff -Naur linux-2.6.32.8.org/include/linux/netfilter_ipv4/ipt_ipp2p.h linux-2.6.32.8/include/linux/netfilter_ipv4/ipt_ipp2p.h
+--- linux-2.6.32.8.org/include/linux/netfilter_ipv4/ipt_ipp2p.h        1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.8/include/linux/netfilter_ipv4/ipt_ipp2p.h    2010-02-13 19:54:30.000000000 +0100
+@@ -0,0 +1,31 @@
++#ifndef __IPT_IPP2P_H
++#define __IPT_IPP2P_H
++#define IPP2P_VERSION "0.8.2-pomng"
++
++struct ipt_p2p_info {
++    int cmd;
++    int debug;
++};
++
++#endif //__IPT_IPP2P_H
++
++#define SHORT_HAND_IPP2P      1 /* --ipp2p switch*/
++//#define SHORT_HAND_DATA             4 /* --ipp2p-data switch*/
++#define SHORT_HAND_NONE               5 /* no short hand*/
++
++#define IPP2P_EDK             (1 << 1)
++#define IPP2P_DATA_KAZAA      (1 << 2)
++#define IPP2P_DATA_EDK                (1 << 3)
++#define IPP2P_DATA_DC         (1 << 4)
++#define IPP2P_DC              (1 << 5)
++#define IPP2P_DATA_GNU                (1 << 6)
++#define IPP2P_GNU             (1 << 7)
++#define IPP2P_KAZAA           (1 << 8)
++#define IPP2P_BIT             (1 << 9)
++#define IPP2P_APPLE           (1 << 10)
++#define IPP2P_SOUL            (1 << 11)
++#define IPP2P_WINMX           (1 << 12)
++#define IPP2P_ARES            (1 << 13)
++#define IPP2P_MUTE            (1 << 14)
++#define IPP2P_WASTE           (1 << 15)
++#define IPP2P_XDCC            (1 << 16)
+diff -Naur linux-2.6.32.8.org/net/ipv4/netfilter/ipt_ipp2p.c linux-2.6.32.8/net/ipv4/netfilter/ipt_ipp2p.c
+--- linux-2.6.32.8.org/net/ipv4/netfilter/ipt_ipp2p.c  1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.8/net/ipv4/netfilter/ipt_ipp2p.c      2010-02-13 19:54:30.000000000 +0100
+@@ -0,0 +1,964 @@
++#if defined(MODVERSIONS)
++#include <linux/modversions.h>
++#endif
++#include <linux/module.h>
++#include <linux/version.h>
++#include <linux/netfilter_ipv4/ip_tables.h>
++#include <linux/netfilter_ipv4/ipt_ipp2p.h>
++#include <net/tcp.h>
++#include <net/udp.h>
++
++#define get_u8(X,O)  (*(__u8 *)(X + O))
++#define get_u16(X,O)  (*(__u16 *)(X + O))
++#define get_u32(X,O)  (*(__u32 *)(X + O))
++
++MODULE_AUTHOR("Eicke Friedrich/Klaus Degner <ipp2p@ipp2p.org>");
++MODULE_DESCRIPTION("An extension to iptables to identify P2P traffic.");
++MODULE_LICENSE("GPL");
++
++
++/*Search for UDP eDonkey/eMule/Kad commands*/
++int
++udp_search_edk (unsigned char *haystack, int packet_len)
++{
++    unsigned char *t = haystack;
++    t += 8;
++
++      switch (t[0]) {
++              case 0xe3: 
++              {       /*edonkey*/
++                      switch (t[1]) 
++                      {
++                              /* client -> server status request */
++                              case 0x96: 
++                                      if (packet_len == 14) return ((IPP2P_EDK * 100) + 50);
++                                      break;
++                              /* server -> client status request */
++                              case 0x97: if (packet_len == 42) return ((IPP2P_EDK * 100) + 51);
++                                      break;
++                                              /* server description request */
++                                              /* e3 2a ff f0 .. | size == 6 */
++                              case 0xa2: if ( (packet_len == 14) && ( get_u16(t,2) == __constant_htons(0xfff0) ) ) return ((IPP2P_EDK * 100) + 52);
++                                      break;
++                                              /* server description response */
++                                              /* e3 a3 ff f0 ..  | size > 40 && size < 200 */
++                              //case 0xa3: return ((IPP2P_EDK * 100) + 53);
++                              //      break;
++                              case 0x9a: if (packet_len==26) return ((IPP2P_EDK * 100) + 54);
++                                      break;
++
++                              case 0x92: if (packet_len==18) return ((IPP2P_EDK * 100) + 55);
++                                      break;
++                      }
++                      break;
++              }
++              case 0xe4: 
++              {
++                      switch (t[1]) 
++                      {
++                                              /* e4 20 .. | size == 43 */
++                              case 0x20: if ((packet_len == 43) && (t[2] != 0x00) && (t[34] != 0x00)) return ((IPP2P_EDK * 100) + 60);
++                                      break;
++                                              /* e4 00 .. 00 | size == 35 ? */
++                              case 0x00: if ((packet_len == 35) && (t[26] == 0x00)) return ((IPP2P_EDK * 100) + 61);
++                                      break;
++                                              /* e4 10 .. 00 | size == 35 ? */
++                              case 0x10: if ((packet_len == 35) && (t[26] == 0x00)) return ((IPP2P_EDK * 100) + 62);
++                                      break;
++                                              /* e4 18 .. 00 | size == 35 ? */
++                              case 0x18: if ((packet_len == 35) && (t[26] == 0x00)) return ((IPP2P_EDK * 100) + 63);
++                                      break;
++                                              /* e4 52 .. | size = 44 */
++                              case 0x52: if (packet_len == 44 ) return ((IPP2P_EDK * 100) + 64);
++                                      break;
++                                              /* e4 58 .. | size == 6 */
++                              case 0x58: if (packet_len == 14 ) return ((IPP2P_EDK * 100) + 65);
++                                      break;
++                                              /* e4 59 .. | size == 2 */
++                              case 0x59: if (packet_len == 10 )return ((IPP2P_EDK * 100) + 66);
++                                      break;
++                                      /* e4 28 .. | packet_len == 52,77,102,127... */
++                              case 0x28: if (((packet_len-52) % 25) == 0) return ((IPP2P_EDK * 100) + 67);
++                                      break;
++                                      /* e4 50 xx xx | size == 4 */
++                              case 0x50: if (packet_len == 12) return ((IPP2P_EDK * 100) + 68);
++                                      break;
++                                      /* e4 40 xx xx | size == 48 */
++                              case 0x40: if (packet_len == 56) return ((IPP2P_EDK * 100) + 69);
++                                      break;
++                      }
++                      break;
++              }
++      } /* end of switch (t[0]) */
++    return 0;
++}/*udp_search_edk*/
++
++
++/*Search for UDP Gnutella commands*/
++int
++udp_search_gnu (unsigned char *haystack, int packet_len)
++{
++    unsigned char *t = haystack;
++    t += 8;
++    
++    if (memcmp(t, "GND", 3) == 0) return ((IPP2P_GNU * 100) + 51);
++    if (memcmp(t, "GNUTELLA ", 9) == 0) return ((IPP2P_GNU * 100) + 52);
++    return 0;
++}/*udp_search_gnu*/
++
++
++/*Search for UDP KaZaA commands*/
++int
++udp_search_kazaa (unsigned char *haystack, int packet_len)
++{
++    unsigned char *t = haystack;
++    
++    if (t[packet_len-1] == 0x00){
++      t += (packet_len - 6);
++      if (memcmp(t, "KaZaA", 5) == 0) return (IPP2P_KAZAA * 100 +50);
++    }
++    
++    return 0;
++}/*udp_search_kazaa*/
++
++/*Search for UDP DirectConnect commands*/
++int
++udp_search_directconnect (unsigned char *haystack, int packet_len)
++{
++    unsigned char *t = haystack;
++    if ((*(t + 8) == 0x24) && (*(t + packet_len - 1) == 0x7c)) {
++      t+=8;
++      if (memcmp(t, "SR ", 3) == 0)                   return ((IPP2P_DC * 100) + 60);
++      if (memcmp(t, "Ping ", 5) == 0)                 return ((IPP2P_DC * 100) + 61);
++    }
++    return 0;
++}/*udp_search_directconnect*/
++
++
++
++/*Search for UDP BitTorrent commands*/
++int
++udp_search_bit (unsigned char *haystack, int packet_len)
++{
++      switch(packet_len)
++      {
++              case 24:
++                      /* ^ 00 00 04 17 27 10 19 80 */
++                      if ((ntohl(get_u32(haystack, 8)) == 0x00000417) && (ntohl(get_u32(haystack, 12)) == 0x27101980)) 
++                              return (IPP2P_BIT * 100 + 50);
++                      break;
++              case 44:
++                      if (get_u32(haystack, 16) == __constant_htonl(0x00000400) && get_u32(haystack, 36) == __constant_htonl(0x00000104)) 
++                              return (IPP2P_BIT * 100 + 51);
++                      if (get_u32(haystack, 16) == __constant_htonl(0x00000400))
++                              return (IPP2P_BIT * 100 + 61);
++                      break;
++              case 65:
++                      if (get_u32(haystack, 16) == __constant_htonl(0x00000404) && get_u32(haystack, 36) == __constant_htonl(0x00000104)) 
++                              return (IPP2P_BIT * 100 + 52);
++                      if (get_u32(haystack, 16) == __constant_htonl(0x00000404))
++                              return (IPP2P_BIT * 100 + 62);
++                      break;
++              case 67:
++                      if (get_u32(haystack, 16) == __constant_htonl(0x00000406) && get_u32(haystack, 36) == __constant_htonl(0x00000104)) 
++                              return (IPP2P_BIT * 100 + 53);
++                      if (get_u32(haystack, 16) == __constant_htonl(0x00000406))
++                              return (IPP2P_BIT * 100 + 63);
++                      break;
++              case 211:
++                      if (get_u32(haystack, 8) == __constant_htonl(0x00000405)) 
++                              return (IPP2P_BIT * 100 + 54);
++                      break;
++              case 29:
++                      if ((get_u32(haystack, 8) == __constant_htonl(0x00000401))) 
++                              return (IPP2P_BIT * 100 + 55);
++                      break;
++              case 52:
++                      if (get_u32(haystack,8)  == __constant_htonl(0x00000827) &&
++                      get_u32(haystack,12) == __constant_htonl(0x37502950))
++                              return (IPP2P_BIT * 100 + 80);
++                      break;
++              default:
++                      /* this packet does not have a constant size */
++                      if (packet_len >= 40 && get_u32(haystack, 16) == __constant_htonl(0x00000402) && get_u32(haystack, 36) == __constant_htonl(0x00000104)) 
++                              return (IPP2P_BIT * 100 + 56);
++                      break;
++      }
++    
++      /* some extra-bitcomet rules:
++      * "d1:" [a|r] "d2:id20:"
++      */
++      if (packet_len > 30 && get_u8(haystack, 8) == 'd' && get_u8(haystack, 9) == '1' && get_u8(haystack, 10) == ':' )
++      {
++              if (get_u8(haystack, 11) == 'a' || get_u8(haystack, 11) == 'r')
++              {
++                      if (memcmp(haystack+12,"d2:id20:",8)==0)
++                              return (IPP2P_BIT * 100 + 57);
++              }
++      }
++    
++#if 0
++      /* bitlord rules */
++      /* packetlen must be bigger than 40 */
++      /* first 4 bytes are zero */
++      if (packet_len > 40 && get_u32(haystack, 8) == 0x00000000)
++      {
++              /* first rule: 00 00 00 00 01 00 00 xx xx xx xx 00 00 00 00*/
++              if (get_u32(haystack, 12) == 0x00000000 && 
++                  get_u32(haystack, 16) == 0x00010000 &&
++                  get_u32(haystack, 24) == 0x00000000 )
++                      return (IPP2P_BIT * 100 + 71);
++                      
++              /* 00 01 00 00 0d 00 00 xx xx xx xx 00 00 00 00*/
++              if (get_u32(haystack, 12) == 0x00000001 && 
++                  get_u32(haystack, 16) == 0x000d0000 &&
++                  get_u32(haystack, 24) == 0x00000000 )
++                      return (IPP2P_BIT * 100 + 71);
++              
++                  
++      }
++#endif
++
++    return 0;
++}/*udp_search_bit*/
++
++
++
++/*Search for Ares commands*/
++//#define IPP2P_DEBUG_ARES
++int
++search_ares (const unsigned char *payload, const u16 plen)
++//int search_ares (unsigned char *haystack, int packet_len, int head_len)
++{
++//    const unsigned char *t = haystack + head_len;
++      
++      /* all ares packets start with  */
++      if (payload[1] == 0 && (plen - payload[0]) == 3)
++      {
++              switch (payload[2])
++              {
++                      case 0x5a:
++                              /* ares connect */
++                              if ( plen == 6 && payload[5] == 0x05 ) return ((IPP2P_ARES * 100) + 1);
++                              break;
++                      case 0x09:
++                              /* ares search, min 3 chars --> 14 bytes
++                               * lets define a search can be up to 30 chars --> max 34 bytes
++                               */
++                              if ( plen >= 14 && plen <= 34 ) return ((IPP2P_ARES * 100) + 1);
++                              break;
++#ifdef IPP2P_DEBUG_ARES
++                      default:
++                      printk(KERN_DEBUG "Unknown Ares command %x recognized, len: %u \n", (unsigned int) payload[2],plen);
++#endif /* IPP2P_DEBUG_ARES */
++              }
++      }
++
++#if 0         
++      /* found connect packet: 03 00 5a 04 03 05 */
++      /* new version ares 1.8: 03 00 5a xx xx 05 */
++    if ((plen) == 6){ /* possible connect command*/
++      if ((payload[0] == 0x03) && (payload[1] == 0x00) && (payload[2] == 0x5a) && (payload[5] == 0x05))
++          return ((IPP2P_ARES * 100) + 1);
++    }
++    if ((plen) == 60){        /* possible download command*/
++      if ((payload[59] == 0x0a) && (payload[58] == 0x0a)){
++          if (memcmp(t, "PUSH SHA1:", 10) == 0) /* found download command */
++              return ((IPP2P_ARES * 100) + 2);
++      }
++    }
++#endif
++
++    return 0;
++} /*search_ares*/
++
++/*Search for SoulSeek commands*/
++int
++search_soul (const unsigned char *payload, const u16 plen)
++{
++//#define IPP2P_DEBUG_SOUL
++    /* match: xx xx xx xx | xx = sizeof(payload) - 4 */
++    if (get_u32(payload, 0) == (plen - 4)){
++      const __u32 m=get_u32(payload, 4);
++      /* match 00 yy yy 00, yy can be everything */
++        if ( get_u8(payload, 4) == 0x00 && get_u8(payload, 7) == 0x00 )
++      {
++#ifdef IPP2P_DEBUG_SOUL
++      printk(KERN_DEBUG "0: Soulseek command 0x%x recognized\n",get_u32(payload, 4));
++#endif /* IPP2P_DEBUG_SOUL */
++              return ((IPP2P_SOUL * 100) + 1);
++      }
++      
++        /* next match: 01 yy 00 00 | yy can be everything */
++        if ( get_u8(payload, 4) == 0x01 && get_u16(payload, 6) == 0x0000 )
++      {
++#ifdef IPP2P_DEBUG_SOUL
++      printk(KERN_DEBUG "1: Soulseek command 0x%x recognized\n",get_u16(payload, 4));
++#endif /* IPP2P_DEBUG_SOUL */
++              return ((IPP2P_SOUL * 100) + 2);
++      }
++      
++      /* other soulseek commandos are: 1-5,7,9,13-18,22,23,26,28,35-37,40-46,50,51,60,62-69,91,92,1001 */
++      /* try to do this in an intelligent way */
++      /* get all small commandos */
++      switch(m)
++      {
++              case 7:
++              case 9:
++              case 22:
++              case 23:
++              case 26:
++              case 28:
++              case 50:
++              case 51:
++              case 60:
++              case 91:
++              case 92:
++              case 1001:
++#ifdef IPP2P_DEBUG_SOUL
++              printk(KERN_DEBUG "2: Soulseek command 0x%x recognized\n",get_u16(payload, 4));
++#endif /* IPP2P_DEBUG_SOUL */
++              return ((IPP2P_SOUL * 100) + 3);
++      }
++      
++      if (m > 0 && m < 6 ) 
++      {
++#ifdef IPP2P_DEBUG_SOUL
++              printk(KERN_DEBUG "3: Soulseek command 0x%x recognized\n",get_u16(payload, 4));
++#endif /* IPP2P_DEBUG_SOUL */
++              return ((IPP2P_SOUL * 100) + 4);
++      }
++      if (m > 12 && m < 19 )
++      {
++#ifdef IPP2P_DEBUG_SOUL
++              printk(KERN_DEBUG "4: Soulseek command 0x%x recognized\n",get_u16(payload, 4));
++#endif /* IPP2P_DEBUG_SOUL */
++              return ((IPP2P_SOUL * 100) + 5);
++      }
++
++      if (m > 34 && m < 38 )
++      {
++#ifdef IPP2P_DEBUG_SOUL
++              printk(KERN_DEBUG "5: Soulseek command 0x%x recognized\n",get_u16(payload, 4));
++#endif /* IPP2P_DEBUG_SOUL */
++              return ((IPP2P_SOUL * 100) + 6);
++      }
++
++      if (m > 39 && m < 47 )
++      {
++#ifdef IPP2P_DEBUG_SOUL
++              printk(KERN_DEBUG "6: Soulseek command 0x%x recognized\n",get_u16(payload, 4));
++#endif /* IPP2P_DEBUG_SOUL */
++              return ((IPP2P_SOUL * 100) + 7);
++      }
++
++      if (m > 61 && m < 70 ) 
++      {
++#ifdef IPP2P_DEBUG_SOUL
++              printk(KERN_DEBUG "7: Soulseek command 0x%x recognized\n",get_u16(payload, 4));
++#endif /* IPP2P_DEBUG_SOUL */
++              return ((IPP2P_SOUL * 100) + 8);
++      }
++
++#ifdef IPP2P_DEBUG_SOUL
++      printk(KERN_DEBUG "unknown SOULSEEK command: 0x%x, first 16 bit: 0x%x, first 8 bit: 0x%x ,soulseek ???\n",get_u32(payload, 4),get_u16(payload, 4) >> 16,get_u8(payload, 4) >> 24);
++#endif /* IPP2P_DEBUG_SOUL */
++    }
++      
++      /* match 14 00 00 00 01 yy 00 00 00 STRING(YY) 01 00 00 00 00 46|50 00 00 00 00 */
++      /* without size at the beginning !!! */
++      if ( get_u32(payload, 0) == 0x14 && get_u8(payload, 4) == 0x01 )
++      {
++              __u32 y=get_u32(payload, 5);
++              /* we need 19 chars + string */
++              if ( (y + 19) <= (plen) )
++              {
++                      const unsigned char *w=payload+9+y;
++                      if (get_u32(w, 0) == 0x01 && ( get_u16(w, 4) == 0x4600 || get_u16(w, 4) == 0x5000) && get_u32(w, 6) == 0x00);
++#ifdef IPP2P_DEBUG_SOUL
++                      printk(KERN_DEBUG "Soulssek special client command recognized\n");
++#endif /* IPP2P_DEBUG_SOUL */
++                      return ((IPP2P_SOUL * 100) + 9);
++              }
++      }
++    return 0;
++}
++
++
++/*Search for WinMX commands*/
++int
++search_winmx (const unsigned char *payload, const u16 plen)
++{
++//#define IPP2P_DEBUG_WINMX
++    if (((plen) == 4) && (memcmp(payload, "SEND", 4) == 0))  return ((IPP2P_WINMX * 100) + 1);
++    if (((plen) == 3) && (memcmp(payload, "GET", 3) == 0))  return ((IPP2P_WINMX * 100) + 2);
++    //if (packet_len < (head_len + 10)) return 0;
++    if (plen < 10) return 0;
++    
++    if ((memcmp(payload, "SEND", 4) == 0) || (memcmp(payload, "GET", 3) == 0)){
++        u16 c=4;
++        const u16 end=plen-2;
++        u8 count=0;
++        while (c < end)
++        {
++              if (payload[c]== 0x20 && payload[c+1] == 0x22)
++              {
++                      c++;
++                      count++;
++                      if (count>=2) return ((IPP2P_WINMX * 100) + 3);
++              }
++              c++;
++        }
++    }
++    
++    if ( plen == 149 && payload[0] == '8' )
++    {
++#ifdef IPP2P_DEBUG_WINMX
++      printk(KERN_INFO "maybe WinMX\n");
++#endif
++      if (get_u32(payload,17) == 0 && get_u32(payload,21) == 0 && get_u32(payload,25) == 0 &&
++//                get_u32(payload,33) == __constant_htonl(0x71182b1a) && get_u32(payload,37) == __constant_htonl(0x05050000) &&
++//                get_u32(payload,133) == __constant_htonl(0x31097edf) && get_u32(payload,145) == __constant_htonl(0xdcb8f792))
++          get_u16(payload,39) == 0 && get_u16(payload,135) == __constant_htons(0x7edf) && get_u16(payload,147) == __constant_htons(0xf792))
++          
++      {
++#ifdef IPP2P_DEBUG_WINMX
++              printk(KERN_INFO "got WinMX\n");
++#endif
++              return ((IPP2P_WINMX * 100) + 4);
++      }
++    }
++    return 0;
++} /*search_winmx*/
++
++
++/*Search for appleJuice commands*/
++int
++search_apple (const unsigned char *payload, const u16 plen)
++{
++    if ( (plen > 7) && (payload[6] == 0x0d) && (payload[7] == 0x0a) && (memcmp(payload, "ajprot", 6) == 0))  return (IPP2P_APPLE * 100);
++    
++    return 0;
++}
++
++
++/*Search for BitTorrent commands*/
++int
++search_bittorrent (const unsigned char *payload, const u16 plen)
++{
++    if (plen > 20)
++    {
++      /* test for match 0x13+"BitTorrent protocol" */
++      if (payload[0] == 0x13) 
++      {
++              if (memcmp(payload+1, "BitTorrent protocol", 19) == 0) return (IPP2P_BIT * 100);
++      }
++      
++      /* get tracker commandos, all starts with GET /
++      * then it can follow: scrape| announce
++      * and then ?hash_info=
++      */
++      if (memcmp(payload,"GET /",5) == 0)
++      {
++              /* message scrape */
++              if ( memcmp(payload+5,"scrape?info_hash=",17)==0 ) return (IPP2P_BIT * 100 + 1);
++              /* message announce */
++              if ( memcmp(payload+5,"announce?info_hash=",19)==0 ) return (IPP2P_BIT * 100 + 2);
++      }
++    } 
++    else 
++    {
++      /* bitcomet encryptes the first packet, so we have to detect another 
++       * one later in the flow */
++       /* first try failed, too many missdetections */
++      //if ( size == 5 && get_u32(t,0) == __constant_htonl(1) && t[4] < 3) return (IPP2P_BIT * 100 + 3);
++      
++      /* second try: block request packets */
++      if ( plen == 17 && get_u32(payload,0) == __constant_htonl(0x0d) && payload[4] == 0x06 && get_u32(payload,13) == __constant_htonl(0x4000) ) return (IPP2P_BIT * 100 + 3);
++    }
++
++    return 0;
++}
++
++
++
++/*check for Kazaa get command*/
++int
++search_kazaa (const unsigned char *payload, const u16 plen)
++
++{
++    if ((payload[plen-2] == 0x0d) && (payload[plen-1] == 0x0a) && memcmp(payload, "GET /.hash=", 11) == 0)
++      return (IPP2P_DATA_KAZAA * 100);
++
++    return 0;
++}
++
++
++/*check for gnutella get command*/
++int
++search_gnu (const unsigned char *payload, const u16 plen)
++{
++    if ((payload[plen-2] == 0x0d) && (payload[plen-1] == 0x0a))
++    {
++      if (memcmp(payload, "GET /get/", 9) == 0)       return ((IPP2P_DATA_GNU * 100) + 1);
++      if (memcmp(payload, "GET /uri-res/", 13) == 0) return ((IPP2P_DATA_GNU * 100) + 2); 
++    }
++    return 0;
++}
++
++
++/*check for gnutella get commands and other typical data*/
++int
++search_all_gnu (const unsigned char *payload, const u16 plen)
++{
++    
++    if ((payload[plen-2] == 0x0d) && (payload[plen-1] == 0x0a))
++    {
++      
++      if (memcmp(payload, "GNUTELLA CONNECT/", 17) == 0) return ((IPP2P_GNU * 100) + 1);
++      if (memcmp(payload, "GNUTELLA/", 9) == 0) return ((IPP2P_GNU * 100) + 2);    
++    
++    
++      if ((memcmp(payload, "GET /get/", 9) == 0) || (memcmp(payload, "GET /uri-res/", 13) == 0))
++      {        
++              u16 c=8;
++              const u16 end=plen-22;
++              while (c < end) {
++                      if ( payload[c] == 0x0a && payload[c+1] == 0x0d && ((memcmp(&payload[c+2], "X-Gnutella-", 11) == 0) || (memcmp(&payload[c+2], "X-Queue:", 8) == 0))) 
++                              return ((IPP2P_GNU * 100) + 3);
++                      c++;
++              }
++      }
++    }
++    return 0;
++}
++
++
++/*check for KaZaA download commands and other typical data*/
++int
++search_all_kazaa (const unsigned char *payload, const u16 plen)
++{
++    if ((payload[plen-2] == 0x0d) && (payload[plen-1] == 0x0a))
++    {
++
++      if (memcmp(payload, "GIVE ", 5) == 0) return ((IPP2P_KAZAA * 100) + 1);
++    
++      if (memcmp(payload, "GET /", 5) == 0) {
++              u16 c = 8;
++              const u16 end=plen-22;
++              while (c < end) {
++                      if ( payload[c] == 0x0a && payload[c+1] == 0x0d && ((memcmp(&payload[c+2], "X-Kazaa-Username: ", 18) == 0) || (memcmp(&payload[c+2], "User-Agent: PeerEnabler/", 24) == 0)))
++                              return ((IPP2P_KAZAA * 100) + 2);
++                      c++;
++              }
++      }
++    }
++    return 0;
++}
++
++/*fast check for edonkey file segment transfer command*/
++int
++search_edk (const unsigned char *payload, const u16 plen)
++{
++    if (payload[0] != 0xe3) 
++      return 0;
++    else {
++      if (payload[5] == 0x47) 
++          return (IPP2P_DATA_EDK * 100);
++      else    
++          return 0;
++    }
++}
++
++
++
++/*intensive but slower search for some edonkey packets including size-check*/
++int
++search_all_edk (const unsigned char *payload, const u16 plen)
++{
++    if (payload[0] != 0xe3) 
++      return 0;
++    else {
++      //t += head_len;        
++      const u16 cmd = get_u16(payload, 1);
++      if (cmd == (plen - 5)) {
++          switch (payload[5]) {
++              case 0x01: return ((IPP2P_EDK * 100) + 1);      /*Client: hello or Server:hello*/
++              case 0x4c: return ((IPP2P_EDK * 100) + 9);      /*Client: Hello-Answer*/
++          }
++      }
++      return 0;
++     }
++}
++
++
++/*fast check for Direct Connect send command*/
++int
++search_dc (const unsigned char *payload, const u16 plen)
++{
++
++    if (payload[0] != 0x24 ) 
++      return 0;
++    else {
++      if (memcmp(&payload[1], "Send|", 5) == 0)
++          return (IPP2P_DATA_DC * 100);
++      else
++          return 0;
++    } 
++
++}
++
++
++/*intensive but slower check for all direct connect packets*/
++int
++search_all_dc (const unsigned char *payload, const u16 plen)
++{
++//    unsigned char *t = haystack;
++
++    if (payload[0] == 0x24 && payload[plen-1] == 0x7c) 
++    {
++      const unsigned char *t=&payload[1];
++              /* Client-Hub-Protocol */
++      if (memcmp(t, "Lock ", 5) == 0)                 return ((IPP2P_DC * 100) + 1);
++      /* Client-Client-Protocol, some are already recognized by client-hub (like lock) */
++      if (memcmp(t, "MyNick ", 7) == 0)               return ((IPP2P_DC * 100) + 38); 
++    }
++    return 0;
++}
++
++/*check for mute*/
++int
++search_mute (const unsigned char *payload, const u16 plen)
++{
++      if ( plen == 209 || plen == 345 || plen == 473 || plen == 609 || plen == 1121 )
++      {
++              //printk(KERN_DEBUG "size hit: %u",size);
++              if (memcmp(payload,"PublicKey: ",11) == 0 )
++              { 
++                      return ((IPP2P_MUTE * 100) + 0);
++                      
++/*                    if (memcmp(t+size-14,"\x0aEndPublicKey\x0a",14) == 0)
++                      {
++                              printk(KERN_DEBUG "end pubic key hit: %u",size);
++                              
++                      }*/
++              }
++      }
++      return 0;
++}
++
++
++/* check for xdcc */
++int
++search_xdcc (const unsigned char *payload, const u16 plen)
++{
++      /* search in small packets only */
++      if (plen > 20 && plen < 200 && payload[plen-1] == 0x0a && payload[plen-2] == 0x0d && memcmp(payload,"PRIVMSG ",8) == 0)
++      {
++              
++              u16 x=10;
++              const u16 end=plen - 13;
++              
++              /* is seems to be a irc private massage, chedck for xdcc command */
++              while (x < end)
++              {
++                      if (payload[x] == ':')
++                      {
++                              if ( memcmp(&payload[x+1],"xdcc send #",11) == 0 )
++                                      return ((IPP2P_XDCC * 100) + 0);
++                      }
++                      x++;
++              }
++      }
++      return 0;
++}
++
++/* search for waste */
++int search_waste(const unsigned char *payload, const u16 plen)
++{
++      if ( plen >= 8 && memcmp(payload,"GET.sha1:",9) == 0)
++              return ((IPP2P_WASTE * 100) + 0);
++
++      return 0;
++}
++
++
++static struct {
++    int command;
++    __u8 short_hand;                  /*for fucntions included in short hands*/
++    int packet_len;
++    int (*function_name) (const unsigned char *, const u16);
++} matchlist[] = {
++    {IPP2P_EDK,SHORT_HAND_IPP2P,20, &search_all_edk},
++//    {IPP2P_DATA_KAZAA,SHORT_HAND_DATA,200, &search_kazaa},
++//    {IPP2P_DATA_EDK,SHORT_HAND_DATA,60, &search_edk},
++//    {IPP2P_DATA_DC,SHORT_HAND_DATA,26, &search_dc},
++    {IPP2P_DC,SHORT_HAND_IPP2P,5, search_all_dc},
++//    {IPP2P_DATA_GNU,SHORT_HAND_DATA,40, &search_gnu},
++    {IPP2P_GNU,SHORT_HAND_IPP2P,5, &search_all_gnu},
++    {IPP2P_KAZAA,SHORT_HAND_IPP2P,5, &search_all_kazaa},
++    {IPP2P_BIT,SHORT_HAND_IPP2P,20, &search_bittorrent},
++    {IPP2P_APPLE,SHORT_HAND_IPP2P,5, &search_apple},
++    {IPP2P_SOUL,SHORT_HAND_IPP2P,5, &search_soul},
++    {IPP2P_WINMX,SHORT_HAND_IPP2P,2, &search_winmx},
++    {IPP2P_ARES,SHORT_HAND_IPP2P,5, &search_ares},
++    {IPP2P_MUTE,SHORT_HAND_NONE,200, &search_mute},
++    {IPP2P_WASTE,SHORT_HAND_NONE,5, &search_waste},
++    {IPP2P_XDCC,SHORT_HAND_NONE,5, &search_xdcc},
++    {0,0,0,NULL}
++};
++
++
++static struct {
++    int command;
++    __u8 short_hand;                  /*for fucntions included in short hands*/
++    int packet_len;
++    int (*function_name) (unsigned char *, int);
++} udp_list[] = {
++    { IPP2P_KAZAA, SHORT_HAND_IPP2P, 14, &udp_search_kazaa},
++    { IPP2P_BIT,   SHORT_HAND_IPP2P, 23, &udp_search_bit},
++    { IPP2P_GNU,   SHORT_HAND_IPP2P, 11, &udp_search_gnu},
++    { IPP2P_EDK,   SHORT_HAND_IPP2P,  9, &udp_search_edk},
++    { IPP2P_DC,    SHORT_HAND_IPP2P, 12, &udp_search_directconnect},    
++    { 0, 0, 0, NULL }
++};
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
++static int
++match(const struct sk_buff *skb,
++      const struct net_device *in,
++      const struct net_device *out,
++      const void *matchinfo,
++      int offset,
++      const void *hdr,
++      u_int16_t datalen,
++      int *hotdrop) 
++#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
++static int
++match(const struct sk_buff *skb,
++      const struct net_device *in,
++      const struct net_device *out,
++      const void *matchinfo,
++      int offset,
++      int *hotdrop) 
++#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,17)
++static int
++match(const struct sk_buff *skb,
++      const struct net_device *in,
++      const struct net_device *out,
++      const void *matchinfo,
++      int offset,
++      unsigned int protoff,
++      int *hotdrop)
++#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
++static int
++match(const struct sk_buff *skb,
++      const struct net_device *in,
++      const struct net_device *out,
++      const struct xt_match *match,
++      const void *matchinfo,
++      int offset,
++      unsigned int protoff,
++      int *hotdrop)
++#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)
++static bool
++match(const struct sk_buff *skb,
++      const struct net_device *in,
++      const struct net_device *out,
++      const struct xt_match *match,
++      const void *matchinfo,
++      int offset, 
++      unsigned int protoff, 
++      bool *hotdrop)
++#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28) */
++static bool
++match(const struct sk_buff *skb,
++      const struct xt_match_param *par)
++#endif
++{
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)
++      const struct ipt_p2p_info *info = matchinfo;
++#else
++      const struct ipt_p2p_info *info = par->matchinfo;
++      const int offset = par->fragoff;
++#endif
++    unsigned char  *haystack;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
++    struct iphdr *ip = ip_hdr(skb);
++#else
++    struct iphdr *ip = skb->nh.iph;
++#endif
++    int p2p_result = 0, i = 0;
++//    int head_len;
++    int hlen = ntohs(ip->tot_len)-(ip->ihl*4);        /*hlen = packet-data length*/
++
++    /*must not be a fragment*/
++    if (offset) {
++      if (info->debug) printk("IPP2P.match: offset found %i \n",offset);
++      return 0;
++    }
++    
++    /*make sure that skb is linear*/
++    if(skb_is_nonlinear(skb)){
++      if (info->debug) printk("IPP2P.match: nonlinear skb found\n");
++      return 0;
++    }
++
++
++    haystack=(char *)ip+(ip->ihl*4);          /*haystack = packet data*/
++
++    switch (ip->protocol){
++      case IPPROTO_TCP:               /*what to do with a TCP packet*/
++      {
++          struct tcphdr *tcph = (void *) ip + ip->ihl * 4;
++          
++          if (tcph->fin) return 0;  /*if FIN bit is set bail out*/
++          if (tcph->syn) return 0;  /*if SYN bit is set bail out*/
++          if (tcph->rst) return 0;  /*if RST bit is set bail out*/
++          
++          haystack += tcph->doff * 4; /*get TCP-Header-Size*/
++          hlen -= tcph->doff * 4;
++          while (matchlist[i].command) {
++              if ((((info->cmd & matchlist[i].command) == matchlist[i].command) ||
++                  ((info->cmd & matchlist[i].short_hand) == matchlist[i].short_hand)) &&
++                  (hlen > matchlist[i].packet_len)) {
++                          p2p_result = matchlist[i].function_name(haystack, hlen);
++                          if (p2p_result) 
++                          {
++                              if (info->debug) printk("IPP2P.debug:TCP-match: %i from: %u.%u.%u.%u:%i to: %u.%u.%u.%u:%i Length: %i\n", 
++                                  p2p_result, NIPQUAD(ip->saddr),ntohs(tcph->source), NIPQUAD(ip->daddr),ntohs(tcph->dest),hlen);
++                              return p2p_result;
++                          }
++              }
++          i++;
++          }
++          return p2p_result;
++      }
++      
++      case IPPROTO_UDP:               /*what to do with an UDP packet*/
++      {
++          struct udphdr *udph = (void *) ip + ip->ihl * 4;
++          
++          while (udp_list[i].command){
++              if ((((info->cmd & udp_list[i].command) == udp_list[i].command) ||
++                  ((info->cmd & udp_list[i].short_hand) == udp_list[i].short_hand)) &&
++                  (hlen > udp_list[i].packet_len)) {
++                          p2p_result = udp_list[i].function_name(haystack, hlen);
++                          if (p2p_result){
++                              if (info->debug) printk("IPP2P.debug:UDP-match: %i from: %u.%u.%u.%u:%i to: %u.%u.%u.%u:%i Length: %i\n", 
++                                  p2p_result, NIPQUAD(ip->saddr),ntohs(udph->source), NIPQUAD(ip->daddr),ntohs(udph->dest),hlen);
++                              return p2p_result;
++                          }
++              }
++          i++;
++          }                   
++          return p2p_result;
++      }
++    
++      default: return 0;
++    }
++}
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
++static int
++checkentry(const char *tablename,
++         const struct ipt_ip *ip,
++         void *matchinfo,
++         unsigned int matchsize,
++         unsigned int hook_mask)
++#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,17)
++static int
++checkentry(const char *tablename,
++         const void *inf,
++         void *matchinfo,
++         unsigned int matchsize,
++         unsigned int hook_mask)
++#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
++static int
++checkentry(const char *tablename,
++         const void *inf,
++         const struct xt_match *match,
++         void *matchinfo,
++         unsigned int matchsize,
++         unsigned int hook_mask)
++#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
++static int
++checkentry(const char *tablename,
++         const void *inf,
++         const struct xt_match *match,
++         void *matchinfo,
++         unsigned int hook_mask)
++#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)
++static bool
++checkentry(const char *tablename,
++         const void *inf,
++         const struct xt_match *match,
++         void *matchinfo,
++         unsigned int hook_mask)
++#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28) */
++static bool
++checkentry(const struct xt_mtchk_param *par)
++#endif
++{
++        /* Must specify -p tcp */
++/*    if (ip->proto != IPPROTO_TCP || (ip->invflags & IPT_INV_PROTO)) {
++ *    printk("ipp2p: Only works on TCP packets, use -p tcp\n");
++ *    return 0;
++ *    }*/
++    return 1;
++}
++
++
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21)
++static struct xt_match ipp2p_match = {
++#else
++static struct ipt_match ipp2p_match = { 
++#endif
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
++      { NULL, NULL }, 
++      "ipp2p", 
++      &ipp2p_match, 
++      &ipp2p_checkentry, 
++      NULL, 
++      THIS_MODULE
++#endif
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
++      .name           = "ipp2p",
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21)
++      .family         = AF_INET,
++#endif
++      .match          = &match,
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17)
++      .matchsize      = sizeof(struct ipt_p2p_info),
++#endif
++      .checkentry     = &checkentry,
++      .me             = THIS_MODULE,
++#endif
++};
++
++
++static int __init init(void)
++{
++    printk(KERN_INFO "IPP2P v%s loading\n", IPP2P_VERSION);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21)
++    return xt_register_match(&ipp2p_match);
++#else
++    return ipt_register_match(&ipp2p_match);
++#endif
++}
++      
++static void __exit fini(void)
++{
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21)
++    xt_unregister_match(&ipp2p_match);
++#else
++    ipt_unregister_match(&ipp2p_match);
++#endif
++    printk(KERN_INFO "IPP2P v%s unloaded\n", IPP2P_VERSION);    
++}
++      
++module_init(init);
++module_exit(fini);
++
++
+diff -Naur linux-2.6.32.8.org/net/ipv4/netfilter/Kconfig linux-2.6.32.8/net/ipv4/netfilter/Kconfig
+--- linux-2.6.32.8.org/net/ipv4/netfilter/Kconfig      2010-02-09 13:57:19.000000000 +0100
++++ linux-2.6.32.8/net/ipv4/netfilter/Kconfig  2010-02-13 19:54:30.000000000 +0100
+@@ -388,5 +388,15 @@
+ 
+ endif # IP_NF_ARPTABLES
+ 
++config IP_NF_MATCH_IPP2P
++      tristate  'IPP2P match support'
++      depends on IP_NF_IPTABLES
++      help
++        This option makes possible to match some P2P packets
++        therefore helps controlling such traffic.
++      
++        If you want to compile it as a module, say M here and read
++        <file:Documentation/modules.txt>.  If unsure, say `N'.
++
+ endmenu
+ 
+diff -Naur linux-2.6.32.8.org/net/ipv4/netfilter/Makefile linux-2.6.32.8/net/ipv4/netfilter/Makefile
+--- linux-2.6.32.8.org/net/ipv4/netfilter/Makefile     2010-02-09 13:57:19.000000000 +0100
++++ linux-2.6.32.8/net/ipv4/netfilter/Makefile 2010-02-13 19:54:30.000000000 +0100
+@@ -48,6 +48,7 @@
+ obj-$(CONFIG_IP_NF_SECURITY) += iptable_security.o
+ 
+ # matches
++obj-$(CONFIG_IP_NF_MATCH_IPP2P) += ipt_ipp2p.o
+ obj-$(CONFIG_IP_NF_MATCH_ADDRTYPE) += ipt_addrtype.o
+ obj-$(CONFIG_IP_NF_MATCH_AH) += ipt_ah.o
+ obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn.o

diff --git a/src/patches/linux-2.6.32.8-xen-imq-test2.patch b/src/patches/linux-2.6.32.8-xen-imq-test2.patch
new file mode 100644 (file)
index 0000000..9d05da5
--- /dev/null
+++ b/src/patches/linux-2.6.32.8-xen-imq-test2.patch
@@ -0,0 +1,1353 @@
+diff -Naur linux-2.6.32.8.org/drivers/net/imq.c linux-2.6.32.8/drivers/net/imq.c
+--- linux-2.6.32.8.org/drivers/net/imq.c       1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.8/drivers/net/imq.c   2010-02-17 20:45:00.000000000 +0100
+@@ -0,0 +1,632 @@
++/*
++ *             Pseudo-driver for the intermediate queue device.
++ *
++ *             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 the Free Software Foundation; either version
++ *             2 of the License, or (at your option) any later version.
++ *
++ * Authors:    Patrick McHardy, <kaber@trash.net>
++ *
++ *            The first version was written by Martin Devera, <devik@cdi.cz>
++ *
++ * Credits:    Jan Rafaj <imq2t@cedric.vabo.cz>
++ *              - Update patch to 2.4.21
++ *             Sebastian Strollo <sstrollo@nortelnetworks.com>
++ *              - Fix "Dead-loop on netdevice imq"-issue
++ *             Marcel Sebek <sebek64@post.cz>
++ *              - Update to 2.6.2-rc1
++ *
++ *           After some time of inactivity there is a group taking care
++ *           of IMQ again: http://www.linuximq.net
++ *
++ *
++ *           2004/06/30 - New version of IMQ patch to kernels <=2.6.7
++ *             including the following changes:
++ *
++ *           - Correction of ipv6 support "+"s issue (Hasso Tepper)
++ *           - Correction of imq_init_devs() issue that resulted in
++ *           kernel OOPS unloading IMQ as module (Norbert Buchmuller)
++ *           - Addition of functionality to choose number of IMQ devices
++ *           during kernel config (Andre Correa)
++ *           - Addition of functionality to choose how IMQ hooks on
++ *           PRE and POSTROUTING (after or before NAT) (Andre Correa)
++ *           - Cosmetic corrections (Norbert Buchmuller) (Andre Correa)
++ *
++ *
++ *             2005/12/16 - IMQ versions between 2.6.7 and 2.6.13 were
++ *             released with almost no problems. 2.6.14-x was released
++ *             with some important changes: nfcache was removed; After
++ *             some weeks of trouble we figured out that some IMQ fields
++ *             in skb were missing in skbuff.c - skb_clone and copy_skb_header.
++ *             These functions are correctly patched by this new patch version.
++ *
++ *             Thanks for all who helped to figure out all the problems with
++ *             2.6.14.x: Patrick McHardy, Rune Kock, VeNoMouS, Max CtRiX,
++ *             Kevin Shanahan, Richard Lucassen, Valery Dachev (hopefully
++ *             I didn't forget anybody). I apologize again for my lack of time.
++ *
++ *
++ *             2008/06/17 - 2.6.25 - Changed imq.c to use qdisc_run() instead 
++ *             of qdisc_restart() and moved qdisc_run() to tasklet to avoid
++ *             recursive locking. New initialization routines to fix 'rmmod' not
++ *             working anymore. Used code from ifb.c. (Jussi Kivilinna)
++ *
++ *             2008/08/06 - 2.6.26 - (JK)
++ *              - Replaced tasklet with 'netif_schedule()'.
++ *              - Cleaned up and added comments for imq_nf_queue().
++ *
++ *             2009/04/12
++ *              - Add skb_save_cb/skb_restore_cb helper functions for backuping
++ *                control buffer. This is needed because qdisc-layer on kernels
++ *                2.6.27 and newer overwrite control buffer. (Jussi Kivilinna)
++ *              - Add better locking for IMQ device. Hopefully this will solve
++ *                SMP issues. (Jussi Kivilinna)
++ *              - Port to 2.6.27
++ *              - Port to 2.6.28
++ *              - Port to 2.6.29 + fix rmmod not working
++ *
++ *             2009/04/20 - (Jussi Kivilinna)
++ *              - Use netdevice feature flags to avoid extra packet handling
++ *                by core networking layer and possibly increase performance.
++ *
++ *             2009/09/26 - (Jussi Kivilinna)
++ *              - Add imq_nf_reinject_lockless to fix deadlock with
++ *                imq_nf_queue/imq_nf_reinject.
++ *
++ *             2009/12/08 - (Jussi Kivilinna)
++ *              - Port to 2.6.32
++ *              - Add check for skb->nf_queue_entry==NULL in imq_dev_xmit()
++ *              - Also add better error checking for skb->nf_queue_entry usage
++ *
++ *           Also, many thanks to pablo Sebastian Greco for making the initial
++ *           patch and to those who helped the testing.
++ *
++ *             More info at: http://www.linuximq.net/ (Andre Correa)
++ */
++
++#include <linux/module.h>
++#include <linux/kernel.h>
++#include <linux/moduleparam.h>
++#include <linux/list.h>
++#include <linux/skbuff.h>
++#include <linux/netdevice.h>
++#include <linux/etherdevice.h>
++#include <linux/rtnetlink.h>
++#include <linux/if_arp.h>
++#include <linux/netfilter.h>
++#include <linux/netfilter_ipv4.h>
++#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
++      #include <linux/netfilter_ipv6.h>
++#endif
++#include <linux/imq.h>
++#include <net/pkt_sched.h>
++#include <net/netfilter/nf_queue.h>
++
++static nf_hookfn imq_nf_hook;
++
++static struct nf_hook_ops imq_ingress_ipv4 = {
++      .hook           = imq_nf_hook,
++      .owner          = THIS_MODULE,
++      .pf             = PF_INET,
++      .hooknum        = NF_INET_PRE_ROUTING,
++#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB)
++      .priority       = NF_IP_PRI_MANGLE + 1
++#else
++      .priority       = NF_IP_PRI_NAT_DST + 1
++#endif
++};
++
++static struct nf_hook_ops imq_egress_ipv4 = {
++      .hook           = imq_nf_hook,
++      .owner          = THIS_MODULE,
++      .pf             = PF_INET,
++      .hooknum        = NF_INET_POST_ROUTING,
++#if defined(CONFIG_IMQ_BEHAVIOR_AA) || defined(CONFIG_IMQ_BEHAVIOR_BA)
++      .priority       = NF_IP_PRI_LAST
++#else
++      .priority       = NF_IP_PRI_NAT_SRC - 1
++#endif
++};
++
++#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
++static struct nf_hook_ops imq_ingress_ipv6 = {
++      .hook           = imq_nf_hook,
++      .owner          = THIS_MODULE,
++      .pf             = PF_INET6,
++      .hooknum        = NF_INET_PRE_ROUTING,
++#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB)
++      .priority       = NF_IP6_PRI_MANGLE + 1
++#else
++      .priority       = NF_IP6_PRI_NAT_DST + 1
++#endif
++};
++
++static struct nf_hook_ops imq_egress_ipv6 = {
++      .hook           = imq_nf_hook,
++      .owner          = THIS_MODULE,
++      .pf             = PF_INET6,
++      .hooknum        = NF_INET_POST_ROUTING,
++#if defined(CONFIG_IMQ_BEHAVIOR_AA) || defined(CONFIG_IMQ_BEHAVIOR_BA)
++      .priority       = NF_IP6_PRI_LAST
++#else
++      .priority       = NF_IP6_PRI_NAT_SRC - 1
++#endif
++};
++#endif
++
++#if defined(CONFIG_IMQ_NUM_DEVS)
++static unsigned int numdevs = CONFIG_IMQ_NUM_DEVS;
++#else
++static unsigned int numdevs = IMQ_MAX_DEVS;
++#endif
++
++static DEFINE_SPINLOCK(imq_nf_queue_lock);
++
++static struct net_device *imq_devs_cache[IMQ_MAX_DEVS];
++
++
++static struct net_device_stats *imq_get_stats(struct net_device *dev)
++{
++      return &dev->stats;
++}
++
++/* called for packets kfree'd in qdiscs at places other than enqueue */
++static void imq_skb_destructor(struct sk_buff *skb)
++{
++      struct nf_queue_entry *entry = skb->nf_queue_entry;
++
++      skb->nf_queue_entry = NULL;
++
++      if (entry) {
++              nf_queue_entry_release_refs(entry);
++              kfree(entry);
++      }
++
++      skb_restore_cb(skb); /* kfree backup */
++}
++
++/* locking not needed when called from imq_nf_queue */
++static void imq_nf_reinject_lockless(struct nf_queue_entry *entry,
++                                              unsigned int verdict)
++{
++      int status;
++
++      if (!entry->next_outfn) {
++              nf_reinject(entry, verdict);
++              return;
++      }
++
++      status = entry->next_outfn(entry, entry->next_queuenum);
++      if (status < 0) {
++              nf_queue_entry_release_refs(entry);
++              kfree_skb(entry->skb);
++              kfree(entry);
++      }
++}
++
++static void imq_nf_reinject(struct nf_queue_entry *entry, unsigned int verdict)
++{
++      int status;
++
++      if (!entry->next_outfn) {
++              spin_lock_bh(&imq_nf_queue_lock);
++              nf_reinject(entry, verdict);
++              spin_unlock_bh(&imq_nf_queue_lock);
++              return;
++      }
++
++      rcu_read_lock();
++      local_bh_disable();
++      status = entry->next_outfn(entry, entry->next_queuenum);
++      local_bh_enable();
++      if (status < 0) {
++              nf_queue_entry_release_refs(entry);
++              kfree_skb(entry->skb);
++              kfree(entry);
++      }
++
++      rcu_read_unlock();
++}
++
++static netdev_tx_t imq_dev_xmit(struct sk_buff *skb, struct net_device *dev)
++{
++      struct nf_queue_entry *entry = skb->nf_queue_entry;
++
++      skb->nf_queue_entry = NULL;
++      dev->trans_start = jiffies;
++
++      dev->stats.tx_bytes += skb->len;
++      dev->stats.tx_packets++;
++
++      if (entry == NULL) {
++              /* We don't know what is going on here.. packet is queued for
++               * imq device, but (probably) not by us.
++               *
++               * If this packet was not send here by imq_nf_queue(), then
++               * skb_save_cb() was not used and skb_free() should not show:
++               *   WARNING: IMQ: kfree_skb: skb->cb_next:..
++               * and/or
++               *   WARNING: IMQ: kfree_skb: skb->nf_queue_entry...
++               *
++               * However if this message is shown, then IMQ is somehow broken
++               * and you should report this to linuximq.net.
++               */
++
++              /* imq_dev_xmit is black hole that eats all packets, report that
++               * we eat this packet happily and increase dropped counters.
++               */
++
++              dev->stats.tx_dropped++;
++              dev_kfree_skb(skb);
++
++              return NETDEV_TX_OK;
++      }
++
++      skb_restore_cb(skb); /* restore skb->cb */
++
++      skb->imq_flags = 0;
++      skb->destructor = NULL;
++
++      imq_nf_reinject(entry, NF_ACCEPT);
++
++      return NETDEV_TX_OK;
++}
++
++static int imq_nf_queue(struct nf_queue_entry *entry, unsigned queue_num)
++{
++      struct net_device *dev;
++      struct sk_buff *skb_orig, *skb, *skb_shared;
++      struct Qdisc *q;
++      struct netdev_queue *txq;
++      int users, index;
++      int retval = -EINVAL;
++
++      index = entry->skb->imq_flags & IMQ_F_IFMASK;
++      if (unlikely(index > numdevs - 1)) {
++              if (net_ratelimit())
++                      printk(KERN_WARNING
++                             "IMQ: invalid device specified, highest is %u\n",
++                             numdevs - 1);
++              retval = -EINVAL;
++              goto out;
++      }
++
++      /* check for imq device by index from cache */
++      dev = imq_devs_cache[index];
++      if (unlikely(!dev)) {
++              char buf[8];
++
++              /* get device by name and cache result */
++              snprintf(buf, sizeof(buf), "imq%d", index);
++              dev = dev_get_by_name(&init_net, buf);
++              if (!dev) {
++                      /* not found ?!*/
++                      BUG();
++                      retval = -ENODEV;
++                      goto out;
++              }
++
++              imq_devs_cache[index] = dev;
++              dev_put(dev);
++      }
++
++      if (unlikely(!(dev->flags & IFF_UP))) {
++              entry->skb->imq_flags = 0;
++              imq_nf_reinject_lockless(entry, NF_ACCEPT);
++              retval = 0;
++              goto out;
++      }
++      dev->last_rx = jiffies;
++
++      skb = entry->skb;
++      skb_orig = NULL;
++
++      /* skb has owner? => make clone */
++      if (unlikely(skb->destructor)) {
++              skb_orig = skb;
++              skb = skb_clone(skb, GFP_ATOMIC);
++              if (!skb) {
++                      retval = -ENOMEM;
++                      goto out;
++              }
++              entry->skb = skb;
++      }
++
++      skb->nf_queue_entry = entry;
++
++      dev->stats.rx_bytes += skb->len;
++      dev->stats.rx_packets++;
++
++      txq = dev_pick_tx(dev, skb);
++
++      q = rcu_dereference(txq->qdisc);
++      if (unlikely(!q->enqueue))
++              goto packet_not_eaten_by_imq_dev;
++
++      spin_lock_bh(qdisc_lock(q));
++
++      users = atomic_read(&skb->users);
++
++      skb_shared = skb_get(skb); /* increase reference count by one */
++      skb_save_cb(skb_shared); /* backup skb->cb, as qdisc layer will
++                                      overwrite it */
++      qdisc_enqueue_root(skb_shared, q); /* might kfree_skb */
++
++      if (likely(atomic_read(&skb_shared->users) == users + 1)) {
++              kfree_skb(skb_shared); /* decrease reference count by one */
++
++              skb->destructor = &imq_skb_destructor;
++
++              /* cloned? */
++              if (skb_orig)
++                      kfree_skb(skb_orig); /* free original */
++
++              spin_unlock_bh(qdisc_lock(q));
++
++              /* schedule qdisc dequeue */
++              __netif_schedule(q);
++
++              retval = 0;
++              goto out;
++      } else {
++              skb_restore_cb(skb_shared); /* restore skb->cb */
++              skb->nf_queue_entry = NULL;
++              /* qdisc dropped packet and decreased skb reference count of
++               * skb, so we don't really want to and try refree as that would
++               * actually destroy the skb. */
++              spin_unlock_bh(qdisc_lock(q));
++              goto packet_not_eaten_by_imq_dev;
++      }
++
++packet_not_eaten_by_imq_dev:
++      /* cloned? restore original */
++      if (skb_orig) {
++              kfree_skb(skb);
++              entry->skb = skb_orig;
++      }
++      retval = -1;
++out:
++      return retval;
++}
++
++static struct nf_queue_handler nfqh = {
++      .name  = "imq",
++      .outfn = imq_nf_queue,
++};
++
++static unsigned int imq_nf_hook(unsigned int hook, struct sk_buff *pskb,
++                              const struct net_device *indev,
++                              const struct net_device *outdev,
++                              int (*okfn)(struct sk_buff *))
++{
++      if (pskb->imq_flags & IMQ_F_ENQUEUE)
++              return NF_QUEUE;
++
++      return NF_ACCEPT;
++}
++
++static int imq_close(struct net_device *dev)
++{
++      netif_stop_queue(dev);
++      return 0;
++}
++
++static int imq_open(struct net_device *dev)
++{
++      netif_start_queue(dev);
++      return 0;
++}
++
++static const struct net_device_ops imq_netdev_ops = {
++      .ndo_open               = imq_open,
++      .ndo_stop               = imq_close,
++      .ndo_start_xmit         = imq_dev_xmit,
++      .ndo_get_stats          = imq_get_stats,
++};
++
++static void imq_setup(struct net_device *dev)
++{
++      dev->netdev_ops         = &imq_netdev_ops;
++      dev->type               = ARPHRD_VOID;
++      dev->mtu                = 16000;
++      dev->tx_queue_len       = 11000;
++      dev->flags              = IFF_NOARP;
++      dev->features           = NETIF_F_SG | NETIF_F_FRAGLIST |
++                                NETIF_F_GSO | NETIF_F_HW_CSUM |
++                                NETIF_F_HIGHDMA;
++      dev->priv_flags         &= ~IFF_XMIT_DST_RELEASE;
++}
++
++static int imq_validate(struct nlattr *tb[], struct nlattr *data[])
++{
++      int ret = 0;
++
++      if (tb[IFLA_ADDRESS]) {
++              if (nla_len(tb[IFLA_ADDRESS]) != ETH_ALEN) {
++                      ret = -EINVAL;
++                      goto end;
++              }
++              if (!is_valid_ether_addr(nla_data(tb[IFLA_ADDRESS]))) {
++                      ret = -EADDRNOTAVAIL;
++                      goto end;
++              }
++      }
++      return 0;
++end:
++      printk(KERN_WARNING "IMQ: imq_validate failed (%d)\n", ret);
++      return ret;
++}
++
++static struct rtnl_link_ops imq_link_ops __read_mostly = {
++      .kind           = "imq",
++      .priv_size      = 0,
++      .setup          = imq_setup,
++      .validate       = imq_validate,
++};
++
++static int __init imq_init_hooks(void)
++{
++      int err;
++
++      nf_register_queue_imq_handler(&nfqh);
++
++      err = nf_register_hook(&imq_ingress_ipv4);
++      if (err)
++              goto err1;
++
++      err = nf_register_hook(&imq_egress_ipv4);
++      if (err)
++              goto err2;
++
++#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
++      err = nf_register_hook(&imq_ingress_ipv6);
++      if (err)
++              goto err3;
++
++      err = nf_register_hook(&imq_egress_ipv6);
++      if (err)
++              goto err4;
++#endif
++
++      return 0;
++
++#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
++err4:
++      nf_unregister_hook(&imq_ingress_ipv6);
++err3:
++      nf_unregister_hook(&imq_egress_ipv4);
++#endif
++err2:
++      nf_unregister_hook(&imq_ingress_ipv4);
++err1:
++      nf_unregister_queue_imq_handler();
++      return err;
++}
++
++static int __init imq_init_one(int index)
++{
++      struct net_device *dev;
++      int ret;
++
++      dev = alloc_netdev(0, "imq%d", imq_setup);
++      if (!dev)
++              return -ENOMEM;
++
++      ret = dev_alloc_name(dev, dev->name);
++      if (ret < 0)
++              goto fail;
++
++      dev->rtnl_link_ops = &imq_link_ops;
++      ret = register_netdevice(dev);
++      if (ret < 0)
++              goto fail;
++
++      return 0;
++fail:
++      free_netdev(dev);
++      return ret;
++}
++
++static int __init imq_init_devs(void)
++{
++      int err, i;
++
++      if (numdevs < 1 || numdevs > IMQ_MAX_DEVS) {
++              printk(KERN_ERR "IMQ: numdevs has to be betweed 1 and %u\n",
++                     IMQ_MAX_DEVS);
++              return -EINVAL;
++      }
++
++      rtnl_lock();
++      err = __rtnl_link_register(&imq_link_ops);
++
++      for (i = 0; i < numdevs && !err; i++)
++              err = imq_init_one(i);
++
++      if (err) {
++              __rtnl_link_unregister(&imq_link_ops);
++              memset(imq_devs_cache, 0, sizeof(imq_devs_cache));
++      }
++      rtnl_unlock();
++
++      return err;
++}
++
++static int __init imq_init_module(void)
++{
++      int err;
++
++#if defined(CONFIG_IMQ_NUM_DEVS)
++      BUILD_BUG_ON(CONFIG_IMQ_NUM_DEVS > 16);
++      BUILD_BUG_ON(CONFIG_IMQ_NUM_DEVS < 2);
++      BUILD_BUG_ON(CONFIG_IMQ_NUM_DEVS - 1 > IMQ_F_IFMASK);
++#endif
++
++      err = imq_init_devs();
++      if (err) {
++              printk(KERN_ERR "IMQ: Error trying imq_init_devs(net)\n");
++              return err;
++      }
++
++      err = imq_init_hooks();
++      if (err) {
++              printk(KERN_ERR "IMQ: Error trying imq_init_hooks()\n");
++              rtnl_link_unregister(&imq_link_ops);
++              memset(imq_devs_cache, 0, sizeof(imq_devs_cache));
++              return err;
++      }
++
++      printk(KERN_INFO "IMQ driver loaded successfully.\n");
++
++#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB)
++      printk(KERN_INFO "\tHooking IMQ before NAT on PREROUTING.\n");
++#else
++      printk(KERN_INFO "\tHooking IMQ after NAT on PREROUTING.\n");
++#endif
++#if defined(CONFIG_IMQ_BEHAVIOR_AB) || defined(CONFIG_IMQ_BEHAVIOR_BB)
++      printk(KERN_INFO "\tHooking IMQ before NAT on POSTROUTING.\n");
++#else
++      printk(KERN_INFO "\tHooking IMQ after NAT on POSTROUTING.\n");
++#endif
++
++      return 0;
++}
++
++static void __exit imq_unhook(void)
++{
++#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
++      nf_unregister_hook(&imq_ingress_ipv6);
++      nf_unregister_hook(&imq_egress_ipv6);
++#endif
++      nf_unregister_hook(&imq_ingress_ipv4);
++      nf_unregister_hook(&imq_egress_ipv4);
++
++      nf_unregister_queue_imq_handler();
++}
++
++static void __exit imq_cleanup_devs(void)
++{
++      rtnl_link_unregister(&imq_link_ops);
++      memset(imq_devs_cache, 0, sizeof(imq_devs_cache));
++}
++
++static void __exit imq_exit_module(void)
++{
++      imq_unhook();
++      imq_cleanup_devs();
++      printk(KERN_INFO "IMQ driver unloaded successfully.\n");
++}
++
++module_init(imq_init_module);
++module_exit(imq_exit_module);
++
++module_param(numdevs, int, 0);
++MODULE_PARM_DESC(numdevs, "number of IMQ devices (how many imq* devices will "
++                      "be created)");
++MODULE_AUTHOR("http://www.linuximq.net");
++MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See "
++                      "http://www.linuximq.net/ for more information.");
++MODULE_LICENSE("GPL");
++MODULE_ALIAS_RTNL_LINK("imq");
++
+diff -Naur linux-2.6.32.8.org/drivers/net/Kconfig linux-2.6.32.8/drivers/net/Kconfig
+--- linux-2.6.32.8.org/drivers/net/Kconfig     2010-02-17 20:30:19.000000000 +0100
++++ linux-2.6.32.8/drivers/net/Kconfig 2010-02-17 20:45:00.000000000 +0100
+@@ -109,6 +109,129 @@
+         To compile this driver as a module, choose M here: the module
+         will be called eql.  If unsure, say N.
+ 
++config IMQ
++      tristate "IMQ (intermediate queueing device) support"
++      depends on NETDEVICES && NETFILTER
++      ---help---
++        The IMQ device(s) is used as placeholder for QoS queueing
++        disciplines. Every packet entering/leaving the IP stack can be
++        directed through the IMQ device where it's enqueued/dequeued to the
++        attached qdisc. This allows you to treat network devices as classes
++        and distribute bandwidth among them. Iptables is used to specify
++        through which IMQ device, if any, packets travel.
++
++        More information at: http://www.linuximq.net/
++
++        To compile this driver as a module, choose M here: the module
++        will be called imq.  If unsure, say N.
++
++choice
++      prompt "IMQ behavior (PRE/POSTROUTING)"
++      depends on IMQ
++      default IMQ_BEHAVIOR_AB
++      help
++
++              This settings defines how IMQ behaves in respect to its
++              hooking in PREROUTING and POSTROUTING.
++
++              IMQ can work in any of the following ways:
++
++                  PREROUTING   |      POSTROUTING
++              -----------------|-------------------
++              #1  After NAT    |      After NAT
++              #2  After NAT    |      Before NAT
++              #3  Before NAT   |      After NAT
++              #4  Before NAT   |      Before NAT
++
++              The default behavior is to hook before NAT on PREROUTING
++              and after NAT on POSTROUTING (#3).
++
++              This settings are specially usefull when trying to use IMQ
++              to shape NATed clients.
++
++              More information can be found at: www.linuximq.net
++
++              If not sure leave the default settings alone.
++
++config IMQ_BEHAVIOR_AA
++      bool "IMQ AA"
++      help
++              This settings defines how IMQ behaves in respect to its
++              hooking in PREROUTING and POSTROUTING.
++
++              Choosing this option will make IMQ hook like this:
++
++              PREROUTING:   After NAT
++              POSTROUTING:  After NAT
++
++              More information can be found at: www.linuximq.net
++
++              If not sure leave the default settings alone.
++
++config IMQ_BEHAVIOR_AB
++      bool "IMQ AB"
++      help
++              This settings defines how IMQ behaves in respect to its
++              hooking in PREROUTING and POSTROUTING.
++
++              Choosing this option will make IMQ hook like this:
++
++              PREROUTING:   After NAT
++              POSTROUTING:  Before NAT
++
++              More information can be found at: www.linuximq.net
++
++              If not sure leave the default settings alone.
++
++config IMQ_BEHAVIOR_BA
++      bool "IMQ BA"
++      help
++              This settings defines how IMQ behaves in respect to its
++              hooking in PREROUTING and POSTROUTING.
++
++              Choosing this option will make IMQ hook like this:
++
++              PREROUTING:   Before NAT
++              POSTROUTING:  After NAT
++
++              More information can be found at: www.linuximq.net
++
++              If not sure leave the default settings alone.
++
++config IMQ_BEHAVIOR_BB
++      bool "IMQ BB"
++      help
++              This settings defines how IMQ behaves in respect to its
++              hooking in PREROUTING and POSTROUTING.
++
++              Choosing this option will make IMQ hook like this:
++
++              PREROUTING:   Before NAT
++              POSTROUTING:  Before NAT
++
++              More information can be found at: www.linuximq.net
++
++              If not sure leave the default settings alone.
++
++endchoice
++
++config IMQ_NUM_DEVS
++
++      int "Number of IMQ devices"
++      range 2 16
++      depends on IMQ
++      default "16"
++      help
++
++              This settings defines how many IMQ devices will be
++              created.
++
++              The default value is 16.
++
++              More information can be found at: www.linuximq.net
++
++              If not sure leave the default settings alone.
++
+ config TUN
+       tristate "Universal TUN/TAP device driver support"
+       select CRC32
+diff -Naur linux-2.6.32.8.org/drivers/net/Makefile linux-2.6.32.8/drivers/net/Makefile
+--- linux-2.6.32.8.org/drivers/net/Makefile    2010-02-17 20:30:19.000000000 +0100
++++ linux-2.6.32.8/drivers/net/Makefile        2010-02-17 20:46:48.000000000 +0100
+@@ -165,6 +165,7 @@
+ obj-$(CONFIG_XEN_NETFRONT) += xen-netfront.o
+ 
+ obj-$(CONFIG_DUMMY) += dummy.o
++obj-$(CONFIG_IMQ) += imq.o
+ obj-$(CONFIG_IFB) += ifb.o
+ obj-$(CONFIG_MACVLAN) += macvlan.o
+ obj-$(CONFIG_DE600) += de600.o
+diff -Naur linux-2.6.32.8.org/include/linux/imq.h linux-2.6.32.8/include/linux/imq.h
+--- linux-2.6.32.8.org/include/linux/imq.h     1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.8/include/linux/imq.h 2010-02-17 20:45:00.000000000 +0100
+@@ -0,0 +1,13 @@
++#ifndef _IMQ_H
++#define _IMQ_H
++
++/* IFMASK (16 device indexes, 0 to 15) and flag(s) fit in 5 bits */
++#define IMQ_F_BITS    5
++
++#define IMQ_F_IFMASK  0x0f
++#define IMQ_F_ENQUEUE 0x10
++
++#define IMQ_MAX_DEVS  (IMQ_F_IFMASK + 1)
++
++#endif /* _IMQ_H */
++
+diff -Naur linux-2.6.32.8.org/include/linux/netdevice.h linux-2.6.32.8/include/linux/netdevice.h
+--- linux-2.6.32.8.org/include/linux/netdevice.h       2010-02-17 20:30:18.000000000 +0100
++++ linux-2.6.32.8/include/linux/netdevice.h   2010-02-17 20:45:00.000000000 +0100
+@@ -1119,6 +1119,7 @@
+ extern int            dev_open(struct net_device *dev);
+ extern int            dev_close(struct net_device *dev);
+ extern void           dev_disable_lro(struct net_device *dev);
++extern struct netdev_queue *dev_pick_tx(struct net_device *dev, struct sk_buff *skb);
+ extern int            dev_queue_xmit(struct sk_buff *skb);
+ extern int            register_netdevice(struct net_device *dev);
+ extern void           unregister_netdevice(struct net_device *dev);
+diff -Naur linux-2.6.32.8.org/include/linux/netfilter/xt_IMQ.h linux-2.6.32.8/include/linux/netfilter/xt_IMQ.h
+--- linux-2.6.32.8.org/include/linux/netfilter/xt_IMQ.h        1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.8/include/linux/netfilter/xt_IMQ.h    2010-02-17 20:45:00.000000000 +0100
+@@ -0,0 +1,9 @@
++#ifndef _XT_IMQ_H
++#define _XT_IMQ_H
++
++struct xt_imq_info {
++      unsigned int todev;     /* target imq device */
++};
++
++#endif /* _XT_IMQ_H */
++
+diff -Naur linux-2.6.32.8.org/include/linux/netfilter_ipv4/ipt_IMQ.h linux-2.6.32.8/include/linux/netfilter_ipv4/ipt_IMQ.h
+--- linux-2.6.32.8.org/include/linux/netfilter_ipv4/ipt_IMQ.h  1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.8/include/linux/netfilter_ipv4/ipt_IMQ.h      2010-02-17 20:45:00.000000000 +0100
+@@ -0,0 +1,10 @@
++#ifndef _IPT_IMQ_H
++#define _IPT_IMQ_H
++
++/* Backwards compatibility for old userspace */
++#include <linux/netfilter/xt_IMQ.h>
++
++#define ipt_imq_info xt_imq_info
++
++#endif /* _IPT_IMQ_H */
++
+diff -Naur linux-2.6.32.8.org/include/linux/netfilter_ipv6/ip6t_IMQ.h linux-2.6.32.8/include/linux/netfilter_ipv6/ip6t_IMQ.h
+--- linux-2.6.32.8.org/include/linux/netfilter_ipv6/ip6t_IMQ.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.8/include/linux/netfilter_ipv6/ip6t_IMQ.h     2010-02-17 20:45:00.000000000 +0100
+@@ -0,0 +1,10 @@
++#ifndef _IP6T_IMQ_H
++#define _IP6T_IMQ_H
++
++/* Backwards compatibility for old userspace */
++#include <linux/netfilter/xt_IMQ.h>
++
++#define ip6t_imq_info xt_imq_info
++
++#endif /* _IP6T_IMQ_H */
++
+diff -Naur linux-2.6.32.8.org/include/linux/skbuff.h linux-2.6.32.8/include/linux/skbuff.h
+--- linux-2.6.32.8.org/include/linux/skbuff.h  2010-02-17 20:30:19.000000000 +0100
++++ linux-2.6.32.8/include/linux/skbuff.h      2010-02-17 20:50:34.000000000 +0100
+@@ -29,6 +29,9 @@
+ #include <linux/rcupdate.h>
+ #include <linux/dmaengine.h>
+ #include <linux/hrtimer.h>
++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
++#include <linux/imq.h>
++#endif
+ 
+ /* Don't change this without changing skb_csum_unnecessary! */
+ #define CHECKSUM_NONE 0
+@@ -332,6 +335,9 @@
+        * first. This is owned by whoever has the skb queued ATM.
+        */
+       char                    cb[48];
++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
++      void                    *cb_next;
++#endif
+ 
+       unsigned int            len,
+                               data_len;
+@@ -364,6 +370,9 @@
+       struct nf_conntrack     *nfct;
+       struct sk_buff          *nfct_reasm;
+ #endif
++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
++      struct nf_queue_entry   *nf_queue_entry;
++#endif
+ #ifdef CONFIG_BRIDGE_NETFILTER
+       struct nf_bridge_info   *nf_bridge;
+ #endif
+@@ -395,6 +404,11 @@
+ #ifdef CONFIG_NET_DMA
+       dma_cookie_t            dma_cookie;
+ #endif
++
++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
++      __u8                    imq_flags:IMQ_F_BITS;
++#endif
++
+ #ifdef CONFIG_NETWORK_SECMARK
+       __u32                   secmark;
+ #endif
+@@ -458,6 +472,12 @@
+       return (struct rtable *)skb_dst(skb);
+ }
+ 
++
++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
++extern int skb_save_cb(struct sk_buff *skb);
++extern int skb_restore_cb(struct sk_buff *skb);
++#endif
++
+ extern void kfree_skb(struct sk_buff *skb);
+ extern void consume_skb(struct sk_buff *skb);
+ extern void          __kfree_skb(struct sk_buff *skb);
+@@ -2008,6 +2028,10 @@
+       dst->nfct_reasm = src->nfct_reasm;
+       nf_conntrack_get_reasm(src->nfct_reasm);
+ #endif
++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
++      dst->imq_flags = src->imq_flags;
++      dst->nf_queue_entry = src->nf_queue_entry;
++#endif
+ #ifdef CONFIG_BRIDGE_NETFILTER
+       dst->nf_bridge  = src->nf_bridge;
+       nf_bridge_get(src->nf_bridge);
+diff -Naur linux-2.6.32.8.org/include/net/netfilter/nf_queue.h linux-2.6.32.8/include/net/netfilter/nf_queue.h
+--- linux-2.6.32.8.org/include/net/netfilter/nf_queue.h        2010-02-09 13:57:19.000000000 +0100
++++ linux-2.6.32.8/include/net/netfilter/nf_queue.h    2010-02-17 20:45:00.000000000 +0100
+@@ -13,6 +13,12 @@
+       struct net_device       *indev;
+       struct net_device       *outdev;
+       int                     (*okfn)(struct sk_buff *);
++
++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
++      int                     (*next_outfn)(struct nf_queue_entry *entry,
++                                            unsigned int queuenum);
++      unsigned int            next_queuenum;
++#endif
+ };
+ 
+ #define nf_queue_entry_reroute(x) ((void *)x + sizeof(struct nf_queue_entry))
+@@ -30,5 +36,11 @@
+                                      const struct nf_queue_handler *qh);
+ extern void nf_unregister_queue_handlers(const struct nf_queue_handler *qh);
+ extern void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict);
++extern void nf_queue_entry_release_refs(struct nf_queue_entry *entry);
++
++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
++extern void nf_register_queue_imq_handler(const struct nf_queue_handler *qh);
++extern void nf_unregister_queue_imq_handler(void);
++#endif
+ 
+ #endif /* _NF_QUEUE_H */
+diff -Naur linux-2.6.32.8.org/net/core/dev.c linux-2.6.32.8/net/core/dev.c
+--- linux-2.6.32.8.org/net/core/dev.c  2010-02-17 20:30:19.000000000 +0100
++++ linux-2.6.32.8/net/core/dev.c      2010-02-17 20:57:37.000000000 +0100
+@@ -96,6 +96,9 @@
+ #include <net/net_namespace.h>
+ #include <net/sock.h>
+ #include <linux/rtnetlink.h>
++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
++#include <linux/imq.h>
++#endif
+ #include <linux/proc_fs.h>
+ #include <linux/seq_file.h>
+ #include <linux/stat.h>
+@@ -1723,7 +1726,11 @@
+       int rc;
+ 
+       if (likely(!skb->next)) {
+-              if (!list_empty(&ptype_all))
++              if (!list_empty(&ptype_all)
++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
++                  && !(skb->imq_flags & IMQ_F_ENQUEUE)
++#endif
++                  )
+                       dev_queue_xmit_nit(skb, dev);
+ 
+               if (netif_needs_gso(dev, skb)) {
+@@ -1808,8 +1815,7 @@
+ }
+ EXPORT_SYMBOL(skb_tx_hash);
+ 
+-static struct netdev_queue *dev_pick_tx(struct net_device *dev,
+-                                      struct sk_buff *skb)
++struct netdev_queue *dev_pick_tx(struct net_device *dev, struct sk_buff *skb)
+ {
+       const struct net_device_ops *ops = dev->netdev_ops;
+       u16 queue_index = 0;
+@@ -1875,6 +1881,7 @@
+ EXPORT_SYMBOL(skb_checksum_setup);
+ #endif
+ 
++EXPORT_SYMBOL(dev_pick_tx);
+ static inline int __dev_xmit_skb(struct sk_buff *skb, struct Qdisc *q,
+                                struct net_device *dev,
+                                struct netdev_queue *txq)
+diff -Naur linux-2.6.32.8.org/net/core/skbuff.c linux-2.6.32.8/net/core/skbuff.c
+--- linux-2.6.32.8.org/net/core/skbuff.c       2010-02-17 20:30:18.000000000 +0100
++++ linux-2.6.32.8/net/core/skbuff.c   2010-02-17 20:45:00.000000000 +0100
+@@ -72,6 +72,9 @@
+ 
+ static struct kmem_cache *skbuff_head_cache __read_mostly;
+ static struct kmem_cache *skbuff_fclone_cache __read_mostly;
++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
++static struct kmem_cache *skbuff_cb_store_cache __read_mostly;
++#endif
+ 
+ static void sock_pipe_buf_release(struct pipe_inode_info *pipe,
+                                 struct pipe_buffer *buf)
+@@ -91,6 +94,83 @@
+       return 1;
+ }
+ 
++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
++/* Control buffer save/restore for IMQ devices */
++struct skb_cb_table {
++      void                    *cb_next;
++      atomic_t                refcnt;
++      char                    cb[48];
++};
++
++static DEFINE_SPINLOCK(skb_cb_store_lock);
++
++int skb_save_cb(struct sk_buff *skb)
++{
++      struct skb_cb_table *next;
++
++      next = kmem_cache_alloc(skbuff_cb_store_cache, GFP_ATOMIC);
++      if (!next)
++              return -ENOMEM;
++
++      BUILD_BUG_ON(sizeof(skb->cb) != sizeof(next->cb));
++
++      memcpy(next->cb, skb->cb, sizeof(skb->cb));
++      next->cb_next = skb->cb_next;
++
++      atomic_set(&next->refcnt, 1);
++
++      skb->cb_next = next;
++      return 0;
++}
++EXPORT_SYMBOL(skb_save_cb);
++
++int skb_restore_cb(struct sk_buff *skb)
++{
++      struct skb_cb_table *next;
++
++      if (!skb->cb_next)
++              return 0;
++
++      next = skb->cb_next;
++
++      BUILD_BUG_ON(sizeof(skb->cb) != sizeof(next->cb));
++
++      memcpy(skb->cb, next->cb, sizeof(skb->cb));
++      skb->cb_next = next->cb_next;
++
++      spin_lock(&skb_cb_store_lock);
++
++      if (atomic_dec_and_test(&next->refcnt)) {
++              kmem_cache_free(skbuff_cb_store_cache, next);
++      }
++
++      spin_unlock(&skb_cb_store_lock);
++
++      return 0;
++}
++EXPORT_SYMBOL(skb_restore_cb);
++
++static void skb_copy_stored_cb(struct sk_buff *new, const struct sk_buff *__old)
++{
++      struct skb_cb_table *next;
++      struct sk_buff *old;
++
++      if (!__old->cb_next) {
++              new->cb_next = NULL;
++              return;
++      }
++
++      spin_lock(&skb_cb_store_lock);
++
++      old = (struct sk_buff *)__old;
++
++      next = old->cb_next;
++      atomic_inc(&next->refcnt);
++      new->cb_next = next;
++
++      spin_unlock(&skb_cb_store_lock);
++}
++#endif
+ 
+ /* Pipe buffer operations for a socket. */
+ static struct pipe_buf_operations sock_pipe_buf_ops = {
+@@ -456,6 +536,26 @@
+               WARN_ON(in_irq());
+               skb->destructor(skb);
+       }
++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
++      /* This should not happen. When it does, avoid memleak by restoring
++      the chain of cb-backups. */
++      while(skb->cb_next != NULL) {
++              if (net_ratelimit())
++                      printk(KERN_WARNING "IMQ: kfree_skb: skb->cb_next: "
++                              "%08x\n", (unsigned int)skb->cb_next);
++
++              skb_restore_cb(skb);
++      }
++      /* This should not happen either, nf_queue_entry is nullified in
++       * imq_dev_xmit(). If we have non-NULL nf_queue_entry then we are
++       * leaking entry pointers, maybe memory. We don't know if this is
++       * pointer to already freed memory, or should this be freed.
++       * If this happens we need to add refcounting, etc for nf_queue_entry.
++       */
++      if (skb->nf_queue_entry && net_ratelimit())
++              printk(KERN_WARNING
++                              "IMQ: kfree_skb: skb->nf_queue_entry != NULL");
++#endif
+ #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
+       nf_conntrack_put(skb->nfct);
+       nf_conntrack_put_reasm(skb->nfct_reasm);
+@@ -593,6 +693,9 @@
+       new->sp                 = secpath_get(old->sp);
+ #endif
+       memcpy(new->cb, old->cb, sizeof(old->cb));
++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
++      skb_copy_stored_cb(new, old);
++#endif
+       new->csum               = old->csum;
+       new->local_df           = old->local_df;
+       new->pkt_type           = old->pkt_type;
+@@ -2863,6 +2966,13 @@
+                                               0,
+                                               SLAB_HWCACHE_ALIGN|SLAB_PANIC,
+                                               NULL);
++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
++      skbuff_cb_store_cache = kmem_cache_create("skbuff_cb_store_cache",
++                                                sizeof(struct skb_cb_table),
++                                                0,
++                                                SLAB_HWCACHE_ALIGN|SLAB_PANIC,
++                                                NULL);
++#endif
+ }
+ 
+ /**
+diff -Naur linux-2.6.32.8.org/net/netfilter/Kconfig linux-2.6.32.8/net/netfilter/Kconfig
+--- linux-2.6.32.8.org/net/netfilter/Kconfig   2010-02-17 20:30:16.000000000 +0100
++++ linux-2.6.32.8/net/netfilter/Kconfig       2010-02-17 20:45:00.000000000 +0100
+@@ -411,6 +411,18 @@
+         For more information on the LEDs available on your system, see
+         Documentation/leds-class.txt
+ 
++config NETFILTER_XT_TARGET_IMQ
++        tristate '"IMQ" target support'
++      depends on NETFILTER_XTABLES
++      depends on IP_NF_MANGLE || IP6_NF_MANGLE
++      select IMQ
++      default m if NETFILTER_ADVANCED=n
++        help
++          This option adds a `IMQ' target which is used to specify if and
++          to which imq device packets should get enqueued/dequeued.
++
++          To compile it as a module, choose M here.  If unsure, say N.
++
+ config NETFILTER_XT_TARGET_MARK
+       tristate '"MARK" target support'
+       default m if NETFILTER_ADVANCED=n
+diff -Naur linux-2.6.32.8.org/net/netfilter/Makefile linux-2.6.32.8/net/netfilter/Makefile
+--- linux-2.6.32.8.org/net/netfilter/Makefile  2010-02-17 20:30:16.000000000 +0100
++++ linux-2.6.32.8/net/netfilter/Makefile      2010-02-17 20:45:00.000000000 +0100
+@@ -47,6 +47,7 @@
+ obj-$(CONFIG_NETFILTER_XT_TARGET_CONNSECMARK) += xt_CONNSECMARK.o
+ obj-$(CONFIG_NETFILTER_XT_TARGET_DSCP) += xt_DSCP.o
+ obj-$(CONFIG_NETFILTER_XT_TARGET_HL) += xt_HL.o
++obj-$(CONFIG_NETFILTER_XT_TARGET_IMQ) += xt_IMQ.o
+ obj-$(CONFIG_NETFILTER_XT_TARGET_LED) += xt_LED.o
+ obj-$(CONFIG_NETFILTER_XT_TARGET_MARK) += xt_MARK.o
+ obj-$(CONFIG_NETFILTER_XT_TARGET_NFLOG) += xt_NFLOG.o
+diff -Naur linux-2.6.32.8.org/net/netfilter/nf_queue.c linux-2.6.32.8/net/netfilter/nf_queue.c
+--- linux-2.6.32.8.org/net/netfilter/nf_queue.c        2010-02-09 13:57:19.000000000 +0100
++++ linux-2.6.32.8/net/netfilter/nf_queue.c    2010-02-17 20:45:00.000000000 +0100
+@@ -20,6 +20,26 @@
+ 
+ static DEFINE_MUTEX(queue_handler_mutex);
+ 
++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
++static const struct nf_queue_handler *queue_imq_handler;
++
++void nf_register_queue_imq_handler(const struct nf_queue_handler *qh)
++{
++      mutex_lock(&queue_handler_mutex);
++      rcu_assign_pointer(queue_imq_handler, qh);
++      mutex_unlock(&queue_handler_mutex);
++}
++EXPORT_SYMBOL(nf_register_queue_imq_handler);
++
++void nf_unregister_queue_imq_handler(void)
++{
++      mutex_lock(&queue_handler_mutex);
++      rcu_assign_pointer(queue_imq_handler, NULL);
++      mutex_unlock(&queue_handler_mutex);
++}
++EXPORT_SYMBOL(nf_unregister_queue_imq_handler);
++#endif
++
+ /* return EBUSY when somebody else is registered, return EEXIST if the
+  * same handler is registered, return 0 in case of success. */
+ int nf_register_queue_handler(u_int8_t pf, const struct nf_queue_handler *qh)
+@@ -80,7 +100,7 @@
+ }
+ EXPORT_SYMBOL_GPL(nf_unregister_queue_handlers);
+ 
+-static void nf_queue_entry_release_refs(struct nf_queue_entry *entry)
++void nf_queue_entry_release_refs(struct nf_queue_entry *entry)
+ {
+       /* Release those devices we held, or Alexey will kill me. */
+       if (entry->indev)
+@@ -100,6 +120,7 @@
+       /* Drop reference to owner of hook which queued us. */
+       module_put(entry->elem->owner);
+ }
++EXPORT_SYMBOL_GPL(nf_queue_entry_release_refs);
+ 
+ /*
+  * Any packet that leaves via this function must come back
+@@ -121,12 +142,26 @@
+ #endif
+       const struct nf_afinfo *afinfo;
+       const struct nf_queue_handler *qh;
++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
++      const struct nf_queue_handler *qih = NULL;
++#endif
+ 
+       /* QUEUE == DROP if noone is waiting, to be safe. */
+       rcu_read_lock();
+ 
+       qh = rcu_dereference(queue_handler[pf]);
++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
++#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
++      if (pf == PF_INET || pf == PF_INET6)
++#else
++      if (pf == PF_INET)
++#endif
++              qih = rcu_dereference(queue_imq_handler);
++
++      if (!qh && !qih)
++#else /* !IMQ */
+       if (!qh)
++#endif
+               goto err_unlock;
+ 
+       afinfo = nf_get_afinfo(pf);
+@@ -145,6 +180,10 @@
+               .indev  = indev,
+               .outdev = outdev,
+               .okfn   = okfn,
++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
++              .next_outfn = qh ? qh->outfn : NULL,
++              .next_queuenum = queuenum,
++#endif
+       };
+ 
+       /* If it's going away, ignore hook. */
+@@ -170,8 +209,19 @@
+       }
+ #endif
+       afinfo->saveroute(skb, entry);
++
++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
++      if (qih) {
++              status = qih->outfn(entry, queuenum);
++              goto imq_skip_queue;
++      }
++#endif
++
+       status = qh->outfn(entry, queuenum);
+ 
++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
++imq_skip_queue:
++#endif
+       rcu_read_unlock();
+ 
+       if (status < 0) {
+diff -Naur linux-2.6.32.8.org/net/netfilter/xt_IMQ.c linux-2.6.32.8/net/netfilter/xt_IMQ.c
+--- linux-2.6.32.8.org/net/netfilter/xt_IMQ.c  1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.8/net/netfilter/xt_IMQ.c      2010-02-17 20:45:00.000000000 +0100
+@@ -0,0 +1,73 @@
++/*
++ * This target marks packets to be enqueued to an imq device
++ */
++#include <linux/module.h>
++#include <linux/skbuff.h>
++#include <linux/netfilter/x_tables.h>
++#include <linux/netfilter/xt_IMQ.h>
++#include <linux/imq.h>
++
++static unsigned int imq_target(struct sk_buff *pskb,
++                              const struct xt_target_param *par)
++{
++      const struct xt_imq_info *mr = par->targinfo;
++
++      pskb->imq_flags = (mr->todev & IMQ_F_IFMASK) | IMQ_F_ENQUEUE;
++
++      return XT_CONTINUE;
++}
++
++static bool imq_checkentry(const struct xt_tgchk_param *par)
++{
++      struct xt_imq_info *mr = par->targinfo;
++
++      if (mr->todev > IMQ_MAX_DEVS - 1) {
++              printk(KERN_WARNING
++                     "IMQ: invalid device specified, highest is %u\n",
++                     IMQ_MAX_DEVS - 1);
++              return 0;
++      }
++
++      return 1;
++}
++
++static struct xt_target xt_imq_reg[] __read_mostly = {
++      {
++              .name           = "IMQ",
++              .family         = AF_INET,
++              .checkentry     = imq_checkentry,
++              .target         = imq_target,
++              .targetsize     = sizeof(struct xt_imq_info),
++              .table          = "mangle",
++              .me             = THIS_MODULE
++      },
++      {
++              .name           = "IMQ",
++              .family         = AF_INET6,
++              .checkentry     = imq_checkentry,
++              .target         = imq_target,
++              .targetsize     = sizeof(struct xt_imq_info),
++              .table          = "mangle",
++              .me             = THIS_MODULE
++      },
++};
++
++static int __init imq_init(void)
++{
++      return xt_register_targets(xt_imq_reg, ARRAY_SIZE(xt_imq_reg));
++}
++
++static void __exit imq_fini(void)
++{
++      xt_unregister_targets(xt_imq_reg, ARRAY_SIZE(xt_imq_reg));
++}
++
++module_init(imq_init);
++module_exit(imq_fini);
++
++MODULE_AUTHOR("http://www.linuximq.net");
++MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See http://www.linuximq.net/ for more information.");
++MODULE_LICENSE("GPL");
++MODULE_ALIAS("ipt_IMQ");
++MODULE_ALIAS("ip6t_IMQ");
++

diff --git a/src/patches/linux-2.6.32.8-xen-patch-fixes.patch b/src/patches/linux-2.6.32.8-xen-patch-fixes.patch
new file mode 100644 (file)
index 0000000..8e2bc66
--- /dev/null
+++ b/src/patches/linux-2.6.32.8-xen-patch-fixes.patch
@@ -0,0 +1,13 @@
+diff -Naur linux-2.6.32.8.org/init/main.c linux-2.6.32.8/init/main.c
+--- linux-2.6.32.8.org/init/main.c     2010-02-17 20:30:17.000000000 +0100
++++ linux-2.6.32.8/init/main.c 2010-02-17 22:00:48.000000000 +0100
+@@ -90,9 +90,6 @@
+ extern void prio_tree_init(void);
+ extern void radix_tree_init(void);
+ extern void free_initmem(void);
+-#ifndef CONFIG_DEBUG_RODATA
+-static inline void mark_rodata_ro(void) { }
+-#endif
+ 
+ #ifdef CONFIG_TC
+ extern void tc_init(void);

diff --git a/src/patches/openssl-0.9.8n-cryptodev.diff b/src/patches/openssl-0.9.8n-cryptodev.diff
new file mode 100644 (file)
index 0000000..0913f9a
--- /dev/null
+++ b/src/patches/openssl-0.9.8n-cryptodev.diff
@@ -0,0 +1,99 @@
+diff -Naur openssl-0.9.8n.org/crypto/engine/eng_all.c openssl-0.9.8n/crypto/engine/eng_all.c
+--- openssl-0.9.8n.org/crypto/engine/eng_all.c 2010-03-01 01:30:11.000000000 +0100
++++ openssl-0.9.8n/crypto/engine/eng_all.c     2010-03-30 08:11:26.000000000 +0200
+@@ -104,16 +104,13 @@
+ #endif
+ #endif
+ #ifndef OPENSSL_NO_HW
+-#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)
+       ENGINE_load_cryptodev();
+-#endif
+ #if defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_NO_CAPIENG)
+       ENGINE_load_capi();
+ #endif
+ #endif
+       }
+ 
+-#if defined(__OpenBSD__) || defined(__FreeBSD__)
+ void ENGINE_setup_bsd_cryptodev(void) {
+       static int bsd_cryptodev_default_loaded = 0;
+       if (!bsd_cryptodev_default_loaded) {
+@@ -122,4 +119,3 @@
+       }
+       bsd_cryptodev_default_loaded=1;
+ }
+-#endif
+diff -Naur openssl-0.9.8n.org/crypto/engine/eng_cryptodev.c openssl-0.9.8n/crypto/engine/eng_cryptodev.c
+--- openssl-0.9.8n.org/crypto/engine/eng_cryptodev.c   2010-03-03 16:30:05.000000000 +0100
++++ openssl-0.9.8n/crypto/engine/eng_cryptodev.c       2010-03-30 08:01:11.000000000 +0200
+@@ -38,14 +38,15 @@
+ #if (defined(__unix__) || defined(unix)) && !defined(USG) && \
+       (defined(OpenBSD) || defined(__FreeBSD__))
+ #include <sys/param.h>
+-# if (OpenBSD >= 200112) || ((__FreeBSD_version >= 470101 && __FreeBSD_version < 500000) || __FreeBSD_version >= 500041)
+-#  define HAVE_CRYPTODEV
+-# endif
+ # if (OpenBSD >= 200110)
+ #  define HAVE_SYSLOG_R
+ # endif
+ #endif
+ 
++#if (OpenBSD >= 200112) || ((__FreeBSD_version >= 470101 && __FreeBSD_version < 500000) || __FreeBSD_version >= 500041) || defined(__linux__)
++# define HAVE_CRYPTODEV
++#endif
++
+ #ifndef HAVE_CRYPTODEV
+ 
+ void
+@@ -58,7 +59,12 @@
+ #else 
+  
+ #include <sys/types.h>
+-#include <crypto/cryptodev.h>
++#if defined(__linux__)
++# include <linux/cryptodev.h>
++# define HAVE_CRYPTODEV_NAME
++#else
++# include <crypto/cryptodev.h>
++#endif
+ #include <sys/ioctl.h>
+ #include <errno.h>
+ #include <stdio.h>
+@@ -81,7 +87,11 @@
+ static int get_dev_crypto(void);
+ static int cryptodev_max_iv(int cipher);
+ static int cryptodev_key_length_valid(int cipher, int len);
+-static int cipher_nid_to_cryptodev(int nid);
++#ifndef HAVE_CRYPTODEV_NAME
++ static int cipher_nid_to_cryptodev(int nid);
++#else
++ static char *cipher_nid_to_cryptodev_name(int nid);
++#endif
+ static int get_cryptodev_ciphers(const int **cnids);
+ /*static int get_cryptodev_digests(const int **cnids);*/
+ static int cryptodev_usable_ciphers(const int **nids);
+diff -Naur openssl-0.9.8n.org/crypto/engine/engine.h openssl-0.9.8n/crypto/engine/engine.h
+--- openssl-0.9.8n.org/crypto/engine/engine.h  2010-02-09 15:18:15.000000000 +0100
++++ openssl-0.9.8n/crypto/engine/engine.h      2010-03-30 08:01:11.000000000 +0200
+@@ -705,9 +705,7 @@
+  * values. */
+ void *ENGINE_get_static_state(void);
+ 
+-#if defined(__OpenBSD__) || defined(__FreeBSD__)
+ void ENGINE_setup_bsd_cryptodev(void);
+-#endif
+ 
+ /* BEGIN ERROR CODES */
+ /* The following lines are auto generated by the script mkerr.pl. Any changes
+diff -Naur openssl-0.9.8n.org/crypto/evp/c_all.c openssl-0.9.8n/crypto/evp/c_all.c
+--- openssl-0.9.8n.org/crypto/evp/c_all.c      2004-08-29 18:36:04.000000000 +0200
++++ openssl-0.9.8n/crypto/evp/c_all.c  2010-03-30 08:01:11.000000000 +0200
+@@ -83,8 +83,6 @@
+       OpenSSL_add_all_ciphers();
+       OpenSSL_add_all_digests();
+ #ifndef OPENSSL_NO_ENGINE
+-# if defined(__OpenBSD__) || defined(__FreeBSD__)
+       ENGINE_setup_bsd_cryptodev();
+-# endif
+ #endif
+       }

diff --git a/src/patches/openswan-2.6.20_noxmlto.patch b/src/patches/openswan-2.6.24_noxmlto.patch
similarity index 71%
rename from src/patches/openswan-2.6.20_noxmlto.patch
rename to src/patches/openswan-2.6.24_noxmlto.patch
index 5898bd5f406090d6f8faa4a37a0cf51e1879b160..dc0c30cbb5341025e1af4937e503aca59588a237 100644 (file)
--- a/src/patches/openswan-2.6.20_noxmlto.patch
+++ b/src/patches/openswan-2.6.24_noxmlto.patch
@@ -1,7 +1,25 @@
-diff -Nur openswan-2.6.20dr2.old/programs/pluto/Makefile openswan-2.6.20dr2/programs/pluto/Makefile
---- openswan-2.6.20dr2.old/programs/pluto/Makefile     2008-12-20 19:53:00.000000000 +0100
-+++ openswan-2.6.20dr2/programs/pluto/Makefile 2008-12-20 20:14:07.000000000 +0100
-@@ -171,7 +171,7 @@
+diff -Naur openswan-2.6.24.org/programs/_confread/Makefile openswan-2.6.24/programs/_confread/Makefile
+--- openswan-2.6.24.org/programs/_confread/Makefile    2010-01-10 02:34:38.000000000 +0100
++++ openswan-2.6.24/programs/_confread/Makefile        2010-01-10 22:44:33.000000000 +0100
+@@ -16,7 +16,13 @@
+ OPENSWANSRCDIR?=$(shell cd ../..; pwd)
+ include ${OPENSWANSRCDIR}/Makefile.inc
+ 
+-EXTRA5MAN=ipsec.conf.5
++SUBDIRS=doc lib programs testing
++ifeq ($(findstring $(SUBDIRS),doc),doc)
++  EXTRA5MAN=ipsec.conf.5
++else
++  EXTRA5MAN=
++endif
++
+ CONFFILES=ipsec.conf
+ EXCONFILES=ipsec.win2k.conf
+ SOURCEDIR=_confread
+diff -Naur openswan-2.6.24.org/programs/pluto/Makefile openswan-2.6.24/programs/pluto/Makefile
+--- openswan-2.6.24.org/programs/pluto/Makefile        2010-01-10 02:34:38.000000000 +0100
++++ openswan-2.6.24/programs/pluto/Makefile    2010-01-10 22:51:15.000000000 +0100
+@@ -172,7 +172,7 @@
  all: $(BINNAMEPLUTO) $(BINNAMEADNSIFNEEDED) $(BINNAMEWHACK) #$(BINNAMEWHACKINIT) 
  programs: $(BINNAMEPLUTO) $(BINNAMEADNSIFNEEDED) $(BINNAMEWHACK) #$(BINNAMEWHACKINIT)
  clean:        cleanall
@@ -10,16 +28,16 @@ diff -Nur openswan-2.6.20dr2.old/programs/pluto/Makefile openswan-2.6.20dr2/prog
  endif
  
  doinstall: all
-@@ -187,6 +187,9 @@
+@@ -188,6 +188,9 @@
        $(INSTALL) $(INSTBINFLAGS) $(BINNAMEPLUTO) $(BINNAMEWHACK) $(LIBEXECDIR)
        #$(INSTALL) $(INSTSUIDFLAGS) $(BINNAMEWHACKINIT) $(LIBEXECDIR)
        if $(USE_ADNS) ; then $(INSTALL) $(INSTBINFLAGS) $(BINNAMEADNS)  $(LIBEXECDIR) ; fi
 +
 +ifeq ($(findstring $(SUBDIRS),doc),doc)
 +doinstalldoc:
-       ( cd ${OPENSWANSRCDIR}/programs/pluto ; xmlto man pluto.8.xml ; mv ipsec_pluto.8 pluto.8; xmlto man ipsec.secrets.5.xml)
        $(INSTALL) $(INSTMANFLAGS) ${srcdir}pluto.8 $(PMANDIR)/ipsec_pluto.8
        sh ${OPENSWANSRCDIR}/packaging/utils/manlink ${srcdir}pluto.8 | \
+               while read from to ; \
 @@ -201,10 +204,7 @@
                 ln -s -f $$from $(FMANDIR)/$$to; \
                done
@@ -48,21 +66,3 @@ diff -Nur openswan-2.6.20dr2.old/programs/pluto/Makefile openswan-2.6.20dr2/prog
  
  alg_info_test: alg_info_test.o ike_alg.o constants.o defs.o log.o db_ops.o crypto.o $(LIBDESLITE) $(OPENSWANLIB)
        $(CC) -o $@ $^ $(LDFLAGS) $(LIBSPLUTO)
-diff -Nur openswan-2.6.20dr2.old/programs/_confread/Makefile openswan-2.6.20dr2/programs/_confread/Makefile
---- openswan-2.6.20dr2.old/programs/_confread/Makefile 2008-12-20 19:53:00.000000000 +0100
-+++ openswan-2.6.20dr2/programs/_confread/Makefile     2008-12-21 00:13:23.000000000 +0100
-@@ -16,7 +16,13 @@
- OPENSWANSRCDIR?=$(shell cd ../..; pwd)
- include ${OPENSWANSRCDIR}/Makefile.inc
- 
--EXTRA5MAN=ipsec.conf.5
-+SUBDIRS=doc lib programs testing
-+ifeq ($(findstring $(SUBDIRS),doc),doc)
-+  EXTRA5MAN=ipsec.conf.5
-+else
-+  EXTRA5MAN=
-+endif
-+
- CONFFILES=ipsec.conf
- EXCONFILES=ipsec.win2k.conf
- SOURCEDIR=_confread

diff --git a/src/patches/strongswan-4.3.6_ipfire.patch b/src/patches/strongswan-4.3.6_ipfire.patch
new file mode 100644 (file)
index 0000000..26cc357
--- /dev/null
+++ b/src/patches/strongswan-4.3.6_ipfire.patch
@@ -0,0 +1,264 @@
+diff -Naur strongswan-4.3.6.org/src/_updown/_updown.in strongswan-4.3.6/src/_updown/_updown.in
+--- strongswan-4.3.6.org/src/_updown/_updown.in        2009-09-27 21:50:42.000000000 +0200
++++ strongswan-4.3.6/src/_updown/_updown.in    2010-03-27 16:32:13.000000000 +0100
+@@ -374,12 +374,12 @@
+       # connection to me, with (left/right)firewall=yes, coming up
+       # This is used only by the default updown script, not by your custom
+       # ones, so do not mess with it; see CAUTION comment up at top.
+-      iptables -I INPUT 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
++      iptables -I IPSECINPUT 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
+           -s $PLUTO_PEER_CLIENT $S_PEER_PORT \
+           -d $PLUTO_ME $D_MY_PORT $IPSEC_POLICY_IN -j ACCEPT
+-      iptables -I OUTPUT 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
++      iptables -I IPSECOUTPUT 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
+           -s $PLUTO_ME $S_MY_PORT $IPSEC_POLICY_OUT \
+-          -d $PLUTO_PEER_CLIENT $D_PEER_PORT -j ACCEPT
++          -d $PLUTO_PEER_CLIENT $D_PEER_PORT -j MARK --set-mark 50
+       #
+       # log IPsec host connection setup
+       if [ $VPN_LOGGING ]
+@@ -387,10 +387,10 @@
+         if [ "$PLUTO_PEER_CLIENT" = "$PLUTO_PEER/32" ]
+         then
+           logger -t $TAG -p $FAC_PRIO \
+-            "+ $PLUTO_PEER_ID $PLUTO_PEER -- $PLUTO_ME"
++            "host+ $PLUTO_PEER_ID $PLUTO_PEER -- $PLUTO_ME"
+         else
+           logger -t $TAG -p $FAC_PRIO \
+-            "+ $PLUTO_PEER_ID $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME"
++            "host+ $PLUTO_PEER_ID $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME"
+         fi
+       fi
+       ;;
+@@ -398,12 +398,12 @@
+       # connection to me, with (left/right)firewall=yes, going down
+       # This is used only by the default updown script, not by your custom
+       # ones, so do not mess with it; see CAUTION comment up at top.
+-      iptables -D INPUT -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
++      iptables -D IPSECINPUT -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
+           -s $PLUTO_PEER_CLIENT $S_PEER_PORT \
+           -d $PLUTO_ME $D_MY_PORT $IPSEC_POLICY_IN -j ACCEPT
+-      iptables -D OUTPUT -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
++      iptables -D IPSECOUTPUT -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
+           -s $PLUTO_ME $S_MY_PORT $IPSEC_POLICY_OUT \
+-          -d $PLUTO_PEER_CLIENT $D_PEER_PORT -j ACCEPT
++          -d $PLUTO_PEER_CLIENT $D_PEER_PORT -j MARK --set-mark 50
+       #
+       # log IPsec host connection teardown
+       if [ $VPN_LOGGING ]
+@@ -411,10 +411,10 @@
+         if [ "$PLUTO_PEER_CLIENT" = "$PLUTO_PEER/32" ]
+         then
+           logger -t $TAG -p $FAC_PRIO -- \
+-            "- $PLUTO_PEER_ID $PLUTO_PEER -- $PLUTO_ME"
++            "host- $PLUTO_PEER_ID $PLUTO_PEER -- $PLUTO_ME"
+         else
+           logger -t $TAG -p $FAC_PRIO -- \
+-          "- $PLUTO_PEER_ID $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME"
++          "host- $PLUTO_PEER_ID $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME"
+         fi
+       fi
+       ;;
+@@ -424,10 +424,10 @@
+       # ones, so do not mess with it; see CAUTION comment up at top.
+       if [ "$PLUTO_PEER_CLIENT" != "$PLUTO_MY_SOURCEIP/32" ]
+       then
+-        iptables -I FORWARD 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
++        iptables -I IPSECFORWARD 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
+             -s $PLUTO_MY_CLIENT $S_MY_PORT \
+-            -d $PLUTO_PEER_CLIENT $D_PEER_PORT $IPSEC_POLICY_OUT -j ACCEPT
+-        iptables -I FORWARD 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
++            -d $PLUTO_PEER_CLIENT $D_PEER_PORT $IPSEC_POLICY_OUT -j MARK --set-mark 50
++        iptables -I IPSECFORWARD 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
+             -s $PLUTO_PEER_CLIENT $S_PEER_PORT \
+             -d $PLUTO_MY_CLIENT $D_MY_PORT $IPSEC_POLICY_IN -j ACCEPT
+       fi
+@@ -436,12 +436,12 @@
+       # or sometimes host access via the internal IP is needed
+       if [ -n "$PLUTO_MY_SOURCEIP" -o -n "$PLUTO_HOST_ACCESS" ]
+       then
+-        iptables -I INPUT 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
++        iptables -I IPSECINPUT 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
+             -s $PLUTO_PEER_CLIENT $S_PEER_PORT \
+             -d $PLUTO_MY_CLIENT $D_MY_PORT $IPSEC_POLICY_IN -j ACCEPT
+-        iptables -I OUTPUT 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
++        iptables -I IPSECOUTPUT 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
+             -s $PLUTO_MY_CLIENT $S_MY_PORT \
+-            -d $PLUTO_PEER_CLIENT $D_PEER_PORT $IPSEC_POLICY_OUT -j ACCEPT
++            -d $PLUTO_PEER_CLIENT $D_PEER_PORT $IPSEC_POLICY_OUT -j MARK --set-mark 50
+       fi
+       #
+       # log IPsec client connection setup
+@@ -450,12 +450,27 @@
+         if [ "$PLUTO_PEER_CLIENT" = "$PLUTO_PEER/32" ]
+         then
+           logger -t $TAG -p $FAC_PRIO \
+-            "+ $PLUTO_PEER_ID $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT"
++            "client+ $PLUTO_PEER_ID $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT"
+         else
+           logger -t $TAG -p $FAC_PRIO \
+-            "+ $PLUTO_PEER_ID $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT"
++            "client+ $PLUTO_PEER_ID $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT"
+         fi
+       fi
++
++      #
++      # Open Firewall for AH + ESP Traffic
++        iptables -I IPSECINPUT 1 -i $PLUTO_INTERFACE -p AH \
++            -s $PLUTO_PEER $S_PEER_PORT \
++            -d $PLUTO_ME $D_MY_PORT -j ACCEPT
++        iptables -I IPSECINPUT 1 -i $PLUTO_INTERFACE -p ESP \
++            -s $PLUTO_PEER $S_PEER_PORT \
++            -d $PLUTO_ME $D_MY_PORT -j ACCEPT
++      if [ $VPN_LOGGING ]
++      then
++          logger -t $TAG -p $FAC_PRIO \
++            "ESP+ $PLUTO_PEER -- $PLUTO_ME"
++      fi
++
+       ;;
+ down-client:iptables)
+       # connection to client subnet, with (left/right)firewall=yes, going down
+@@ -463,11 +478,11 @@
+       # ones, so do not mess with it; see CAUTION comment up at top.
+       if [ "$PLUTO_PEER_CLIENT" != "$PLUTO_MY_SOURCEIP/32" ]
+       then
+-        iptables -D FORWARD -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
++        iptables -D IPSECFORWARD -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
+             -s $PLUTO_MY_CLIENT $S_MY_PORT \
+             -d $PLUTO_PEER_CLIENT $D_PEER_PORT \
+-               $IPSEC_POLICY_OUT -j ACCEPT
+-        iptables -D FORWARD -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
++               $IPSEC_POLICY_OUT -j MARK --set-mark 50
++        iptables -D IPSECFORWARD -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
+             -s $PLUTO_PEER_CLIENT $S_PEER_PORT \
+             -d $PLUTO_MY_CLIENT $D_MY_PORT \
+                $IPSEC_POLICY_IN -j ACCEPT
+@@ -477,14 +492,14 @@
+       # or sometimes host access via the internal IP is needed
+       if [ -n "$PLUTO_MY_SOURCEIP" -o -n "$PLUTO_HOST_ACCESS" ]
+       then
+-        iptables -D INPUT -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
++        iptables -D IPSECINPUT -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
+             -s $PLUTO_PEER_CLIENT $S_PEER_PORT \
+             -d $PLUTO_MY_CLIENT $D_MY_PORT \
+                $IPSEC_POLICY_IN -j ACCEPT
+-        iptables -D OUTPUT -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
++        iptables -D IPSECOUTPUT -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
+             -s $PLUTO_MY_CLIENT $S_MY_PORT \
+             -d $PLUTO_PEER_CLIENT $D_PEER_PORT \
+-               $IPSEC_POLICY_OUT -j ACCEPT
++               $IPSEC_POLICY_OUT -j MARK --set-mark 50
+       fi
+       #
+       # log IPsec client connection teardown
+@@ -493,12 +508,27 @@
+         if [ "$PLUTO_PEER_CLIENT" = "$PLUTO_PEER/32" ]
+         then
+           logger -t $TAG -p $FAC_PRIO -- \
+-            "- $PLUTO_PEER_ID $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT"
++            "client- $PLUTO_PEER_ID $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT"
+         else
+           logger -t $TAG -p $FAC_PRIO -- \
+-            "- $PLUTO_PEER_ID $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT"
++            "client- $PLUTO_PEER_ID $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT"
+         fi
+       fi
++
++      #
++      # Close Firewall for AH+ESP Traffic
++        iptables -D IPSECINPUT -i $PLUTO_INTERFACE -p AH \
++            -s $PLUTO_PEER $S_PEER_PORT \
++            -d $PLUTO_ME $D_MY_PORT -j ACCEPT
++        iptables -D IPSECINPUT -i $PLUTO_INTERFACE -p ESP \
++            -s $PLUTO_PEER $S_PEER_PORT \
++            -d $PLUTO_ME $D_MY_PORT -j ACCEPT
++      if [ $VPN_LOGGING ]
++      then
++          logger -t $TAG -p $FAC_PRIO \
++            "ESP- $PLUTO_PEER -- $PLUTO_ME"
++      fi
++
+       ;;
+ #
+ # IPv6
+@@ -533,10 +563,10 @@
+       # connection to me, with (left/right)firewall=yes, coming up
+       # This is used only by the default updown script, not by your custom
+       # ones, so do not mess with it; see CAUTION comment up at top.
+-      ip6tables -I INPUT 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
++      ip6tables -I IPSECINPUT 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
+           -s $PLUTO_PEER_CLIENT $S_PEER_PORT \
+           -d $PLUTO_ME $D_MY_PORT $IPSEC_POLICY_IN -j ACCEPT
+-      ip6tables -I OUTPUT 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
++      ip6tables -I IPSECOUTPUT 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
+           -s $PLUTO_ME $S_MY_PORT $IPSEC_POLICY_OUT \
+           -d $PLUTO_PEER_CLIENT $D_PEER_PORT -j ACCEPT
+       #
+@@ -557,10 +587,10 @@
+       # connection to me, with (left/right)firewall=yes, going down
+       # This is used only by the default updown script, not by your custom
+       # ones, so do not mess with it; see CAUTION comment up at top.
+-      ip6tables -D INPUT -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
++      ip6tables -D IPSECINPUT -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
+           -s $PLUTO_PEER_CLIENT $S_PEER_PORT \
+           -d $PLUTO_ME $D_MY_PORT $IPSEC_POLICY_IN -j ACCEPT
+-      ip6tables -D OUTPUT -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
++      ip6tables -D IPSECOUTPUT -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
+           -s $PLUTO_ME $S_MY_PORT $IPSEC_POLICY_OUT \
+           -d $PLUTO_PEER_CLIENT $D_PEER_PORT -j ACCEPT
+       #
+@@ -583,10 +613,10 @@
+       # ones, so do not mess with it; see CAUTION comment up at top.
+       if [ "$PLUTO_PEER_CLIENT" != "$PLUTO_MY_SOURCEIP/128" ]
+       then
+-        ip6tables -I FORWARD 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
++        ip6tables -I IPSECFORWARD 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
+             -s $PLUTO_MY_CLIENT $S_MY_PORT \
+             -d $PLUTO_PEER_CLIENT $D_PEER_PORT $IPSEC_POLICY_OUT -j ACCEPT
+-        ip6tables -I FORWARD 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
++        ip6tables -I IPSECFORWARD 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
+             -s $PLUTO_PEER_CLIENT $S_PEER_PORT \
+             -d $PLUTO_MY_CLIENT $D_MY_PORT $IPSEC_POLICY_IN -j ACCEPT
+       fi
+@@ -595,10 +625,10 @@
+       # or sometimes host access via the internal IP is needed
+       if [ -n "$PLUTO_MY_SOURCEIP" -o -n "$PLUTO_HOST_ACCESS" ]
+       then
+-        ip6tables -I INPUT 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
++        ip6tables -I IPSECINPUT 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
+             -s $PLUTO_PEER_CLIENT $S_PEER_PORT \
+             -d $PLUTO_MY_CLIENT $D_MY_PORT $IPSEC_POLICY_IN -j ACCEPT
+-        ip6tables -I OUTPUT 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
++        ip6tables -I IPSECOUTPUT 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
+             -s $PLUTO_MY_CLIENT $S_MY_PORT \
+             -d $PLUTO_PEER_CLIENT $D_PEER_PORT $IPSEC_POLICY_OUT -j ACCEPT
+       fi
+@@ -622,11 +652,11 @@
+       # ones, so do not mess with it; see CAUTION comment up at top.
+       if [ "$PLUTO_PEER_CLIENT" != "$PLUTO_MY_SOURCEIP/128" ]
+       then
+-        ip6tables -D FORWARD -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
++        ip6tables -D IPSECFORWARD -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
+             -s $PLUTO_MY_CLIENT $S_MY_PORT \
+             -d $PLUTO_PEER_CLIENT $D_PEER_PORT \
+                $IPSEC_POLICY_OUT -j ACCEPT
+-        ip6tables -D FORWARD -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
++        ip6tables -D IPSECFORWARD -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
+             -s $PLUTO_PEER_CLIENT $S_PEER_PORT \
+             -d $PLUTO_MY_CLIENT $D_MY_PORT \
+                $IPSEC_POLICY_IN -j ACCEPT
+@@ -636,11 +666,11 @@
+       # or sometimes host access via the internal IP is needed
+       if [ -n "$PLUTO_MY_SOURCEIP" -o -n "$PLUTO_HOST_ACCESS" ]
+       then
+-        ip6tables -D INPUT -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
++        ip6tables -D IPSECINPUT -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
+             -s $PLUTO_PEER_CLIENT $S_PEER_PORT \
+             -d $PLUTO_MY_CLIENT $D_MY_PORT \
+                $IPSEC_POLICY_IN -j ACCEPT
+-        ip6tables -D OUTPUT -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
++        ip6tables -D IPSECOUTPUT -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
+             -s $PLUTO_MY_CLIENT $S_MY_PORT \
+             -d $PLUTO_PEER_CLIENT $D_PEER_PORT \
+                $IPSEC_POLICY_OUT -j ACCEPT

diff --git a/src/patches/suse_xen_series.conf b/src/patches/suse_xen_series.conf
index d89dbb282aef233bf4c53a0ce8ae4eb3bca375e3..625b6d235aa2b55dac4802df2cf9e5b8f9d7b8b6 100644 (file)
--- a/src/patches/suse_xen_series.conf
+++ b/src/patches/suse_xen_series.conf
@@ -27,53 +27,16 @@
        # DO NOT MODIFY THEM!
        # Send separate patches upstream if you find a problem...
        ########################################################
-#      patches.kernel.org/patch-2.6.27.1
-#      patches.kernel.org/patch-2.6.27.1-2
-#      patches.kernel.org/patch-2.6.27.2-3
-#      patches.kernel.org/patch-2.6.27.3-4
-#      patches.kernel.org/patch-2.6.27.4-5
-#      patches.kernel.org/patch-2.6.27.5-6
-#      patches.kernel.org/patch-2.6.27.6-7
-       patches.kernel.org/revert-scsi-qla2xxx-correct-atmel-flash-part-handling.patch
-       patches.kernel.org/revert-scsi-qla2xxx-do-not-honour-max_vports-from-firmware-for-2g-isps-and-below.patch
-       patches.kernel.org/revert-scsi-qla2xxx-return-a-failed-status-when-abort-mailbox-command-fails.patch
-#      patches.kernel.org/patch-2.6.27.7-8
-#      patches.kernel.org/patch-2.6.27.8-9
-#      patches.kernel.org/patch-2.6.27.9-10
-#      patches.kernel.org/patch-2.6.27.10-11
-#      patches.kernel.org/patch-2.6.27.11-12
-#      patches.kernel.org/patch-2.6.27.12-13
-#      patches.kernel.org/patch-2.6.27.13-14
-#      patches.kernel.org/patch-2.6.27.14-15
-#      patches.kernel.org/patch-2.6.27.15-16
-#      patches.kernel.org/patch-2.6.27.16-17
-#      patches.kernel.org/patch-2.6.27.17-18
-#      patches.kernel.org/patch-2.6.27.18-19
-#      patches.kernel.org/patch-2.6.27.19-20
-#      patches.kernel.org/patch-2.6.27.20-21
-#      patches.kernel.org/patch-2.6.27.21-22
-#      patches.kernel.org/patch-2.6.27.22-23
-#      patches.kernel.org/patch-2.6.27.23-24
-#      patches.kernel.org/patch-2.6.27.24-25
-#      patches.kernel.org/revert-ext4-changes-in-2.6.27.19-and-2.6.27.20-and-2.6.27.25.patch
-#      patches.kernel.org/ext4-restore-page_mkwrite2
-#      patches.kernel.org/patch-2.6.27.25-26
-#      patches.kernel.org/patch-2.6.27.26-27
-#      patches.kernel.org/patch-2.6.27.27-28
-#      patches.kernel.org/patch-2.6.27.28-29
-#      patches.kernel.org/patch-2.6.27.29-30
-#      patches.kernel.org/patch-2.6.27.30-31
-#      patches.kernel.org/patch-2.6.27.31-32
-#      patches.kernel.org/patch-2.6.27.32-33
-#      patches.kernel.org/patch-2.6.27.33-34
-#      patches.kernel.org/patch-2.6.27.34-35
-#      patches.kernel.org/patch-2.6.27.35-36
-#      patches.kernel.org/patch-2.6.27.36-37
-#      patches.kernel.org/patch-2.6.27.37-38
-#      patches.kernel.org/patch-2.6.27.38-39
-#      patches.kernel.org/patch-2.6.27.39-40
-#      patches.kernel.org/patch-2.6.27.40-41
-#      patches.kernel.org/patch-2.6.27.41-42
+#      patches.kernel.org/patch-2.6.32.1
+#      patches.kernel.org/patch-2.6.32.1-2
+#      patches.kernel.org/patch-2.6.32.2-3
+#      patches.kernel.org/patch-2.6.32.3-4
+#      patches.kernel.org/patch-2.6.32.4-5
+#      patches.kernel.org/patch-2.6.32.5-6
+#      patches.kernel.org/patch-2.6.32.6-7
+#      patches.kernel.org/patch-2.6.32.7-8
+#      patches.kernel.org/patch-2.6.32.8-9
+#      patches.kernel.org/patch-2.6.32.9-10
 
         ########################################################
         # Build fixes that apply to the vanilla kernel too.
@@ -82,34 +45,21 @@
        # since they're not actually upstream, but if the
        # packages don't build, that's pretty useless too.
         ########################################################
-       patches.kernel.org/psmouse-section-conflict.diff
-       patches.kernel.org/ipmi-section-conflict.diff
-       patches.kernel.org/md-section-conflict
-       patches.kernel.org/spu_profiler-include
-       patches.kernel.org/setup_APIC_timer-section-mismatch
-       patches.kernel.org/carmine-section-mismatch
-       patches.kernel.org/gdth-section-conflict
-       patches.kernel.org/arch-include-asm-fixes
-       patches.rpmify/8250_pci-constify-quirk-setup
+       patches.rpmify/psmouse-section-conflict.diff
+       patches.rpmify/ipmi-section-conflict.diff
+       patches.rpmify/md-section-conflict
+       patches.rpmify/gdth-section-conflict
+       patches.rpmify/arch-include-asm-fixes
+       patches.rpmify/arm-arch_include_asm-fix.diff
+       patches.rpmify/tsi148-dependency
+       patches.rpmify/staging-missing-sched.h
+       patches.rpmify/ia64-sn-fix-percpu-warnings
+       patches.rpmify/modpost-segfault
+       patches.rpmify/ppc-crashdump-typefix
 
         ########################################################
         # kABI consistency patches
         ########################################################
-       patches.kabi/abi-fix-add-s_syncing-back-to-struct-super_block.patch
-       patches.kabi/abi-fix-add-wb_sync_hold-enum-writeback_sync_modes.patch
-       patches.kabi/abi-fix-add-epoll_devs-back-to-struct-user_struct.patch
-       patches.kabi/abi-fix-add-vc_scrl_erase_char-back-to-struct-vc_data.patch
-       patches.kabi/abi-fix-for-struct-seq_file-change.patch
-       patches.kabi/abi-add-back-skb_truesize_bug-and-skb_truesize_check.patch
-       patches.kabi/mm-page_mkwrite-rename.patch
-       patches.kabi/mm-page_mkwrite-compat.patch
-       patches.kabi/splice-kabi-fix.patch
-       patches.kabi/ftrace-dummy-export
-       patches.kabi/kabi-fix-struct-parport-abi-change.patch
-       patches.kabi/move-aarp_send_ddp-export-back
-       patches.kabi/revert-usb-fix-mos7840-problem-with-minor-numbers.patch
-       patches.kabi/revert-usb-usb-serial-replace-shutdown-with-disconnect-release.patch
-       patches.kabi/revert-usb-suspend-resume-support-for-option-driver.patch
 
        ########################################################
        #
@@ -122,11 +72,9 @@
        ########################################################
 #      patches.rpmify/firmware-path
 #      patches.rpmify/no-include-asm
-#      patches.suse/genksyms-reference.diff
-#      patches.suse/genksyms-override.diff
-#      patches.suse/genksyms-add-override-flag.diff
 
-#      patches.rpmify/rpm-kernel-config
+       patches.rpmify/rpm-kernel-config
+#      patches.rpmify/split-package
 #      patches.rpmify/buildhost
 #      patches.rpmify/cloneconfig.diff
 
@@ -135,7 +83,13 @@
         ########################################################
 #      patches.suse/supported-flag
 #      patches.suse/supported-flag-sysfs
-#      patches.suse/modpost-filter-out-built-in-depends
+#      patches.suse/supported-flag-enterprise
+#      patches.suse/kbuild-record-built-in-o
+#      patches.fixes/kbuild-fix-generating-of-.symtypes-files
+#      patches.suse/genksyms-add-override-flag.diff
+#      patches.suse/kbuild-generate-modules.builtin
+#      patches.suse/kconfig-automate-kernel-desktop
+#      patches.fixes/kbuild-Really-don-t-clean-bounds.h-and-asm-offsets.h
 
         ########################################################
         # Simple export additions/removals
@@ -143,25 +97,65 @@
 #      patches.suse/reiser4-exports
 #      patches.suse/kvm-as-kmp
 #      patches.suse/export-release_open_intent
-#      patches.kabi/export-iwl_rx_allocate
+#      patches.suse/export-security_inode_permission
+#      patches.suse/export-sync_page_range
 
        ########################################################
        # Bug workarounds for binutils
        ########################################################
-#      patches.suse/s390-System.map.diff
 
         ########################################################
         # Scheduler / Core
         ########################################################
        patches.suse/setuid-dumpable-wrongdir
-       patches.suse/sysctl-add-affinity_load_balancing
        patches.fixes/seccomp-disable-tsc-option
-       patches.suse/self-ptrace.patch
-       patches.suse/rwlocks-enable-interrupts
-       patches.suse/coredump_filter-add-elfhdr-default.patch
-       patches.fixes/round-jiffies-up
-       patches.kabi/sched-kabi-compat-hack.patch
+       patches.suse/hung_task_timeout-configurable-default
+       patches.suse/sched-revert-latency-defaults
+       # bnc#560317
+       patches.fixes/sched-make-tunable-scaling-configurable
+       patches.fixes/sched-sysctl-for-normalized-tunables
+       patches.fixes/sched-cleanup-select_task_rq_fair
+       patches.fixes/sched-more-generic_WAKE_AFFINE
+       patches.fixes/sched-fix-vmark-regression
+       patches.fixes/sched-inline__percpu_counter_add.patch
+       patches.fixes/sched-cpuacct-percpu-counter-batch.patch
+
+       # writable limits
+       patches.suse/rlim-0002-resource-move-kernel-function-inside-__KERNEL__.patch
+       patches.suse/rlim-0004-IA64-use-helpers-for-rlimits.patch
+       patches.suse/rlim-0005-core-posix-cpu-timers-cleanup-rlimits-usage.patch
+       patches.suse/rlim-0006-PPC-use-helpers-for-rlimits.patch
+       patches.suse/rlim-0007-S390-use-helpers-for-rlimits.patch
+       patches.suse/rlim-0008-SPARC-use-helpers-for-rlimits.patch
+       patches.suse/rlim-0009-X86-use-helpers-for-rlimits.patch
+       patches.suse/rlim-0010-FS-use-helpers-for-rlimits.patch
+       patches.suse/rlim-0011-MM-use-helpers-for-rlimits.patch
+       patches.suse/rlim-0012-core-use-helpers-for-rlimits.patch
+       patches.suse/rlim-0013-infiniband-use-helpers-for-rlimits.patch
+       patches.suse/rlim-0014-ipc-use-helpers-for-rlimits.patch
+       patches.suse/rlim-0015-SECURITY-add-task_struct-to-setrlimit.patch
+       patches.suse/rlim-0016-core-add-task_struct-to-update_rlimit_cpu.patch
+       patches.suse/rlim-0017-sys_setrlimit-make-sure-rlim_max-never-grows.patch
+       patches.suse/rlim-0018-core-split-sys_setrlimit.patch
+       patches.suse/rlim-0019-core-allow-setrlimit-to-non-current-tasks.patch
+       patches.suse/rlim-0020-core-optimize-setrlimit-for-current-task.patch
+       patches.suse/rlim-0021-FS-proc-switch-limits-reading-to-fops.patch
+       patches.suse/rlim-0022-FS-proc-make-limits-writable.patch
+       patches.suse/rlim-0023-core-do-security-check-under-task_lock.patch
+
+       patches.fixes/make-note_interrupt-fast.diff
+
+       patches.fixes/nohz-delay-from-tip.diff
+       patches.fixes/reuse-ktime-from-tip.diff
 
+       patches.fixes/sched-Limit-the-number-of-scheduler-debug-messages.patch
+       patches.fixes/cpuset-fix-cpuset_mem_spread_node-offline-node.patch
+
+       patches.fixes/fix_clock_gettime_vsyscall_time_warp.diff
+       patches.suse/cfq-turn-lowlatency-off-by-default.patch
+
+       patches.fixes/sched-fix-sched_mc-regression-caused-by-change-in-sched-cpu_power
+       patches.fixes/sched-fix-cputime-monotonicity.patch
         ########################################################
         # Architecture-specific patches. These used to be all
         # at the end of series.conf, but since we don't do
@@ -172,23 +166,20 @@
         ########################################################
        # ia64
         ########################################################
-#      patches.arch/ia64-node_mem_map-node_start_pfn.diff
 #      patches.fixes/ia64-sparse-fixes.diff
-#      patches.arch/ia64-rwlocks-enable-interrupts
 #      patches.fixes/nr-irqs-file
 #      patches.arch/mm-avoid-bad-page-on-lru
 #      patches.arch/ia64-page-migration
 #      patches.arch/ia64-page-migration.fix
-#      patches.arch/ia64-sn-BTE_MAX_XFER
-#      patches.arch/ia64-cpu_disable-fix
-#      patches.fixes/taskstats-align
-#      patches.arch/ia64-smp_flush_tlb_mm-IPI-fix
+#      patches.fixes/taskstats-alignment
 #      patches.fixes/ia64-fix-sba-iommu-to-handle-allocation-failure-properly
+#      patches.fixes/ia64-select-mmu-notifier-for-sgi-xp.patch
+#      patches.fixes/ia64-preserve-high-order-personality-bits
 
         ########################################################
        # i386
         ########################################################
-
+       patches.arch/i386-do-a-global-tlb-flush-in-S4-resume.patch
 
        # amd64 | x86-64 | x86_64
        # 'Intel(r) Extended Memory 64 Technology' | 'Intel(r) EM64T'
@@ -200,150 +191,182 @@
         ########################################################
        # x86_64/i386 biarch
         ########################################################
-       patches.arch/disable-apic-error
-       patches.arch/x86-add-PCI-IDs-for-devices-that-need-boot-irq-quirk.patch
-       patches.arch/x86-introduce-pci-noioapicquirk-kernel-cmdline.patch
-       patches.arch/x86-introduce-pci-ioapicreroute-kernel-cmdline.patch
-       patches.arch/x86-disable-intel-boot-interrupt-generation.patch
-       patches.arch/x86-acpi-reroute-PCI-interrupt-to-legacy-boot-interrupt.patch
-       patches.arch/x86-disable-broadcomm-boot-interrupt-generation.patch
-       patches.arch/x86-disable-AMD-ATI-boot-interrupt-generation.patch
-       patches.arch/x86-introduce-config-option-for-pci-reroute-quirks.patch
-       patches.arch/x86-call-boot-IRQ-quirks-at-end-of-device-init-and-during-resume.patch
-       patches.arch/x86-self-ptrace.patch
-       patches.arch/x86-tracehook
        patches.arch/x86-hpet-pre-read
        patches.arch/x86_64-hpet-64bit-timer.patch
+
+       patches.arch/add_support_for_hpet_msi_intr_remap.patch
+       patches.arch/add_x86_support_for_hpet_msi_intr_remap.patch
+       patches.arch/x86-crypto-pclmulqdq-accelerated-implementation.patch
+       patches.arch/x86-crypto-add-ghash-algorithm-test.patch
+       patches.fixes/crypto-testmgr-fix-complain-about-lacking-test.patch
        patches.arch/x86-mcp51-no-dac
-       patches.fixes/remove_kernel_physical_mapping_init_from_init
+
+       patches.arch/kvm-split-paravirt-ops-by-functionality
+       patches.arch/kvm-only-export-selected-pv-ops-feature-structs
+       patches.arch/kvm-split-the-KVM-pv-ops-support-by-feature
+       patches.arch/kvm-replace-kvm-io-delay-pv-ops-with-linux-magic
+
+       patches.arch/x86-64-preserve-large-page-mapping-for-1st-2mb-kernel-txt-with-config_debug_rodata
+       patches.arch/x86-64-align-rodata-kernel-section-to-2mb-with-config_debug_rodata
+       patches.arch/x86-64-add-comment-for-rodata-large-page-retainment
        patches.suse/x86-mark_rodata_rw.patch
-+npiggin       patches.suse/x86-mark_rodata_rw-2.patch
-       patches.arch/x86-pageattr-pmd-permission-fix.patch
-       patches.suse/usb-move-ehci-reg-def.patch
-       patches.suse/x86-usb-debug-port-early-console-v4.patch
-       patches.fixes/video-vesa-bad-mode
-       patches.fixes/hpet-fix-for-LS21-boot-hang
-       patches.fixes/sparsemem-maxmem-fix
-       patches.arch/x86-mce-switch-machine-check-polling-to-per-cpu-timer
-       patches.arch/x86-mce-use-round_jiffies-instead-round_jiffies_relative
-       patches.arch/x86-mce-make-polling-timer-interval-per-cpu
-       patches.arch/x86_64_make_calibrate_APIC_clock_SMI-safe.diff
-       patches.fixes/hpet-correct-periodic-intr.patch
 
+       patches.arch/x86-ftrace-fix-rodata-1.patch
+       patches.arch/x86-ftrace-fix-rodata-2.patch
+       patches.arch/x86-ftrace-fix-rodata-3.patch
+
+       patches.fixes/dmar-fix-oops-with-no-dmar-table
+
+       # bug 564618
+       patches.arch/x86-Remove-the-CPU-cache-size-printks.patch
+       patches.arch/x86-Remove-CPU-cache-size-output-for-non-Intel-too.patch
+       patches.arch/x86-cpu-mv-display_cacheinfo-cpu_detect_cache_sizes.patch
+       patches.arch/x86-Limit-the-number-of-processor-bootup-messages.patch
+       patches.arch/x86-Limit-number-of-per-cpu-TSC-sync-messages.patch
+       patches.arch/x86-Remove-enabling-x2apic-message-for-every-CPU.patch
+       patches.arch/ACPI-Remove-repeated-registered-as-cooling_device-messages.patch
+
+       # bug 567510
+       patches.arch/x86-revert-apic-Use-logical-flat-on-intel-with-8-or-fewer-logical-cpus.patch
+       patches.arch/x86-apic-use-logical-flat-for-systems-with-8-or-fewer-logical-cpus.patch
+
+       patches.fixes/x86_64_memory_hotplug_dev_mem.patch
+
+       patches.arch/x86-calgary-increase-max-phb-bus-num.patch
+
+       patches.arch/x86_64_apic_consider_hotplug_for_mode_logical_flat.patch
+       patches.fixes/x86_ioapic_fix_out_of_order_gsi.patch
+
+       patches.suse/x86-cacheline-size-128.patch
+
+       # bug 587669
+       patches.arch/x86-Reduce-per-cpu-warning-boot-up-messages.patch
+
+       # bug 588008
+       patches.arch/x86-pat-Update-page-flags-for-memtype-without-using-memtype_lock-V3.patch
+
+       ########################################################
+       # x86 MCE/MCA (Machine Check Error/Architecture) extensions
         ########################################################
-       # x86_64/i386 biarch - x2APIC next generation x86 CPU support
-        ########################################################
-       patches.arch/x2APIC_PATCH_01_of_41_e61d98d8dad0048619bb138b0ff996422ffae53b
-       patches.arch/x2APIC_PATCH_02_of_41_c42d9f32443397aed2d37d37df161392e6a5862f
-       patches.arch/x2APIC_PATCH_03_of_41_1886e8a90a580f3ad343f2065c84c1b9e1dac9ef
-       patches.arch/x2APIC_PATCH_04_of_41_aaa9d1dd63bf89b62f4ea9f46de376ab1a3fbc6c
-       patches.arch/x2APIC_PATCH_06_of_41_ad3ad3f6a2caebf56869b83b69e23eb9fa5e0ab6
-       patches.arch/x2APIC_PATCH_07_of_41_cf1337f0447e5be8e66daa944f0ea3bcac2b6179
-       patches.arch/x2APIC_PATCH_08_of_41_fe962e90cb17a8426e144dee970e77ed789d98ee
-       patches.arch/x2APIC_PATCH_09_of_41_2ae21010694e56461a63bfc80e960090ce0a5ed9
-       patches.arch/x2APIC_PATCH_10_of_41_b6fcb33ad6c05f152a672f7c96c1fab006527b80
-       patches.arch/x2APIC_PATCH_11_of_41_72b1e22dfcad1daca6906148fd956ffe404bb0bc
-       patches.arch/x2APIC_PATCH_12_of_41_d94d93ca5cc36cd78c532def62772c98fe8ba5d7
-       patches.arch/x2APIC_PATCH_13_of_41_4dc2f96cacd1e74c688f94348a3bfd0a980817d5
-       patches.arch/x2APIC_PATCH_14_of_41_0c81c746f9bdbfaafe64322d540c8b7b59c27314
-       patches.arch/x2APIC_PATCH_15_of_41_2d7a66d02e11af9ab8e16c76d22767e622b4e3d7
-       patches.arch/x2APIC_PATCH_16_of_41_1b374e4d6f8b3eb2fcd034fcc24ea8ba1dfde7aa
-       patches.arch/x2APIC_PATCH_17_of_41_32e1d0a0651004f5fe47f85a2a5c725ad579a90c
-       patches.arch/x2APIC_PATCH_18_of_41_1cb11583a6c4ceda7426eb36f7bf0419da8dfbc2
-       patches.arch/x2APIC_PATCH_19_of_41_13c88fb58d0112d47f7839f24a755715c6218822
-       patches.arch/x2APIC_PATCH_20_of_41_cff73a6ffaed726780b001937d2a42efde553922
-       patches.arch/x2APIC_PATCH_21_of_41_12a67cf6851871ca8df42025c94f140c303d0f7f
-       patches.arch/x2APIC_PATCH_22_of_41_5c520a6724e912a7e6153b7597192edad6752750
-       patches.arch/x2APIC_PATCH_23_of_41_89027d35aa5b8f45ce0f7fa0911db85b46563da0
-       patches.arch/x2APIC_PATCH_24_of_41_75c46fa61bc5b4ccd20a168ff325c58771248fcd
-       patches.arch/x2APIC_PATCH_25_of_41_6e1cb38a2aef7680975e71f23de187859ee8b158
-       patches.arch/x2APIC_PATCH_x86-mach_apicdef.h-need-to-include-before-smp.h.patch
-       patches.arch/x2APIC_PATCH_25_1_of_41_4c9961d56ec20c27ec5d02e49fd7427748312741
-       patches.arch/x2APIC_PATCH_25_2_of_41_c535b6a1a685eb23f96e2c221777d6c1e05080d5
-       patches.arch/x2APIC_PATCH_26_of_41_2d9579a124d746a3e0e0ba45e57d80800ee80807
-       patches.arch/x2APIC_PATCH_27_of_41_9fa8c481b55e80edd8c637573f87853bb6b600f5
-       patches.arch/x2APIC_PATCH_28_1_of_41_f910a9dc7c865896815e2a95fe33363e9522f277
-       patches.arch/x2APIC_PATCH_29_of_41_277d1f5846d84e16760131a93b7a67ebfa8eded4
-       patches.arch/x2APIC_PATCH_30_of_41_ad66dd340f561bdde2285992314d9e4fd9b6191e
-       patches.arch/x2APIC_PATCH_34_of_41_1b9b89e7f163336ad84200b66a17284dbf26aced
-       patches.arch/x2APIC_PATCH_35_of_41_d25ae38b7e005af03843833bbd811ffe8c5f8cb4
-       patches.arch/x2APIC_PATCH_36_of_41_276605dddb74cbf1b77696e32c4a947e42cec52d
-       patches.arch/x2APIC_PATCH_40_of_41_bbb65d2d365efe9951290e61678dcf81ec60add4
-       patches.arch/x2APIC_PATCH_41_of_41_11c231a962c740b3216eb6565149ae5a7944cba7
-       patches.arch/x2APIC_PATCH_42_of_41_77322deb4bc676a5ee645444e7ed1a89f854473d
-       patches.arch/x2APIC_PATCH_43_of_41_2c72d93f6593f386f5760ca8e7ac7026948c31d7
-
-       patches.arch/x2APIC_PATCH_01_0f4896665a02b465ddca59a560983b24ec28c64b
-       patches.arch/x2APIC_PATCH_02_228324076234ca6a8cd34be89be78022773459f1
-       patches.arch/x2APIC_PATCH_03_3f1fdb3673bb5638fa94186dc391cbc4879590bc
-       patches.arch/x2APIC_PATCH_04_f12c73e7fa7ebf9ad6defee2c4fb2664e743e970
-       patches.arch/x2APIC_PATCH_05_7be42004065ce4df193aeef5befd26805267d0d9
-       patches.arch/x2APIC_PATCH_06_caf43bf7c6a55e89b6df5179df434d67e24aa32e
-       patches.arch/x2APIC_PATCH_07_511d9d34183662aada3890883e860b151d707e22
-       patches.arch/x2APIC_PATCH_09_94a8c3c2437c8946f1b6c8e0b2c560a7db8ed3c6
-
-       patches.arch/x2APIC_fix_section_mismatch.patch
-
-       patches.fixes/bug-502026_fix_apicid_panic.patch
-       patches.arch/bug-531260-x86-pci-insert-ioapic-resource-before-assigning-unassigned-resources.patch
+       patches.arch/x86_mce_undef-lru
+       patches.arch/x86_mce_shake-page
+       patches.arch/x86_mce_hwpoison-action_result-valid-pfn.patch
+       patches.arch/x86_mce_hwpoison-no-double-ref.patch
+       patches.arch/x86_mce_ref-to-flags
+       patches.arch/x86_mce_hwpoison-is-free-page.patch
+       patches.arch/x86_mce_offline-inject
+       patches.arch/x86_mce_madvise-locking
+       patches.arch/x86_mce_page-offline
+
+       # one bug fix, better stress testing, and injection filters
+       patches.fixes/mce_injection_enhancements_9b9a29ecd75e310f75a9243e1c3538ad34598fcb
+       patches.fixes/mce_injection_enhancements_1668bfd5be9d8a52536c4865000fbbe065a3613b
+       patches.fixes/mce_injection_enhancements_db0480b3a61bd6ad86ead3b8bbad094ab0996932
+       patches.fixes/mce_injection_enhancements_71f72525dfaaec012e23089c73331654ea7b12d3
+       patches.fixes/mce_injection_enhancements_95d01fc664b9476e0d18e3d745bb209a42a33588
+       patches.fixes/mce_injection_enhancements_847ce401df392b0704369fd3f75df614ac1414b4
+       patches.fixes/mce_injection_enhancements_d95ea51e3a7e9ee051d19f1dd283ca61d1aa5ec6
+       patches.fixes/mce_injection_enhancements_138ce286eb6ee6d39ca4fb50516e93adaf6b605f
+       patches.fixes/mce_injection_enhancements_7c116f2b0dbac4a1dd051c7a5e8cef37701cafd4
+       patches.fixes/mce_injection_enhancements_31d3d3484f9bd263925ecaa341500ac2df3a5d9b
+       patches.fixes/mce_injection_enhancements_1a9b5b7fe0c5dad8a635288882d36785dea742f9
+       patches.fixes/mce_injection_enhancements_478c5ffc0b50527bd2390f2daa46cc16276b8413
+       patches.fixes/mce_injection_enhancements_e42d9d5d47961fb5db0be65b56dd52fe7b2421f1
+       patches.fixes/mce_injection_enhancements_d324236b3333e87c8825b35f2104184734020d35
+       patches.fixes/mce_injection_enhancements_4fd466eb46a6a917c317a87fb94bfc7252a0f7ed
+       patches.fixes/mce_injection_enhancements_1bfe5febe34d2be2120803c10720e179186357c9
+       patches.fixes/mce_injection_enhancements_413f9efbc513d330f00352bb7cba060a729999d3
+       patches.fixes/mce_injection_enhancements_fe194d3e100dea323d7b2de96d3b44d0c067ba7a
+       patches.fixes/mce_injection_enhancements_0474a60ec704324577782b1057d05b574388d552
+       patches.fixes/mce_injection_enhancements_0d57eb8dfcb92e3dd928d792f4ed2b2fec680bb7
+       patches.fixes/mce_injection_enhancements_12686d153abff397fa0927c620d5a3de84910b72
+       patches.fixes/mce_injection_enhancements_f2c03debdfb387fa2e35cac6382779072b8b9209
+
+       # Needed on Boxboro/Westmere-EX to correctly decode the physical
+       # address of correctable errors
+       patches.arch/x86_mce_intel_decode_physical_address.patch
+       patches.arch/x86_mce_intel_decode_physical_address_rename_fix.patch
+       patches.arch/x86_mce_intel_decode_physical_address_compile_fix.patch
+
+       # bug 587669
+       patches.arch/x86-Reduce-per-cpu-MCA-boot-up-messages.patch
 
        ########################################################
        # x86_64/4096CPUS - from SGI
        ########################################################
-       patches.arch/x86_sgi_cpus4096-01-fix-smp_call_function.patch
-       patches.arch/x86_sgi_cpus4096-02-fix-send_call_func_ip.patch
-       # patch 03 integrated into 05.
-       patches.arch/x86_sgi_cpus4096-04-add-for_each_cpu_mask_and.patch
-       patches.arch/x86_sgi_cpus4096-05-update-send_IPI_mask.patch
-       patches.arch/x86_sgi_cpus4096-06-optimize-cpumask-in-sched_c.patch
-       patches.arch/x86_sgi_cpus4096-07_pae_compile_fixups.patch
-
-       # UV
-       patches.arch/x86_sgi-uv-scir.patch
-       patches.fixes/uv-efi_bios.diff
-       patches.fixes/uv-bios_common.diff
-       patches.fixes/uv-bios_call_partition.diff
-       patches.fixes/uv-sysfs.diff
-       patches.fixes/uv-sn_region_size.diff
-       patches.fixes/uv-bios_call_watchlist.diff
-       patches.fixes/uv-bios_call_memprotect.diff
-       patches.fixes/uv-bios_call_reserve_page.diff
-       patches.fixes/ia64_uv_partition_id.diff
-       patches.fixes/ia64_uv_watchlist.diff
-       patches.fixes/no-sys_uv-on-non-uv-systems
-
-       patches.fixes/uv_setup_irq.diff
-       patches.fixes/uv-xp-change_memprotect.diff
-       patches.fixes/uv-xpc_create_gru_mq_uv.diff
-       patches.fixes/uv-xpc-get_sn_info.diff
-       patches.fixes/uv-xpc_get_part_rsvd_page.diff
-       patches.drivers/sgi-xp-no-uv
-       patches.fixes/uv_zalias_support
-       patches.fixes/sn-irq-affinity
-       patches.fixes/xpc-pass-physical
-       patches.kabi/xpc-pass-physical
-
-       # VMware TSC workaround patches (bnc#441338)
-       patches.arch/x86-vmware-tsc-01-add-TSC_RELIABLE
-       patches.arch/x86-vmware-tsc-02-add-X86_FEATURE_HYPERVISOR
-       patches.arch/x86-vmware-tsc-03-detect-from-hypervisor
-       patches.arch/x86-vmware-tsc-04-use-TSC_RELIABLE
-       patches.arch/x86-vmware-tsc-05-skip-tsc-clocksource
-       patches.arch/x86-vmware-tsc-06-fix-vmware_get_tsc
-       patches.arch/x86-vmware-tsc-07-DMI-product-serial-key
-
-       patches.arch/x86_restrict_pci_early_quirks_to_root_bridges.patch
        patches.arch/x86-apic-force-bigsmp-apic-on-IBM-EXA3-4.patch
-       patches.arch/x86-fix-kmap-contig.patch
 
-       patches.arch/x86_fix_llc_shared_map__cpu_llc_id_anomolies.patch
-       patches.arch/x86_intel_cacheinfo_fix.patch
+       ########################################################
+       # x86 UV patches from SGI
+       ########################################################
+       patches.arch/bug-561933_uv_pat_is_gru_range.patch
+       patches.arch/bug-561939_uv_bios_call_hwperf_updated.patch
+       patches.arch/bug-561939_uv_gpa_to_soc_phys_ram.patch
+       patches.arch/bug-561939_uv_gpa_is_mmr_space.patch
+       patches.arch/bug-561939_uv_rtc_fixes.patch
+       patches.arch/bug-561939_uv_rtc_setup_evt.patch
+       patches.arch/bug-561939_uv_rtc_cleanup.patch
+       patches.arch/bug-561939_uv_ipi_macro.patch
+       patches.arch/bug-561939_uv_mmap_low.patch
+       patches.arch/uv_determine_revision_id_of_node_controller_chip.patch
+       patches.arch/uv_use_replicated_cachelines_to_read_rtc.patch
+
+       # Generic, but depends on the above patches
+       patches.arch/bug-561946_rename_generic_int.patch
+
+       patches.arch/bug-561946_uv_use_rtc.patch
+       patches.arch/bug-561946_uv_irq_affinity.patch
+       patches.arch/bug-561946_uv_move_ioapic.patch
+       patches.arch/bug-561989_gru_rollup.patch
+
+       # bug 562288
+       patches.arch/xpc_introduce_xp_socket.patch
+       patches.arch/xpc_uv_bios_changes.patch
+       patches.arch/xpc_fix_xpc_get_fifo_entry_uv.patch
+       patches.arch/xpc_first_contact_when_active.patch
+       patches.arch/xpc_recv_msg_slots_wrap.patch
+       patches.arch/xpc_pass_nasid_to_gru_create_message_queue.patch
+
+       # bug 566745
+       patches.arch/UV-Expose-irq_desc-node-in-proc.patch
+
+       # bug 579636
+       patches.arch/x86-uv-fix-uv_hub_macro-bug.patch
 
-        # Magny Cours (AMD 12 core) fixes
-       patches.arch/amd_magny_cour_topology_fix.patch
-       patches.arch/amd_magny_cour_topology_fix_1.patch
+       # bug 579647
+       patches.arch/x86-UV-Add-UV-NMI-handler.patch
 
-       patches.arch/x86_tsc-nonstop-intel.diff
+       # bug 582878
+       patches.arch/x86-Fix-sched_clock_cpu-for-systems-with-unsynchronized-TSC.patch
+
+       # bug 586364
+       patches.arch/x86-speed-up-microcode.ctl-on-SGI-UV.patch
+
+       # bug 587562
+       patches.arch/x86-uv-Update-UV-mmr-definitions-header-file.patch
+
+       # bug 587673
+       patches.arch/x86-UV-Fix-target_cpus-in-x2apic_uv_x.c.patch
+
+       # bug 586806
+       patches.arch/x86-UV-BAU-performance-and-error-recovery.patch
+
+        ########################################################
+       # x86_64/i386 depending on the UV patchset
+        ########################################################
+
+       # bug 558247
+       patches.arch/x86-Unify-fixup_irqs-for-32-bit-and-64-bit-kernels.patch
+       patches.arch/x86-intr-remap-Avoid-irq_chip-mask-unmask-in-fixup_irqs-for-intr-remapping.patch
+       patches.arch/x86-Remove-move_cleanup_count-from-irq_cfg.patch
+       patches.arch/x86-Force-irq-complete-move-during-cpu-offline.patch
+       patches.arch/x86-Use-EOI-register-in-io-apic-on-intel-platforms.patch
+       patches.arch/x86-Remove-local_irq_enable-local_irq_disable-in-fixup_irqs.patch
+       patches.arch/x86-io-apic-Move-the-effort-of-clearing-remoteIRR-explicitly-before-migrating-the-irq.patch
+       patches.arch/x86-ioapic-Fix-the-EOI-register-detection-mechanism.patch
+       patches.arch/x86-ioapic-Document-another-case-when-level-irq-is-seen-as-an-edge.patch
+       patches.arch/x86-Remove-unnecessary-mdelay-from-cpu_disable_common.patch
+       patches.arch/x86-irq-check-move_in_progress-before-freeing-the-vector-mapping.patch
 
         ########################################################
        # powerpc/generic
@@ -351,16 +374,15 @@
        patches.suse/of_platform_driver.module-owner.patch
        patches.suse/led_classdev.sysfs-name.patch
        patches.suse/radeon-monitor-jsxx-quirk.patch
+
        patches.suse/8250-sysrq-ctrl_o.patch
-       patches.arch/ppc-pseries_remove_lmb-PAGE_SHIFTT.patch
-       patches.arch/ppc-pseries_pfn-mem-rm.patch
        patches.suse/ppc-no-LDFLAGS_MODULE.patch
        patches.arch/ppc-vio-modalias.patch
        patches.arch/ppc-efika-mpc52xx-ac97.patch
        patches.arch/ppc-efika-psc-console-autodetection.patch
 -      patches.arch/ppc-efika-bestcomm-ata-dma.patch
        patches.arch/ppc-pegasos-console-autodetection.patch
-       patches.suse/ppc-powerbook-usb-fn-key-default.patch
+       patches.suse/ppc-powerbook-usb-fn-key-default.patch
        patches.suse/suse-ppc32-mol.patch
        patches.suse/suse-ppc32-mol-kbuild.patch
        patches.suse/suse-ppc32-mol-handle-mm-fault
@@ -375,289 +397,153 @@
        patches.arch/ppc-prom-nodisplay.patch
        patches.fixes/ptrace-getsiginfo
        patches.arch/ppc-ipic-suspend-without-83xx-fix
-       patches.arch/ppc-dynamic-reconfiguration.diff
        patches.arch/ppc-vmcoreinfo.diff
-       patches.arch/ppc-powerpc-fix-pci-unmap-io.patch
-       patches.arch/ppc-pcibios_allocate_bus_resources.patch
-       patches.arch/ppc-powerpc-debug-pci-hotplug.patch
-       patches.arch/ppc-oprofile-spu.patch
-       patches.arch/ppc-oprofile-spu-mutex-locking.patch
-       patches.arch/ppc-clock_gettime-nanoseconds.patch
-       patches.arch/compat-sys-swapcontext
        patches.arch/ppc-select
 
-       patches.arch/ppc-axon-missing-msi-workaround-5.diff
-       patches.arch/ppc-pseries-bsr-4k.patch
-       patches.arch/ppc-pseries-bsr-multinode.patch
-       patches.arch/ppc-pseries-cmm-pagecounter.patch
-       patches.arch/ppc-of-irq-map.patch
-       patches.arch/ppc-memoryless-nodes.patch
-       patches.arch/ppc-syscall-xer.so.1.patch
-       patches.arch/ppc-cell-gdb-watchpoints.patch
-       patches.arch/ppc-valid-hugepage-size-hugetlb_get_unmapped_area.patch
-       patches.arch/ppc-pseries-cpu-migrate.patch
-       patches.arch/ppc-pseries-migration_hang_fix.patch
-       patches.arch/ppc-optimize-sync.patch
-       patches.arch/ppc-fix-ppc-insn-emulation_mr.patch
-
-       patches.arch/ppc-spufs-01-use-inc_nlink.patch
-       patches.arch/ppc-spufs-03-sputrace-Only-enable-logging-on-open.patch
-       patches.arch/ppc-spufs-04-sputrace-Don-t-block-until-the-read.patch
-       patches.arch/ppc-spufs-05-Use-state_mutex-for-switch_log-lockin.patch
-       patches.arch/ppc-spufs-06-Don-t-require-full-buffer-in-switch_l.patch
-       patches.arch/ppc-spufs-07-Don-t-spu_acquire_saved-unnecessarily.patch
-       patches.arch/ppc-spufs-08-Use-kmalloc-rather-than-kzalloc-for-s.patch
-       patches.arch/ppc-spufs-09-Improve-search-of-node-for-contexts-w.patch
-       patches.arch/ppc-spufs-10-Explain-conditional-decrement-of-aff_.patch
-
-       patches.arch/ppc-xics-EOI-unmapped-irqs.patch
-       patches.arch/ppc32-fix-ptrace-compat-wrapper-for-fpu-register-access
-       patches.arch/powerpc-pseries-cmo-unused-page-hinting.patch
-       patches.arch/ppc64-reduce-hashtable-size-for-64k-pages.patch
-       patches.arch/ppc-altivec-VSX-ctxswitch
-       patches.arch/pseries-set-error_state-correctly-in-eeh_report_reset
-       patches.arch/ppc64-eeh-msix-irq
-       patches.arch/kprobes-use-do_irq-in-lkdtm
+       patches.arch/ppc-extended_h_cede-kernel-dlpar
+       patches.arch/ppc-extended_h_cede-mv_of_drconf_cell
+       patches.arch/ppc-extended_h_cede-Export_memory_sysdev_class
+       patches.arch/ppc-extended_h_cede-memory-dlpar
+       patches.arch/ppc-extended_h_cede-cpu-dlpar
+       patches.arch/ppc-extended_h_cede-new_cede_processor
+       patches.arch/ppc-extended_h_cede-add_offline_states
+       patches.arch/ppc-extended_h_cede-node_offline_online_cpus
+       patches.arch/ppc-extended_h_cede-add_driver_lock
+       patches.arch/ppc-extended_h_cede-update-to-mainline
+       patches.arch/ppc-extended_h_cede-fix-kstack-resume
+       patches.arch/ppc-pseries-mach-cpu-die-rearrange-code
+       patches.arch/ppc-pseries-mach-cpu-die-remove-debug-printk
        patches.fixes/powerpc-fix-cpu-name-in-show-cpuinfo
-
+       patches.arch/ppc-pseries-ncpus-1
+       patches.arch/ppc-pseries-ncpus-2
+       patches.fixes/powerpc-eeh-fix-a-bug-when-pci-structure-is-null
+       patches.arch/powerpc-export-data-from-new-hcall-H_EM_GET_PARMS.patch
 
         ########################################################
         # PS3
         ########################################################
 
-#      patches.arch/ppc-ps3-add-ps3av-audio-mute-analog.patch
-#      patches.arch/ppc-ps3-add-passthrough-support-for-non-audio-streams.patch
-#      patches.arch/ppc-ps3-add-support-for-SPDIF-HDMI-passthrough.patch
-#      patches.arch/ppc-ps3-introduce-ps3_gpu_mutex.patch
-#      patches.arch/ppc-ps3-ps3vram-mtd.patch
-
        ########################################################
        # S/390
        ########################################################
        patches.arch/s390-add-FREE_PTE_NR
 
-       patches.arch/s390-01-02-dcss-64-v2.patch
-       patches.arch/s390-01-04-fcpperf-1.patch
-       patches.arch/s390-01-04-fcpperf-2.patch
-       patches.arch/s390-01-04-fcpperf-3-v2.patch
-       patches.arch/s390-01-04-fcpperf-4-v2.patch
-       patches.arch/s390-01-05-kmsg-v3.patch
-       patches.arch/s390-01-06-zfcp-cleanup-v2.patch
-
-       patches.arch/s390-02-01-xpram.patch
-       patches.arch/s390-02-03-zfcp.patch
-       patches.arch/s390-02-04-qeth-mac.patch
-       patches.arch/s390-02-05-qeth-recovery.patch
-       patches.arch/s390-02-06-qeth-offset.patch
-       patches.arch/s390-02-07-qeth-ipv6check.patch
-       patches.arch/s390-02-08-qeth-panic.patch
-       patches.arch/s390-02-09-tape-lock.patch
-       patches.arch/s390-02-10-zfcp-scan-online.patch
-
-       patches.arch/s390-03-01-stp-init.patch
-       patches.arch/s390-03-02-setup_memory.patch
-       patches.arch/s390-03-03-dasd_unsolicited_interrupt.patch
-       patches.arch/s390-03-04-qdio_multicast_performance.patch
-       patches.arch/s390-03-05-dasd-block-uevent.patch
-       patches.arch/s390-03-06-zfcp-hexdump.patch
-       patches.arch/s390-03-07-qeth_hsi_mcl_string.patch
-       patches.arch/s390-03-08-zfcp-abort-race.patch
-       patches.arch/s390-03-09-zfcp-oops-during-target-scan.patch
-
-       patches.arch/s390-04-01-qdio_prevent_double_shutdown.patch
-       patches.arch/s390-04-02-qdio-osa-port-count.patch
-       patches.arch/s390-04-03-kmsg.patch
-       patches.arch/s390-04-04-dasd_fatal_error_log_sense.patch
-       patches.arch/s390-04-06-cio-sac-update.diff
-       patches.arch/s390-04-07-als.patch
-       patches.arch/s390-04-08-cio-ungroup-race-fix.patch
-       patches.arch/s390-04-09-zfcp-host-busy-count-fix.patch
-
-       patches.arch/s390-05-01-zfcp-message-linebreak.patch
-       patches.arch/s390-05-02-zfcp-invalid-non-null-return.patch
-       patches.arch/s390-05-03-zfcp-wka-port.patch
-       patches.arch/s390-05-04-fix_rport_status_check.patch
-       patches.arch/s390-05-05-stp-etr-stop-machine.patch
-       patches.arch/s390-05-06-stp-etr-mutex.patch
-       patches.arch/s390-05-07-generic-ipi.patch
-       patches.arch/s390-05-08-topology.patch
-       patches.arch/s390-05-09-cleanup-of-portopen-requests.patch
-
-       patches.arch/s390-06-01-qeth-ext-src-mac-addr.patch
-       patches.arch/s390-06-02-qeth-layercrash.patch
-       patches.arch/s390-06-03-dasd_sim_sense_condition.patch
-       patches.arch/s390-06-04-qdio_ssqd_memcpy.patch
-       patches.arch/s390-06-05-qdio_s390dbf.patch
-       patches.arch/s390-06-06-qdio_inbound_ack.patch
-       patches.arch/s390-06-07-cio-attach_detach.patch
-
-       patches.arch/s390-07-01-zfcp-port-failed-message.diff
-       patches.arch/s390-07-02-zfcp-unchained-fsf.diff
-       patches.arch/s390-07-03-topology-fix.diff
-       # The s390-07-04-dasd-failfast.patch is moved after the
-       # patches.fixes/scsi-enhance-error-codes patch as the s390
-       # patch is dependent on the error-codes patch.
-
-       patches.arch/s390-08-01-cio-fix-mp-mode.diff
-       patches.arch/s390-08-02-zfcp-gpn-align-fix.diff
-       patches.arch/s390-08-03-iucv-cpu-hotremove.diff
-       patches.arch/s390-08-04-compat-sigaltstack.diff
-       patches.arch/s390-08-05-af_iucv-msgpeek-fix.patch
-       patches.arch/s390-08-06-personality.patch
-       patches.arch/s390-08-07-compat_wrappers.patch
-       patches.arch/s390-08-08-add_qdio_utilization.patch
-       patches.arch/s390-08-09-switch-amode-off.patch
-
-       patches.arch/s390-09-01-cio_disable_notoper.patch
-       patches.arch/s390-09-02-sclp-handle-empty-evbufs.patch
-       patches.arch/s390-09-03-sclp-mem.patch
-       patches.arch/s390-09-04-topology.diff
-
-       patches.arch/s390-10-01-airq_fix_array_boundary.patch
-       patches.arch/s390-10-02-zfcp_wait_sbal.patch
-       patches.arch/s390-10-03-zfcp_els_thread_context.patch
-       patches.arch/s390-10-04-zfcp_change_adisc_processing.patch
-       patches.arch/s390-10-05-zfcp_remote_port_handling.patch
-       patches.arch/s390-10-06-zfcp_slave_destroy.patch
-       patches.arch/s390-10-07-zfcp_refc_work_inflight.patch
-       patches.arch/s390-10-08-iucv-2ndparm.patch
-       patches.arch/s390-10-09-dasd-fix-timer-add.patch
-       patches.arch/s390-10-10-ccwgroup_fix_unbind.patch
-
-       patches.arch/s390-11-01-kernel_ds_pgtable_walk.patch
-       patches.arch/s390-11-02-kernel_pfn_valid_uaccess.patch
-       patches.arch/s390-11-03-qeth_recovery_drop_mac.patch
-       patches.arch/s390-11-04-lcs_hard_sx_rc.patch
-       patches.arch/s390-11-05-qdio_error_reporting_hs.patch
-       patches.arch/s390-11-06-qdio_tiq_list_lock.patch
-       patches.arch/s390-11-07-qdio_kill_tasklets.patch
-       patches.arch/s390-11-08-qdio_free_shutdown.patch
-       patches.arch/s390-11-09-qdio_ack_newest_and_seperate_polling.patch
-       patches.arch/s390-11-10-zfcp_nameserver_state_on_adapter_offline.patch
-       patches.arch/s390-11-11-zfcp_req_free.patch
-       patches.arch/s390-11-12-zfcp_scsi_scan.patch
-       patches.arch/s390-11-13-zfcp_avoid_semaphore_race.patch
-       patches.arch/s390-11-14-zfcp_unit_remove.patch
-       patches.arch/s390-11-15-kernel_task_size.patch
-       patches.arch/s390-11-16-qeth_siga_error_handling.patch
-
-       patches.arch/s390-12-01-cio-reprobe-deadlock-fix.patch
-       patches.arch/s390-12-02-zfcp_scsi_queue_erp_deadlock.patch
-       patches.arch/s390-12-03-zfcp_adjust_test_link_pre_reqs.patch
-       patches.arch/s390-12-04-zfcp_rport_handling_on_error_inject.patch
-       patches.arch/s390-12-05-cio_introduce_ccw_device_boxed_notify.patch
-       patches.arch/s390-12-06-zfcp_actcli_error.patch
-       patches.arch/s390-12-07-ctcm_remove_crash.patch
-       patches.arch/s390-12-08-kernel_appldata_vtimer.patch
-       patches.arch/s390-12-09-qeth_lan_offline.patch
-       patches.arch/s390-12-10-kernel_appldata_mutex.patch
-       patches.arch/s390-12-11-zfcp_fcp_port_handling.patch
-       patches.arch/s390-12-12-zfcp_wka_wait_refcount.patch
-       patches.arch/s390-12-13-zfcp_deadlock_port_scan_ERP.patch
-       patches.arch/s390-12-14-zfcp_port_reference_counting.patch
-       patches.arch/s390-12-15-zfcp_abort_handler_for_completions_in_progress.patch
-       patches.arch/s390-12-16-zfcp_reference_counting_for_cfdc_requests.patch
-
-       patches.arch/s390-13-01-af_iucv-fix-race-msgpending.patch
-       patches.arch/s390-13-02-zfcp_changed_port_did.patch
-       patches.arch/s390-13-03-qeth_checksum.patch
-       patches.arch/s390-13-04-qeth-port-isolation.patch
-
-       patches.arch/s390-14-01-af_iucv-connect-free-path.patch
-
-       patches.arch/s390-15-01-zfcp-erp-escalation.patch
-       patches.arch/s390-15-02-phys-port-close.patch
-       patches.arch/s390-15-03-zfcp-recover-stall.patch
-       patches.arch/s390-15-04-zfcp-unchained-sbals.patch
-       patches.arch/s390-15-05-zfcp-erp-notify.patch
-       patches.arch/s390-15-06-zfcp-recovery-wait.patch
-       patches.arch/s390-15-07-zfcp-fc-rport.patch
-       patches.arch/s390-15-08-zfcp-fc-wka-opening.patch
-       patches.arch/s390-15-09-idle-accounting.diff
-       patches.arch/s390-15-10-zcrypt-hrtimer-scheduling.patch
-       patches.arch/s390-15-11-cio-vary-unregister.patch
-       patches.arch/s390-15-12-zfcp-wka-work.patch
-
-       patches.arch/s390-16-01-zfcp-link-test.patch
-
-       patches.arch/s390-symmetrix-ioctl.patch
-       patches.fixes/zfcp-make-queue_depth-adjustable
-
-       # s390-17-perf-01 needs to be after the debugging patch no-frame-pointer-select
-       # s390-17-perf-02 needs to be after s390-utrace-enablement
-       patches.arch/s390-17-perf-03-qdio_inline_qdio_perf_stat_inc.patch
-       patches.arch/s390-17-perf-04-qdio_move_adapter_interrupt_tasklet_code.patch
-       patches.arch/s390-17-perf-05-qdio_extract_all_primed_SBALs_at_once.patch
-       patches.arch/s390-17-perf-07-qdio_sanitize_do_QDIO_sanity_checks.patch
-       patches.arch/s390-17-perf-08-qdio_merge_AI_tasklet_into_interrupt_handler.patch
-       patches.arch/s390-17-perf-09-module-plt.patch
-       patches.arch/s390-17-perf-10-cio-scsw-helper.patch
-       patches.arch/s390-17-perf-11-csum-fold.patch
-       patches.arch/s390-17-perf-12-get_clock_monotonic.patch
-       patches.arch/s390-17-perf-13-dasd-goodcase-perf.patch
-       patches.arch/s390-17-perf-14-zfcp-optimize-qdio_account.patch
-       patches.arch/s390-17-perf-15-zfcp-move-debug-data.patch
-       patches.arch/s390-17-perf-16-zfcp-scsi-trace-only-matching-debug-data.patch
-       patches.arch/s390-17-perf-17-zfcp-fsfhba-trace-only-matching-debug-data.patch
-
-       patches.arch/s390-18-01-cio-retries.patch
-       patches.arch/s390-18-02-cio-race.patch
-       patches.arch/s390-18-03-iucv-query-maxconn.patch
-
-       patches.arch/s390-19-01-dasd-diag-for-readonly-devices.patch
-       patches.arch/s390-19-02-ap_bus-lock-when-scheduling-hrtimer.patch
-       patches.arch/s390-19-03-kernel-clear-high-regs.patch
-
-       patches.arch/s390-personality-mask.patch
-       patches.arch/s390-zfcp-synchronize-scsi-register
+       patches.suse/s390-System.map.diff
+       patches.arch/s390-message-catalog.diff
+
+       patches.arch/s390-01-qeth-isolation.patch
+
+       patches.arch/s390-02-01-cex3-init-msg.patch
+       patches.arch/s390-02-02-cex3-special-command.patch
+       patches.arch/s390-02-03-cex3-device.patch
+       patches.arch/s390-02-04-cex3-use-def.patch
+       patches.arch/s390-02-05-zcrypt-speed-cex2c.patch
+       patches.arch/s390-02-06-zcrypt-speed-cex3.patch
+
+       patches.arch/s390-03-qeth-hs-traffic-analyzer.patch
+
+       patches.arch/s390-04-02-zcrypt-hrtimer.patch
+       patches.arch/s390-04-04-mm-fault-fix.patch
+       patches.arch/s390-04-05-sclp-dump-indicator.patch
+       patches.arch/s390-04-06-dasd-move-diag-kmsg.patch
+       patches.arch/s390-04-08-cio-fix-dev-stall.patch
+       patches.arch/s390-04-09-cio-recover-hw-changes.patch
+       patches.arch/s390-04-10-cio-fix-onoffline-failure.patch
+       patches.arch/s390-04-11-cio-error-reporting.patch
+       patches.arch/s390-04-13-cio-internal-io.patch
+       patches.arch/s390-04-14-cio-allow-offline.patch
+       patches.arch/s390-04-15-cio-split-pgid.patch
+       patches.arch/s390-04-16-cio-path-verification.patch
+       patches.arch/s390-04-17-cio-steal-lock.patch
+       patches.arch/s390-04-18-cio-fix-memleak-chk-dev.patch
+       patches.arch/s390-04-19-cio-fix-deact-dev-panic.patch
+
        patches.suse/s390-Kerntypes.diff
-       patches.arch/s390-disable-etr-stp
-       patches.arch/s390-dasd-eckd_write_r0.patch
 
-       patches.arch/s390-20-02-sclp-dump-indicator.patch
-       patches.arch/s390-20-03-zfcp-fail-commands.diff
+       patches.arch/s390-05-02-cmm-suspend.patch
+       patches.arch/s390-05-03-iucv-suspend.patch
+       patches.arch/s390-05-04-zfcp-work-queue.patch
+       patches.arch/s390-05-05-zfcp-fail-commands.patch
+       patches.arch/s390-05-06-zfcp-adisc.patch
+       patches.arch/s390-05-07-zfcp-fsf-errors.patch
+       patches.arch/s390-05-08-zfcp-block.diff
+       patches.arch/s390-05-09-ctcm-suspend-wait.diff
+       patches.arch/s390-05-10-rework-tso.diff
+       patches.arch/s390-05-11-atomic-volatile.patch
+       patches.arch/s390-05-12-tape-remove-fn.patch
+       patches.arch/s390-05-13-qeth-blkt-defaults.patch
+       patches.arch/s390-05-14-dasd-dasd-enable-prefix.patch
+       patches.arch/s390-05-16-dasd-wait-lcu-setup.patch
+
+       patches.arch/s390-06-01-zfcp-introduce-bsg-timeout-callback.patch
+       patches.arch/s390-06-02-zfcp-set-hw-timeout-requested-by-bsg.patch
+
+       patches.arch/s390-07-03-cio-fix-vary-handling.patch
+       patches.arch/s390-07-04-dasd_online_offline_race.patch
+
+       patches.arch/s390-08-01-zfcp_port_dequeue_race.patch
+       patches.arch/s390-08-02-zfcp_fc_bsg_report_error.patch
+       patches.arch/s390-08-03-qdio-input-error.patch
+       patches.arch/s390-08-04-qdio-int_handler_warn.patch
+       patches.arch/s390-08-05-hvc-iucv-alloc-dma.patch
+
+       patches.arch/s390-09-01-vdso-version.patch
+       patches.arch/s390-09-02-dasd-fix_refcount.patch
+       patches.arch/s390-09-03-dasd-correct_offline_processing.patch
+       patches.arch/s390-09-04-qeth-no-online-recover.patch
+       patches.arch/s390-09-05-zfcp-ccw_fix_remove_list.patch
+       patches.arch/s390-09-06-qeth-dhcp.patch
+       patches.arch/s390-09-07-qeth-checksum-default.patch
+
+       patches.arch/s390-dasd-emc-ckd-psf-and-security.patch
 
         ########################################################
         # VM/FS patches
         ########################################################
        patches.suse/unmap_vmas-lat
-+andrea        patches.suse/silent-stack-overflow
        patches.suse/silent-stack-overflow-2.patch
        patches.fixes/do_anonymous_page-race
        patches.fixes/oom-warning
        patches.suse/shmall-bigger
        patches.fixes/grab-swap-token-oops
-       patches.fixes/mm-madvise-fix.patch
-       patches.fixes/slab-alloc_slabmgmt-fix.patch
-       patches.suse/mm-do-not-disable-memory-hotplug-when-hibernation-is-enabled.patch
-       patches.fixes/mm-fix-Commited_AS-underflow-on-large-NR_CPUS
 
-       patches.suse/osync-error
++needs_update-32       patches.suse/osync-error
        patches.fixes/remount-no-shrink-dcache
-       patches.suse/reiser4-sync_inodes
-       patches.suse/x86-gb-linear-map.patch
-       patches.suse/file-capabilities-add-file_caps-switch.diff
+       patches.suse/reiser4-set_page_dirty_notag
        patches.suse/file-capabilities-disable-by-default.diff
-       patches.fixes/block-sanitize-invalid-partition-table-entries
 
-       patches.suse/mnt-want-write-speedup.patch
-       patches.suse/mnt_clone_write.patch
        patches.suse/unlock_page-speedup.patch
+       patches.suse/mm-tune-dirty-limits.patch
+
+       patches.suse/mm-vmalloc-fail-dump-stack.patch
        patches.suse/mm-devzero-optimisation.patch
-       patches.fixes/mm-nr_pdflush-race-fix.patch
-       patches.fixes/numa-enable-hashdist-default.patch
+
        patches.fixes/aggressive-zone-reclaim.patch
+       patches.suse/readahead-request-tunables.patch
+       patches.fixes/mm-memcg-coalesce-uncharge.patch
+       patches.fixes/mm-memcg-coalesce-charging.patch
+       patches.fixes/readahead-unplug-dev.patch
 
-       patches.suse/mm-vmalloc-fail-dump-stack.patch
-       patches.fixes/mm-fix-overcommit-accounting.patch
+       # bug 578046
+       patches.fixes/Have-mmu_notifiers-use-SRCU-so-they-may-safely-schedule.patch
+       patches.fixes/Have-mmu_notifiers-use-SRCU-so-they-may-safely-schedule-build-fix.patch
+       patches.fixes/Fix-unmap_vma-bug-related-to-mmu_notifiers.patch
 
-       ########################################################
-       # CPU scheduler
-       ########################################################
-       patches.fixes/bug-437171_1_sched_clock_lock.patch
-       patches.fixes/bug-437171_2_sched_delta_weight.patch
-       patches.fixes/bug-437171_3_rework_wakeup_preemption.patch
-       patches.fixes/bug-437171_4_sched_reinstate_vruntime_wakeup.patch
+       patches.fixes/mm-pagealloc-fix-congestion-wait.patch
+       patches.suse/mm-uninline-add-to-page-cache.patch
+       patches.suse/pagecache-limit.patch
+
+        ########################################################
+        # IPC patches
+        ########################################################
+       patches.fixes/ipc-semc-sem-optimise-undo-list-search.patch
+       patches.fixes/ipc-semc-sem-use-list-operations.patch
+       patches.fixes/ipc-semc-sem-preempt-improve.patch
+       patches.fixes/ipc-semc-optimize-if-semops-fail.patch
+       patches.fixes/ipc-semc-add-a-per-semaphore-pending-list.patch
+       patches.fixes/ipc-semc-optimize-single-semop-operations.patch
+       patches.fixes/ipc-semc-optimize-single-sops-when-semval-is-zero.patch
+       patches.fixes/ipc-remove-unreachable-code-in-semc.patch
 
        ########################################################
        # nfsacl protocol (agruen)
@@ -671,9 +557,6 @@
        patches.suse/connector-read-mostly
        patches.suse/kbd-ignore-gfx.patch
        patches.fixes/ds1682-build-fix
-       patches.suse/rlimit-memlock-64k.patch
-       patches.fixes/sched-fix-__load_balance_iterator-for-cfs-with-on.patch
-       patches.fixes/use-totalram_pages
 
        ########################################################
        #
@@ -683,82 +566,50 @@
        patches.suse/apm_setup_UP.diff
 
        # Check resource conflicts between hwmon and ACPI OpRegs
-       patches.arch/check-for-acpi-resource-conflicts-in-hwmon-drivers.patch
-
        patches.arch/acpi_thinkpad_introduce_acpi_root_table_boot_param.patch
-       patches.arch/acpi_thinkpad_introduce_acpica_rsdt_global_variable.patch
-       patches.arch/acpi_thinkpad_remove_R40e_c-state_blacklist.patch
 
-       patches.suse/acpi-dsdt-initrd-v0.9a-2.6.25.patch
++trenn patches.suse/acpi-dsdt-initrd-v0.9a-2.6.25.patch
++jeffm patches.suse/add-initramfs-file_read_write
++jeffm patches.suse/init-move-populate_rootfs-back-to-start_kernel
++jeffm patches.suse/acpi-generic-initramfs-table-override-support
 
        patches.arch/acpi_thermal_passive_blacklist.patch
-
-       patches.arch/0000-ACPI-video-Ignore-devices-not-present.patch
-       patches.arch/0001-Check-for-ACPI-backlight-support.patch
-       patches.arch/0002-Acer-WMI-fingers-off-backlight-video.ko.patch
-       patches.arch/0003-Asus-acpi-fingers-off-backlight.patch
-       patches.arch/0004-Compal-fingers-off-backlight.patch
-       patches.arch/0005-eeepc-laptop-fingers-off.patch
-       patches.arch/0006-fujitsu-laptop-fingers-off-backlight.patch
-       patches.arch/0007-msi-laptop-fingers-off-backlight.patch
-       patches.arch/0008-sony-laptop-fingers-off-backlight.patch
-       patches.arch/0009-thinkpad_acpi-fingers-off-backlight.patch
-       patches.arch/thinkpad_fingers_off_backlight_igd.patch
-       patches.arch/thinkpad_acpi-hotkey-notify-fix
-       patches.arch/acpi_video_thinkpad_exclude_IGD_devices.patch
-
-       patches.arch/acpi-dock-fix-eject-request-process.patch
-       patches.arch/acpi-dock-_LCK-support-for-dock.patch
-       patches.arch/acpi-dock-makeing-dock-driver-supports-bay-and-battery-hotplug.patch
-       patches.arch/acpi-dock-Fix-duplicate-notification-handler-register.patch
-       patches.arch/acpi-dock-fix-hotplug-race.patch
-       patches.arch/acpi-libata-hotplug-to-align-with-dock-driver.patch
-       patches.arch/acpi-dock-introduce-.uevent-for-devices-in-dock.patch
-       patches.arch/acpi-bay-remove-useless-code.patch
-       patches.arch/acpi-bay-remove-from-makefile
-       patches.arch/acpi-dock-fix-for-bay-in-a-dock-station.patch
-       patches.arch/acpi-dock-add-type-sysfs-file-for-dock.patch
-       patches.arch/acpi-dock-don-t-eval-_sta-on-every-show_docked-sysfs-read.patch
        patches.arch/acpi-export-hotplug_execute
 
-       patches.fixes/acpi_use_acpi_exception.patch
-       patches.fixes/fujisu_laptop_fix_section_mismatch.patch
-       patches.arch/acpi_ec_provide_non_interrupt_mode_boot_param.patch
-       patches.arch/acpi_x2APIC_madt_enhancements.patch
-
-       # HP - Differ ACPI processor declarations and gain apic id
-       #      correctly for each
-       patches.arch/acpi_disambiguate_processor_declaration_type.patch
-       patches.arch/acpi_behave_uniquely_based_on_processor_declaration.patch
-       patches.arch/acpi_processor_cleanups.patch
-       patches.fixes/acpi_assure_unique_processor_proc_creation.patch
-
-       patches.suse/acpi_osi_sle11_ident.patch
++needs_update-32       patches.arch/acpi_ec_provide_non_interrupt_mode_boot_param.patch
 
+       # Adjust this patch for every new product (at least Enterprise
+       # level) to provide OEMs a safety break so that they can add
+       # for example SLE11 specific BIOS updates (if there is no other
+       # way to safely solve an ACPI issue).
++trenn patches.suse/acpi_osi_sle11_ident.patch
        patches.arch/acpi_srat-pxm-rev-store.patch
        patches.arch/acpi_srat-pxm-rev-ia64.patch
        patches.arch/acpi_srat-pxm-rev-x86-64.patch
+       patches.arch/x86_cpu_hotplug_map_numa_node_correctly.patch
 
-       patches.suse/bug-504646-acpi-enable-root-bridge-to-wakeup.patch
-       patches.arch/bug-535380-x86-change-some-messages-to-debug.patch
-
+       patches.arch/acpi_enable_C3_on_huge_latencies.patch
+       patches.fixes/acpi-fix-regression-where-_ppc-is-not-read-at-boot-even-when-ignore_ppc-0
        ########################################################
        # CPUFREQ
        ########################################################
-        # To be benchmarked (if time after late feature freeze):
-+trenn patches.drivers/cpufreq_add_cpu_number_paramater_1.patch
-+trenn patches.drivers/cpufreq_change_load_calculation_2.patch
-+trenn patches.drivers/cpufreq_get_cpu_idle_time_changes_3.patch
-+trenn patches.drivers/cpufreq_parameterize_down_differential_4.patch
-+trenn patches.drivers/cpufreq_changes_to_get_cpu_idle_us_5.patch
-+trenn patches.drivers/cpufreq_add_idle_microaccounting_6.patch
-
-       patches.fixes/cpufreq_export_latency.patch
-       patches.fixes/cpufreq_ondemand_adjust_sampling_rate_limit.patch
-       patches.fixes/x86_cpufreq_powernow-k8_acpi_latency_values.patch
+
+## cpuidle feature patch set still not consistent.
+#      patches.suse/cpuidle-cleanup
+#      patches.suse/cpuidle-implement-list
+#      patches.suse/cpuidle-cleanup-x86
+#      patches.suse/cpuidle-enable-pseries
+#      patches.suse/cpuidle-cleanup-pseries
+#      patches.suse/cpuidle-add-default-idle-ppc
+#      patches.suse/cpuidle-pseries-proc-idle
+#      patches.suse/cpuidle-eliminate-ppcmdpowersave1
+#      patches.suse/cpuidle-documentation
        patches.fixes/cpufreq_ondemand_performance_optimise_default_settings.patch
-       patches.suse/hp_backlight_blacklist_6530b.patch
-       patches.arch/x86_cpufreq_intel_blacklist.patch
+
+       # PCC -> HP's cpufreq driver
+       patches.drivers/cpufreq_ondemand_limit_fix.patch
+       patches.drivers/cpufreq_processor_clocking_control_pcc_driver.patch
+       patches.fixes/bios_driven_exclude_firmware_error.patch
 
        ########################################################
        # AGP, graphics related stuff
@@ -769,61 +620,32 @@
        # Suse specific stuff
        ########################################################
        # TIOCGDEV - suse special
-#      patches.fixes/tiocgdev
-#      patches.suse/mm-increase-dirty-limits.patch
+       patches.fixes/tiocgdev
++still_needed? patches.suse/mm-increase-dirty-limits.patch
+       patches.suse/panic-on-io-nmi-SLE11-user-space-api.patch
+       patches.suse/stop_machine-implement-lazy
 
         ########################################################
         # Networking, IPv6
         ########################################################
        patches.fixes/bridge-module-get-put.patch
-       patches.fixes/vlan-gso-size-fix
-       patches.fixes/pkt_sched_multiq_support
-       patches.fixes/pkt_action-skbedit
-       patches.fixes/bonding-net-move-last_rx-update-into-bonding-recv-logic
-       patches.fixes/fix-balance-alb-bonding-receive
-       patches.fixes/tc-fix-unitialized-kernel-memory-leak
+       patches.fixes/gre-fix-netns-vs-proto-registration-ordering
+       patches.fixes/tunnels-fix-netns-vs-proto-registration-ordering
 
        ########################################################
        # NFS
        ########################################################
-       patches.fixes/nfs-file-cred-context-null
-       patches.fixes/nfs-handle-ESTALE-on-ACCESS
-       patches.fixes/nfs-fix-posix-acl
-       patches.fixes/nfs-fix-nfs3_xdr_setaclargs
-       patches.fixes/sunrpc-fix-oops-not-setup-socket
-       patches.fixes/nfs-lock-release-lockargs
-       # 5 patches for bnc#490030
-       patches.fixes/nfs-01-Uninline-the-function-put_mnt_ns
-       patches.fixes/nfs-02-Add-VFS-helper-functions-for-setting-up-private-namespaces
-       patches.fixes/nfs-03-NFSv4-Replace-nfs4_path_walk-with-VFS-path-lookup-in-private-namespace
-       patches.fixes/nfs-04-Fix-nfs_path-to-always-return-a-slash-at-the-beginning-of-the-path
-       patches.fixes/nfs-05-Correct-the-NFS-mount-path-when-following-a-referral
-       patches.fixes/nfs-06-dont-bother-with-check_mnt-in-do_add_mount-on-shrinkable-ones
-       patches.fixes/NFSv4-Fix-an-Oops-in-nfs4_free_lock_state.patch
-
-       patches.fixes/sunrpc-tcp-reconnect
        patches.fixes/nfs-slot-table-alloc
-       patches.fixes/nfs-honour-server-preferred-io-size
-       patches.fixes/nfs-auth-cache-race.patch
-       patches.fixes/nfs-mount-symlink-fix
-       patches.fixes/nfs-fix-NFS4ERR_FILE_OPEN-handling
 
-       ########################################################
-       # NFSd
-       ########################################################
-       # bnc#498708
-       patches.fixes/nfsd-01-sunrpc-cache-simplify-cache_fresh_locked-and-cache_f.patch
-       patches.fixes/nfsd-02-sunrpc-cache-recheck-cache-validity-after-cache_defe.patch
-       patches.fixes/nfsd-03-sunrpc-cache-use-list_del_init-for-the-list_head-ent.patch
-       patches.fixes/nfsd-04-sunrpc-cache-avoid-variable-over-loading-in-cache_de.patch
        patches.fixes/nfsd-05-sunrpc-cache-allow-thread-to-block-while-waiting-for.patch
        patches.fixes/nfsd-06-sunrpc-cache-retry-cache-lookups-that-return-ETIMEDO.patch
        patches.fixes/nfsd-07-nfsd-idmap-drop-special-request-deferal-in-favour-of.patch
-       patches.fixes/nfsd-08-sunrpc-fix-memory-leak-in-unix_gid-cache.patch
        patches.fixes/nfsd-09-fix-kabi
-       patches.fixes/nfsd4-posix-acl-to-nfs4-acl-conversion-isues.diff
-       patches.fixes/nfsd-exclusive-create-fix
-       patches.fixes/nfsd-acl.patch
+
+       patches.fixes/nfs-fix-NFS4ERR_FILE_OPEN-handling
+       patches.fixes/sunrpc-monotonic-expiry
+       patches.fixes/nfs-bdi-leak.fix
+       patches.fixes/01-rnfs_read_complete_calc_rq_respages.patch
 
        ########################################################
        # lockd + statd
@@ -832,369 +654,91 @@
        ########################################################
        # cifs patches
        ########################################################
-       patches.fixes/cifs-fix-ssh-tunneled-mounts
 
        ########################################################
        # ext2/ext3
        ########################################################
 #      patches.suse/ext3-barrier-default
-       patches.suse/ext2-fsync-err
+#      patches.suse/ext2-fsync-err
        patches.fixes/ext3-mark-super-uptodate
-       patches.fixes/ext3_false_EIO_fix.diff
-       patches.fixes/ext2_mtime_update_on_rename.diff
 
        ########################################################
        # ext4
        ########################################################
-#      patches.fixes/percpu_counter_sum_cleanup.patch
-#      patches.fixes/ext4-fixes-2.6.28-rc8.patch
-#      patches.fixes/ext4-mballoc-preallocate.patch
-#      patches.fixes/ext4-use-a-fake-block-number-for-delayed-new-buffer_head
-#      patches.fixes/ext4-fix-sub-block-zeroing-for-preallocated-writes
-#      patches.fixes/ext4-clear-unwritten-flag-after-extent-initialization
-#      patches.fixes/ext4-avoid-corrupting-the-uninitialized-bit-in-the-extent-during-truncate
-#      patches.fixes/ext4-avoid-null-pointer-dereference-when-decoding-erofs-w-o-a-journal
-#      patches.fixes/ext4-avoid-divide-by-zero-when-trying-to-mount-a-corrupted-file-system
-
-#      patches.fixes/ext4-fix-i_flags-access-in-ext4_da_writepages_trans_blocks
-#      patches.fixes/ext4-fix-potential-buffer-head-leak-when-add_dirent_to_buf-returns-enospc
-#      patches.fixes/ext4-fix-uninit-block-bitmap-initialization-when-s_meta_first_bg-is-non-zero
-#      patches.fixes/ext4-journal-all-modifications-in-ext4_xattr_set_handle
-#      patches.fixes/ext4-make-sure-directory-and-symlink-blocks-are-revoked
-#      patches.fixes/ext4-plug-a-buffer_head-leak-in-an-error-path-of-ext4_iget
-#      patches.fixes/ext4-return-the-ptr_err-of-the-correct-pointer-in-setup_new_group_blocks
-#      patches.fixes/jbd2-fix-race-between-write_metadata_buffer-and-get_write_access
-#      patches.fixes/jbd2-add-enomem-checking-in-and-for-jbd2_journal_write_metadata_buffer
 
        ########################################################
        # Reiserfs Patches
        ########################################################
-
-       # From -mm
-
-       patches.suse/reiserfs-mount-count
--      patches.suse/reiserfs-inode-init
-       patches.fixes/reiserfs-commit-ids-unsigned-ints
-
-
-       # Better error handling and reporting
-       patches.suse/reiserfs-buffer-info-for-balance.diff
-       patches.suse/reiserfs-consistent-messages.diff
-       patches.suse/reiserfs-reiserfs_info.diff
-       patches.suse/reiserfs-reiserfs-warning.diff
-       patches.suse/reiserfs_warning-reentrant
-       patches.suse/reiserfs-reiserfs_panic.diff
-       patches.suse/reiserfs-rearrange-journal-abort.diff
-       patches.suse/reiserfs-add-reiserfs_error.diff
-       patches.suse/reiserfs-use-reiserfs_error.diff
-
-       # Extended attribute rework
-       patches.suse/reiserfs-remove-xinode
-       patches.suse/reiserfs-xattr-get-page
-       patches.suse/reiserfs-remove-link-detection.diff
-       patches.suse/reiserfs-xattr-S_PRIVATE
-       patches.suse/reiserfs-clean-up-xattrs
-       patches.suse/reiserfs-simplify-xattr-internal-file-lookups-opens.diff
-       patches.suse/reiserfs-eliminate-per-super-xattr-lock.diff
-       patches.suse/reiserfs-make-per-inode-xattr-locking-more-fine-grained.diff
-       patches.suse/reiserfs-remove-i_has_xattr_dir.diff
-       patches.suse/reiserfs-use-generic-xattr-handlers.diff
-       patches.suse/reiserfs-journaled-xattrs.diff
-       patches.suse/reiserfs-kill-xattr-readdir.diff
-       patches.suse/reiserfs-selinux.diff
-
-       # Code cleanups
-       patches.suse/reiserfs-simplify-buffer-info.diff
-       patches.suse/reiserfs-cleanup-path-funcs.diff
-       patches.suse/reiserfs-strip-whitespace.diff
-       patches.suse/reiserfs-rename-p_s_sb.diff
-       patches.suse/reiserfs-rename-p_s_bh.diff
-       patches.suse/reiserfs-rename-p_s_inode.diff
-       patches.suse/reiserfs-rename-p_s_tb.diff
-       patches.suse/reiserfs-rename-p_._.diff
-       patches.suse/reiserfs-rename-._.diff
-
-       # Fixes
-        patches.fixes/reiserfs-varargs-fix
-        patches.fixes/reiserfs-error-buffer-locking
-       patches.suse/reiserfs-barrier-default
-       patches.fixes/reiserfs-truncate-failed-write
        patches.fixes/reiserfs-replay-honor-ro
-
+       patches.suse/reiserfs-barrier-default
 
        ########################################################
-       # ocfs2
+       # dlm
        ########################################################
-
-       # fs/dlm fixes
-       patches.fixes/dlm-allow-multiple-lockspaces.patch
-       patches.fixes/dlm-fix-shutdown-cleanup.patch
-       patches.suse/dlm-detect-available-userspace-daemon.patch
-       patches.suse/dlm-fix-locking-of-lockspace-list-in-dlm_scand.patch
-       patches.suse/dlm-fix-address-compare.patch
-       patches.suse/dlm-remove-bkl.patch
-       patches.suse/dlm-choose-better-identifiers.patch
-       patches.suse/dlm-trivial-annotation-of-be16-value.patch
-       patches.suse/dlm-fix-up-memory-allocation-flags.patch
-       patches.suse/dlm-remove-kmap-and-kunmap.patch
-       patches.suse/fix-warning-in-fsdlm-netlink.c.patch
-       patches.suse/dlm-remove-extra-blocking-callback-check.patch
-       patches.suse/dlm-improve-how-bast-mode-handling.patch
-       patches.suse/dlm-change-lock-time-stamping.patch
-       patches.suse/dlm-replace-schedule-with-cond_resched.patch
-       patches.suse/dlm-add-new-debugfs-entry.patch
-       patches.suse/dlm-add-time-stamp-of-blocking-callback.patch
-       patches.suse/dlm-fsdlm-ast.c-fix-warning.patch
-       patches.suse/dlm-fix-seq_file-usage-in-debugfs-lock-dump.patch
-       patches.suse/dlm-Change-rwlock-which-is-only-used-in-write-mode-to-a-spinlock.patch
-       patches.suse/dlm-change-rsbtbl-rwlock-to-spinlock.patch
-       patches.suse/dlm-fix-plock-notify-callback-to-lockd.patch
-       patches.suse/dlm-use-ipv6_addr_copy.patch
-       patches.suse/dlm-comment-typo-fixes.patch
-       patches.suse/dlm-replace-idr-with-hash-table-for-connections.patch
-       patches.suse/dlm-clear-defunct-cancel-state.patch
-       patches.suse/dlm-ignore-cancel-on-granted-lock.patch
-       patches.suse/dlm-fix-length-calculation-in-compat-code.patch
-       patches.suse/headers_check-fix-linux-dlm_plock.h.patch
-       patches.suse/dlm_lock_data-make-most-exported-headers-use-strict-integer-types.patch
-
-
-       # Extended Attribute Support
-       patches.suse/ocfs2-Modify-ocfs2_num_free_extents-f.patch
-       patches.suse/ocfs2-Use-ocfs2_extent_list-instead-o.patch
-       patches.suse/ocfs2-Abstract-ocfs2_extent_tree-in-b.patch
-       patches.suse/ocfs2-Make-high-level-btree-extend-co.patch
-       patches.suse/ocfs2-Add-the-basic-xattr-disk-layout-in-ocf.patch
-       patches.suse/ocfs2-Add-helper-function-in-uptodate.patch
-       patches.suse/ocfs2-Add-extent-tree-operation-for-x.patch
-       patches.suse/ocfs2-reserve-inline-space-for-extend.patch
-       patches.suse/ocfs2-Add-extended-attribute-support.patch
-       patches.suse/ocfs2-Add-xattr-index-tree-operations.patch
-       patches.suse/ocfs2-Add-xattr-bucket-iteration-for.patch
-       patches.suse/ocfs2-Add-xattr-lookup-code-xattr-btr.patch
-       patches.suse/ocfs2-Optionally-limit-extent-size-in.patch
-       patches.suse/ocfs2-Enable-xattr-set-in-index-btree.patch
-       patches.suse/ocfs2-Delete-all-xattr-buckets-during.patch
-       patches.suse/ocfs2-Add-incompatible-flag-for-exten.patch
-       patches.suse/ocfs2-fix-printk-format-warnings.patch
-       patches.suse/ocfs2-Prefix-the-extent-tree-operations-structure.patch
-       patches.suse/ocfs2-Prefix-the-ocfs2_extent_tree-structure.patch
-       patches.suse/ocfs2-Make-ocfs2_extent_tree-get-put-instead-of-all.patch
-       patches.suse/ocfs2-Make-private-into-object-on-ocfs2_extent_.patch
-       patches.suse/ocfs2-Provide-the-get_root_el-method-to-ocfs2_ext.patch
-       patches.suse/ocfs2-Use-struct-ocfs2_extent_tree-in-ocfs2_num_fre.patch
-       patches.suse/ocfs2-Determine-an-extent-tree-s-max_leaf_clusters.patch
-       patches.suse/ocfs2-Create-specific-get_extent_tree-functions.patch
-       patches.suse/ocfs2-Add-an-insertion-check-to-ocfs2_extent_tree_o.patch
-       patches.suse/ocfs2-Make-ocfs2_extent_tree-the-first-class-repres.patch
-       patches.suse/ocfs2-Comment-struct-ocfs2_extent_tree_operations.patch
-       patches.suse/ocfs2-Change-ocfs2_get_-_extent_tree-to-ocfs2_ini.patch
-       patches.suse/ocfs2-bug-fix-for-journal-extend-in-xattr.patch
-       patches.suse/ocfs2-Resolve-deadlock-in-ocfs2_xattr_free_.patch
-       patches.suse/ocfs2-Add-xattr-mount-option-in-ocfs2_show_options.patch
-
-       # JBD2 Support
-       patches.suse/ocfs2-Limit-inode-allocation-to-32bits.patch
-       patches.suse/ocfs2-Add-the-inode64-mount-option.patch
-       patches.suse/ocfs2-Switch-over-to-JBD2.patch
-
-       # POSIX File Locks support
-       patches.suse/ocfs2-POSIX-file-locks-support.patch
-
-       # Dynamic local alloc
-       patches.suse/ocfs2-Track-local-alloc-bits-internally.patch
-       patches.suse/ocfs2-throttle-back-local-alloc-when-low-on-disk-sp.patch
-       patches.suse/ocfs2-track-local-alloc-state-via-debugfs.patch
-
-       # Remaining 2.6.28 merge window patches
-       patches.suse/ocfs2-xattr.c-Fix-a-bug-when-inserting-xattr.patch
-       patches.suse/ocfs2-Add-empty-bucket-support-in-xattr.patch
-       patches.suse/ocfs2-Remove-pointless.patch
-       patches.suse/ocfs2-make-la_debug_mutex-static.patch
-       patches.suse/ocfs2-Documentation-update-for-user_xattr-nouser_.patch
-       patches.suse/ocfs2-use-smaller-counters-in-ocfs2_remove_xattr_cl.patch
-       patches.suse/ocfs2-Don-t-check-for-NULL-before-brelse.patch
-       patches.suse/ocfs2-Uninline-ocfs2_xattr_name_hash.patch
-       patches.suse/ocfs2-Move-trusted-and-user-attribute-support-into.patch
-       patches.suse/ocfs2-Calculate-EA-hash-only-by-its-suffix.patch
-       patches.suse/ocfs2-Refactor-xattr-list-and-remove-ocfs2_xattr_ha.patch
-       patches.suse/ocfs2-Separate-out-sync-reads-from-ocfs2_read_block.patch
-       patches.suse/ocfs2-Require-an-inode-for-ocfs2_read_block-s.patch
-       patches.suse/ocfs2-Simplify-ocfs2_read_block.patch
-       patches.suse/ocfs2-Move-ocfs2_bread-into-dir.c.patch
-       patches.suse/ocfs2-Kill-the-last-naked-wait_on_buffer-for-cach.patch
-       patches.suse/ocfs2-Make-cached-block-reads-the-common-case.patch
-       patches.suse/ocfs2-fix-build-error.patch
-
-       # Fixes from 2.6.28
-       patches.fixes/ocfs2-remove-undefined-xattr-handlers.patch
-       patches.fixes/ocfs2-remove-prepare_write-commit_write.patch
-       patches.fixes/ocfs2-fix-license-in-xattr.patch
-       patches.fixes/ocfs2-fix-function-declaration-and-definition-in-xa.patch
-       patches.fixes/ocfs2-remove-duplicate-definition-in-xattr.patch
-       patches.fixes/ocfs2-add-handler_map-array-bounds-checking.patch
-       patches.fixes/ocfs2-Check-xattr-block-signatures-properly.patch
-       patches.fixes/ocfs2-Don-t-return-EFAULT-from-a-corrupt-xattr-ent.patch
-       patches.fixes/ocfs2-Check-errors-from-ocfs2_xattr_update_xattr_se.patch
-       patches.fixes/ocfs2-Specify-appropriate-journal-access-for-new-xa.patch
-       patches.fixes/ocfs2-Don-t-repeat-ocfs2_xattr_block_find.patch
-       patches.fixes/ocfs2-Remove-unused-ocfs2_restore_xattr_block.patch
-       patches.fixes/ocfs2-Fix-some-typos-in-xattr-annotations.patch
-       patches.fixes/ocfs2-Fix-check-of-return-value-of-ocfs2_start_tran.patch
-       patches.fixes/ocfs2-Fix-checking-of-return-value-of-new_inode.patch
-       patches.fixes/ocfs2-Let-inode-be-really-deleted-when-ocfs2_mknod_.patch
-       patches.fixes/ocfs2-more_start_tran_fixes.patch
-       patches.fixes/ocfs2-Set-journal-descriptor-to-NULL-after-journal.patch
-       patches.fixes/ocfs2-return-0-in-page_mkwrite-to-let-VFS-retry.patch
-       patches.fixes/ocfs2-xattr-Proper-hash-collision-handle-in-bucket.patch
-       patches.fixes/ocfs2-truncate-outstanding-block-after-direct-io-fa.patch
-       patches.fixes/ocfs2-fix-printk-related-build-warnings-in-xattr.c.patch
-       patches.fixes/ocfs2-Check-search-result-in-ocfs2_xattr_block_get.patch
-       patches.fixes/ocfs2-comments-typo-fix.patch
-       patches.fixes/ocfs2-initialize-stack_user-lvbptr.patch
-       patches.fixes/ocfs2-fix-wake_up-in-unlock_ast.patch
-       patches.fixes/ocfs2-fix-return-value-set-in-init_dlmfs_fs.patch
-       patches.fixes/ocfs2-fix-regression-in-ocfs2_read_blocks_sync.patch
-       patches.fixes/ocfs2-Always-update-xattr-search-when-creating-buck.patch
-       patches.fixes/ocfs2-Add-JBD2-compat-feature-bit.patch
-
-       # ACL and Security Attribute Support
-       patches.suse/ocfs2-Field-prefixes-for-the-xattr_bucket-structure.patch
-       patches.suse/ocfs2-Convenient-access-to-an-xattr-bucket-s-block.patch
-       patches.suse/ocfs2-Convenient-access-to-xattr-bucket-data-blocks.patch
-       patches.suse/ocfs2-Convenient-access-to-an-xattr-bucket-s-header.patch
-       patches.suse/ocfs2-Provide-a-wrapper-to-brelse-xattr-bucket-bu.patch
-       patches.suse/ocfs2-Improve-ocfs2_read_xattr_bucket.patch
-       patches.suse/ocfs2-Wrap-journal_access-journal_dirty-for-xattr-b.patch
-       patches.suse/ocfs2-Copy-xattr-buckets-with-a-dedicated-function.patch
-       patches.suse/ocfs2-Take-ocfs2_xattr_bucket-structures-off-of-the.patch
-       patches.suse/ocfs2-Use-buckets-in-ocfs2_xattr_bucket_find.patch
-       patches.suse/ocfs2-Use-buckets-in-ocfs2_xattr_create_index_block.patch
-       patches.suse/ocfs2-Use-buckets-in-ocfs2_defrag_xattr_bucket.patch
-       patches.suse/ocfs2-Use-buckets-in-ocfs2_xattr_set_entry_in_bucke.patch
-       patches.suse/ocfs2-xattr-Remove-additional-bucket-allocation-in.patch
-       patches.suse/ocfs2-xattr-Only-set-buffer-update-if-it-doesn-t-ex.patch
-       patches.suse/ocfs2-xattr-Only-extend-xattr-bucket-in-need.patch
-       patches.suse/ocfs2-Add-clusters-free-in-dealloc_ctxt.patch
-       patches.suse/ocfs2-xattr-Move-clusters-free-into-dealloc.patch
-       patches.suse/ocfs2-xattr-Reserve-meta-data-at-the-beginning-of-o.patch
-       patches.suse/ocfs2-xattr-Merge-xattr-set-transaction.patch
-       patches.suse/ocfs2-turn-__ocfs2_remove_inode_range-into-ocfs2_.patch
-       patches.suse/ocfs2-move-new-inode-allocation-out-of-the-transact.patch
-       patches.suse/ocfs2-add-ocfs2_xattr_set_handle.patch
-       patches.suse/ocfs2-add-security-xattr-API.patch
-       patches.suse/ocfs2-add-ocfs2_init_security-in-during-file-create.patch
-       patches.suse/ocfs2-add-ocfs2_xattr_get_nolock.patch
-       patches.suse/ocfs2-add-POSIX-ACL-API.patch
-       patches.suse/ocfs2-add-ocfs2_check_acl.patch
-       patches.suse/ocfs2-add-ocfs2_acl_chmod.patch
-       patches.suse/ocfs2-add-ocfs2_init_acl-in-mknod.patch
-       patches.suse/ocfs2-add-mount-option-and-Kconfig-option-for-acl.patch
-
-       # bnc #499278
-       patches.fixes/ocfs2-really-add-ACL-Kconfig.patch
-
-       # Quotas
-       patches.suse/quota-Add-callbacks-for-allocating-and-destroying-d.patch
-       patches.suse/quota-Increase-size-of-variables-for-limits-and-ino.patch
-       patches.suse/quota-Remove-bogus-optimization-in-check_idq-an.patch
-       patches.suse/quota-Make-_SUSPENDED-just-a-flag.patch
-       patches.suse/quota-Allow-to-separately-enable-quota-accounting-a.patch
-       patches.suse/ext3-Use-sb_any_quota_loaded-instead-of-sb_any_qu.patch
-       patches.suse/reiserfs-Use-sb_any_quota_loaded-instead-of-sb_an.patch
-       patches.suse/quota-Remove-compatibility-function-sb_any_quota_en.patch
-       patches.suse/quota-Introduce-DQUOT_QUOTA_SYS_FILE-flag.patch
-       patches.suse/quota-Move-quotaio_v-12-.h-from-include-linux-to-f.patch
-       patches.suse/quota-Split-off-quota-tree-handling-into-a-separate.patch
-       patches.suse/quota-Convert-union-in-mem_dqinfo-to-a-pointer.patch
-       patches.suse/quota-Allow-negative-usage-of-space-and-inodes.patch
-       patches.suse/quota-Keep-which-entries-were-set-by-SETQUOTA-quota.patch
-       patches.suse/quota-Add-helpers-to-allow-ocfs2-specific-quota-ini.patch
-       patches.suse/quota-Implement-function-for-scanning-active-dquots.patch
-       patches.suse/ocfs2-Support-nested-transactions.patch
-       patches.suse/ocfs2-Assign-feature-bits-and-system-inodes-to-quot.patch
-       patches.suse/ocfs2-Mark-system-files-as-not-subject-to-quota-acc.patch
-       patches.suse/ocfs2-Implementation-of-local-and-global-quota-file.patch
-       patches.suse/ocfs2-Add-quota-calls-for-allocation-and-freeing-of.patch
-       patches.suse/ocfs2-Enable-quota-accounting-on-mount-disable-on.patch
-       patches.suse/ocfs2-Implement-quota-syncing-thread.patch
-       patches.suse/ocfs2-Implement-quota-recovery.patch
-       patches.suse/ocfs2-Fix-grace-time-syncing.patch
-       patches.suse/ocfs2-Fix-oop-in-recovery-without-quotas
-       patches.suse/ocfs2-Fix-mount-cleanup-after-quota-failure.patch
-       patches.suse/ocfs2-Change-quotafile-names.patch
-       patches.suse/ocfs2-Fix-oops-when-one-quotatype-enabled
-       patches.suse/ocfs2-Fix-hang-in-quota-recovery-code.patch
-
-       # Fixes from 2.6.29
-       patches.fixes/ocfs2-dlm-Hold-off-sending-lockres-drop-ref-message.patch
-       patches.fixes/ocfs2-push-out-dropping-of-dentry-lock-to-ocfs2_wq.patch
-       patches.fixes/ocfs2-wakeup-the-downconvert-thread-after-a-success.patch
-       patches.fixes/ocfs2-add-quota-call-to-ocfs2_remove_btree_range.patch
-       patches.fixes/ocfs2-access-and-dirty-the-buffer_head-in-mark_writ.patch
-       patches.fixes/ocfs2-dlm-use-ast_lock-to-protect-ast_list.patch
-       patches.fixes/ocfs2-dlm-make-dlm_assert_master_handler-kill-its.patch
-       patches.fixes/ocfs2-set-gap-to-seperate-entry-and-value-when-xatt.patch
-       patches.fixes/ocfs2-add-io-error-check-in-ocfs2_get_sector.patch
-       patches.fixes/ocfs2-reserve-xattr-block-for-new-directory-with-in.patch
-       patches.fixes/ocfs2-tweak-to-get-the-maximum-inline-data-size-wit.patch
-       patches.fixes/ocfs2-fix-a-bug-found-by-sparse-check.patch
-       patches.fixes/ocfs2-use-xs-bucket-to-set-xattr-value-outside.patch
-
-       # Quota fixes from 2.6.31
-       patches.fixes/ocfs2-1.4-git-65bac575e35915801ea518b9d8d8824367d125c8
-       patches.fixes/ocfs2-1.4-git-80d73f15d12f087f3fe074f8a4d6e5c5624f2b47
-       patches.fixes/ocfs2-1.4-git-4e8a301929bfa017e6ffe11e3cf78ccaf8492801
-       patches.fixes/ocfs2-1.4-git-b4c30de39a2596503e888a7b47d19792f25913d6
-       patches.fixes/ocfs2-quota-Make-global-quota-files-blocksize-aligned.patch
-       patches.fixes/ocfs2-quota-Mark-buffer-uptodate-before-calling-ocfs2_jou.patch
-       patches.fixes/ocfs2-quota-Initialize-blocks-allocated-to-local-quota-fi.patch
-       patches.fixes/ocfs2-quota-Remove-syncjiff-field-from-quota-info.patch
-
-       # bnc #408304
-       patches.fixes/ocfs2-dlm-fix-race-in-adding-removing-lockres-to-f.patch
-       patches.fixes/ocfs2-dlm-encapsulate-adding-and-removing-of-mle-fr.patch
-       patches.fixes/ocfs2-dlm-clean-up-struct-dlm_lock_name.patch
-       patches.fixes/ocfs2-dlm-refactor-dlm_clean_master_list.patch
-       patches.fixes/ocfs2-dlm-create-and-destroy-the-dlm-master_hash.patch
-       patches.fixes/ocfs2-dlm-activate-dlm-master_hash-for-master-list.patch
-       patches.fixes/ocfs2-dlm-indent-dlm_cleanup_master_list.patch
-       patches.fixes/ocfs2-dlm-track-number-of-mles.patch
-       patches.fixes/ocfs2-dlm-improve-lockres-counts.patch
-       patches.fixes/ocfs2-dlm-dlm_set_lockres_owner-and-dlm_change_lo.patch
-       patches.fixes/ocfs2-dlm-show-the-number-of-lockres-mles-in-dlm_st.patch
-       patches.fixes/ocfs2-dlm-remove-struct-dlm_lock_name-in-struct-dlm.patch
-       patches.fixes/ocfs2-dlm-do-not-purge-lockres-that-is-being-migrat.patch
-       patches.fixes/ocfs2-dlm-tweak-mle_state-output.patch
-       patches.fixes/ocfs2-initialize-count-before-generic_write_checks
-
-       # fixes from 2.6.31
-       patches.fixes/dlm-fix-use-count-with-multiple-joins.patch
-       patches.fixes/dlm-connect-to-nodes-earlier.patch
-       patches.fixes/dlm-use-more-NOFS-allocation.patch
-       patches.fixes/dlm-Fix-uninitialised-variable-warning-in-lock.c.patch
-       patches.fixes/dlm-fix-plock-use-after-free.patch
-       patches.fixes/dlm-free-socket-in-error-exit-path.patch
-
-       # bnc #524222
-       patches.fixes/dlm-close-connection-2.patch
-       # bnc #531716
-       patches.fixes/bug-531716_ocfs2-SLE11-dentry_lock_drop_flush.diff
-       # bnc #524683
-       patches.fixes/ocfs2-dlm-wait-on-lockres-instead-of-err-during-cancel.patch
-       # Assorted btree fixes in support of bnc 528427
-       patches.fixes/ocfs2-adjust-rightmost-path-in-ocfs2_add_branch.patch
-       patches.fixes/ocfs2-add-extra-credits-and-access-the-modified-bh.patch
-       patches.fixes/ocfs2-use-ocfs2_rec_clusters-in-ocfs2_adjust_adjace.patch
-       patches.fixes/ocfs2-release-the-buffer-head-in-ocfs2_do_truncate.patch
-       # bnc #552602
-       patches.fixes/ocfs2-fix-check-for-osb-in-kill_sb.patch
-
        patches.fixes/dlm-enable-debug.patch
-       patches.suse/64bytes_lvb_len.diff
+       patches.fixes/dlm-always-use-GFP_NOFS.patch
+       patches.fixes/dlm-fix-ordering-of-bast-and-cast.patch
+       patches.fixes/dlm-send-reply-before-bast.patch
+       patches.fixes/dlm-Send-lockspace-name-with-uevents.patch
+       patches.fixes/dlm-use-bastmode-in-debugfs-output.patch
 
-       # Userspace clustering will be implemented in a completely
-       # different manner starting with openSUSE 11.1
+       ########################################################
+       # ocfs2
+       ########################################################
+       # ocfs2 fixes from 2.6.32
+       patches.fixes/ocfs2-always-include-acl-support.patch
+       patches.fixes/ocfs2-make-acl-use-the-default.patch
+       patches.fixes/ocfs2-set-MS_POSIXACL-on-remount.patch
+       patches.fixes/ocfs2-Find-proper-end-cpos-for-a-leaf-refcount-block.patch
+       patches.fixes/ocfs2-refcounttree.c-cleanup.patch
+       patches.fixes/ocfs2-cluster-Make-fence-method-configurable-v2.patch
+       patches.fixes/ocfs2-return-EAGAIN-instead-of-EAGAIN-in-dlm.patch
+       patches.fixes/ocfs-stop-using-do_sync_mapping_range.patch
+       patches.fixes/ocfs2-devel-remove-redundant-OCFS2_MOUNT_POSIX_ACL-c.patch
+       patches.fixes/ocfs2-explicit-declare-uninitialized-var-in-user_clu.patch
+       patches.fixes/ocfs2-replace-u8-by-__u8-in-ocfs2_fs.h.patch
+       patches.suse/fiemap-Add-new-extent-flag-FIEMAP_EXTENT_SHARED.patch
+       patches.suse/ocfs2-Use-FIEMAP_EXTENT_SHARED.patch
+       patches.fixes/Ocfs2-Should-ocfs2-support-fiemap-for-S_IFDIR-inode.patch
+       patches.fixes/ocfs2-Add-reflinked-file-s-inode-to-inode-hash-earil.patch
+       patches.fixes/ocfs2-Set-i_nlink-properly-during-reflink.patch
+       patches.fixes/Ocfs2-Let-ocfs2-support-fiemap-for-symlink-and-fast-.patch
+       patches.fixes/ocfs2-trivial-Use-proper-mask-for-2-places-in-hearbe.patch
+       patches.fixes/ocfs2-trivial-Use-le16_to_cpu-for-a-disk-value-in-xa.patch
+       patches.fixes/ocfs2-Handle-O_DIRECT-when-writing-to-a-refcounted-c.patch
+
+       patches.fixes/ocfs2-Fix-refcnt-leak-on-ocfs2_fast_follow_link-erro.patch
+       patches.fixes/ocfs2-Sync-max_inline_data_with_xattr-from-tools.patch
+       patches.fixes/ocfs2-fix-a-misleading-variable-name.patch
+       patches.fixes/ocfs2-trivial-Remove-trailing-whitespaces.patch
+       patches.fixes/ocfs2-dlm-Ignore-LVBs-of-locks-in-the-Blocked-list.patch
+       patches.fixes/ocfs2-dlm-Print-more-messages-during-lock-migration.patch
+
+       patches.suse/ocfs2-allocation-resrvations.patch
+
+       # ocfs2 fixes from 2.6.33-rc8
+       patches.fixes/ocfs2-Fix-memory-overflow-in-cow_by_page.patch
+       patches.fixes/ocfs2-Only-bug-out-when-page-size-is-larger-than-clu.patch
+       patches.fixes/ocfs2-dlm-Handle-EAGAIN-for-compatibility-v2.patch
+       patches.fixes/ocfs2-Use-compat_ptr-in-reflink_arguments.patch
+       patches.fixes/ocfs2-Fix-setting-of-OCFS2_LOCK_BLOCKED-during-bast.patch
+       patches.fixes/ocfs2-Prevent-a-livelock-in-dlmglue.patch
+       patches.fixes/ocfs2-Do-not-downconvert-if-the-lock-level-is-alread.patch
+       patches.fixes/ocfs2-Remove-overzealous-BUG_ON-during-blocked-lock-.patch
+       patches.fixes/ocfs2-Plugs-race-between-the-dc-thread-and-an-unlock.patch
+       patches.fixes/ocfs2-dlm-Remove-BUG_ON-in-dlm-recovery-when-freeing.patch
+       patches.fixes/ocfs2-Fix-contiguousness-check-in-ocfs2_try_to_merge.patch
+       patches.fixes/ocfs2-dlm-Fix-printing-of-lockname.patch
+       patches.fixes/ocfs2-cluster-Make-o2net-connect-messages-KERN_NOTIC.patch
+
+       #bnc#575752
+       patches.fixes/ocfs2-set-i_mode-on-disk-during-acl-operations.patch
+
+       ########################################################
+       # gfs2 read-only support for migration
+       ########################################################
+       patches.suse/gfs2-ro-mounts-only.patch
+       patches.suse/gfs2-ro-fixes.patch
 
        ########################################################
        # xfs
@@ -1202,57 +746,119 @@
        patches.suse/xfs-dmapi-src
        patches.suse/xfs-dmapi-enable
        patches.suse/xfs-dmapi-xfs-enable
-       patches.fixes/xfs-dmapi-fixes
        patches.suse/xfs-nfsd-dmapi-aware
-       patches.suse/xfs-account-for-allocated-blocks-when-expanding-directories
-       patches.suse/xfs-handle-memory-allocation-failures-during-log-initialisation
-       patches.suse/xfs-check-for-valid-transaction-headers-in-recovery
-       patches.suse/xfs-wait-for-all-IO-on-truncate-to-zero
+       patches.fixes/xfs-dmapi-fixes
        patches.fixes/xfs-redirty-ENOSPC.patch
-       patches.fixes/xfs-kern_32215a_Clean-up-dquot-pincount-code.patch
-       patches.kabi/xfs-dquot-pincount-kabi.patch
-       patches.fixes/xfs_file_last_byte-needs-to-acquire-ilock.patch
-       patches.fixes/xfs-fix-overflow-in-xfs_growfs_data_private
-       patches.fixes/xfs-more-sb-checks
+       patches.fixes/xfs-export-debug
+
+       patches.xfs/xfs-simplify-inode-teardown.patch
+       patches.xfs/xfs-fix-mmap_sem-iolock-inversion-in-xfs_free_eofblo.patch
+       patches.xfs/xfs-I-O-completion-handlers-must-use-NOFS-allocation.patch
+       patches.xfs/xfs-reset-the-i_iolock-lock-class-in-the-reclaim-pat.patch
+       patches.xfs/xfs-use-WRITE_SYNC_PLUG-for-synchronous-writeout.patch
+       patches.xfs/xfs-cleanup-data-end-I-O-handlers.patch
+       patches.xfs/xfs-Wrapped-journal-record-corruption-on-read-at-rec.patch
+       patches.xfs/xfs-remove-IO_ISAIO.patch
+       patches.xfs/xfs-simplify-xfs_buf_get-xfs_buf_read-interfaces.patch
+       patches.xfs/xfs-rename-xfs_attr_fetch-to-xfs_attr_get_int.patch
+       patches.xfs/xfs-uninline-xfs_get_extsz_hint.patch
+       patches.xfs/xfs-kill-the-STATIC_INLINE-macro.patch
+       patches.xfs/xfs-remove-incorrect-sparse-annotation-for-xfs_iget_.patch
+       patches.xfs/xfs-cleanup-dmapi-macros-in-the-umount-path.patch
+       patches.xfs/xfs-Fix-error-return-for-fallocate-on-XFS.patch
+       patches.xfs/xfs-cleanup-bmap-extent-state-macros.patch
+       patches.xfs/xfs-change-the-xfs_iext_insert-xfs_iext_remove.patch
+       patches.xfs/xfs-check-for-not-fully-initialized-inodes-in-xfs_ir.patch
+       patches.xfs/xfs-improve-metadata-I-O-merging-in-the-elevator.patch
+       patches.xfs/xfs-kill-xfs_bmbt_rec_32-64-types.patch
+       patches.xfs/XFS-Free-buffer-pages-array-unconditionally.patch
+       patches.xfs/kill-I_LOCK.patch
+       patches.xfs/xfs-fix-timestamp-handling-in-xfs_setattr.patch
+       patches.xfs/xfs-Don-t-flush-stale-inodes.patch
+       patches.xfs/xfs-Ensure-we-force-all-busy-extents-in-range-to-dis.patch
+       patches.xfs/xfs-reclaim-inodes-under-a-write-lock.patch
+       patches.xfs/xfs-Avoid-inodes-in-reclaim-when-flushing-from-inode.patch
+       patches.xfs/xfs-reclaim-all-inodes-by-background-tree-walks.patch
+       patches.xfs/xfs-Remove-inode-iolock-held-check-during-allocation.patch
+       patches.xfs/xfs-fix-stale-inode-flush-avoidance.patch
+       patches.xfs/xfs-fix-missing-error-check-in-xfs_rtfree_range.patch
+       patches.xfs/xfs-xfs_swap_extents-needs-to-handle-dynamic-fork-of.patch
+       patches.fixes/xfs-nonblocking-inode-locking-io-completion.patch
+
+       patches.suse/xfs-dmapi-re-add-flags-for-xfs_free_eofblocks
 
        ########################################################
        # novfs
        ########################################################
-#      patches.suse/novfs-add-the-novell-filesystem-client-kernel-module.patch
-#      patches.suse/convert-novfs-to-open-soure-coding-standards.patch
-#      patches.suse/novfs-merge-changes.diff
-#      patches.suse/novfs-patch-2.6.27
-#      patches.suse/novfs-gregorian-day-fix
-#      patches.suse/novfs-map-drives-correctly.diff
-#      patches.suse/novfs-clear-mappeddrives.patch
+#      patches.suse/novfs-client-module
+#      patches.suse/novfs-fix-debug-message.patch
+#      patches.fixes/novfs-err_ptr-fix.diff
+#      patches.fixes/novfs-fix-inode-uid
+#      patches.fixes/novfs-incorrect-filesize-fix
+#      patches.fixes/novfs-truncate-fix
 
        ########################################################
        # other filesystem stuff
        ########################################################
-       patches.suse/squashfs-3.4.patch
-
        patches.suse/parser-match_string.diff
        patches.suse/fs-may_iops.diff
        patches.suse/fs-knows-MAY_APPEND.diff
        patches.suse/nfs4acl-common.diff
        patches.suse/nfs4acl-ext3.diff
        patches.suse/nfs4acl-ai.diff
-
-       patches.fixes/udf-faster_anchor_detection.patch
-       patches.fixes/hfs-corrupt-extent-tree-mount-oops-fix
        patches.fixes/zisofs-large-pagesize-read.patch
 
+
+       ########################################################
+       # Swap-over-NFS
+       ########################################################
+       patches.suse/SoN-01-mm-setup_per_zone_wmarks.patch
+       patches.suse/SoN-02-doc.patch
+       patches.suse/SoN-03-mm-gfp-to-alloc_flags-expose.patch
+       patches.suse/SoN-04-page_alloc-reserve.patch
+       patches.suse/SoN-05-reserve-slub.patch
+       patches.suse/SoN-06-mm-kmem_estimate_pages.patch
+       patches.suse/SoN-07-mm-PF_MEMALLOC-softirq.patch
+       patches.suse/SoN-08-mm-page_alloc-emerg.patch
+       patches.suse/SoN-09-global-ALLOC_NO_WATERMARKS.patch
+       patches.suse/SoN-10-mm-page_alloc-GFP_EMERGENCY.patch
+       patches.suse/SoN-11-mm-reserve.patch
+       patches.suse/SoN-12-mm-selinux-emergency.patch
+       patches.suse/SoN-13-net-ps_rx.patch
+       patches.suse/SoN-14-net-sk_allocation.patch
+       patches.suse/SoN-15-netvm-reserve.patch
+       patches.suse/SoN-16-netvm-reserve-inet.patch
+       patches.suse/SoN-17-netvm-reserve-inet.patch-fix
+       patches.suse/SoN-18-netvm-skbuff-reserve.patch
+       patches.suse/SoN-19-netvm-sk_filter.patch
+       patches.suse/SoN-20-netvm-tcp-deadlock.patch
+       patches.suse/SoN-21-emergency-nf_queue.patch
+       patches.suse/SoN-22-netvm.patch
+       patches.suse/SoN-23-mm-swapfile.patch
+       patches.suse/SoN-24-mm-page_file_methods.patch
+       patches.suse/SoN-25-nfs-swapcache.patch
+       patches.suse/SoN-26-nfs-swapper.patch
+       patches.suse/SoN-27-nfs-swap_ops.patch
+       patches.suse/SoN-28-nfs-alloc-recursions.patch
+       patches.suse/SoN-29-fix-swap_sync_page-race
+       patches.suse/SoN-30-fix-uninitialized-var.patch
+
+       # dont want to rediff SoN until these get more testing
+       patches.suse/slab-memless-node-01-introduce-numa_mem_id.patch
+       patches.suse/slab-memless-node-02-slab-use-numa_mem_id.patch
+       patches.suse/slab-memless-node-03-ia64-memoryless-nodes.patch
+       patches.suse/slab-memless-node-04-kernel-profile-memoryless-nodes.patch
+
        ########################################################
        # Netfilter
        ########################################################
 
-       # anyone want to refresh this one?
-       patches.suse/netfilter-ipv4options
        patches.suse/netfilter-ipt_LOG-mac
 
        patches.suse/netfilter-ip_conntrack_slp.patch
        patches.fixes/fix-nf_conntrack_slp
 #      patches.fixes/netfilter-remove-pointless-config_nf_ct_acct-warning
+       patches.suse/netfilter-ipv4options
 
        ########################################################
        #
@@ -1260,367 +866,90 @@
        #
        ########################################################
 
-       patches.drivers/power-introduce-system_entering_hibernation
-       patches.drivers/dmi-introduce-dmi_first_match
-
-       patches.drivers/igp-fix-ring-on-suspend.patch
-
-       patches.drivers/e1000e_add_82574L.patch
-       patches.drivers/e1000e_add_ICH9_BM.patch
-       patches.drivers/e1000e_add_LOM_devices.patch
-       patches.drivers/e1000e_add_ECC
-       patches.drivers/e1000e-Fixes-possible-phy-corrupton-on-82571-design.patch
-       patches.drivers/e1000e-io_error_detected-callback-should-return-PCI_.patch
-
-       patches.suse/e1000e_Export_set_memory_ro-rw
-       patches.drivers/e1000e-enhance-frame-fragment-detection.patch 
-
-       patches.drivers/e1000-return-pci_ers_result_disconnect-on-permanent-error.patch
-       patches.drivers/e1000-enhance-frame-fragment-detection.patch 
-
-       patches.drivers/tg3-Add-57780-ASIC-revision.patch
-       patches.drivers/broadcom-Add-support-for-the-57780-integrated-PHY.patch
-       patches.drivers/bnx2x-eeh.patch
-       patches.drivers/bnx2-Add-bnx2_shutdown_chip
-        patches.drivers/bnx2-check-running.patch
-       patches.drivers/bnx2-Add-PCI-ID-for-5716S
-       patches.drivers/bnx2-Fix-bug-in-bnx2_free_rx_mem_
-       patches.drivers/bnx2x-version-update.patch
-       patches.drivers/bnx2x-Using-singlethread-work-queue.patch
-       patches.drivers/bnx2x-Missing-memory-barriers.patch
-       patches.drivers/bnx2x-Using-system-page-size-for-SGE.patch
-       patches.drivers/bnx2x-Missing-mask-when-calculating-flow-control.patch
-       patches.drivers/bnx2x-Flow-control-updated-before-reporting-the-lin.patch
-       patches.drivers/bnx2x-Protecting-the-link-change-indication.patch
-       patches.drivers/bnx2x-VLAN-tagged-packets-without-VLAN-offload.patch
-       patches.drivers/bnx2x-Endianness-issues.patch
-       patches.drivers/bnx2x-Fixing-the-doorbell-size.patch
-       patches.drivers/bnx2x-Missing-brackets.patch
-       patches.drivers/bnx2x-Indirection-table-initialization-index.patch
-       patches.drivers/bnx2x-MTU-Filter.patch
-       patches.drivers/bnx2x-First-slow-path-interrupt-race.patch
-       patches.drivers/bnx2x-Free-IRQ.patch
-       patches.drivers/bnx2x-Handling-probe-failures.patch
-       patches.drivers/bnx2x-Potential-race-after-iSCSI-boot.patch
-       patches.drivers/bnx2x-Wrong-HDR-offset-in-CAM.patch
-       patches.drivers/bnx2x-Read-chip-ID.patch
-       patches.fixes/bnx2x-block-nvram-access-when-device-is-inactive
-       patches.drivers/bnx2x-Overstepping-array-bounds.patch
-       patches.drivers/bnx2x-1G-10G-toggling-race.patch
-       patches.drivers/bnx2x-Prevent-self-test-loopback-failures.patch
-       patches.drivers/bnx2x-Legacy-speeds-autoneg-failures.patch
-       patches.drivers/bnx2x-Handling-PHY-FW-load-failure.patch
-       patches.drivers/bnx2x-Driver-description-update.patch
-       patches.drivers/bnx2x-Barriers-for-the-compiler.patch
-       patches.drivers/bnx2x-Version-update.patch
-       patches.drivers/bnx2x-Reset-HW-before-use.patch
-       patches.drivers/bnx2x-Disable-napi.patch
-       patches.drivers/bnx2x-Handling-load-failures.patch
-       patches.drivers/bnx2x-Carrier-off-first-call.patch
-       patches.drivers/bnx2x-Calling-napi_del.patch
-       patches.drivers/bnx2x-Missing-rmb-when-waiting-for-FW-response.patch
-       patches.drivers/bnx2x-loopback-test-failure.patch
-       patches.drivers/bnx2x-Version.patch
-       patches.drivers/bnx2x-tx_has_work-should-not-wait-for-FW.patch
-       patches.drivers/bnx2x-Adding-restriction-on-sge_buf_size.patch
-       patches.drivers/bnx2x-Casting-page-alignment.patch
-       patches.drivers/bnx2x-Using-DMAE-to-initialize-the-chip.patch
-
-       patches.drivers/r8169-Tx-performance-tweak-helper
-       patches.drivers/r8169-use-pci_find_capability-for-the-PCI-E-features
-       patches.drivers/r8169-add-8168-8101-registers-description
-       patches.drivers/r8169-add-hw-start-helpers-for-the-8168-and-the-8101
-       patches.drivers/r8169-additional-8101-and-8102-support
-       patches.drivers/r8169-allow-true-forced-mode-setting.patch
-       patches.drivers/r8169-Use-a-different-default-for-each-family.patch
-
-       patches.drivers/ixgbe-fcoe-bugfixes
-
-       patches.drivers/sgi-ioc4-request-submodules
-
-       patches.drivers/sky2-no-link-at-probe.patch
-
-       patches.drivers/reenable-generic_serial
-
-       # This one is more related to x2APIC patches, but adjusted by SGI to cleanly
-       # patch on-top of sgi-uv-led -> I don't do the extra work and keep it here
-       patches.arch/x86_uv_early_detect.patch
-       patches.arch/x86_sgi_uv_early_detect_oem.patch
-       patches.fixes/uv-redundant-creation-of-proc-dir
-
-       # Add support for Montevina hardware; series mainlined 2.6.26
-
-       patches.drivers/ehca-flush-cqe.patch
-       patches.drivers/ehca-rejecting-dynamic-mem-add-remove.patch
-
-       patches.drivers/tpm-correct-timeouts.patch
-       patches.drivers/tpm-bcm0102-workaround.patch
-
-       patches.drivers/0001-IB-ehca-Fix-problem-with-max-number-of-QPs-and-CQs.patch
-
-       patches.drivers/ehca-fix-possible-nullpointer-access-v2.patch
-       patches.drivers/ehca-malloc-speedup
-
        patches.drivers/disable-catas_reset-by-default-to-avoid-problems-with-eeh.patch
-       patches.fixes/hpilo-open-close-fix
-       patches.fixes/ib-ipath-fix-hang-on-module-unload
-       patches.fixes/initialize-dev-power-entry
+       patches.drivers/reenable-generic_serial
+       patches.drivers/msi-wmi.patch
 
        ########################################################
        # Storage
        ########################################################
 
+       # add genhd.mangle_minor parameter
+       patches.suse/block-add-mangle-devt-switch
+
        # libata
        patches.drivers/libata-add-waits-for-govault
        patches.drivers/libata-unlock-hpa-by-default
        patches.drivers/libata-prefer-over-ide
-       patches.drivers/libata-dont-restore-DET-on-detach
-
-       # libata-slave_link
-       patches.drivers/libata-make-SCR-access-ops-per-link
-       patches.drivers/libata-reimplement-link-iterator
-       patches.drivers/libata-misc-updates-to-prepare-for-slave-link
-       patches.drivers/libata-implement-slave_link
-       patches.drivers/libata-transfer-EHI-control-flags-to-slave-ehc.i
-       patches.drivers/libata-eh-fix-slave-link-EH-action-mask-handling
-       patches.drivers/libata-set-device-class-to-NONE-if-phys_offline
-       patches.drivers/libata-ata_piix-use-slave_link
-
-       patches.drivers/libata-ata_piix-add-intel-ibex-pci-ids
-       patches.drivers/libata-ata_piix-add-Hercules-EC-900-mini-to-laptop-tbl
-       patches.drivers/libata-sata_via-load-DEVICE-register-when-CTL-changes
-       patches.drivers/libata-sata_via-fix-support-for-5287
-       patches.drivers/libata-sata_via-restore-vt-_prepare_host-error-handling
-       patches.drivers/libata-sata_via-add-vt8261-support.patch
-       patches.drivers/libata-implement-NO_SPINDOWN
-       patches.drivers/libata-ahci-blacklist-double-spin-off
-       patches.drivers/libata-sata_sil-blacklist-double-spin-off
-       patches.drivers/libata-ata_piix-blacklist-double-spin-off
-       patches.drivers/libata-whitelist-good-bridges
-       patches.drivers/libata-add-and-use-HORKAGE_ATAPI_MOD16_DMA
-       patches.drivers/libata-pata_sch-slave-poss
+
        patches.drivers/libata-ata_piix-clear-spurious-IRQ
-       patches.drivers/libata-ata_piix-borked-tecra-m4-broken-suspend
-       patches.drivers/libata-pata_hpt366-fix-clock-detection
-       patches.drivers/libata-pata_hpt366-fix-cable-detection
-       patches.drivers/libata-pata_hpt366-no-ATAPI-DMA
-       patches.drivers/libata-pata_hpt366-reimplement-mode-programming
-       patches.drivers/libata-ata_piix-add-VGN-BX297XP-to-broken-suspend-list
-       patches.drivers/libata-clear-ering-on-resume
-       patches.drivers/libata-ahci-correct-enclosure-LED-state-save
-       patches.drivers/libata-ahci-enclosure-management-bios-workaround
-       patches.drivers/libata-6gbps-message
-       patches.drivers/libata-ahci-sb600-srst-workaround-soften-msg
-       patches.drivers/libata-ocz-vertex-no-hpa
        patches.drivers/libata-ahci-aspire-3810t-noncq
-+sp1   patches.drivers/libata-ahci-Withdraw-IGN_SERR_INTERNAL-for-SB800
        patches.drivers/libata-missing-_SDD-is-not-an-error
 
        # Block layer fixes
-       patches.fixes/block-use-bio_has_data
-       patches.fixes/block-discard-requests
-       patches.fixes/block-git-fixes
-       patches.fixes/block-rq-affinity
-       patches.fixes/block-failfast-merge-fix
-       patches.suse/cfq-ioc-race
-       patches.suse/genhd-disk-ro-uevents
-
-       # Online disk resize
-       patches.drivers/bdev-resize-wrapper-for-revalidate_disk
-       patches.drivers/bdev-resize-adjust-block-device-size
-       patches.drivers/bdev-resize-check-for-device-resize
-       patches.drivers/bdev-resize-sd-driver-calls
-       patches.drivers/bdev-resize-added-flush_disk
-       patches.drivers/bdev-resize-call-flush_disk
-       # Block-layer timeout
-       patches.drivers/block-timeout-handling
-       patches.drivers/block-abort-queue
-       patches.drivers/dm-abort-queue-on-failed-paths
-       patches.drivers/block-abort-request-rq-complete-marking
-       patches.drivers/block-call-sync-on-cleanup
-       patches.drivers/block-add-timeout-on-dequeue
-       patches.drivers/block-del-timer-after-dequeue
-       patches.fixes/block-use-round_jiffies_up
-       patches.fixes/blk-leave-sync-timer-running
-       patches.drivers/block-internal-dequeue-shouldnt-start-timer
-       patches.fixes/block-integrity-update
-       patches.fixes/blk-dont-invoke-request_fn-on-stopped-queue
-       patches.fixes/blk-move-unplug_work-init
-       patches.fixes/blk-get-extra-reference-before-unmap
-       patches.fixes/block-fix-blk_start_queueing
-       patches.fixes/block-suppress-buffer-IO-errors
-       patches.fixes/block-optimizations-in-blk_rq_timed_out_timer
-       patches.fixes/block-add-comment-in-blk_rq_timed_out
-       patches.fixes/blk-timeout-splice-timeout-list
-       patches.fixes/blk-timeout-readd-timeout-list
-
-       patches.drivers/cciss-driver-panic-on-volume-delete
-       patches.drivers/cciss-ignore-stale-commands
-
-       patches.fixes/scsi-misc-git-update
-       # The s390-07-04-dasd-failfast.patch must follow the
-       # scsi-enhance-error-codes patch for dependency reasons
-       patches.fixes/scsi-enhance-error-codes
-       patches.arch/s390-07-04-dasd-failfast.patch
-       patches.fixes/scsi-terminate-target-reset
-       patches.fixes/sd-needs-updating
        patches.fixes/scsi-inquiry-too-short-ratelimit
        patches.suse/scsi-netlink-ml
 
-       # FCoE
-       patches.drivers/open-fcoe-header-files
-       patches.drivers/open-fcoe-libfc
-       patches.drivers/open-fcoe-driver
-       patches.drivers/open-fcoe-dcb-support
-       # readd copper pond bnc#441471
-       patches.drivers/ixgbe-copper_pond.patch
-       patches.drivers/ixgbe-sfp.patch
-
-       patches.fixes/dcb-setting-pg-will-cause-tx-hang
-       patches.fixes/multiq-requeue-should-rewind-current_band
-       patches.drivers/open-fcoe-beta3-update
-       patches.drivers/ixgbe-add-bcna-support
-       patches.drivers/open-fcoe-beta4-update
-       patches.fixes/dcb-fix-setpfcstate
-       patches.drivers/open-fcoe-beta5-update
-       patches.drivers/open-fcoe-beta6-update
-       patches.drivers/open-fcoe-rc1-update
-       patches.drivers/open-fcoe-fnic-patches
-
-       # bnc #459142
-       patches.drivers/fcoe-logoff-of-the-fabric-when.diff
-       patches.drivers/fcoe-remove-warn_on-in-fc_set.diff
-       patches.drivers/fcoe-user_mfs-is-never-used.diff
-       patches.drivers/fcoe-check-return-for-fc_set_m.diff
-       patches.drivers/libfc-use-an-operations-struct.diff
-       patches.drivers/fcoe-fix-frame-length-validati.diff
-       patches.drivers/libfc-make-sure-we-access-the.diff
-       patches.drivers/libfc-make-fc_disc-inline-with.diff
-       patches.drivers/libfc-make-rscn-parsing-more-r.diff
-       patches.drivers/libfc-improve-fc_lport-c-locki.diff
-       patches.drivers/libfc-improve-fc_rport-c-locki.diff
-       patches.drivers/libfc-add-fc_disc-c-locking-co.diff
-       patches.drivers/libfc-ensure-correct-device_pu.diff
-       patches.drivers/fcoe-improved-load-balancing-i.diff
-       patches.drivers/libfc-updated-comment-for-orde.diff
-       patches.drivers/fcoe-change-fcoe_sw-sg_tablesi.diff
-       patches.drivers/libfc-updated-libfc-fcoe-modul.diff
-       patches.drivers/libfc-set-the-release-function.diff
-
-       # bnc #468051
-       patches.drivers/fcoe-fix-incorrect-use-of-struct-module.diff
-
-       # bnc #468053
-       patches.drivers/libfc_locking.diff
-
-       patches.drivers/fcoe-exch-mgr-is-freed-while-lport-still-retrying-s.patch
-       patches.drivers/Out-of-order-tx-frames-was-causing-several-check-con.patch
-       patches.drivers/fcoe-fix-kfree-skb.patch
-
-       # bnc #468054
-       patches.drivers/libfc_rport.diff
-
-       # bnc #465596
-       patches.drivers/libfc-handle-rrq-exch-timeout.diff
-       patches.drivers/libfc-pass-lport-in-exch_mgr_r.diff
-       patches.drivers/libfc-when-rport-goes-away-re.diff
-
-       #bnc #469536
-       patches.drivers/libfc-fix-read-IO-data-integrity
-       patches.drivers/libfc-check-for-err-when-recv-state-is-incorrect.diff
-       patches.drivers/libfc-cancel_delayed_work_sync-called-improperly.patch
-       patches.drivers/fcoe-fix-handling-of-pending-queue
-
-       patches.drivers/ixgbe-dcb-setstate.patch
-       patches.drivers/ixgbe_DCB_compile_err.patch
-       patches.drivers/ixgbe_pagesize_fix.patch
-
-       patches.drivers/lpfc-8.2.8-update
-       patches.drivers/lpfc-8.2.8.1-update
-       patches.drivers/lpfc-8.2.8.3-update
-       patches.drivers/lpfc-8.2.8.4-update
-       patches.drivers/lpfc-8.2.8.7-update
-       patches.drivers/lpfc-8.2.8.9-update
-       patches.drivers/lpfc-8.2.8.10-update
-       patches.drivers/lpfc-8.2.8.11-update
-       patches.drivers/lpfc-8.2.8.12-update
-       patches.drivers/lpfc-8.2.8.13-update
-       patches.drivers/lpfc-8.2.8.14-update
-       patches.drivers/qla2xxx-8.02.01-k8-update
-       patches.drivers/qla2xxx-8.02.01-k9-update
-       patches.drivers/qla2xxx-8.02.01.02.11.0-k9-update
-       patches.fixes/qla2xxx-disable-automatic-queue-tracking
-       patches.fixes/qla2xxx-check-fc-rport-validity
-       patches.fixes/qla2xxx-devtbl-fix
-       patches.drivers/qla2xxx-correct-endianness-issue-during-flash
-       patches.drivers/qla2xxx-extend-address-range-of-option-rom-update
-       patches.drivers/qla2xxx-eeh-recovery
-       patches.drivers/mpt-fusion-4.00.43.00-update
-       patches.drivers/mpt-fusion-4.16.00.00-update
-       patches.drivers/mpt-return-all-sense-data
-       patches.drivers/mptsas-discover-all-devices
-       patches.drivers/mptsas-fixup-workqueue
-       patches.drivers/megaraid-mbox-fix-SG_IO
-       patches.drivers/qla4xxx-sles11-update
-       patches.drivers/qla4xxx-5.01.00-k8_sles11-03-update
-       patches.drivers/qla4xxx-5.01.00-k8_sles11-04-update
-       patches.drivers/qla4xxx-correct-extended-sense-data-errors
-       patches.drivers/qla4xxx-correct-extended-sense-data-errors-update
-       patches.fixes/scsi-skip-nonscsi-device-for-dma
-       patches.fixes/scsi-dh-rdac-set-default-ownership
-       patches.fixes/scsi-dh-rdac-retry-mode-select
-       patches.fixes/scsi-eh-timed-out-missing-braces
-       patches.fixes/scsi-retry-transport-error
-       patches.fixes/scsi-retry-TASK_ABORTED
+       # from scsi-misc
+       patches.fixes/scsi-fc-class-failfast-bsg-requests
+       patches.fixes/scsi-add-scsi-target-reset-support-to-ioctl
+       patches.suse/modify-change_queue_depth-to-take-in-reason-why-it-is-being-called.patch
+       patches.suse/scsi-error-have-scsi-ml-call-change_queue_depth-to-handle-queue_full.patch
+       patches.suse/add-queue_depth-ramp-up-code.patch
+
+       patches.drivers/mpt-fusion-4.22.00.00-update
+       patches.drivers/hpsa
+       patches.fixes/scsi-introduce-helper-function-for-blocking-eh
+       patches.fixes/scsi-dh-queuedata-accessors
        patches.fixes/scsi-dh-alua-retry-UA
        patches.fixes/scsi-add-tgps-setting
        patches.fixes/scsi-dh-alua-send-stpg
-       patches.fixes/scsi-dh-rdac-initialize-passive-path
-       patches.fixes/scsi-fixup-failfast-definitions
-       patches.fixes/scsi-remove-scmd-timeout
-       patches.fixes/scsi-check-host-lookup-failure
-       patches.fixes/scsi_dh-add-lsi-ids-to-rdac
-       patches.fixes/scsi_dh-add-del-ids-to-rdac
-       patches.suse/scsi-check-removed-device-for-offline
-       patches.fixes/fc_transport-devloss-callback-restore
-       patches.fixes/scsi_dh-retry-on-UNIT_ATTENTION
-       patches.fixes/scsi-refactor-busy-processing
-       patches.fixes/scsi-fix-hang-in-starved-list-processing
-       patches.fixes/scsi-call-unprep_request-under-lock
-       patches.fixes/scsi-restart-lookup-by-target
-       patches.fixes/scsi-fixup-scsi_host_lookup-return-value
-       patches.fixes/scsi-dh-alua-group-id-mask
-       patches.fixes/scsi-scan-set-SDEV_DEL-on-destroy
-       patches.fixes/scsi-dh-rdac-retry-UA
-       patches.fixes/scsi-dh-emc-rw-mismatch
+       patches.fixes/scsi_dh-change-activate-interface
+       patches.fixes/scsi_dh-make-rdac-handler-asynchronous
+       patches.fixes/scsi_dh-make-hp_sw-handler-asynchronous
+       patches.fixes/scsi_dh-make-alua-handler-asynchronous
        patches.fixes/scsi-dh-emc-mode-select-10-size
-       patches.fixes/sd-no-spinup-on-standby-ports
-       patches.fixes/scsi-dh-queuedata-accessors
-       patches.fixes/aic7xxx-leaves-timer-running-on-init-failure
-       patches.drivers/qla1280-eh-update
-       patches.fixes/scsi-dh-rdac-retry-for-not-ready
-       patches.fixes/scsi-retry-alua-transition-in-progress
-       patches.drivers/ipr-slave-alloc-crash
-       patches.fixes/scsi-ipr-fix-PCI-permanent-error-handler
-       patches.fixes/scsi-lib-string_get_size-don-t-hang-on-zero-no-decimals-on-exact.patch
+       patches.fixes/scsi-dh-emc-rw-mismatch
        patches.fixes/scsi-dh-rdac-add-stk
-       patches.fixes/scsi-initialize-max_targets_blocked
-       patches.fixes/scsi-fixup-recovered-error
-       patches.fixes/scsi-reservation-conflict-after-timeout
-       patches.fixes/scsi-dh-rdac-sles10sp3-fixes
-       patches.fixes/scsi-retry-ADD_TO_MLQUEUE-return-values
+       patches.fixes/scsi-dh-rdac-add-ibm-174x
+       patches.fixes/scsi-retry-alua-transition-in-progress
+       patches.suse/fc-transport-allow-dev_loss_tmo-disable
+       patches.suse/blk-queue-unprep-fn
+       patches.suse/blk-add-atomic-abort-flag
+       patches.fixes/fc_bsg_request_packed
+       patches.fixes/bsg-SG_IO-compat_ioctl
+
+       patches.fixes/scsi-check-host-lookup-failure
        patches.drivers/aacraid-24701-update
-       patches.fixes/scsi-dont-call-blk_plug_device-from-scsi_target_queue_ready
-       patches.fixes/scsi-ses-hotplug-fix
-
-       patches.drivers/ibmvfc-async-events-oops
-       patches.drivers/ibmvfc-add_sync.patch
-       patches.drivers/ibmvfc-abort-response.patch
-       patches.drivers/ibmvfc_prli_initiator_fix.patch
-       patches.drivers/ibmvfc_class3.patch
-       patches.drivers/ibmvfc_default_timeout.patch
-       patches.drivers/ibmvfc_relogin_fix.patch
-       patches.drivers/ibmvfc_tasklet.patch
+       patches.drivers/megaraid-04.12-update
+       patches.drivers/qla2xxx-8.03.01.01.11.1-k8-update
+       patches.drivers/qla2xxx-8.03.01.02.11.1-k8-update
+       patches.drivers/qla2xxx-8.03.01.03.11.1-k8-update
+       patches.drivers/megaraid-mbox-fix-SG_IO
+       patches.drivers/mpt2sas-03.100.03.00-update
+       patches.drivers/mpt2sas-04.100.01.00-update
+       patches.drivers/mpt2sas-04.100.01.02-update
+       patches.drivers/bfa-2.1.2.1-update
+       patches.drivers/qla4xxx-5.01.00-k9-5.01.00.00.11.01-k10.patch
+       patches.drivers/qla4xxx-5.01.00.00.11.01-k10_5.01.00.00.11.01-k11.patch
+       patches.drivers/qla4xxx-5.01.00.00.11.01-k11_5.01.00.00.11.01-k12.patch
+       patches.drivers/qla4xxx-5.01.00.00.11.01-k12_5.01.00.00.11.01-k13.patch
+       patches.fixes/aic79xx-null-scb-in-nonpkt-busfree
+       patches.drivers/lpfc-8.3.5-update
+       patches.drivers/lpfc-8.3.5.3-update
+       patches.drivers/lpfc-8.3.5.4-update
+       patches.drivers/lpfc-8.3.5.5-update
+       patches.drivers/lpfc-8.3.5.6-update
+       patches.drivers/lpfc-8.3.5.7-update
+       patches.drivers/vmw_pvscsi-scsi-driver-for-vmware-s-virtual-hba.patch
+       patches.fixes/scsi-fc-class-allow-LLD-bsg-timeout
+       patches.drivers/pmcraid-2.6.33-rc6-update
+       patches.drivers/qla1280-fallback-to-loaded-fw
+       patches.fixes/fc-transport-dev_loss_tmo-overflow
+       patches.drivers/megaraid-sas-04.27-update
+       patches.drivers/scsi-transport-sas-enable-tlr
+       patches.fixes/scsi-fixup-vpd-page-allocation
+       patches.fixes/fc-transport-make-sure-cmds-are-completed-for-offlined-rport
 
        # Remaining SCSI patches (garloff)
        patches.suse/scsi-error-test-unit-ready-timeout
@@ -1629,178 +958,372 @@
        patches.fixes/proc-scsi-scsi-fix.diff
 
        patches.fixes/scsi-ibmvscsi-show-config.patch
-       patches.fixes/scsi-ibmvscsi-can_queue_fix.patch
-       patches.fixes/scsi-ibmvscsi-vio_leak.patch
-       patches.fixes/scsi-ibmvscsi-module_alias.patch
-
        # bnc#362850
        patches.fixes/sd_liberal_28_sense_invalid.diff
 
-       patches.drivers/intel-ibex-peak-device-ids.patch
-       patches.drivers/intel-ibex-peak-device-support.patch
-
-       patches.drivers/ide-tape-ignore_dsc-flags-fix.patch
-       patches.drivers/ide-tape-flags-fix.patch
-       patches.fixes/megaraid_sas-fix-permissions-on-poll_mode_io
+       patches.fixes/scsi-ibmvscsi-module_alias.patch
        patches.fixes/scsi_debug-scale-virtual_gb-with-sector_size-properly
-       patches.fixes/scsi-ses-add-support-for-enclosure-component-hot-removal
-       patches.fixes/scsi-ses-update-enclosure-data-on-hot-add
+
+       # bug 578429
+       patches.fixes/cciss-remove-scan-thread.patch
 
        ########################################################
        # DRM/Video
        ########################################################
-       patches.drivers/via-unichrome-drm-bugfixes.patch
-       patches.drivers/add-via-chrome9-drm-support.patch
-       patches.drivers/intel-hp-newchips-nokms
-       patches.fixes/drm-r128-add-test-for-initialisation-to-all-ioctls-that-require-it
-       patches.suse/drm-export-drm_irq_install.patch
+       patches.drivers/drm-i915-implement-drmmode-overlay-support-v4.patch
+       patches.drivers/drm-i915-fully-switch-off-overlay-when-not-in-use.patch
+       patches.drivers/drm-i915-implement-fastpath-for-overlay-flip-waiting.patch
+       patches.drivers/drm-i915-add-acpi-opregion-support-for-ironlake.patch
+       patches.drivers/drm-i915-fix-crt-hotplug-hang
+       patches.drivers/drm-i915-adhoc-disable-lid-detection
 
        ########################################################
        # Network
        ########################################################
-       patches.drivers/ehea.patch
-       patches.drivers/ehea-modinfo.patch
+
+       # Core networking
+
+       # Driver changes
        patches.fixes/tulip-quad-NIC-ifdown
        patches.suse/nameif-track-rename.patch
-       patches.drivers/atl2-add-atl2-network-driver.patch
-       patches.drivers/atl1-add-device_set_wakeup_enable-to-atl1-_set_wol.patch
        patches.fixes/tg3-fix-default-wol.patch
-       patches.drivers/tg3_libphy_workaround
-       patches.drivers/ipoib_null_skb_on_free.patch
-
-       patches.drivers/cxgb3-private-iscsi-ip-addresses
-       patches.drivers/cxgb3-get_drvinfo-deadlock.patch
-
-       patches.drivers/cxgb3-Allocate-multiqueues-at-init-time
-       patches.drivers/cxgb3-enable-lro-through-ethtool
-       patches.drivers/cxgb3-allow-for-PHY-reset-status
-       patches.drivers/cxgb3-simplify-port-type-struct-and-usage
-       patches.drivers/cxgb3-More-flexible-support-for-PHY-interrupts
-       patches.drivers/cxgb3-commnonize-LASI-phy-code
-       patches.drivers/cxgb3-Support-for-Aeluros-2005-PHY
-       patches.drivers/cxgb3-Add-1G-fiber-support
-       patches.drivers/cxgb3-update-driver-version
-       patches.drivers/cxgb3-eeprom-read-fixes.patch
-       patches.drivers/cxgb3-ser.patch
-       patches.drivers/cxgb3-fix_lro_alignment.patch
-       patches.drivers/cxgb3-fix_lro_switch.patch
-       patches.drivers/cxgb3-handle-err-inject.patch
-
-       patches.drivers/netxen-enable-msi-x-for-quad-gig-boards.patch
-       patches.drivers/netxen-fix-endianness-in-firmware-commands.patch
-       patches.drivers/netxen-fix-ipv6-offload-and-tx-cleanup.patch
-       patches.drivers/netxen-fix-link-speed-reporting-for-some-boards.patch
-       patches.drivers/netxen-firmware-init-fix.patch
-       patches.drivers/netxen-cleanup-mac-list-on-driver-unload.patch
-       patches.drivers/netxen-hold-tx-lock-while-sending-firmware-commands.patch
-       patches.drivers/netxen-handle-dma-mapping-failures.patch
-       patches.drivers/netxen-avoid-invalid-iounmap.patch
-       patches.drivers/netxen-include-ipv6.h-fixes-build-failure.patch
-       patches.drivers/netxen-fix-vlan-tso-checksum-offload.patch
-       patches.drivers/netxen-reduce-memory-footprint.patch
-       patches.drivers/netxen-revert-jumbo-ringsize.patch
-       patches.drivers/netxen-fix-memory-leak-in-drivers-net-netxen_nic_in.patch
-
-#      patches.drivers/e100-adapt-to-the-reworked-PCI-PM.patch
+       patches.drivers/ehea-modinfo.patch
+       patches.drivers/igb-add-support-for-82576NS-SerDes-adapter.patch
+       patches.fixes/tehuti-firmware-name
+       patches.drivers/dmfe-tulip-Let-dmfe-handle-DM910x-except-for-SPARC-o.patch
+
+       patches.drivers/s2io-fixing-dbg_print-macro.patch
+
+       # barton hills support bnc#557479
+       patches.drivers/igb-add-new-data-structure-for-handling-interrupts-a.patch
+       patches.drivers/igb-cleanup-interrupt-enablement-in-regards-to-msix_.patch
+       patches.drivers/igb-cleanup-some-of-the-code-related-to-hw-timestamp.patch
+       patches.drivers/igb-use-packet-buffer-sizes-from-RXPBS-register.patch
+       patches.drivers/igb-0001-add-support-for-the-82580-phy.patch
+       patches.drivers/igb-0002-Add-full-support-for-82580-devices.patch
+       patches.drivers/igb-0003-add-support-for-82580-MAC.patch
+       patches.drivers/igb-check-both-function-bits-in-status-register-in-w.patch
+
+       patches.drivers/phy-broadcom-bug-fixes-for-sp1.patch
+       patches.drivers/tg3-update-version-to-3.104.patch
+       patches.drivers/tg3-updates-from-f4188d-to-ba5b0bf.patch
+       patches.suse/tg3-5785-and-57780-asic-revs-not-working.patch
+       patches.drivers/tg3-Add-support-for-2-new-selfboot-formats.patch
+       patches.drivers/tg3-Add-more-partno-entries-for-fallback-path.patch   
+       patches.drivers/tg3-Give-MSI-X-vec-1-rx-backlog-space.patch           
+       patches.drivers/tg3-Prevent-rx-producer-ring-overruns.patch           
+       patches.drivers/tg3-Unwedge-stuck-MSI-X-vectors.patch                 
+       patches.drivers/tg3-Fix-57765-A0-bootcode-race-condition.patch        
+       patches.drivers/tg3-Turn-off-multiple-DMA-reads-for-5717.patch        
+       patches.drivers/tg3-Fix-napi-assignments-in-loopback-test.patch       
+       patches.drivers/tg3-Fix-AC131-loopback-test-errors-for-5785.patch     
+       patches.drivers/tg3-Enforce-DMA-mapping-skb-assignment-ordering.patch 
+       patches.drivers/tg3-Make-57791-and-57795-10-100-only.patch            
+
+       patches.drivers/bnx2-v2.6.32-to-b746656.patch
+       patches.drivers/bnx2-update-firmware-and-some-bug-fixes-from-upstream.patch
 
        patches.drivers/sky2-add-register-definitions
        patches.drivers/sky2-88E8059-support
        patches.drivers/sky2-optima-tcp-offload-fix
        patches.drivers/sky2-optima-fix-pci-cfg
+       
+       patches.suse/allow_bonding_with_blacklisted_ipv6.patch
+
+       #FCOE update (fate#306857, fate#306859, bnc#551175)
+       patches.suse/libfc-fcoe-don-t-export_symbols-unnecessarily.patch
+       patches.suse/libfc-remove-unused-fc_lport-pointer-from-fc_fcp_pkt_abort.patch
+       patches.suse/libfc-removes-initializing-fc_cpu_order-and-fc_cpu_mask-per-lport.patch
+       patches.suse/libfc-adds-missing-exch-release-for-accepted-rrq.patch
+       patches.suse/libfc-removes-unused-disc_work-and-ex_list.patch
+       patches.suse/fcoe-use-netif_f_fcoe_mtu-flag-to-set-up-max-frame-size-lport-mfs.patch
+       patches.suse/fcoe-call-ndo_fcoe_enable-disable-to-turn-fcoe-feature-on-off-in-lld.patch
+       patches.suse/libfc-convert-to-scsi_track_queue_full.patch
+       patches.suse/libfc-add-queue_depth-ramp-up.patch
+       patches.suse/fcoe-increase-fcoe_max_lun-to-0xffff-65535.patch
+       patches.suse/libfc-move-non-common-routines-and-prototypes-out-of-libfc-h.patch
+       patches.suse/libfc-remove-fc_fcp_complete.patch
+       patches.suse/libfc-add-libfc-fc_libfc-ch-for-libfc-internal-routines.patch
+       patches.suse/libfc-move-libfc_init-and-libfc_exit-to-fc_libfc-c.patch
+       patches.suse/libfc-changes-to-libfc_host_alloc-to-consolidate-initialization-with-allocation.patch
+       patches.suse/libfc-add-some-generic-npiv-support-routines-to-libfc.patch
+       patches.suse/libfc-vport-link-handling-and-fc_vport-state-managment.patch
+       patches.suse/libfc-libfcoe-fdisc-els-for-npiv.patch
+       patches.suse/libfcoe-fcoe-libfcoe-npiv-support.patch
+       patches.suse/fcoe-add-a-separate-scsi-transport-template-for-npiv-vports.patch
+       patches.suse/fcoe-npiv-vport-create-destroy.patch
+       patches.suse/libfc-rpn_id-is-obsolete-and-unnecessary.patch
+       patches.suse/libfc-rnn_id-may-be-required-before-rsnn_nn-with-some-switches.patch
+       patches.suse/libfc-register-symbolic-node-name-rsnn_nn.patch
+       patches.suse/libfc-register-symbolic-port-name-rspn_id.patch
+       patches.suse/libfc-combine-name-server-registration-response-handlers.patch
+       patches.suse/libfc-combine-name-server-registration-request-functions.patch
+       patches.suse/fcoe-vport-symbolic-name-support.patch
+       patches.suse/libfc-export-fc-headers.patch
+       patches.suse/libfc-add-routine-to-copy-data-from-a-buffer-to-a-sg-list.patch
+       patches.suse/libfc-fcoe-add-fc-passthrough-support.patch
+       patches.suse/libfc-formatting-cleanups-across-libfc.patch
+       patches.suse/libfcoe-formatting-and-comment-cleanups.patch
+       patches.suse/fcoe-formatting-cleanups-and-commenting.patch
+       patches.suse/fcoe-libfc-use-single-frame-allocation-api.patch
+       patches.suse/libfc-reduce-can_queue-for-all-fcp-frame-allocation-failures.patch
+       patches.suse/libfc-adds-can_queue-ramp-up.patch
+       patches.suse/libfcoe-allow-fip-to-be-disabled-by-the-driver.patch
+       patches.suse/libfcoe-fip-use-scsi-host-number-to-identify-debug-messages.patch
+       patches.suse/libfcoe-fip-allow-fip-receive-to-be-called-from-irq.patch
+       patches.suse/libfcoe-fip-should-report-link-to-libfc-whether-selected-or-not.patch
+       patches.suse/libfcoe-don-t-send-els-in-fip-mode-if-no-fcf-selected.patch
+       patches.suse/fcoe-remove-extra-function-decalrations.patch
+       patches.suse/fcoe-add-check-to-fail-gracefully-in-bonding-mode.patch
+       patches.suse/libfc-fix-rnn_id-smashing-skb-payload.patch
+       patches.suse/libfc-fix-symbolic-name-registrations-smashing-skb-data.patch
+       patches.suse/libfc-fix-fc_els_resp_type-to-correct-display-of-ct-responses.patch
+       patches.suse/libfc-add-set_fid-function-to-libfc-template.patch
+       patches.suse/libfc-add-host-number-to-lport-link-up-down-messages.patch
+       patches.suse/libfcoe-fcoe-simplify-receive-flogi-response.patch
+       patches.suse/libfc-register-fc4-features-with-the-fc-switch.patch
+       patches.suse/fcoe-fix-setting-lport-s-wwnn-wwpn-to-use-san-mac-address.patch
+       patches.suse/libfc-do-not-use-did_no_connect-for-pkt-alloc-failures.patch
+       patches.suse/fcoe-fix-using-vlan-id-in-creating-lport-s-wwwn-wwpn.patch
+       patches.suse/libfc-fcoe-fixes-for-highmem-skb-linearize-panics.patch
+       patches.suse/libfc-fix-an-issue-of-pending-exch-es-after-i-f-destroyed-or-rmmod-fcoe.patch
+       patches.suse/libfcoe-do-not-pad-fip-keep-alive-to-full-frame-size.patch
+       patches.suse/libfc-fcoe-increase-els-and-ct-timeouts.patch
+       patches.suse/libfc-call-ddp-setup-for-FCP-reads-only
+       patches.suse/libfc-fix-e_d_tov-ns-ms-scaling
+       patches.suse/libfc-don-t-assume-response-request-present
+       patches.suse/libfcoe-send-port-lka-every-fip_vn_ka_period
+       patches.suse/fcoe-only-rmmod-fcoe-ko-if-no-active-connections
+
+       # qlge patches from 2.6.33 bnc#560420, fate#307130
+       patches.drivers/qlge-0001-Use-the-instance-of-net_device_stats-from-net_.patch
+       patches.drivers/qlge-0005-Store-firmware-revision-as-early-as-possible.patch
+       patches.drivers/qlge-0006-Remove-inline-math-for-small-rx-buf-mapping.patch
+       patches.drivers/qlge-0007-Get-rid-of-firmware-handler-debug-code.patch
+       patches.drivers/qlge-0009-Add-CBFC-pause-frame-counters-to-ethtool-stats.patch
+       patches.drivers/qlge-0010-Size-RX-buffers-based-on-MTU.patch
+       patches.drivers/qlge-0011-Add-ethtool-get-set-pause-parameter.patch
+       patches.drivers/qlge-0012-Add-ethtool-blink-function.patch
+       patches.drivers/qlge-0013-Add-ethtool-wake-on-LAN-function.patch
+       patches.drivers/qlge-0014-Add-ethtool-register-dump-function.patch
+       patches.drivers/qlge-0015-Add-ethtool-self-test.patch
+       patches.drivers/qlge-0016-Change-naming-on-vlan-API.patch
+       patches.drivers/qlge-0017-Fix-indentations.patch
+       patches.drivers/qlge-0018-Add-firmware-driver-sub-command-support.patch
+       patches.drivers/qlge-0019-Clean-up-netdev-stats-usage.patch
+       patches.drivers/qlge-0020-Do-not-change-frame-routing-during-suspend.patch
+       patches.drivers/qlge-0021-Add-asic-reset-to-open-call.patch
+       patches.drivers/qlge-0022-Clean-up-module-parameter-name.patch
+       patches.drivers/qlge-0023-Change-version-to-v1.00.00.23.00.00-01.patch
+       patches.drivers/qlge-0025-drivers-net-Move-and-to-end-of-previous-line.patch
+       patches.drivers/qlge-0026-Turn-on-RX-header-split-based-on-platform.patch
+       patches.drivers/qlge-0027-Add-RX-frame-handlers-for-non-split-frames.patch
+       patches.drivers/qlge-0028-Add-napi-gro-frags-interface.patch
+       patches.drivers/qlge-0029-drivers-net-qlge-qlge_main.c-use-pM-to-show-MAC-ad.patch
+       patches.drivers/qlge-0030-drivers-net-use-DEFINE_PCI_DEVICE_TABLE.patch
+       patches.drivers/qlge-0031-Add-data-for-firmware-dump.patch
+       patches.drivers/qlge-0032-Add-basic-firmware-dump.patch
+       patches.drivers/qlge-0033-Add-probe-regs-to-firmware-dump.patch
+       patches.drivers/qlge-0034-Add-RAM-dump-to-firmware-dump.patch
+       patches.drivers/qlge-0035-Add-alternate-function-s-reg-dump-to-fw-dump.patch
+       patches.drivers/qlge-0036-Add-serdes-reg-blocks-dump-to-firmware-dump.patch
+       patches.drivers/qlge-0037-Add-xgmac-reg-blocks-to-firwmare-dump.patch
+       patches.drivers/qlge-0038-Add-module-param-to-force-firmware-core-dump.patch
+       patches.drivers/qlge-Fix-dropping-of-large-non-TCP-UDP-frames.patch
+       patches.drivers/qlge-Fix-occasional-loopback-test-failure.patch
+       patches.drivers/qlge-Fix-bonding-mac-address-bug.patch
+
+       # bnc#575956 qlge eeh
+       patches.drivers/qlge-0001-move-reset-from-eeh-io_resume-to-slot_reset.patch
+       patches.drivers/qlge-0002-add-watchdog-timer.patch
+       patches.drivers/qlge-0003-add-check-for-eeh-failure-when-closing-device.patch
+
+       # netxen patches from 2.6.33 bnc#560003, fate#307134
+       patches.drivers/netxen-0000-Use-the-instance-of-net_device_stats-from-net.patch
+       patches.drivers/netxen-0001-remove-sub-64-bit-mem-accesses.patch
+       patches.drivers/netxen-0002-add-access-to-on-chip-memory-for-tools.patch
+       patches.drivers/netxen-0003-annotate-register-windowing-code.patch
+       patches.drivers/netxen-0004-separate-register-and-memory-access-lock.patch
+       patches.drivers/netxen-0005-add-sysfs-entries-for-diag-tools.patch
+       patches.drivers/netxen-0006-defines-for-next-revision.patch
+       patches.drivers/netxen-0007-128-memory-controller-support.patch
+       patches.drivers/netxen-0008-reset-sequence-changes.patch
+       patches.drivers/netxen-0009-onchip-memory-access-change.patch
+       patches.drivers/netxen-0010-fix-error-codes-in-for-tools-access.patch
+       patches.drivers/netxen-0011-sysfs-control-for-auto-firmware-recovery.patch
+       patches.drivers/netxen-0012-update-version-to-4.0.62.patch
+       patches.drivers/netxen-0013-fix-builds-for-SYSFS-n-or-MODULES-n.patch
+       patches.drivers/netxen-0014-support-for-new-firmware-file-format.patch
+       patches.drivers/netxen-0015-refactor-indirect-register-access.patch
+       patches.drivers/netxen-0016-add-PCI-IDs-for-new-chip.patch
+       patches.drivers/netxen-0017-update-module-info.patch
+       patches.drivers/netxen-0018-module-firmware-hints.patch
+       patches.drivers/netxen-0019-update-version-to-4.0.65.patch
+       patches.drivers/netxen-0020-remove-PCI-IDs-of-CNA-device.patch
+       patches.drivers/netxen-0021-fix-debug-tools-access-for-NX2031.patch
+       patches.drivers/netxen-0022-fix-failure-cases-for-fw-hang-recovery.patch
+       patches.drivers/netxen-8f9b3f-to-c651a8.patch
+
+       # fcoe patches from 2.6.33 bnc#562046
+       patches.fixes/libfc-fix-payload-size-pa
+       patches.fixes/fcoe-allow-scsi-fcp-to-be
+       patches.fixes/libfc-add-fc-bb-5-lesb-co
+       patches.fixes/libfcoe-add-checking-disa
+       patches.fixes/libfcoe-add-tracking-fip--0
+       patches.fixes/libfcoe-add-tracking-fip-
+       patches.fixes/libfc-add-fcoe_fc_els_les
+       patches.fixes/fcoe-libfc-add-get_lesb-t
+       patches.fixes/libfc-add-support-of-rece
+       patches.fixes/libfc-add-target-reset-fl
+       patches.fixes/fcoe-use-lld-s-wwpn-and-w
+       patches.fixes/libfc-reduce-hold-time-on
+       patches.fixes/fcoe-libfc-adds-enable-di
+
+       patches.fixes/fc_sdev_blocked.patch
+       patches.suse/libfc-fix-unnecessary-seq-id-jump
+       patches.suse/libfc-use-offload-em-instance-again
+       patches.suse/libfc-fix-fcp-pkt-recovery
+
+       # ixgbe patches from 2.6.33 bnc#562046
+       patches.drivers/dcb-data-center-bridging-ops-s
+       patches.drivers/ixgbe-use-the-instance-of-net_
+       patches.drivers/ixgbe-add-support-for-82599-ba
+       patches.drivers/ixgbe-fix-kr-to-kx-fail-over-f
+       patches.drivers/net-add-netdev_alloc_skb_ip_al
+       patches.drivers/net-use-netdev_alloc_skb_ip_al
+       patches.drivers/ixgbe-fix-erroneous-display-of
+       patches.drivers/ixgbe-add-support-for-82599-al
+       patches.drivers/net-add-ndo_fcoe_get_wwn-to-ne
+       patches.drivers/ixgbe-add-support-for-netdev_o
+       patches.drivers/vlan-add-support-to-netdev_ops
+       patches.drivers/ixgbe-r_idx-not-used-in-ixgbe_
+       patches.drivers/ixgbe-flush-the-lsc-mask-chang
+       patches.drivers/ixgbe-make-queue-pairs-on-sing
+       patches.drivers/drivers-net-request_irq-remove
+       patches.drivers/ixgbe-modify-82599-hwrsc-stati
+       patches.drivers/ixgbe-use-rx-buffer-length-fro
+       patches.drivers/ixgbe-only-set-clear-vfe-in-ix
+       patches.drivers/ixgbe-handle-parameters-for-tx
+       patches.drivers/ixgbe-disable-flow-control-for
+       patches.drivers/ixgbe-links2-is-not-a-valid-re
+       patches.drivers/ixgbe-fix-receive-address-regi
+       patches.drivers/ethtool-add-direct-attach-supp
+       patches.drivers/ixgbe-display-currently-attach
+       patches.drivers/ixgbe-use-known-user-priority-
+       patches.drivers/ixgbe-select-fcoe-tx-queue-in-
+       patches.drivers/ixgbe-change-default-ring-size
+       patches.drivers/ixgbe-performance-tweaks
+       patches.drivers/ixgbe-use-eiam-to-automask-msi
+       patches.drivers/ixgbe-Fix-DMA-mapping-unmapping-issues-when-HWRSC-is.patch
+       
+       patches.drivers/ixgbe-only-process-one-ixgbe_watchdog_task-at-a-time.patch
+       patches.drivers/ixgbe-prevent-speculative-processing-of-descriptors.patch
+       patches.drivers/ixgbe-add-support-for-82599-KR-device-0x1517.patch
+       patches.drivers/ixgbe-don-t-exceed-user-buffer
+
++philips patches.drivers/ixgbe-Add-support-for-the-new-ethtool-n-tuple-progra.patch
++philips patches.drivers/ethtool-Introduce-n-tuple-filter-programming-support.patch
+
+       patches.drivers/bnx2x-backports-v2.6.32-to-af901ca.patch
+       patches.drivers/bnx2x-to-version-1.52.1-7.patch
+
+       patches.drivers/cxgb3-add-memory-barriers.patch
+       patches.drivers/cxgb3-Set-the-rxq.patch
+       patches.drivers/cxgb3-fix-GRO-checksum-check.patch
+       patches.drivers/cxgb3-FIx-VLAN-over-Jumbo-frames.patch
+       patches.drivers/cxgb3-fix-link-flap.patch
+       patches.drivers/cxgb3-fixing-eeh-handlers.patch
+
+       patches.drivers/benet-from-v2.6.32-to-8f47afe0.patch
+       patches.drivers/be2net-swap-only-first-2-fields-of-mcc_wrb.patch
+       patches.drivers/be2net-set-proper-value-to-version-field-in-req-hdr.patch
+       patches.drivers/be2net-remove-ASIC-generation-number-from-Kconfig.patch
+       patches.drivers/be2net-change-the-driver-description.patch
+       patches.drivers/be2net-fix-to-limit-max-vlans-supported-in-certain-s.patch
+       patches.drivers/be2net-minor-code-optimizations.patch
+       patches.drivers/be2net-0000-fix-bug-in-rx-page-posting.patch
+       patches.drivers/be2net-0001-Add-link-test-to-list-of-ethtool-self-tests.patch
+       patches.drivers/be2net-0002-ethtool-self-test-reorganization.patch
+       patches.drivers/be2net-0003-bug-fix-in-be_read_eeprom.patch
+       patches.drivers/be2net-0004-bug-fix-for-flashing-the-BladeEngine3-ASIC.patch
+       patches.drivers/be2net-0005-remove-unused-pci-device-id.patch
+       patches.drivers/be2net-0006-bug-fix-in-be_change_mtu.patch
+       patches.drivers/be2net-use-eq-id-to-calculate-cev-isr-reg-offset.patch
+       patches.drivers/be2net-implement-EEH-pci-error-recovery-handlers.patch
+       patches.drivers/be2net-a-mini-optimization-in-rx_compl_process-co.patch
+       patches.drivers/be2net-don-t-rearm-mcc-cq-when-device-is-not-open.patch
+       patches.drivers/be2net-fix-rx-path-to-ignore-a-flush-completion.patch
+       patches.drivers/be2net-fix-tx-completion-polling.patch
+       patches.drivers/be2net-download-NCSI-section-during-firmware-update.patch
+       patches.drivers/be2net-update-version-2.101.346u-to-2.102.147s.patch
+
+       # Infiniband fixes
+       patches.drivers/ehca-ib-qp-max-supported.patch
+       patches.drivers/ehca-no-disable-irq-in-tasklet.patch
+
+       patches.drivers/e1000e-call-pci_save_state-after-pci_restore_state.patch
+       patches.drivers/e1000e-enable-new-82567V-3-device.patch
+
+       # entropy FATE##307517 suse patches, put below rest of netdev patches
+       patches.drivers/bnx2-entropy-source.patch
+       patches.drivers/e1000-entropy-source.patch
+       patches.drivers/e1000e-entropy-source.patch
+       patches.drivers/igb-entropy-source.patch
+       patches.drivers/ixgbe-entropy-source.patch
+       patches.drivers/tg3-entropy-source.patch
+
+       patches.drivers/ehca-process-mad-null.patch
+       patches.drivers/mlx4_core-missing-device-id-6778.patch
+       patches.drivers/iw_cxgb3-dlpar.patch
 
        ########################################################
        # Wireless Networking
        ########################################################
-#      patches.suse/wireless-no-aes-select
-#      patches.fixes/ipw2200-send-noassoc.patch
-#      patches.fixes/iwl3945-fix-rfkill.patch
-#      patches.fixes/iwlagn-fix-rfkill.patch
-#      patches.fixes/iwlagn-fix-error-path.patch
-#      patches.fixes/iwlwifi-fix-rs_get_rate-oops.patch
-#      patches.fixes/iwlwifi-dont-clean-static-wep-keys.patch
-#      patches.fixes/iwl3945-fix-crash-on-rmmod.patch
-#      patches.fixes/ath5k-ignore-calibration-return-value.patch
-#      patches.fixes/ath5k-aspire-one-led.patch
-#      patches.fixes/rt2x00-fix-race-conditions.patch
-#      patches.fixes/mac80211-add-direct-probe.patch
-#      patches.fixes/b43legacy-fix-led_device_naming.diff
-#      patches.fixes/iwlwifi-fix-iwl-3945_led_device_naming.diff
-#      patches.fixes/iwlwifi-fix-iwl-led_device_naming.diff
-#      patches.fixes/rt2x00-fix-led_device_naming.diff
-#      patches.fixes/ath5k-5211-protected-fix.patch
-#      patches.fixes/iwlwifi-fix-updating-key-flags.patch
-#      patches.fixes/iwlagn-debug-build-fix
+       patches.suse/wireless-no-aes-select
 
        ########################################################
        # iSCSI
        ########################################################
-       patches.fixes/open-iscsi-git-update
-       patches.drivers/open-iscsi-offloading-support
-       patches.drivers/cxgb3i
-       patches.drivers/cxgb3i-fixed-offload-array-size
-       patches.drivers/cxgb3i_ddp.patch
-       patches.drivers/cxgb3i-mainline.patch
-       patches.drivers/cxgb3i-fix-skb-overrun
-       patches.fixes/open-iscsi-mv-transport-eh-setting
-       patches.fixes/libiscsi-fix-nop-response-reply-and-session-cleanup.patch
-       patches.fixes/libiscsi-fix-null-pointer-in-fail-all-commands
-       patches.fixes/libiscsi-fix-locking-in-eh_device_reset
-       patches.fixes/libiscsi-don-t-let-io-sit-in-queue-when-session-has-failed
-       patches.fixes/iscsi_tcp-Evaluate-socket-state-in-data_ready
-       patches.fixes/libiscsi-don-t-increment-cmdsn-if-cmd-is-not-sent
-       patches.fixes/libiscsi-handle-immediate-command-rejections
-       patches.fixes/iscsi_tcp-return-a-descriptive-error-value
-       patches.fixes/libiscsi-handle-param-allocation-failure
-       patches.fixes/iscsi_tcp-propogate-EAGAIN-from-sendpage-to-libiscsi
-       patches.fixes/libiscsi-fix-data-corruption
-       patches.fixes/libiscsi-have-iscsi_data_in_rsp-call-iscsi_update_cmdsn
-       patches.fixes/libiscsi-check-suspend-bit-before-each-call-to-xmit
-       patches.fixes/libiscsi-fix-iscsi-transport-checks
-       patches.fixes/iscsi_tcp-Use-1-second-send-timeout
-       patches.fixes/libiscsi-Update-queuecommand-return-codes-for-multipath
-       patches.fixes/iscsi_tcp-Use-last_recv-to-track-xmits
+       patches.fixes/bnx2i-use-common-iscsi-suspend-queue
+       patches.drivers/bnx2i-backport-from-v2.6.32-to-45ca38e.patch
+       patches.fixes/libiscsi-fix-login-text-checks-in-pdu-inject
+       patches.fixes/libiscsi-check-tmf-state-before-sending-pdu
+       patches.fixes/libiscsi-add-warm-target-reset-tmf-support
+       patches.fixes/iser-set-tgt-and-lu-reset-timeout
+       patches.drivers/cnic-backport-from-v2.6.32-4e9c4f.patch
+       patches.drivers/be2iscsi-beta4-update
+       patches.fixes/libiscsi-add-recover-target
+       patches.drivers/be2iscsi-BE3-support
 
        ########################################################
        # PCI and PCI hotplug
        ########################################################
-       patches.drivers/acpi-pci-fix-possible-race-condition-on-_osc-evaluation.patch
-       patches.drivers/acpi-pci-change-pci_osc_control_set-to-query-control-bits-first.patch
-       patches.drivers/acpi-pci-include-missing-acpi.h-file-in-pci-acpi.h.patch
-       patches.drivers/acpi-pci-call-_osc-support-during-root-bridge-discovery.patch
-       patches.drivers/acpi-pci-pci-extended-config-_osc-support-called-when-root-bridge-added.patch
-       patches.drivers/acpi-pci-pcie-aspm-_osc-support-capabilities-called-when-root-bridge-added.patch
-       patches.drivers/acpi-pci-pcie-aer-_osc-support-capabilities-called-when-root-bridge-added.patch
-       patches.drivers/acpi-pci-pci-msi-_osc-support-capabilities-called-when-root-bridge-added.patch
-       patches.drivers/acpi-pci-remove-obsolete-_osc-capability-support-functions.patch
-       patches.fixes/pci-amd-813x-b2-devices-do-not-need-quirk.patch
-       patches.arch/ia64-sn-fix-pci-attribute-propagation-bug.patch
-       patches.arch/ia64-sn-specific-version-of-dma_get_required_mask
-       patches.kabi/ia64-sn-specific-version-of-dma_get_required_mask-kabi-fix
+       patches.fixes/PCIe-AER-reject-aer-inject-if-hardware-mask-error-reporting.patch
+
+       # Use list instead static array for pci resources
+       patches.fixes/pci_use_list_for_resources_1_5.patch
+       patches.fixes/pci_use_list_for_resources_2_5.patch
+       patches.fixes/pci_use_list_for_resources_3_5.patch
+       patches.fixes/pci_use_list_for_resources_4_5.patch
+       patches.fixes/pci_use_list_for_resources_5_5.patch
+
+       # bug 586343
+       patches.fixes/vgaarb-fix-vga-arbiter-to-accept-pci-domains-other-than-0.patch
+       patches.fixes/pci-update-pci_set_vga_state-to-call-arch-functions.patch
+       patches.fixes/pci_aer_unconditionally_clear_uncor_status.patch
 
        ########################################################
        # sysfs / driver core
        ########################################################
-       # make debugging easier
-       patches.drivers/sysfs-crash-debugging.patch
-       patches.drivers/driver-core-basic-infrastructure-for-per-module-dynamic-debug-messages.patch
-       patches.drivers/driver-core-fix-dynamic_debug-cmd-line-parameter.patch
-       patches.drivers/driver-core-fix-using-ret-variable-in-unregister_dynamic_debug_module.patch
-       patches.drivers/driver-core-add-newlines-to-debugging-enabled-disabled-messages.patch
-
-       # this must be after the previous *-dynamic-debug-messages.patch
-       patches.suse/module-ref-dynamic-alloc
-       patches.suse/mem_cgroup_stat-dynamic-alloc
+       patches.suse/driver-core-reduce-level-of-request_firmware-messages.patch
 
        ########################################################
        # USB
        ########################################################
        patches.suse/usb-storage-disable-delay.patch
-       patches.suse/usb_correct_config_ti_04b3_4543.diff
-       patches.drivers/usb-serial-add-qualcomm-wireless-modem-driver.patch
-       patches.drivers/v4l-dvb-uvcvideo-implement-the-usb-power-management-reset_resume-method.patch
-       patches.drivers/uvcvideo-ignore-hue-control-for-5986-0241.patch
-       patches.drivers/quickcam_messenger.c-add-support-for-all-quickcam.patch
-       patches.drivers/usb-storage-increase-the-bcd-range-in-sony-s-bad-device-table.patch
+
+       # remove this for openSUSE 11.3, it is here only for SLE11 SP1 and later.
+       patches.suse/revert-usb-remove-phidget-drivers-from-kernel-tree.patch
 
        ########################################################
        # I2C
@@ -1810,134 +1333,81 @@
        # Input & Console
        ########################################################
        patches.suse/bootsplash
+       patches.suse/Cleanup-and-make-boot-splash-work-with-KMS.patch
+       patches.suse/bootsplash-keep-multiple-data
+       patches.suse/bootsplash-scaler
        patches.drivers/elousb.patch
        patches.fixes/input-add-acer-aspire-5710-to-nomux.patch
-       patches.fixes/input-add-nomux-dell-vostro-1510.patch
-       patches.fixes/hid-rdesc-quirk-for-sony-vaio-VGX-TP1E.patch
-       patches.drivers/input-usbtouchscreen-hw-calibration.patch
-       patches.fixes/usb-hid-ncr-no-init-reports.patch
-
-       patches.drivers/synaptics-ensure-reset-on-resume
        patches.drivers/synaptics-hp-clickpad
+       patches.drivers/synaptics-clickpad-area-param
+       patches.drivers/synaptics-clickpad-button-toggle
+       patches.drivers/synaptics-clickpad-bottom-enable
 
        ##########################################################
        # Sound
        ##########################################################
-       patches.drivers/alsa-hda-beep
-       patches.drivers/alsa-hda-spdif-slave
-       patches.drivers/alsa-hda-probe-fix
-       patches.drivers/alsa-hda-proc-fix
-       patches.drivers/alsa-hda-analog-update
-       patches.drivers/alsa-hda-atihdmi-update
-       patches.drivers/alsa-hda-nvidia-hdmi
-       patches.drivers/alsa-hda-realtek-update
-       patches.drivers/alsa-hda-sigmatel-update
-       patches.drivers/alsa-hda-via-update
-       patches.drivers/alsa-hda-via-rec-fix
-       patches.drivers/alsa-hda-sigmatel-spdif-fix
-       patches.drivers/alsa-hda-realtek-mic-automute-fix
-       patches.drivers/alsa-hda-realtek-alc269-dmic
-       patches.drivers/alsa-hda-alc269-fsc-amilo
-       patches.drivers/alsa-hda-proc-gpio-fix
-       patches.drivers/alsa-hda-hp-3013-master-fix
-       patches.drivers/alsa-hda-dell-studio-probe-fix
-       patches.drivers/alsa-hda-stac9200-missing-mux-capture
-       patches.drivers/alsa-hda-stac92xx-mic-pin-fix
-       patches.drivers/alsa-hda-stac-hp-detect-fix
-       patches.drivers/alsa-hda-beep-dig-switch
-       patches.drivers/alsa-hda-beep-null-check-fix
-       patches.drivers/alsa-hda-sigmatel-vref-event-fix
-       patches.drivers/alsa-hda-sigmatel-hp-m4-check-fix
-       patches.drivers/alsa-hda-realtek-acer-dmic
-       patches.drivers/alsa-hda-stac-92hd71bxx-gpio-fix
-       patches.drivers/alsa-hda-stac-hp-pavilion-quirks
-       patches.drivers/alsa-hda-stac-gpio-unsol-resume-fix
-       patches.drivers/alsa-hda-stac-hp-gpio-switch-fix
-       patches.drivers/alsa-hda-stac-dell-m4-3-quirk
-       patches.drivers/alsa-hda-spdif-bits-cache-fix
-       patches.drivers/alsa-hda-stac-yet-more-fixes
-       patches.drivers/alsa-hda-dell-92hd73xx-models
-       patches.drivers/alsa-hda-sony-vaio-vgn-sr19xn-quirk
-       patches.drivers/alsa-hda-92hd73x-desktop-fixes
-       patches.drivers/alsa-hda-hp-dv7-quirk
-       patches.drivers/alsa-hda-hp2230s-quirk
-       patches.drivers/alsa-hda-ad1882-id-typo-fix
-       patches.drivers/alsa-hda-sigmatel-add-missing-terminators
-       patches.drivers/alsa-hda-seek-for-codec-id
-       patches.drivers/alsa-hda-gateway-fix
-       patches.drivers/alsa-hda-gateway-fix2
-       patches.drivers/alsa-hda-stac925x-init-fix
-       patches.drivers/alsa-hda-hp-dv5-quirk
-       patches.drivers/alsa-hda-hp-dv5-mic-fix
-       patches.drivers/alsa-hda-idt92hd83-fix-typo
-       patches.drivers/alsa-hda-add-volume-offset
-       patches.drivers/alsa-hda-stac-reduce-volume-scale
-       patches.drivers/alsa-hda-hp-dv4-quirk
-       patches.drivers/alsa-hda-gateway-t1616-quirk
-       patches.drivers/alsa-hda-intel-d945-ref-quirk
-       patches.drivers/alsa-hda-hp-zenith-quirk
-       patches.drivers/alsa-ad1984-hp-volume-fix
-       patches.drivers/alsa-hda-hp6530b-quirk
-       patches.drivers/alsa-emu10k1-audigy-fixes
-       patches.drivers/alsa-powermac-ibook-g4-mic-fix
-       patches.drivers/alsa-ca0106-pm-support
-       patches.drivers/alsa-ca0106-capture-no-44khz
-
-       # post-GA updates
-       patches.drivers/alsa-post-ga-hda-hp-xw-quirk
-       patches.drivers/alsa-post-ga-hda-sigmatel-update
-       patches.drivers/alsa-post-ga-hda-sigmatel-update2
-       patches.drivers/alsa-post-ga-hda-sigmatel-update3
-       patches.drivers/alsa-post-ga-hda-hp-more-quirks
-       patches.drivers/alsa-post-ga-ideapad-44khz-fix
-       patches.drivers/alsa-post-ga-hda-hp-ad1984a-more-quirk
-       patches.drivers/alsa-post-ga-hda-hp-ad1984a-more-quirk2
-       patches.drivers/alsa-post-ga-alc888-hp-4ch-mode
-       patches.drivers/alsa-post-ga-alc888-hp-3stack-auto-mute
-       patches.drivers/alsa-post-ga-alc888-hp-quirk
-       patches.drivers/alsa-post-ga-alc888-coef-fix
-       patches.drivers/alsa-post-ga-lenovo-x200-quirk
-       patches.drivers/alsa-post-ga-hp-dv6736-mic-fix
-       patches.drivers/alsa-post-ga-stac-hp-detect-fix
-       patches.drivers/alsa-post-ga-ad1884a-mobile-init-fix
-       patches.drivers/alsa-post-ga-hda-pb-rs65-quirk
-       patches.drivers/alsa-post-ga-hda-ati-pos-fix
-       patches.drivers/alsa-post-ga-hda-own-workq
-       patches.drivers/alsa-post-ga-hda-codec-bus-intapi-change
-       patches.drivers/alsa-post-ga-hda-single-cmd-concurrent-access
-       patches.drivers/alsa-post-ga-hda-robust-codec-probe
-       patches.drivers/alsa-post-ga-hda-intel-cleanup
-       patches.drivers/alsa-post-ga-hda-forced-codec-slots
-       patches.drivers/alsa-post-ga-hda-hwptr-stabilize
-       patches.drivers/alsa-post-ga-hda-intelhdmi
-       patches.drivers/alsa-post-ga-hda-single-cmd-sync-write
-       patches.drivers/alsa-post-ga-hda-sync-verbs
-       patches.drivers/alsa-post-ga-hda-codec-verb-retry
-       patches.drivers/alsa-post-ga-hda-codec-limit-verb-retry
-       patches.drivers/alsa-post-ga-hda-internal-binary-compat
-       patches.drivers/alsa-post-ga-hda-alc269-lenovo-capture-fix
-       patches.drivers/alsa-post-ga-hp-ad1984a-mobile-mute-fix
-       patches.drivers/alsa-post-ga-alc268-mono-output-fix
-       patches.drivers/alsa-post-ga-hda-reduce-click-noise
-       patches.drivers/alsa-post-ga-hda-snd-array
-       patches.drivers/alsa-post-ga-hda-quirk-ext
-       patches.drivers/alsa-post-ga-hda-stac-automic
-       patches.drivers/alsa-post-ga-hda-stac-lo-detect-fix
-       patches.drivers/alsa-post-ga-hp-piaget-quirk
-       patches.drivers/alsa-post-ga-hda-idt92hd8x-fix
-       patches.drivers/alsa-post-ga-hda-stac9872-inputsrc-fix
-       patches.drivers/alsa-post-ga-hda-analog-updates
-       patches.drivers/alsa-post-ga-hda-stac-92hd73-fixes
-       patches.drivers/alsa-post-ga-hda-stac-92hd-hp-fixes
-       patches.drivers/alsa-post-ga-hda-stac-automic-fix
-       patches.drivers/alsa-post-ga-hda-stac-shutup-at-free
-       patches.drivers/alsa-post-ga-hda-stac927x-fsc-fix
-       patches.drivers/alsa-post-ga-hda-stac927x-dell-volknob-fix
-       patches.drivers/alsa-post-ga-hda-hp-bseries-mute-led-fix
-       patches.drivers/alsa-post-ga-hda-reboot-notify
-       patches.drivers/alsa-post-ga-hda-stac-dual-headphones-fix
-       patches.drivers/alsa-post-ga-hda-idt92hd83xxx-hp-model
-       patches.drivers/alsa-post-ga-hda-hp-mute-led-gpio-fixes
+       patches.drivers/alsa-sp1-hda-02-vectorize-get_empty_pcm_device
+       patches.drivers/alsa-sp1-hda-03-allow-up-to-4-HDMI
+       patches.drivers/alsa-sp1-hda-04-convert-intelhdmi-global-references
+       patches.drivers/alsa-sp1-hda-05-remove-intelhdmi-dependency-on-multiout
+       patches.drivers/alsa-sp1-hda-06-use-pcm-prepare-callbacks-for-intelhdmi
+       patches.drivers/alsa-sp1-hda-07-reorder-intelhemi-prepare-callbacks
+       patches.drivers/alsa-sp1-hda-08-vectorize-intelhdmi
+       patches.drivers/alsa-sp1-hda-09-get-intelhtemi-max-channels
+       patches.drivers/alsa-sp1-hda-10-auto-parse-intelhdmi-cvt-pin
+       patches.drivers/alsa-sp1-hda-11-remove-static-intelhdmi-config
+       patches.drivers/alsa-sp1-hda-12-reset-pins-idt-codec-free
+       patches.drivers/alsa-sp1-hda-13-add-reboot-notifier
+       patches.drivers/alsa-sp1-hda-14-add-missing-export
+       patches.drivers/alsa-sp1-hda-15-fix-build-warning
+       patches.drivers/alsa-sp1-hda-16-stac-dual-headphones-fix
+       patches.drivers/alsa-sp1-hda-17-fix-mute-LED-sync-idt92h383xxx
+       patches.drivers/alsa-sp1-hda-19-cx5047-test-mode-fix
+       patches.drivers/alsa-sp1-hda-20-fsc-amilo-pi1505-fix
+       patches.drivers/alsa-sp1-hda-21-hp-dv3-position-fix-quirk
+       patches.drivers/alsa-sp1-hda-22-alc888-exclude-unusable-adcs
+       patches.drivers/alsa-sp1-hda-23-hp-mute-led-gpio-fixes
+       patches.drivers/alsa-sp1-hda-24-keep-msi-on
+       patches.drivers/alsa-sp1-hda-25-add-power-counter
+       patches.drivers/alsa-sp1-hda-26-fix-hwdep-config-dependency
+       patches.drivers/alsa-sp1-hda-27-sony-vaio-use-default-auto
+       patches.drivers/alsa-sp1-hda-28-hdmi-fix-audio-infoframe-size
+       patches.drivers/alsa-sp1-hda-29-hdmi-fix-channel-mapping-slot
+       patches.drivers/alsa-sp1-hda-30-hdmi-export-monitor-presence
+       patches.drivers/alsa-sp1-hda-31-hdmi-add-jack-detect-helper
+       patches.drivers/alsa-sp1-hda-32-hdmi-probe-monitor-at-init
+       patches.drivers/alsa-sp1-hda-33-hdmi-separate-checksum-routine
+       patches.drivers/alsa-sp1-hda-34-hdmi-sticky-infoframe
+       patches.drivers/alsa-sp1-hda-35-hdmi-sticky-stream-id
+       patches.drivers/alsa-sp1-hda-36-sticky-channel-count
+       patches.drivers/alsa-sp1-hda-37-show-epps-capability-in-proc
+       patches.drivers/alsa-sp1-hda-38-acer-aspire-4930g-mute-fix
+       patches.drivers/alsa-sp1-hda-39-hdmi-show-hbr-pincap
+       patches.drivers/alsa-sp1-hda-40-hdmi-accept-DP-pin
+       patches.drivers/alsa-sp1-hda-41-hdmi-channel-mapping-pin
+       patches.drivers/alsa-sp1-hda-42-hdmi-add-chmap-configs
+       patches.drivers/alsa-sp1-hda-43-dont-power-off-hda-link
+       patches.drivers/alsa-sp1-hda-44-alc661-892-support
+       patches.drivers/alsa-sp1-hda-45-alc661-memleak-fix
+       patches.drivers/alsa-sp1-hda-47-quirk-for-intel-d945-mobo
+       patches.drivers/alsa-sp1-hda-48-alc260-will-quirk-for-acer
+       patches.drivers/alsa-sp1-hda-49-more-alc663-fixes
+       patches.drivers/alsa-sp1-hda-52-hdmi-sticky-stream-tag
+       patches.drivers/alsa-sp1-hda-55-alc259-hp-pin-fix
+       patches.drivers/alsa-sp1-hda-56-realtek-eapd-fix
+       patches.drivers/alsa-sp1-hda-57-cx5051-toshiba-quirk
+       patches.drivers/alsa-sp1-hda-58-cx5051-lenovo-mute-fix
+       patches.drivers/alsa-sp1-hda-59-idt92hd83xxx-hp-mute-led
+       patches.drivers/alsa-sp1-hda-60-add-idt92hd88x-support
+       patches.drivers/alsa-sp1-hda-61-add-idt92hd88x-support2
+       patches.drivers/alsa-sp1-hda-62-fix-hp-dv-mute-led
+       patches.drivers/alsa-sp1-hda-63-idt-hp-mute-led-detect
+       patches.drivers/alsa-sp1-hda-64-idt-hp-mute-led-cleanup
+       patches.drivers/alsa-sp1-hda-65-idt-hp-mute-led-cleanup2
+       patches.drivers/alsa-sp1-hda-66-idt-hp-mute-led-fix-polarity
+       patches.drivers/alsa-sp1-hda-67-alc268-fix-quirk-check
+       patches.drivers/alsa-sp1-hda-68-fix-realtek-secondary-adcs
+       patches.drivers/alsa-sp1-hda-69-alc262-single-adc-fix
 
        ########################################################
        # Other driver fixes
@@ -1952,100 +1422,38 @@
        patches.suse/raw_device_max_minors_param.diff
        patches.suse/no-partition-scan
 
-       patches.fixes/saa7134-fix-resource-map-sanity-check-conflict.patch
-       patches.fixes/enclosure-fix-oops-while-iterating-enclosure_status-array
-
-       patches.drivers/8250_pnp-wacom-add1
-       patches.drivers/8250_pnp-wacom-add2
-       patches.drivers/8250_pnp-wacom-add3
-       patches.fixes/uart-txen-race.patch
+       patches.drivers/add-support-for-intel-cougar-point-chipset.patch
+       patches.fixes/pci-fix-nested-spinlock-hang-in-aer_inject.patch
+       patches.drivers/support-pci-domains-in-aer-inject
 
        ########################################################
        # Other drivers we have added to the tree
        ########################################################
-       patches.drivers/panasonic-laptop-add-panasonic-let-s-note-laptop-extras-driver-v0.94.patch
 
        ########################################################
        # Suspend/Resume stuff
        ########################################################
-       patches.fixes/Hibernate-Take-overlapping-zones-into-account-rev-2.patch
 
        ########################################################
        # device-mapper
        ########################################################
        patches.suse/dm-emulate-blkrrpart-ioctl
-       patches.suse/dm-raid45_2.6.27_20081027.patch
-       patches.drivers/blk-request-based-multipath-update
-       patches.suse/rq-based-multipath
-       patches.fixes/dm-mpath-remove-is_active
-       patches.suse/dm-barrier-single-device
+       patches.suse/dm-raid45-26-Nov-2009.patch
        patches.fixes/dm-mpath-reattach-dh
        patches.suse/dm-mpath-leastpending-path-update
+       patches.suse/dm-mpath-accept-failed-paths
+       patches.suse/dm-mpath-detach-existing-hardware-handler
        patches.suse/dm-mpath-null-pgs
        patches.fixes/dm-table-switch-to-readonly
-       patches.suse/dm-mpath-add-start-io
-       patches.suse/dm-mpath-queue-length-load-balancing
-       patches.suse/dm-mpath-tracking-nr-bytes
-       patches.suse/dm-mpath-service-time-load-balancing
-       patches.suse/dm-block-integrity
-       patches.fixes/blk-set-segment-boundary-mask
-       patches.fixes/dm-mpath-send-activate-to-every-path
-       patches.suse/dm-mpath-accept-failed-paths
-       patches.fixes/dm-avoid-put-table-dm_any_congested
-       patches.fixes/dm-unbind-drop-ref
-       patches.fixes/dm-table-ref-count
-       patches.suse/dm-mpath-requeue-for-stopped-queue
-       patches.suse/dm-mpath-check-info-before-access
-       patches.suse/dm-table-change-mode-to-ro
-       patches.suse/dm-use-md-for-free_bio_clone
-       patches.fixes/dm-path-selector-ref-count
-       patches.suse/dm-mpath-lockdep-irqsave
-       patches.fixes/dm-mpath-leastpending-correction
+       patches.suse/dm-mpath-evaluate-request-result-and-sense
        patches.fixes/dm-release-map_lock-before-set_disk_ro
        patches.suse/dm-mpath-no-activate-for-offlined-paths
-       patches.fixes/dm-table-upgrade-mode-race-fix
-       patches.fixes/dm_flag_queue_barrier_support
        patches.suse/dm-mpath-no-partitions-feature
-       patches.fixes/dm-mpath-skip-inactive-paths-during-activation
+       patches.suse/dm-mpath-skip-disabled-devices-when-iterating
 
        ########################################################
        # md
        ########################################################
-       patches.suse/md-notify-when-stopped
-       patches.fixes/md-disable-recovery-on-faulty-degraded-array
-       patches.suse/md-raid-metadata-PAGE_SIZE.patch
-       patches.fixes/md-raid1-chunksize
-       patches.suse/md-bitmap-sub-page-chunks
-       patches.fixes/md-raid1-handle-read-error.patch
-
-       # bug fixes and minor features to 2.6.30. bnc#498358
-       patches.fixes/0001-md-Relax-minimum-size-restrictions-on-chunk_size.patch
-       patches.fixes/0002-md-fix-input-truncation-in-safe_delay_store.patch
-       patches.fixes/0003-md-don-t-retry-recovery-of-raid1-that-fails-due-to-e.patch
-       patches.fixes/0004-md-fix-deadlock-when-stopping-arrays.patch
-       patches.fixes/0005-md-Fix-is_mddev_idle-test-again.patch
-       patches.fixes/0006-md-never-clear-bit-from-the-write-intent-bitmap-when.patch
-       patches.fixes/0007-md-write-bitmap-information-to-devices-that-are-unde.patch
-       patches.fixes/0008-md-be-more-consistent-about-setting-WriteMostly-flag.patch
-       patches.fixes/0009-md-raid5-simplify-interface-for-init_stripe-and-get_.patch
-       patches.fixes/0010-md-raid5-change-raid5_compute_sector-and-stripe_to_p.patch
-       patches.fixes/0011-md-raid6-remove-expectation-that-Q-device-is-immedia.patch
-       patches.fixes/0012-md-raid5-simplify-raid5_compute_sector-interface.patch
-       patches.fixes/0013-md-raid5-Add-support-for-new-layouts-for-raid5-and-r.patch
-       patches.fixes/0014-md-raid5-finish-support-for-DDF-raid6.patch
-+kabi  patches.fixes/0015-md-add-size-as-a-personality-method.patch
-+kabi  patches.fixes/0016-md-centralize-array_sectors-modifications.patch
-+kabi  patches.fixes/0017-md-array_size-sysfs-attribute.patch
--kabi  patches.fixes/0017A-md-array_size-sysfs-arrtibute.patch
-       patches.fixes/0018-md-raid5-run-Fix-max_degraded-for-raid-level-4.patch
-       patches.fixes/0019-md-allow-setting-newly-added-device-to-in_sync-via-s.patch
-       patches.fixes/0020-md-support-bitmaps-on-RAID10-arrays-larger-then-2-te.patch
-       patches.fixes/0024-md-tidy-up-status_resync-to-handle-large-arrays.patch
-       patches.fixes/0026-md-remove-rd-d-links-immediately-after-stopping-an-a.patch
-+kabi  patches.fixes/0027-md-improve-errno-return-when-setting-array_size.patch
-+kabi  patches.fixes/0028-md-add-explicit-method-to-signal-the-end-of-a-reshap.patch
-       patches.fixes/md-update-size
-       patches.fixes/md-utime-fix
 
        ##########################################################
        #
@@ -2054,65 +1462,52 @@
        ##########################################################
 
        ##########################################################
-       # AppArmor
+       # Audit
        ##########################################################
 
-#      patches.apparmor/security-create.diff
-#      patches.apparmor/remove_suid.diff
-#      patches.apparmor/vfs-notify_change.diff
-#      patches.apparmor/security-setattr.diff
-#      patches.apparmor/vfs-mkdir.diff
-#      patches.apparmor/security-mkdir.diff
-#      patches.apparmor/vfs-mknod.diff
-#      patches.apparmor/security-mknod.diff
-#      patches.apparmor/vfs-symlink.diff
-#      patches.apparmor/security-symlink.diff
-#      patches.apparmor/security-readlink.diff
-#      patches.apparmor/vfs-link.diff
-#      patches.apparmor/security-link.diff
-#      patches.apparmor/vfs-rmdir.diff
-#      patches.apparmor/security-rmdir.diff
-#      patches.apparmor/fix-vfs_rmdir.diff
-#      patches.apparmor/vfs-unlink.diff
-#      patches.apparmor/security-unlink.diff
-#      patches.apparmor/vfs-rename.diff
-#      patches.apparmor/security-rename.diff
-#      patches.apparmor/vfs-setxattr.diff
-#      patches.apparmor/security-setxattr.diff
-#      patches.apparmor/vfs-getxattr.diff
-#      patches.apparmor/security-getxattr.diff
-#      patches.apparmor/vfs-listxattr.diff
-#      patches.apparmor/security-listxattr.diff
-#      patches.apparmor/vfs-removexattr.diff
-#      patches.apparmor/security-removexattr.diff
-#      patches.apparmor/unambiguous-__d_path.diff
-#      patches.apparmor/d_namespace_path.diff
-#      patches.apparmor/d_namespace_path_oops_fix.diff
-#      patches.apparmor/fsetattr.diff
-#      patches.apparmor/fsetattr-reintro-ATTR_FILE.diff
-#      patches.apparmor/fsetattr-restore-ia_file.diff
-#      patches.apparmor/file-handle-ops.diff
-#      patches.apparmor/security-xattr-file.diff
-#      patches.apparmor/sysctl-pathname.diff
-#      patches.apparmor/add-security_path_permission
-#      patches.apparmor/add-path_permission.diff
-#      patches.apparmor/do_path_lookup-nameidata.diff
-#      patches.apparmor/apparmor-audit.diff
-#      patches.apparmor/apparmor-main.diff
-#      patches.apparmor/apparmor-lsm.diff
-#      patches.apparmor/apparmor-path_permission
-#      patches.apparmor/apparmor-module_interface.diff
-#      patches.apparmor/apparmor-misc.diff
-#      patches.apparmor/apparmor-intree.diff
-#      patches.apparmor/apparmor-network.diff
-#      patches.apparmor/apparmor-rlimits.diff
-#      patches.apparmor/apparmor-2.6.25.diff
-#      patches.apparmor/apparmor-ptrace-2.6.27.diff
-#      patches.apparmor/fix-complain.diff
-#      patches.apparmor/fix-security-param.diff
-#      patches.apparmor/fork-tracking.diff
-#      patches.apparmor/export-security_inode_permission-for-aufs
-#      patches.apparmor/fix-deleted-leak.diff
+       ##########################################################
+       # AppArmor
+       ##########################################################
+#      patches.apparmor/security-default-lsm
+#      patches.apparmor/apparmor-security-module
+#      patches.apparmor/apparmor-correct-mapping-of-file-permissions
+#      patches.apparmor/apparmor-turn-auditing-of-ptrace-on
+#      patches.apparmor/apparmor-fix-operator-precidence-issue-in-as_path_link
+#      patches.apparmor/apparmor-explicitly-include-header-files-to-allow-apparmor-to-build-on-powerpc
+#      patches.apparmor/apparmor-ensure-apparmor-enabled-parmater-is-off-if-apparmor-fails-to-initialize
+#      patches.apparmor/apparmor-fix-auditing-of-domain-transitions-to-include-target-profile-information
+#      patches.apparmor/apparmor-fix-c99-violation
+#      patches.apparmor/apparmor-fix-build-failure-on-ia64
+#      patches.apparmor/apparmor-revert-reporting-of-create-to-write-permission
+#      patches.apparmor/apparmor-fix-null-pointer-dereference-oops-in-profile-attachment
+#      patches.apparmor/apparmor-fix-argument-size-missmatch-on-64-bit-builds
+#      patches.apparmor/apparmor-fix-change_profile-failing-lpn401931
+#      patches.apparmor/apparmor-fix-determination-of-forced-audit-messages
+#      patches.apparmor/apparmor-fix-oops-in-auditing-of-the-policy-interface-offset
+#      patches.apparmor/apparmor-fix-profile-attachment-for-regexp-based-profile-names
+#      patches.apparmor/apparmor-return-the-correct-error-codes-on-profile-addition-removal
+#      patches.apparmor/apparmor-fix-oops-in-profile-listing-and-display-full-list
+#      patches.apparmor/apparmor-fix-mapping-of-pux-to-new-internal-permission-format
+#      patches.apparmor/apparmor-fix-change_profile-failure
+#      patches.apparmor/apparmor-fix-profile-namespace-removal
+#      patches.apparmor/apparmor-fix-oops-when-auditing-the-addition-of-profile-namespace
+#      patches.apparmor/apparmor-fix-mediation-of-created-paths-that-look-like-deleted-paths
+#      patches.apparmor/apparmor-fix-file-auditing-when-quiet-is-used
+#      patches.apparmor/apparmor-policy-load-and-replacement-can-fail-to-alloc-mem
+#      patches.apparmor/apparmor-fix-failure-to-audit-change_hat-correctly
+
+#      patches.apparmor/apparmor-allow-truncation-of-deleted-files
+#      patches.apparmor/apparmor-fix-oops-after-profile-removal
+#      patches.apparmor/apparmor-fix-oops-when-in-apparmor_bprm_set_creds
+#      patches.apparmor/apparmor-fix-cap-audit_caching-preemption-disabling
+#      patches.apparmor/apparmor-fix-refcounting-bug-causing-leak-of-creds-and-oops
+#      patches.apparmor/apparmor-fix-leak-when-profile-transition-table-fails-unpack
+#      patches.apparmor/apparmor-fully-close-race-condition-for-deleted-paths
+
+#      patches.apparmor/apparmor-missing-unlock
+#      patches.apparmor/ptrace_may_access-fix
+#      patches.apparmor/apparmor-fix-security_ops-task_setrlimit-api-use
+#      patches.apparmor/apparmor-check-for-network-in-interrupt-and-work-around
 
        ########################################################
        # Address space layout randomization
@@ -2125,13 +1520,20 @@
        patches.suse/kdb-common
        patches.suse/kdb-x86
        patches.suse/kdb-ia64
-       patches.suse/kdb-serial-8250
-       patches.fixes/kdb-fix-stack-overflow.patch
-       patches.suse/kdb-resolve-uv-conflict.diff
-       patches.fixes/kdb-read-CR.diff
-       patches.fixes/kdb-bb_all-fixes
-       patches.fixes/kdb-Commited_AS-fix
+       patches.suse/kdb-build-fixes
+       patches.suse/kdb-x86-build-fixes
+       patches.suse/kdb-usb-rework
+       patches.suse/kdb_fix_ia64_build.patch
        patches.suse/kdb_dont_touch_i8042_early.patch
+       patches.suse/kdb-handle-nonexistance-keyboard-controller
+       patches.suse/kdb-fix-kdb_cmds-to-include-the-arch-common-macro
+       patches.suse/kdb-fix-the-multi-word-nop-instructions-in-the-disassembler
+       patches.suse/x86-uv-kdb-support-for-uv-nmi-handler.patch
+       patches.suse/x86-add-kdb-support-for-unknown_nmi_error-handler.patch
+       patches.suse/kdb-x86-backtrace-code-to-use-the-in-kernel-show_stack-function
+
+       # bug 586343, depends on the KDB patches
+       patches.fixes/x86_64-uv-update-uv-arch-to-target-legacy-vga-i-o-correctly.patch
 
         ########################################################
         # Other patches for debugging
@@ -2140,194 +1542,63 @@
 #      patches.suse/stack-unwind
 #      patches.suse/no-frame-pointer-select
 #      patches.arch/x86_64-unwind-annotations
-#      patches.arch/s390-17-perf-01-framepointer.patch
-
-        ########################################################
-       # Perfmon
-        ########################################################
-       patches.suse/perfmon2.patch
-       patches.suse/perfmon2-fix_disabled.patch
-       patches.suse/perfmon2-remove_syscalls.patch
-       patches.suse/perfmon2-remove_get_base_syscall_attr.patch
-       patches.suse/perfmon2-add_ioctl_interface.patch
 
         ########################################################
         # Kdump
         ########################################################
-       patches.fixes/kdb-kdump.diff
-       patches.fixes/kdb-oops-panic.diff
        patches.suse/kdump-dump_after_notifier.patch
-       patches.fixes/kdump-x86-sparsemem.diff
 
         ########################################################
-       # cgroups
+       # audit subsystem
         ########################################################
-       patches.suse/cgroup-freezer.patch
-       patches.fixes/cgroups-suppress-cloning-warning.patch
-       patches.fixes/fix-nr_uninterruptible-accounting-of-frozen-tasks
-
-       patches.suse/panic-on-io-nmi.diff
+       patches.suse/audit-export-logging.patch
 
-       patches.suse/cgroup-disable-memory.patch
         ########################################################
-       # Tracing
-        ########################################################
-       # in tip/tracing/ftrace
-       patches.trace/rcu-read-sched.patch
-       patches.trace/markers-use-rcu-read-lock-sched.patch
-
-       # in tip/tracing/ftrace
-       patches.trace/tracepoints.patch
-       patches.trace/tracepoints-use-table-size-macro.patch
-       patches.trace/tracepoints-documentation.patch
-       patches.trace/tracepoints-tracepoint-synchronize-unregister.patch
-       patches.trace/tracepoints-documentation-fix-teardown.patch
-       patches.trace/tracepoints-samples.patch
-       patches.trace/tracepoints-samples-fix-teardown.patch
-
-       patches.trace/lttng-instrumentation-irq.patch
-       patches.trace/lttng-instrumentation-scheduler.patch
-       patches.trace/lttng-instrumentation-timer.patch
-       patches.trace/lttng-instrumentation-kernel.patch
-       patches.trace/lttng-instrumentation-filemap.patch
-       patches.trace/lttng-instrumentation-swap.patch
-       patches.trace/lttng-instrumentation-memory.patch
-       patches.trace/lttng-instrumentation-page_alloc.patch
-       patches.trace/lttng-instrumentation-hugetlb.patch
-       patches.trace/lttng-instrumentation-net.patch
-       patches.trace/lttng-instrumentation-ipv4.patch
-       patches.trace/lttng-instrumentation-ipv6.patch
-       patches.trace/lttng-instrumentation-socket.patch
-       patches.trace/lttng-instrumentation-fs.patch
-       patches.trace/lttng-instrumentation-ipc.patch
-
-       patches.trace/ftrace-port-to-tracepoints.patch
-       patches.trace/ftrace-framepointer.diff
-
-       patches.trace/utrace-core
-
-       patches.trace/s390-utrace-enablement.patch
-       patches.trace/s390-syscall-get-nr.diff
-
-       # Fix for #469589
-       patches.fixes/make-note_interrupt-fast.diff
+       # Performance Monitoring, Tracing etc
+       ########################################################
+ 
+       patches.suse/perfmon2.patch
+       patches.suse/perfmon2_ioctl.patch  
+       patches.suse/perfmon2-remove_syscalls.patch
+       patches.suse/perfmon2-remove_get_base_syscall_attr.patch
+       patches.suse/perfmon2_noutrace.patch  
 
-       # Fix for #473537
-       patches.fixes/fix-device-number-in-blktrace.patch
+       patches.fixes/oprofile_bios_ctr.patch
 
-       # Fix for #475149
-       patches.fixes/block-get-rid-of-the-manual-directory-counting-in-blktrace.patch
+       patches.trace/utrace-core
 
-       patches.arch/s390-17-perf-02-schedframepointer.patch
++needs_update-32       patches.fixes/nfs-write.c-bug-removal.patch
+       patches.fixes/ia64-configure-HAVE_UNSTABLE_SCHED_CLOCK-for-SGI_SN.patch
 
-        ########################################################
-       # Swap over NFS
-        ########################################################
+       ########################################################
+       # KVM patches
+       ########################################################
 
-       patches.suse/SoN-01-mm-gfp-to-alloc_flags.patch
-       patches.suse/SoN-02-mm-setup_per_zone_pages_min.patch
-       patches.suse/SoN-03-net-ipv6-route-cleanup.patch
-       patches.suse/SoN-04-net-ipv6-route-cleanup-sysctl.patch
-       patches.suse/SoN-05-doc.patch
-       patches.suse/SoN-06-mm-gfp-to-alloc_flags-expose.patch
-       patches.suse/SoN-07-page_alloc-reserve.patch
-       patches.suse/SoN-08-reserve-slub.patch
-       patches.suse/SoN-fix-uninitialized-variable.patch
-       patches.suse/SoN-09-mm-kmem_estimate_pages.patch
-       patches.suse/SoN-10-mm-PF_MEMALLOC-softirq.patch
-       patches.suse/SoN-11-mm-page_alloc-emerg.patch
-       patches.suse/SoN-12-global-ALLOC_NO_WATERMARKS.patch
-       patches.suse/SoN-13-mm-page_alloc-GFP_EMERGENCY.patch
-       patches.suse/SoN-14-mm-reserve.patch
-       patches.suse/SoN-15-mm-selinux-emergency.patch
-       patches.suse/SoN-16-net-backlog.patch
-       patches.suse/SoN-17-net-ps_rx.patch
-       patches.suse/SoN-18-net-sk_allocation.patch
-       patches.suse/SoN-19-netvm-reserve.patch
-       patches.suse/SoN-20-netvm-reserve-inet.patch
-       patches.suse/SoN-20-netvm-reserve-inet.patch-fix
-       patches.suse/SoN-21-netvm-skbuff-reserve.patch
-       patches.suse/SoN-22-netvm-sk_filter.patch
-       patches.suse/SoN-23-netvm-tcp-deadlock.patch
-       patches.suse/SoN-24-emergency-nf_queue.patch
-       patches.suse/SoN-25-netvm.patch
-       patches.suse/SoN-26-mm-swapfile.patch
-       patches.suse/SoN-fix-sync
-       patches.suse/SoN-27-mm-page_file_methods.patch
-       patches.suse/SoN-28-nfs-swapcache.patch
-       patches.suse/SoN-29-nfs-swapper.patch
-       patches.suse/SoN-30-nfs-swap_ops.patch
-       patches.suse/SoN-31-nfs-alloc-recursions.patch
-       patches.fixes/nfs-write.c-bug-removal.patch
-       patches.fixes/ia64-configure-HAVE_UNSTABLE_SCHED_CLOCK-for-SGI_SN.patch
+       patches.fixes/kvm-ioapic.patch
+       patches.fixes/kvm-macos.patch
 
         ########################################################
        # Staging tree patches
        # new drivers that are going upstream
         ########################################################
-#      patches.drivers/0001-Staging-add-TAINT_CRAP-for-all-drivers-staging-code.patch
-#      patches.drivers/0002-Staging-add-TAINT_CRAP-flag-to-drivers-staging-modu.patch
-#      patches.drivers/0003-Staging-add-Kconfig-entries-and-Makefile-infrastruc.patch
-#      patches.drivers/0004-Staging-add-MAINTAINERS-entry.patch
-#      patches.drivers/0005-Staging-add-et131x-network-driver.patch
-#      patches.drivers/0006-Staging-add-Alacritech-slicoss-network-driver.patch
-#      patches.drivers/0007-Staging-add-sxg-network-driver.patch
-#      patches.drivers/0008-Staging-add-me4000-firmware-files.patch
-#      patches.drivers/0009-Staging-add-me4000-pci-data-collection-driver.patch
-#      patches.drivers/0010-Staging-add-the-go7007-video-driver.patch
-#      patches.drivers/0011-Staging-USB-IP-add-common-functions-needed.patch
-#      patches.drivers/0012-Staging-USB-IP-add-client-driver.patch
-#      patches.drivers/0013-Staging-USB-IP-add-host-driver.patch
-#      patches.drivers/0014-Staging-add-w35und-wifi-driver.patch
-#      patches.drivers/w35-ieee80211_ops-api-fixups
-#      patches.drivers/0015-Staging-add-wlan-ng-prism2-usb-driver.patch
-#      patches.drivers/0016-Staging-add-echo-cancelation-module.patch
-#      patches.drivers/0017-Staging-Fix-gcc-warnings-in-sxg.patch
-#      patches.drivers/0018-Staging-go7007-v4l-fixes.patch
-#      patches.drivers/0019-Staging-SLICOSS-lots-of-checkpatch-fixes.patch
-#      patches.drivers/0020-Staging-SLICOSS-Fix-warnings-due-to-static-usage.patch
-#      patches.drivers/0021-Staging-SLICOSS-Fix-remaining-type-names.patch
-#      patches.drivers/0022-Staging-SLICOSS-Call-pci_release_regions-at-driver.patch
-#      patches.drivers/0023-Staging-Lindent-sxg.c.patch
-#      patches.drivers/staging-workaround-build-system-bug.patch
-#      patches.drivers/staging-at76_usb-wireless-driver.patch
-#      patches.drivers/staging-add-agnx-wireless-driver.patch
-#      patches.drivers/staging-add-otus-atheros-wireless-network-driver.patch
-#      patches.drivers/otus-usb_complete_t-fixups
-#      patches.drivers/staging-add-rt2860-wireless-driver.patch
-#      patches.drivers/staging-rt2860-enable-wpa_supplicant-support.patch
-#      patches.drivers/staging-rt2860-sync-driver-up-with-2.6.30-version.patch
-#      patches.drivers/staging-add-serverengines-benet-10gb-ethernet-driver.patch
-#      patches.drivers/staging-add-rtl8187se-driver.patch
-#      patches.drivers/rtl8187se-fix-iw_handler-api-usage
-#      patches.drivers/staging-add-rt2870-wireless-driver.patch
-#      patches.drivers/staging-add-rt3070-wireless-driver.patch
-
-#      patches.drivers/staging-hv-add-the-hyper-v-api-header-files.patch
-#      patches.drivers/staging-hv-add-the-hyper-v-driver-header-files.patch
-#      patches.drivers/staging-hv-add-the-hyper-v-virtual-bus.patch
-#      patches.drivers/staging-hv-add-the-hyper-v-virtual-block-driver.patch
-#      patches.drivers/staging-hv-add-the-hyper-v-virtual-network-driver.patch
-#      patches.drivers/staging-hv-add-the-hyper-v-virtual-storage-driver.patch
-#      patches.drivers/staging-hv-add-a-todo-file.patch
-#      patches.drivers/staging-hv-make-the-hyper-v-virtual-bus-code-build.patch
-#      patches.drivers/staging-hv-use-the-correct-ifdef-for-x86-64.patch
-#      patches.drivers/staging-hv-add-the-hyper-v-virtual-bus-to-the-build.patch
-#      patches.drivers/staging-hv-make-the-hyper-v-virtual-storage-driver-build.patch
-#      patches.drivers/staging-hv-add-the-hyper-v-virtual-scsi-driver-to-the-build.patch
-#      patches.drivers/staging-hv-storvsc-fix-up-driver_data-usage.patch
-#      patches.drivers/staging-hv-make-the-hyper-v-virtual-block-driver-build.patch
-#      patches.drivers/staging-hv-add-the-hyper-v-virtual-block-driver-to-the-build.patch
-#      patches.drivers/staging-hv-blkvsc-fix-up-driver_data-usage.patch
-#      patches.drivers/staging-hv-make-the-hyper-v-virtual-network-driver-build.patch
-#      patches.drivers/staging-hv-add-the-hyper-v-virtual-network-driver-to-the-build.patch
-
-#      patches.drivers/staging-add-realtek-8192-pci-wireless-driver.patch
-#      patches.drivers/staging-rtl8192e-backport-net_device_ops-conversion.patch
-
-       ########################################################
-       # kernel-wide security fixes
+
+       ########################################################
+       # "fastboot" patches
+       # These should all be upstream, we took them from
+       # moblin to try to speed up the boot process
        ########################################################
+       patches.suse/linux-2.6.29-dont-wait-for-mouse.patch
+       patches.suse/linux-2.6.29-enable-async-by-default.patch
+-      patches.suse/linux-2.6.29-even-faster-kms.patch
+       patches.suse/linux-2.6.29-silence-acer-message.patch
+       patches.suse/linux-2.6.29-kms-after-sata.patch
+       patches.suse/linux-2.6.29-jbd-longer-commit-interval.patch
+
+       patches.suse/trace-open.patch
+
+       # some driver patches, should move up in the series...
+       patches.suse/linux-2.6.29-touchkit.patch
+       patches.suse/uvcvideo-ignore-hue-control-for-5986-0241.patch
 
         ########################################################
        # You'd better have a good reason for adding a patch
@@ -2353,12 +1624,13 @@
        patches.xen/linux-2.6.19-rc1-kexec-move_segment_code-i386.patch
        patches.xen/linux-2.6.19-rc1-kexec-move_segment_code-x86_64.patch
        patches.xen/ipv6-no-autoconf
-       patches.xen/gso-size-check.patch
-       patches.xen/pci-reassign-resources
+       patches.xen/pci-guestdev
+       patches.xen/pci-reserve
        patches.xen/sfc-driverlink
        patches.xen/sfc-resource-driver
        patches.xen/sfc-driverlink-conditional
        patches.xen/sfc-external-sram
+       patches.xen/tmem
 
        # bulk stuff, new files for xen
        patches.xen/xen3-auto-xen-arch.diff
@@ -2377,42 +1649,10 @@
        # fixups due to upstream Xen parts
        patches.xen/xen3-fixup-xen
 
-       patches.xen/sfc-sync-headers
+       patches.xen/sfc-set-arch
+       patches.xen/sfc-endianness
 
        # newer changeset backports
-       patches.xen/735-balloon-exit.patch
-       patches.xen/737-kexec-free.patch
-       patches.xen/740-blkback-resource-leak.patch
-       patches.xen/746-pirq-status-page.patch
-       patches.xen/747-x86-undo-mfn-limit.patch
-       patches.xen/748-x86-ioapic-cleanup.patch
-       patches.xen/761-highpte.patch
-       patches.xen/762-xencons-hvc.patch
-       patches.xen/764-netback-foreign-pages.patch
-       patches.xen/769-evtchn-CPU-offline.patch
-       patches.xen/781-fbfront-bogus-rect.patch
-       patches.xen/782-netback-error-handling.patch
-       patches.xen/791-x86-pcifront-register-pirq.patch
-       patches.xen/797-pirq-range-check.patch
-       patches.xen/801-pciback-no-pci_match_id.patch
-       patches.xen/803-netfront-unregister-notifier.patch
-       patches.xen/805-blkfront-map-sg.patch
-       patches.xen/821-xenbus-state-strings.patch
-       patches.xen/832-ntp-interaction.patch
-       patches.xen/844-swiotlb-alloc.patch
-       patches.xen/848-sfc-vif-states-lock.patch
-       patches.xen/849-sfc-tx-skb-lock.patch
-       patches.xen/863-blktap-vma-close.patch
-       patches.xen/870-i386-critical-section.patch
-       patches.xen/897-balloon-keep-trying.patch
-       patches.xen/899-kbuild-extmod.patch
-       patches.xen/914-dynamic-Cx-change.patch
-       patches.xen/932-edac.patch
-       patches.xen/933-usb-mon-dma.patch
-       patches.xen/941-xenbus-transaction-mutex.patch
-       patches.xen/944-Dell-RBU.patch
-       patches.xen/945-MSI-disable-check.patch
-       patches.xen/958-fbfront-resume.patch
 
        # changes outside arch/{i386,x86_64}/xen
        patches.xen/xen3-fixup-kconfig
@@ -2430,81 +1670,70 @@
        patches.xen/xen3-patch-2.6.25
        patches.xen/xen3-patch-2.6.26
        patches.xen/xen3-patch-2.6.27
-       patches.xen/xen3-patch-2.6.27.1-2
-       patches.xen/xen3-patch-2.6.27.3-4
-       patches.xen/xen3-patch-2.6.27.4-5
-       patches.xen/xen3-patch-2.6.27.5-6
-       patches.xen/xen3-patch-2.6.27.7-8
-       patches.xen/xen3-patch-2.6.27.8-9
-       patches.xen/xen3-patch-2.6.27.9-10
-       patches.xen/xen3-patch-2.6.27.11-12
-       patches.xen/xen3-patch-2.6.27.14-15
-       patches.xen/xen3-patch-2.6.27.15-16
-       patches.xen/xen3-patch-2.6.27.18-19
-       patches.kabi/xen3-patch-2.6.27.18-19
-       patches.xen/xen3-patch-2.6.27.19-20
-       patches.xen/xen3-patch-2.6.27.24-25
-       patches.xen/xen3-patch-2.6.27.25-26
-       patches.xen/xen3-patch-2.6.27.36-37
-       patches.xen/xen3-patch-2.6.27.38-39
+       patches.xen/xen3-patch-2.6.28
+       patches.xen/xen3-patch-2.6.29
+       patches.xen/xen3-patch-2.6.30
+       patches.xen/xen3-patch-2.6.31
+       patches.xen/xen3-patch-2.6.32
+       patches.xen/xen3-patch-2.6.32.1-2
+       patches.xen/xen3-patch-2.6.32.2-3
+       patches.xen/xen3-patch-2.6.32.3-4
+       patches.xen/xen3-patch-2.6.32.7-8
+       patches.xen/xen3-patch-2.6.32.8-9
        patches.xen/xen3-seccomp-disable-tsc-option
-       patches.xen/xen3-rwlocks-enable-interrupts
-       patches.xen/xen3-x86-fix-nodac
+       patches.xen/xen3-fix_clock_gettime_vsyscall_time_warp.diff
        patches.xen/xen3-x86-mcp51-no-dac
-       patches.xen/xen3-remove_kernel_physical_mapping_init_from_init
+       patches.xen/xen3-x86-64-preserve-large-page-mapping-for-1st-2mb-kernel-txt-with-config_debug_rodata
+       patches.xen/xen3-x86-64-align-rodata-kernel-section-to-2mb-with-config_debug_rodata
        patches.xen/xen3-x86-mark_rodata_rw.patch
-+npiggin patches.xen/xen3-x86-mark_rodata_rw-2.patch
-       patches.xen/xen3-x86-pageattr-pmd-permission-fix.patch
-       patches.xen/xen3-x86-usb-debug-port-early-console-v4.patch
-       patches.xen/xen3-x2APIC_PATCH_20_of_41_cff73a6ffaed726780b001937d2a42efde553922
-       patches.xen/xen3-x2APIC_PATCH_27_of_41_9fa8c481b55e80edd8c637573f87853bb6b600f5
-       patches.xen/xen3-x2APIC_PATCH_40_of_41_bbb65d2d365efe9951290e61678dcf81ec60add4
-       patches.xen/xen3-bug-531260-x86-pci-insert-ioapic-resource-before-assigning-unassigned-resources.patch
-       patches.xen/xen3-x86_sgi_cpus4096-02-fix-send_call_func_ip.patch
-       patches.xen/xen3-x86_sgi_cpus4096-05-update-send_IPI_mask.patch
-       patches.xen/xen3-uv_setup_irq.diff
-       patches.xen/xen3-x86-vmware-tsc-03-detect-from-hypervisor
-       patches.xen/xen3-x86-fix-kmap-contig.patch
-+andrea        patches.xen/xen3-silent-stack-overflow
-       patches.xen/xen3-acpi_assure_unique_processor_proc_creation.patch
-       patches.kabi/xen3-e1000e_Export_set_memory_ro-rw
-       patches.xen/xen3-x86_sgi_uv_early_detect_oem.patch
-       patches.xen/xen3-intel-ibex-peak-device-ids.patch
-       patches.xen/xen3-add-via-chrome9-drm-support.patch
-       patches.xen/xen3-acpi-pci-pci-msi-_osc-support-capabilities-called-when-root-bridge-added.patch
-       patches.xen/xen3-sysfs-crash-debugging.patch
+       patches.xen/xen3-x86-ftrace-fix-rodata-1.patch
+       patches.xen/xen3-x86-ftrace-fix-rodata-3.patch
+       patches.xen/xen3-x86-Remove-CPU-cache-size-output-for-non-Intel-too.patch
+       patches.xen/xen3-x86-cpu-mv-display_cacheinfo-cpu_detect_cache_sizes.patch
+       patches.xen/xen3-x86-Limit-the-number-of-processor-bootup-messages.patch
+       patches.xen/xen3-x86_irq_setup_extra_ioapic_for_sci.patch
+       patches.xen/xen3-x86_64_apic_consider_hotplug_for_mode_logical_flat.patch
+       patches.xen/xen3-x86_ioapic_fix_out_of_order_gsi.patch
+       patches.xen/xen3-bug-561933_uv_pat_is_gru_range.patch
+       patches.xen/xen3-x86-Fix-sched_clock_cpu-for-systems-with-unsynchronized-TSC.patch
+       patches.xen/xen3-x86-Unify-fixup_irqs-for-32-bit-and-64-bit-kernels.patch
+       patches.xen/xen3-x86-intr-remap-Avoid-irq_chip-mask-unmask-in-fixup_irqs-for-intr-remapping.patch
+       patches.xen/xen3-x86-Remove-local_irq_enable-local_irq_disable-in-fixup_irqs.patch
+       patches.xen/xen3-vmw_pvscsi-scsi-driver-for-vmware-s-virtual-hba.patch
+       patches.xen/xen3-add-support-for-intel-cougar-point-chipset.patch
        patches.xen/xen3-kdb-x86
        patches.xen/xen3-stack-unwind
        patches.xen/xen3-x86_64-unwind-annotations
-       patches.xen/xen3-perfmon2.patch
-       patches.xen/xen3-perfmon2-remove_syscalls.patch
-       patches.xen/xen3-panic-on-io-nmi.diff
 
        # bugfixes and enhancements
        patches.xen/xen-balloon-max-target
-       patches.xen/xen-balloon-accounting
        patches.xen/xen-modular-blktap
        patches.xen/xen-blkback-bimodal-suse
        patches.xen/xen-blkif-protocol-fallback-hack
        patches.xen/xen-blkback-cdrom
        patches.xen/xen-blktap-write-barriers
-       patches.xen/xen-scsifront-block-timeout-update
        patches.xen/xen-op-packet
        patches.xen/xen-blkfront-cdrom
+       patches.xen/xen-vbd-resize
        patches.xen/xen-sections
        patches.xen/xen-swiotlb-heuristics
-       patches.xen/xen-kconfig-compat-3.2.0
+       patches.xen/xen-kconfig-compat
        patches.xen/xen-cpufreq-report
-       patches.xen/xen-rt2860-build
+       patches.xen/xen-staging-build
        patches.xen/xen-sysdev-suspend
        patches.xen/xen-ipi-per-cpu-irq
        patches.xen/xen-virq-per-cpu-irq
+       patches.xen/xen-spinlock-poll-early
        patches.xen/xen-configurable-guest-devices
        patches.xen/xen-netback-nr-irqs
        patches.xen/xen-netback-notify-multi
-       patches.xen/xen-S3-MSI
-       patches.xen/xen-blktap-vma-close-fix
+       patches.xen/xen-netback-generalize
+       patches.xen/xen-netback-multiple-tasklets
+       patches.xen/xen-netback-kernel-threads
+       patches.xen/xen-usbfront-schedule
+       patches.xen/xen-unpriv-build
        patches.xen/xen-dcdbas
+       patches.xen/xen-floppy
        patches.xen/xen-x86-panic-no-reboot
        patches.xen/xen-x86-dcr-fallback
        patches.xen/xen-x86-consistent-nmi
@@ -2512,12 +1741,11 @@
        patches.xen/xen-x86-pmd-handling
        patches.xen/xen-x86-bigmem
        patches.xen/xen-x86-machphys-prediction
-       patches.xen/xen-x86-no-lazy-tlb
        patches.xen/xen-x86-exit-mmap
-       patches.xen/xen-x86-exports
-       patches.xen/xen-i386-panic-on-oops
+       patches.xen/xen-x86-per-cpu-vcpu-info
+       patches.xen/xen-x86-xtime-lock
+       patches.xen/xen-x86-time-per-cpu
        patches.xen/xen-x86_64-pgd-pin
        patches.xen/xen-x86_64-pgd-alloc-order
        patches.xen/xen-x86_64-dump-user-pgt
        patches.xen/xen-x86_64-note-init-p2m
-       patches.kabi/xen-x86_64-note-init-p2m