From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Fri, 27 Jul 2012 15:34:45 +0000 (+0200)
Subject: Merge remote-tracking branch 'ms/thirteen' into kernel-update
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=9776dede5dfed3803272ccbe627f862481cbdcd2;hp=3d08d9377d220d4be9238270599fab53f8d66d1b

Merge remote-tracking branch 'ms/thirteen' into kernel-update
---

diff --git a/config/etc/sysctl.conf b/config/etc/sysctl.conf
index 105feaa0a..b2934577e 100644
--- a/config/etc/sysctl.conf
+++ b/config/etc/sysctl.conf
@@ -23,3 +23,4 @@ net.ipv4.conf.all.log_martians = 1
 kernel.printk = 1 4 1 7
 vm.swappiness=0
 vm.mmap_min_addr = 4096
+vm.min_free_kbytes = 8192
diff --git a/config/kernel/kernel.config.armv5tel-ipfire-omap b/config/kernel/kernel.config.armv5tel-ipfire-omap
index eb8c18a12..08405e29d 100644
--- a/config/kernel/kernel.config.armv5tel-ipfire-omap
+++ b/config/kernel/kernel.config.armv5tel-ipfire-omap
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 2.6.42.19-ipfire-omap Kernel Configuration
+# Linux/arm 3.2.21 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_HAVE_PWM=y
diff --git a/config/kernel/kernel.config.armv5tel-ipfire-rpi b/config/kernel/kernel.config.armv5tel-ipfire-rpi
index c5a9062cb..4d434e01a 100644
--- a/config/kernel/kernel.config.armv5tel-ipfire-rpi
+++ b/config/kernel/kernel.config.armv5tel-ipfire-rpi
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 2.6.42.18 Kernel Configuration
+# Linux/arm 3.2.21 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -2734,28 +2734,6 @@ CONFIG_USB_CXACRU=m
 CONFIG_USB_UEAGLEATM=m
 CONFIG_USB_XUSBATM=m
 # CONFIG_USB_GADGET is not set
-# CONFIG_USB_FUSB300 is not set
-# CONFIG_USB_R8A66597 is not set
-# CONFIG_USB_M66592 is not set
-# CONFIG_USB_NET2272 is not set
-# CONFIG_USB_DUMMY_HCD is not set
-# CONFIG_USB_ZERO is not set
-# CONFIG_USB_AUDIO is not set
-# CONFIG_USB_ETH is not set
-# CONFIG_USB_G_NCM is not set
-# CONFIG_USB_GADGETFS is not set
-# CONFIG_USB_FUNCTIONFS is not set
-# CONFIG_USB_FILE_STORAGE is not set
-# CONFIG_USB_MASS_STORAGE is not set
-# CONFIG_USB_G_SERIAL is not set
-# CONFIG_USB_MIDI_GADGET is not set
-# CONFIG_USB_G_PRINTER is not set
-# CONFIG_USB_CDC_COMPOSITE is not set
-# CONFIG_USB_G_ACM_MS is not set
-# CONFIG_USB_G_MULTI is not set
-# CONFIG_USB_G_HID is not set
-# CONFIG_USB_G_DBGP is not set
-# CONFIG_USB_G_WEBCAM is not set
 
 #
 # OTG and related infrastructure
diff --git a/config/rootfiles/common/armv5tel/linux-omap b/config/rootfiles/common/armv5tel/linux-omap
index 43f7aa0cf..2e85befc9 100644
--- a/config/rootfiles/common/armv5tel/linux-omap
+++ b/config/rootfiles/common/armv5tel/linux-omap
@@ -1,5 +1,5 @@
 boot/uInit-ipfire-omap
 boot/uImage-ipfire-omap
-boot/System.map-2.6.42.19-ipfire-omap
-boot/config-2.6.42.19-ipfire-omap
-lib/modules/2.6.42.19-ipfire-omap
+boot/System.map-3.2.23-ipfire-omap
+boot/config-3.2.23-ipfire-omap
+lib/modules/3.2.23-ipfire-omap
diff --git a/config/rootfiles/common/armv5tel/linux-rpi b/config/rootfiles/common/armv5tel/linux-rpi
index 7c18d4bb2..fdc050fdf 100644
--- a/config/rootfiles/common/armv5tel/linux-rpi
+++ b/config/rootfiles/common/armv5tel/linux-rpi
@@ -1,4 +1,4 @@
 boot/kernel.img
-boot/System.map-2.6.42.19-ipfire-rpi
-boot/config-2.6.42.19-ipfire-rpi
-lib/modules/2.6.42.19-ipfire-rpi
+boot/System.map-3.2.23-ipfire-rpi
+boot/config-3.2.23-ipfire-rpi
+lib/modules/3.2.23-ipfire-rpi
diff --git a/config/rootfiles/common/armv5tel/rpi-firmware b/config/rootfiles/common/armv5tel/rpi-firmware
new file mode 100644
index 000000000..e8b99d7b1
--- /dev/null
+++ b/config/rootfiles/common/armv5tel/rpi-firmware
@@ -0,0 +1,9 @@
+#boot/LICENCE.broadcom
+boot/arm128_start.elf
+boot/arm192_start.elf
+boot/arm224_start.elf
+boot/bootcode.bin
+boot/cmdline.txt
+#boot/first32k.bin
+boot/loader.bin
+boot/start.elf
diff --git a/config/rootfiles/common/armv5tel/rpi_firmware b/config/rootfiles/common/armv5tel/rpi_firmware
deleted file mode 100644
index 8e14e53e1..000000000
--- a/config/rootfiles/common/armv5tel/rpi_firmware
+++ /dev/null
@@ -1,6 +0,0 @@
-boot/bootcode.bin
-boot/cmdline.txt
-#boot/first32k.bin
-boot/loader.bin
-boot/start.elf
-#boot/LICENCE.broadcom
\ No newline at end of file
diff --git a/config/rootfiles/common/openvpn b/config/rootfiles/common/openvpn
index 18f4d3197..6be9a102a 100644
--- a/config/rootfiles/common/openvpn
+++ b/config/rootfiles/common/openvpn
@@ -8,6 +8,7 @@ usr/sbin/openvpn
 var/ipfire/ovpn
 var/ipfire/ovpn/ca
 var/ipfire/ovpn/caconfig
+var/ipfire/ovpn/ccd
 #var/ipfire/ovpn/certs
 var/ipfire/ovpn/certs/index.txt
 var/ipfire/ovpn/certs/serial
diff --git a/config/rootfiles/common/squid b/config/rootfiles/common/squid
index 2c37c171c..1e015bfcd 100644
--- a/config/rootfiles/common/squid
+++ b/config/rootfiles/common/squid
@@ -24,6 +24,9 @@ usr/lib/squid/diskd
 #usr/lib/squid/errors/TRANSLATORS
 #usr/lib/squid/errors/af
 #usr/lib/squid/errors/af/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/af/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/af/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/af/ERR_AGENT_WPAD
 #usr/lib/squid/errors/af/ERR_CACHE_ACCESS_DENIED
 #usr/lib/squid/errors/af/ERR_CACHE_MGR_ACCESS_DENIED
 #usr/lib/squid/errors/af/ERR_CANNOT_FORWARD
@@ -60,6 +63,7 @@ usr/lib/squid/diskd
 #usr/lib/squid/errors/af/ERR_URN_RESOLVE
 #usr/lib/squid/errors/af/ERR_WRITE_ERROR
 #usr/lib/squid/errors/af/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/af/error-details.txt
 #usr/lib/squid/errors/ar
 #usr/lib/squid/errors/ar-ae
 #usr/lib/squid/errors/ar-bh
@@ -78,6 +82,9 @@ usr/lib/squid/diskd
 #usr/lib/squid/errors/ar-tn
 #usr/lib/squid/errors/ar-ye
 #usr/lib/squid/errors/ar/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/ar/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/ar/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/ar/ERR_AGENT_WPAD
 #usr/lib/squid/errors/ar/ERR_CACHE_ACCESS_DENIED
 #usr/lib/squid/errors/ar/ERR_CACHE_MGR_ACCESS_DENIED
 #usr/lib/squid/errors/ar/ERR_CANNOT_FORWARD
@@ -114,9 +121,13 @@ usr/lib/squid/diskd
 #usr/lib/squid/errors/ar/ERR_URN_RESOLVE
 #usr/lib/squid/errors/ar/ERR_WRITE_ERROR
 #usr/lib/squid/errors/ar/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/ar/error-details.txt
 #usr/lib/squid/errors/az
 #usr/lib/squid/errors/az-az
 #usr/lib/squid/errors/az/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/az/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/az/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/az/ERR_AGENT_WPAD
 #usr/lib/squid/errors/az/ERR_CACHE_ACCESS_DENIED
 #usr/lib/squid/errors/az/ERR_CACHE_MGR_ACCESS_DENIED
 #usr/lib/squid/errors/az/ERR_CANNOT_FORWARD
@@ -153,9 +164,13 @@ usr/lib/squid/diskd
 #usr/lib/squid/errors/az/ERR_URN_RESOLVE
 #usr/lib/squid/errors/az/ERR_WRITE_ERROR
 #usr/lib/squid/errors/az/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/az/error-details.txt
 #usr/lib/squid/errors/bg
 #usr/lib/squid/errors/bg-bg
 #usr/lib/squid/errors/bg/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/bg/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/bg/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/bg/ERR_AGENT_WPAD
 #usr/lib/squid/errors/bg/ERR_CACHE_ACCESS_DENIED
 #usr/lib/squid/errors/bg/ERR_CACHE_MGR_ACCESS_DENIED
 #usr/lib/squid/errors/bg/ERR_CANNOT_FORWARD
@@ -192,8 +207,12 @@ usr/lib/squid/diskd
 #usr/lib/squid/errors/bg/ERR_URN_RESOLVE
 #usr/lib/squid/errors/bg/ERR_WRITE_ERROR
 #usr/lib/squid/errors/bg/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/bg/error-details.txt
 #usr/lib/squid/errors/ca
 #usr/lib/squid/errors/ca/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/ca/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/ca/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/ca/ERR_AGENT_WPAD
 #usr/lib/squid/errors/ca/ERR_CACHE_ACCESS_DENIED
 #usr/lib/squid/errors/ca/ERR_CACHE_MGR_ACCESS_DENIED
 #usr/lib/squid/errors/ca/ERR_CANNOT_FORWARD
@@ -230,9 +249,13 @@ usr/lib/squid/diskd
 #usr/lib/squid/errors/ca/ERR_URN_RESOLVE
 #usr/lib/squid/errors/ca/ERR_WRITE_ERROR
 #usr/lib/squid/errors/ca/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/ca/error-details.txt
 #usr/lib/squid/errors/cs
 #usr/lib/squid/errors/cs-cz
 #usr/lib/squid/errors/cs/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/cs/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/cs/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/cs/ERR_AGENT_WPAD
 #usr/lib/squid/errors/cs/ERR_CACHE_ACCESS_DENIED
 #usr/lib/squid/errors/cs/ERR_CACHE_MGR_ACCESS_DENIED
 #usr/lib/squid/errors/cs/ERR_CANNOT_FORWARD
