Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

2026-04-10 11:05:54 +02:00 · 2008-07-25 21:02:35 +00:00
parent cab84d3ab8 683beb54de
commit 2c4512303e
44 changed files with 8586 additions and 218198 deletions
--- a/config/grub/grub.conf
+++ b/config/grub/grub.conf
@@ -6,41 +6,41 @@ background = ffffff
 splashimage (hd0,0)/grub/ipfire.xpm.gz
 title IPFire
  root (hd0,0)
-  kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 MOUNT
-  initrd /ipfirerd-KVER.img
+  kernel /vmlinuz-KVER-ipfire-smp root=ROOT rootdelay=10 panic=10 MOUNT
+  initrd /ipfirerd-KVER-smp.img
  savedefault 0
 title IPFire (vesafb 1024x768)
  root (hd0,0)
-  kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 vga=791 MOUNT
-  initrd /ipfirerd-KVER.img
+  kernel /vmlinuz-KVER-ipfire-smp root=ROOT rootdelay=10 panic=10 vga=791 MOUNT
+  initrd /ipfirerd-KVER-smp.img
  savedefault 1
 title IPFire (acpi=off)
  root (hd0,0)
-  kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 acpi=off MOUNT
-  initrd /ipfirerd-KVER.img
+  kernel /vmlinuz-KVER-ipfire-smp root=ROOT rootdelay=10 panic=10 acpi=off MOUNT
+  initrd /ipfirerd-KVER-smp.img
  savedefault 2
 title IPFire (vesafb 1024x768, acpi=off)
-  root (hd0,0)
-  kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 vga=791 acpi=off MOUNT
-  initrd /ipfirerd-KVER.img
-  savedefault 3
-title IPFire SMP/HT
-  root (hd0,0)
-  kernel /vmlinuz-KVER-ipfire-smp root=ROOT rootdelay=10 panic=10 MOUNT
-  initrd /ipfirerd-KVER-smp.img
-  savedefault 4
-title IPFire SMP/HT (vesafb 1024x768)
-  root (hd0,0)
-  kernel /vmlinuz-KVER-ipfire-smp root=ROOT rootdelay=10 panic=10 vga=791 MOUNT
-  initrd /ipfirerd-KVER-smp.img
-  savedefault 5
-title IPFire SMP/HT (acpi=off)
-  root (hd0,0)
-  kernel /vmlinuz-KVER-ipfire-smp root=ROOT rootdelay=10 panic=10 acpi=off MOUNT
-  initrd /ipfirerd-KVER-smp.img
-  savedefault 6
-title IPFire SMP/HT (vesafb 1024x768, acpi=off)
  root (hd0,0)
  kernel /vmlinuz-KVER-ipfire-smp root=ROOT rootdelay=10 panic=10 vga=791 acpi=off MOUNT
  initrd /ipfirerd-KVER-smp.img
+  savedefault 3
+title IPFire SMP/HT disabled
+  root (hd0,0)
+  kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 MOUNT
+  initrd /ipfirerd-KVER.img
+  savedefault 4
+title IPFire SMP/HT disabled (vesafb 1024x768)
+  root (hd0,0)
+  kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 vga=791 MOUNT
+  initrd /ipfirerd-KVER.img
+  savedefault 5
+title IPFire SMP/HT disabled (acpi=off)
+  root (hd0,0)
+  kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 acpi=off MOUNT
+  initrd /ipfirerd-KVER.img
+  savedefault 6
+title IPFire SMP/HT disabled (vesafb 1024x768, acpi=off)
+  root (hd0,0)
+  kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 vga=791 acpi=off MOUNT
+  initrd /ipfirerd-KVER.img
  savedefault 7
--- a/config/install/rc
+++ b/config/install/rc
@@ -32,11 +32,6 @@ ln -s /proc/kcore /dev/core
 echo "Starting syslogd"
 syslogd -O /dev/tty4

-echo "Loading scsi_mod & libata"
-/sbin/modprobe scsi_mod
-/sbin/modprobe libata
-
-sleep 1
 echo "Starting udev daemon"
 /sbin/udevd --daemon
 /sbin/udevtrigger
