Imported the beginning of the rowie-spezial and possible 2.2 release.

2026-04-18 23:12:59 +02:00 · 2008-05-17 23:58:21 +02:00
parent ee51a108cc
commit 4ce3790866
67 changed files with 142338 additions and 1324 deletions
--- a/config/kernel/kernel.config.i586
+++ b/config/kernel/kernel.config.i586
--- a/config/kernel/kernel.config.i586.smp
+++ b/config/kernel/kernel.config.i586.smp
--- a/config/rootfiles/common/klibc
+++ b/config/rootfiles/common/klibc
@@ -1,4 +1,4 @@
-lib/klibc-pFXBYGYRiBAAryaZ7Zw_ISKpcTk.so
+lib/klibc-a0tNUCyBK7E4egoFt3zvXR0uOfI.so
 usr/bin/klcc
 #usr/lib/klibc
 #usr/lib/klibc/bin
@@ -1566,7 +1566,7 @@ usr/lib/klibc/bin/zcat
 #usr/lib/klibc/lib
 #usr/lib/klibc/lib/crt0.o
 #usr/lib/klibc/lib/interp.o
-usr/lib/klibc/lib/klibc-pFXBYGYRiBAAryaZ7Zw_ISKpcTk.so
+usr/lib/klibc/lib/klibc-a0tNUCyBK7E4egoFt3zvXR0uOfI.so
 #usr/lib/klibc/lib/libc.a
 usr/lib/klibc/lib/libc.so
 #usr/man/man1/klcc.1
--- a/config/rootfiles/common/oldcore1
+++ b/config/rootfiles/common/oldcore1
--- a/config/rootfiles/common/oldcore10
+++ b/config/rootfiles/common/oldcore10
@@ -1,5 +1,5 @@
 etc/collectd.conf
-etc/init.d/collectd
+etc/rc.d/init.d/collectd
 usr/local/bin/wirelessctrl
 srv/web/ipfire/cgi-bin/optionsfw.cgi
 srv/web/ipfire/cgi-bin/gui.cgi
@@ -8,5 +8,3 @@ srv/web/ipfire/cgi-bin/services.cgi
 srv/web/ipfire/cgi-bin/graphs.cgi
 var/ipfire/langs
 var/ipfire/graphs.pl
-lib/modules/2.6.16.57-ipfire/kernel/drivers/parport/pt_drv.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/parport/pt_drv.ko
--- a/config/rootfiles/common/oldcore11
+++ b/config/rootfiles/common/oldcore11
--- a/config/rootfiles/common/oldcore12
+++ b/config/rootfiles/common/oldcore12
@@ -0,0 +1,11 @@
+etc/udev/dvb.sh
+etc/udev/rules.d/10-dvb.rules
+srv/web/ipfire/cgi-bin/services.cgi
+srv/web/ipfire/cgi-bin/proxy.cgi
+srv/web/ipfire/cgi-bin/urlfilter.cgi
+srv/web/ipfire/cgi-bin/updatexlrator.cgi
+srv/web/ipfire/cgi-bin/pakfire.cgi
+srv/web/ipfire/cgi-bin/logs.cgi/log.dat
+opt/pakfire/lib/functions.pl
+var/ipfire/langs
+etc/sysconfig/modules
--- a/config/rootfiles/common/oldcore13
+++ b/config/rootfiles/common/oldcore13
--- a/config/rootfiles/common/oldcore14
+++ b/config/rootfiles/common/oldcore14
@@ -0,0 +1,25 @@
+var/ipfire/langs
+etc/squid
+usr/lib/squid
+usr/sbin/squid
+srv/web/ipfire/cgi-bin/updatexlrator.cgi
+srv/web/ipfire/html/images/updxl-src-avg.gif
+usr/sbin/updxlrator
+srv/web/ipfire/html/images/audio-volume-high.png
+srv/web/ipfire/html/images/audio-volume-low.png
+srv/web/ipfire/html/images/audio-x-generic.png
+srv/web/ipfire/html/images/audio-volume-high-red.png
+srv/web/ipfire/html/images/audio-volume-low-red.png
+srv/web/ipfire/html/images/audio-x-generic-red.png
+srv/web/ipfire/html/images/media-flash.png
+srv/web/ipfire/html/images/media-playback-start-all.png
+srv/web/ipfire/html/images/media-repeat.png
+srv/web/ipfire/html/images/media-skip-backward.png
+srv/web/ipfire/html/images/media-floppy.png
+srv/web/ipfire/html/images/media-playback-start.png
+srv/web/ipfire/html/images/media-resume.png
+srv/web/ipfire/html/images/media-skip-forward.png
+srv/web/ipfire/html/images/media-optical.png
+srv/web/ipfire/html/images/media-playback-stop.png
+srv/web/ipfire/html/images/media-shuffle.png
+usr/share/curl/curl-ca-bundle.crt
--- a/config/rootfiles/common/oldcore2
+++ b/config/rootfiles/common/oldcore2
--- a/config/rootfiles/common/oldcore3
+++ b/config/rootfiles/common/oldcore3
--- a/config/rootfiles/common/oldcore4
+++ b/config/rootfiles/common/oldcore4
@@ -1,4 +1,4 @@
-etc/init.d/firewall
+etc/rc.d/init.d/firewall
 usr/local/bin/makegraphs
 var/ipfire/langs
 var/ipfire/optionsfw/settings
--- a/config/rootfiles/common/oldcore5
+++ b/config/rootfiles/common/oldcore5
@@ -0,0 +1,6 @@
+lib/modules/KVER-ipfire/kernel/fs/nfsd/nfsd.ko
+lib/modules/KVER-ipfire-smp/kernel/fs/nfsd/nfsd.ko
+usr/local/bin/qosctrl
+etc/rc.d/init.d/squid
+var/ipfire/langs
+var/ipfire/graphs.pl
--- a/config/rootfiles/common/oldcore6
+++ b/config/rootfiles/common/oldcore6
@@ -0,0 +1,7 @@
+srv/web/ipfire/cgi-bin/outgoingfw.cgi
+etc/rc.d/init.d/squid
+#bin/ntfs-3g
+#lib/libntfs-3g.so
+#lib/libntfs-3g.so.21
+#lib/libntfs-3g.so.21.0.0
+#sbin/mount.ntfs-3g
--- a/config/rootfiles/common/oldcore7
+++ b/config/rootfiles/common/oldcore7
@@ -1,11 +1,11 @@
 etc/collectd.conf
-etc/init.d/collectd
+etc/rc.d/init.d/collectd
 etc/rc.d/rc0.d/K50collectd
 etc/rc.d/rc3.d/S20collectd
 etc/rc.d/rc6.d/K50collectd
 etc/rc.d/rc3.d/S19smartenabler
-etc/init.d/smartenabler
-etc/init.d/networking/red
+etc/rc.d/init.d/smartenabler
+etc/rc.d/init.d/networking/red
 srv/web/ipfire/cgi-bin/graphs.cgi
 srv/web/ipfire/cgi-bin/hardwaregraphs.cgi
 srv/web/ipfire/cgi-bin/network.cgi
@@ -18,5 +18,5 @@ usr/sbin/collectd
 var/ipfire/graphs.pl
 var/ipfire/menu.d/20-status.menu
 var/ipfire/langs
-lib/modules/2.6.16.57-ipfire/kernel/drivers/ieee1394/sbp2.ko
+lib/modules/KVER-ipfire/kernel/drivers/ieee1394/sbp2.ko
 srv/web/ipfire/cgi-bin/logs.cgi/log.dat
--- a/config/rootfiles/common/oldcore8
+++ b/config/rootfiles/common/oldcore8
@@ -0,0 +1,3 @@
+srv/web/ipfire/cgi-bin/logs.cgi/log.dat
+etc/ntp
+usr/local/bin/wirelessctrl
--- a/config/rootfiles/common/oldcore9
+++ b/config/rootfiles/common/oldcore9
@@ -1,10 +1,8 @@
-lib/modules/2.6.16.57-ipfire/misc/kqemu.ko
-lib/modules/2.6.16.57-ipfire-smp/misc/kqemu.ko
 sbin/hdparm
 usr/lib/collectd
 usr/sbin/collectd
 usr/sbin/collectdmon
-etc/init.d/networking/red
+etc/rc.d/init.d/networking/red
 etc/squid
 sbin/capiinit
 usr/bin/capiinfo