@@ -269,9 +292,13 @@ usr/lib/squid/diskd
 #usr/lib/squid/errors/cs/ERR_URN_RESOLVE
 #usr/lib/squid/errors/cs/ERR_WRITE_ERROR
 #usr/lib/squid/errors/cs/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/cs/error-details.txt
 #usr/lib/squid/errors/da
 #usr/lib/squid/errors/da-dk
 #usr/lib/squid/errors/da/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/da/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/da/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/da/ERR_AGENT_WPAD
 #usr/lib/squid/errors/da/ERR_CACHE_ACCESS_DENIED
 #usr/lib/squid/errors/da/ERR_CACHE_MGR_ACCESS_DENIED
 #usr/lib/squid/errors/da/ERR_CANNOT_FORWARD
@@ -308,6 +335,7 @@ usr/lib/squid/diskd
 #usr/lib/squid/errors/da/ERR_URN_RESOLVE
 #usr/lib/squid/errors/da/ERR_WRITE_ERROR
 #usr/lib/squid/errors/da/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/da/error-details.txt
 #usr/lib/squid/errors/de
 #usr/lib/squid/errors/de-at
 #usr/lib/squid/errors/de-ch
@@ -315,6 +343,9 @@ usr/lib/squid/diskd
 #usr/lib/squid/errors/de-li
 #usr/lib/squid/errors/de-lu
 usr/lib/squid/errors/de/ERR_ACCESS_DENIED
+usr/lib/squid/errors/de/ERR_ACL_TIME_QUOTA_EXCEEDED
+usr/lib/squid/errors/de/ERR_AGENT_CONFIGURE
+usr/lib/squid/errors/de/ERR_AGENT_WPAD
 usr/lib/squid/errors/de/ERR_CACHE_ACCESS_DENIED
 usr/lib/squid/errors/de/ERR_CACHE_MGR_ACCESS_DENIED
 usr/lib/squid/errors/de/ERR_CANNOT_FORWARD
@@ -351,9 +382,13 @@ usr/lib/squid/errors/de/ERR_UNSUP_REQ
 usr/lib/squid/errors/de/ERR_URN_RESOLVE
 usr/lib/squid/errors/de/ERR_WRITE_ERROR
 usr/lib/squid/errors/de/ERR_ZERO_SIZE_OBJECT
+usr/lib/squid/errors/de/error-details.txt
 #usr/lib/squid/errors/el
 #usr/lib/squid/errors/el-gr
 #usr/lib/squid/errors/el/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/el/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/el/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/el/ERR_AGENT_WPAD
 #usr/lib/squid/errors/el/ERR_CACHE_ACCESS_DENIED
 #usr/lib/squid/errors/el/ERR_CACHE_MGR_ACCESS_DENIED
 #usr/lib/squid/errors/el/ERR_CANNOT_FORWARD
@@ -390,6 +425,7 @@ usr/lib/squid/errors/de/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/el/ERR_URN_RESOLVE
 #usr/lib/squid/errors/el/ERR_WRITE_ERROR
 #usr/lib/squid/errors/el/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/el/error-details.txt
 #usr/lib/squid/errors/en
 #usr/lib/squid/errors/en-au
 #usr/lib/squid/errors/en-bz
@@ -407,6 +443,9 @@ usr/lib/squid/errors/de/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/en-za
 #usr/lib/squid/errors/en-zw
 usr/lib/squid/errors/en/ERR_ACCESS_DENIED
+usr/lib/squid/errors/en/ERR_ACL_TIME_QUOTA_EXCEEDED
+usr/lib/squid/errors/en/ERR_AGENT_CONFIGURE
+usr/lib/squid/errors/en/ERR_AGENT_WPAD
 usr/lib/squid/errors/en/ERR_CACHE_ACCESS_DENIED
 usr/lib/squid/errors/en/ERR_CACHE_MGR_ACCESS_DENIED
 usr/lib/squid/errors/en/ERR_CANNOT_FORWARD
@@ -443,6 +482,7 @@ usr/lib/squid/errors/en/ERR_UNSUP_REQ
 usr/lib/squid/errors/en/ERR_URN_RESOLVE
 usr/lib/squid/errors/en/ERR_WRITE_ERROR
 usr/lib/squid/errors/en/ERR_ZERO_SIZE_OBJECT
+usr/lib/squid/errors/en/error-details.txt
 #usr/lib/squid/errors/es
 #usr/lib/squid/errors/es-ar
 #usr/lib/squid/errors/es-bo
@@ -464,6 +504,9 @@ usr/lib/squid/errors/en/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/es-uy
 #usr/lib/squid/errors/es-ve
 usr/lib/squid/errors/es/ERR_ACCESS_DENIED
+usr/lib/squid/errors/es/ERR_ACL_TIME_QUOTA_EXCEEDED
+usr/lib/squid/errors/es/ERR_AGENT_CONFIGURE
+usr/lib/squid/errors/es/ERR_AGENT_WPAD
 usr/lib/squid/errors/es/ERR_CACHE_ACCESS_DENIED
 usr/lib/squid/errors/es/ERR_CACHE_MGR_ACCESS_DENIED
 usr/lib/squid/errors/es/ERR_CANNOT_FORWARD
@@ -500,9 +543,13 @@ usr/lib/squid/errors/es/ERR_UNSUP_REQ
 usr/lib/squid/errors/es/ERR_URN_RESOLVE
 usr/lib/squid/errors/es/ERR_WRITE_ERROR
 usr/lib/squid/errors/es/ERR_ZERO_SIZE_OBJECT
+usr/lib/squid/errors/es/error-details.txt
 #usr/lib/squid/errors/et
 #usr/lib/squid/errors/et-ee
 #usr/lib/squid/errors/et/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/et/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/et/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/et/ERR_AGENT_WPAD
 #usr/lib/squid/errors/et/ERR_CACHE_ACCESS_DENIED
 #usr/lib/squid/errors/et/ERR_CACHE_MGR_ACCESS_DENIED
 #usr/lib/squid/errors/et/ERR_CANNOT_FORWARD
@@ -539,10 +586,14 @@ usr/lib/squid/errors/es/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/et/ERR_URN_RESOLVE
 #usr/lib/squid/errors/et/ERR_WRITE_ERROR
 #usr/lib/squid/errors/et/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/et/error-details.txt
 #usr/lib/squid/errors/fa
 #usr/lib/squid/errors/fa-fa
 #usr/lib/squid/errors/fa-ir
 #usr/lib/squid/errors/fa/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/fa/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/fa/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/fa/ERR_AGENT_WPAD
 #usr/lib/squid/errors/fa/ERR_CACHE_ACCESS_DENIED
 #usr/lib/squid/errors/fa/ERR_CACHE_MGR_ACCESS_DENIED
 #usr/lib/squid/errors/fa/ERR_CANNOT_FORWARD
@@ -579,9 +630,13 @@ usr/lib/squid/errors/es/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/fa/ERR_URN_RESOLVE
 #usr/lib/squid/errors/fa/ERR_WRITE_ERROR
 #usr/lib/squid/errors/fa/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/fa/error-details.txt
 #usr/lib/squid/errors/fi
 #usr/lib/squid/errors/fi-fi
 #usr/lib/squid/errors/fi/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/fi/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/fi/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/fi/ERR_AGENT_WPAD
 #usr/lib/squid/errors/fi/ERR_CACHE_ACCESS_DENIED
 #usr/lib/squid/errors/fi/ERR_CACHE_MGR_ACCESS_DENIED
 #usr/lib/squid/errors/fi/ERR_CANNOT_FORWARD
@@ -618,6 +673,7 @@ usr/lib/squid/errors/es/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/fi/ERR_URN_RESOLVE
 #usr/lib/squid/errors/fi/ERR_WRITE_ERROR
 #usr/lib/squid/errors/fi/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/fi/error-details.txt
 #usr/lib/squid/errors/fr
 #usr/lib/squid/errors/fr-be
 #usr/lib/squid/errors/fr-ca
@@ -626,6 +682,9 @@ usr/lib/squid/errors/es/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/fr-lu
 #usr/lib/squid/errors/fr-mc
 usr/lib/squid/errors/fr/ERR_ACCESS_DENIED
+usr/lib/squid/errors/fr/ERR_ACL_TIME_QUOTA_EXCEEDED
+usr/lib/squid/errors/fr/ERR_AGENT_CONFIGURE
+usr/lib/squid/errors/fr/ERR_AGENT_WPAD
 usr/lib/squid/errors/fr/ERR_CACHE_ACCESS_DENIED
 usr/lib/squid/errors/fr/ERR_CACHE_MGR_ACCESS_DENIED
 usr/lib/squid/errors/fr/ERR_CANNOT_FORWARD
@@ -662,9 +721,13 @@ usr/lib/squid/errors/fr/ERR_UNSUP_REQ
 usr/lib/squid/errors/fr/ERR_URN_RESOLVE
 usr/lib/squid/errors/fr/ERR_WRITE_ERROR
 usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
+usr/lib/squid/errors/fr/error-details.txt
 #usr/lib/squid/errors/he
 #usr/lib/squid/errors/he-il
 #usr/lib/squid/errors/he/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/he/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/he/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/he/ERR_AGENT_WPAD
 #usr/lib/squid/errors/he/ERR_CACHE_ACCESS_DENIED
 #usr/lib/squid/errors/he/ERR_CACHE_MGR_ACCESS_DENIED
 #usr/lib/squid/errors/he/ERR_CANNOT_FORWARD
@@ -701,9 +764,13 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/he/ERR_URN_RESOLVE
 #usr/lib/squid/errors/he/ERR_WRITE_ERROR
 #usr/lib/squid/errors/he/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/he/error-details.txt
 #usr/lib/squid/errors/hu
 #usr/lib/squid/errors/hu-hu
 #usr/lib/squid/errors/hu/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/hu/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/hu/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/hu/ERR_AGENT_WPAD
 #usr/lib/squid/errors/hu/ERR_CACHE_ACCESS_DENIED
 #usr/lib/squid/errors/hu/ERR_CACHE_MGR_ACCESS_DENIED
 #usr/lib/squid/errors/hu/ERR_CANNOT_FORWARD