@@ -47,6 +42,5 @@ for file in /dev/.udev/failed/*/uevent ; do
 	echo "add" >"${file}"
 done 2>/dev/null
 /sbin/udevsettle
-sleep 2

 echo "Loading Installer..."
--- a/config/kernel/kernel.config.i586
+++ b/config/kernel/kernel.config.i586
@@ -1,13 +1,14 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.23.17-ipfire
-# Thu Jul 17 11:24:36 2008
+# Sat Jul 19 07:10:03 2008
 #
 CONFIG_X86_32=y
 CONFIG_GENERIC_TIME=y
 CONFIG_GENERIC_CMOS_UPDATE=y
 CONFIG_CLOCKSOURCE_WATCHDOG=y
 CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_SEMAPHORE_SLEEPERS=y
@@ -28,6 +29,7 @@ CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
+CONFIG_LOCK_KERNEL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
@@ -41,7 +43,7 @@ CONFIG_POSIX_MQUEUE=y
 CONFIG_AUDIT=y
 CONFIG_AUDITSYSCALL=y
 # CONFIG_IKCONFIG is not set
-CONFIG_LOG_BUF_SHIFT=14
+CONFIG_LOG_BUF_SHIFT=15
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
 CONFIG_BLK_DEV_INITRD=y
@@ -99,9 +101,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 #
 # Processor type and features
 #
-CONFIG_TICK_ONESHOT=y
+# CONFIG_TICK_ONESHOT is not set
 # CONFIG_NO_HZ is not set
-CONFIG_HIGH_RES_TIMERS=y
+# CONFIG_HIGH_RES_TIMERS is not set
 # CONFIG_SMP is not set
 CONFIG_X86_PC=y
 # CONFIG_X86_ELAN is not set
@@ -156,12 +158,17 @@ CONFIG_X86_INTEL_USERCOPY=y
 CONFIG_X86_MINIMUM_CPU_FAMILY=4
 CONFIG_HPET_TIMER=y
 CONFIG_HPET_EMULATE_RTC=y
-CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_NONE is not set
 # CONFIG_PREEMPT_VOLUNTARY is not set
-# CONFIG_PREEMPT is not set
-# CONFIG_X86_UP_APIC is not set
+CONFIG_PREEMPT=y
+CONFIG_PREEMPT_BKL=y
+CONFIG_X86_UP_APIC=y
+CONFIG_X86_UP_IOAPIC=y
+CONFIG_X86_LOCAL_APIC=y
+CONFIG_X86_IO_APIC=y
 CONFIG_X86_MCE=y
 CONFIG_X86_MCE_NONFATAL=m
+CONFIG_X86_MCE_P4THERMAL=y
 CONFIG_VM86=y
 # CONFIG_TOSHIBA is not set
 # CONFIG_I8K is not set
@@ -255,7 +262,7 @@ CONFIG_ACPI_CONTAINER=m
 CONFIG_APM=m
 CONFIG_APM_IGNORE_USER_SUSPEND=y
 # CONFIG_APM_DO_ENABLE is not set
-# CONFIG_APM_CPU_IDLE is not set
+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
@@ -316,7 +323,9 @@ CONFIG_PCI_DIRECT=y
 CONFIG_PCI_MMCONFIG=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCIEAER=y
-# CONFIG_ARCH_SUPPORTS_MSI is not set
+CONFIG_ARCH_SUPPORTS_MSI=y
+# CONFIG_PCI_MSI is not set
+CONFIG_HT_IRQ=y
 CONFIG_ISA_DMA_API=y
 CONFIG_ISA=y
 CONFIG_EISA=y
@@ -881,8 +890,8 @@ CONFIG_BLK_DEV_NBD=m
 CONFIG_BLK_DEV_SX8=m
 # CONFIG_BLK_DEV_UB is not set
 CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=8192
+CONFIG_BLK_DEV_RAM_COUNT=8
+CONFIG_BLK_DEV_RAM_SIZE=16384
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_CDROM_PKTCDVD is not set
 CONFIG_ATA_OVER_ETH=m
@@ -922,7 +931,7 @@ CONFIG_IDE_PROC_FS=y
 #
 CONFIG_IDE_GENERIC=m
 CONFIG_BLK_DEV_CMD640=y
-# CONFIG_BLK_DEV_CMD640_ENHANCED is not set
+CONFIG_BLK_DEV_CMD640_ENHANCED=y
 CONFIG_BLK_DEV_IDEPNP=y
 CONFIG_BLK_DEV_IDEPCI=y
 CONFIG_IDEPCI_SHARE_IRQ=y
@@ -1234,7 +1243,7 @@ CONFIG_IEEE1394=m
 #
 # Controllers
 #
-# CONFIG_IEEE1394_PCILYNX is not set
+CONFIG_IEEE1394_PCILYNX=m
 CONFIG_IEEE1394_OHCI1394=m

 #
@@ -1416,12 +1425,7 @@ CONFIG_NETXEN_NIC=m
 #
 # Wireless LAN
 #
-CONFIG_WLAN_PRE80211=y
-CONFIG_STRIP=m
-CONFIG_ARLAN=m
-CONFIG_WAVELAN=m
-CONFIG_PCMCIA_WAVELAN=m
-CONFIG_PCMCIA_NETWAVE=m
+# CONFIG_WLAN_PRE80211 is not set
 CONFIG_WLAN_80211=y
 CONFIG_PCMCIA_RAYCS=m
 CONFIG_IPW2100=m
@@ -1459,7 +1463,7 @@ CONFIG_HOSTAP_PLX=m
 CONFIG_HOSTAP_PCI=m
 CONFIG_HOSTAP_CS=m
 CONFIG_BCM43XX=m
-# CONFIG_BCM43XX_DEBUG is not set
+CONFIG_BCM43XX_DEBUG=y
 CONFIG_BCM43XX_DMA=y
 CONFIG_BCM43XX_PIO=y
 CONFIG_BCM43XX_DMA_AND_PIO_MODE=y
@@ -2041,9 +2045,112 @@ CONFIG_RADIO_ADAPTERS=y
 # CONFIG_RADIO_TYPHOON is not set
 # CONFIG_RADIO_ZOLTRIX is not set
 # CONFIG_USB_DSBR is not set
-# CONFIG_DVB_CORE is not set
+CONFIG_DVB_CORE=m
+# CONFIG_DVB_CORE_ATTACH is not set
+CONFIG_DVB_CAPTURE_DRIVERS=y
+
+#
+# Supported SAA7146 based PCI Adapters
+#
+# CONFIG_DVB_AV7110 is not set
+# CONFIG_DVB_BUDGET is not set
+# CONFIG_DVB_BUDGET_CI is not set
+# CONFIG_DVB_BUDGET_AV is not set
+
+#
+# Supported USB Adapters
+#
+# 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
+
+#
+# Supported FlexCopII (B2C2) Adapters
+#
+# CONFIG_DVB_B2C2_FLEXCOP is not set
+
+#
+# Supported BT878 Adapters
+#
+
+#
+# Supported Pluto2 Adapters
+#
+# CONFIG_DVB_PLUTO2 is not set
+
+#
+# Supported DVB Frontends
+#
+
+#
+# Customise DVB Frontends
+#
+# CONFIG_DVB_FE_CUSTOMISE is not set
+
+#
+# DVB-S (satellite) frontends
+#
+# CONFIG_DVB_STV0299 is not set
+# CONFIG_DVB_CX24110 is not set
+# CONFIG_DVB_CX24123 is not set
+# CONFIG_DVB_TDA8083 is not set
+# CONFIG_DVB_MT312 is not set
+# CONFIG_DVB_VES1X93 is not set
+# CONFIG_DVB_S5H1420 is not set
+# CONFIG_DVB_TDA10086 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_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
+
+#
+# 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
+
+#
+# Tuners/PLL support
+#
+# CONFIG_DVB_PLL is not set
+# CONFIG_DVB_TDA826X is not set
+# CONFIG_DVB_TDA827X is not set
+# CONFIG_DVB_TUNER_QT1010 is not set
+# CONFIG_DVB_TUNER_MT2060 is not set
+
+#
+# Miscellaneous devices
+#
+# CONFIG_DVB_LNBP21 is not set
+# CONFIG_DVB_ISL6421 is not set
+# CONFIG_DVB_TUA6100 is not set
 CONFIG_DAB=y
-# CONFIG_USB_DABUSB is not set
+CONFIG_USB_DABUSB=m

 #
 # Graphics support
@@ -2070,10 +2177,10 @@ CONFIG_FB_DDC=m
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
-CONFIG_FB_SYS_FILLRECT=m
-CONFIG_FB_SYS_COPYAREA=m
-CONFIG_FB_SYS_IMAGEBLIT=m
-CONFIG_FB_SYS_FOPS=m
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_SYS_FOPS is not set
 CONFIG_FB_DEFERRED_IO=y
 CONFIG_FB_SVGALIB=m
 # CONFIG_FB_MACMODES is not set
@@ -2088,12 +2195,12 @@ CONFIG_FB_CIRRUS=m
 CONFIG_FB_PM2=m
 CONFIG_FB_PM2_FIFO_DISCONNECT=y
 CONFIG_FB_CYBER2000=m
-CONFIG_FB_ARC=m
+# CONFIG_FB_ARC is not set
 CONFIG_FB_ASILIANT=y
-CONFIG_FB_IMSTT=y
+# CONFIG_FB_IMSTT is not set
 # CONFIG_FB_VGA16 is not set
 CONFIG_FB_VESA=y
-CONFIG_FB_HECUBA=m
+# CONFIG_FB_HECUBA is not set
 # CONFIG_FB_HGA is not set
 # CONFIG_FB_S1D13XXX is not set
 CONFIG_FB_NVIDIA=m
@@ -2329,7 +2436,7 @@ CONFIG_SND_VIA82XX_MODEM=m
 CONFIG_SND_VX222=m
 CONFIG_SND_YMFPCI=m
 CONFIG_SND_YMFPCI_FIRMWARE_IN_KERNEL=y
-# CONFIG_SND_AC97_POWER_SAVE is not set
+CONFIG_SND_AC97_POWER_SAVE=y

 #
 # USB devices
@@ -2448,12 +2555,52 @@ CONFIG_USB_STORAGE_KARMA=y
 #
 # USB port drivers
 #
-# CONFIG_USB_USS720 is not set
+CONFIG_USB_USS720=m

 #
 # USB Serial Converter support
 #
-# CONFIG_USB_SERIAL is not set
+CONFIG_USB_SERIAL=m
+# CONFIG_USB_SERIAL_GENERIC is not set
+CONFIG_USB_SERIAL_AIRCABLE=m
+CONFIG_USB_SERIAL_AIRPRIME=m
+CONFIG_USB_SERIAL_ARK3116=m
+CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_CP2101=m
+CONFIG_USB_SERIAL_CYPRESS_M8=m
+CONFIG_USB_SERIAL_EMPEG=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+# CONFIG_USB_SERIAL_FUNSOFT is not set
+# CONFIG_USB_SERIAL_VISOR is not set
+# CONFIG_USB_SERIAL_IPAQ is not set
+# CONFIG_USB_SERIAL_IR is not set
+CONFIG_USB_SERIAL_EDGEPORT=m
+# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
+CONFIG_USB_SERIAL_GARMIN=m
+CONFIG_USB_SERIAL_IPW=m
+# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
+# CONFIG_USB_SERIAL_KEYSPAN is not set
+# CONFIG_USB_SERIAL_KLSI is not set
+# CONFIG_USB_SERIAL_KOBIL_SCT is not set
+CONFIG_USB_SERIAL_MCT_U232=m
+CONFIG_USB_SERIAL_MOS7720=m
+CONFIG_USB_SERIAL_MOS7840=m
+# CONFIG_USB_SERIAL_NAVMAN is not set
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_SERIAL_OTI6858=m
+CONFIG_USB_SERIAL_HP4X=m
+CONFIG_USB_SERIAL_SAFE=m
+# CONFIG_USB_SERIAL_SAFE_PADDED is not set
+CONFIG_USB_SERIAL_SIERRAWIRELESS=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_DEBUG is not set
+CONFIG_USB_EZUSB=y

 #
 # USB Miscellaneous drivers
@@ -2814,6 +2961,8 @@ CONFIG_UNUSED_SYMBOLS=y
 # CONFIG_DEBUG_KERNEL is not set
 CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_EARLY_PRINTK=y
+CONFIG_X86_FIND_SMP_CONFIG=y
+CONFIG_X86_MPPARSE=y
 CONFIG_DOUBLEFAULT=y

 #
--- a/config/kernel/kernel.config.i586.smp
+++ b/config/kernel/kernel.config.i586.smp
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.23.17
-# Wed Jul 16 13:41:42 2008
+# Linux kernel version: 2.6.23.17-ipfire
+# Sat Jul 19 07:10:44 2008
 #
 CONFIG_X86_32=y
 CONFIG_GENERIC_TIME=y
@@ -42,7 +42,7 @@ CONFIG_POSIX_MQUEUE=y
 CONFIG_AUDIT=y
 CONFIG_AUDITSYSCALL=y
 # CONFIG_IKCONFIG is not set
-CONFIG_LOG_BUF_SHIFT=14
+CONFIG_LOG_BUF_SHIFT=15
 # CONFIG_CPUSETS is not set
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
@@ -102,9 +102,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 #
 # Processor type and features
 #
-CONFIG_TICK_ONESHOT=y
+# CONFIG_TICK_ONESHOT is not set
 # CONFIG_NO_HZ is not set
-CONFIG_HIGH_RES_TIMERS=y
+# CONFIG_HIGH_RES_TIMERS is not set
 CONFIG_SMP=y
 CONFIG_X86_PC=y
 # CONFIG_X86_ELAN is not set
@@ -268,7 +268,7 @@ CONFIG_ACPI_CONTAINER=m
 CONFIG_APM=m
 CONFIG_APM_IGNORE_USER_SUSPEND=y
 # CONFIG_APM_DO_ENABLE is not set
-# CONFIG_APM_CPU_IDLE is not set
+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
@@ -895,8 +895,8 @@ CONFIG_BLK_DEV_NBD=m
 CONFIG_BLK_DEV_SX8=m
 # CONFIG_BLK_DEV_UB is not set
 CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=8192
+CONFIG_BLK_DEV_RAM_COUNT=8
+CONFIG_BLK_DEV_RAM_SIZE=16384
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_CDROM_PKTCDVD is not set
 CONFIG_ATA_OVER_ETH=m
@@ -936,7 +936,7 @@ CONFIG_IDE_PROC_FS=y
 #
 CONFIG_IDE_GENERIC=m
 CONFIG_BLK_DEV_CMD640=y
-# CONFIG_BLK_DEV_CMD640_ENHANCED is not set
+CONFIG_BLK_DEV_CMD640_ENHANCED=y
 CONFIG_BLK_DEV_IDEPNP=y
 CONFIG_BLK_DEV_IDEPCI=y
 CONFIG_IDEPCI_SHARE_IRQ=y
@@ -1247,7 +1247,7 @@ CONFIG_IEEE1394=m
 #
 # Controllers
 #
-# CONFIG_IEEE1394_PCILYNX is not set
+CONFIG_IEEE1394_PCILYNX=m
 CONFIG_IEEE1394_OHCI1394=m

 #
@@ -1427,12 +1427,7 @@ CONFIG_NETXEN_NIC=m
 #
 # Wireless LAN
 #
-CONFIG_WLAN_PRE80211=y
-CONFIG_STRIP=m
-CONFIG_ARLAN=m
-CONFIG_WAVELAN=m
-CONFIG_PCMCIA_WAVELAN=m
-CONFIG_PCMCIA_NETWAVE=m
+# CONFIG_WLAN_PRE80211 is not set
 CONFIG_WLAN_80211=y
 CONFIG_PCMCIA_RAYCS=m
 CONFIG_IPW2100=m
@@ -1470,7 +1465,7 @@ CONFIG_HOSTAP_PLX=m
 CONFIG_HOSTAP_PCI=m
 CONFIG_HOSTAP_CS=m
 CONFIG_BCM43XX=m
-# CONFIG_BCM43XX_DEBUG is not set
+CONFIG_BCM43XX_DEBUG=y
 CONFIG_BCM43XX_DMA=y
 CONFIG_BCM43XX_PIO=y
 CONFIG_BCM43XX_DMA_AND_PIO_MODE=y
@@ -2051,9 +2046,112 @@ CONFIG_RADIO_ADAPTERS=y
 # CONFIG_RADIO_TYPHOON is not set
 # CONFIG_RADIO_ZOLTRIX is not set
 # CONFIG_USB_DSBR is not set
-# CONFIG_DVB_CORE is not set
+CONFIG_DVB_CORE=m
+# CONFIG_DVB_CORE_ATTACH is not set
+CONFIG_DVB_CAPTURE_DRIVERS=y
+
+#
+# Supported SAA7146 based PCI Adapters
+#
+# CONFIG_DVB_AV7110 is not set
+# CONFIG_DVB_BUDGET is not set
+# CONFIG_DVB_BUDGET_CI is not set
+# CONFIG_DVB_BUDGET_AV is not set
+
+#
+# Supported USB Adapters
+#
+# 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
+
+#
+# Supported FlexCopII (B2C2) Adapters
+#
+# CONFIG_DVB_B2C2_FLEXCOP is not set
+
+#
+# Supported BT878 Adapters
+#
+
+#
+# Supported Pluto2 Adapters
+#
+# CONFIG_DVB_PLUTO2 is not set
+
+#
+# Supported DVB Frontends
+#
+
+#
+# Customise DVB Frontends
+#
+# CONFIG_DVB_FE_CUSTOMISE is not set
+
+#
+# DVB-S (satellite) frontends
+#
+# CONFIG_DVB_STV0299 is not set
+# CONFIG_DVB_CX24110 is not set
+# CONFIG_DVB_CX24123 is not set
+# CONFIG_DVB_TDA8083 is not set
+# CONFIG_DVB_MT312 is not set
+# CONFIG_DVB_VES1X93 is not set
+# CONFIG_DVB_S5H1420 is not set
+# CONFIG_DVB_TDA10086 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_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
+
+#
+# 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
+
+#
+# Tuners/PLL support
+#
+# CONFIG_DVB_PLL is not set
+# CONFIG_DVB_TDA826X is not set
+# CONFIG_DVB_TDA827X is not set
+# CONFIG_DVB_TUNER_QT1010 is not set
+# CONFIG_DVB_TUNER_MT2060 is not set
+
+#
+# Miscellaneous devices
+#
+# CONFIG_DVB_LNBP21 is not set
+# CONFIG_DVB_ISL6421 is not set
+# CONFIG_DVB_TUA6100 is not set
 CONFIG_DAB=y
-# CONFIG_USB_DABUSB is not set
+CONFIG_USB_DABUSB=m

 #
 # Graphics support
@@ -2080,10 +2178,10 @@ CONFIG_FB_DDC=m
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
-CONFIG_FB_SYS_FILLRECT=m
-CONFIG_FB_SYS_COPYAREA=m
-CONFIG_FB_SYS_IMAGEBLIT=m
-CONFIG_FB_SYS_FOPS=m
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_SYS_FOPS is not set
 CONFIG_FB_DEFERRED_IO=y
 CONFIG_FB_SVGALIB=m
 # CONFIG_FB_MACMODES is not set
@@ -2098,12 +2196,12 @@ CONFIG_FB_CIRRUS=m
 CONFIG_FB_PM2=m
 CONFIG_FB_PM2_FIFO_DISCONNECT=y
 CONFIG_FB_CYBER2000=m
-CONFIG_FB_ARC=m
+# CONFIG_FB_ARC is not set
 CONFIG_FB_ASILIANT=y
-CONFIG_FB_IMSTT=y
+# CONFIG_FB_IMSTT is not set
 # CONFIG_FB_VGA16 is not set
 CONFIG_FB_VESA=y
-CONFIG_FB_HECUBA=m
+# CONFIG_FB_HECUBA is not set
 # CONFIG_FB_HGA is not set
 # CONFIG_FB_S1D13XXX is not set
 CONFIG_FB_NVIDIA=m
@@ -2339,7 +2437,7 @@ CONFIG_SND_VIA82XX_MODEM=m
 CONFIG_SND_VX222=m
 CONFIG_SND_YMFPCI=m
 CONFIG_SND_YMFPCI_FIRMWARE_IN_KERNEL=y
-# CONFIG_SND_AC97_POWER_SAVE is not set
+CONFIG_SND_AC97_POWER_SAVE=y

 #
 # USB devices
@@ -2458,12 +2556,52 @@ CONFIG_USB_STORAGE_KARMA=y
 #
 # USB port drivers
 #
-# CONFIG_USB_USS720 is not set
+CONFIG_USB_USS720=m

 #
 # USB Serial Converter support
 #
-# CONFIG_USB_SERIAL is not set
+CONFIG_USB_SERIAL=m
+# CONFIG_USB_SERIAL_GENERIC is not set
+CONFIG_USB_SERIAL_AIRCABLE=m
+CONFIG_USB_SERIAL_AIRPRIME=m
+CONFIG_USB_SERIAL_ARK3116=m
+CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_CP2101=m
+CONFIG_USB_SERIAL_CYPRESS_M8=m
+CONFIG_USB_SERIAL_EMPEG=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+# CONFIG_USB_SERIAL_FUNSOFT is not set
+# CONFIG_USB_SERIAL_VISOR is not set
+# CONFIG_USB_SERIAL_IPAQ is not set
+# CONFIG_USB_SERIAL_IR is not set
+CONFIG_USB_SERIAL_EDGEPORT=m
+# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
+CONFIG_USB_SERIAL_GARMIN=m
+CONFIG_USB_SERIAL_IPW=m
+# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
+# CONFIG_USB_SERIAL_KEYSPAN is not set
+# CONFIG_USB_SERIAL_KLSI is not set
+# CONFIG_USB_SERIAL_KOBIL_SCT is not set
+CONFIG_USB_SERIAL_MCT_U232=m
+CONFIG_USB_SERIAL_MOS7720=m
+CONFIG_USB_SERIAL_MOS7840=m
+# CONFIG_USB_SERIAL_NAVMAN is not set
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_SERIAL_OTI6858=m
+CONFIG_USB_SERIAL_HP4X=m
+CONFIG_USB_SERIAL_SAFE=m
+# CONFIG_USB_SERIAL_SAFE_PADDED is not set
+CONFIG_USB_SERIAL_SIERRAWIRELESS=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_DEBUG is not set
+CONFIG_USB_EZUSB=y

 #
 # USB Miscellaneous drivers
--- a/config/rootfiles/cdrom_corever
+++ b/config/rootfiles/cdrom_corever
@@ -1 +1,2 @@
-15
+16
+
--- a/config/rootfiles/common/initscripts
+++ b/config/rootfiles/common/initscripts
@@ -9,6 +9,7 @@ etc/rc.d/init.d/apache
 #etc/rc.d/init.d/applejuice
 etc/rc.d/init.d/beep
 etc/rc.d/init.d/checkfs
+etc/rc.d/init.d/checkfstab
 #etc/rc.d/init.d/clamav
 etc/rc.d/init.d/cleanfs
 etc/rc.d/init.d/connectd
@@ -123,6 +124,7 @@ etc/rc.d/rc6.d/S99reboot
 etc/rc.d/rcsysinit.d/S00mountkernfs
 etc/rc.d/rcsysinit.d/S05modules
 etc/rc.d/rcsysinit.d/S10udev
+etc/rc.d/rcsysinit.d/S19checkfstab
 etc/rc.d/rcsysinit.d/S20swap
 etc/rc.d/rcsysinit.d/S30checkfs
 etc/rc.d/rcsysinit.d/S40mountfs
--- a/config/rootfiles/common/wireless
+++ b/config/rootfiles/common/wireless
@@ -1,7 +1,7 @@
 #usr/include/iwlib.h
 #usr/include/wireless.h
-usr/lib/libiw.so
-usr/lib/libiw.so.28
+#usr/lib/libiw.so
+#usr/lib/libiw.so.28
 #usr/man/man5/iftab.5
 #usr/man/man7/wireless.7
 #usr/man/man8/ifrename.8
--- a/config/rootfiles/core/15/files
+++ b/config/rootfiles/core/15/files
@@ -0,0 +1 @@
+usr/sbin/dnsmasq
--- a/config/rootfiles/core/15/meta
+++ b/config/rootfiles/core/15/meta
--- a/config/rootfiles/core/15/update.sh
+++ b/config/rootfiles/core/15/update.sh
--- a/config/rootfiles/core/16/files
+++ b/config/rootfiles/core/16/files
--- a/config/rootfiles/updater/filelists/core16
+++ b/config/rootfiles/updater/filelists/core16
@@ -20,3 +20,5 @@ bin/ntfs-3g
 lib/libntfs-3g.so
 lib/libntfs-3g.so.31
 lib/libntfs-3g.so.31.0.0
+etc/rc.d/init.d/checkfstab
+etc/rc.d/rcsysinit.d/S19checkfstab
--- a/config/rootfiles/updater/filelists/dnsmasq
+++ b/config/rootfiles/updater/filelists/dnsmasq
@@ -0,0 +1,2 @@
+usr/sbin/dnsmasq
+#usr/share/man/man8/dnsmasq.8
--- a/config/rootfiles/updater/filelists/hwdata
+++ b/config/rootfiles/updater/filelists/hwdata
@@ -0,0 +1,2 @@
+usr/share/hwdata/usb.ids
+usr/share/hwdata/pci.ids
--- a/config/rootfiles/updater/filelists/klibc
+++ b/config/rootfiles/updater/filelists/klibc
--- a/config/rootfiles/updater/filelists/setup
+++ b/config/rootfiles/updater/filelists/setup
@@ -0,0 +1,2 @@
+usr/local/sbin/setup
+bin/probenic.sh
--- a/config/rootfiles/updater/filelists/udev
+++ b/config/rootfiles/updater/filelists/udev
@@ -1,73 +0,0 @@
-etc/scsi_id.config
-etc/modprobe.d/blacklist
-etc/udev
-#etc/udev/rules.d
-#etc/udev/rules.d/05-udev-early.rules
-#etc/udev/rules.d/25-lfs.rules
-#etc/udev/rules.d/26-modprobe.rules
-#etc/udev/rules.d/27-firmware.rules
-#etc/udev/rules.d/60-persistent-storage.rules
-#etc/udev/rules.d/81-cdrom.rules
-#etc/udev/udev.conf
-lib/firmware
-lib/libvolume_id.so.0
-lib/libvolume_id.so.0.66.0
-lib/udev
-#lib/udev/ata_id
-#lib/udev/cdrom_id
-#lib/udev/create_floppy_devices
-#lib/udev/devices
-#lib/udev/devices/core
-#lib/udev/devices/fd
-#lib/udev/devices/null
-#lib/udev/devices/pts
-#lib/udev/devices/shm
-#lib/udev/devices/stderr
-#lib/udev/devices/stdin
-#lib/udev/devices/stdout
-#lib/udev/edd_id
-#lib/udev/firmware.sh
-#lib/udev/path_id
-#lib/udev/scsi_id
-#lib/udev/usb_id
-#lib/udev/vol_id
-sbin/scsi_id
-sbin/udevcontrol
-sbin/udevd
-sbin/udevsettle
-sbin/udevtrigger
-usr/bin/udevinfo
-usr/bin/udevtest
-#usr/include/libvolume_id.h
-#usr/lib/libvolume_id.a
-usr/lib/libvolume_id.so
-#usr/lib/pkgconfig/libvolume_id.pc
-usr/sbin/udevmonitor
-#usr/share/doc/udev-096
-#usr/share/doc/udev-096/index.html
-#usr/share/man/man7/udev.7
-#usr/share/man/man8/ata_id.8
-#usr/share/man/man8/cdrom_id.8
-#usr/share/man/man8/edd_id.8
-#usr/share/man/man8/scsi_id.8
-#usr/share/man/man8/udevcontrol.8
-#usr/share/man/man8/udevd.8
-#usr/share/man/man8/udevinfo.8
-#usr/share/man/man8/udevmonitor.8
-#usr/share/man/man8/udevsettle.8
-#usr/share/man/man8/udevtest.8
-#usr/share/man/man8/udevtrigger.8
-#usr/share/man/man8/vol_id.8
-lib/initcpio/hooks/udev
-lib/initcpio/install/udev
-#lib/initcpio/udev
-lib/initcpio/udev/cdrom_id
-lib/initcpio/udev/firmware.sh
-lib/initcpio/udev/load-modules.sh
-lib/initcpio/udev/start_udev
-lib/initcpio/udev/udev.rules
-lib/initcpio/udev/udevd
-lib/initcpio/udev/udevsettle
-lib/initcpio/udev/udevtrigger
-etc/udev/dvb.sh
-etc/udev/rules.d/10-dvb.rules
--- a/config/rootfiles/updater/filelists/wireless
+++ b/config/rootfiles/updater/filelists/wireless
@@ -0,0 +1,20 @@
+#usr/include/iwlib.h
+#usr/include/wireless.h
+#usr/lib/libiw.so
+#usr/lib/libiw.so.28
+#usr/man/man5/iftab.5
+#usr/man/man7/wireless.7
+#usr/man/man8/ifrename.8
+#usr/man/man8/iwconfig.8
+#usr/man/man8/iwevent.8
+#usr/man/man8/iwgetid.8
+#usr/man/man8/iwlist.8
+#usr/man/man8/iwpriv.8
+#usr/man/man8/iwspy.8
+usr/sbin/ifrename
+usr/sbin/iwconfig
+usr/sbin/iwevent
+usr/sbin/iwgetid
+usr/sbin/iwlist
+usr/sbin/iwpriv
+usr/sbin/iwspy
--- a/config/rootfiles/updater/update.sh
+++ b/config/rootfiles/updater/update.sh
@@ -40,9 +40,9 @@ echo
 #
 # check if we the backup file already exist
 if [ -e /var/ipfire/backup/update_$OLDVERSION-$NEWVERSION.tar.bz2 ]; then
-    echo Error! The backupfile of this update already exist!!!
-    echo Have you already installed this update?
-    exit 3
+    echo Moving backup to backup-old ...
+    mv -f /var/ipfire/backup/update_$OLDVERSION-$NEWVERSION.tar.bz2 \
+       /var/ipfire/backup/update_$OLDVERSION-$NEWVERSION-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 ...
@@ -109,11 +109,26 @@ rm -f /opt/pakfire/db/lists/*list.db
 echo IPFire v$NEWVERSION - www.ipfire.org > /etc/issue
 echo =================================== >> /etc/issue
 echo \\n running on \\s \\r \\m >> /etc/issue
-# Core 15 begin
+# Core 16 begin
 perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
 /etc/init.d/mISDN config
-# Core 15 end
-echo
-echo
-echo Update to IPFire $NEWVERSION finished. Please reboot...
+# Core 16 end
+#
+# Remove obsolete packages
+#
+echo '#!/bin/bash'                                        >  /tmp/remove_obsolete_paks 
+echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/remove_obsolete_paks
+echo '    sleep 2'                                        >> /tmp/remove_obsolete_paks
+echo 'done'                                               >> /tmp/remove_obsolete_paks
+echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do'   >> /tmp/remove_obsolete_paks
+echo '    sleep 2'                                        >> /tmp/remove_obsolete_paks
+echo 'done'                                               >> /tmp/remove_obsolete_paks
+echo '/opt/pakfire/pakfire remove zaptel -y'              >> /tmp/remove_obsolete_paks
+echo 'echo'                                               >> /tmp/remove_obsolete_paks
+echo 'echo Update to IPFire $NEWVERSION finished. Please reboot... ' >> /tmp/remove_obsolete_paks
+echo 'echo'                                               >> /tmp/remove_obsolete_paks
+chmod +x /tmp/remove_obsolete_paks
+/tmp/remove_obsolete_paks &
 echo
+echo Please wait until pakfire has ended...
+echo
--- a/config/v4l-dvb/config
+++ b/config/v4l-dvb/config
@@ -1,388 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Linux kernel version: 
-# Wed Jul  9 17:38:39 2008
-#
-CONFIG_INPUT=y
-CONFIG_USB=m
-# CONFIG_SPARC64 is not set
-CONFIG_FW_LOADER=m
-# CONFIG_of is not set
-# CONFIG_M is not set
-# CONFIG_PLAT_M32700UT is not set
-# CONFIG_GENERIC_GPIO is not set
-# CONFIG_SOUND_PRIME is not set
-# CONFIG_dependencies is not set
-CONFIG_FB_CFB_IMAGEBLIT=m
-# CONFIG_GPIO_PCA953X is not set
-# CONFIG_dependency is not set
-CONFIG_SND_MPU401_UART=m
-CONFIG_SND=m
-# CONFIG_BROKEN is not set
-# CONFIG_PPC_PMAC is not set
-# CONFIG_SPARC32 is not set
-CONFIG_I2C_ALGOBIT=m
-# CONFIG_IR is not set
-CONFIG_INET=y
-# CONFIG_SOUND_OSS is not set
-CONFIG_CRC32=m
-CONFIG_SYSFS=y
-CONFIG_ISA=y
-CONFIG_PCI=y
-CONFIG_PARPORT_1284=y
-CONFIG_FB_CFB_FILLRECT=m
-CONFIG_VIRT_TO_BUS=y
-CONFIG_PARPORT=m
-# CONFIG_Avoids is not set
-# CONFIG_due is not set
-CONFIG_NET=y
-CONFIG_FB_CFB_COPYAREA=m
-CONFIG_SND_AC97_CODEC=m
-# CONFIG_PXA27x is not set
-# CONFIG_SGI_IP22 is not set
-CONFIG_I2C=m
-CONFIG_HOTPLUG=y
-# CONFIG_STANDALONE is not set
-# CONFIG_Y is not set
-CONFIG_MODULES=y
-CONFIG_HAS_IOMEM=y
-CONFIG_SND_OPL3_LIB=m
-CONFIG_PROC_FS=y
-# CONFIG_DVB_FE_CUSTOMIZE is not set
-# CONFIG_to is not set
-# CONFIG_HAS_DMA is not set
-# CONFIG_pvrusb is not set
-CONFIG_FB=y
-CONFIG_DVB=y
-# CONFIG_SONY_LAPTOP is not set
-CONFIG_SND_PCM=m
-CONFIG_EXPERIMENTAL=y
-# CONFIG_M32R is not set
-# CONFIG_I2C_ALGO_SGI is not set
-# CONFIG_VIDEO_KERNEL_VERSION is not set
-
-#
-# Multimedia devices
-#
-
-#
-# Multimedia core support
-#
-CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_V4L2_COMMON=m
-CONFIG_VIDEO_ALLOW_V4L1=y
-CONFIG_VIDEO_V4L1_COMPAT=y
-CONFIG_DVB_CORE=m
-CONFIG_VIDEO_MEDIA=m
-
-#
-# Multimedia drivers
-#
-CONFIG_VIDEO_SAA7146=m
-CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_MEDIA_ATTACH=y
-CONFIG_MEDIA_TUNER=m
-CONFIG_MEDIA_TUNER_CUSTOMIZE=y
-CONFIG_MEDIA_TUNER_SIMPLE=m
-CONFIG_MEDIA_TUNER_TDA8290=m
-CONFIG_MEDIA_TUNER_TDA827X=m
-CONFIG_MEDIA_TUNER_TDA18271=m
-CONFIG_MEDIA_TUNER_TDA9887=m
-CONFIG_MEDIA_TUNER_TEA5761=m
-CONFIG_MEDIA_TUNER_TEA5767=m
-CONFIG_MEDIA_TUNER_MT20XX=m
-CONFIG_MEDIA_TUNER_MT2060=m
-CONFIG_MEDIA_TUNER_MT2266=m
-CONFIG_MEDIA_TUNER_MT2131=m
-CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=m
-CONFIG_MEDIA_TUNER_XC5000=m
-CONFIG_MEDIA_TUNER_MXL5005S=m
-CONFIG_VIDEO_V4L2=m
-CONFIG_VIDEO_V4L1=m
-CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_DMA_SG=m
-CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_VIDEOBUF_DVB=m
-CONFIG_VIDEO_BTCX=m
-CONFIG_VIDEO_IR_I2C=m
-CONFIG_VIDEO_IR=m
-CONFIG_VIDEO_TVEEPROM=m
-CONFIG_VIDEO_TUNER=m
-CONFIG_VIDEO_CAPTURE_DRIVERS=y
-# CONFIG_VIDEO_ADV_DEBUG is not set
-CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
-CONFIG_VIDEO_TVAUDIO=m
-CONFIG_VIDEO_TDA7432=m
-CONFIG_VIDEO_TDA9840=m
-CONFIG_VIDEO_TDA9875=m
-CONFIG_VIDEO_TEA6415C=m
-CONFIG_VIDEO_TEA6420=m
-CONFIG_VIDEO_MSP3400=m
-CONFIG_VIDEO_CS5345=m
-CONFIG_VIDEO_CS53L32A=m
-CONFIG_VIDEO_M52790=m
-CONFIG_VIDEO_WM8775=m
-CONFIG_VIDEO_WM8739=m
-CONFIG_VIDEO_VP27SMPX=m
-CONFIG_VIDEO_BT819=m
-CONFIG_VIDEO_BT856=m
-CONFIG_VIDEO_KS0127=m
-CONFIG_VIDEO_OV7670=m
-CONFIG_VIDEO_SAA7110=m
-CONFIG_VIDEO_SAA7111=m
-CONFIG_VIDEO_SAA7114=m
-CONFIG_VIDEO_SAA711X=m
-CONFIG_VIDEO_SAA717X=m
-CONFIG_VIDEO_TVP5150=m
-CONFIG_VIDEO_VPX3220=m
-CONFIG_VIDEO_CX25840=m
-CONFIG_VIDEO_CX2341X=m
-CONFIG_VIDEO_SAA7127=m
-CONFIG_VIDEO_SAA7185=m
-CONFIG_VIDEO_ADV7170=m
-CONFIG_VIDEO_ADV7175=m
-CONFIG_VIDEO_UPD64031A=m
-CONFIG_VIDEO_UPD64083=m
-# CONFIG_VIDEO_VIVI is not set
-CONFIG_VIDEO_BT848=m
-CONFIG_VIDEO_BT848_DVB=y
-CONFIG_VIDEO_SAA6588=m
-CONFIG_VIDEO_PMS=m
-CONFIG_VIDEO_BWQCAM=m
-CONFIG_VIDEO_CQCAM=m
-CONFIG_VIDEO_W9966=m
-CONFIG_VIDEO_CPIA=m
-CONFIG_VIDEO_CPIA_PP=m
-CONFIG_VIDEO_CPIA_USB=m
-CONFIG_VIDEO_CPIA2=m
-CONFIG_VIDEO_SAA5246A=m
-CONFIG_VIDEO_SAA5249=m
-CONFIG_TUNER_3036=m
-CONFIG_VIDEO_STRADIS=m
-CONFIG_VIDEO_ZORAN_ZR36060=m
-CONFIG_VIDEO_ZORAN=m
-CONFIG_VIDEO_ZORAN_BUZ=m
-CONFIG_VIDEO_ZORAN_DC10=m
-CONFIG_VIDEO_ZORAN_DC30=m
-CONFIG_VIDEO_ZORAN_LML33=m
-CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_ZORAN_AVS6EYES=m
-CONFIG_VIDEO_SAA7134=m
-CONFIG_VIDEO_SAA7134_ALSA=m
-CONFIG_VIDEO_SAA7134_DVB=m
-CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_DPC=m
-CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_CX88=m
-CONFIG_VIDEO_CX88_ALSA=m
-CONFIG_VIDEO_CX88_BLACKBIRD=m
-CONFIG_VIDEO_CX88_DVB=m
-CONFIG_VIDEO_CX88_VP3054=m
-CONFIG_VIDEO_CX23885=m
-CONFIG_VIDEO_AU0828=m
-CONFIG_VIDEO_IVTV=m
-CONFIG_VIDEO_FB_IVTV=m
-CONFIG_VIDEO_CX18=m
-CONFIG_VIDEO_CAFE_CCIC=m
-CONFIG_V4L_USB_DRIVERS=y
-CONFIG_USB_GSPCA=m
-CONFIG_VIDEO_PVRUSB2=m
-CONFIG_VIDEO_PVRUSB2_SYSFS=y
-CONFIG_VIDEO_PVRUSB2_DVB=y
-# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-CONFIG_VIDEO_EM28XX_DVB=m
-CONFIG_VIDEO_USBVISION=m
-CONFIG_VIDEO_USBVIDEO=m
-CONFIG_USB_VICAM=m
-CONFIG_USB_IBMCAM=m
-CONFIG_USB_KONICAWC=m
-CONFIG_USB_QUICKCAM_MESSENGER=m
-CONFIG_USB_ET61X251=m
-CONFIG_VIDEO_OVCAMCHIP=m
-CONFIG_USB_W9968CF=m
-CONFIG_USB_OV511=m
-CONFIG_USB_SE401=m
-CONFIG_USB_SN9C102=m
-CONFIG_USB_STV680=m
-CONFIG_USB_ZC0301=m
-CONFIG_USB_PWC=m
-# CONFIG_USB_PWC_DEBUG is not set
-CONFIG_USB_ZR364XX=m
-CONFIG_USB_S2255=m
-CONFIG_RADIO_ADAPTERS=y
-CONFIG_RADIO_CADET=m
-CONFIG_RADIO_RTRACK=m
-CONFIG_RADIO_RTRACK2=m
-CONFIG_RADIO_AZTECH=m
-CONFIG_RADIO_GEMTEK=m
-CONFIG_RADIO_GEMTEK_PCI=m
-CONFIG_RADIO_MAXIRADIO=m
-CONFIG_RADIO_MAESTRO=m
-CONFIG_RADIO_SF16FMI=m
-CONFIG_RADIO_SF16FMR2=m
-CONFIG_RADIO_TERRATEC=m
-CONFIG_RADIO_TRUST=m
-CONFIG_RADIO_TYPHOON=m
-CONFIG_RADIO_TYPHOON_PROC_FS=y
-CONFIG_RADIO_ZOLTRIX=m
-CONFIG_USB_DSBR=m
-CONFIG_USB_SI470X=m
-CONFIG_DVB_CAPTURE_DRIVERS=y
-
-#
-# Supported SAA7146 based PCI Adapters
-#
-CONFIG_TTPCI_EEPROM=m
-CONFIG_DVB_AV7110=m
-# CONFIG_DVB_AV7110_FIRMWARE is not set
-CONFIG_DVB_AV7110_OSD=y
-CONFIG_DVB_BUDGET_CORE=m
-CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_CI=m
-CONFIG_DVB_BUDGET_AV=m
-CONFIG_DVB_BUDGET_PATCH=m
-
-#
-# Supported USB Adapters
-#
-CONFIG_DVB_USB=m
-# CONFIG_DVB_USB_DEBUG is not set
-CONFIG_DVB_USB_A800=m
-CONFIG_DVB_USB_DIBUSB_MB=m
-CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
-CONFIG_DVB_USB_DIBUSB_MC=m
-CONFIG_DVB_USB_DIB0700=m
-CONFIG_DVB_USB_UMT_010=m
-CONFIG_DVB_USB_CXUSB=m
-CONFIG_DVB_USB_M920X=m
-CONFIG_DVB_USB_GL861=m
-CONFIG_DVB_USB_AU6610=m
-CONFIG_DVB_USB_DIGITV=m
-CONFIG_DVB_USB_VP7045=m
-CONFIG_DVB_USB_VP702X=m
-CONFIG_DVB_USB_GP8PSK=m
-CONFIG_DVB_USB_NOVA_T_USB2=m
-CONFIG_DVB_USB_TTUSB2=m
-CONFIG_DVB_USB_DTT200U=m
-CONFIG_DVB_USB_OPERA1=m
-CONFIG_DVB_USB_AF9005=m
-CONFIG_DVB_USB_AF9005_REMOTE=m
-CONFIG_DVB_USB_ANYSEE=m
-CONFIG_DVB_TTUSB_BUDGET=m
-CONFIG_DVB_TTUSB_DEC=m
-CONFIG_DVB_CINERGYT2=m
-# CONFIG_DVB_CINERGYT2_TUNING is not set
-
-#
-# Supported FlexCopII (B2C2) Adapters
-#
-CONFIG_DVB_B2C2_FLEXCOP=m
-CONFIG_DVB_B2C2_FLEXCOP_PCI=m
-CONFIG_DVB_B2C2_FLEXCOP_USB=m
-# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set
-
-#
-# Supported BT878 Adapters
-#
-CONFIG_DVB_BT8XX=m
-
-#
-# Supported Pluto2 Adapters
-#
-CONFIG_DVB_PLUTO2=m
-
-#
-# Supported DVB Frontends
-#
-
-#
-# Customise DVB Frontends
-#
-# CONFIG_DVB_FE_CUSTOMISE is not set
-
-#
-# DVB-S (satellite) frontends
-#
-CONFIG_DVB_CX24110=m
-CONFIG_DVB_CX24123=m
-CONFIG_DVB_MT312=m
-CONFIG_DVB_S5H1420=m
-CONFIG_DVB_STV0299=m
-CONFIG_DVB_TDA8083=m
-CONFIG_DVB_TDA10086=m
-CONFIG_DVB_VES1X93=m
-CONFIG_DVB_TUNER_ITD1000=m
-CONFIG_DVB_TDA826X=m
-CONFIG_DVB_TUA6100=m
-
-#
-# DVB-T (terrestrial) frontends
-#
-CONFIG_DVB_SP8870=m
-CONFIG_DVB_SP887X=m
-CONFIG_DVB_CX22700=m
-CONFIG_DVB_CX22702=m
-CONFIG_DVB_DRX397XD=m
-CONFIG_DVB_L64781=m
-CONFIG_DVB_TDA1004X=m
-CONFIG_DVB_NXT6000=m
-CONFIG_DVB_MT352=m
-CONFIG_DVB_ZL10353=m
-CONFIG_DVB_DIB3000MB=m
-CONFIG_DVB_DIB3000MC=m
-CONFIG_DVB_DIB7000M=m
-CONFIG_DVB_DIB7000P=m
-CONFIG_DVB_TDA10048=m
-
-#
-# DVB-C (cable) frontends
-#
-CONFIG_DVB_VES1820=m
-CONFIG_DVB_TDA10021=m
-CONFIG_DVB_TDA10023=m
-CONFIG_DVB_STV0297=m
-
-#
-# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
-#
-CONFIG_DVB_NXT200X=m
-CONFIG_DVB_OR51211=m
-CONFIG_DVB_OR51132=m
-CONFIG_DVB_BCM3510=m
-CONFIG_DVB_LGDT330X=m
-CONFIG_DVB_S5H1409=m
-CONFIG_DVB_AU8522=m
-CONFIG_DVB_S5H1411=m
-
-#
-# Digital terrestrial only tuners/PLL
-#
-CONFIG_DVB_PLL=m
-CONFIG_DVB_TUNER_DIB0070=m
-
-#
-# SEC control devices for DVB-S
-#
-CONFIG_DVB_LNBP21=m
-CONFIG_DVB_ISL6405=m
-CONFIG_DVB_ISL6421=m
-CONFIG_DAB=y
-CONFIG_USB_DABUSB=m
-
-#
-# Audio devices for multimedia
-#
-
-#
-# ALSA sound
-#
-CONFIG_SND_BT87X=m
-CONFIG_SND_BT87X_OVERCLOCK=y
-
-#
-# OSS sound
-#
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -39,7 +39,6 @@
 * arptables-v0.0.3-3
 * as86-0.16.17
 * asterisk-1.4.18
-* asterisk-1.4.18_old
 * atl2-2.0.4
 * autoconf-2.59
 * automake-1.9.6
@@ -73,7 +72,7 @@
 * dhcp-3.1.0
 * dhcpcd-2.0.8
 * diffutils-2.8.1
-* dnsmasq-2.40
+* dnsmasq-2.45
 * dosfstools-2.11
 * e2fsprogs-1.39
 * ebtables-v2.0.8-2
@@ -126,17 +125,16 @@
 * icegenerator-0.5.5-pre2
 * igmpproxy-src-0.1-beta2
 * inetutils-1.4.2
-* initscripts_old
 * ipaddr-1.2
 * ipfireseeder-1.00
 * iproute2-2.6.16-060323
-* iptables-1.4.0
+* iptables-1.3.8
 * iptstate-2.1
 * iputils-ss020927
 * java-1.5.0_06-for-ipfire
 * jpegsrc.v6b
 * kbd-1.12
-* klibc-1.5.10
+* klibc-1.5
 * kqemu-1.3.0pre11
 * kudzu-1.2.64
 * l7-protocols-2007-10-10
@@ -166,10 +164,9 @@
 * libwww-perl-5.803
 * libxml2-2.6.26
 * libxslt-1.1.17
-* linux-2.6.24.7
-* linux-2.6.24.7-smp_old
-* linux-2.6.24.7_old
+* linux-2.6.23.17
 * linux-atm-2.4.1
+* linux-fusion-7.0.1
 * linux-libc-headers-2.6.12.0
 * linuxigd-0.95
 * lm_sensors-3.0.2
@@ -219,9 +216,8 @@
 * openmailadmin-1.0.0
 * openssh-4.7p1
 * openssl-0.9.8g
-* openswan-2.6.14
-* openswan-2.6.14-kmod
-* openswan-2.6.16dr2
+* openswan-2.4.12
+* openswan-2.4.12-kmod
 * openvpn-2.0.9
 * pam_mysql-0.7RC1
 * patch-2.5.4
@@ -239,6 +235,8 @@
 * procps-3.2.6
 * psmisc-22.2
 * qemu-0.9.1
+* r8168-8.005.00
+* r8169-6.005.00
 * readline-5.1
 * reiser4progs-1.0.5
 * reiserfsprogs-3.6.19
@@ -268,7 +266,7 @@
 * sudo-1.6.8p12
 * sysfsutils-1.3.0
 * sysklogd-1.4.1
-* syslinux-3.11
+* syslinux-3.62
 * sysstat-6.0.2
 * sysvinit-2.86
 * tar-1.15.1
@@ -278,7 +276,6 @@
 * teamspeak-2.0.24.1
 * texinfo-4.8
 * tftp-hpa-0.48
-* tftp-hpa-0.48_old
 * tiff-3.8.2
 * traceroute-1.4a12
 * tripwire-2.4.1.2
@@ -301,7 +298,7 @@
 * wget-1.10.2
 * whatmask-1.2
 * which-2.16
-* wireless_tools.28
+* wireless_tools.30.pre6
 * wpa_supplicant-0.5.10
 * xfsprogs-2.9.4
 * xvidcore-1.1.0
--- a/lfs/atl1
+++ b/lfs/atl1
@@ -1,90 +0,0 @@
-###############################################################################
-#                                                                             #
-# 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.2.40.2
-
-THISAPP    = atl1-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-ifeq "$(SMP)" "1"
-	TARGET     = $(DIR_INFO)/$(THISAPP)-smp
-else
-	TARGET     = $(DIR_INFO)/$(THISAPP)
-endif
-
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = b9f30f9d3c9ab2e98309f8d229713b27
-
-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)
-	
-ifeq "$(SMP)" "1"
-	cd $(DIR_APP)/src && make -C /lib/modules/$(KVER)-ipfire-smp/build/ SUBDIRS=$(DIR_APP)/src modules
-	cd $(DIR_APP)/src && install -m 644 atl1.ko /lib/modules/$(KVER)-ipfire-smp/kernel/drivers/net 
-else
-	cd $(DIR_APP)/src && make -C /lib/modules/$(KVER)-ipfire/build/ SUBDIRS=$(DIR_APP)/src modules
-	cd $(DIR_APP)/src && install -m 644 atl1.ko /lib/modules/$(KVER)-ipfire/kernel/drivers/net 
-endif
-	@rm -rf $(DIR_APP)
-	@$(POSTBUILD)
--- a/lfs/dnsmasq
+++ b/lfs/dnsmasq
@@ -24,7 +24,7 @@

 include Config

-VER        = 2.40
+VER        = 2.45

 THISAPP    = dnsmasq-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 91b6063ae81146b9d70b4381b2f3e44f
+$(DL_FILE)_MD5 = b7956e15c9766e05b3eca3ce88fdb616

 install : $(TARGET)

@@ -70,10 +70,11 @@ $(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|/usr/local|/usr|g' Makefile
 	cd $(DIR_APP)/src && sed -i \
 		-e 's|^\/\* #define HAVE_ISC_READER .*$$|#define HAVE_ISC_READER\n#define NO_IPV6|' \
 		-e 's/^#define CHUSER .*$$/#define CHUSER "dnsmasq"/' config.h
 	cd $(DIR_APP) && make $(MAKETUNING)
-	cd $(DIR_APP) && PREFIX=/usr make install
+	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
--- a/lfs/initrd
+++ b/lfs/initrd
@@ -82,9 +82,9 @@ $(TARGET) :
 	    -b /install/initrd $(KVER)-ipfire
 	    
 	# Change priority of pata module
-	cd /install/initrd/lib/modules/$(KVER)-ipfire && grep "# \|ata" \
+	cd /install/initrd/lib/modules/$(KVER)-ipfire && grep "# \|ata\|ahci" \
 	    modules.alias > modules.alias.tmp
-	cd /install/initrd/lib/modules/$(KVER)-ipfire && grep -v "# \|ata" \
+	cd /install/initrd/lib/modules/$(KVER)-ipfire && grep -v "# \|ata\|ahci" \
 	    modules.alias >> modules.alias.tmp
 	cd /install/initrd/lib/modules/$(KVER)-ipfire && mv -f \
 	    modules.alias.tmp modules.alias
--- a/lfs/initscripts
+++ b/lfs/initscripts
@@ -126,6 +126,7 @@ $(TARGET) :
 	ln -sf ../init.d/mountkernfs /etc/rc.d/rcsysinit.d/S00mountkernfs
 	ln -sf ../init.d/modules     /etc/rc.d/rcsysinit.d/S05modules
 	ln -sf ../init.d/udev        /etc/rc.d/rcsysinit.d/S10udev
+	ln -sf ../init.d/checkfstab  /etc/rc.d/rcsysinit.d/S19checkfstab
 	ln -sf ../init.d/swap        /etc/rc.d/rcsysinit.d/S20swap
 	ln -sf ../init.d/checkfs     /etc/rc.d/rcsysinit.d/S30checkfs
 	ln -sf ../init.d/mountfs     /etc/rc.d/rcsysinit.d/S40mountfs
--- a/lfs/linux
+++ b/lfs/linux
@@ -95,9 +95,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	ln -s linux-$(VER) /usr/src/linux

 	# Security fix for CIFS & Netfilter SNMP
-#	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.20.21-additional_check_on_BER_decoding.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.20.21-additional_check_on_BER_decoding.patch

-	# Openswan nat-t
+	# Openswan
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.4.x.kernel-2.6.23-natt.patch

 	# Reiser4
--- a/lfs/openswan
+++ b/lfs/openswan
@@ -24,7 +24,7 @@

 include Config

-VER        = 2.4.13
+VER        = 2.4.12

 THISAPP    = openswan-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -48,7 +48,7 @@ objects = $(DL_FILE)

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 0c2505cf2639a7de051e815f41e8e1f4
+$(DL_FILE)_MD5 = 0bca0cc205d2d83eff64a7cea825ce7a

 install : $(TARGET)

--- a/lfs/updater
+++ b/lfs/updater
@@ -70,13 +70,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	# Other files
 	cp $(DIR_SRC)/config/rootfiles/updater/update.sh /install/updater/
 	chmod 755 /install/updater/update.sh
-	cd /install/updater && tar cf /install/packages/core-upgrade-2.1-15.ipfire \
+	cd /install/updater && tar cf /install/packages/core-upgrade-2.1-16.ipfire \
 		update.sh files ROOTFILES
 	rm -rf /install/updater

 	sed -e "s/NAME/core-upgrade/g" \
 		-e "s/VER/2.1/g" \
-		-e "s/RELEASE/15/g" \
+		-e "s/RELEASE/16/g" \
 		-e "s/DEPS/$(DEPS)/g" \
-		-e "s/SIZE/`ls -l \/install\/packages\/core-upgrade-2.1-15.ipfire | awk '{ print $$5 }'`/g" \
-		< /usr/src/src/pakfire/meta > /install/packages/meta-core-upgrade-15
+		-e "s/SIZE/`ls -l \/install\/packages\/core-upgrade-2.1-16.ipfire | awk '{ print $$5 }'`/g" \
+		< /usr/src/src/pakfire/meta > /install/packages/meta-core-upgrade-16
--- a/lfs/v4l-dvb
+++ b/lfs/v4l-dvb
@@ -78,7 +78,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-	cp -f $(DIR_SRC)/config/v4l-dvb/config $(DIR_APP)/v4l/.config
+#	cp -f $(DIR_SRC)/config/v4l-dvb/config $(DIR_APP)/v4l/.config
 ifeq "$(SMP)" "1"
 	cd $(DIR_APP) && make release VER=$(KVER)-ipfire-smp
 else
--- a/lfs/wireless
+++ b/lfs/wireless
@@ -24,12 +24,13 @@

 include Config

-VER        = 28
+VER        = 30.pre6

 THISAPP    = wireless_tools.$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
+#DIR_APP    = $(DIR_SRC)/$(THISAPP)
+DIR_APP    = $(DIR_SRC)/wireless_tools.30
 TARGET     = $(DIR_INFO)/$(THISAPP)

 ###############################################################################
@@ -40,8 +41,7 @@ objects = $(DL_FILE)

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 599c94497f9c9073c7b052d3dcb7cd16
-
+$(DL_FILE)_MD5 = 4f42f95e6ec8890b2cebd27aeddf954f
 install : $(TARGET)

 check : $(patsubst %,$(DIR_CHK)/%,$(objects))
--- a/make.sh
+++ b/make.sh
@@ -24,7 +24,7 @@

 NAME="IPFire"										# Software name
 SNAME="ipfire"									# Short name
-VERSION="2.3-test"
+VERSION="2.3-beta2"
 GIT_BRANCH=master:master										# Version number
 SLOGAN="www.ipfire.org"					# Software slogan
 CONFIG_ROOT=/var/ipfire					# Configuration rootdir
@@ -338,23 +338,23 @@ buildipfire() {
 #  ipfiremake ipp2p			SMP=1
  ipfiremake r8169			SMP=1
  ipfiremake r8168			SMP=1
-#  ipfiremake atl1			SMP=1
  ipfiremake atl2			SMP=1
  ipfiremake kqemu			SMP=1
  ipfiremake v4l-dvb			SMP=1
  ipfiremake madwifi                    SMP=1
  ipfiremake sane		KMOD=1	SMP=1
+  ipfiremake openswan		KMOD=1	SMP=1
  ipfiremake linux
  ipfiremake linux-fusion
 #  ipfiremake ipp2p
  ipfiremake r8169
  ipfiremake r8168
-#  ipfiremake atl1
  ipfiremake atl2
-#  ipfiremake kqemu
+  ipfiremake kqemu
  ipfiremake v4l-dvb
  ipfiremake madwifi
  ipfiremake sane		KMOD=1
+  ipfiremake openswan		KMOD=1
  ipfiremake pkg-config
  ipfiremake linux-atm
  ipfiremake cpio
--- a/src/hwdata/pci.ids
+++ b/src/hwdata/pci.ids
--- a/src/hwdata/usb.ids
+++ b/src/hwdata/usb.ids
--- a/src/initscripts/init.d/checkfstab
+++ b/src/initscripts/init.d/checkfstab
@@ -0,0 +1,51 @@
+#!/bin/sh
+########################################################################
+# Begin $rc_base/init.d/checkfstab
+#
+# Description : Check and repair fstab if the drivename has changed
+#
+# Authors     : Arne Fitzenreiter - arne_f@ipfire.org
+#
+# Version     : 00.00
+#
+# Notes       :
+#
+########################################################################
+
+. /etc/sysconfig/rc
+. ${rc_functions}
+
+case "${1}" in
+	start)
+		boot_mesg "Checking fstab rootdevice entry ..."
+		ROOTPOS=`expr index "$CMDLINE" root=`
+		NEWROOT=`echo ${CMDLINE:$ROOTPOS} | cut -d"=" -f2 | cut -d" " -f1`;
+		OLDROOT=`cat /etc/fstab | grep -m1 " / " | cut -d" " -f1`;
+		OLDDRV=${OLDROOT::`expr length $OLDROOT`-1}
+		NEWDRV=${NEWROOT::`expr length $NEWROOT`-1}
+		if [ "$OLDROOT" == "$NEWROOT" ]; then
+		    echo_ok;
+		    exit 0;
+		fi
+		echo_failure;
+		boot_mesg "Warning! Rootdevice not match with fstab entry!"
+		boot_mesg
+		boot_mesg "Rootdevice:  $NEWROOT"
+		boot_mesg "fstab-entry: $OLDROOT"
+		boot_mesg
+		boot_mesg "Attempt to repair it ..."
+		mount -o remount,rw /
+		sed -i -e "s|$OLDDRV|$NEWDRV|g" /etc/fstab
+		mount /boot
+		sed -i -e "s|$OLDDRV|$NEWDRV|g" /boot/grub/grub.conf
+		umount /boot
+		echo_ok;
+		exit 0;
+		;;
+	*)
+		echo "Usage: ${0} {start}"
+		exit 1
+		;;
+esac
+
+# End $rc_base/init.d/checkfstab
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -116,9 +116,6 @@ int main(int argc, char *argv[])
 	mysystem("/sbin/modprobe usb-storage");
 	mysystem("/sbin/modprobe usbhid");

-	mysystem("/bin/sleep 3"); 
-	mysystem("/sbin/modprobe ahci"); // SATA AHCI Host controller
-
 	mysystem("/sbin/modprobe iso9660"); // CDROM
 	mysystem("/sbin/modprobe ext2"); // Boot patition
 	mysystem("/sbin/modprobe vfat"); // USB key
--- a/src/patches/kudzu-usbnet.patch
+++ b/src/patches/kudzu-usbnet.patch
@@ -1,24 +1,30 @@
-diff -Naur kudzu.org/usb.c kudzu-1.2.64/usb.c
--- kudzu.org/usb.c	2006-11-28 17:58:58.000000000 +0100
-+++ kudzu-1.2.64/usb.c	2008-06-11 19:27:36.000000000 +0200
-@@ -264,10 +264,20 @@
- 			if (t->driver && (!strcmp(t->driver, "pegasus") ||
+diff -Naur kudzu-1.2.64.org/usb.c kudzu-1.2.64/usb.c
+--- kudzu-1.2.64.org/usb.c	2006-11-28 17:58:58.000000000 +0100
+++ kudzu-1.2.64/usb.c	2008-07-22 12:13:42.000000000 +0200
+@@ -261,13 +261,22 @@
+ 				t->desc = strdup(t->usbprod);
+ 			else
+ 				asprintf(&t->desc,"Unknown USB device 0x%x:0x%x",t->vendorId,t->deviceId);
+-			if (t->driver && (!strcmp(t->driver, "pegasus") ||
+			if (t->driver && (!strcmp(t->driver, "asix") ||
 			    !strcmp(t->driver, "catc") ||
- 			    !strcmp(t->driver, "kaweth") ||
 +			    !strcmp(t->driver, "cdc_ether") ||
+			    !strcmp(t->driver, "dm9601") ||
 +			    !strcmp(t->driver, "gl620a") ||
+ 			    !strcmp(t->driver, "kaweth") ||
+-			    !strcmp(t->driver, "rtl8150") ||
+-			    !strcmp(t->driver, "ax8817x") ||
+			    !strcmp(t->driver, "mcs7830") || 
 +			    !strcmp(t->driver, "net1080") ||
+			    !strcmp(t->driver, "pegasus") ||	    
 +			    !strcmp(t->driver, "plusb") ||
 +			    !strcmp(t->driver, "rndis_host") ||
 +			    !strcmp(t->driver, "zaurus") ||
-+			    !strcmp(t->driver, "net1080") ||
- 			    !strcmp(t->driver, "rtl8150") ||
- 			    !strcmp(t->driver, "ax8817x") ||
-+			    !strcmp(t->driver, "zd1211rw") ||
+			    !strcmp(t->driver, "rtl8187") ||
+			    !strcmp(t->driver, "usb8xxx") ||
 			    !strcmp(t->driver, "zd1201") ||
- 			    !strcmp(t->driver, "asix") ||
-+			    !strcmp(t->driver, "mcs7830") || 
-+			    !strcmp(t->driver, "dm9601") ||
+-			    !strcmp(t->driver, "asix") ||
+			    !strcmp(t->driver, "zd1211rw") ||
 			    !strcmp(t->driver, "usbnet"))) {
 				if (t->type == CLASS_OTHER)
 					t->type = CLASS_NETWORK;
--- a/src/patches/openswan-2.4.12.kernel-2.6.20.21-natt.patch
+++ b/src/patches/openswan-2.4.12.kernel-2.6.20.21-natt.patch
@@ -1,122 +0,0 @@
-packaging/utils/nattpatch 2.6
--- /dev/null   Tue Mar 11 13:02:56 2003
-+++ nat-t/include/net/xfrmudp.h     Mon Feb  9 13:51:03 2004
-@@ -0,0 +1,10 @@
-+/*
-+ * pointer to function for type that xfrm4_input wants, to permit
-+ * decoupling of XFRM from udp.c
-+ */
-+#define HAVE_XFRM4_UDP_REGISTER
-+
-+typedef int (*xfrm4_rcv_encap_t)(struct sk_buff *skb, __u16 encap_type);
-+extern int udp4_register_esp_rcvencap(xfrm4_rcv_encap_t func
-+				      , xfrm4_rcv_encap_t *oldfunc);
-+extern int udp4_unregister_esp_rcvencap(xfrm4_rcv_encap_t func);
--- /distros/kernel/linux-2.6.11.2/net/ipv4/Kconfig	2005-03-09 03:12:33.000000000 -0500
-+++ swan26/net/ipv4/Kconfig	2005-04-04 18:46:13.000000000 -0400
-@@ -351,2 +351,8 @@
- 
-+config IPSEC_NAT_TRAVERSAL
-+	bool "IPSEC NAT-Traversal (KLIPS compatible)"
-+	depends on INET
-+	---help---
-+          Includes support for RFC3947/RFC3948 NAT-Traversal of ESP over UDP.
-+
- config IP_TCPDIAG
--- plain26/net/ipv4/udp.c.orig	2006-01-02 22:21:10.000000000 -0500
-+++ plain26/net/ipv4/udp.c	2006-01-12 20:18:57.000000000 -0500
-@@ -108,6 +108,7 @@
-  */
- 
- DEFINE_SNMP_STAT(struct udp_mib, udp_statistics) __read_mostly;
-+#include <net/xfrmudp.h>
- 
- struct hlist_head udp_hash[UDP_HTABLE_SIZE];
- DEFINE_RWLOCK(udp_hash_lock);
-@@ -914,6 +915,44 @@
- 	return 0;
- }
- 
-+#if defined(CONFIG_XFRM) || defined(CONFIG_IPSEC_NAT_TRAVERSAL)
-+
-+/* if XFRM isn't a module, then register it directly. */
-+#if !defined(CONFIG_XFRM_MODULE) 
-+static xfrm4_rcv_encap_t xfrm4_rcv_encap_func = xfrm4_rcv_encap;
-+#else
-+static xfrm4_rcv_encap_t xfrm4_rcv_encap_func = NULL;
-+#endif
-+
-+static xfrm4_rcv_encap_t xfrm4_rcv_encap_func;
-+
-+int udp4_register_esp_rcvencap(xfrm4_rcv_encap_t func
-+			       , xfrm4_rcv_encap_t *oldfunc)
-+{
-+  if(oldfunc != NULL) {
-+    *oldfunc = xfrm4_rcv_encap_func;
-+  }
-+
-+#if 0
-+  if(xfrm4_rcv_encap_func != NULL)
-+    return -1;
-+#endif
-+
-+  xfrm4_rcv_encap_func = func;
-+  return 0;
-+}
-+
-+int udp4_unregister_esp_rcvencap(xfrm4_rcv_encap_t func)
-+{
-+  if(xfrm4_rcv_encap_func != func)
-+    return -1;
-+
-+  xfrm4_rcv_encap_func = NULL;
-+  return 0;
-+}
-+#endif /* CONFIG_XFRM || defined(CONFIG_IPSEC_NAT_TRAVERSAL)*/
-+
-+
- /* return:
-  * 	1  if the the UDP system should process it
-  *	0  if we should drop this packet
-@@ -921,9 +960,9 @@
-  */
- static int udp_encap_rcv(struct sock * sk, struct sk_buff *skb)
- {
-#ifndef CONFIG_XFRM
-+#if !defined(CONFIG_XFRM) && !defined(CONFIG_IPSEC_NAT_TRAVERSAL)
- 	return 1; 
-#else
-+#else /* either CONFIG_XFRM or CONFIG_IPSEC_NAT_TRAVERSAL */
- 	struct udp_sock *up = udp_sk(sk);
-   	struct udphdr *uh;
- 	struct iphdr *iph;
-@@ -1049,11 +1088,15 @@
- 			kfree_skb(skb);
- 			return 0;
- 		}
-		if (ret < 0) {
-			/* process the ESP packet */
-			ret = xfrm4_rcv_encap(skb, up->encap_type);
-			UDP_INC_STATS_BH(UDP_MIB_INDATAGRAMS, up->pcflag);
-			return -ret;
-+  		if (ret < 0) {
-+  			if(xfrm4_rcv_encap_func != NULL) {
-+  			  ret = (*xfrm4_rcv_encap_func)(skb, up->encap_type);
-+  			  UDP_INC_STATS_BH(UDP_MIB_INDATAGRAMS, up->pcflag);
-+  			} else {
-+  			  UDP_INC_STATS_BH(UDP_MIB_INERRORS, up->pcflag);
-+  			  ret = 1;
-+  			}
-+ 			return ret;	
- 		}
- 		/* FALLTHROUGH -- it's a UDP Packet */
- 	}
-@@ -1732,3 +1775,8 @@
- EXPORT_SYMBOL(udp_proc_register);
- EXPORT_SYMBOL(udp_proc_unregister);
- #endif
-+
-+#if defined(CONFIG_IPSEC_NAT_TRAVERSAL)
-+EXPORT_SYMBOL(udp4_register_esp_rcvencap);
-+EXPORT_SYMBOL(udp4_unregister_esp_rcvencap);
-+#endif
--- a/src/patches/openswan-2.6.14-kernel-2.6.24.7-natt.patch
+++ b/src/patches/openswan-2.6.14-kernel-2.6.24.7-natt.patch
@@ -1,129 +0,0 @@
--- /dev/null   Tue Mar 11 13:02:56 2003
-+++ nat-t/include/net/xfrmudp.h     Mon Feb  9 13:51:03 2004
-@@ -0,0 +1,10 @@
-+/*
-+ * pointer to function for type that xfrm4_input wants, to permit
-+ * decoupling of XFRM from udp.c
-+ */
-+#define HAVE_XFRM4_UDP_REGISTER
-+
-+typedef int (*xfrm4_rcv_encap_t)(struct sk_buff *skb, __u16 encap_type);
-+extern int udp4_register_esp_rcvencap(xfrm4_rcv_encap_t func
-+				      , xfrm4_rcv_encap_t *oldfunc);
-+extern int udp4_unregister_esp_rcvencap(xfrm4_rcv_encap_t func);
--- /distros/kernel/linux-2.6.11.2/net/ipv4/Kconfig	2005-03-09 03:12:33.000000000 -0500
-+++ swan26/net/ipv4/Kconfig	2005-04-04 18:46:13.000000000 -0400
-@@ -351,2 +351,8 @@
- 
-+config IPSEC_NAT_TRAVERSAL
-+	bool "IPSEC NAT-Traversal (KLIPS compatible)"
-+	depends on INET
-+	---help---
-+          Includes support for RFC3947/RFC3948 NAT-Traversal of ESP over UDP.
-+
- config IP_TCPDIAG
--- plain26/net/ipv4/udp.c.orig	2006-12-28 20:53:17.000000000 -0500
-+++ plain26/net/ipv4/udp.c	2007-05-11 10:22:50.000000000 -0400
-@@ -108,6 +108,7 @@
- #include <net/inet_common.h>
- #include <net/checksum.h>
- #include <net/xfrm.h>
-+#include <net/xfrmudp.h>
- 
- /*
-  *	Snmp MIB for the UDP layer
-@@ -881,6 +882,31 @@
- 	sk_common_release(sk);
- }
- 
-+#if defined(CONFIG_XFRM) || defined(CONFIG_IPSEC_NAT_TRAVERSAL)
-+
-+static xfrm4_rcv_encap_t xfrm4_rcv_encap_func = NULL;
-+int udp4_register_esp_rcvencap(xfrm4_rcv_encap_t func
-+			       , xfrm4_rcv_encap_t *oldfunc)
-+{
-+  if(oldfunc != NULL) {
-+    *oldfunc = xfrm4_rcv_encap_func;
-+  }
-+
-+  xfrm4_rcv_encap_func = func;
-+  return 0;
-+}
-+
-+int udp4_unregister_esp_rcvencap(xfrm4_rcv_encap_t func)
-+{
-+  if(xfrm4_rcv_encap_func != func)
-+    return -1;
-+
-+  xfrm4_rcv_encap_func = NULL;
-+  return 0;
-+}
-+#endif /* CONFIG_XFRM_MODULE || CONFIG_IPSEC_NAT_TRAVERSAL */
-+
-+
- /* return:
-  * 	1  if the the UDP system should process it
-  *	0  if we should drop this packet
-@@ -888,9 +914,9 @@
-  */
- static int udp_encap_rcv(struct sock * sk, struct sk_buff *skb)
- {
-#ifndef CONFIG_XFRM
-+#if !defined(CONFIG_XFRM) && !defined(CONFIG_IPSEC_NAT_TRAVERSAL)
- 	return 1; 
-#else
-+#else /* either CONFIG_XFRM or CONFIG_IPSEC_NAT_TRAVERSAL */
- 	struct udp_sock *up = udp_sk(sk);
-   	struct udphdr *uh;
- 	struct iphdr *iph;
-@@ -1018,10 +1044,27 @@
- 			return 0;
- 		}
- 		if (ret < 0) {
-			/* process the ESP packet */
-			ret = xfrm4_rcv_encap(skb, up->encap_type);
-			UDP_INC_STATS_BH(UDP_MIB_INDATAGRAMS);
-			return -ret;
-+ 			if(xfrm4_rcv_encap_func != NULL)
-+				ret = (*xfrm4_rcv_encap_func)(skb, up->encap_type);
-+	
-+			switch(ret) {
-+			case 1:
-+				/* FALLTHROUGH to send-up */;
-+				break;
-+				
-+			case 0:
-+                                /* PROCESSED, free it */
-+				UDP_INC_STATS_BH(UDP_MIB_INDATAGRAMS);
-+				return 0;
-+				
-+			case -1:
-+				/* PACKET wasn't for _func, or no func, pass it
-+				 * to stock function
-+				 */
-+				ret = xfrm4_rcv_encap(skb, up->encap_type);
-+				UDP_INC_STATS_BH(UDP_MIB_INDATAGRAMS);
-+				return -ret;
-+			}
- 		}
- 		/* FALLTHROUGH -- it's a UDP Packet */
- 	}
-@@ -1110,7 +1153,6 @@
- /*
-  *	All we need to do is get the socket, and then do a checksum. 
-  */
- 
- int udp_rcv(struct sk_buff *skb)
- {
-   	struct sock *sk;
-@@ -1599,3 +1641,9 @@
- EXPORT_SYMBOL(udp_proc_register);
- EXPORT_SYMBOL(udp_proc_unregister);
- #endif
-+
-+#if defined(CONFIG_IPSEC_NAT_TRAVERSAL)
-+EXPORT_SYMBOL(udp4_register_esp_rcvencap);
-+EXPORT_SYMBOL(udp4_unregister_esp_rcvencap);
-+#endif
-+
-make[1]: Leaving directory `/usr/src/openswan-2.6.14'
--- a/src/patches/openswan-2.6.14-startklips-1.patch
+++ b/src/patches/openswan-2.6.14-startklips-1.patch
@@ -1,55 +0,0 @@
--- _startklips.orig	2008-07-11 01:55:19.000000000 +0200
-+++ _startklips	2008-07-12 09:11:56.000000000 +0200
-@@ -149,23 +149,35 @@
- 
- 	# figure out ifconfig for interface
- 	addr=
-	eval `ifconfig $phys |
-		awk '$1 == "inet" && $2 ~ /^addr:/ && $NF ~ /^Mask:/ {
-			gsub(/:/, " ", $0)
-			print "addr=" $3
-			other = $5
-			if ($4 == "Bcast")
-				print "type=broadcast"
-			else if ($4 == "P-t-P")
-				print "type=pointopoint"
-			else if (NF == 5) {
-				print "type="
-				other = ""
-			} else
-				print "type=unknown"
-			print "otheraddr=" other
-			print "mask=" $NF
-		}'`
-+	eval `ip addr show $phys | awk '$3 ~ /BROADCAST|POINTOPOINT/ { 
-+				if ($3 ~ /BROADCAST/) 
-+					print "type=broadcast"; 
-+				else if ($3 ~ /POINTOPOINT/) 
-+					print "type=pointopoint";
-+				else {
-+					print "type=";
-+				}
-+			}'`
-+			
-+	if [ "$type" == "broadcast" ]; then
-+		eval `ip addr show $phys | awk '$1 == "inet"  { gsub(/\//, " "); 
-+					print "addr=" $2;
-+					print "mask=" $3;
-+					print "otheraddr=" $5;
-+					}'`
-+	elif [ "$type" == "pointopoint" ]; then
-+		eval `ip addr show $phys | awk '$1 == "inet"  { gsub(/\//, " "); 
-+					print "addr=" $2;
-+					print "mask=" $5;
-+					print "otheraddr=" $4;
-+					}'`
-+	else
-+		type="unknown"
-+		otheraddr=
-+	fi
-+	
-+	eval `whatmask /$mask | awk -F': ' '$1 ~ /^Netmask =/ { print "mask=" $2 }'`
-+	
- 	if test " $addr" = " "
- 	then
- 		echo "unable to determine address of \`$phys'"
--- a/src/patches/openswan-2.6.14-updown-1.patch
+++ b/src/patches/openswan-2.6.14-updown-1.patch
@@ -1,30 +0,0 @@
--- _updown.klips.orig	2008-07-11 01:55:19.000000000 +0200
-+++ _updown.klips	2008-07-12 09:20:26.000000000 +0200
-@@ -407,8 +407,8 @@
- 		# opportunistic encryption work around
- 		# need to provide route that eclipses default, without 
- 		# replacing it.
-		it="ip route $1 0.0.0.0/1 $parms2 $parms3 &&
-			ip route $1 128.0.0.0/1 $parms2 $parms3"
-+		#it="ip route $1 0.0.0.0/1 $parms2 $parms3 &&
-+	#		ip route $1 128.0.0.0/1 $parms2 $parms3"
- 		;;
- 	*)	it="ip route $1 $parms $parms2 $parms3"
- 		;;
-@@ -432,13 +432,13 @@
- prepare-host:*|prepare-client:*)
- 	# delete possibly-existing route (preliminary to adding a route)
- 	case "$PLUTO_PEER_CLIENT" in
-	"0.0.0.0/0")
-+  "0.0.0.0/0")
- 		# need to provide route that eclipses default, without 
- 		# replacing it.
- 		parms1="0.0.0.0/1"
- 		parms2="128.0.0.0/1"
-		it="ip route delete $parms1 $IPROUTEARGS 2>&1 ; ip route delete $parms2 $IPROUTEARGS 2>&1"
-		oops="`ip route delete $parms1 $IPROUTEARGS 2>&1 ; ip route delete $parms2 $IPROUTEARGS 2>&1`"
-+	#	it="ip route delete $parms1 $IPROUTEARGS 2>&1 ; ip route delete $parms2 $IPROUTEARGS 2>&1"
-+	#	oops="`ip route delete $parms1 $IPROUTEARGS 2>&1 ; ip route delete $parms2 $IPROUTEARGS 2>&1`"
- 		;;
- 	*)
- 		parms="$PLUTO_PEER_CLIENT $IPROUTEARGS"
--- a/src/patches/openswan-2.6.16dr2-2.6.24-kernel.patch
+++ b/src/patches/openswan-2.6.16dr2-2.6.24-kernel.patch
--- a/src/patches/openswan-2.6.16dr2-2.6.24-natt.patch
+++ b/src/patches/openswan-2.6.16dr2-2.6.24-natt.patch
@@ -1,204 +0,0 @@
-Index: linux-2.6.x/net/ipv4/Kconfig
-===================================================================
-RCS file: /cvs/sw/linux-2.6.x/net/ipv4/Kconfig,v
-retrieving revision 1.1.1.28
-retrieving revision 1.10
-diff -u -r1.1.1.28 -r1.10
--- linux-2.6.x/net/ipv4/Kconfig	10 Oct 2007 00:54:30 -0000	1.1.1.28
-+++ linux-2.6.x/net/ipv4/Kconfig	10 Oct 2007 04:53:57 -0000	1.10
-@@ -367,6 +367,12 @@
- 	tristate
- 	default n
- 
-+config IPSEC_NAT_TRAVERSAL
-+	bool "IPSEC NAT-Traversal (KLIPS compatible)"
-+	depends on INET
-+	---help---
-+          Includes support for RFC3947/RFC3948 NAT-Traversal of ESP over UDP.
-+
- config INET_XFRM_MODE_TRANSPORT
- 	tristate "IP: IPsec transport mode"
- 	default y
-Index: linux-2.6.x/net/ipv4/udp.c
-===================================================================
-RCS file: /cvs/sw/linux-2.6.x/net/ipv4/udp.c,v
-retrieving revision 1.1.1.46
-diff -u -r1.1.1.46 udp.c
--- linux-2.6.x/net/ipv4/udp.c	10 Oct 2007 00:54:30 -0000	1.1.1.46
-+++ linux-2.6.x/net/ipv4/udp.c	9 Nov 2007 00:11:33 -0000
-@@ -102,6 +102,7 @@
- #include <net/route.h>
- #include <net/checksum.h>
- #include <net/xfrm.h>
-+#include <net/xfrmudp.h>
- #include "udp_impl.h"
- 
- /*
-@@ -920,6 +921,128 @@
- 	return 0;
- }
- 
-+#if defined(CONFIG_XFRM) || defined(CONFIG_IPSEC_NAT_TRAVERSAL)
-+
-+static xfrm4_rcv_encap_t xfrm4_rcv_encap_func = NULL;
-+
-+/*
-+ * de-encapsulate and pass to the registered xfrm4_rcv_encap_func function.
-+ * Most of this code stolen from net/ipv4/xfrm4_input.c
-+ * which is attributed to YOSHIFUJI Hideaki @USAGI, and
-+ * Derek Atkins <derek@ihtfp.com>
-+ */
-+
-+static int xfrm4_udp_encap_rcv_wrapper(struct sock *sk, struct sk_buff *skb)
-+{
-+	struct udp_sock *up = udp_sk(sk);
-+	struct udphdr *uh;
-+	struct iphdr *iph;
-+	int iphlen, len;
-+	int ret;
-+
-+	__u8 *udpdata;
-+	__be32 *udpdata32;
-+	__u16 encap_type = up->encap_type;
-+
-+	/* if this is not encapsulated socket, then just return now */
-+	if (!encap_type && !xfrm4_rcv_encap_func)
-+		return 1;
-+
-+	/* If this is a paged skb, make sure we pull up
-+	 * whatever data we need to look at. */
-+	len = skb->len - sizeof(struct udphdr);
-+	if (!pskb_may_pull(skb, sizeof(struct udphdr) + min(len, 8)))
-+		return 1;
-+
-+	/* Now we can get the pointers */
-+	uh = udp_hdr(skb);
-+	udpdata = (__u8 *)uh + sizeof(struct udphdr);
-+	udpdata32 = (__be32 *)udpdata;
-+
-+	switch (encap_type) {
-+	default:
-+	case UDP_ENCAP_ESPINUDP:
-+		/* Check if this is a keepalive packet.  If so, eat it. */
-+		if (len == 1 && udpdata[0] == 0xff) {
-+			goto drop;
-+		} else if (len > sizeof(struct ip_esp_hdr) && udpdata32[0] != 0) {
-+			/* ESP Packet without Non-ESP header */
-+			len = sizeof(struct udphdr);
-+		} else
-+			/* Must be an IKE packet.. pass it through */
-+			return 1;
-+		break;
-+	case UDP_ENCAP_ESPINUDP_NON_IKE:
-+		/* Check if this is a keepalive packet.  If so, eat it. */
-+		if (len == 1 && udpdata[0] == 0xff) {
-+			goto drop;
-+		} else if (len > 2 * sizeof(u32) + sizeof(struct ip_esp_hdr) &&
-+			   udpdata32[0] == 0 && udpdata32[1] == 0) {
-+
-+			/* ESP Packet with Non-IKE marker */
-+			len = sizeof(struct udphdr) + 2 * sizeof(u32);
-+		} else
-+			/* Must be an IKE packet.. pass it through */
-+			return 1;
-+		break;
-+	}
-+
-+	/* At this point we are sure that this is an ESPinUDP packet,
-+	 * so we need to remove 'len' bytes from the packet (the UDP
-+	 * header and optional ESP marker bytes) and then modify the
-+	 * protocol to ESP, and then call into the transform receiver.
-+	 */
-+	if (skb_cloned(skb) && pskb_expand_head(skb, 0, 0, GFP_ATOMIC))
-+		goto drop;
-+
-+	/* Now we can update and verify the packet length... */
-+	iph = ip_hdr(skb);
-+	iphlen = iph->ihl << 2;
-+	iph->tot_len = htons(ntohs(iph->tot_len) - len);
-+	if (skb->len < iphlen + len) {
-+		/* packet is too small!?! */
-+		goto drop;
-+	}
-+
-+	/* pull the data buffer up to the ESP header and set the
-+	 * transport header to point to ESP.  Keep UDP on the stack
-+	 * for later.
-+	 */
-+	__skb_pull(skb, len);
-+	skb_reset_transport_header(skb);
-+
-+	/* modify the protocol (it's ESP!) */
-+	iph->protocol = IPPROTO_ESP;
-+
-+	/* process ESP */
-+	ret = (*xfrm4_rcv_encap_func)(skb, encap_type);
-+	return ret;
-+
-+drop:
-+	kfree_skb(skb);
-+	return 0;
-+}
-+
-+int udp4_register_esp_rcvencap(xfrm4_rcv_encap_t func,
-+		xfrm4_rcv_encap_t *oldfunc)
-+{
-+	if (oldfunc != NULL)
-+		*oldfunc = xfrm4_rcv_encap_func;
-+	xfrm4_rcv_encap_func = func;
-+	return 0;
-+}
-+
-+int udp4_unregister_esp_rcvencap(xfrm4_rcv_encap_t func)
-+{
-+	if (xfrm4_rcv_encap_func != func)
-+		return -1;
-+
-+	xfrm4_rcv_encap_func = NULL;
-+	return 0;
-+}
-+
-+#endif /* CONFIG_XFRM_MODULE || CONFIG_IPSEC_NAT_TRAVERSAL */
-+
- /* returns:
-  *  -1: error
-  *   0: success
-@@ -1252,6 +1375,11 @@
- 		case 0:
- 		case UDP_ENCAP_ESPINUDP:
- 		case UDP_ENCAP_ESPINUDP_NON_IKE:
-+#if defined(CONFIG_XFRM) || defined(CONFIG_IPSEC_NAT_TRAVERSAL)
-+			if (xfrm4_rcv_encap_func)
-+				up->encap_rcv = xfrm4_udp_encap_rcv_wrapper;
-+			else
-+#endif
- 			up->encap_rcv = xfrm4_udp_encap_rcv;
- 			/* FALLTHROUGH */
- 		case UDP_ENCAP_L2TPINUDP:
-@@ -1648,3 +1776,9 @@
- EXPORT_SYMBOL(udp_proc_register);
- EXPORT_SYMBOL(udp_proc_unregister);
- #endif
-+
-+#if defined(CONFIG_IPSEC_NAT_TRAVERSAL)
-+EXPORT_SYMBOL(udp4_register_esp_rcvencap);
-+EXPORT_SYMBOL(udp4_unregister_esp_rcvencap);
-+#endif
-+
-Index: linux-2.6.x/include/net/xfrmudp.h
-===================================================================
-RCS file: linux-2.6.x/include/net/xfrmudp.h
-diff -N linux-2.6.x/include/net/xfrmudp.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ linux-2.6.x/include/net/xfrmudp.h	3 Nov 2005 01:55:55 -0000	1.1
-@@ -0,0 +1,10 @@
-+/*
-+ * pointer to function for type that xfrm4_input wants, to permit
-+ * decoupling of XFRM from udp.c
-+ */
-+#define HAVE_XFRM4_UDP_REGISTER
-+
-+typedef int (*xfrm4_rcv_encap_t)(struct sk_buff *skb, __u16 encap_type);
-+extern int udp4_register_esp_rcvencap(xfrm4_rcv_encap_t func
-+				      , xfrm4_rcv_encap_t *oldfunc);
-+extern int udp4_unregister_esp_rcvencap(xfrm4_rcv_encap_t func);
--- a/src/patches/reiser4-for-2.6.20.patch
+++ b/src/patches/reiser4-for-2.6.20.patch
--- a/src/patches/reiser4-for-2.6.24.patch
+++ b/src/patches/reiser4-for-2.6.24.patch