--- a/config/rootfiles/core/1/meta
+++ b/config/rootfiles/core/1/meta
@@ -1 +0,0 @@
-DEPS=""
--- a/config/rootfiles/core/1/update.sh
+++ b/config/rootfiles/core/1/update.sh
@@ -1,6 +0,0 @@
-#!/bin/bash
-. /opt/pakfire/lib/functions.sh
-
-extract_files
-mv /srv/web/ipfire/html/updatecache /var/
-/etc/init.d/squid restart
--- a/config/rootfiles/core/10/meta
+++ b/config/rootfiles/core/10/meta
@@ -1 +0,0 @@
-DEPS=""
--- a/config/rootfiles/core/10/update.sh
+++ b/config/rootfiles/core/10/update.sh
@@ -1,7 +0,0 @@
-#!/bin/bash
-. /opt/pakfire/lib/functions.sh
-/usr/local/bin/backupctrl exclude >/dev/null 2>&1
-extract_files
-perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
-depmod -a
-/etc/init.d/collectd restart
--- a/config/rootfiles/core/11/meta
+++ b/config/rootfiles/core/11/meta
@@ -1 +0,0 @@
-DEPS=""
--- a/config/rootfiles/core/11/update.sh
+++ b/config/rootfiles/core/11/update.sh
@@ -1,9 +0,0 @@
-#!/bin/bash
-. /opt/pakfire/lib/functions.sh
-/usr/local/bin/backupctrl exclude >/dev/null 2>&1
-/etc/init.d/squid stop
-extract_files
-perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
-squidGuard -d -C all
-chmod 666 /var/ipfire/urlfilter/blacklists/*/*.db
-/etc/init.d/squid start
--- a/config/rootfiles/core/12/files
+++ b/config/rootfiles/core/12/files
@@ -1,137 +0,0 @@
-lib/modules/2.6.16.57-ipfire/kernel/drivers/i2c/i2c-core.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/i2c/algos/i2c-algo-bit.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/common/saa7146.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/common/saa7146_vv.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/ttpci/budget-ci.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/ttpci/budget.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/ttpci/budget-patch.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/ttpci/ttpci-eeprom.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/ttpci/dvb-ttpci.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/ttpci/budget-av.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/ttpci/budget-core.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/ttusb-dec/ttusbdecfe.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/ttusb-dec/ttusb_dec.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/dvb-usb/dvb-usb-cxusb.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/dvb-usb/dvb-usb-digitv.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/dvb-usb/dvb-usb-dibusb-common.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/dvb-usb/dvb-usb-umt-010.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/dvb-usb/dvb-usb-dibusb-mb.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/dvb-usb/dvb-usb-dibusb-mc.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/dvb-usb/dvb-usb-nova-t-usb2.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/dvb-usb/dvb-usb-vp7045.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/dvb-usb/dvb-usb-a800.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/dvb-usb/dvb-usb-dtt200u.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/dvb-usb/dvb-usb-vp702x.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/dvb-usb/dvb-usb.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/pluto2/pluto2.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/cinergyT2/cinergyT2.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/b2c2/b2c2-flexcop-pci.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/b2c2/b2c2-flexcop.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/b2c2/b2c2-flexcop-usb.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/s5h1420.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/dib3000mb.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/mt352.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/cx22702.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/ves1x93.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/or51132.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/tda10021.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/or51211.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/cx24123.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/sp8870.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/nxt6000.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/tda1004x.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/mt312.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/tda8083.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/nxt200x.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/cx24110.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/stv0299.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/l64781.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/dvb-pll.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/ves1820.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/sp887x.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/dib3000mc.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/bcm3510.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/cx22700.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/lgdt330x.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/stv0297.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/dvb-core/dvb-core.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/video/compat_ioctl32.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/video/videodev.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/video/v4l1-compat.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/video/v4l2-common.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/i2c/i2c-core.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/i2c/algos/i2c-algo-bit.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/common/saa7146.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/common/saa7146_vv.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/ttpci/budget-ci.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/ttpci/budget.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/ttpci/budget-patch.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/ttpci/ttpci-eeprom.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/ttpci/dvb-ttpci.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/ttpci/budget-av.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/ttpci/budget-core.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/ttusb-dec/ttusbdecfe.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/ttusb-dec/ttusb_dec.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/dvb-usb/dvb-usb-cxusb.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/dvb-usb/dvb-usb-digitv.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/dvb-usb/dvb-usb-dibusb-common.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/dvb-usb/dvb-usb-umt-010.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/dvb-usb/dvb-usb-dibusb-mb.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/dvb-usb/dvb-usb-dibusb-mc.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/dvb-usb/dvb-usb-nova-t-usb2.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/dvb-usb/dvb-usb-vp7045.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/dvb-usb/dvb-usb-a800.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/dvb-usb/dvb-usb-dtt200u.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/dvb-usb/dvb-usb-vp702x.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/dvb-usb/dvb-usb.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/pluto2/pluto2.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/cinergyT2/cinergyT2.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/b2c2/b2c2-flexcop-pci.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/b2c2/b2c2-flexcop.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/b2c2/b2c2-flexcop-usb.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/s5h1420.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/dib3000mb.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/mt352.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/cx22702.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/ves1x93.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/or51132.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/tda10021.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/or51211.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/cx24123.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/sp8870.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/nxt6000.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/tda1004x.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/mt312.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/tda8083.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/nxt200x.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/cx24110.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/stv0299.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/l64781.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/dvb-pll.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/ves1820.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/sp887x.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/dib3000mc.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/bcm3510.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/cx22700.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/lgdt330x.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/stv0297.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/dvb-core/dvb-core.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/compat_ioctl32.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/videodev.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/v4l1-compat.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/v4l2-common.ko
-etc/udev/dvb.sh
-etc/udev/rules.d/10-dvb.rules
-srv/web/ipfire/cgi-bin/services.cgi
-lib/modules/2.6.16.57-ipfire/kernel/drivers/usb/net/dm9601.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/usb/net/dm9601.ko
-srv/web/ipfire/cgi-bin/proxy.cgi
-srv/web/ipfire/cgi-bin/urlfilter.cgi
-srv/web/ipfire/cgi-bin/updatexlrator.cgi
-srv/web/ipfire/cgi-bin/pakfire.cgi
-srv/web/ipfire/cgi-bin/logs.cgi/log.dat
-opt/pakfire/lib/functions.pl
-var/ipfire/langs
-etc/sysconfig/modules
--- a/config/rootfiles/core/12/meta
+++ b/config/rootfiles/core/12/meta
@@ -1 +0,0 @@
-DEPS=""
--- a/config/rootfiles/core/12/update.sh
+++ b/config/rootfiles/core/12/update.sh
@@ -1,8 +0,0 @@
-#!/bin/bash
-. /opt/pakfire/lib/functions.sh
-/usr/local/bin/backupctrl exclude >/dev/null 2>&1
-extract_files
-perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
-depmod -a 2.6.16.57-ipfire
-depmod -a 2.6.16.57-ipfire-smp
-
--- a/config/rootfiles/core/13/meta
+++ b/config/rootfiles/core/13/meta
@@ -1 +0,0 @@
-DEPS=""
--- a/config/rootfiles/core/13/update.sh
+++ b/config/rootfiles/core/13/update.sh
@@ -1,6 +0,0 @@
-#!/bin/bash
-. /opt/pakfire/lib/functions.sh
-/usr/local/bin/backupctrl exclude >/dev/null 2>&1
-extract_files
-/var/ipfire/urlfilter/bin/prebuild.pl
-/etc/init.d/squid restart
--- a/config/rootfiles/core/14/files
+++ b/config/rootfiles/core/14/files
@@ -1,297 +0,0 @@
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/common/ir-common.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/common/saa7146_vv.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/common/tuners/tea5761.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/common/tuners/mt2131.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/common/tuners/tuner-xc2028.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/common/tuners/xc5000.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/common/tuners/tuner-types.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/common/tuners/qt1010.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/common/tuners/tuner-simple.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/common/tuners/tda8290.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/common/tuners/tda18271.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/common/tuners/tda827x.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/common/tuners/mt2266.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/common/tuners/tda9887.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/common/tuners/tea5767.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/common/tuners/mt20xx.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/common/tuners/mt2060.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/common/saa7146.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/pluto2/pluto2.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/b2c2/b2c2-flexcop-pci.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/b2c2/b2c2-flexcop.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/b2c2/b2c2-flexcop-usb.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/cinergyT2/cinergyT2.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/dvb-usb/dvb-usb-au6610.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/dvb-usb/dvb-usb-dibusb-mc.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/dvb-usb/dvb-usb-cxusb.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/dvb-usb/dvb-usb-gp8psk.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/dvb-usb/dvb-usb-opera.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/dvb-usb/dvb-usb-vp702x.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/dvb-usb/dvb-usb-vp7045.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/dvb-usb/dvb-usb-ttusb2.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/dvb-usb/dvb-usb-digitv.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/dvb-usb/dvb-usb-umt-010.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/dvb-usb/dvb-usb-nova-t-usb2.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/dvb-usb/dvb-usb-dibusb-mb.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/dvb-usb/dvb-usb-af9005.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/dvb-usb/dvb-usb-m920x.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/dvb-usb/dvb-usb.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/dvb-usb/dvb-usb-dtt200u.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/dvb-usb/dvb-usb-a800.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/dvb-usb/dvb-usb-dibusb-common.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/dvb-usb/dvb-usb-af9005-remote.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/dvb-usb/dvb-usb-gl861.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/dvb-usb/dvb-usb-dib0700.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/sp8870.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/dib3000mc.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/dib7000p.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/tda826x.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/isl6405.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/ves1x93.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/or51132.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/isl6421.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/mt352.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/tda10023.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/cx24123.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/drx397xD.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/cx24110.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/s5h1409.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/dib0070.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/dibx000_common.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/cx22700.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/stv0297.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/nxt6000.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/stv0299.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/au8522.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/tua6100.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/s5h1411.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/mt312.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/dvb-pll.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/lgdt330x.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/bcm3510.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/dib3000mb.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/itd1000.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/l64781.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/nxt200x.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/tda10048.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/ves1820.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/dib7000m.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/lnbp21.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/tda10086.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/zl10353.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/s5h1420.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/tda10021.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/cx22702.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/or51211.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/sp887x.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/tda1004x.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/tda8083.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/ttpci/budget-core.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/ttpci/ttpci-eeprom.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/ttpci/budget.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/ttpci/dvb-ttpci.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/ttpci/budget-ci.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/ttpci/budget-av.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/ttpci/budget-patch.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/dvb-core/dvb-core.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/ttusb-dec/ttusbdecfe.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/ttusb-dec/ttusb_dec.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/bt8xx/dst_ca.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/bt8xx/dvb-bt8xx.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/bt8xx/bt878.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/bt8xx/dst.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/video/msp3400.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/video/v4l1-compat.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/video/videobuf-dvb.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/video/ir-kbd-i2c.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/video/cs53l32a.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/video/btcx-risc.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/video/cx2341x.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/video/v4l2-common.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/video/tda9875.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/video/videobuf-dma-sg.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/video/cx88/cx88-dvb.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/video/cx88/cx8802.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/video/cx88/cx88xx.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/video/cx88/cx88-vp3054-i2c.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/video/cx88/cx8800.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/video/v4l2-int-device.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/video/videodev.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/video/wm8775.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/video/videobuf-core.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/video/pvrusb2/pvrusb2.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/video/compat_ioctl32.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/video/tvaudio.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/video/cx25840/cx25840.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/video/saa7115.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/video/tda7432.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/video/bt8xx/bttv.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/video/tveeprom.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/video/saa7134
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/video/saa7134/saa6752hs.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/video/saa7134/saa7134-dvb.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/video/saa7134/saa7134-empress.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/video/saa7134/saa7134.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/media/video/tuner.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/common/ir-common.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/common/saa7146_vv.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/common/tuners/tea5761.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/common/tuners/mt2131.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/common/tuners/tuner-xc2028.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/common/tuners/xc5000.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/common/tuners/tuner-types.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/common/tuners/qt1010.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/common/tuners/tuner-simple.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/common/tuners/tda8290.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/common/tuners/tda18271.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/common/tuners/tda827x.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/common/tuners/mt2266.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/common/tuners/tda9887.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/common/tuners/tea5767.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/common/tuners/mt20xx.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/common/tuners/mt2060.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/common/saa7146.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/pluto2/pluto2.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/b2c2/b2c2-flexcop-pci.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/b2c2/b2c2-flexcop.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/b2c2/b2c2-flexcop-usb.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/cinergyT2/cinergyT2.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/dvb-usb/dvb-usb-au6610.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/dvb-usb/dvb-usb-dibusb-mc.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/dvb-usb/dvb-usb-cxusb.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/dvb-usb/dvb-usb-gp8psk.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/dvb-usb/dvb-usb-opera.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/dvb-usb/dvb-usb-vp702x.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/dvb-usb/dvb-usb-vp7045.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/dvb-usb/dvb-usb-ttusb2.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/dvb-usb/dvb-usb-digitv.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/dvb-usb/dvb-usb-umt-010.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/dvb-usb/dvb-usb-nova-t-usb2.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/dvb-usb/dvb-usb-dibusb-mb.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/dvb-usb/dvb-usb-af9005.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/dvb-usb/dvb-usb-m920x.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/dvb-usb/dvb-usb.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/dvb-usb/dvb-usb-dtt200u.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/dvb-usb/dvb-usb-a800.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/dvb-usb/dvb-usb-dibusb-common.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/dvb-usb/dvb-usb-af9005-remote.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/dvb-usb/dvb-usb-gl861.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/dvb-usb/dvb-usb-dib0700.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/sp8870.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/dib3000mc.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/dib7000p.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/tda826x.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/isl6405.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/ves1x93.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/or51132.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/isl6421.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/mt352.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/tda10023.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/cx24123.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/drx397xD.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/cx24110.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/s5h1409.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/dib0070.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/dibx000_common.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/cx22700.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/stv0297.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/nxt6000.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/stv0299.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/au8522.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/tua6100.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/s5h1411.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/mt312.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/dvb-pll.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/lgdt330x.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/bcm3510.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/dib3000mb.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/itd1000.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/l64781.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/nxt200x.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/tda10048.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/ves1820.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/dib7000m.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/lnbp21.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/tda10086.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/zl10353.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/s5h1420.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/tda10021.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/cx22702.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/or51211.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/sp887x.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/tda1004x.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/tda8083.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/ttpci/budget-core.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/ttpci/ttpci-eeprom.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/ttpci/budget.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/ttpci/dvb-ttpci.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/ttpci/budget-ci.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/ttpci/budget-av.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/ttpci/budget-patch.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/dvb-core/dvb-core.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/ttusb-dec/ttusbdecfe.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/ttusb-dec/ttusb_dec.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/bt8xx/dst_ca.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/bt8xx/dvb-bt8xx.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/bt8xx/bt878.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/bt8xx/dst.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/msp3400.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/v4l1-compat.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/videobuf-dvb.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/ir-kbd-i2c.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/cs53l32a.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/btcx-risc.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/cx2341x.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/v4l2-common.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/tda9875.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/videobuf-dma-sg.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/cx88/cx88-dvb.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/cx88/cx8802.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/cx88/cx88xx.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/cx88/cx88-vp3054-i2c.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/cx88/cx8800.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/v4l2-int-device.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/videodev.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/wm8775.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/videobuf-core.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/pvrusb2/pvrusb2.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/compat_ioctl32.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/tvaudio.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/cx25840/cx25840.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/saa7115.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/tda7432.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/bt8xx/bttv.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/tveeprom.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/saa7134
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/saa7134/saa6752hs.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/saa7134/saa7134-dvb.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/saa7134/saa7134-empress.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/saa7134/saa7134.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/tuner.ko
-var/ipfire/langs
-etc/squid
-usr/lib/squid
-usr/sbin/squid
-srv/web/ipfire/cgi-bin/updatexlrator.cgi
-srv/web/ipfire/html/images/updxl-src-avg.gif
-usr/sbin/updxlrator
-srv/web/ipfire/html/images/audio-volume-high.png
-srv/web/ipfire/html/images/audio-volume-low.png
-srv/web/ipfire/html/images/audio-x-generic.png
-srv/web/ipfire/html/images/audio-volume-high-red.png
-srv/web/ipfire/html/images/audio-volume-low-red.png
-srv/web/ipfire/html/images/audio-x-generic-red.png
-srv/web/ipfire/html/images/media-flash.png
-srv/web/ipfire/html/images/media-playback-start-all.png
-srv/web/ipfire/html/images/media-repeat.png
-srv/web/ipfire/html/images/media-skip-backward.png
-srv/web/ipfire/html/images/media-floppy.png
-srv/web/ipfire/html/images/media-playback-start.png
-srv/web/ipfire/html/images/media-resume.png
-srv/web/ipfire/html/images/media-skip-forward.png
-srv/web/ipfire/html/images/media-optical.png
-srv/web/ipfire/html/images/media-playback-stop.png
-srv/web/ipfire/html/images/media-shuffle.png
-usr/share/curl/curl-ca-bundle.crt
--- a/config/rootfiles/core/14/meta
+++ b/config/rootfiles/core/14/meta
@@ -1 +0,0 @@
-DEPS=""
--- a/config/rootfiles/core/14/update.sh
+++ b/config/rootfiles/core/14/update.sh
@@ -1,13 +0,0 @@
-#!/bin/bash
-. /opt/pakfire/lib/functions.sh
-/usr/local/bin/backupctrl exclude >/dev/null 2>&1
-rm /lib/modules/2.6.16.57-ipfire/kernel/drivers/media/video/video-buf.ko
-rm /lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/dib3000-common.ko
-rm /lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/video-buf.ko
-rm /lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/dib3000-common.ko
-/etc/init.d/squid stop
-extract_files
-perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
-/etc/init.d/squid start
-depmod -a 2.6.16.57-ipfire
-depmod -a 2.6.16.57-ipfire-smp
--- a/config/rootfiles/core/2/meta
+++ b/config/rootfiles/core/2/meta
@@ -1 +0,0 @@
-DEPS=""
--- a/config/rootfiles/core/2/update.sh
+++ b/config/rootfiles/core/2/update.sh
@@ -1,10 +0,0 @@
-#!/bin/bash
-. /opt/pakfire/lib/functions.sh
-mv /etc/sysconfig/rc.local /etc/sysconfig/rc.local.old
-extract_files
-if [ -e "/var/ipfire/qos/enable" ]; then
- /usr/local/bin/qosctrl stop
- /usr/local/bin/qosctrl generate
- /usr/local/bin/qosctrl start
-fi
-/usr/local/bin/outgoingfwctrl restart
--- a/config/rootfiles/core/3/meta
+++ b/config/rootfiles/core/3/meta
@@ -1 +0,0 @@
-DEPS=""
--- a/config/rootfiles/core/3/update.sh
+++ b/config/rootfiles/core/3/update.sh
@@ -1,3 +0,0 @@
-#!/bin/bash
-. /opt/pakfire/lib/functions.sh
-extract_files
--- a/config/rootfiles/core/4/meta
+++ b/config/rootfiles/core/4/meta
@@ -1 +0,0 @@
-DEPS=""
--- a/config/rootfiles/core/4/update.sh
+++ b/config/rootfiles/core/4/update.sh
@@ -1,4 +0,0 @@
-#!/bin/bash
-. /opt/pakfire/lib/functions.sh
-extract_files
-perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
--- a/config/rootfiles/core/5/files
+++ b/config/rootfiles/core/5/files
@@ -1,6 +0,0 @@
-lib/modules/2.6.16.57-ipfire/kernel/fs/nfsd/nfsd.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/fs/nfsd/nfsd.ko
-usr/local/bin/qosctrl
-etc/init.d/squid
-var/ipfire/langs
-var/ipfire/graphs.pl
--- a/config/rootfiles/core/5/meta
+++ b/config/rootfiles/core/5/meta
@@ -1 +0,0 @@
-DEPS=""
--- a/config/rootfiles/core/5/update.sh
+++ b/config/rootfiles/core/5/update.sh
@@ -1,5 +0,0 @@
-#!/bin/bash
-. /opt/pakfire/lib/functions.sh
-extract_files
-perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
-depmod -a
--- a/config/rootfiles/core/6/files
+++ b/config/rootfiles/core/6/files
@@ -1,19 +0,0 @@
-lib/modules/2.6.16.57-ipfire/kernel/fs/fuse
-lib/modules/2.6.16.57-ipfire-smp/kernel/fs/fuse
-lib/modules/2.6.16.57-ipfire/kernel/drivers/net/r8169.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/net/r8168.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/usb/net/mcs7830.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/ieee1394/sbp2.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/net/r8169.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/net/r8168.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/usb/net/mcs7830.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/ieee1394/sbp2.ko
-/sbin/kudzu
-var/ipfire/langs
-srv/web/ipfire/cgi-bin/outgoingfw.cgi
-etc/init.d/squid
-#bin/ntfs-3g
-#lib/libntfs-3g.so
-#lib/libntfs-3g.so.21
-#lib/libntfs-3g.so.21.0.0
-#sbin/mount.ntfs-3g
--- a/config/rootfiles/core/6/meta
+++ b/config/rootfiles/core/6/meta
@@ -1 +0,0 @@
-DEPS=""
--- a/config/rootfiles/core/6/update.sh
+++ b/config/rootfiles/core/6/update.sh
@@ -1,5 +0,0 @@
-#!/bin/bash
-. /opt/pakfire/lib/functions.sh
-extract_files
-depmod -a
-perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
--- a/config/rootfiles/core/7/meta
+++ b/config/rootfiles/core/7/meta
@@ -1 +0,0 @@
-DEPS=""
--- a/config/rootfiles/core/7/update.sh
+++ b/config/rootfiles/core/7/update.sh
@@ -1,8 +0,0 @@
-#!/bin/bash
-. /opt/pakfire/lib/functions.sh
-extract_files
-depmod -a
-GATEWAY=$(cat /var/ipfire/red/remote-ipaddress)
-echo "$GATEWAY gateway" >> /etc/hosts
-/etc/init.d/collectd start
-perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
--- a/config/rootfiles/core/8/files
+++ b/config/rootfiles/core/8/files
@@ -1,7 +0,0 @@
-lib/modules/2.6.16.57-ipfire/kernel/drivers/net/r8169.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/net/r8168.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/net/r8169.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/net/r8168.ko
-srv/web/ipfire/cgi-bin/logs.cgi/log.dat
-etc/ntp
-usr/local/bin/wirelessctrl
--- a/config/rootfiles/core/8/meta
+++ b/config/rootfiles/core/8/meta
@@ -1 +0,0 @@
-DEPS=""
--- a/config/rootfiles/core/8/update.sh
+++ b/config/rootfiles/core/8/update.sh
@@ -1,6 +0,0 @@
-#!/bin/bash
-. /opt/pakfire/lib/functions.sh
-/usr/local/bin/backupctrl exclude >/dev/null 2>&1
-extract_files
-depmod -a
-
--- a/config/rootfiles/core/9/meta
+++ b/config/rootfiles/core/9/meta
@@ -1 +0,0 @@
-DEPS=""
--- a/config/rootfiles/core/9/update.sh
+++ b/config/rootfiles/core/9/update.sh
@@ -1,10 +0,0 @@
-#!/bin/bash
-. /opt/pakfire/lib/functions.sh
-/usr/local/bin/backupctrl exclude >/dev/null 2>&1
-/etc/init.d/squid stop
-/etc/init.d/collectd stop
-extract_files
-/etc/init.d/squid start
-/etc/init.d/collectd start
-depmod -a
-perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
--- a/config/rootfiles/packages/pcmciautils
+++ b/config/rootfiles/packages/pcmciautils
@@ -7,22 +7,22 @@ sbin/pcmcia-check-broken-cis
 sbin/pcmcia-socket-startup
 #usr/share/man/man8/lspcmcia.8
 #usr/share/man/man8/pccardctl.8
-lib/modules/2.6.16.57-ipfire/kernel/drivers/char/pcmcia
-lib/modules/2.6.16.57-ipfire/kernel/drivers/ide/legacy/ide-cs.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/net/pcmcia
-lib/modules/2.6.16.57-ipfire/kernel/drivers/net/tulip/xircom_cb.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/net/tulip/xircom_tulip_cb.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/scsi/pcmcia
-lib/modules/2.6.16.57-ipfire/kernel/drivers/parport/parport_cs.ko
-lib/modules/2.6.16.57-ipfire/kernel/drivers/pcmcia
-lib/modules/2.6.16.57-ipfire/kernel/drivers/serial/serial_cs.ko
-lib/modules/2.6.16.57-ipfire/kernel/sound/pcmcia
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/char/pcmcia
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/ide/legacy/ide-cs.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/net/pcmcia
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/net/tulip/xircom_cb.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/scsi/pcmcia
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/parport/parport_cs.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/pcmcia
-lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/serial/serial_cs.ko
-lib/modules/2.6.16.57-ipfire-smp/kernel/sound/pcmcia
+lib/modules/KVER-ipfire/kernel/drivers/char/pcmcia
+lib/modules/KVER-ipfire/kernel/drivers/ide/legacy/ide-cs.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/pcmcia
+lib/modules/KVER-ipfire/kernel/drivers/net/tulip/xircom_cb.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/tulip/xircom_tulip_cb.ko
+lib/modules/KVER-ipfire/kernel/drivers/scsi/pcmcia
+lib/modules/KVER-ipfire/kernel/drivers/parport/parport_cs.ko
+lib/modules/KVER-ipfire/kernel/drivers/pcmcia
+lib/modules/KVER-ipfire/kernel/drivers/serial/serial_cs.ko
+lib/modules/KVER-ipfire/kernel/sound/pcmcia
+lib/modules/KVER-ipfire-smp/kernel/drivers/char/pcmcia
+lib/modules/KVER-ipfire-smp/kernel/drivers/ide/legacy/ide-cs.ko
+lib/modules/KVER-ipfire-smp/kernel/drivers/net/pcmcia
+lib/modules/KVER-ipfire-smp/kernel/drivers/net/tulip/xircom_cb.ko
+lib/modules/KVER-ipfire-smp/kernel/drivers/scsi/pcmcia
+lib/modules/KVER-ipfire-smp/kernel/drivers/parport/parport_cs.ko
+lib/modules/KVER-ipfire-smp/kernel/drivers/pcmcia
+lib/modules/KVER-ipfire-smp/kernel/drivers/serial/serial_cs.ko
+lib/modules/KVER-ipfire-smp/kernel/sound/pcmcia
--- a/config/v4l-dvb/config
+++ b/config/v4l-dvb/config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 
-# Tue May 13 21:13:59 2008
+# Sat May 17 18:34:26 2008
 #
 CONFIG_INPUT=y
 CONFIG_USB=m
@@ -12,7 +12,7 @@ CONFIG_FW_LOADER=m
 # CONFIG_of is not set
 # CONFIG_PLAT_M32700UT is not set
 CONFIG_NET=y
-CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_COPYAREA=m
 # CONFIG_GENERIC_GPIO is not set
 # CONFIG_SOUND_PRIME is not set
 CONFIG_SND_AC97_CODEC=m
@@ -20,7 +20,7 @@ CONFIG_SND_AC97_CODEC=m
 # CONFIG_dependencies is not set
 # CONFIG_SGI_IP22 is not set
 CONFIG_I2C=m
-CONFIG_FB_CFB_IMAGEBLIT=y
+CONFIG_FB_CFB_IMAGEBLIT=m
 # CONFIG_GPIO_PCA953X is not set
 # CONFIG_STANDALONE is not set
 CONFIG_HOTPLUG=y
@@ -51,7 +51,7 @@ CONFIG_SND_PCM=m
 CONFIG_EXPERIMENTAL=y
 # CONFIG_M32R is not set
 # CONFIG_I2C_ALGO_SGI is not set
-CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_FILLRECT=m
 CONFIG_VIRT_TO_BUS=y
 # CONFIG_VIDEO_KERNEL_VERSION is not set

@@ -91,11 +91,12 @@ CONFIG_MEDIA_TUNER_MT2131=m
 CONFIG_MEDIA_TUNER_QT1010=m
 CONFIG_MEDIA_TUNER_XC2028=m
 CONFIG_MEDIA_TUNER_XC5000=m
-# CONFIG_MEDIA_TUNER_MXL5005S is not set
+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
@@ -103,67 +104,123 @@ CONFIG_VIDEO_IR=m
 CONFIG_VIDEO_TVEEPROM=m
 CONFIG_VIDEO_TUNER=m
 CONFIG_VIDEO_CAPTURE_DRIVERS=y
-CONFIG_VIDEO_ADV_DEBUG=n
+# 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 is not set
-# CONFIG_VIDEO_PMS is not set
-# CONFIG_VIDEO_BWQCAM is not set
-# CONFIG_VIDEO_CQCAM is not set
-# CONFIG_VIDEO_CPIA is not set
-# CONFIG_VIDEO_CPIA2 is not set
-# CONFIG_VIDEO_SAA5246A is not set
-# CONFIG_VIDEO_SAA5249 is not set
-# CONFIG_TUNER_3036 is not set
-# CONFIG_VIDEO_STRADIS is not set
-# CONFIG_VIDEO_ZORAN is not set
+CONFIG_VIDEO_SAA6588=m
+CONFIG_VIDEO_PMS=m
+CONFIG_VIDEO_BWQCAM=m
+CONFIG_VIDEO_CQCAM=m
+CONFIG_VIDEO_CPIA=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 is not set
+CONFIG_VIDEO_SAA7134_ALSA=m
 CONFIG_VIDEO_SAA7134_DVB=m
-# CONFIG_VIDEO_MXB is not set
-# CONFIG_VIDEO_DPC is not set
-# CONFIG_VIDEO_HEXIUM_ORION is not set
-# CONFIG_VIDEO_HEXIUM_GEMINI is not set
+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 is not set
-# CONFIG_VIDEO_CX88_BLACKBIRD is not set
+CONFIG_VIDEO_CX88_ALSA=m
+CONFIG_VIDEO_CX88_BLACKBIRD=m
 CONFIG_VIDEO_CX88_DVB=m
 CONFIG_VIDEO_CX88_VP3054=m
-# 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_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_VIDEO_PVRUSB2=m
+CONFIG_VIDEO_PVRUSB2_SYSFS=y
 CONFIG_VIDEO_PVRUSB2_DVB=y
-# CONFIG_VIDEO_EM28XX is not set
-# CONFIG_VIDEO_USBVISION is not set
-# CONFIG_USB_VICAM is not set
-# CONFIG_USB_IBMCAM is not set
-# CONFIG_USB_KONICAWC is not set
-# CONFIG_USB_QUICKCAM_MESSENGER is not set
-# CONFIG_USB_ET61X251 is not set
-# CONFIG_VIDEO_OVCAMCHIP is not set
-# CONFIG_USB_W9968CF is not set
-# CONFIG_USB_OV511 is not set
-# CONFIG_USB_SE401 is not set
-# CONFIG_USB_SN9C102 is not set
-# CONFIG_USB_STV680 is not set
-# CONFIG_USB_ZC0301 is not set
-# CONFIG_USB_PWC is not set
-# CONFIG_USB_ZR364XX is not set
-# CONFIG_RADIO_ADAPTERS is not set
+# 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=y
+CONFIG_USB_ZR364XX=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

 #
@@ -183,7 +240,7 @@ CONFIG_DVB_BUDGET_PATCH=m
 # Supported USB Adapters
 #
 CONFIG_DVB_USB=m
-CONFIG_DVB_USB_DEBUG=n
+# 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
@@ -215,7 +272,7 @@ CONFIG_DVB_CINERGYT2=m
 CONFIG_DVB_B2C2_FLEXCOP=m
 CONFIG_DVB_B2C2_FLEXCOP_PCI=m
 CONFIG_DVB_B2C2_FLEXCOP_USB=m
-CONFIG_DVB_B2C2_FLEXCOP_DEBUG=n
+# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set

 #
 # Supported BT878 Adapters
@@ -302,7 +359,8 @@ CONFIG_DVB_TUNER_DIB0070=m
 CONFIG_DVB_LNBP21=m
 CONFIG_DVB_ISL6405=m
 CONFIG_DVB_ISL6421=m
-# CONFIG_DAB is not set
+CONFIG_DAB=y
+CONFIG_USB_DABUSB=m

 #
 # Audio devices for multimedia
@@ -311,7 +369,8 @@ CONFIG_DVB_ISL6421=m
 #
 # ALSA sound
 #
-# CONFIG_SND_BT87X is not set
+CONFIG_SND_BT87X=m
+CONFIG_SND_BT87X_OVERCLOCK=y

 #
 # OSS sound
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -1,4 +1,4 @@
-== List of softwares used to build IPFire Version: 2.1 ==
+== List of softwares used to build IPFire Version: 2.2-test ==
 * Archive-Tar-1.29
 * Archive-Zip-1.16
 * BerkeleyDB-0.27
@@ -70,7 +70,6 @@
 * dhcp-3.1.0
 * dhcpcd-2.0.8
 * diffutils-2.8.1
-* dm9601-2.6
 * dnsmasq-2.40
 * dosfstools-2.11
 * e2fsprogs-1.39
@@ -128,7 +127,7 @@
 * ipp2p-0.8.2
 * ipp2p-0.8.2-iptables
 * iproute2-2.6.16-060323
-* iptables-1.3.5
+* iptables-1.3.8
 * iptstate-2.1
 * iputils-ss020927
 * java-1.5.0_06-for-ipfire
@@ -163,7 +162,7 @@
 * libwww-perl-5.803
 * libxml2-2.6.26
 * libxslt-1.1.17
-* linux-2.6.16.57
+* linux-2.6.20.21
 * linux-atm-2.4.1
 * linux-libc-headers-2.6.12.0
 * linuxigd-0.95
@@ -178,7 +177,6 @@
 * man-pages-2.34
 * mbr-1.1.8
 * mc-4.6.1
-* mcs7830-060926
 * memtest86+-1.65
 * misc-progs
 * mkinitcpio-0.5.9
@@ -213,7 +211,7 @@
 * openmailadmin-1.0.0
 * openssh-4.7p1
 * openssl-0.9.8g
-* openswan-2.4.9
+* openswan-2.4.12
 * openvpn-2.0.9
 * pam_mysql-0.7RC1
 * patch-2.5.4
--- a/lfs/collectd
+++ b/lfs/collectd
@@ -78,10 +78,10 @@ $(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 --localstatedir=/var \
-		--disable-{apache,apple_sensors,csv,ipvs,memcached,mysql,netlink,nginx,nut} \
+		--disable-{apache,apple_sensors,csv,iptables,ipvs,memcached,mysql,netlink,nginx,nut} \
 		--disable-{perl,serial,sensors,snmp,tape,vserver,wireless,xmms} \
 		--enable-{apcups,battery,cpu{,freq},df,disk,dns,email,entropy,exec,hddtemp} \
-		--enable-{interface,iptables,irq,load,logfile,mbmon,memory,multimeter} \
+		--enable-{interface,irq,load,logfile,mbmon,memory,multimeter} \
 		--enable-{network,nfs,ntpd,ping,processes,rrdtool,swap,syslog} \
 		--enable-{tcpconns,unixsock,users} \
 		--with-rrdtool=/usr/share/rrdtool-1.2.15 --enable-debug
--- a/lfs/core-updates
+++ b/lfs/core-updates
@@ -55,6 +55,7 @@ core/%:
 	eval $$(cat /usr/src/config/rootfiles/$@/meta)
 	cp -f /usr/src/config/rootfiles/$@/update.sh /install/packages/package
 	cp -f /usr/src/config/rootfiles/$@/files /install/packages/package/ROOTFILES
+	sed -e 's/KVER/$(KVER)/g' -i /install/packages/package/ROOTFILES
 	chmod 755 /install/packages/package/update.sh
 	cd / && tar cf /install/packages/package/files --files-from=/install/packages/package/ROOTFILES --exclude='#*'
 	-cat /install/packages/package/ROOTFILES | grep -v "#" > /install/packages/package/ROOTFILES
--- a/lfs/iptables
+++ b/lfs/iptables
@@ -24,7 +24,7 @@

 include Config

-VER        = 1.3.5
+VER        = 1.3.8

 THISAPP    = iptables-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -45,7 +45,7 @@ netfilter-layer7-v2.9.tar.gz 	= $(URL_IPFIRE)/netfilter-layer7-v2.9.tar.gz
 libnfnetlink-0.0.25.tar.bz2		= $(URL_IPFIRE)/libnfnetlink-0.0.25.tar.bz2
 libnetfilter_queue-0.0.13.tar.bz2	= $(URL_IPFIRE)/libnetfilter_queue-0.0.13.tar.bz2

-$(DL_FILE)_MD5 = 00fb916fa8040ca992a5ace56d905ea5
+$(DL_FILE)_MD5 = 0a9209f928002e5eee9cdff8fef4d4b3
 netfilter-layer7-v2.9.tar.gz_MD5 = ebf9043a5352ebe6dbd721989ef83dee
 libnfnetlink-0.0.25.tar.bz2_MD5 = fc915a2e66d282e524af6ef939042d7d
 libnetfilter_queue-0.0.13.tar.bz2_MD5 = 660cbfd3dc8c10bf9b1803cd2b688256
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,8 +24,8 @@

 include Config

-PATCHLEVEL = .57
-VER        = 2.6.16.57
+PATCHLEVEL = .21
+VER        = 2.6.20.21

 THISAPP    = linux-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -48,30 +48,30 @@ endif
 ###############################################################################
 objects =$(DL_FILE) \
 	mISDN-1_1_5.tar.gz \
-	squashfs3.2-r2.tar.gz \
-	iptables-1.3.5.tar.bz2 \
+	squashfs3.3.tgz \
+	iptables-1.3.8.tar.bz2 \
 	patch-o-matic-ng-20061210.tar.bz2 \
 	netfilter-layer7-v2.9.tar.gz \
 	patch-2.6.16-nath323-1.3.bz2 \
-	openswan-2.4.9.tar.gz
+	openswan-2.4.12.tar.gz

 $(DL_FILE)												= $(URL_IPFIRE)/$(DL_FILE)
 patch-o-matic-ng-20061210.tar.bz2	= $(URL_IPFIRE)/patch-o-matic-ng-20061210.tar.bz2
-iptables-1.3.5.tar.bz2						= $(URL_IPFIRE)/iptables-1.3.5.tar.bz2
-netfilter-layer7-v2.9.tar.gz			= $(URL_IPFIRE)/netfilter-layer7-v2.9.tar.gz
-patch-2.6.16-nath323-1.3.bz2			= $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2
-squashfs3.2-r2.tar.gz							= $(URL_IPFIRE)/squashfs3.2-r2.tar.gz
-mISDN-1_1_5.tar.gz                = $(URL_IPFIRE)/mISDN-1_1_5.tar.gz
-openswan-2.4.9.tar.gz							= $(URL_IPFIRE)/openswan-2.4.9.tar.gz
+iptables-1.3.8.tar.bz2			= $(URL_IPFIRE)/iptables-1.3.8.tar.bz2
+netfilter-layer7-v2.9.tar.gz		= $(URL_IPFIRE)/netfilter-layer7-v2.9.tar.gz
+patch-2.6.16-nath323-1.3.bz2		= $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2
+squashfs3.3.tgz				= $(URL_IPFIRE)/squashfs3.3.tgz
+mISDN-1_1_5.tar.gz			= $(URL_IPFIRE)/mISDN-1_1_5.tar.gz
+openswan-2.4.12.tar.gz			= $(URL_IPFIRE)/openswan-2.4.12.tar.gz

-$(DL_FILE)_MD5										= d6f37a2967be44ab2696eef3132d4b0a
+$(DL_FILE)_MD5										= fbedc192e654735936cc780da8deeba4
 patch-o-matic-ng-20061210.tar.bz2_MD5	= 76edac76301b45f89e467b41c8cf4393
-iptables-1.3.5.tar.bz2_MD5				= 00fb916fa8040ca992a5ace56d905ea5
+iptables-1.3.8.tar.bz2_MD5		= 0a9209f928002e5eee9cdff8fef4d4b3
 netfilter-layer7-v2.9.tar.gz_MD5	= ebf9043a5352ebe6dbd721989ef83dee
 patch-2.6.16-nath323-1.3.bz2_MD5	= f926409ff703a307baf54b57ab75d138
-squashfs3.2-r2.tar.gz_MD5					= bf360b92eba9e6d5610196ce2e02fcd1
-mISDN-1_1_5.tar.gz_MD5	          = 93b1cff7817b82638a0475c2b7b7f1b6
-openswan-2.4.9.tar.gz_MD5					= 845f12d80d443cfa1a52f2b53b987bee
+squashfs3.3.tgz_MD5			= 95c40fca0d886893631b5de14a0af25b
+mISDN-1_1_5.tar.gz_MD5	          	= 93b1cff7817b82638a0475c2b7b7f1b6
+openswan-2.4.12.tar.gz_MD5		= 0bca0cc205d2d83eff64a7cea825ce7a

 install : $(TARGET)

@@ -103,54 +103,49 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) $(DIR_SRC)/linux $(DIR_SRC)/xen-* && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 	ln -s linux-$(VER) /usr/src/linux

-	# An UTF8 patch from LFS
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.16.27-utf8_input-1.patch
-
 	# Openswan 2
 	cd $(DIR_SRC) && rm -rf openswan-*
-	cd $(DIR_SRC) && tar xfz $(DIR_DL)/openswan-2.4.9.tar.gz
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.4.9.kernel-2.6-klips.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.4.9.kernel-2.6-natt.patch
-
+	cd $(DIR_SRC) && tar xfz $(DIR_DL)/openswan-2.4.12.tar.gz
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.4.12.kernel-2.6-klips.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.4.12.kernel-2.6.20.21-natt.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.4.12.kernel-2.6.20-cryptoalg.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.4.12-missing-files.patch
 	cd $(DIR_SRC)/openswan-* && sed -i -e 's/INC_USRLOCAL=\/usr\/local/INC_USRLOCAL=\/usr/' Makefile.inc

-	# H323 conntrack
-	cd $(DIR_APP) && bunzip2 -cd $(DIR_DL)/patch-2.6.16-nath323-1.3.bz2 | patch -Np1
-
 	# Reiser4
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/reiser4-for-2.6.16-5.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/reiser4-for-2.6.20.patch

 	# SquashFS
 	cd $(DIR_SRC) && rm -rf squashfs*
-	cd $(DIR_SRC) && tar xfz $(DIR_DL)/squashfs3.2-r2.tar.gz
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/squashfs3.2-r2/kernel-patches/linux-2.6.16/squashfs3.2-patch
+	cd $(DIR_SRC) && tar xfz $(DIR_DL)/squashfs3.3.tgz
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/squashfs3.3/kernel-patches/linux-2.6.20/squashfs3.3-patch

 	# ip_conntrack permissions from 440 to 444
 	cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/ip_conntrack_standalone-patch-for-ipfire.patch
 	
 	# Some VIA patches
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/padlock-prereq-2.6.16.diff
-	cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/epia_dma.patch
+	#cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/padlock-prereq-2.6.16.diff
+	#cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/epia_dma.patch

 	# Patch-o-matic
 	cd $(DIR_SRC) && rm -rf iptables-* patch-o-matic*
-	cd $(DIR_SRC) && tar xfj $(DIR_DL)/iptables-1.3.5.tar.bz2
-	cd $(DIR_SRC) && ln -sf iptables-1.3.5 iptables
-	cd $(DIR_SRC) && tar xfj $(DIR_DL)/patch-o-matic-ng-20061210.tar.bz2
-	cd $(DIR_SRC)/patch-o-matic-ng* && \
-		./runme --batch --kernel-path=$(ROOT)/usr/src/$(THISAPP)/ \
-			--iptables-path=$(ROOT)/usr/src/iptables/ \
-			sip-conntrack-nat rtsp-conntrack-nat \
-			mms-conntrack-nat
+	cd $(DIR_SRC) && tar xfj $(DIR_DL)/iptables-1.3.8.tar.bz2
+	cd $(DIR_SRC) && ln -sf iptables-1.3.8 iptables
+	#cd $(DIR_SRC) && tar xfj $(DIR_DL)/patch-o-matic-ng-20061210.tar.bz2
+	#cd $(DIR_SRC)/patch-o-matic-ng* && \
+	#	./runme --batch --kernel-path=$(ROOT)/usr/src/$(THISAPP)/ \
+	#		--iptables-path=$(ROOT)/usr/src/iptables/ \
+	#		sip-conntrack-nat rtsp-conntrack-nat \
+	#		mms-conntrack-nat

 	# Layer7-patch
 	cd $(DIR_SRC) && rm -rf $(DIR_SRC)/netfilter-layer7-v2.9
 	cd $(DIR_SRC) && tar xzf $(DIR_DL)/netfilter-layer7-v2.9.tar.gz
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/netfilter-layer7-v2.9/for_older_kernels/kernel-2.6.13-2.6.16-layer7-2.2.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/netfilter-layer7-v2.9/kernel-2.6.18-2.6.19-layer7-2.9.patch

 	# Linux Intermediate Queueing Device
 ifeq "$(XEN)" ""
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.16-imq2.diff
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.20-imq.diff
 endif

 	# mISDN
@@ -162,7 +157,7 @@ endif

 ifeq "$(SMP)" ""
 	# Only do this once on the non-SMP pass
-	cd $(DIR_SRC) && tar czf $(DIR_DL)/iptables-fixed.tar.gz iptables-1.3.5
+	cd $(DIR_SRC) && tar czf $(DIR_DL)/iptables-fixed.tar.gz iptables-1.3.8
 endif

 	# Cleanup kernel source
--- a/lfs/openswan
+++ b/lfs/openswan
@@ -24,7 +24,7 @@

 include Config

-VER        = 2.4.9
+VER        = 2.4.12

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

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

-$(DL_FILE)_MD5 = 845f12d80d443cfa1a52f2b53b987bee
+$(DL_FILE)_MD5 = 0bca0cc205d2d83eff64a7cea825ce7a

 install : $(TARGET)

@@ -88,8 +88,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	ln -sf $(CONFIG_ROOT)/certs /etc/ipsec.d/certs
 	ln -sf $(CONFIG_ROOT)/crls  /etc/ipsec.d/crls
 	
-	cd /usr/lib/ipsec && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.4.9-startklips-1.patch
-	cd /usr/lib/ipsec && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.4.9-realsetup-1.patch
+	cd /usr/lib/ipsec && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.4.12-startklips-1.patch
+#	cd /usr/lib/ipsec && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.4.9-realsetup-1.patch
 	cd /usr/lib/ipsec && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.4.9-updown-1.patch
 	cd /usr/lib/ipsec && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.4.9-updown_x509-1.patch
 	cd /etc/ipsec.d/policies && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.4.9-clear-1.patch
--- a/lfs/v4l-dvb
+++ b/lfs/v4l-dvb
@@ -78,13 +78,11 @@ $(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 -N -p1 \
-	 < $(DIR_SRC)/src/patches/v4l-dvb-kernel2.6.16-disabledvideodev.patch
 	cp -f $(DIR_SRC)/config/v4l-dvb/config $(DIR_APP)/v4l/.config
 ifeq "$(SMP)" "1"
-	cd $(DIR_APP) && make release VER=2.6.16.57-ipfire-smp
+	cd $(DIR_APP) && make release VER=$(KVER)-ipfire-smp
 else
-	cd $(DIR_APP) && make release VER=2.6.16.57-ipfire
+	cd $(DIR_APP) && make release VER=$(KVER)-ipfire
 endif
 	cd $(DIR_APP) && make $(MAKETUNING) all
 	cd $(DIR_APP) && make install
--- a/make.sh
+++ b/make.sh
@@ -24,7 +24,7 @@

 NAME="IPFire"										# Software name
 SNAME="ipfire"									# Short name
-VERSION="2.1"										# Version number
+VERSION="2.2-test"										# Version number
 SLOGAN="www.ipfire.org"					# Software slogan
 CONFIG_ROOT=/var/ipfire					# Configuration rootdir
 NICE=10													# Nice level
@@ -336,9 +336,9 @@ buildipfire() {
  ipfiremake zaptel			SMP=1
  ipfiremake r8169			SMP=1
  ipfiremake r8168			SMP=1
-  ipfiremake mcs7830			SMP=1
+  #ipfiremake mcs7830			SMP=1
  ipfiremake atl1			SMP=1
-  ipfiremake dm9601			SMP=1
+  #ipfiremake dm9601			SMP=1
  ipfiremake kqemu			SMP=1
  ipfiremake v4l-dvb			SMP=1
  ipfiremake sane		KMOD=1	SMP=1
@@ -347,9 +347,9 @@ buildipfire() {
  ipfiremake zaptel
  ipfiremake r8169
  ipfiremake r8168
-  ipfiremake mcs7830
+  #ipfiremake mcs7830
  ipfiremake atl1
-  ipfiremake dm9601
+  #ipfiremake dm9601
  ipfiremake kqemu
  ipfiremake v4l-dvb
  ipfiremake sane		KMOD=1
@@ -670,7 +670,7 @@ buildpackages() {
 }

 ipfirepackages() {
-	ipfiremake core-updates
+	#ipfiremake core-updates
 	for i in $(ls -1 $BASEDIR/config/rootfiles/packages); do
 		if [ -e $BASEDIR/lfs/$i ]; then
 			ipfiredist $i
--- a/src/pakfire/pakfire.conf
+++ b/src/pakfire/pakfire.conf
@@ -21,7 +21,7 @@

 package Conf;

-$version = "2.1";
+$version = "2.2-test";

 $mainserver = "pakfire.ipfire.org";

--- a/src/patches/openswan-2.4.12-missing-files.patch
+++ b/src/patches/openswan-2.4.12-missing-files.patch
@@ -0,0 +1,277 @@
+--- /dev/null	2008-04-27 15:35:57.000000000 +0200
+++ linux/net/ipsec/version.c	2008-05-17 18:35:27.000000000 +0200
+@@ -0,0 +1,44 @@
+/*
+ * return IPsec version information
+ * Copyright (C) 2001  Henry Spencer.
+ * 
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Library 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/lgpl.txt>.
+ * 
+ * This library 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 Library General Public
+ * License for more details.
+ *
+ * RCSID $Id: version.in.c,v 1.2 2004/04/14 05:09:46 ken Exp $
+ */
+
+#ifdef __KERNEL__
+#include <linux/netdevice.h>
+#endif
+
+#include "openswan.h"
+
+#define	V	"2.4.12"	/* substituted in by Makefile */
+static const char openswan_number[] = V;
+static const char openswan_string[] = "Openswan " V;
+
+/*
+ - ipsec_version_code - return IPsec version number/code, as string
+ */
+const char *
+ipsec_version_code()
+{
+	return openswan_number;
+}
+
+/*
+ - ipsec_version_string - return full version string
+ */
+const char *
+ipsec_version_string()
+{
+	return openswan_string;
+}
+--- /dev/null	2008-04-27 15:35:57.000000000 +0200
+++ linux/net/ipsec/zutil.c	2008-05-16 17:28:08.000000000 +0200
+@@ -0,0 +1,227 @@
+/* zutil.c -- target dependent utility functions for the compression library
+ * Copyright (C) 1995-2002 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h 
+ */
+
+/* @(#) $Id: zutil.c,v 1.5 2004/07/10 07:48:40 mcr Exp $ */
+
+#include <zlib/zutil.h>
+
+#define MY_ZCALLOC
+
+struct internal_state      {int dummy;}; /* for buggy compilers */
+
+#ifndef STDC
+extern void exit OF((int));
+#endif
+
+const char *z_errmsg[10] = {
+"need dictionary",     /* Z_NEED_DICT       2  */
+"stream end",          /* Z_STREAM_END      1  */
+"",                    /* Z_OK              0  */
+"file error",          /* Z_ERRNO         (-1) */
+"stream error",        /* Z_STREAM_ERROR  (-2) */
+"data error",          /* Z_DATA_ERROR    (-3) */
+"insufficient memory", /* Z_MEM_ERROR     (-4) */
+"buffer error",        /* Z_BUF_ERROR     (-5) */
+"incompatible version",/* Z_VERSION_ERROR (-6) */
+""};
+
+
+const char * ZEXPORT zlibVersion()
+{
+    return ZLIB_VERSION;
+}
+
+#ifdef DEBUG
+
+#  ifndef verbose
+#    define verbose 0
+#  endif
+int z_verbose = verbose;
+
+void z_error (m)
+    char *m;
+{
+    fprintf(stderr, "%s\n", m);
+    exit(1);
+}
+#endif
+
+/* exported to allow conversion of error code to string for compress() and
+ * uncompress()
+ */
+const char * ZEXPORT zError(err)
+    int err;
+{
+    return ERR_MSG(err);
+}
+
+
+#ifndef HAVE_MEMCPY
+
+void zmemcpy(dest, source, len)
+    Bytef* dest;
+    const Bytef* source;
+    uInt  len;
+{
+    if (len == 0) return;
+    do {
+        *dest++ = *source++; /* ??? to be unrolled */
+    } while (--len != 0);
+}
+
+int zmemcmp(s1, s2, len)
+    const Bytef* s1;
+    const Bytef* s2;
+    uInt  len;
+{
+    uInt j;
+
+    for (j = 0; j < len; j++) {
+        if (s1[j] != s2[j]) return 2*(s1[j] > s2[j])-1;
+    }
+    return 0;
+}
+
+void zmemzero(dest, len)
+    Bytef* dest;
+    uInt  len;
+{
+    if (len == 0) return;
+    do {
+        *dest++ = 0;  /* ??? to be unrolled */
+    } while (--len != 0);
+}
+#endif
+
+#ifdef __TURBOC__
+#if (defined( __BORLANDC__) || !defined(SMALL_MEDIUM)) && !defined(__32BIT__)
+/* Small and medium model in Turbo C are for now limited to near allocation
+ * with reduced MAX_WBITS and MAX_MEM_LEVEL
+ */
+#  define MY_ZCALLOC
+
+/* Turbo C malloc() does not allow dynamic allocation of 64K bytes
+ * and farmalloc(64K) returns a pointer with an offset of 8, so we
+ * must fix the pointer. Warning: the pointer must be put back to its
+ * original form in order to free it, use zcfree().
+ */
+
+#define MAX_PTR 10
+/* 10*64K = 640K */
+
+local int next_ptr = 0;
+
+typedef struct ptr_table_s {
+    voidpf org_ptr;
+    voidpf new_ptr;
+} ptr_table;
+
+local ptr_table table[MAX_PTR];
+/* This table is used to remember the original form of pointers
+ * to large buffers (64K). Such pointers are normalized with a zero offset.
+ * Since MSDOS is not a preemptive multitasking OS, this table is not
+ * protected from concurrent access. This hack doesn't work anyway on
+ * a protected system like OS/2. Use Microsoft C instead.
+ */
+
+voidpf zcalloc (voidpf opaque, unsigned items, unsigned size)
+{
+    voidpf buf = opaque; /* just to make some compilers happy */
+    ulg bsize = (ulg)items*size;
+
+    /* If we allocate less than 65520 bytes, we assume that farmalloc
+     * will return a usable pointer which doesn't have to be normalized.
+     */
+    if (bsize < 65520L) {
+        buf = farmalloc(bsize);
+        if (*(ush*)&buf != 0) return buf;
+    } else {
+        buf = farmalloc(bsize + 16L);
+    }
+    if (buf == NULL || next_ptr >= MAX_PTR) return NULL;
+    table[next_ptr].org_ptr = buf;
+
+    /* Normalize the pointer to seg:0 */
+    *((ush*)&buf+1) += ((ush)((uch*)buf-0) + 15) >> 4;
+    *(ush*)&buf = 0;
+    table[next_ptr++].new_ptr = buf;
+    return buf;
+}
+
+void  zcfree (voidpf opaque, voidpf ptr)
+{
+    int n;
+    if (*(ush*)&ptr != 0) { /* object < 64K */
+        farfree(ptr);
+        return;
+    }
+    /* Find the original pointer */
+    for (n = 0; n < next_ptr; n++) {
+        if (ptr != table[n].new_ptr) continue;
+
+        farfree(table[n].org_ptr);
+        while (++n < next_ptr) {
+            table[n-1] = table[n];
+        }
+        next_ptr--;
+        return;
+    }
+    ptr = opaque; /* just to make some compilers happy */
+    Assert(0, "zcfree: ptr not found");
+}
+#endif
+#endif /* __TURBOC__ */
+
+
+#if defined(M_I86) && !defined(__32BIT__)
+/* Microsoft C in 16-bit mode */
+
+#  define MY_ZCALLOC
+
+#if (!defined(_MSC_VER) || (_MSC_VER <= 600))
+#  define _halloc  halloc
+#  define _hfree   hfree
+#endif
+
+voidpf zcalloc (voidpf opaque, unsigned items, unsigned size)
+{
+    if (opaque) opaque = 0; /* to make compiler happy */
+    return _halloc((long)items, size);
+}
+
+void  zcfree (voidpf opaque, voidpf ptr)
+{
+    if (opaque) opaque = 0; /* to make compiler happy */
+    _hfree(ptr);
+}
+
+#endif /* MSC */
+
+
+#ifndef MY_ZCALLOC /* Any system without a special alloc function */
+
+#ifndef STDC
+extern voidp  calloc OF((uInt items, uInt size));
+extern void   free   OF((voidpf ptr));
+#endif
+
+voidpf zcalloc (opaque, items, size)
+    voidpf opaque;
+    unsigned items;
+    unsigned size;
+{
+    if (opaque) items += size - size; /* make compiler happy */
+    return (voidpf)calloc(items, size);
+}
+
+void  zcfree (opaque, ptr)
+    voidpf opaque;
+    voidpf ptr;
+{
+    free(ptr);
+    if (opaque) return; /* make compiler happy */
+}
+
+#endif /* MY_ZCALLOC */
--- a/src/patches/openswan-2.4.12-startklips-1.patch
+++ b/src/patches/openswan-2.4.12-startklips-1.patch
@@ -0,0 +1,79 @@
+--- _startklips.old	2008-05-17 15:41:46.000000000 +0200
+++ _startklips	2008-05-17 15:52:10.000000000 +0200
+@@ -104,23 +104,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'"
+@@ -129,7 +141,7 @@
+ 	if test " $type" = " unknown"
+ 	then
+ 		echo "\`$phys' is of an unknown type"
+-		exit 1
+		exit 1 
+ 	fi
+ 	if test " $omtu" != " "
+ 	then
+@@ -223,10 +235,10 @@
+ 	fi
+ 	next=`netstat -nr |
+ 		awk '$1 == "0.0.0.0" && $3 == "0.0.0.0" { print $2; exit 0 }'`
+-	if [ "$next" = "0.0.0.0" ] ; then
+-		next=`ip addr list $phys | grep -E "^ +inet6*.*scope global $phys" |
+-			awk '{ if($3=="peer")print $4; else print $2 }' | awk -F / '{ print $1 }'`
+-	fi
+#	if [ "$next" = "0.0.0.0" ] ; then
+#		next=`ip addr list $phys | grep -E "^ +inet6*.*scope global $phys" |
+#			awk '{ if($3=="peer")print $4; else print $2 }' | awk -F / '{ print $1 }'`
+#	fi
+ 	klipsinterface "ipsec0=$phys" $next
+ }
+ 
--- a/src/patches/openswan-2.4.12.kernel-2.6-klips.patch
+++ b/src/patches/openswan-2.4.12.kernel-2.6-klips.patch
--- a/src/patches/openswan-2.4.12.kernel-2.6.20-cryptoalg.patch
+++ b/src/patches/openswan-2.4.12.kernel-2.6.20-cryptoalg.patch
@@ -0,0 +1,11 @@
+--- linux-2.6.20.oorig/net/ipsec/ipsec_alg_cryptoapi.c	2007-02-15 12:30:41.000000000 +0100
+++ linux-2.6.20/net/ipsec/ipsec_alg_cryptoapi.c	2007-02-15 13:47:07.000000000 +0100
+@@ -197,7 +197,7 @@ static struct ipsec_alg_capi_cipher alg_
+  */
+ int setup_cipher(const char *ciphername)
+ {
+-	return crypto_alg_available(ciphername, 0);
+	return crypto_has_alg(ciphername, 0, CRYPTO_ALG_ASYNC);
+ }
+ 
+ /*
--- 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
@@ -0,0 +1,122 @@
+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/reiser4-for-2.6.20.patch
+++ b/src/patches/reiser4-for-2.6.20.patch