@@ -740,10 +807,14 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/hu/ERR_URN_RESOLVE
 #usr/lib/squid/errors/hu/ERR_WRITE_ERROR
 #usr/lib/squid/errors/hu/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/hu/error-details.txt
 #usr/lib/squid/errors/hy
 #usr/lib/squid/errors/hy-am
 #usr/lib/squid/errors/hy-armn
 #usr/lib/squid/errors/hy/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/hy/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/hy/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/hy/ERR_AGENT_WPAD
 #usr/lib/squid/errors/hy/ERR_CACHE_ACCESS_DENIED
 #usr/lib/squid/errors/hy/ERR_CACHE_MGR_ACCESS_DENIED
 #usr/lib/squid/errors/hy/ERR_CANNOT_FORWARD
@@ -780,9 +851,13 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/hy/ERR_URN_RESOLVE
 #usr/lib/squid/errors/hy/ERR_WRITE_ERROR
 #usr/lib/squid/errors/hy/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/hy/error-details.txt
 #usr/lib/squid/errors/id
 #usr/lib/squid/errors/id-id
 #usr/lib/squid/errors/id/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/id/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/id/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/id/ERR_AGENT_WPAD
 #usr/lib/squid/errors/id/ERR_CACHE_ACCESS_DENIED
 #usr/lib/squid/errors/id/ERR_CACHE_MGR_ACCESS_DENIED
 #usr/lib/squid/errors/id/ERR_CANNOT_FORWARD
@@ -819,10 +894,14 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/id/ERR_URN_RESOLVE
 #usr/lib/squid/errors/id/ERR_WRITE_ERROR
 #usr/lib/squid/errors/id/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/id/error-details.txt
 #usr/lib/squid/errors/it
 #usr/lib/squid/errors/it-ch
 #usr/lib/squid/errors/it-it
 #usr/lib/squid/errors/it/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/it/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/it/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/it/ERR_AGENT_WPAD
 #usr/lib/squid/errors/it/ERR_CACHE_ACCESS_DENIED
 #usr/lib/squid/errors/it/ERR_CACHE_MGR_ACCESS_DENIED
 #usr/lib/squid/errors/it/ERR_CANNOT_FORWARD
@@ -859,9 +938,13 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/it/ERR_URN_RESOLVE
 #usr/lib/squid/errors/it/ERR_WRITE_ERROR
 #usr/lib/squid/errors/it/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/it/error-details.txt
 #usr/lib/squid/errors/ja
 #usr/lib/squid/errors/ja-jp
 #usr/lib/squid/errors/ja/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/ja/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/ja/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/ja/ERR_AGENT_WPAD
 #usr/lib/squid/errors/ja/ERR_CACHE_ACCESS_DENIED
 #usr/lib/squid/errors/ja/ERR_CACHE_MGR_ACCESS_DENIED
 #usr/lib/squid/errors/ja/ERR_CANNOT_FORWARD
@@ -898,10 +981,14 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/ja/ERR_URN_RESOLVE
 #usr/lib/squid/errors/ja/ERR_WRITE_ERROR
 #usr/lib/squid/errors/ja/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/ja/error-details.txt
 #usr/lib/squid/errors/ko
 #usr/lib/squid/errors/ko-kp
 #usr/lib/squid/errors/ko-kr
 #usr/lib/squid/errors/ko/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/ko/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/ko/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/ko/ERR_AGENT_WPAD
 #usr/lib/squid/errors/ko/ERR_CACHE_ACCESS_DENIED
 #usr/lib/squid/errors/ko/ERR_CACHE_MGR_ACCESS_DENIED
 #usr/lib/squid/errors/ko/ERR_CANNOT_FORWARD
@@ -938,9 +1025,13 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/ko/ERR_URN_RESOLVE
 #usr/lib/squid/errors/ko/ERR_WRITE_ERROR
 #usr/lib/squid/errors/ko/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/ko/error-details.txt
 #usr/lib/squid/errors/lt
 #usr/lib/squid/errors/lt-lt
 #usr/lib/squid/errors/lt/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/lt/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/lt/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/lt/ERR_AGENT_WPAD
 #usr/lib/squid/errors/lt/ERR_CACHE_ACCESS_DENIED
 #usr/lib/squid/errors/lt/ERR_CACHE_MGR_ACCESS_DENIED
 #usr/lib/squid/errors/lt/ERR_CANNOT_FORWARD
@@ -977,9 +1068,13 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/lt/ERR_URN_RESOLVE
 #usr/lib/squid/errors/lt/ERR_WRITE_ERROR
 #usr/lib/squid/errors/lt/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/lt/error-details.txt
 #usr/lib/squid/errors/lv
 #usr/lib/squid/errors/lv-lv
 #usr/lib/squid/errors/lv/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/lv/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/lv/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/lv/ERR_AGENT_WPAD
 #usr/lib/squid/errors/lv/ERR_CACHE_ACCESS_DENIED
 #usr/lib/squid/errors/lv/ERR_CACHE_MGR_ACCESS_DENIED
 #usr/lib/squid/errors/lv/ERR_CANNOT_FORWARD
@@ -1016,9 +1111,13 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/lv/ERR_URN_RESOLVE
 #usr/lib/squid/errors/lv/ERR_WRITE_ERROR
 #usr/lib/squid/errors/lv/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/lv/error-details.txt
 #usr/lib/squid/errors/ms
 #usr/lib/squid/errors/ms-my
 #usr/lib/squid/errors/ms/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/ms/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/ms/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/ms/ERR_AGENT_WPAD
 #usr/lib/squid/errors/ms/ERR_CACHE_ACCESS_DENIED
 #usr/lib/squid/errors/ms/ERR_CACHE_MGR_ACCESS_DENIED
 #usr/lib/squid/errors/ms/ERR_CANNOT_FORWARD
@@ -1055,9 +1154,13 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/ms/ERR_URN_RESOLVE
 #usr/lib/squid/errors/ms/ERR_WRITE_ERROR
 #usr/lib/squid/errors/ms/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/ms/error-details.txt
 #usr/lib/squid/errors/nl
 #usr/lib/squid/errors/nl-nl
 #usr/lib/squid/errors/nl/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/nl/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/nl/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/nl/ERR_AGENT_WPAD
 #usr/lib/squid/errors/nl/ERR_CACHE_ACCESS_DENIED
 #usr/lib/squid/errors/nl/ERR_CACHE_MGR_ACCESS_DENIED
 #usr/lib/squid/errors/nl/ERR_CANNOT_FORWARD
@@ -1094,8 +1197,12 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/nl/ERR_URN_RESOLVE
 #usr/lib/squid/errors/nl/ERR_WRITE_ERROR
 #usr/lib/squid/errors/nl/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/nl/error-details.txt
 #usr/lib/squid/errors/oc
 #usr/lib/squid/errors/oc/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/oc/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/oc/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/oc/ERR_AGENT_WPAD
 #usr/lib/squid/errors/oc/ERR_CACHE_ACCESS_DENIED
 #usr/lib/squid/errors/oc/ERR_CACHE_MGR_ACCESS_DENIED
 #usr/lib/squid/errors/oc/ERR_CANNOT_FORWARD
@@ -1132,9 +1239,13 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/oc/ERR_URN_RESOLVE
 #usr/lib/squid/errors/oc/ERR_WRITE_ERROR
 #usr/lib/squid/errors/oc/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/oc/error-details.txt
 #usr/lib/squid/errors/pl
 #usr/lib/squid/errors/pl-pl
 usr/lib/squid/errors/pl/ERR_ACCESS_DENIED
+usr/lib/squid/errors/pl/ERR_ACL_TIME_QUOTA_EXCEEDED
+usr/lib/squid/errors/pl/ERR_AGENT_CONFIGURE
+usr/lib/squid/errors/pl/ERR_AGENT_WPAD
 usr/lib/squid/errors/pl/ERR_CACHE_ACCESS_DENIED
 usr/lib/squid/errors/pl/ERR_CACHE_MGR_ACCESS_DENIED
 usr/lib/squid/errors/pl/ERR_CANNOT_FORWARD
@@ -1171,9 +1282,13 @@ usr/lib/squid/errors/pl/ERR_UNSUP_REQ
 usr/lib/squid/errors/pl/ERR_URN_RESOLVE
 usr/lib/squid/errors/pl/ERR_WRITE_ERROR
 usr/lib/squid/errors/pl/ERR_ZERO_SIZE_OBJECT
+usr/lib/squid/errors/pl/error-details.txt
 #usr/lib/squid/errors/pt
 #usr/lib/squid/errors/pt-br
 #usr/lib/squid/errors/pt-br/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/pt-br/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/pt-br/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/pt-br/ERR_AGENT_WPAD
 #usr/lib/squid/errors/pt-br/ERR_CACHE_ACCESS_DENIED
 #usr/lib/squid/errors/pt-br/ERR_CACHE_MGR_ACCESS_DENIED
 #usr/lib/squid/errors/pt-br/ERR_CANNOT_FORWARD
@@ -1210,8 +1325,12 @@ usr/lib/squid/errors/pl/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/pt-br/ERR_URN_RESOLVE
 #usr/lib/squid/errors/pt-br/ERR_WRITE_ERROR
 #usr/lib/squid/errors/pt-br/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/pt-br/error-details.txt
 #usr/lib/squid/errors/pt-pt
 #usr/lib/squid/errors/pt/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/pt/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/pt/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/pt/ERR_AGENT_WPAD
 #usr/lib/squid/errors/pt/ERR_CACHE_ACCESS_DENIED
 #usr/lib/squid/errors/pt/ERR_CACHE_MGR_ACCESS_DENIED
 #usr/lib/squid/errors/pt/ERR_CANNOT_FORWARD
@@ -1248,10 +1367,14 @@ usr/lib/squid/errors/pl/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/pt/ERR_URN_RESOLVE
 #usr/lib/squid/errors/pt/ERR_WRITE_ERROR
 #usr/lib/squid/errors/pt/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/pt/error-details.txt
 #usr/lib/squid/errors/ro
 #usr/lib/squid/errors/ro-md
 #usr/lib/squid/errors/ro-ro
 #usr/lib/squid/errors/ro/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/ro/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/ro/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/ro/ERR_AGENT_WPAD
 #usr/lib/squid/errors/ro/ERR_CACHE_ACCESS_DENIED
 #usr/lib/squid/errors/ro/ERR_CACHE_MGR_ACCESS_DENIED
 #usr/lib/squid/errors/ro/ERR_CANNOT_FORWARD
@@ -1288,9 +1411,13 @@ usr/lib/squid/errors/pl/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/ro/ERR_URN_RESOLVE
 #usr/lib/squid/errors/ro/ERR_WRITE_ERROR
 #usr/lib/squid/errors/ro/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/ro/error-details.txt
 #usr/lib/squid/errors/ru
 #usr/lib/squid/errors/ru-ru
 usr/lib/squid/errors/ru/ERR_ACCESS_DENIED
+usr/lib/squid/errors/ru/ERR_ACL_TIME_QUOTA_EXCEEDED
+usr/lib/squid/errors/ru/ERR_AGENT_CONFIGURE
+usr/lib/squid/errors/ru/ERR_AGENT_WPAD
 usr/lib/squid/errors/ru/ERR_CACHE_ACCESS_DENIED
 usr/lib/squid/errors/ru/ERR_CACHE_MGR_ACCESS_DENIED
 usr/lib/squid/errors/ru/ERR_CANNOT_FORWARD
@@ -1327,9 +1454,13 @@ usr/lib/squid/errors/ru/ERR_UNSUP_REQ
 usr/lib/squid/errors/ru/ERR_URN_RESOLVE
 usr/lib/squid/errors/ru/ERR_WRITE_ERROR
 usr/lib/squid/errors/ru/ERR_ZERO_SIZE_OBJECT
+usr/lib/squid/errors/ru/error-details.txt
 #usr/lib/squid/errors/sk
 #usr/lib/squid/errors/sk-sk
 #usr/lib/squid/errors/sk/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/sk/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/sk/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/sk/ERR_AGENT_WPAD
 #usr/lib/squid/errors/sk/ERR_CACHE_ACCESS_DENIED
 #usr/lib/squid/errors/sk/ERR_CACHE_MGR_ACCESS_DENIED
 #usr/lib/squid/errors/sk/ERR_CANNOT_FORWARD
@@ -1366,9 +1497,56 @@ usr/lib/squid/errors/ru/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/sk/ERR_URN_RESOLVE
 #usr/lib/squid/errors/sk/ERR_WRITE_ERROR
 #usr/lib/squid/errors/sk/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/sk/error-details.txt
+#usr/lib/squid/errors/sl
+#usr/lib/squid/errors/sl-si
+#usr/lib/squid/errors/sl/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/sl/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/sl/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/sl/ERR_AGENT_WPAD
+#usr/lib/squid/errors/sl/ERR_CACHE_ACCESS_DENIED
+#usr/lib/squid/errors/sl/ERR_CACHE_MGR_ACCESS_DENIED
+#usr/lib/squid/errors/sl/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/sl/ERR_CONNECT_FAIL
+#usr/lib/squid/errors/sl/ERR_DIR_LISTING
+#usr/lib/squid/errors/sl/ERR_DNS_FAIL
+#usr/lib/squid/errors/sl/ERR_ESI
+#usr/lib/squid/errors/sl/ERR_FORWARDING_DENIED
+#usr/lib/squid/errors/sl/ERR_FTP_DISABLED
+#usr/lib/squid/errors/sl/ERR_FTP_FAILURE
+#usr/lib/squid/errors/sl/ERR_FTP_FORBIDDEN
+#usr/lib/squid/errors/sl/ERR_FTP_NOT_FOUND
+#usr/lib/squid/errors/sl/ERR_FTP_PUT_CREATED
+#usr/lib/squid/errors/sl/ERR_FTP_PUT_ERROR
+#usr/lib/squid/errors/sl/ERR_FTP_PUT_MODIFIED
+#usr/lib/squid/errors/sl/ERR_FTP_UNAVAILABLE
+#usr/lib/squid/errors/sl/ERR_GATEWAY_FAILURE
+#usr/lib/squid/errors/sl/ERR_ICAP_FAILURE
+#usr/lib/squid/errors/sl/ERR_INVALID_REQ
+#usr/lib/squid/errors/sl/ERR_INVALID_RESP
+#usr/lib/squid/errors/sl/ERR_INVALID_URL
+#usr/lib/squid/errors/sl/ERR_LIFETIME_EXP
+#usr/lib/squid/errors/sl/ERR_NO_RELAY
+#usr/lib/squid/errors/sl/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/sl/ERR_PRECONDITION_FAILED
+#usr/lib/squid/errors/sl/ERR_READ_ERROR
+#usr/lib/squid/errors/sl/ERR_READ_TIMEOUT
+#usr/lib/squid/errors/sl/ERR_SECURE_CONNECT_FAIL
+#usr/lib/squid/errors/sl/ERR_SHUTTING_DOWN
+#usr/lib/squid/errors/sl/ERR_SOCKET_FAILURE
+#usr/lib/squid/errors/sl/ERR_TOO_BIG
+#usr/lib/squid/errors/sl/ERR_UNSUP_HTTPVERSION
+#usr/lib/squid/errors/sl/ERR_UNSUP_REQ
+#usr/lib/squid/errors/sl/ERR_URN_RESOLVE
+#usr/lib/squid/errors/sl/ERR_WRITE_ERROR
+#usr/lib/squid/errors/sl/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/sl/error-details.txt
 #usr/lib/squid/errors/sr
 #usr/lib/squid/errors/sr-cyrl
 #usr/lib/squid/errors/sr-cyrl/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/sr-cyrl/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/sr-cyrl/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/sr-cyrl/ERR_AGENT_WPAD
 #usr/lib/squid/errors/sr-cyrl/ERR_CACHE_ACCESS_DENIED
 #usr/lib/squid/errors/sr-cyrl/ERR_CACHE_MGR_ACCESS_DENIED
 #usr/lib/squid/errors/sr-cyrl/ERR_CANNOT_FORWARD
@@ -1405,9 +1583,13 @@ usr/lib/squid/errors/ru/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/sr-cyrl/ERR_URN_RESOLVE
 #usr/lib/squid/errors/sr-cyrl/ERR_WRITE_ERROR
 #usr/lib/squid/errors/sr-cyrl/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/sr-cyrl/error-details.txt
 #usr/lib/squid/errors/sr-latn
 #usr/lib/squid/errors/sr-latn-cs
 #usr/lib/squid/errors/sr-latn/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/sr-latn/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/sr-latn/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/sr-latn/ERR_AGENT_WPAD
 #usr/lib/squid/errors/sr-latn/ERR_CACHE_ACCESS_DENIED
 #usr/lib/squid/errors/sr-latn/ERR_CACHE_MGR_ACCESS_DENIED
 #usr/lib/squid/errors/sr-latn/ERR_CANNOT_FORWARD
@@ -1444,11 +1626,15 @@ usr/lib/squid/errors/ru/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/sr-latn/ERR_URN_RESOLVE
 #usr/lib/squid/errors/sr-latn/ERR_WRITE_ERROR
 #usr/lib/squid/errors/sr-latn/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/sr-latn/error-details.txt
 #usr/lib/squid/errors/sr-sp
 #usr/lib/squid/errors/sv
 #usr/lib/squid/errors/sv-fi
 #usr/lib/squid/errors/sv-se
 #usr/lib/squid/errors/sv/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/sv/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/sv/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/sv/ERR_AGENT_WPAD
 #usr/lib/squid/errors/sv/ERR_CACHE_ACCESS_DENIED
 #usr/lib/squid/errors/sv/ERR_CACHE_MGR_ACCESS_DENIED
 #usr/lib/squid/errors/sv/ERR_CANNOT_FORWARD
@@ -1485,8 +1671,12 @@ usr/lib/squid/errors/ru/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/sv/ERR_URN_RESOLVE
 #usr/lib/squid/errors/sv/ERR_WRITE_ERROR
 #usr/lib/squid/errors/sv/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/sv/error-details.txt
 #usr/lib/squid/errors/templates
 #usr/lib/squid/errors/templates/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/templates/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/templates/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/templates/ERR_AGENT_WPAD
 #usr/lib/squid/errors/templates/ERR_CACHE_ACCESS_DENIED
 #usr/lib/squid/errors/templates/ERR_CACHE_MGR_ACCESS_DENIED
 #usr/lib/squid/errors/templates/ERR_CANNOT_FORWARD
@@ -1523,9 +1713,13 @@ usr/lib/squid/errors/ru/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/templates/ERR_URN_RESOLVE
 #usr/lib/squid/errors/templates/ERR_WRITE_ERROR
 #usr/lib/squid/errors/templates/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/templates/error-details.txt
 #usr/lib/squid/errors/th
 #usr/lib/squid/errors/th-th
 #usr/lib/squid/errors/th/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/th/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/th/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/th/ERR_AGENT_WPAD
 #usr/lib/squid/errors/th/ERR_CACHE_ACCESS_DENIED
 #usr/lib/squid/errors/th/ERR_CACHE_MGR_ACCESS_DENIED
 #usr/lib/squid/errors/th/ERR_CANNOT_FORWARD
@@ -1562,9 +1756,13 @@ usr/lib/squid/errors/ru/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/th/ERR_URN_RESOLVE
 #usr/lib/squid/errors/th/ERR_WRITE_ERROR
 #usr/lib/squid/errors/th/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/th/error-details.txt
 #usr/lib/squid/errors/tr
 #usr/lib/squid/errors/tr-tr
 #usr/lib/squid/errors/tr/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/tr/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/tr/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/tr/ERR_AGENT_WPAD
 #usr/lib/squid/errors/tr/ERR_CACHE_ACCESS_DENIED
 #usr/lib/squid/errors/tr/ERR_CACHE_MGR_ACCESS_DENIED
 #usr/lib/squid/errors/tr/ERR_CANNOT_FORWARD
@@ -1601,9 +1799,13 @@ usr/lib/squid/errors/ru/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/tr/ERR_URN_RESOLVE
 #usr/lib/squid/errors/tr/ERR_WRITE_ERROR
 #usr/lib/squid/errors/tr/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/tr/error-details.txt
 #usr/lib/squid/errors/uk
 #usr/lib/squid/errors/uk-ua
 #usr/lib/squid/errors/uk/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/uk/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/uk/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/uk/ERR_AGENT_WPAD
 #usr/lib/squid/errors/uk/ERR_CACHE_ACCESS_DENIED
 #usr/lib/squid/errors/uk/ERR_CACHE_MGR_ACCESS_DENIED
 #usr/lib/squid/errors/uk/ERR_CANNOT_FORWARD
@@ -1640,8 +1842,12 @@ usr/lib/squid/errors/ru/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/uk/ERR_URN_RESOLVE
 #usr/lib/squid/errors/uk/ERR_WRITE_ERROR
 #usr/lib/squid/errors/uk/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/uk/error-details.txt
 #usr/lib/squid/errors/uz
 #usr/lib/squid/errors/uz/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/uz/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/uz/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/uz/ERR_AGENT_WPAD
 #usr/lib/squid/errors/uz/ERR_CACHE_ACCESS_DENIED
 #usr/lib/squid/errors/uz/ERR_CACHE_MGR_ACCESS_DENIED
 #usr/lib/squid/errors/uz/ERR_CANNOT_FORWARD
@@ -1678,9 +1884,13 @@ usr/lib/squid/errors/ru/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/uz/ERR_URN_RESOLVE
 #usr/lib/squid/errors/uz/ERR_WRITE_ERROR
 #usr/lib/squid/errors/uz/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/uz/error-details.txt
 #usr/lib/squid/errors/vi
 #usr/lib/squid/errors/vi-vn
 #usr/lib/squid/errors/vi/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/vi/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/vi/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/vi/ERR_AGENT_WPAD
 #usr/lib/squid/errors/vi/ERR_CACHE_ACCESS_DENIED
 #usr/lib/squid/errors/vi/ERR_CACHE_MGR_ACCESS_DENIED
 #usr/lib/squid/errors/vi/ERR_CANNOT_FORWARD
@@ -1717,8 +1927,12 @@ usr/lib/squid/errors/ru/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/vi/ERR_URN_RESOLVE
 #usr/lib/squid/errors/vi/ERR_WRITE_ERROR
 #usr/lib/squid/errors/vi/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/vi/error-details.txt
 #usr/lib/squid/errors/zh-cn
 #usr/lib/squid/errors/zh-cn/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/zh-cn/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/zh-cn/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/zh-cn/ERR_AGENT_WPAD
 #usr/lib/squid/errors/zh-cn/ERR_CACHE_ACCESS_DENIED
 #usr/lib/squid/errors/zh-cn/ERR_CACHE_MGR_ACCESS_DENIED
 #usr/lib/squid/errors/zh-cn/ERR_CANNOT_FORWARD
@@ -1755,11 +1969,15 @@ usr/lib/squid/errors/ru/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/zh-cn/ERR_URN_RESOLVE
 #usr/lib/squid/errors/zh-cn/ERR_WRITE_ERROR
 #usr/lib/squid/errors/zh-cn/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/zh-cn/error-details.txt
 #usr/lib/squid/errors/zh-hk
 #usr/lib/squid/errors/zh-mo
 #usr/lib/squid/errors/zh-sg
 #usr/lib/squid/errors/zh-tw
 #usr/lib/squid/errors/zh-tw/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/zh-tw/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/zh-tw/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/zh-tw/ERR_AGENT_WPAD
 #usr/lib/squid/errors/zh-tw/ERR_CACHE_ACCESS_DENIED
 #usr/lib/squid/errors/zh-tw/ERR_CACHE_MGR_ACCESS_DENIED
 #usr/lib/squid/errors/zh-tw/ERR_CANNOT_FORWARD
@@ -1796,6 +2014,7 @@ usr/lib/squid/errors/ru/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/zh-tw/ERR_URN_RESOLVE
 #usr/lib/squid/errors/zh-tw/ERR_WRITE_ERROR
 #usr/lib/squid/errors/zh-tw/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/zh-tw/error-details.txt
 usr/lib/squid/fakeauth_auth
 usr/lib/squid/icons
 #usr/lib/squid/icons/anthony-binhex.gif
diff --git a/config/rootfiles/common/usb_modeswitch_data b/config/rootfiles/common/usb_modeswitch_data
index 0ebcf6220..3d6af6db2 100644
--- a/config/rootfiles/common/usb_modeswitch_data
+++ b/config/rootfiles/common/usb_modeswitch_data
@@ -2,22 +2,26 @@ etc/usb_modeswitch.d
 lib/udev/rules.d/40-usb_modeswitch.rules
 #usr/share/usb_modeswitch
 usr/share/usb_modeswitch/03f0:002a
+usr/share/usb_modeswitch/0408:f000
 usr/share/usb_modeswitch/0421:060c
 usr/share/usb_modeswitch/0421:0610
 usr/share/usb_modeswitch/0421:0622
 usr/share/usb_modeswitch/0421:0627
 usr/share/usb_modeswitch/0421:062c
+usr/share/usb_modeswitch/0421:0637
 usr/share/usb_modeswitch/0471:1210:uMa=Philips
 usr/share/usb_modeswitch/0471:1210:uMa=Wisue
 usr/share/usb_modeswitch/0471:1237
 usr/share/usb_modeswitch/0482:024d
 usr/share/usb_modeswitch/04bb:bccd
+usr/share/usb_modeswitch/04e8:680c
 usr/share/usb_modeswitch/04e8:689a
 usr/share/usb_modeswitch/04e8:f000:sMo=U209
 usr/share/usb_modeswitch/057c:84ff
 usr/share/usb_modeswitch/05c6:1000:sVe=GT
 usr/share/usb_modeswitch/05c6:1000:sVe=Option
 usr/share/usb_modeswitch/05c6:1000:uMa=AnyDATA
+usr/share/usb_modeswitch/05c6:1000:uMa=CELOT
 usr/share/usb_modeswitch/05c6:1000:uMa=DGT
 usr/share/usb_modeswitch/05c6:1000:uMa=Option
 usr/share/usb_modeswitch/05c6:1000:uMa=SAMSUNG
@@ -34,6 +38,7 @@ usr/share/usb_modeswitch/07d1:a804
 usr/share/usb_modeswitch/0930:0d46
 usr/share/usb_modeswitch/0ace:2011
 usr/share/usb_modeswitch/0ace:20ff
+usr/share/usb_modeswitch/0af0:4007
 usr/share/usb_modeswitch/0af0:6711
 usr/share/usb_modeswitch/0af0:6731
 usr/share/usb_modeswitch/0af0:6751
@@ -64,6 +69,7 @@ usr/share/usb_modeswitch/0af0:7801
 usr/share/usb_modeswitch/0af0:7901
 usr/share/usb_modeswitch/0af0:7a01
 usr/share/usb_modeswitch/0af0:7a05
+usr/share/usb_modeswitch/0af0:8006
 usr/share/usb_modeswitch/0af0:8200
 usr/share/usb_modeswitch/0af0:8201
 usr/share/usb_modeswitch/0af0:8300
@@ -95,6 +101,7 @@ usr/share/usb_modeswitch/0cf3:20ff
 usr/share/usb_modeswitch/0d46:45a1
 usr/share/usb_modeswitch/0d46:45a5
 usr/share/usb_modeswitch/0df7:0800
+usr/share/usb_modeswitch/0e8d:0002
 usr/share/usb_modeswitch/0e8d:7109
 usr/share/usb_modeswitch/0fce:d0cf
 usr/share/usb_modeswitch/0fce:d0e1
@@ -114,6 +121,7 @@ usr/share/usb_modeswitch/106c:3b03
 usr/share/usb_modeswitch/106c:3b05
 usr/share/usb_modeswitch/106c:3b06
 usr/share/usb_modeswitch/1076:7f40
+usr/share/usb_modeswitch/109b:f009
 usr/share/usb_modeswitch/1199:0fff
 usr/share/usb_modeswitch/1266:1000
 usr/share/usb_modeswitch/12d1:1001
@@ -129,6 +137,7 @@ usr/share/usb_modeswitch/12d1:14ad
 usr/share/usb_modeswitch/12d1:14b5
 usr/share/usb_modeswitch/12d1:14b7
 usr/share/usb_modeswitch/12d1:14c1
+usr/share/usb_modeswitch/12d1:14c3
 usr/share/usb_modeswitch/12d1:14c4
 usr/share/usb_modeswitch/12d1:14c5
 usr/share/usb_modeswitch/12d1:14d1
@@ -140,6 +149,7 @@ usr/share/usb_modeswitch/12d1:1523
 usr/share/usb_modeswitch/12d1:1553
 usr/share/usb_modeswitch/12d1:1557
 usr/share/usb_modeswitch/12d1:1c0b
+usr/share/usb_modeswitch/12d1:1c24
 usr/share/usb_modeswitch/12d1:1d50
 usr/share/usb_modeswitch/12d1:1da1
 usr/share/usb_modeswitch/12d1:1f01
@@ -164,9 +174,10 @@ usr/share/usb_modeswitch/198f:bccd
 usr/share/usb_modeswitch/19d2:0003
 usr/share/usb_modeswitch/19d2:0013
 usr/share/usb_modeswitch/19d2:0026
+usr/share/usb_modeswitch/19d2:0031
 usr/share/usb_modeswitch/19d2:0040
 usr/share/usb_modeswitch/19d2:0053
-usr/share/usb_modeswitch/19d2:0083
+usr/share/usb_modeswitch/19d2:0083:uPr=WCDMA
 usr/share/usb_modeswitch/19d2:0101
 usr/share/usb_modeswitch/19d2:0103
 usr/share/usb_modeswitch/19d2:0110
@@ -185,6 +196,7 @@ usr/share/usb_modeswitch/19d2:1179
 usr/share/usb_modeswitch/19d2:1201
 usr/share/usb_modeswitch/19d2:1216
 usr/share/usb_modeswitch/19d2:1224
+usr/share/usb_modeswitch/19d2:1514
 usr/share/usb_modeswitch/19d2:1517
 usr/share/usb_modeswitch/19d2:1520
 usr/share/usb_modeswitch/19d2:2000
@@ -203,6 +215,7 @@ usr/share/usb_modeswitch/1c9e:1001
 usr/share/usb_modeswitch/1c9e:6061
 usr/share/usb_modeswitch/1c9e:9200
 usr/share/usb_modeswitch/1c9e:9800
+usr/share/usb_modeswitch/1c9e:98ff
 usr/share/usb_modeswitch/1c9e:9e00
 usr/share/usb_modeswitch/1c9e:f000
 usr/share/usb_modeswitch/1da5:f000
@@ -214,13 +227,17 @@ usr/share/usb_modeswitch/1edf:6003
 usr/share/usb_modeswitch/1ee8:0009
 usr/share/usb_modeswitch/1ee8:0013
 usr/share/usb_modeswitch/1ee8:0040
+usr/share/usb_modeswitch/1ee8:0060
 usr/share/usb_modeswitch/1f28:0021
 usr/share/usb_modeswitch/1fac:0032
 usr/share/usb_modeswitch/1fac:0130
+usr/share/usb_modeswitch/2001:a80b
 usr/share/usb_modeswitch/201e:1023
 usr/share/usb_modeswitch/201e:2009
 usr/share/usb_modeswitch/2020:f00e
+usr/share/usb_modeswitch/2077:f000
 usr/share/usb_modeswitch/21f5:1000
+usr/share/usb_modeswitch/22f4:0021
 usr/share/usb_modeswitch/230d:0001
 usr/share/usb_modeswitch/230d:0007
 usr/share/usb_modeswitch/8888:6500
diff --git a/config/rootfiles/core/61/filelists/files b/config/rootfiles/core/61/filelists/files
index 78765a6d6..56981ed01 100644
--- a/config/rootfiles/core/61/filelists/files
+++ b/config/rootfiles/core/61/filelists/files
@@ -1,7 +1,9 @@
 etc/system-release
 etc/issue
 etc/rc.d/init.d/collectd
+opt/pakfire/lib/functions.sh
 srv/web/ipfire/cgi-bin/index.cgi
 srv/web/ipfire/cgi-bin/ovpnmain.cgi
 var/ipfire/general-functions.pl
 var/ipfire/langs
+usr/sbin/redirect_wrapper
diff --git a/config/rootfiles/core/61/filelists/logwatch b/config/rootfiles/core/61/filelists/logwatch
new file mode 120000
index 000000000..f14eabda9
--- /dev/null
+++ b/config/rootfiles/core/61/filelists/logwatch
@@ -0,0 +1 @@
+../../../common/logwatch
\ No newline at end of file
diff --git a/config/rootfiles/core/61/filelists/php b/config/rootfiles/core/61/filelists/php
new file mode 120000
index 000000000..1ae48d7a7
--- /dev/null
+++ b/config/rootfiles/core/61/filelists/php
@@ -0,0 +1 @@
+../../../common/php
\ No newline at end of file
diff --git a/config/rootfiles/core/61/filelists/usb_modeswitch_data b/config/rootfiles/core/61/filelists/usb_modeswitch_data
new file mode 120000
index 000000000..4cbce46cf
--- /dev/null
+++ b/config/rootfiles/core/61/filelists/usb_modeswitch_data
@@ -0,0 +1 @@
+../../../common/usb_modeswitch_data
\ No newline at end of file
diff --git a/config/rootfiles/core/61/update.sh b/config/rootfiles/core/61/update.sh
index e20324621..e6b504ae2 100644
--- a/config/rootfiles/core/61/update.sh
+++ b/config/rootfiles/core/61/update.sh
@@ -35,6 +35,10 @@ done
 #
 #Stop services
 
+#
+#Remove old usb_modeswitch_data
+rm -rf /usr/share/usb_modeswitch
+
 #
 #Extract files
 extract_files
diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav
index 4029074b6..6987adeda 100644
--- a/config/rootfiles/packages/clamav
+++ b/config/rootfiles/packages/clamav
@@ -10,15 +10,15 @@ usr/bin/sigtool
 #usr/lib/libclamav.la
 usr/lib/libclamav.so
 usr/lib/libclamav.so.6
-usr/lib/libclamav.so.6.1.13
+usr/lib/libclamav.so.6.1.14
 #usr/lib/libclamunrar.la
 usr/lib/libclamunrar.so
 usr/lib/libclamunrar.so.6
-usr/lib/libclamunrar.so.6.1.13
+usr/lib/libclamunrar.so.6.1.14
 #usr/lib/libclamunrar_iface.la
 usr/lib/libclamunrar_iface.so
 usr/lib/libclamunrar_iface.so.6
-usr/lib/libclamunrar_iface.so.6.1.13
+usr/lib/libclamunrar_iface.so.6.1.14
 #usr/lib/pkgconfig/libclamav.pc
 usr/sbin/clamd
 usr/share/clamav
diff --git a/config/u-boot/boot.scr b/config/u-boot/boot.scr
index 7174fae82..784c1213f 100755
Binary files a/config/u-boot/boot.scr and b/config/u-boot/boot.scr differ
diff --git a/config/u-boot/boot.script b/config/u-boot/boot.script
index 6fccbf135..795e60fd1 100755
--- a/config/u-boot/boot.script
+++ b/config/u-boot/boot.script
@@ -1,4 +1,4 @@
 fatload mmc 0:1 0x80000000 uImage-ipfire-omap
 fatload mmc 0:1 0x81600000 uInit-ipfire-omap
-setenv bootargs vram=32M console=tty1 omapfb.mode=dvi:800x600MR-16@60 rootwait smsc95xx.macaddr=$usbethaddr root=/dev/mmcblk0p3 rw
+setenv bootargs vram=32M console=tty1 omapfb.mode=dvi:800x600MR-16@60 rootwait smsc95xx.macaddr=$usbethaddr root=/dev/mmcblk0p3 ro
 bootm 0x80000000 0x81600000
diff --git a/config/urlfilter/redirect_wrapper b/config/urlfilter/redirect_wrapper
index c3bbf7c9f..ceae12b2b 100644
--- a/config/urlfilter/redirect_wrapper
+++ b/config/urlfilter/redirect_wrapper
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2009  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -115,7 +115,7 @@ while($line = <>) {
 exit 0;
 
 sub writetolog {
-	open(DATEI, ">>/var/log/squid/redirector_debug") || die "Unable to acces file /var/log/redirector_debug";
+	open(DATEI, ">>/var/log/squid/redirector_debug") || die "Unable to acces file /var/log/squid/redirector_debug";
 	my $log = shift;
 	print DATEI $log."\n";
 	close(DATEI);
diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi
index 07dc9e7fb..01bb3d685 100644
--- a/html/cgi-bin/index.cgi
+++ b/html/cgi-bin/index.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -356,7 +356,7 @@ END
 END
 		my $id = 0;
 		my $gif;
-		foreach my $key (keys %confighash) {
+		foreach my $key (sort { uc($confighash{$a}[1]) cmp uc($confighash{$b}[1]) } keys %confighash) {
 			if ($confighash{$key}[0] eq 'on') { $gif = 'on.gif'; } else { $gif = 'off.gif'; }
 
 			if ($id % 2) {
@@ -489,6 +489,14 @@ foreach my $file (@files) {
 	}
 }
 
+# Reiser4 warning
+my @files = `mount | grep " reiser4 (" 2>/dev/null`;
+foreach my $disk (@files) {
+	chomp ($disk);
+	$warnmessage .= "<li>$disk - $Lang::tr{'deprecated fs warn'}</li>\n\n";
+}
+
+
 if ($warnmessage) {
 	print "<tr><td align='center' bgcolor=$Header::colourred colspan='3'><font color='white'>$warnmessage</font></table>";
 }
diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 0c4502da6..92bab4732 100644
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -334,6 +334,7 @@ sub writeserverconf {
     print CONF "port $sovpnsettings{'DDEST_PORT'}\n";
     print CONF "script-security 3 system\n";
     print CONF "ifconfig-pool-persist /var/ipfire/ovpn/ovpn-leases.db 3600\n";
+    print CONF "client-config-dir /var/ipfire/ovpn/ccd\n";
     print CONF "tls-server\n";
     print CONF "ca /var/ipfire/ovpn/ca/cacert.pem\n";
     print CONF "cert /var/ipfire/ovpn/certs/servercert.pem\n";
@@ -358,7 +359,7 @@ sub writeserverconf {
     if ($sovpnsettings{MSSFIX} eq 'on') {
 	print CONF "mssfix\n";
     }
-    if ($sovpnsettings{FRAGMENT} ne '' && $sovpnsettings{'DPROTOCOL'} ne 'tcp') {
+    if (($sovpnsettings{FRAGMENT} ne '' && $sovpnsettings{FRAGMENT} ne 0) && $sovpnsettings{'DPROTOCOL'} ne 'tcp') {
 	print CONF "fragment $sovpnsettings{'FRAGMENT'}\n";
     }
     if ($sovpnsettings{KEEPALIVE_1} > 0 && $sovpnsettings{KEEPALIVE_2} > 0) {	
@@ -2910,7 +2911,7 @@ if ($cgiparams{'TYPE'} eq 'net') {
 
 	    # Sign the certificate request and move it
 	    # Sign the host certificate request
-	    system('/usr/bin/openssl', 'ca', '-days', '999999',
+	    system('/usr/bin/openssl', 'ca', '-days', "$cgiparams{'DAYS_VALID'}",
 		'-batch', '-notext',
 		'-in', $filename,
 		'-out', "${General::swroot}/ovpn/certs/$cgiparams{'NAME'}cert.pem",
@@ -3089,7 +3090,7 @@ if ($cgiparams{'TYPE'} eq 'net') {
 	    }
 	
 	    # Sign the host certificate request
-	    system('/usr/bin/openssl', 'ca', '-days', '999999',
+	    system('/usr/bin/openssl', 'ca', '-days', "$cgiparams{'DAYS_VALID'}",
 		'-batch', '-notext',
 		'-in',  "${General::swroot}/ovpn/certs/$cgiparams{'NAME'}req.pem",
 		'-out', "${General::swroot}/ovpn/certs/$cgiparams{'NAME'}cert.pem",
@@ -3873,7 +3874,7 @@ END
 	;
         my $id = 0;
         my $gif;
-        foreach my $key (keys %confighash) {
+	 foreach my $key (sort { uc($confighash{$a}[1]) cmp uc($confighash{$b}[1]) } keys %confighash) {
     	if ($confighash{$key}[0] eq 'on') { $gif = 'on.gif'; } else { $gif = 'off.gif'; }
 
 	if ($id % 2) {
diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index 6d0fe545e..8c9574cd5 100644
--- a/html/cgi-bin/proxy.cgi
+++ b/html/cgi-bin/proxy.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -55,10 +55,10 @@ my %mainsettings=();
 my %checked=();
 my %selected=();
 
-my @throttle_limits=(64,128,256,384,512,1024,2048,3072,5120);
-my $throttle_binary="bin|cab|exe|gz|rar|sea|tar|tgz|zip";
-my $throttle_dskimg="b5t|bin|bwt|ccd|cdi|cue|gho|img|iso|mds|nrg|pqi";
-my $throttle_mmedia="aiff?|asf|avi|divx|mov|mp3|mpe?g|qt|ra?m";
+my @throttle_limits=(64,128,256,384,512,768,1024,1280,1536,1792,2048,2560,3072,3584,4096,5120,6144,7168,8192,10240,12288,16384,20480);
+my $throttle_binary="7z|arj|bin|bz2|cab|exe|gz|lzh|rar|sea|tar|tgz|xz|zip";
+my $throttle_dskimg="b5t|bin|bwt|ccd|cdi|cue|gho|img|iso|mds|nrg|pqi|vmdk";
+my $throttle_mmedia="aiff?|asf|avi|divx|mov|mp3|mpe?g|ogg|qt|ra?m|ts|vob";
 
 my $def_ports_safe="80 # http\n21 # ftp\n443 # https\n563 # snews\n70 # gopher\n210 # wais\n1025-65535 # unregistered ports\n280 # http-mgmt\n488 # gss-http\n591 # filemaker\n777 # multiling http\n800 # Squids port (for icons)\n";
 my $def_ports_ssl="443 # https\n563 # snews\n";
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index b576d3ec5..c7f254ae6 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -581,6 +581,7 @@
 'delete share' => 'Freigabe löschen',
 'delete user' => 'Benutzer löschen',
 'demon login script' => 'Demon-Anmeldeskript',
+'deprecated fs warn' => 'Veraltetes Dateisystem! Keine Unterstützung in neueren Kernelversionen. Sichern und Umformatieren!',
 'description' => 'Beschreibung',
 'dest ip and port' => 'Ziel-IP:Port',
 'destination' => 'Ziel',
@@ -1383,10 +1384,10 @@
 'pakfire install description' => 'Wählen Sie ein oder mehrere Pakete zur Installation aus und drücken Sie auf das plus Symbol.',
 'pakfire install package' => 'Sie möchten folgende Pakete installieren: ',
 'pakfire installed addons' => 'Installierte Addons:',
-'pakfire last core list update' => 'Letztes Corelisten Update vor',
-'pakfire last package update' => 'Letztes Paketlisten Update vor',
-'pakfire last serverlist update' => 'Letztes Serverlisten Update vor',
-'pakfire last update' => 'Letzes Update vor',
+'pakfire last core list update' => 'Letztes Corelisten Update ist',
+'pakfire last package update' => 'Letztes Paketlisten Update ist',
+'pakfire last serverlist update' => 'Letztes Serverlisten Update ist',
+'pakfire last update' => 'Letzes Update ist',
 'pakfire possible dependency' => ' Möglicherweise haben diese Pakete Abhängigkeiten, d.h. andere Pakete müssen zusätzlich installiert werden. Dazu sehen sie unten eine Liste.',
 'pakfire register' => 'Registrierung am Pakfire-Server:',
 'pakfire system state' => 'System Status',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index d1c3b6b42..52872f49a 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -602,6 +602,7 @@
 'delete share' => 'Delete share',
 'delete user' => 'Delete user',
 'demon login script' => 'Demon login script',
+'deprecated fs warn' => 'Deprecated filesystem! Newer kernel drop the support. Backup and reformat!',
 'description' => 'Description',
 'dest ip and port' => 'Dest. IP: Port',
 'destination' => 'Destination',
diff --git a/lfs/GeoIP b/lfs/GeoIP
index f1b200b81..aeb358d28 100644
--- a/lfs/GeoIP
+++ b/lfs/GeoIP
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2010  IPFire Team  <info@ipfire.org>                          #
+# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -25,7 +25,7 @@
 include Config
 
 VER        = 1.17
-DATVER     = 01052012
+DATVER     = 04072012
 
 THISAPP    = Geo-IP-PurePerl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -43,7 +43,7 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 GeoIP.dat-$(DATVER).gz = $(DL_FROM)/GeoIP.dat-$(DATVER).gz
 
 $(DL_FILE)_MD5 = 42a6b9d4dd2563a20c8998556216e1de
-GeoIP.dat-$(DATVER).gz_MD5 = bb073125a92b1ee3dba202b1cec922c4
+GeoIP.dat-$(DATVER).gz_MD5 = 1395bec12f8a5f0b1e889581271ed5ce
 
 install : $(TARGET)
 
diff --git a/lfs/clamav b/lfs/clamav
index fe26aa2b6..a71702302 100644
--- a/lfs/clamav
+++ b/lfs/clamav
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.97.4
+VER        = 0.97.5
 
 THISAPP    = clamav-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = clamav
-PAK_VER    = 19
+PAK_VER    = 20
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = dc1e5abc093b11f120e4eac94a7f78aa
+$(DL_FILE)_MD5 = 4d4b93243a5add0216acc4f24f43a895
 
 install : $(TARGET)
 
@@ -80,6 +80,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/var/ipfire/clamav
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
+	mkdir -p /usr/share/clamav/
 	chown clamav.clamav -R /usr/share/clamav/
 	cp -rf $(DIR_SRC)/config/clamav/* /var/ipfire/clamav/
 	rm -rfv /usr/share/clamav/*.cvd
diff --git a/lfs/flash-images b/lfs/flash-images
index 075808b22..e43d53eb2 100644
--- a/lfs/flash-images
+++ b/lfs/flash-images
@@ -50,7 +50,7 @@ MNThdd   := /install/harddisk
 IMGpart  := /install/images/part_area
 IMGboot  := /install/images/bootfs
 # don't change SIZEboot this without checking Image size
-SIZEboot := 50
+SIZEboot := 64
 IMGroot  := /install/images/rootfs
 SIZEroot := 600
 
@@ -61,7 +61,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	dd bs=1k if=/dev/zero of=$(IMGpart) count=16
 
 	# Create images for filesystems
-	dd bs=1K if=/dev/zero of=$(IMGboot) count=51184  # 50MB-16K
+	dd bs=1K if=/dev/zero of=$(IMGboot) count=65520  # 64MB-16K
 	dd bs=1M if=/dev/zero of=$(IMGroot) count=$(SIZEroot)
 
 	# Format them
@@ -72,6 +72,10 @@ else
 endif
 	mkfs.ext4 -O ^has_journal,extent -F $(IMGroot)
 
+	# Most systems that use Flashimages has no RTC at boot
+	# so the interval check should disables
+	tune2fs -i0 $(IMGroot)
+
 	# Mount Images
 	mount -o loop $(IMGroot) $(MNThdd)
 	mkdir $(MNThdd)/boot
diff --git a/lfs/foomatic b/lfs/foomatic
index e22f4b840..712247ff0 100644
--- a/lfs/foomatic
+++ b/lfs/foomatic
@@ -86,7 +86,7 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_SRC)/foomatic-* && cd $(DIR_SRC) && \
+	@rm -rf $(DIR_SRC)/foomatic-* /usr/share/foomatic && cd $(DIR_SRC) && \
 		tar zxf $(DIR_DL)/$(DL_FILE) && \
 		tar zxf $(DIR_DL)/foomatic-db-$(DATE).tar.gz && \
 		tar zxf $(DIR_DL)/foomatic-db-engine-$(VER).tar.gz && \
diff --git a/lfs/linux3 b/lfs/linux3
index e049be0f2..e84fd7aa9 100644
--- a/lfs/linux3
+++ b/lfs/linux3
@@ -24,20 +24,12 @@
 
 include Config
 
-PATCHLEVEL = .19
+VER           = 3.2.23
 
-VER           = 2.6.42.19
-
-XVERS         = 3.2.19
-XVERSION      = 2
-XPATCHLEVEL   = 6
-XSUBLEVEL     = 42
-XEXTRAVERSION = .19
-
-RPI_PATCHES = linux-3.2-bootc-5b84c25
+RPI_PATCHES = linux-3.2-bootc-f23da7f
 
 THISAPP    = linux-$(VER)
-DL_FILE    = linux-$(XVERS).tar.bz2
+DL_FILE    = linux-$(VER).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 CFLAGS     =
@@ -83,9 +75,8 @@ objects =$(DL_FILE) \
 $(DL_FILE)				= $(URL_IPFIRE)/$(DL_FILE)
 rpi-patches-$(RPI_PATCHES).patch.xz	= $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).patch.xz
 
-$(DL_FILE)_MD5				= 64c732cb425eb8787b841d11309bb335
-rpi-patches-$(RPI_PATCHES).patch.xz_MD5	= 0b2fac563b093465f5c6b3d571e57399
-
+$(DL_FILE)_MD5				= 1fc88918d247293d236d5dc169bf0b30
+rpi-patches-$(RPI_PATCHES).patch.xz_MD5	= 5651c6411bb1cbdbfe4b2908c117aaf3
 
 install : $(TARGET)
 
@@ -118,13 +109,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) $(DIR_SRC)/linux && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 
-	# Change version from 3.x to 2.6.4x
-	cd $(DIR_SRC)/linux-$(XVERS) && sed -i -e "s/^VERSION =.*$$/VERSION = $(XVERSION)/g" Makefile
-	cd $(DIR_SRC)/linux-$(XVERS) && sed -i -e "s/^PATCHLEVEL =.*$$/PATCHLEVEL = $(XPATCHLEVEL)/g" Makefile
-	cd $(DIR_SRC)/linux-$(XVERS) && sed -i -e "s/^SUBLEVEL =.*$$/SUBLEVEL = $(XSUBLEVEL)/g" Makefile
-	cd $(DIR_SRC)/linux-$(XVERS) && sed -i -e "s/^EXTRAVERSION =.*$$/EXTRAVERSION = $(XEXTRAVERSION)/g" Makefile
-	mv $(DIR_SRC)/linux-$(XVERS) $(DIR_SRC)/linux-$(VER)
-
 	ln -svf linux-$(VER) $(DIR_SRC)/linux
 
 	# Linux Intermediate Queueing Device
@@ -133,7 +117,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	# Not report deprecated syscall 1.23 (for kudzu)
 #	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.25.18-not_report_sysctl_1.23.patch
 
-
 	# ipp2p 0.8.2-ipfire
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.0-ipp2p-0.8.2-ipfire.patch
 
@@ -170,7 +153,7 @@ ifeq "$(KCFG)" "-omap"
 endif
 
 ifeq "$(KCFG)" "-rpi"
-	# Apply Raspberry Pi kernel patches. (only avail for 3.1.x kernel yet)
+	# Apply Raspberry Pi kernel patches.
 	cd $(DIR_APP) && xzcat $(DIR_DL)/rpi-patches-$(RPI_PATCHES).patch.xz | patch -Np1
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2-bcm2835-alsamixer.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2-bcm2835-limit_volume.patch
@@ -192,7 +175,7 @@ else
 	cp $(DIR_SRC)/config/kernel/kernel.config.$(MACHINE)-$(VERSUFIX) $(DIR_APP)/.config
 	cd $(DIR_APP) && make CC="$(KGCC)" oldconfig
 	cd $(DIR_APP) && make CC="$(KGCC)" clean
-	cd $(DIR_APP) && sed -i -e 's/EXTRAVERSION\ =.*/EXTRAVERSION\ =\ $(PATCHLEVEL)-$(VERSUFIX)/' Makefile
+	cd $(DIR_APP) && sed -i -e 's/EXTRAVERSION\ =.*/EXTRAVERSION\ =\ -$(VERSUFIX)/' Makefile
 
 ifeq "$(KCFG)" "-kirkwood"
 	cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" uImage
diff --git a/lfs/logwatch b/lfs/logwatch
index ac2585b78..755557a0b 100644
--- a/lfs/logwatch
+++ b/lfs/logwatch
@@ -71,6 +71,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && sed -e "s/^TEMPDIR=.*/TEMPDIR=\"\/tmp\"/g" -i install_logwatch.sh
+	cd $(DIR_APP)/lib && patch < $(DIR_SRC)/src/patches/logwatch-7.3.6-date_manip6.patch
 	@cd $(DIR_APP) && chmod 755 install_logwatch.sh
 	cd $(DIR_APP) && yes "" | ./install_logwatch.sh
 	
diff --git a/lfs/openvpn b/lfs/openvpn
index 4f10e7afb..e57aa30ba 100644
--- a/lfs/openvpn
+++ b/lfs/openvpn
@@ -84,6 +84,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP)/plugin/down-root && make
 	cp -pvf $(DIR_APP)/plugin/down-root/openvpn-down-root.so /usr/lib/openvpn
 	-mkdir -vp /var/ipfire/ovpn/ca
+	-mkdir -vp /var/ipfire/ovpn/ccd
 	-mkdir -vp /var/ipfire/ovpn/crls
 	-mkdir -vp /var/ipfire/ovpn/n2nconf
 	-mkdir -vp /var/ipfire/ovpn/scripts
diff --git a/lfs/php b/lfs/php
index 075d4fbae..3fcac1717 100644
--- a/lfs/php
+++ b/lfs/php
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 5.3.13
+VER        = 5.3.14
 
 THISAPP    = php-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -42,7 +42,7 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 idn-0.1.tgz = $(DL_FROM)/idn-0.1.tgz
 Log-1.9.11.tgz = $(DL_FROM)/Log-1.9.11.tgz
 
-$(DL_FILE)_MD5 = 370be99c5cdc2e756c82c44d774933c8
+$(DL_FILE)_MD5 = 7caac4f71e2f21426c11ac153e538392
 idn-0.1.tgz_MD5 = ef8635ec22348325a76abd2abddca4a1
 Log-1.9.11.tgz_MD5 = fb7c648b212f12fdb5ce1ab687793513
 
diff --git a/lfs/rpi-firmware b/lfs/rpi-firmware
index c7edf4130..4daec2f7a 100644
--- a/lfs/rpi-firmware
+++ b/lfs/rpi-firmware
@@ -24,13 +24,15 @@
 
 include Config
 
-VER        = ipf1
+VER        = 1309b3d
 
-THISAPP    = raspberrypi-firmware_$(VER)
+THISAPP    = rpi-firmware-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
+SUP_ARCH   = armv5tel
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -39,7 +41,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ffae4e109de698987795f1d5cb952ed6
+$(DL_FILE)_MD5 = 90978c567f9bcd2aad2c1c138acb3518
 
 install : $(TARGET)
 
diff --git a/lfs/samba b/lfs/samba
index e27ee08da..9c6a3b65d 100644
--- a/lfs/samba
+++ b/lfs/samba
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.5.15
+VER        = 3.5.16
 
 THISAPP    = samba-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = samba
-PAK_VER    = 40
+PAK_VER    = 41
 
 DEPS       = "cups"
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 2d72c044bdfd854ee2ab736326da3afd
+$(DL_FILE)_MD5 = 260cf49b683e86f4cc316c1e6fddbdc5
 
 install : $(TARGET)
 
diff --git a/lfs/squid b/lfs/squid
index 61f17dfb3..74683284f 100644
--- a/lfs/squid
+++ b/lfs/squid
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.1.19
+VER        = 3.1.20
 
 THISAPP    = squid-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 9b6ffaf96bee8f05f0085bc6361d7c94
+$(DL_FILE)_MD5 = c4d733a383c0508fd0746d64a2d7278a
 
 install : $(TARGET)
 
diff --git a/lfs/udev b/lfs/udev
index c7cba7138..decdce8bb 100644
--- a/lfs/udev
+++ b/lfs/udev
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2005-2010  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -77,33 +77,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/udev-125-netif_rename.patch
-ifeq "$(LFS_PASS)" "install"
-	cd $(DIR_APP) && make DESTDIR=/install/initrd sbindir=/sbin udevdir=/dev
-	cd $(DIR_APP) && make DESTDIR=/install/initrd sbindir=/sbin udevdir=/dev install
-	rm -f /install/initrd/sbin/udev* /install/initrd/usr/sbin/udev* /install/initrd/usr/bin/udev*
-	cd $(DIR_APP) && install udevadm udevd /install/initrd/sbin
-	cd $(DIR_APP) && make $(MAKETUNING) EXTRAS="extras/ata_id extras/cdrom_id extras/edd_id \
-					extras/firmware extras/floppy extras/path_id \
-					extras/scsi_id extras/usb_id extras/volume_id"
-	cd $(DIR_APP) && make DESTDIR=/install/initrd EXTRAS="extras/ata_id extras/cdrom_id extras/edd_id \
-					extras/firmware extras/floppy extras/path_id \
-					extras/scsi_id extras/usb_id extras/volume_id" install
-	cd /install/initrd/usr/share && rm -rf man
-	-mkdir -pv /install/initrd/dev
-	cd /install/initrd/dev && rm -f console
-	cd /install/initrd/dev && mknod -m 0600 console c 5 1
-	cd /install/initrd/dev && rm -f null
-	cd /install/initrd/dev && mknod -m 0777 null c 1 3
-	cd /install/initrd/dev && rm -f tty*
-	cd /install/initrd/dev && mknod -m 0600 tty1 c 4 1
-	cd /install/initrd/dev && mknod -m 0600 tty2 c 4 2
-	cd /install/initrd/dev && mknod -m 0600 tty3 c 4 3
-	cd /install/initrd/dev && mknod -m 0600 tty4 c 4 4
-	cd /install/initrd/dev && mknod -m 0600 tty5 c 4 5
-	cd /install/initrd/dev && mknod -m 0600 tty6 c 4 6
-	cp -f /etc/udev/rules.d/55-scsi-cdrom.rules /install/initrd/etc/udev/rules.d/55-scsi-cdrom.rules
-
-else
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/udev-125-ext4_wo_journal.patch
 	rm -rf /lib/udev/devices
 	cd $(DIR_APP) && tar jxf $(DIR_DL)/udev-config-6.2.tar.bz2
 	cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/udev-config-6.2_persistent-storage-fix.patch
@@ -131,6 +105,5 @@ else
 	chmod 755 /etc/udev/dvb.sh
 	touch /etc/udev/rules.d/30-persistent-network.rules
 	cp -vf $(DIR_SRC)/config/udev/blacklist /etc/modprobe.d/blacklist
-endif
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/lfs/usb_modeswitch_data b/lfs/usb_modeswitch_data
index 2b99bd079..46c7c0d98 100644
--- a/lfs/usb_modeswitch_data
+++ b/lfs/usb_modeswitch_data
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 20120120
+VER        = 20120531
 
 THISAPP    = usb-modeswitch-data-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = c899cc9c71bb35f3ec600b7cd1455c65
+$(DL_FILE)_MD5 = 4a948331d5b9fccba4a89d3e62040cc3
 
 install : $(TARGET)
 
diff --git a/src/initscripts/init.d/partresize b/src/initscripts/init.d/partresize
index c78c0c52c..33b56266a 100644
--- a/src/initscripts/init.d/partresize
+++ b/src/initscripts/init.d/partresize
@@ -30,7 +30,7 @@ case "${1}" in
 			DRV=${ROOT::`expr length $ROOT`-1}
 		fi
 
-		boot_mesg "Change Partition $(DRV)3 to all free space ..."
+		boot_mesg "Change Partition ${DRV}3 to all free space ..."
 		echo -e 'd\n3\nn\np\n3\n\n\nw\nq\n' | fdisk ${DRV}
 
 		# Erase symlink, it should run only once
diff --git a/src/pakfire/lib/functions.sh b/src/pakfire/lib/functions.sh
index 2f6491f28..bc05bd01e 100644
--- a/src/pakfire/lib/functions.sh
+++ b/src/pakfire/lib/functions.sh
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -28,6 +28,13 @@ extract_files() {
 	echo "...Finished."
 }
 
+extract_backup_includes() {
+	echo "Extracting backup includes..."
+	tar xvf /opt/pakfire/tmp/files --no-overwrite-dir -p --numeric-owner -C / \
+		var/ipfire/backup/addons/includes
+	echo "...Finished."
+}
+
 remove_files() {
 	echo "Removing files..."
 	for i in $(cat /opt/pakfire/db/rootfiles/${NAME}); do
diff --git a/src/patches/logwatch-7.3.6-date_manip6.patch b/src/patches/logwatch-7.3.6-date_manip6.patch
new file mode 100644
index 000000000..015e7d6be
--- /dev/null
+++ b/src/patches/logwatch-7.3.6-date_manip6.patch
@@ -0,0 +1,13 @@
+--- Logwatch.pm.orig    2012-06-20 09:58:12.786294471 +0200
++++ Logwatch.pm 2012-06-20 09:41:59.443055298 +0200
+@@ -4,6 +4,10 @@
+
+ package Logwatch;
+
++# Define interace version 5 for Date::Manip
++BEGIN {
++       $Date::Manip::Backend = 'DM5';
++}
+ use strict;
+ use Exporter;
+ use POSIX qw(strftime);
diff --git a/src/patches/udev-125-ext4_wo_journal.patch b/src/patches/udev-125-ext4_wo_journal.patch
new file mode 100644
index 000000000..77072cea6
--- /dev/null
+++ b/src/patches/udev-125-ext4_wo_journal.patch
@@ -0,0 +1,50 @@
+diff -Naur udev-125.org/extras/volume_id/lib/ext.c udev-125/extras/volume_id/lib/ext.c
+--- udev-125.org/extras/volume_id/lib/ext.c	2008-07-18 16:26:55.000000000 +0200
++++ udev-125/extras/volume_id/lib/ext.c	2012-06-25 00:52:40.976563010 +0200
+@@ -160,32 +160,31 @@
+ 		goto found;
+ 	}
+ 
+-	/* has journal */
+-	if ((feature_compat & EXT3_FEATURE_COMPAT_HAS_JOURNAL) != 0) {
+-		/* "use on development code" is ext4dev */
+-		if ((flags & EXT2_FLAGS_TEST_FILESYS) != 0) {
+-			id->type = "ext4dev";
+-			goto found;
+-		}
++	/* "use on development code" is ext4dev */
++	if ((flags & EXT2_FLAGS_TEST_FILESYS) != 0) {
++		id->type = "ext4dev";
++		goto found;
++	}
+ 
+-		/* incompatible ext3 features is ext4 */
+-		if ((feature_ro_compat & EXT3_FEATURE_RO_COMPAT_UNSUPPORTED) != 0 ||
+-		    (feature_incompat & EXT3_FEATURE_INCOMPAT_UNSUPPORTED) != 0) {
+-			id->type = "ext4";
+-			goto found;
+-		}
++	/* incompatible ext3 features is ext4 */
++	if ((feature_ro_compat & EXT3_FEATURE_RO_COMPAT_UNSUPPORTED) != 0 ||
++	    (feature_incompat & EXT3_FEATURE_INCOMPAT_UNSUPPORTED) != 0) {
++		id->type = "ext4";
++		goto found;
++	}
+ 
++	/* has journal */
++	if ((feature_compat & EXT3_FEATURE_COMPAT_HAS_JOURNAL) != 0) {
+ 		id->type = "ext3";
+ 		goto found;
+ 	} else {
+-		/* no incompatible ext2 feature is ext2 */
++	/* no incompatible ext2 feature is ext2 */
+ 		if ((feature_ro_compat & EXT2_FEATURE_RO_COMPAT_UNSUPPORTED) == 0 &&
+ 		    (feature_incompat & EXT2_FEATURE_INCOMPAT_UNSUPPORTED) == 0) {
+ 			id->type = "ext2";
+ 			goto found;
+ 		}
+ 	}
+-
+ 	return -1;
+ 
+ found: