[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 13ff7d0bfb5b886aa0a1a11cca8045d4e9ed3409
by git＠ipfire.org 18 Oct '10
by git＠ipfire.org 18 Oct '10
18 Oct '10
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, master has been updated
via 13ff7d0bfb5b886aa0a1a11cca8045d4e9ed3409 (commit)
from 66d54d5bc104924f88f3a36e836ec50594b0476e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 13ff7d0bfb5b886aa0a1a11cca8045d4e9ed3409
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Oct 18 14:37:20 2010 +0200
core41: fix path to outgoing firewall folder.
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/41/filelists/files | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Difference in files:
diff --git a/config/rootfiles/core/41/filelists/files b/config/rootfiles/core/41/filelists/files
index 47487bd..c42902f 100644
--- a/config/rootfiles/core/41/filelists/files
+++ b/config/rootfiles/core/41/filelists/files
@@ -8,4 +8,4 @@ var/ipfire/langs/en.pl
var/ipfire/langs/de.pl
var/ipfire/langs/es.pl
var/ipfire/langs/fr.pl
-var/ipfire/outgoingfw/bin/outgoingfw.pl
+var/ipfire/outgoing/bin/outgoingfw.pl
hooks/post-receive
--
IPFire 2.x development tree
1
0
[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. cdd964e9f8907999c9a54b4d15271902d0666064
by git＠ipfire.org 16 Oct '10
by git＠ipfire.org 16 Oct '10
16 Oct '10
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
via cdd964e9f8907999c9a54b4d15271902d0666064 (commit)
via 598293d753a64133321bb660ebd3b67c57ccc998 (commit)
via c3a05990d7bec5acd4460d6079d23231b0962137 (commit)
via f7108e23e54a5783b5fc720b58954b31ddb6495b (commit)
via 4663169f4991d306d67dfdc049294fdf65b0b0a5 (commit)
via c2adfd375e04ea2af12428342b69b714efe4823b (commit)
via 98e4b7dccf63fd6c1cdf7c089e22f054b4d82e1e (commit)
via 01441c88a23e90b78c7ba943d66e3b542a0c9cbd (commit)
via e0c4818d612a9ac909d9a07a71cd2d5037ac8b3a (commit)
via 137c998130a6b873d9bd5c756903f06ea89d7879 (commit)
via 4b2af69ae4dd8a816141742be8a3a72771dacc2a (commit)
via 765cf0e9be7622bb54c5d0b2d39a2ae8e388949c (commit)
via 62e73637d310d935eb4b78f81aeecf1ebf8d2b9d (commit)
via c81fdcc9fd9f71feeaea284c19d2a0b606820cb7 (commit)
via 930b94431503424efe06ac576543abd688a5968b (commit)
from 6eed299202d2f9c25abc53def2304af28e81ec21 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit cdd964e9f8907999c9a54b4d15271902d0666064
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Oct 8 20:58:57 2010 +0200
iscsi-initiator-utils: New package.
commit 598293d753a64133321bb660ebd3b67c57ccc998
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Oct 8 17:08:55 2010 +0200
audit: Divided into 2 more packages.
commit c3a05990d7bec5acd4460d6079d23231b0962137
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Oct 8 08:24:11 2010 +0200
audit: New package.
commit f7108e23e54a5783b5fc720b58954b31ddb6495b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Oct 15 21:20:09 2010 +0200
nss-util: Likewise.
commit 4663169f4991d306d67dfdc049294fdf65b0b0a5
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Oct 15 21:19:17 2010 +0200
nss: -devel should also depend on main package.
commit c2adfd375e04ea2af12428342b69b714efe4823b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Oct 15 21:18:55 2010 +0200
nss: Depend on nss-softokn.
commit 98e4b7dccf63fd6c1cdf7c089e22f054b4d82e1e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Oct 15 21:18:34 2010 +0200
nss-softokn: New package.
commit 01441c88a23e90b78c7ba943d66e3b542a0c9cbd
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Oct 15 20:42:14 2010 +0200
nss: Depend on nss-util.
commit e0c4818d612a9ac909d9a07a71cd2d5037ac8b3a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Oct 15 20:42:02 2010 +0200
nss-util: New package.
commit 137c998130a6b873d9bd5c756903f06ea89d7879
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Oct 15 19:26:29 2010 +0200
nss: New package.
commit 4b2af69ae4dd8a816141742be8a3a72771dacc2a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Oct 15 19:26:11 2010 +0200
nspr: New package.
commit 765cf0e9be7622bb54c5d0b2d39a2ae8e388949c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Oct 14 22:01:17 2010 +0200
util-linux-ng: Update to 2.18.
commit 62e73637d310d935eb4b78f81aeecf1ebf8d2b9d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Oct 16 00:22:54 2010 +0200
hwdata: New package.
commit c81fdcc9fd9f71feeaea284c19d2a0b606820cb7
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Oct 16 00:23:25 2010 +0200
pciutils: Move pci.ids to /usr/share/pci.ids.
commit 930b94431503424efe06ac576543abd688a5968b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Oct 16 23:13:04 2010 +0200
kbd: Downgrade to 1.15.
-----------------------------------------------------------------------
Summary of changes:
pkgs/core/audit/audit.nm | 72 +
pkgs/core/hwdata/hwdata.nm | 47 +
pkgs/core/iscsi-initiator-utils/04-iscsi | 17 +
.../iscsi-initiator-utils/iscsi-initiator-utils.nm | 102 +
.../iscsi-initiator-utils-add-libiscsi.patch | 3737 ++++++++++++++++++++
...scsi-initiator-utils-disable-isns-for-lib.patch | 74 +
.../iscsi-initiator-utils-dont-use-static.patch | 12 +
.../iscsi-initiator-utils-fix-lib-sysfs-init.patch | 49 +
.../iscsi-initiator-utils-only-root-use.patch | 16 +
.../patches/iscsi-initiator-utils-uip-mgmt.patch | 385 ++
...itiator-utils-update-initscripts-and-docs.patch | 114 +
...scsi-initiator-utils-use-red-hat-for-name.patch | 12 +
.../iscsi-initiator-utils-use-var-for-config.patch | 234 ++
pkgs/core/kbd/kbd.nm | 3 +-
pkgs/core/kbd/patches/kbd-1.15-defkeymap.patch | 12 +
pkgs/core/kbd/patches/kbd-1.15-keycodes-man.patch | 52 +
pkgs/core/kbd/patches/kbd-1.15-po.patch | 31 +
pkgs/core/kbd/patches/kbd-1.15-quiet_doc.patch | 34 +
.../kbd/patches/kbd-1.15-resizecon-x86_64.patch | 15 +
pkgs/core/kbd/patches/kbd-1.15-sparc.patch | 97 +
pkgs/core/kbd/patches/kbd-1.15-unicode_start.patch | 21 +
pkgs/core/kbd/patches/kbd-1.15.1-backspace-1.patch | 250 --
pkgs/core/nspr/nspr-config-vars.in | 2 +
pkgs/core/nspr/nspr.nm | 107 +
pkgs/core/nspr/nspr.pc.in | 10 +
pkgs/core/nspr/patches/nspr-config-pc.patch | 48 +
pkgs/core/nss-softokn/nss-softokn-config.in | 116 +
pkgs/core/nss-softokn/nss-softokn.nm | 131 +
pkgs/core/nss-softokn/nss-softokn.pc.in | 11 +
pkgs/core/nss-softokn/nss-softokn.spec | 462 +++
.../patches/nss-softokn-3.12.4-fips-fix.patch | 12 +
.../patches/nss-softokn-3.12.4-prelink.patch | 298 ++
pkgs/core/nss-util/nss-util-config.in | 118 +
pkgs/core/nss-util/nss-util.nm | 109 +
pkgs/core/nss-util/nss-util.pc.in | 11 +
pkgs/core/nss-util/nss-util.spec | 278 ++
pkgs/core/nss/PayPalEE.cert | Bin 0 -> 1483 bytes
pkgs/core/nss/cert8.db | Bin 0 -> 65536 bytes
pkgs/core/nss/cert9.db | Bin 0 -> 9216 bytes
pkgs/core/nss/key3.db | Bin 0 -> 16384 bytes
pkgs/core/nss/key4.db | Bin 0 -> 11264 bytes
pkgs/core/nss/nss-config.in | 145 +
pkgs/core/nss/nss.nm | 225 ++
pkgs/core/nss/nss.pc.in | 11 +
...d-support-for-PKCS-8-encoded-private-keys.patch | 237 ++
.../0001-Do-not-define-SEC_SkipTemplate.patch | 35 +
pkgs/core/nss/patches/nss-enable-pem.patch | 12 +
.../nss/patches/nss-sysinit-userdb-first.patch | 65 +
pkgs/core/nss/patches/nsspem-596674.patch | 127 +
.../nss/patches/renegotiate-transitional.patch | 12 +
pkgs/core/nss/secmod.db | Bin 0 -> 16384 bytes
pkgs/core/nss/setup-nsssysinit.sh | 68 +
pkgs/core/nss/system-pkcs11.txt | 5 +
pkgs/core/pciutils/pciutils.nm | 7 +-
pkgs/core/util-linux-ng/util-linux-ng.nm | 4 +-
55 files changed, 7796 insertions(+), 256 deletions(-)
create mode 100644 pkgs/core/audit/audit.nm
create mode 100644 pkgs/core/hwdata/hwdata.nm
create mode 100755 pkgs/core/iscsi-initiator-utils/04-iscsi
create mode 100644 pkgs/core/iscsi-initiator-utils/iscsi-initiator-utils.nm
create mode 100644 pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-add-libiscsi.patch
create mode 100644 pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-disable-isns-for-lib.patch
create mode 100644 pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-dont-use-static.patch
create mode 100644 pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-fix-lib-sysfs-init.patch
create mode 100644 pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-only-root-use.patch
create mode 100644 pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-uip-mgmt.patch
create mode 100644 pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-update-initscripts-and-docs.patch
create mode 100644 pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-use-red-hat-for-name.patch
create mode 100644 pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-use-var-for-config.patch
create mode 100644 pkgs/core/kbd/patches/kbd-1.15-defkeymap.patch
create mode 100644 pkgs/core/kbd/patches/kbd-1.15-keycodes-man.patch
create mode 100644 pkgs/core/kbd/patches/kbd-1.15-po.patch
create mode 100644 pkgs/core/kbd/patches/kbd-1.15-quiet_doc.patch
create mode 100644 pkgs/core/kbd/patches/kbd-1.15-resizecon-x86_64.patch
create mode 100644 pkgs/core/kbd/patches/kbd-1.15-sparc.patch
create mode 100644 pkgs/core/kbd/patches/kbd-1.15-unicode_start.patch
delete mode 100644 pkgs/core/kbd/patches/kbd-1.15.1-backspace-1.patch
create mode 100644 pkgs/core/nspr/nspr-config-vars.in
create mode 100644 pkgs/core/nspr/nspr.nm
create mode 100644 pkgs/core/nspr/nspr.pc.in
create mode 100644 pkgs/core/nspr/patches/nspr-config-pc.patch
create mode 100644 pkgs/core/nss-softokn/nss-softokn-config.in
create mode 100644 pkgs/core/nss-softokn/nss-softokn.nm
create mode 100644 pkgs/core/nss-softokn/nss-softokn.pc.in
create mode 100644 pkgs/core/nss-softokn/nss-softokn.spec
create mode 100644 pkgs/core/nss-softokn/patches/nss-softokn-3.12.4-fips-fix.patch
create mode 100644 pkgs/core/nss-softokn/patches/nss-softokn-3.12.4-prelink.patch
create mode 100644 pkgs/core/nss-util/nss-util-config.in
create mode 100644 pkgs/core/nss-util/nss-util.nm
create mode 100644 pkgs/core/nss-util/nss-util.pc.in
create mode 100644 pkgs/core/nss-util/nss-util.spec
create mode 100644 pkgs/core/nss/PayPalEE.cert
create mode 100644 pkgs/core/nss/cert8.db
create mode 100644 pkgs/core/nss/cert9.db
create mode 100644 pkgs/core/nss/key3.db
create mode 100644 pkgs/core/nss/key4.db
create mode 100644 pkgs/core/nss/nss-config.in
create mode 100644 pkgs/core/nss/nss.nm
create mode 100644 pkgs/core/nss/nss.pc.in
create mode 100644 pkgs/core/nss/patches/0001-Add-support-for-PKCS-8-encoded-private-keys.patch
create mode 100644 pkgs/core/nss/patches/0001-Do-not-define-SEC_SkipTemplate.patch
create mode 100644 pkgs/core/nss/patches/nss-enable-pem.patch
create mode 100755 pkgs/core/nss/patches/nss-sysinit-userdb-first.patch
create mode 100644 pkgs/core/nss/patches/nsspem-596674.patch
create mode 100644 pkgs/core/nss/patches/renegotiate-transitional.patch
create mode 100644 pkgs/core/nss/secmod.db
create mode 100755 pkgs/core/nss/setup-nsssysinit.sh
create mode 100644 pkgs/core/nss/system-pkcs11.txt
Difference in files:
diff --git a/pkgs/core/audit/audit.nm b/pkgs/core/audit/audit.nm
new file mode 100644
index 0000000..c86b005
--- /dev/null
+++ b/pkgs/core/audit/audit.nm
@@ -0,0 +1,72 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include $(PKGROOT)/Include
+
+PKG_NAME = audit
+PKG_VER = 2.0.5
+PKG_REL = 0
+
+PKG_MAINTAINER =
+PKG_GROUP = System/Daemons
+PKG_URL = http://people.redhat.com/sgrubb/audit/
+PKG_LICENSE = GPLv2+
+PKG_SUMMARY = User space tools for 2.6 kernel auditing.
+
+PKG_BUILD_DEPS+= autoconf automake libcap-ng-devel libtool openldap-devel \
+ python-devel swig
+
+define PKG_DESCRIPTION
+ The audit package contains the user space utilities for \
+ storing and searching the audit records generate by \
+ the audit subsystem in the Linux 2.6 kernel.
+endef
+
+PKG_TARBALL = $(THISAPP).tar.gz
+
+PKG_PACKAGES += $(PKG_NAME)-devel $(PKG_NAME)-libs
+
+CONFIGURE_OPTIONS += \
+ --sysconfdir=/etc \
+ --sbindir=/sbin \
+ --libdir=/lib \
+ --without-prelude \
+ --without-libwrap \
+ --enable-gssapi-krb5=no \
+ --with-libcap-ng=yes
+
+define STAGE_PREPARE_CMDS
+ cd $(DIR_APP) && autoreconf -fvi
+endef
+
+define STAGE_INSTALL_CMDS
+ rm -vf $(BUILDROOT)/lib/libau{dit,parse}.so
+ ln -svf ../../lib/libaudit.so.1 $(BUILDROOT)/usr/lib/libaudit.so
+ ln -svf ../../lib/libauparse.so.0 $(BUILDROOT)/usr/lib/libauparse.so
+
+ -mkdir -pv $(BUILDROOT)/usr/sbin
+ mv -v $(BUILDROOT)/sbin/audisp*remote $(BUILDROOT)/usr/sbin/
+
+ rm -rfv $(BUILDROOT)/etc/{rc.d,sysconfig}
+endef
diff --git a/pkgs/core/hwdata/hwdata.nm b/pkgs/core/hwdata/hwdata.nm
new file mode 100644
index 0000000..d4eb4f9
--- /dev/null
+++ b/pkgs/core/hwdata/hwdata.nm
@@ -0,0 +1,47 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include $(PKGROOT)/Include
+
+PKG_NAME = hwdata
+PKG_VER = 0.232
+PKG_REL = 0
+
+PKG_MAINTAINER =
+PKG_GROUP = System/Base
+PKG_URL = http://git.fedorahosted.org/git/hwdata.git
+PKG_LICENSE = GPLv2+ and LGPLv2+
+PKG_SUMMARY = Hardware identification and configuration data.
+
+PKG_BUILD_DEPS = # Need no gcc
+PKG_DEPS += module-init-tools
+
+define PKG_DESCRIPTION
+ hwdata contains various hardware identification and configuration data, \
+ such as the pci.ids database and MonitorsDb databases.
+endef
+
+PKG_TARBALL = $(THISAPP).tar.bz2
+
+STAGE_BUILD = # Nothing to do
diff --git a/pkgs/core/iscsi-initiator-utils/04-iscsi b/pkgs/core/iscsi-initiator-utils/04-iscsi
new file mode 100755
index 0000000..58aa798
--- /dev/null
+++ b/pkgs/core/iscsi-initiator-utils/04-iscsi
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+export LC_ALL=C
+
+if [ "$2" = "down" ]; then
+ if ! /sbin/ip route ls | grep -q ^default &&
+ [ -f /var/lock/subsys/iscsi ]; then
+ /etc/rc.d/init.d/iscsi stop
+ fi
+fi
+
+if [ "$2" = "up" ]; then
+ if /sbin/ip -o route show dev "$1" | grep -q '^default' &&
+ /sbin/chkconfig iscsi; then
+ /etc/rc.d/init.d/iscsi start
+ fi
+fi
diff --git a/pkgs/core/iscsi-initiator-utils/iscsi-initiator-utils.nm b/pkgs/core/iscsi-initiator-utils/iscsi-initiator-utils.nm
new file mode 100644
index 0000000..b07c5c4
--- /dev/null
+++ b/pkgs/core/iscsi-initiator-utils/iscsi-initiator-utils.nm
@@ -0,0 +1,102 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include $(PKGROOT)/Include
+
+PKG_NAME = iscsi-initiator-utils
+PKG_VER = 6.2.0.872
+PKG_REL = 0
+
+PKG_MAINTAINER =
+PKG_GROUP = Networking/Tools
+PKG_URL = http://bridge.sourceforge.net/
+PKG_LICENSE = GPLv2+
+PKG_SUMMARY = iSCSI daemon and utility programs.
+
+PKG_BUILD_DEPS+= openssl-devel python-devel
+
+define PKG_DESCRIPTION
+ The iscsi package provides the server daemon for the iSCSI protocol, \
+ as well as the utility programs used to manage it. iSCSI is a protocol \
+ for distributed disk access using SCSI commands sent over Internet \
+ Protocol networks.
+endef
+
+PKG_PACKAGES += libiscsi libiscsi-devel
+
+define PKG_FILES-libiscsi
+ /usr/lib/libiscsi.so.*
+endef
+
+define PKG_FILES-libiscsi-devel
+ /usr/lib/libiscsi.so
+ /usr/include
+endef
+
+PKG_TARBALL = open-iscsi-2.0-872-rc4-bnx2i.tar.gz
+DIR_APP = $(DIR_SRC)/open-iscsi-2.0-872-rc4-bnx2i
+
+define STAGE_PREPARE_CMDS
+ cd $(DIR_APP)/libiscsi && sed -e "s/^all.*/all: lib tests/" -i Makefile
+endef
+
+define STAGE_BUILD
+ cd $(DIR_APP)/utils/open-isns && ./configure
+ cd $(DIR_APP)/utils/open-isns && make
+ cd $(DIR_APP) && make -C utils/sysdeps
+ cd $(DIR_APP) && make -C utils/fwparam_ibft
+ cd $(DIR_APP) && make -C usr
+ cd $(DIR_APP) && make -C utils
+ cd $(DIR_APP) && make -C libiscsi
+ cd $(DIR_APP)/libiscsi && python setup.py build
+endef
+
+define STAGE_INSTALL
+ -mkdir -pv $(BUILDROOT)/sbin
+ -mkdir -pv $(BUILDROOT)/usr/share/man/man8
+ -mkdir -pv $(BUILDROOT)/etc/{iscsi,sysconfig}
+ -mkdir -pv $(BUILDROOT)/etc/NetworkManager/dispatcher.d
+ -mkdir -pv $(BUILDROOT)/var/lib/iscsi/{nodes,send_targets,static,isns,slp,ifaces}
+ -mkdir -pv $(BUILDROOT)/var/lock/iscsi
+ -mkdir -pv $(BUILDROOT)/usr/lib
+ -mkdir -pv $(BUILDROOT)/usr/include
+ -mkdir -pv $(BUILDROOT)/usr/lib/python2.7/site-packages
+
+ cd $(DIR_APP) && install -p -m 755 usr/iscsid usr/iscsiadm utils/iscsi-iname usr/iscsistart \
+ $(BUILDROOT)/sbin
+ cd $(DIR_APP) && install -p -m 644 doc/iscsiadm.8 $(BUILDROOT)/usr/share/man/man8
+ cd $(DIR_APP) && install -p -m 644 doc/iscsid.8 $(BUILDROOT)/usr/share/man/man8
+ cd $(DIR_APP) && install -p -m 644 etc/iscsid.conf $(BUILDROOT)/etc/sysconfig/iscsi
+ cd $(DIR_APP) && install -p -m 644 doc/iscsistart.8 $(BUILDROOT)/usr/share/man/man8
+ cd $(DIR_APP) && install -p -m 644 doc/iscsi-iname.8 $(BUILDROOT)/usr/share/man/man8
+
+ cd $(DIR_APP) && install -p -m 755 $(DIR_SOURCE)/04-iscsi $(BUILDROOT)/etc/NetworkManager/dispatcher.d
+
+ cd $(DIR_APP) && install -p -m 755 libiscsi/libiscsi.so.0 $(BUILDROOT)/usr/lib
+ ln -svf libiscsi.so.0 $(BUILDROOT)/usr/lib/libiscsi.so
+ cd $(DIR_APP) && install -p -m 644 libiscsi/libiscsi.h $(BUILDROOT)/usr/include
+
+ cd $(DIR_APP) && install -p -m 755 libiscsi/build/lib.linux-*/libiscsimodule.so \
+ $(BUILDROOT)/usr/lib/python2.7/site-packages
+endef
diff --git a/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-add-libiscsi.patch b/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-add-libiscsi.patch
new file mode 100644
index 0000000..4cc7db8
--- /dev/null
+++ b/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-add-libiscsi.patch
@@ -0,0 +1,3737 @@
+diff --git a/Makefile b/Makefile
+index db460eb..a4d4ce0 100644
+--- a/Makefile
++++ b/Makefile
+@@ -32,6 +32,7 @@ user: ;
+ $(MAKE) -C utils/fwparam_ibft
+ $(MAKE) -C usr
+ $(MAKE) -C utils
++ $(MAKE) -C libiscsi
+ @echo
+ @echo "Compilation complete Output file"
+ @echo "----------------------------------- ----------------"
+@@ -53,6 +54,7 @@ kernel: force
+ force: ;
+
+ clean:
++ $(MAKE) -C libiscsi clean
+ $(MAKE) -C utils/sysdeps clean
+ $(MAKE) -C utils/fwparam_ibft clean
+ $(MAKE) -C utils clean
+diff --git a/libiscsi/Makefile b/libiscsi/Makefile
+new file mode 100644
+index 0000000..4aeb44f
+--- /dev/null
++++ b/libiscsi/Makefile
+@@ -0,0 +1,62 @@
++# This Makefile will work only with GNU make.
++
++OSNAME=$(shell uname -s)
++OPTFLAGS ?= -O2 -g
++WARNFLAGS ?= -Wall -Wstrict-prototypes
++CFLAGS = $(OPTFLAGS) $(WARNFLAGS) -I../include -I../usr -I../utils/open-isns \
++ -D$(OSNAME) -fPIC -D_GNU_SOURCE -fvisibility=hidden
++LIB = libiscsi.so.0
++TESTS = tests/test_discovery_sendtargets tests/test_discovery_firmware
++TESTS += tests/test_login tests/test_logout tests/test_params
++TESTS += tests/test_get_network_config tests/test_get_initiator_name
++TESTS += tests/test_set_auth tests/test_get_auth
++
++COMMON_SRCS = sysdeps.o
++# sources shared between iscsid, iscsiadm and iscsistart
++ISCSI_LIB_SRCS = session_info.o iscsi_util.o io.o auth.o discovery.o login.o log.o md5.o sha1.o iface.o idbm.o sysfs.o iscsi_sysfs.o iscsi_net_util.o iscsid_req.o
++FW_PARAM_SRCS = fw_entry.o prom_lex.o prom_parse.tab.o fwparam_ppc.o fwparam_sysfs.o
++
++# sources shared with the userspace utils, note we build these separately
++# to get PIC versions.
++COMMON_OBJS = $(patsubst %.o, common-objs/%.o, $(COMMON_SRCS))
++USR_OBJS = $(patsubst %.o, usr-objs/%.o, $(ISCSI_LIB_SRCS) strings.o)
++FW_OBJS = $(patsubst %.o, fw-objs/%.o, $(FW_PARAM_SRCS))
++
++# Flags for the tests
++tests/% : CFLAGS = $(OPTFLAGS) $(WARNFLAGS) -I.
++
++all: lib tests html
++
++lib: $(LIB)
++tests: $(TESTS)
++
++common-objs/%.o: ../utils/sysdeps/%.c
++ mkdir -p common-objs
++ $(CC) $(CFLAGS) -c $< -o $@
++
++usr-objs/%.o: ../usr/%.c
++ mkdir -p usr-objs
++ $(CC) $(CFLAGS) -c $< -o $@
++
++fw-objs/%.o: ../utils/fwparam_ibft/%.c
++ mkdir -p fw-objs
++ $(CC) $(CFLAGS) -c $< -o $@
++
++$(LIB): $(COMMON_OBJS) $(FW_OBJS) $(USR_OBJS) libiscsi.o
++ $(CC) $(CFLAGS) -L../utils/open-isns -lisns -shared -Wl,-soname,$(LIB) $^ -o $@
++ ln -s -f $(LIB) libiscsi.so
++
++$(TESTS): $(FW_OBJS) $(COMMON_OBJS) $(USR_OBJS) $(LIB)
++ $(CC) $(CFLAGS) -L../utils/open-isns -lisns -c $< -o $@
++
++html: libiscsi.h libiscsi.doxy
++ doxygen libiscsi.doxy
++
++clean:
++ rm -rf *.o common-objs usr-objs fw-objs libuip-objs libiscsi.so* \
++ .depend *~ html $(TESTS) tests/*~
++
++depend:
++ gcc $(CFLAGS) -M `ls *.c` > .depend
++
++-include .depend ../usr/.depend
+diff --git a/libiscsi/libiscsi.c b/libiscsi/libiscsi.c
+new file mode 100644
+index 0000000..a9eb0a6
+--- /dev/null
++++ b/libiscsi/libiscsi.c
+@@ -0,0 +1,563 @@
++/*
++ * iSCSI Administration library
++ *
++ * Copyright (C) 2008-2009 Red Hat, Inc. All rights reserved.
++ * Copyright (C) 2008-2009 Hans de Goede <hdegoede(a)redhat.com>
++ * maintained by open-iscsi(a)googlegroups.com
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published
++ * by the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * General Public License for more details.
++ *
++ * See the file COPYING included with this distribution for more details.
++ */
++
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <errno.h>
++#include <unistd.h>
++#include <sys/syslog.h>
++#include "libiscsi.h"
++#include "idbm.h"
++#include "discovery.h"
++#include "log.h"
++#include "sysfs.h"
++#include "iscsi_sysfs.h"
++#include "session_info.h"
++#include "iscsi_util.h"
++#include "sysdeps.h"
++#include "iface.h"
++#include "iscsi_proto.h"
++#include "fw_context.h"
++#include "iscsid_req.h"
++
++#define CHECK(a) { context->error_str[0] = 0; rc = a; if (rc) goto leave; }
++
++struct libiscsi_context {
++ char error_str[256];
++ /* For get_parameter_helper() */
++ const char *parameter;
++ char *value;
++};
++
++static void libiscsi_log(int prio, void *priv, const char *fmt, va_list ap)
++{
++ struct libiscsi_context *context = priv;
++
++ if (prio > LOG_ERR) /* We are only interested in errors (or worse) */
++ return;
++
++ vsnprintf(context->error_str, sizeof(context->error_str), fmt, ap);
++}
++
++struct libiscsi_context *libiscsi_init(void)
++{
++ struct libiscsi_context *context;
++
++ context = calloc(1, sizeof *context);
++ if (!context)
++ return NULL;
++
++ log_init("libiscsi", 1024, libiscsi_log, context);
++ sysfs_init();
++ increase_max_files();
++ if (idbm_init(NULL)) {
++ sysfs_cleanup();
++ free(context);
++ return NULL;
++ }
++
++ iface_setup_host_bindings();
++
++ return context;
++}
++
++void libiscsi_cleanup(struct libiscsi_context *context)
++{
++ idbm_terminate();
++ free_transports();
++ sysfs_cleanup();
++ free(context);
++}
++
++static void free_rec_list(struct list_head *rec_list)
++{
++ struct node_rec *rec, *tmp;
++
++ list_for_each_entry_safe(rec, tmp, rec_list, list) {
++ list_del(&rec->list);
++ free(rec);
++ }
++}
++
++int libiscsi_discover_sendtargets(struct libiscsi_context *context,
++ const char *address, int port,
++ const struct libiscsi_auth_info *auth_info,
++ int *nr_found, struct libiscsi_node **found_nodes)
++{
++ struct discovery_rec drec;
++ LIST_HEAD(bound_rec_list);
++ struct node_rec *rec;
++ int rc = 0, found = 0;
++
++ INIT_LIST_HEAD(&bound_rec_list);
++
++ if (nr_found)
++ *nr_found = 0;
++ if (found_nodes)
++ *found_nodes = NULL;
++
++ CHECK(libiscsi_verify_auth_info(context, auth_info))
++
++ /* Fill the drec struct with all needed info */
++ memset(&drec, 0, sizeof drec);
++ idbm_sendtargets_defaults(&drec.u.sendtargets);
++ drec.type = DISCOVERY_TYPE_SENDTARGETS;
++ strlcpy(drec.address, address, sizeof(drec.address));
++ drec.port = port ? port : ISCSI_LISTEN_PORT;
++ switch(auth_info ? auth_info->method : libiscsi_auth_none) {
++ case libiscsi_auth_chap:
++ drec.u.sendtargets.auth.authmethod = AUTH_METHOD_CHAP;
++ strlcpy(drec.u.sendtargets.auth.username,
++ auth_info->chap.username, AUTH_STR_MAX_LEN);
++ strlcpy((char *)drec.u.sendtargets.auth.password,
++ auth_info->chap.password, AUTH_STR_MAX_LEN);
++ drec.u.sendtargets.auth.password_length =
++ strlen((char *)drec.u.sendtargets.auth.password);
++ strlcpy(drec.u.sendtargets.auth.username_in,
++ auth_info->chap.reverse_username, AUTH_STR_MAX_LEN);
++ strlcpy((char *)drec.u.sendtargets.auth.password_in,
++ auth_info->chap.reverse_password, AUTH_STR_MAX_LEN);
++ drec.u.sendtargets.auth.password_in_length =
++ strlen((char *)drec.u.sendtargets.auth.password_in);
++ break;
++ }
++
++ CHECK(idbm_add_discovery(&drec))
++
++ CHECK(idbm_bind_ifaces_to_nodes(discovery_sendtargets,
++ &drec, NULL, &bound_rec_list))
++
++ /* now add/update records */
++ list_for_each_entry(rec, &bound_rec_list, list) {
++ CHECK(idbm_add_node(rec, &drec, 1 /* overwrite */))
++ found++;
++ }
++
++ if (nr_found)
++ *nr_found = found;
++
++ if (found_nodes && found) {
++ *found_nodes = calloc(found, sizeof **found_nodes);
++ if (*found_nodes == NULL) {
++ snprintf(context->error_str,
++ sizeof(context->error_str), strerror(ENOMEM));
++ rc = ENOMEM;
++ goto leave;
++ }
++ found = 0;
++ list_for_each_entry(rec, &bound_rec_list, list) {
++ strlcpy((*found_nodes)[found].name, rec->name,
++ LIBISCSI_VALUE_MAXLEN);
++ (*found_nodes)[found].tpgt = rec->tpgt;
++ strlcpy((*found_nodes)[found].address,
++ rec->conn[0].address, NI_MAXHOST);
++ (*found_nodes)[found].port = rec->conn[0].port;
++ found++;
++ }
++ }
++
++leave:
++ free_rec_list(&bound_rec_list);
++ return rc;
++}
++
++int libiscsi_discover_firmware(struct libiscsi_context *context,
++ int *nr_found, struct libiscsi_node **found_nodes)
++{
++ struct boot_context fw_entry;
++ struct node_rec rec;
++ int rc = 0;
++
++ if (nr_found)
++ *nr_found = 0;
++ if (found_nodes)
++ *found_nodes = NULL;
++
++ memset(&fw_entry, 0, sizeof fw_entry);
++ rc = fw_get_entry(&fw_entry);
++ if (rc) {
++ strcpy(context->error_str, "Could not read fw values.");
++ return rc;
++ }
++
++ memset(&rec, 0, sizeof rec);
++ idbm_node_setup_defaults(&rec);
++
++ strlcpy(rec.name, fw_entry.targetname, TARGET_NAME_MAXLEN);
++ rec.tpgt = 1;
++ strlcpy(rec.conn[0].address, fw_entry.target_ipaddr, NI_MAXHOST);
++ rec.conn[0].port = fw_entry.target_port;
++
++ iface_setup_defaults(&rec.iface);
++ strncpy(rec.iface.iname, fw_entry.initiatorname,
++ sizeof(fw_entry.initiatorname));
++ strncpy(rec.session.auth.username, fw_entry.chap_name,
++ sizeof(fw_entry.chap_name));
++ strncpy((char *)rec.session.auth.password, fw_entry.chap_password,
++ sizeof(fw_entry.chap_password));
++ strncpy(rec.session.auth.username_in, fw_entry.chap_name_in,
++ sizeof(fw_entry.chap_name_in));
++ strncpy((char *)rec.session.auth.password_in,
++ fw_entry.chap_password_in,
++ sizeof(fw_entry.chap_password_in));
++ rec.session.auth.password_length =
++ strlen((char *)fw_entry.chap_password);
++ rec.session.auth.password_in_length =
++ strlen((char *)fw_entry.chap_password_in);
++
++ CHECK(idbm_add_node(&rec, NULL, 1 /* overwrite */))
++
++ if (nr_found)
++ *nr_found = 1;
++
++ if (found_nodes) {
++ *found_nodes = calloc(1, sizeof **found_nodes);
++ if (*found_nodes == NULL) {
++ snprintf(context->error_str,
++ sizeof(context->error_str), strerror(ENOMEM));
++ rc = ENOMEM;
++ goto leave;
++ }
++ strlcpy((*found_nodes)[0].name, rec.name,
++ LIBISCSI_VALUE_MAXLEN);
++ (*found_nodes)[0].tpgt = rec.tpgt;
++ strlcpy((*found_nodes)[0].address,
++ rec.conn[0].address, NI_MAXHOST);
++ (*found_nodes)[0].port = rec.conn[0].port;
++ }
++
++leave:
++ return rc;
++}
++
++int libiscsi_verify_auth_info(struct libiscsi_context *context,
++ const struct libiscsi_auth_info *auth_info)
++{
++ switch(auth_info ? auth_info->method : libiscsi_auth_none) {
++ case libiscsi_auth_none:
++ break;
++ case libiscsi_auth_chap:
++ if (!auth_info->chap.username[0]) {
++ strcpy(context->error_str, "Empty username");
++ return EINVAL;
++ }
++ if (!auth_info->chap.password[0]) {
++ strcpy(context->error_str, "Empty password");
++ return EINVAL;
++ }
++ if (auth_info->chap.reverse_username[0] &&
++ !auth_info->chap.reverse_password[0]) {
++ strcpy(context->error_str, "Empty reverse password");
++ return EINVAL;
++ }
++ break;
++ default:
++ sprintf(context->error_str,
++ "Invalid authentication method: %d",
++ (int)auth_info->method);
++ return EINVAL;
++ }
++ return 0;
++}
++
++int libiscsi_node_set_auth(struct libiscsi_context *context,
++ const struct libiscsi_node *node,
++ const struct libiscsi_auth_info *auth_info)
++{
++ int rc = 0;
++
++ CHECK(libiscsi_verify_auth_info(context, auth_info))
++
++ switch(auth_info ? auth_info->method : libiscsi_auth_none) {
++ case libiscsi_auth_none:
++ CHECK(libiscsi_node_set_parameter(context, node,
++ "node.session.auth.authmethod", "None"))
++ CHECK(libiscsi_node_set_parameter(context, node,
++ "node.session.auth.username", ""))
++ CHECK(libiscsi_node_set_parameter(context, node,
++ "node.session.auth.password", ""))
++ CHECK(libiscsi_node_set_parameter(context, node,
++ "node.session.auth.username_in", ""))
++ CHECK(libiscsi_node_set_parameter(context, node,
++ "node.session.auth.password_in", ""))
++ break;
++
++ case libiscsi_auth_chap:
++ CHECK(libiscsi_node_set_parameter(context, node,
++ "node.session.auth.authmethod", "CHAP"))
++ CHECK(libiscsi_node_set_parameter(context, node,
++ "node.session.auth.username",
++ auth_info->chap.username))
++ CHECK(libiscsi_node_set_parameter(context, node,
++ "node.session.auth.password",
++ auth_info->chap.password))
++ CHECK(libiscsi_node_set_parameter(context, node,
++ "node.session.auth.username_in",
++ auth_info->chap.reverse_username))
++ CHECK(libiscsi_node_set_parameter(context, node,
++ "node.session.auth.password_in",
++ auth_info->chap.reverse_password))
++ break;
++ }
++leave:
++ return rc;
++}
++
++int libiscsi_node_get_auth(struct libiscsi_context *context,
++ const struct libiscsi_node *node,
++ struct libiscsi_auth_info *auth_info)
++{
++ int rc = 0;
++ char value[LIBISCSI_VALUE_MAXLEN];
++
++ memset(auth_info, 0, sizeof *auth_info);
++
++ CHECK(libiscsi_node_get_parameter(context, node,
++ "node.session.auth.authmethod", value))
++
++ if (!strcmp(value, "None")) {
++ auth_info->method = libiscsi_auth_none;
++ } else if (!strcmp(value, "CHAP")) {
++ auth_info->method = libiscsi_auth_chap;
++ CHECK(libiscsi_node_get_parameter(context, node,
++ "node.session.auth.username",
++ auth_info->chap.username))
++ CHECK(libiscsi_node_get_parameter(context, node,
++ "node.session.auth.password",
++ auth_info->chap.password))
++ CHECK(libiscsi_node_get_parameter(context, node,
++ "node.session.auth.username_in",
++ auth_info->chap.reverse_username))
++ CHECK(libiscsi_node_get_parameter(context, node,
++ "node.session.auth.password_in",
++ auth_info->chap.reverse_password))
++ } else {
++ snprintf(context->error_str, sizeof(context->error_str),
++ "unknown authentication method: %s", value);
++ rc = EINVAL;
++ }
++leave:
++ return rc;
++}
++
++static void node_to_rec(const struct libiscsi_node *node,
++ struct node_rec *rec)
++{
++ memset(rec, 0, sizeof *rec);
++ idbm_node_setup_defaults(rec);
++ strlcpy(rec->name, node->name, TARGET_NAME_MAXLEN);
++ rec->tpgt = node->tpgt;
++ strlcpy(rec->conn[0].address, node->address, NI_MAXHOST);
++ rec->conn[0].port = node->port;
++}
++
++int login_helper(void *data, node_rec_t *rec)
++{
++ int rc = iscsid_req_by_rec(MGMT_IPC_SESSION_LOGIN, rec);
++ if (rc) {
++ iscsid_handle_error(rc);
++ rc = ENOTCONN;
++ }
++ return rc;
++}
++
++int libiscsi_node_login(struct libiscsi_context *context,
++ const struct libiscsi_node *node)
++{
++ int nr_found = 0, rc;
++
++ CHECK(idbm_for_each_iface(&nr_found, NULL, login_helper,
++ (char *)node->name, node->tpgt,
++ (char *)node->address, node->port))
++ if (nr_found == 0) {
++ strcpy(context->error_str, "No such node");
++ rc = ENODEV;
++ }
++leave:
++ return rc;
++}
++
++static int logout_helper(void *data, struct session_info *info)
++{
++ int rc;
++ struct node_rec *rec = data;
++
++ if (!iscsi_match_session(rec, info))
++ /* Tell iscsi_sysfs_for_each_session this session was not a
++ match so that it will not increase nr_found. */
++ return -1;
++
++ rc = iscsid_req_by_sid(MGMT_IPC_SESSION_LOGOUT, info->sid);
++ if (rc) {
++ iscsid_handle_error(rc);
++ rc = EIO;
++ }
++
++ return rc;
++}
++
++int libiscsi_node_logout(struct libiscsi_context *context,
++ const struct libiscsi_node *node)
++{
++ int nr_found = 0, rc;
++ struct node_rec rec;
++
++ node_to_rec(node, &rec);
++ CHECK(iscsi_sysfs_for_each_session(&rec, &nr_found, logout_helper))
++ if (nr_found == 0) {
++ strcpy(context->error_str, "No matching session");
++ rc = ENODEV;
++ }
++leave:
++ return rc;
++}
++
++int libiscsi_node_set_parameter(struct libiscsi_context *context,
++ const struct libiscsi_node *node,
++ const char *parameter, const char *value)
++{
++ int nr_found = 0, rc;
++ struct db_set_param set_param = {
++ .name = (char *)parameter,
++ .value = (char *)value,
++ };
++
++ CHECK(idbm_for_each_iface(&nr_found, &set_param, idbm_node_set_param,
++ (char *)node->name, node->tpgt,
++ (char *)node->address, node->port))
++ if (nr_found == 0) {
++ strcpy(context->error_str, "No such node");
++ rc = ENODEV;
++ }
++leave:
++ return rc;
++}
++
++static int get_parameter_helper(void *data, node_rec_t *rec)
++{
++ struct libiscsi_context *context = data;
++ recinfo_t *info;
++ int i;
++
++ info = idbm_recinfo_alloc(MAX_KEYS);
++ if (!info) {
++ snprintf(context->error_str, sizeof(context->error_str),
++ strerror(ENOMEM));
++ return ENOMEM;
++ }
++
++ idbm_recinfo_node(rec, info);
++
++ for (i = 0; i < MAX_KEYS; i++) {
++ if (!info[i].visible)
++ continue;
++
++ if (strcmp(context->parameter, info[i].name))
++ continue;
++
++ strlcpy(context->value, info[i].value, LIBISCSI_VALUE_MAXLEN);
++ break;
++ }
++
++ free(info);
++
++ if (i == MAX_KEYS) {
++ strcpy(context->error_str, "No such parameter");
++ return EINVAL;
++ }
++
++ return 0;
++}
++
++int libiscsi_node_get_parameter(struct libiscsi_context *context,
++ const struct libiscsi_node *node, const char *parameter, char *value)
++{
++ int nr_found = 0, rc = 0;
++
++ context->parameter = parameter;
++ context->value = value;
++
++ /* Note we assume there is only one interface, if not we will get
++ the value from the last interface iterated over!
++ This (multiple interfaces) can only happen if someone explicitly
++ created ones using iscsiadm. Even then this should not be a problem
++ as most settings should be the same independent of the iface. */
++ CHECK(idbm_for_each_iface(&nr_found, context, get_parameter_helper,
++ (char *)node->name, node->tpgt,
++ (char *)node->address, node->port))
++ if (nr_found == 0) {
++ strcpy(context->error_str, "No such node");
++ rc = ENODEV;
++ }
++leave:
++ return rc;
++}
++
++const char *libiscsi_get_error_string(struct libiscsi_context *context)
++{
++ /* Sometimes the core open-iscsi code does not give us an error
++ message */
++ if (!context->error_str[0])
++ return "Unknown error";
++
++ return context->error_str;
++}
++
++
++/************************** Utility functions *******************************/
++
++int libiscsi_get_firmware_network_config(
++ struct libiscsi_network_config *config)
++{
++ struct boot_context fw_entry;
++
++ memset(config, 0, sizeof *config);
++ memset(&fw_entry, 0, sizeof fw_entry);
++ if (fw_get_entry(&fw_entry))
++ return ENODEV;
++
++ config->dhcp = strlen(fw_entry.dhcp) ? 1 : 0;
++ strncpy(config->iface_name, fw_entry.iface, sizeof fw_entry.iface);
++ strncpy(config->mac_address, fw_entry.mac, sizeof fw_entry.mac);
++ strncpy(config->ip_address, fw_entry.ipaddr, sizeof fw_entry.ipaddr);
++ strncpy(config->netmask, fw_entry.mask, sizeof fw_entry.mask);
++ strncpy(config->gateway, fw_entry.gateway, sizeof fw_entry.gateway);
++ strncpy(config->primary_dns, fw_entry.primary_dns,
++ sizeof fw_entry.primary_dns);
++ strncpy(config->secondary_dns, fw_entry.secondary_dns,
++ sizeof fw_entry.secondary_dns);
++ return 0;
++}
++
++int libiscsi_get_firmware_initiator_name(char *initiatorname)
++{
++ struct boot_context fw_entry;
++
++ memset(initiatorname, 0, LIBISCSI_VALUE_MAXLEN);
++ memset(&fw_entry, 0, sizeof fw_entry);
++ if (fw_get_entry(&fw_entry))
++ return ENODEV;
++
++ strncpy(initiatorname, fw_entry.initiatorname,
++ sizeof fw_entry.initiatorname);
++
++ return 0;
++}
+diff --git a/libiscsi/libiscsi.doxy b/libiscsi/libiscsi.doxy
+new file mode 100644
+index 0000000..663770f
+--- /dev/null
++++ b/libiscsi/libiscsi.doxy
+@@ -0,0 +1,1473 @@
++# Doxyfile 1.5.7.1
++
++# This file describes the settings to be used by the documentation system
++# doxygen (www.doxygen.org) for a project
++#
++# All text after a hash (#) is considered a comment and will be ignored
++# The format is:
++# TAG = value [value, ...]
++# For lists items can also be appended using:
++# TAG += value [value, ...]
++# Values that contain spaces should be placed between quotes (" ")
++
++#---------------------------------------------------------------------------
++# Project related configuration options
++#---------------------------------------------------------------------------
++
++# This tag specifies the encoding used for all characters in the config file
++# that follow. The default is UTF-8 which is also the encoding used for all
++# text before the first occurrence of this tag. Doxygen uses libiconv (or the
++# iconv built into libc) for the transcoding. See
++# http://www.gnu.org/software/libiconv for the list of possible encodings.
++
++DOXYFILE_ENCODING = UTF-8
++
++# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
++# by quotes) that should identify the project.
++
++PROJECT_NAME = libiscsi
++
++# The PROJECT_NUMBER tag can be used to enter a project or revision number.
++# This could be handy for archiving the generated documentation or
++# if some version control system is used.
++
++PROJECT_NUMBER =
++
++# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
++# base path where the generated documentation will be put.
++# If a relative path is entered, it will be relative to the location
++# where doxygen was started. If left blank the current directory will be used.
++
++OUTPUT_DIRECTORY =
++
++# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
++# 4096 sub-directories (in 2 levels) under the output directory of each output
++# format and will distribute the generated files over these directories.
++# Enabling this option can be useful when feeding doxygen a huge amount of
++# source files, where putting all generated files in the same directory would
++# otherwise cause performance problems for the file system.
++
++CREATE_SUBDIRS = NO
++
++# The OUTPUT_LANGUAGE tag is used to specify the language in which all
++# documentation generated by doxygen is written. Doxygen will use this
++# information to generate all constant output in the proper language.
++# The default language is English, other supported languages are:
++# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
++# Croatian, Czech, Danish, Dutch, Farsi, Finnish, French, German, Greek,
++# Hungarian, Italian, Japanese, Japanese-en (Japanese with English messages),
++# Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, Polish,
++# Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, Slovene,
++# Spanish, Swedish, and Ukrainian.
++
++OUTPUT_LANGUAGE = English
++
++# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
++# include brief member descriptions after the members that are listed in
++# the file and class documentation (similar to JavaDoc).
++# Set to NO to disable this.
++
++BRIEF_MEMBER_DESC = YES
++
++# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
++# the brief description of a member or function before the detailed description.
++# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
++# brief descriptions will be completely suppressed.
++
++REPEAT_BRIEF = NO
++
++# This tag implements a quasi-intelligent brief description abbreviator
++# that is used to form the text in various listings. Each string
++# in this list, if found as the leading text of the brief description, will be
++# stripped from the text and the result after processing the whole list, is
++# used as the annotated text. Otherwise, the brief description is used as-is.
++# If left blank, the following values are used ("$name" is automatically
++# replaced with the name of the entity): "The $name class" "The $name widget"
++# "The $name file" "is" "provides" "specifies" "contains"
++# "represents" "a" "an" "the"
++
++ABBREVIATE_BRIEF =
++
++# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
++# Doxygen will generate a detailed section even if there is only a brief
++# description.
++
++ALWAYS_DETAILED_SEC = YES
++
++# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
++# inherited members of a class in the documentation of that class as if those
++# members were ordinary class members. Constructors, destructors and assignment
++# operators of the base classes will not be shown.
++
++INLINE_INHERITED_MEMB = NO
++
++# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
++# path before files name in the file list and in the header files. If set
++# to NO the shortest path that makes the file name unique will be used.
++
++FULL_PATH_NAMES = YES
++
++# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
++# can be used to strip a user-defined part of the path. Stripping is
++# only done if one of the specified strings matches the left-hand part of
++# the path. The tag can be used to show relative paths in the file list.
++# If left blank the directory from which doxygen is run is used as the
++# path to strip.
++
++STRIP_FROM_PATH =
++
++# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
++# the path mentioned in the documentation of a class, which tells
++# the reader which header file to include in order to use a class.
++# If left blank only the name of the header file containing the class
++# definition is used. Otherwise one should specify the include paths that
++# are normally passed to the compiler using the -I flag.
++
++STRIP_FROM_INC_PATH =
++
++# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
++# (but less readable) file names. This can be useful is your file systems
++# doesn't support long names like on DOS, Mac, or CD-ROM.
++
++SHORT_NAMES = NO
++
++# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
++# will interpret the first line (until the first dot) of a JavaDoc-style
++# comment as the brief description. If set to NO, the JavaDoc
++# comments will behave just like regular Qt-style comments
++# (thus requiring an explicit @brief command for a brief description.)
++
++JAVADOC_AUTOBRIEF = NO
++
++# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
++# interpret the first line (until the first dot) of a Qt-style
++# comment as the brief description. If set to NO, the comments
++# will behave just like regular Qt-style comments (thus requiring
++# an explicit \brief command for a brief description.)
++
++QT_AUTOBRIEF = NO
++
++# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
++# treat a multi-line C++ special comment block (i.e. a block of //! or ///
++# comments) as a brief description. This used to be the default behaviour.
++# The new default is to treat a multi-line C++ comment block as a detailed
++# description. Set this tag to YES if you prefer the old behaviour instead.
++
++MULTILINE_CPP_IS_BRIEF = NO
++
++# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
++# member inherits the documentation from any documented member that it
++# re-implements.
++
++INHERIT_DOCS = YES
++
++# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
++# a new page for each member. If set to NO, the documentation of a member will
++# be part of the file/class/namespace that contains it.
++
++SEPARATE_MEMBER_PAGES = NO
++
++# The TAB_SIZE tag can be used to set the number of spaces in a tab.
++# Doxygen uses this value to replace tabs by spaces in code fragments.
++
++TAB_SIZE = 8
++
++# This tag can be used to specify a number of aliases that acts
++# as commands in the documentation. An alias has the form "name=value".
++# For example adding "sideeffect=\par Side Effects:\n" will allow you to
++# put the command \sideeffect (or @sideeffect) in the documentation, which
++# will result in a user-defined paragraph with heading "Side Effects:".
++# You can put \n's in the value part of an alias to insert newlines.
++
++ALIASES =
++
++# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
++# sources only. Doxygen will then generate output that is more tailored for C.
++# For instance, some of the names that are used will be different. The list
++# of all members will be omitted, etc.
++
++OPTIMIZE_OUTPUT_FOR_C = YES
++
++# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
++# sources only. Doxygen will then generate output that is more tailored for
++# Java. For instance, namespaces will be presented as packages, qualified
++# scopes will look different, etc.
++
++OPTIMIZE_OUTPUT_JAVA = NO
++
++# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
++# sources only. Doxygen will then generate output that is more tailored for
++# Fortran.
++
++OPTIMIZE_FOR_FORTRAN = NO
++
++# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
++# sources. Doxygen will then generate output that is tailored for
++# VHDL.
++
++OPTIMIZE_OUTPUT_VHDL = NO
++
++# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
++# to include (a tag file for) the STL sources as input, then you should
++# set this tag to YES in order to let doxygen match functions declarations and
++# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
++# func(std::string) {}). This also make the inheritance and collaboration
++# diagrams that involve STL classes more complete and accurate.
++
++BUILTIN_STL_SUPPORT = NO
++
++# If you use Microsoft's C++/CLI language, you should set this option to YES to
++# enable parsing support.
++
++CPP_CLI_SUPPORT = NO
++
++# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
++# Doxygen will parse them like normal C++ but will assume all classes use public
++# instead of private inheritance when no explicit protection keyword is present.
++
++SIP_SUPPORT = NO
++
++# For Microsoft's IDL there are propget and propput attributes to indicate getter
++# and setter methods for a property. Setting this option to YES (the default)
++# will make doxygen to replace the get and set methods by a property in the
++# documentation. This will only work if the methods are indeed getting or
++# setting a simple type. If this is not the case, or you want to show the
++# methods anyway, you should set this option to NO.
++
++IDL_PROPERTY_SUPPORT = YES
++
++# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
++# tag is set to YES, then doxygen will reuse the documentation of the first
++# member in the group (if any) for the other members of the group. By default
++# all members of a group must be documented explicitly.
++
++DISTRIBUTE_GROUP_DOC = NO
++
++# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
++# the same type (for instance a group of public functions) to be put as a
++# subgroup of that type (e.g. under the Public Functions section). Set it to
++# NO to prevent subgrouping. Alternatively, this can be done per class using
++# the \nosubgrouping command.
++
++SUBGROUPING = YES
++
++# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
++# is documented as struct, union, or enum with the name of the typedef. So
++# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
++# with name TypeT. When disabled the typedef will appear as a member of a file,
++# namespace, or class. And the struct will be named TypeS. This can typically
++# be useful for C code in case the coding convention dictates that all compound
++# types are typedef'ed and only the typedef is referenced, never the tag name.
++
++TYPEDEF_HIDES_STRUCT = NO
++
++# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
++# determine which symbols to keep in memory and which to flush to disk.
++# When the cache is full, less often used symbols will be written to disk.
++# For small to medium size projects (<1000 input files) the default value is
++# probably good enough. For larger projects a too small cache size can cause
++# doxygen to be busy swapping symbols to and from disk most of the time
++# causing a significant performance penality.
++# If the system has enough physical memory increasing the cache will improve the
++# performance by keeping more symbols in memory. Note that the value works on
++# a logarithmic scale so increasing the size by one will rougly double the
++# memory usage. The cache size is given by this formula:
++# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
++# corresponding to a cache size of 2^16 = 65536 symbols
++
++SYMBOL_CACHE_SIZE = 0
++
++#---------------------------------------------------------------------------
++# Build related configuration options
++#---------------------------------------------------------------------------
++
++# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
++# documentation are documented, even if no documentation was available.
++# Private class members and static file members will be hidden unless
++# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
++
++EXTRACT_ALL = YES
++
++# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
++# will be included in the documentation.
++
++EXTRACT_PRIVATE = NO
++
++# If the EXTRACT_STATIC tag is set to YES all static members of a file
++# will be included in the documentation.
++
++EXTRACT_STATIC = NO
++
++# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
++# defined locally in source files will be included in the documentation.
++# If set to NO only classes defined in header files are included.
++
++EXTRACT_LOCAL_CLASSES = YES
++
++# This flag is only useful for Objective-C code. When set to YES local
++# methods, which are defined in the implementation section but not in
++# the interface are included in the documentation.
++# If set to NO (the default) only methods in the interface are included.
++
++EXTRACT_LOCAL_METHODS = NO
++
++# If this flag is set to YES, the members of anonymous namespaces will be
++# extracted and appear in the documentation as a namespace called
++# 'anonymous_namespace{file}', where file will be replaced with the base
++# name of the file that contains the anonymous namespace. By default
++# anonymous namespace are hidden.
++
++EXTRACT_ANON_NSPACES = NO
++
++# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
++# undocumented members of documented classes, files or namespaces.
++# If set to NO (the default) these members will be included in the
++# various overviews, but no documentation section is generated.
++# This option has no effect if EXTRACT_ALL is enabled.
++
++HIDE_UNDOC_MEMBERS = NO
++
++# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
++# undocumented classes that are normally visible in the class hierarchy.
++# If set to NO (the default) these classes will be included in the various
++# overviews. This option has no effect if EXTRACT_ALL is enabled.
++
++HIDE_UNDOC_CLASSES = NO
++
++# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
++# friend (class|struct|union) declarations.
++# If set to NO (the default) these declarations will be included in the
++# documentation.
++
++HIDE_FRIEND_COMPOUNDS = NO
++
++# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
++# documentation blocks found inside the body of a function.
++# If set to NO (the default) these blocks will be appended to the
++# function's detailed documentation block.
++
++HIDE_IN_BODY_DOCS = NO
++
++# The INTERNAL_DOCS tag determines if documentation
++# that is typed after a \internal command is included. If the tag is set
++# to NO (the default) then the documentation will be excluded.
++# Set it to YES to include the internal documentation.
++
++INTERNAL_DOCS = NO
++
++# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
++# file names in lower-case letters. If set to YES upper-case letters are also
++# allowed. This is useful if you have classes or files whose names only differ
++# in case and if your file system supports case sensitive file names. Windows
++# and Mac users are advised to set this option to NO.
++
++CASE_SENSE_NAMES = YES
++
++# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
++# will show members with their full class and namespace scopes in the
++# documentation. If set to YES the scope will be hidden.
++
++HIDE_SCOPE_NAMES = NO
++
++# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
++# will put a list of the files that are included by a file in the documentation
++# of that file.
++
++SHOW_INCLUDE_FILES = YES
++
++# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
++# is inserted in the documentation for inline members.
++
++INLINE_INFO = YES
++
++# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
++# will sort the (detailed) documentation of file and class members
++# alphabetically by member name. If set to NO the members will appear in
++# declaration order.
++
++SORT_MEMBER_DOCS = YES
++
++# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
++# brief documentation of file, namespace and class members alphabetically
++# by member name. If set to NO (the default) the members will appear in
++# declaration order.
++
++SORT_BRIEF_DOCS = NO
++
++# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
++# hierarchy of group names into alphabetical order. If set to NO (the default)
++# the group names will appear in their defined order.
++
++SORT_GROUP_NAMES = NO
++
++# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
++# sorted by fully-qualified names, including namespaces. If set to
++# NO (the default), the class list will be sorted only by class name,
++# not including the namespace part.
++# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
++# Note: This option applies only to the class list, not to the
++# alphabetical list.
++
++SORT_BY_SCOPE_NAME = NO
++
++# The GENERATE_TODOLIST tag can be used to enable (YES) or
++# disable (NO) the todo list. This list is created by putting \todo
++# commands in the documentation.
++
++GENERATE_TODOLIST = YES
++
++# The GENERATE_TESTLIST tag can be used to enable (YES) or
++# disable (NO) the test list. This list is created by putting \test
++# commands in the documentation.
++
++GENERATE_TESTLIST = YES
++
++# The GENERATE_BUGLIST tag can be used to enable (YES) or
++# disable (NO) the bug list. This list is created by putting \bug
++# commands in the documentation.
++
++GENERATE_BUGLIST = YES
++
++# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
++# disable (NO) the deprecated list. This list is created by putting
++# \deprecated commands in the documentation.
++
++GENERATE_DEPRECATEDLIST= YES
++
++# The ENABLED_SECTIONS tag can be used to enable conditional
++# documentation sections, marked by \if sectionname ... \endif.
++
++ENABLED_SECTIONS =
++
++# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
++# the initial value of a variable or define consists of for it to appear in
++# the documentation. If the initializer consists of more lines than specified
++# here it will be hidden. Use a value of 0 to hide initializers completely.
++# The appearance of the initializer of individual variables and defines in the
++# documentation can be controlled using \showinitializer or \hideinitializer
++# command in the documentation regardless of this setting.
++
++MAX_INITIALIZER_LINES = 30
++
++# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
++# at the bottom of the documentation of classes and structs. If set to YES the
++# list will mention the files that were used to generate the documentation.
++
++SHOW_USED_FILES = YES
++
++# If the sources in your project are distributed over multiple directories
++# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
++# in the documentation. The default is NO.
++
++SHOW_DIRECTORIES = NO
++
++# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
++# This will remove the Files entry from the Quick Index and from the
++# Folder Tree View (if specified). The default is YES.
++
++SHOW_FILES = YES
++
++# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
++# Namespaces page. This will remove the Namespaces entry from the Quick Index
++# and from the Folder Tree View (if specified). The default is YES.
++
++SHOW_NAMESPACES = YES
++
++# The FILE_VERSION_FILTER tag can be used to specify a program or script that
++# doxygen should invoke to get the current version for each file (typically from
++# the version control system). Doxygen will invoke the program by executing (via
++# popen()) the command <command> <input-file>, where <command> is the value of
++# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
++# provided by doxygen. Whatever the program writes to standard output
++# is used as the file version. See the manual for examples.
++
++FILE_VERSION_FILTER =
++
++# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by
++# doxygen. The layout file controls the global structure of the generated output files
++# in an output format independent way. The create the layout file that represents
++# doxygen's defaults, run doxygen with the -l option. You can optionally specify a
++# file name after the option, if omitted DoxygenLayout.xml will be used as the name
++# of the layout file.
++
++LAYOUT_FILE =
++
++#---------------------------------------------------------------------------
++# configuration options related to warning and progress messages
++#---------------------------------------------------------------------------
++
++# The QUIET tag can be used to turn on/off the messages that are generated
++# by doxygen. Possible values are YES and NO. If left blank NO is used.
++
++QUIET = YES
++
++# The WARNINGS tag can be used to turn on/off the warning messages that are
++# generated by doxygen. Possible values are YES and NO. If left blank
++# NO is used.
++
++WARNINGS = YES
++
++# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
++# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
++# automatically be disabled.
++
++WARN_IF_UNDOCUMENTED = YES
++
++# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
++# potential errors in the documentation, such as not documenting some
++# parameters in a documented function, or documenting parameters that
++# don't exist or using markup commands wrongly.
++
++WARN_IF_DOC_ERROR = YES
++
++# This WARN_NO_PARAMDOC option can be abled to get warnings for
++# functions that are documented, but have no documentation for their parameters
++# or return value. If set to NO (the default) doxygen will only warn about
++# wrong or incomplete parameter documentation, but not about the absence of
++# documentation.
++
++WARN_NO_PARAMDOC = NO
++
++# The WARN_FORMAT tag determines the format of the warning messages that
++# doxygen can produce. The string should contain the $file, $line, and $text
++# tags, which will be replaced by the file and line number from which the
++# warning originated and the warning text. Optionally the format may contain
++# $version, which will be replaced by the version of the file (if it could
++# be obtained via FILE_VERSION_FILTER)
++
++WARN_FORMAT = "$file:$line: $text"
++
++# The WARN_LOGFILE tag can be used to specify a file to which warning
++# and error messages should be written. If left blank the output is written
++# to stderr.
++
++WARN_LOGFILE =
++
++#---------------------------------------------------------------------------
++# configuration options related to the input files
++#---------------------------------------------------------------------------
++
++# The INPUT tag can be used to specify the files and/or directories that contain
++# documented source files. You may enter file names like "myfile.cpp" or
++# directories like "/usr/src/myproject". Separate the files or directories
++# with spaces.
++
++INPUT =
++
++# This tag can be used to specify the character encoding of the source files
++# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
++# also the default input encoding. Doxygen uses libiconv (or the iconv built
++# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
++# the list of possible encodings.
++
++INPUT_ENCODING = UTF-8
++
++# If the value of the INPUT tag contains directories, you can use the
++# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
++# and *.h) to filter out the source-files in the directories. If left
++# blank the following patterns are tested:
++# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx
++# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
++
++FILE_PATTERNS =
++
++# The RECURSIVE tag can be used to turn specify whether or not subdirectories
++# should be searched for input files as well. Possible values are YES and NO.
++# If left blank NO is used.
++
++RECURSIVE = NO
++
++# The EXCLUDE tag can be used to specify files and/or directories that should
++# excluded from the INPUT source files. This way you can easily exclude a
++# subdirectory from a directory tree whose root is specified with the INPUT tag.
++
++EXCLUDE =
++
++# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
++# directories that are symbolic links (a Unix filesystem feature) are excluded
++# from the input.
++
++EXCLUDE_SYMLINKS = NO
++
++# If the value of the INPUT tag contains directories, you can use the
++# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
++# certain files from those directories. Note that the wildcards are matched
++# against the file with absolute path, so to exclude all test directories
++# for example use the pattern */test/*
++
++EXCLUDE_PATTERNS =
++
++# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
++# (namespaces, classes, functions, etc.) that should be excluded from the
++# output. The symbol name can be a fully qualified name, a word, or if the
++# wildcard * is used, a substring. Examples: ANamespace, AClass,
++# AClass::ANamespace, ANamespace::*Test
++
++EXCLUDE_SYMBOLS =
++
++# The EXAMPLE_PATH tag can be used to specify one or more files or
++# directories that contain example code fragments that are included (see
++# the \include command).
++
++EXAMPLE_PATH =
++
++# If the value of the EXAMPLE_PATH tag contains directories, you can use the
++# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
++# and *.h) to filter out the source-files in the directories. If left
++# blank all files are included.
++
++EXAMPLE_PATTERNS =
++
++# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
++# searched for input files to be used with the \include or \dontinclude
++# commands irrespective of the value of the RECURSIVE tag.
++# Possible values are YES and NO. If left blank NO is used.
++
++EXAMPLE_RECURSIVE = NO
++
++# The IMAGE_PATH tag can be used to specify one or more files or
++# directories that contain image that are included in the documentation (see
++# the \image command).
++
++IMAGE_PATH =
++
++# The INPUT_FILTER tag can be used to specify a program that doxygen should
++# invoke to filter for each input file. Doxygen will invoke the filter program
++# by executing (via popen()) the command <filter> <input-file>, where <filter>
++# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
++# input file. Doxygen will then use the output that the filter program writes
++# to standard output. If FILTER_PATTERNS is specified, this tag will be
++# ignored.
++
++INPUT_FILTER =
++
++# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
++# basis. Doxygen will compare the file name with each pattern and apply the
++# filter if there is a match. The filters are a list of the form:
++# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
++# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
++# is applied to all files.
++
++FILTER_PATTERNS =
++
++# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
++# INPUT_FILTER) will be used to filter the input files when producing source
++# files to browse (i.e. when SOURCE_BROWSER is set to YES).
++
++FILTER_SOURCE_FILES = NO
++
++#---------------------------------------------------------------------------
++# configuration options related to source browsing
++#---------------------------------------------------------------------------
++
++# If the SOURCE_BROWSER tag is set to YES then a list of source files will
++# be generated. Documented entities will be cross-referenced with these sources.
++# Note: To get rid of all source code in the generated output, make sure also
++# VERBATIM_HEADERS is set to NO.
++
++SOURCE_BROWSER = NO
++
++# Setting the INLINE_SOURCES tag to YES will include the body
++# of functions and classes directly in the documentation.
++
++INLINE_SOURCES = NO
++
++# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
++# doxygen to hide any special comment blocks from generated source code
++# fragments. Normal C and C++ comments will always remain visible.
++
++STRIP_CODE_COMMENTS = YES
++
++# If the REFERENCED_BY_RELATION tag is set to YES
++# then for each documented function all documented
++# functions referencing it will be listed.
++
++REFERENCED_BY_RELATION = NO
++
++# If the REFERENCES_RELATION tag is set to YES
++# then for each documented function all documented entities
++# called/used by that function will be listed.
++
++REFERENCES_RELATION = NO
++
++# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
++# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
++# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
++# link to the source code. Otherwise they will link to the documentstion.
++
++REFERENCES_LINK_SOURCE = YES
++
++# If the USE_HTAGS tag is set to YES then the references to source code
++# will point to the HTML generated by the htags(1) tool instead of doxygen
++# built-in source browser. The htags tool is part of GNU's global source
++# tagging system (see http://www.gnu.org/software/global/global.html). You
++# will need version 4.8.6 or higher.
++
++USE_HTAGS = NO
++
++# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
++# will generate a verbatim copy of the header file for each class for
++# which an include is specified. Set to NO to disable this.
++
++VERBATIM_HEADERS = YES
++
++#---------------------------------------------------------------------------
++# configuration options related to the alphabetical class index
++#---------------------------------------------------------------------------
++
++# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
++# of all compounds will be generated. Enable this if the project
++# contains a lot of classes, structs, unions or interfaces.
++
++ALPHABETICAL_INDEX = NO
++
++# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
++# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
++# in which this list will be split (can be a number in the range [1..20])
++
++COLS_IN_ALPHA_INDEX = 5
++
++# In case all classes in a project start with a common prefix, all
++# classes will be put under the same header in the alphabetical index.
++# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
++# should be ignored while generating the index headers.
++
++IGNORE_PREFIX =
++
++#---------------------------------------------------------------------------
++# configuration options related to the HTML output
++#---------------------------------------------------------------------------
++
++# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
++# generate HTML output.
++
++GENERATE_HTML = YES
++
++# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
++# If a relative path is entered the value of OUTPUT_DIRECTORY will be
++# put in front of it. If left blank `html' will be used as the default path.
++
++HTML_OUTPUT = html
++
++# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
++# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
++# doxygen will generate files with .html extension.
++
++HTML_FILE_EXTENSION = .html
++
++# The HTML_HEADER tag can be used to specify a personal HTML header for
++# each generated HTML page. If it is left blank doxygen will generate a
++# standard header.
++
++HTML_HEADER =
++
++# The HTML_FOOTER tag can be used to specify a personal HTML footer for
++# each generated HTML page. If it is left blank doxygen will generate a
++# standard footer.
++
++HTML_FOOTER =
++
++# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
++# style sheet that is used by each HTML page. It can be used to
++# fine-tune the look of the HTML output. If the tag is left blank doxygen
++# will generate a default style sheet. Note that doxygen will try to copy
++# the style sheet file to the HTML output directory, so don't put your own
++# stylesheet in the HTML output directory as well, or it will be erased!
++
++HTML_STYLESHEET =
++
++# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
++# files or namespaces will be aligned in HTML using tables. If set to
++# NO a bullet list will be used.
++
++HTML_ALIGN_MEMBERS = YES
++
++# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
++# documentation will contain sections that can be hidden and shown after the
++# page has loaded. For this to work a browser that supports
++# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
++# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
++
++HTML_DYNAMIC_SECTIONS = NO
++
++# If the GENERATE_DOCSET tag is set to YES, additional index files
++# will be generated that can be used as input for Apple's Xcode 3
++# integrated development environment, introduced with OSX 10.5 (Leopard).
++# To create a documentation set, doxygen will generate a Makefile in the
++# HTML output directory. Running make will produce the docset in that
++# directory and running "make install" will install the docset in
++# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
++# it at startup.
++# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information.
++
++GENERATE_DOCSET = NO
++
++# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
++# feed. A documentation feed provides an umbrella under which multiple
++# documentation sets from a single provider (such as a company or product suite)
++# can be grouped.
++
++DOCSET_FEEDNAME = "Doxygen generated docs"
++
++# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
++# should uniquely identify the documentation set bundle. This should be a
++# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
++# will append .docset to the name.
++
++DOCSET_BUNDLE_ID = org.doxygen.Project
++
++# If the GENERATE_HTMLHELP tag is set to YES, additional index files
++# will be generated that can be used as input for tools like the
++# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
++# of the generated HTML documentation.
++
++GENERATE_HTMLHELP = NO
++
++# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
++# be used to specify the file name of the resulting .chm file. You
++# can add a path in front of the file if the result should not be
++# written to the html output directory.
++
++CHM_FILE =
++
++# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
++# be used to specify the location (absolute path including file name) of
++# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
++# the HTML help compiler on the generated index.hhp.
++
++HHC_LOCATION =
++
++# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
++# controls if a separate .chi index file is generated (YES) or that
++# it should be included in the master .chm file (NO).
++
++GENERATE_CHI = NO
++
++# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
++# is used to encode HtmlHelp index (hhk), content (hhc) and project file
++# content.
++
++CHM_INDEX_ENCODING =
++
++# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
++# controls whether a binary table of contents is generated (YES) or a
++# normal table of contents (NO) in the .chm file.
++
++BINARY_TOC = NO
++
++# The TOC_EXPAND flag can be set to YES to add extra items for group members
++# to the contents of the HTML help documentation and to the tree view.
++
++TOC_EXPAND = NO
++
++# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER
++# are set, an additional index file will be generated that can be used as input for
++# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated
++# HTML documentation.
++
++GENERATE_QHP = NO
++
++# If the QHG_LOCATION tag is specified, the QCH_FILE tag can
++# be used to specify the file name of the resulting .qch file.
++# The path specified is relative to the HTML output folder.
++
++QCH_FILE =
++
++# The QHP_NAMESPACE tag specifies the namespace to use when generating
++# Qt Help Project output. For more information please see
++# <a href="http://doc.trolltech.com/qthelpproject.html#namespace">Qt Help Project / Namespace</a>.
++
++QHP_NAMESPACE = org.doxygen.Project
++
++# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
++# Qt Help Project output. For more information please see
++# <a href="http://doc.trolltech.com/qthelpproject.html#virtual-folders">Qt Help Project / Virtual Folders</a>.
++
++QHP_VIRTUAL_FOLDER = doc
++
++# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
++# be used to specify the location of Qt's qhelpgenerator.
++# If non-empty doxygen will try to run qhelpgenerator on the generated
++# .qhp file .
++
++QHG_LOCATION =
++
++# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
++# top of each HTML page. The value NO (the default) enables the index and
++# the value YES disables it.
++
++DISABLE_INDEX = NO
++
++# This tag can be used to set the number of enum values (range [1..20])
++# that doxygen will group on one line in the generated HTML documentation.
++
++ENUM_VALUES_PER_LINE = 4
++
++# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
++# structure should be generated to display hierarchical information.
++# If the tag value is set to FRAME, a side panel will be generated
++# containing a tree-like index structure (just like the one that
++# is generated for HTML Help). For this to work a browser that supports
++# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+,
++# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are
++# probably better off using the HTML help feature. Other possible values
++# for this tag are: HIERARCHIES, which will generate the Groups, Directories,
++# and Class Hierarchy pages using a tree view instead of an ordered list;
++# ALL, which combines the behavior of FRAME and HIERARCHIES; and NONE, which
++# disables this behavior completely. For backwards compatibility with previous
++# releases of Doxygen, the values YES and NO are equivalent to FRAME and NONE
++# respectively.
++
++GENERATE_TREEVIEW = NONE
++
++# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
++# used to set the initial width (in pixels) of the frame in which the tree
++# is shown.
++
++TREEVIEW_WIDTH = 250
++
++# Use this tag to change the font size of Latex formulas included
++# as images in the HTML documentation. The default is 10. Note that
++# when you change the font size after a successful doxygen run you need
++# to manually remove any form_*.png images from the HTML output directory
++# to force them to be regenerated.
++
++FORMULA_FONTSIZE = 10
++
++#---------------------------------------------------------------------------
++# configuration options related to the LaTeX output
++#---------------------------------------------------------------------------
++
++# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
++# generate Latex output.
++
++GENERATE_LATEX = NO
++
++# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
++# If a relative path is entered the value of OUTPUT_DIRECTORY will be
++# put in front of it. If left blank `latex' will be used as the default path.
++
++LATEX_OUTPUT = latex
++
++# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
++# invoked. If left blank `latex' will be used as the default command name.
++
++LATEX_CMD_NAME = latex
++
++# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
++# generate index for LaTeX. If left blank `makeindex' will be used as the
++# default command name.
++
++MAKEINDEX_CMD_NAME = makeindex
++
++# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
++# LaTeX documents. This may be useful for small projects and may help to
++# save some trees in general.
++
++COMPACT_LATEX = NO
++
++# The PAPER_TYPE tag can be used to set the paper type that is used
++# by the printer. Possible values are: a4, a4wide, letter, legal and
++# executive. If left blank a4wide will be used.
++
++PAPER_TYPE = a4wide
++
++# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
++# packages that should be included in the LaTeX output.
++
++EXTRA_PACKAGES =
++
++# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
++# the generated latex document. The header should contain everything until
++# the first chapter. If it is left blank doxygen will generate a
++# standard header. Notice: only use this tag if you know what you are doing!
++
++LATEX_HEADER =
++
++# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
++# is prepared for conversion to pdf (using ps2pdf). The pdf file will
++# contain links (just like the HTML output) instead of page references
++# This makes the output suitable for online browsing using a pdf viewer.
++
++PDF_HYPERLINKS = YES
++
++# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
++# plain latex in the generated Makefile. Set this option to YES to get a
++# higher quality PDF documentation.
++
++USE_PDFLATEX = YES
++
++# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
++# command to the generated LaTeX files. This will instruct LaTeX to keep
++# running if errors occur, instead of asking the user for help.
++# This option is also used when generating formulas in HTML.
++
++LATEX_BATCHMODE = NO
++
++# If LATEX_HIDE_INDICES is set to YES then doxygen will not
++# include the index chapters (such as File Index, Compound Index, etc.)
++# in the output.
++
++LATEX_HIDE_INDICES = NO
++
++#---------------------------------------------------------------------------
++# configuration options related to the RTF output
++#---------------------------------------------------------------------------
++
++# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
++# The RTF output is optimized for Word 97 and may not look very pretty with
++# other RTF readers or editors.
++
++GENERATE_RTF = NO
++
++# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
++# If a relative path is entered the value of OUTPUT_DIRECTORY will be
++# put in front of it. If left blank `rtf' will be used as the default path.
++
++RTF_OUTPUT = rtf
++
++# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
++# RTF documents. This may be useful for small projects and may help to
++# save some trees in general.
++
++COMPACT_RTF = NO
++
++# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
++# will contain hyperlink fields. The RTF file will
++# contain links (just like the HTML output) instead of page references.
++# This makes the output suitable for online browsing using WORD or other
++# programs which support those fields.
++# Note: wordpad (write) and others do not support links.
++
++RTF_HYPERLINKS = NO
++
++# Load stylesheet definitions from file. Syntax is similar to doxygen's
++# config file, i.e. a series of assignments. You only have to provide
++# replacements, missing definitions are set to their default value.
++
++RTF_STYLESHEET_FILE =
++
++# Set optional variables used in the generation of an rtf document.
++# Syntax is similar to doxygen's config file.
++
++RTF_EXTENSIONS_FILE =
++
++#---------------------------------------------------------------------------
++# configuration options related to the man page output
++#---------------------------------------------------------------------------
++
++# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
++# generate man pages
++
++GENERATE_MAN = NO
++
++# The MAN_OUTPUT tag is used to specify where the man pages will be put.
++# If a relative path is entered the value of OUTPUT_DIRECTORY will be
++# put in front of it. If left blank `man' will be used as the default path.
++
++MAN_OUTPUT = man
++
++# The MAN_EXTENSION tag determines the extension that is added to
++# the generated man pages (default is the subroutine's section .3)
++
++MAN_EXTENSION = .3
++
++# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
++# then it will generate one additional man file for each entity
++# documented in the real man page(s). These additional files
++# only source the real man page, but without them the man command
++# would be unable to find the correct page. The default is NO.
++
++MAN_LINKS = NO
++
++#---------------------------------------------------------------------------
++# configuration options related to the XML output
++#---------------------------------------------------------------------------
++
++# If the GENERATE_XML tag is set to YES Doxygen will
++# generate an XML file that captures the structure of
++# the code including all documentation.
++
++GENERATE_XML = NO
++
++# The XML_OUTPUT tag is used to specify where the XML pages will be put.
++# If a relative path is entered the value of OUTPUT_DIRECTORY will be
++# put in front of it. If left blank `xml' will be used as the default path.
++
++XML_OUTPUT = xml
++
++# The XML_SCHEMA tag can be used to specify an XML schema,
++# which can be used by a validating XML parser to check the
++# syntax of the XML files.
++
++XML_SCHEMA =
++
++# The XML_DTD tag can be used to specify an XML DTD,
++# which can be used by a validating XML parser to check the
++# syntax of the XML files.
++
++XML_DTD =
++
++# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
++# dump the program listings (including syntax highlighting
++# and cross-referencing information) to the XML output. Note that
++# enabling this will significantly increase the size of the XML output.
++
++XML_PROGRAMLISTING = YES
++
++#---------------------------------------------------------------------------
++# configuration options for the AutoGen Definitions output
++#---------------------------------------------------------------------------
++
++# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
++# generate an AutoGen Definitions (see autogen.sf.net) file
++# that captures the structure of the code including all
++# documentation. Note that this feature is still experimental
++# and incomplete at the moment.
++
++GENERATE_AUTOGEN_DEF = NO
++
++#---------------------------------------------------------------------------
++# configuration options related to the Perl module output
++#---------------------------------------------------------------------------
++
++# If the GENERATE_PERLMOD tag is set to YES Doxygen will
++# generate a Perl module file that captures the structure of
++# the code including all documentation. Note that this
++# feature is still experimental and incomplete at the
++# moment.
++
++GENERATE_PERLMOD = NO
++
++# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
++# the necessary Makefile rules, Perl scripts and LaTeX code to be able
++# to generate PDF and DVI output from the Perl module output.
++
++PERLMOD_LATEX = NO
++
++# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
++# nicely formatted so it can be parsed by a human reader. This is useful
++# if you want to understand what is going on. On the other hand, if this
++# tag is set to NO the size of the Perl module output will be much smaller
++# and Perl will parse it just the same.
++
++PERLMOD_PRETTY = YES
++
++# The names of the make variables in the generated doxyrules.make file
++# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
++# This is useful so different doxyrules.make files included by the same
++# Makefile don't overwrite each other's variables.
++
++PERLMOD_MAKEVAR_PREFIX =
++
++#---------------------------------------------------------------------------
++# Configuration options related to the preprocessor
++#---------------------------------------------------------------------------
++
++# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
++# evaluate all C-preprocessor directives found in the sources and include
++# files.
++
++ENABLE_PREPROCESSING = YES
++
++# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
++# names in the source code. If set to NO (the default) only conditional
++# compilation will be performed. Macro expansion can be done in a controlled
++# way by setting EXPAND_ONLY_PREDEF to YES.
++
++MACRO_EXPANSION = NO
++
++# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
++# then the macro expansion is limited to the macros specified with the
++# PREDEFINED and EXPAND_AS_DEFINED tags.
++
++EXPAND_ONLY_PREDEF = NO
++
++# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
++# in the INCLUDE_PATH (see below) will be search if a #include is found.
++
++SEARCH_INCLUDES = YES
++
++# The INCLUDE_PATH tag can be used to specify one or more directories that
++# contain include files that are not input files but should be processed by
++# the preprocessor.
++
++INCLUDE_PATH =
++
++# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
++# patterns (like *.h and *.hpp) to filter out the header-files in the
++# directories. If left blank, the patterns specified with FILE_PATTERNS will
++# be used.
++
++INCLUDE_FILE_PATTERNS =
++
++# The PREDEFINED tag can be used to specify one or more macro names that
++# are defined before the preprocessor is started (similar to the -D option of
++# gcc). The argument of the tag is a list of macros of the form: name
++# or name=definition (no spaces). If the definition and the = are
++# omitted =1 is assumed. To prevent a macro definition from being
++# undefined via #undef or recursively expanded use the := operator
++# instead of the = operator.
++
++PREDEFINED =
++
++# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
++# this tag can be used to specify a list of macro names that should be expanded.
++# The macro definition that is found in the sources will be used.
++# Use the PREDEFINED tag if you want to use a different macro definition.
++
++EXPAND_AS_DEFINED =
++
++# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
++# doxygen's preprocessor will remove all function-like macros that are alone
++# on a line, have an all uppercase name, and do not end with a semicolon. Such
++# function macros are typically used for boiler-plate code, and will confuse
++# the parser if not removed.
++
++SKIP_FUNCTION_MACROS = YES
++
++#---------------------------------------------------------------------------
++# Configuration::additions related to external references
++#---------------------------------------------------------------------------
++
++# The TAGFILES option can be used to specify one or more tagfiles.
++# Optionally an initial location of the external documentation
++# can be added for each tagfile. The format of a tag file without
++# this location is as follows:
++# TAGFILES = file1 file2 ...
++# Adding location for the tag files is done as follows:
++# TAGFILES = file1=loc1 "file2 = loc2" ...
++# where "loc1" and "loc2" can be relative or absolute paths or
++# URLs. If a location is present for each tag, the installdox tool
++# does not have to be run to correct the links.
++# Note that each tag file must have a unique name
++# (where the name does NOT include the path)
++# If a tag file is not located in the directory in which doxygen
++# is run, you must also specify the path to the tagfile here.
++
++TAGFILES =
++
++# When a file name is specified after GENERATE_TAGFILE, doxygen will create
++# a tag file that is based on the input files it reads.
++
++GENERATE_TAGFILE =
++
++# If the ALLEXTERNALS tag is set to YES all external classes will be listed
++# in the class index. If set to NO only the inherited external classes
++# will be listed.
++
++ALLEXTERNALS = NO
++
++# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
++# in the modules index. If set to NO, only the current project's groups will
++# be listed.
++
++EXTERNAL_GROUPS = YES
++
++# The PERL_PATH should be the absolute path and name of the perl script
++# interpreter (i.e. the result of `which perl').
++
++PERL_PATH = /usr/bin/perl
++
++#---------------------------------------------------------------------------
++# Configuration options related to the dot tool
++#---------------------------------------------------------------------------
++
++# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
++# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
++# or super classes. Setting the tag to NO turns the diagrams off. Note that
++# this option is superseded by the HAVE_DOT option below. This is only a
++# fallback. It is recommended to install and use dot, since it yields more
++# powerful graphs.
++
++CLASS_DIAGRAMS = YES
++
++# You can define message sequence charts within doxygen comments using the \msc
++# command. Doxygen will then run the mscgen tool (see
++# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
++# documentation. The MSCGEN_PATH tag allows you to specify the directory where
++# the mscgen tool resides. If left empty the tool is assumed to be found in the
++# default search path.
++
++MSCGEN_PATH =
++
++# If set to YES, the inheritance and collaboration graphs will hide
++# inheritance and usage relations if the target is undocumented
++# or is not a class.
++
++HIDE_UNDOC_RELATIONS = YES
++
++# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
++# available from the path. This tool is part of Graphviz, a graph visualization
++# toolkit from AT&T and Lucent Bell Labs. The other options in this section
++# have no effect if this option is set to NO (the default)
++
++HAVE_DOT = NO
++
++# By default doxygen will write a font called FreeSans.ttf to the output
++# directory and reference it in all dot files that doxygen generates. This
++# font does not include all possible unicode characters however, so when you need
++# these (or just want a differently looking font) you can specify the font name
++# using DOT_FONTNAME. You need need to make sure dot is able to find the font,
++# which can be done by putting it in a standard location or by setting the
++# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory
++# containing the font.
++
++DOT_FONTNAME = FreeSans
++
++# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
++# The default size is 10pt.
++
++DOT_FONTSIZE = 10
++
++# By default doxygen will tell dot to use the output directory to look for the
++# FreeSans.ttf font (which doxygen will put there itself). If you specify a
++# different font using DOT_FONTNAME you can set the path where dot
++# can find it using this tag.
++
++DOT_FONTPATH =
++
++# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
++# will generate a graph for each documented class showing the direct and
++# indirect inheritance relations. Setting this tag to YES will force the
++# the CLASS_DIAGRAMS tag to NO.
++
++CLASS_GRAPH = YES
++
++# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
++# will generate a graph for each documented class showing the direct and
++# indirect implementation dependencies (inheritance, containment, and
++# class references variables) of the class with other documented classes.
++
++COLLABORATION_GRAPH = YES
++
++# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
++# will generate a graph for groups, showing the direct groups dependencies
++
++GROUP_GRAPHS = YES
++
++# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
++# collaboration diagrams in a style similar to the OMG's Unified Modeling
++# Language.
++
++UML_LOOK = NO
++
++# If set to YES, the inheritance and collaboration graphs will show the
++# relations between templates and their instances.
++
++TEMPLATE_RELATIONS = NO
++
++# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
++# tags are set to YES then doxygen will generate a graph for each documented
++# file showing the direct and indirect include dependencies of the file with
++# other documented files.
++
++INCLUDE_GRAPH = YES
++
++# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
++# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
++# documented header file showing the documented files that directly or
++# indirectly include this file.
++
++INCLUDED_BY_GRAPH = YES
++
++# If the CALL_GRAPH and HAVE_DOT options are set to YES then
++# doxygen will generate a call dependency graph for every global function
++# or class method. Note that enabling this option will significantly increase
++# the time of a run. So in most cases it will be better to enable call graphs
++# for selected functions only using the \callgraph command.
++
++CALL_GRAPH = NO
++
++# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
++# doxygen will generate a caller dependency graph for every global function
++# or class method. Note that enabling this option will significantly increase
++# the time of a run. So in most cases it will be better to enable caller
++# graphs for selected functions only using the \callergraph command.
++
++CALLER_GRAPH = NO
++
++# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
++# will graphical hierarchy of all classes instead of a textual one.
++
++GRAPHICAL_HIERARCHY = YES
++
++# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES
++# then doxygen will show the dependencies a directory has on other directories
++# in a graphical way. The dependency relations are determined by the #include
++# relations between the files in the directories.
++
++DIRECTORY_GRAPH = YES
++
++# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
++# generated by dot. Possible values are png, jpg, or gif
++# If left blank png will be used.
++
++DOT_IMAGE_FORMAT = png
++
++# The tag DOT_PATH can be used to specify the path where the dot tool can be
++# found. If left blank, it is assumed the dot tool can be found in the path.
++
++DOT_PATH =
++
++# The DOTFILE_DIRS tag can be used to specify one or more directories that
++# contain dot files that are included in the documentation (see the
++# \dotfile command).
++
++DOTFILE_DIRS =
++
++# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
++# nodes that will be shown in the graph. If the number of nodes in a graph
++# becomes larger than this value, doxygen will truncate the graph, which is
++# visualized by representing a node as a red box. Note that doxygen if the
++# number of direct children of the root node in a graph is already larger than
++# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
++# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
++
++DOT_GRAPH_MAX_NODES = 50
++
++# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
++# graphs generated by dot. A depth value of 3 means that only nodes reachable
++# from the root by following a path via at most 3 edges will be shown. Nodes
++# that lay further from the root node will be omitted. Note that setting this
++# option to 1 or 2 may greatly reduce the computation time needed for large
++# code bases. Also note that the size of a graph can be further restricted by
++# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
++
++MAX_DOT_GRAPH_DEPTH = 0
++
++# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
++# background. This is disabled by default, because dot on Windows does not
++# seem to support this out of the box. Warning: Depending on the platform used,
++# enabling this option may lead to badly anti-aliased labels on the edges of
++# a graph (i.e. they become hard to read).
++
++DOT_TRANSPARENT = NO
++
++# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
++# files in one run (i.e. multiple -o and -T options on the command line). This
++# makes dot run faster, but since only newer versions of dot (>1.8.10)
++# support this, this feature is disabled by default.
++
++DOT_MULTI_TARGETS = NO
++
++# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
++# generate a legend page explaining the meaning of the various boxes and
++# arrows in the dot generated graphs.
++
++GENERATE_LEGEND = YES
++
++# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
++# remove the intermediate dot files that are used to generate
++# the various graphs.
++
++DOT_CLEANUP = YES
++
++#---------------------------------------------------------------------------
++# Configuration::additions related to the search engine
++#---------------------------------------------------------------------------
++
++# The SEARCHENGINE tag specifies whether or not a search engine should be
++# used. If set to NO the values of all tags below this one will be ignored.
++
++SEARCHENGINE = NO
+diff --git a/libiscsi/libiscsi.h b/libiscsi/libiscsi.h
+new file mode 100644
+index 0000000..a7d05a5
+--- /dev/null
++++ b/libiscsi/libiscsi.h
+@@ -0,0 +1,343 @@
++/*
++ * iSCSI Administration library
++ *
++ * Copyright (C) 2008-2009 Red Hat, Inc. All rights reserved.
++ * Copyright (C) 2008-2009 Hans de Goede <hdegoede(a)redhat.com>
++ * maintained by open-iscsi(a)googlegroups.com
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published
++ * by the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * General Public License for more details.
++ *
++ * See the file COPYING included with this distribution for more details.
++ */
++
++#ifndef __LIBISCSI_H
++#define __LIBISCSI_H
++
++#include <netdb.h>
++
++#ifdef __cplusplus
++extern "C" {
++#endif /* __cplusplus */
++
++#if __GNUC__ >= 4
++#define PUBLIC __attribute__ ((visibility("default")))
++#else
++#define PUBLIC
++#endif
++
++/** \brief Maximum length for iSCSI values.
++ *
++ * Maximum length for iSCSI values such as hostnames and parameter values.
++ */
++#define LIBISCSI_VALUE_MAXLEN 256
++
++/** \brief supported authentication methods
++ *
++ * This enum lists all supported authentication methods.
++ */
++enum libiscsi_auth_t {
++ libiscsi_auth_none /** No authentication */,
++ libiscsi_auth_chap /** CHAP authentication */,
++};
++
++/** \brief libiscsi context struct
++ *
++ * Note: even though libiscsi uses a context struct, the underlying open-iscsi
++ * code does not, so libiscsi is not thread safe, not even when using one
++ * context per thread!
++ */
++struct libiscsi_context;
++
++/** \brief iSCSI node record
++ *
++ * Struct holding data uniquely identifying an iSCSI node.
++ */
++struct libiscsi_node {
++ char name[LIBISCSI_VALUE_MAXLEN] /** iSCSI iqn for the node. */;
++ int tpgt /** Portal group number. */;
++ /* Note open-iscsi has some code in place for multiple connections in one
++ node record and thus multiple address / port combi's, but this does not
++ get used anywhere, so we keep things simple and assume one connection */
++ char address[NI_MAXHOST] /** Portal hostname or IP-address. */;
++ int port /** Portal port number. */;
++};
++
++/** \brief libiscsi CHAP authentication information struct
++ *
++ * Struct holding all data needed for CHAP login / authentication. Note that
++ * \e reverse_username may be a 0 length string in which case only forward
++ * authentication will be done.
++ */
++struct libiscsi_chap_auth_info {
++ char username[LIBISCSI_VALUE_MAXLEN] /** Username */;
++ char password[LIBISCSI_VALUE_MAXLEN] /** Password */;
++ char reverse_username[LIBISCSI_VALUE_MAXLEN] /** Reverse Username */;
++ char reverse_password[LIBISCSI_VALUE_MAXLEN] /** Reverse Password */;
++};
++
++/** \brief generic libiscsi authentication information struct
++ *
++ * Struct holding authentication information for discovery and login.
++ */
++struct libiscsi_auth_info {
++ enum libiscsi_auth_t method /** Authentication method to use */;
++ union {
++ struct libiscsi_chap_auth_info chap /** Chap specific info */;
++ } /** Union holding method depenend info */;
++};
++
++/** \brief Initalize libiscsi
++ *
++ * This function creates a libiscsi context and initalizes it. This context
++ * is need to use other libiscsi funtions.
++ *
++ * \return A pointer to the created context, or NULL in case of an error.
++ */
++PUBLIC struct libiscsi_context *libiscsi_init(void);
++
++/** \brief Cleanup libiscsi used resource
++ *
++ * This function cleanups any used resources and then destroys the passed
++ * context. After this the passed in context may no longer be used!
++ *
++ * \param context libiscsi context to operate on.
++ */
++PUBLIC void libiscsi_cleanup(struct libiscsi_context *context);
++
++/** \brief Discover iSCSI nodes using sendtargets and add them to the node db.
++ *
++ * This function connects to the given address and port and then tries to
++ * discover iSCSI nodes using the sendtargets protocol. Any found nodes are
++ * added to the local iSCSI node database and are returned in a dynamically
++ * allocated array.
++ *
++ * Note that the (optional) authentication info is for authenticating the
++ * discovery, and is not for the found nodes! If the connection(s) to the
++ * node(s) need authentication too, you can set the username / password for
++ * those (which can be different!) using the libiscsi_node_set_auth() function.
++ *
++ * \param context libiscsi context to operate on.
++ * \param address Hostname or IP-address to connect to.
++ * \param port Port to connect to, or 0 for the default port.
++ * \param auth_info Authentication information, or NULL.
++ * \param nr_found The number of found nodes will be returned
++ * through this pointer if not NULL.
++ * \param found_nodes The address of the dynamically allocated array
++ * of found nodes will be returned through this
++ * pointer if not NULL. The caller must free this
++ * array using free().
++ * \return 0 on success, otherwise a standard error code
++ * (from errno.h).
++ */
++PUBLIC int libiscsi_discover_sendtargets(struct libiscsi_context *context,
++ const char *address, int port, const struct libiscsi_auth_info *auth_info,
++ int *nr_found, struct libiscsi_node **found_nodes);
++
++/** \brief Read iSCSI node info from firmware and add them to the node db.
++ *
++ * This function discovers iSCSI nodes using firmware (ppc or ibft). Any found
++ * nodes are added to the local iSCSI node database and are returned in a
++ * dynamically allocated array.
++ *
++ * Note that unlike sendtargets discovery, this function will also read
++ * authentication info and store that in the database too.
++ *
++ * Note this function currently is a stub which will always return -EINVAL
++ * (IOW it is not yet implemented)
++ *
++ * \param context libiscsi context to operate on.
++ * \param nr_found The number of found nodes will be returned
++ * through this pointer if not NULL.
++ * \param found_nodes The address of the dynamically allocated array
++ * of found nodes will be returned through this
++ * pointer if not NULL. The caller must free this
++ * array using free().
++ * \return 0 on success, otherwise a standard error code
++ * (from errno.h).
++ */
++PUBLIC int libiscsi_discover_firmware(struct libiscsi_context *context,
++ int *nr_found, struct libiscsi_node **found_nodes);
++
++/** \brief Check validity of the given authentication info.
++ *
++ * This function checks the validity of the given authentication info. For
++ * example in case of CHAP, if the username and password are not empty.
++ *
++ * This function is mainly intended for use by language bindings.
++ *
++ * \param context libiscsi context to operate on.
++ * \param auth_info Authentication information to check.
++ * \return 0 on success, otherwise EINVAL.
++ */
++PUBLIC int libiscsi_verify_auth_info(struct libiscsi_context *context,
++ const struct libiscsi_auth_info *auth_info);
++
++/** \brief Set the authentication info for the given node.
++ *
++ * This function sets the authentication information for the node described by
++ * the given node record. This will overwrite any existing authentication
++ * information.
++ *
++ * This is the way to specify authentication information for nodes found
++ * through sendtargets discovery.
++ *
++ * Note:
++ * 1) This is a convience wrapper around libiscsi_node_set_parameter(),
++ * setting the node.session.auth.* parameters.
++ * 2) For nodes found through firmware discovery the authentication information
++ * has already been set from the firmware.
++ * 3) \e auth_info may be NULL in which case any existing authinfo will be
++ * cleared.
++ *
++ * \param context libiscsi context to operate on.
++ * \param node iSCSI node to set auth information of
++ * \param auth_info Authentication information, or NULL.
++ * \return 0 on success, otherwise a standard error code
++ * (from errno.h).
++ */
++PUBLIC int libiscsi_node_set_auth(struct libiscsi_context *context,
++ const struct libiscsi_node *node,
++ const struct libiscsi_auth_info *auth_info);
++
++/** \brief Get the authentication info for the given node.
++ *
++ * This function gets the authentication information for the node described by
++ * the given node record.
++ *
++ * \param context libiscsi context to operate on.
++ * \param node iSCSI node to set auth information of
++ * \param auth_info Pointer to a libiscsi_auth_info struct where
++ * the retreived information will be stored.
++ * \return 0 on success, otherwise a standard error code
++ * (from errno.h).
++ */
++PUBLIC int libiscsi_node_get_auth(struct libiscsi_context *context,
++ const struct libiscsi_node *node,
++ struct libiscsi_auth_info *auth_info);
++
++/** \brief Login to an iSCSI node.
++ *
++ * Login to the iSCSI node described by the given node record.
++ *
++ * \param context libiscsi context to operate on.
++ * \param node iSCSI node to login to.
++ * \return 0 on success, otherwise a standard error code
++ * (from errno.h).
++ */
++PUBLIC int libiscsi_node_login(struct libiscsi_context *context,
++ const struct libiscsi_node *node);
++
++/** \brief Logout of an iSCSI node.
++ *
++ * Logout of the iSCSI node described by the given node record.
++ *
++ * \param context libiscsi context to operate on.
++ * \param node iSCSI node to logout from.
++ * \return 0 on success, otherwise a standard error code
++ * (from errno.h).
++ */
++PUBLIC int libiscsi_node_logout(struct libiscsi_context *context,
++ const struct libiscsi_node *node);
++
++/** \brief Set an iSCSI parameter for the given node
++ *
++ * Set the given nodes iSCSI parameter named by \e parameter to value \e value.
++ *
++ * \param context libiscsi context to operate on.
++ * \param node iSCSI node to change a parameter from.
++ * \param parameter Name of the parameter to set.
++ * \param value Value to set the parameter too.
++ * \return 0 on success, otherwise a standard error code
++ * (from errno.h).
++ */
++PUBLIC int libiscsi_node_set_parameter(struct libiscsi_context *context,
++ const struct libiscsi_node *node,
++ const char *parameter, const char *value);
++
++/** \brief Get the value of an iSCSI parameter for the given node
++ *
++ * Get the value of the given nodes iSCSI parameter named by \e parameter.
++ *
++ * \param context libiscsi context to operate on.
++ * \param node iSCSI node to change a parameter from.
++ * \param parameter Name of the parameter to get.
++ * \param value The retreived value is stored here, this buffer must be
++ * atleast LIBISCSI_VALUE_MAXLEN bytes large.
++ * \return 0 on success, otherwise a standard error code
++ * (from errno.h).
++ */
++PUBLIC int libiscsi_node_get_parameter(struct libiscsi_context *context,
++ const struct libiscsi_node *node, const char *parameter, char *value);
++
++/** \brief Get human readable string describing the last libiscsi error.
++ *
++ * This function can be called to get a human readable error string when a
++ * libiscsi function has returned an error. This function uses a single buffer
++ * per context, thus the result is only valid as long as no other libiscsi
++ * calls are made on the same context after the failing function call.
++ *
++ * \param context libiscsi context to operate on.
++ *
++ * \return human readable string describing the last libiscsi error.
++ */
++PUBLIC const char *libiscsi_get_error_string(struct libiscsi_context *context);
++
++
++/************************** Utility functions *******************************/
++
++/** \brief libiscsi network config struct
++ *
++ * libiscsi network config struct.
++ */
++struct libiscsi_network_config {
++ int dhcp /** Using DHCP? (boolean). */;
++ char iface_name[LIBISCSI_VALUE_MAXLEN] /** Interface name. */;
++ char mac_address[LIBISCSI_VALUE_MAXLEN] /** MAC address. */;
++ char ip_address[LIBISCSI_VALUE_MAXLEN] /** IP address. */;
++ char netmask[LIBISCSI_VALUE_MAXLEN] /** Netmask. */;
++ char gateway[LIBISCSI_VALUE_MAXLEN] /** IP of Default gateway. */;
++ char primary_dns[LIBISCSI_VALUE_MAXLEN] /** IP of the Primary DNS. */;
++ char secondary_dns[LIBISCSI_VALUE_MAXLEN] /** IP of the Secondary DNS. */;
++};
++
++/** \brief Get network configuration information from iscsi firmware
++ *
++ * Function can be called to get the network configuration information
++ * (like dhcp, ip, netmask, default gateway, etc.) from the firmware of a
++ * network adapter with iscsi boot firmware.
++ *
++ * Note that not all fields of the returned struct are necessarilly filled,
++ * unset fields contain a 0 length string.
++ *
++ * \param config pointer to a libiscsi_network_config struct to fill.
++ *
++ * \return 0 on success, ENODEV when no iscsi firmware was found.
++ */
++PUBLIC int libiscsi_get_firmware_network_config(
++ struct libiscsi_network_config *config);
++
++/** \brief Get the initiator name (iqn) from the iscsi firmware
++ *
++ * Get the initiator name (iqn) from the iscsi firmware.
++ *
++ * \param initiatorname The initiator name is stored here, this buffer must be
++ * atleast LIBISCSI_VALUE_MAXLEN bytes large.
++ * \return 0 on success, ENODEV when no iscsi firmware was found.
++ */
++PUBLIC int libiscsi_get_firmware_initiator_name(char *initiatorname);
++
++#undef PUBLIC
++
++#ifdef __cplusplus
++}
++#endif /* __cplusplus */
++
++#endif
+diff --git a/libiscsi/pylibiscsi.c b/libiscsi/pylibiscsi.c
+new file mode 100644
+index 0000000..454a26a
+--- /dev/null
++++ b/libiscsi/pylibiscsi.c
+@@ -0,0 +1,624 @@
++/*
++ * iSCSI Administration library
++ *
++ * Copyright (C) 2008-2009 Red Hat, Inc. All rights reserved.
++ * Copyright (C) 2008-2009 Hans de Goede <hdegoede(a)redhat.com>
++ * maintained by open-iscsi(a)googlegroups.com
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published
++ * by the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * General Public License for more details.
++ *
++ * See the file COPYING included with this distribution for more details.
++ */
++
++#include <Python.h>
++#include "libiscsi.h"
++
++static struct libiscsi_context *context = NULL;
++
++/****************************** helpers ***********************************/
++static int check_string(const char *string)
++{
++ if (strlen(string) >= LIBISCSI_VALUE_MAXLEN) {
++ PyErr_SetString(PyExc_ValueError, "string too long");
++ return -1;
++ }
++ return 0;
++}
++
++/********************** PyIscsiChapAuthInfo ***************************/
++
++typedef struct {
++ PyObject_HEAD
++
++ struct libiscsi_auth_info info;
++} PyIscsiChapAuthInfo;
++
++static int PyIscsiChapAuthInfo_init(PyObject *self, PyObject *args,
++ PyObject *kwds)
++{
++ int i;
++ PyIscsiChapAuthInfo *chap = (PyIscsiChapAuthInfo *)self;
++ char *kwlist[] = {"username", "password", "reverse_username",
++ "reverse_password", NULL};
++ const char *string[4] = { NULL, NULL, NULL, NULL };
++
++ if (!PyArg_ParseTupleAndKeywords(args, kwds,
++ "zz|zz:chapAuthInfo.__init__",
++ kwlist, &string[0], &string[1],
++ &string[2], &string[3]))
++ return -1;
++
++ for (i = 0; i < 4; i++)
++ if (string[i] && check_string(string[i]))
++ return -1;
++
++ memset (&chap->info, 0, sizeof(chap->info));
++ chap->info.method = libiscsi_auth_chap;
++ if (string[0])
++ strcpy(chap->info.chap.username, string[0]);
++ if (string[1])
++ strcpy(chap->info.chap.password, string[1]);
++ if (string[2])
++ strcpy(chap->info.chap.reverse_username, string[2]);
++ if (string[3])
++ strcpy(chap->info.chap.reverse_password, string[3]);
++
++ if (libiscsi_verify_auth_info(context, &chap->info)) {
++ PyErr_SetString(PyExc_ValueError,
++ libiscsi_get_error_string(context));
++ return -1;
++ }
++ return 0;
++}
++
++static PyObject *PyIscsiChapAuthInfo_get(PyObject *self, void *data)
++{
++ PyIscsiChapAuthInfo *chap = (PyIscsiChapAuthInfo *)self;
++ const char *attr = (const char *)data;
++
++ if (!strcmp(attr, "username")) {
++ return PyString_FromString(chap->info.chap.username);
++ } else if (!strcmp(attr, "password")) {
++ return PyString_FromString(chap->info.chap.password);
++ } else if (!strcmp(attr, "reverse_username")) {
++ return PyString_FromString(chap->info.chap.reverse_username);
++ } else if (!strcmp(attr, "reverse_password")) {
++ return PyString_FromString(chap->info.chap.reverse_password);
++ }
++ return NULL;
++}
++
++static int PyIscsiChapAuthInfo_set(PyObject *self, PyObject *value, void *data)
++{
++ PyIscsiChapAuthInfo *chap = (PyIscsiChapAuthInfo *)self;
++ const char *attr = (const char *)data;
++ const char *str;
++
++ if (!PyArg_Parse(value, "s", &str) || check_string(str))
++ return -1;
++
++ if (!strcmp(attr, "username")) {
++ strcpy(chap->info.chap.username, str);
++ } else if (!strcmp(attr, "password")) {
++ strcpy(chap->info.chap.password, str);
++ } else if (!strcmp(attr, "reverse_username")) {
++ strcpy(chap->info.chap.reverse_username, str);
++ } else if (!strcmp(attr, "reverse_password")) {
++ strcpy(chap->info.chap.reverse_password, str);
++ }
++
++ return 0;
++}
++
++static int PyIscsiChapAuthInfo_compare(PyIscsiChapAuthInfo *self,
++ PyIscsiChapAuthInfo *other)
++{
++ int r;
++
++ r = strcmp(self->info.chap.username, other->info.chap.username);
++ if (r)
++ return r;
++
++ r = strcmp(self->info.chap.password, other->info.chap.password);
++ if (r)
++ return r;
++
++ r = strcmp(self->info.chap.reverse_username,
++ other->info.chap.reverse_username);
++ if (r)
++ return r;
++
++ r = strcmp(self->info.chap.reverse_password,
++ other->info.chap.reverse_password);
++ return r;
++}
++
++static PyObject *PyIscsiChapAuthInfo_str(PyObject *self)
++{
++ PyIscsiChapAuthInfo *chap = (PyIscsiChapAuthInfo *)self;
++ char s[1024], reverse[512] = "";
++
++ if (chap->info.chap.reverse_username[0])
++ snprintf(reverse, sizeof(reverse), ", %s:%s",
++ chap->info.chap.reverse_username,
++ chap->info.chap.reverse_password);
++
++ snprintf(s, sizeof(s), "%s:%s%s", chap->info.chap.username,
++ chap->info.chap.password, reverse);
++
++ return PyString_FromString(s);
++}
++
++static struct PyGetSetDef PyIscsiChapAuthInfo_getseters[] = {
++ {"username", (getter)PyIscsiChapAuthInfo_get,
++ (setter)PyIscsiChapAuthInfo_set,
++ "username", "username"},
++ {"password", (getter)PyIscsiChapAuthInfo_get,
++ (setter)PyIscsiChapAuthInfo_set,
++ "password", "password"},
++ {"reverse_username", (getter)PyIscsiChapAuthInfo_get,
++ (setter)PyIscsiChapAuthInfo_set,
++ "reverse_username", "reverse_username"},
++ {"reverse_password", (getter)PyIscsiChapAuthInfo_get,
++ (setter)PyIscsiChapAuthInfo_set,
++ "reverse_password", "reverse_password"},
++ {NULL}
++};
++
++PyTypeObject PyIscsiChapAuthInfo_Type = {
++ PyObject_HEAD_INIT(NULL)
++ .tp_name = "libiscsi.chapAuthInfo",
++ .tp_basicsize = sizeof (PyIscsiChapAuthInfo),
++ .tp_getset = PyIscsiChapAuthInfo_getseters,
++ .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_CHECKTYPES |
++ Py_TPFLAGS_BASETYPE,
++ .tp_compare = (cmpfunc)PyIscsiChapAuthInfo_compare,
++ .tp_init = PyIscsiChapAuthInfo_init,
++ .tp_str = PyIscsiChapAuthInfo_str,
++ .tp_new = PyType_GenericNew,
++ .tp_doc = "iscsi chap authentication information.",
++};
++
++/***************************** PyIscsiNode ********************************/
++
++typedef struct {
++ PyObject_HEAD
++
++ struct libiscsi_node node;
++} PyIscsiNode;
++
++static int PyIscsiNode_init(PyObject *self, PyObject *args, PyObject *kwds)
++{
++ PyIscsiNode *node = (PyIscsiNode *)self;
++ char *kwlist[] = {"name", "tpgt", "address", "port", NULL};
++ const char *name = NULL, *address = NULL;
++ int tpgt = -1, port = 3260;
++
++ if (!PyArg_ParseTupleAndKeywords(args, kwds, "s|isi:node.__init__",
++ kwlist, &name, &tpgt, &address, &port))
++ return -1;
++ if (address == NULL) {
++ PyErr_SetString(PyExc_ValueError, "address not set");
++ return -1;
++ }
++ if (check_string(name) || check_string(address))
++ return -1;
++
++ strcpy(node->node.name, name);
++ node->node.tpgt = tpgt;
++ strcpy(node->node.address, address);
++ node->node.port = port;
++
++ return 0;
++}
++
++static PyObject *PyIscsiNode_get(PyObject *self, void *data)
++{
++ PyIscsiNode *node = (PyIscsiNode *)self;
++ const char *attr = (const char *)data;
++
++ if (!strcmp(attr, "name")) {
++ return PyString_FromString(node->node.name);
++ } else if (!strcmp(attr, "tpgt")) {
++ return PyInt_FromLong(node->node.tpgt);
++ } else if (!strcmp(attr, "address")) {
++ return PyString_FromString(node->node.address);
++ } else if (!strcmp(attr, "port")) {
++ return PyInt_FromLong(node->node.port);
++ }
++ return NULL;
++}
++
++static int PyIscsiNode_set(PyObject *self, PyObject *value, void *data)
++{
++ PyIscsiNode *node = (PyIscsiNode *)self;
++ const char *attr = (const char *)data;
++ const char *str;
++ int i;
++
++ if (!strcmp(attr, "name")) {
++ if (!PyArg_Parse(value, "s", &str) || check_string(str))
++ return -1;
++ strcpy(node->node.name, str);
++ } else if (!strcmp(attr, "tpgt")) {
++ if (!PyArg_Parse(value, "i", &i))
++ return -1;
++ node->node.tpgt = i;
++ } else if (!strcmp(attr, "address")) {
++ if (!PyArg_Parse(value, "s", &str) || check_string(str))
++ return -1;
++ strcpy(node->node.address, str);
++ } else if (!strcmp(attr, "port")) {
++ if (!PyArg_Parse(value, "i", &i))
++ return -1;
++ node->node.port = i;
++ }
++
++ return 0;
++}
++
++static int PyIscsiNode_compare(PyIscsiNode *self, PyIscsiNode *other)
++{
++ int res;
++
++ res = strcmp(self->node.name, other->node.name);
++ if (res)
++ return res;
++
++ if (self->node.tpgt < other->node.tpgt)
++ return -1;
++ if (self->node.tpgt > other->node.tpgt)
++ return -1;
++
++ res = strcmp(self->node.address, other->node.address);
++ if (res)
++ return res;
++
++ if (self->node.port < other->node.port)
++ return -1;
++ if (self->node.port > other->node.port)
++ return -1;
++
++ return 0;
++}
++
++static PyObject *PyIscsiNode_str(PyObject *self)
++{
++ PyIscsiNode *node = (PyIscsiNode *)self;
++ char s[1024], tpgt[16] = "";
++
++ if (node->node.tpgt != -1)
++ sprintf(tpgt, ",%d", node->node.tpgt);
++
++ snprintf(s, sizeof(s), "%s:%d%s %s", node->node.address,
++ node->node.port, tpgt, node->node.name);
++
++ return PyString_FromString(s);
++}
++
++static PyObject *PyIscsiNode_login(PyObject *self)
++{
++ PyIscsiNode *node = (PyIscsiNode *)self;
++
++ if (libiscsi_node_login(context, &node->node)) {
++ PyErr_SetString(PyExc_IOError,
++ libiscsi_get_error_string(context));
++ return NULL;
++ }
++ Py_RETURN_NONE;
++}
++
++static PyObject *PyIscsiNode_logout(PyObject *self)
++{
++ PyIscsiNode *node = (PyIscsiNode *)self;
++
++ if (libiscsi_node_logout(context, &node->node)) {
++ PyErr_SetString(PyExc_IOError,
++ libiscsi_get_error_string(context));
++ return NULL;
++ }
++ Py_RETURN_NONE;
++}
++
++static PyObject *PyIscsiNode_setAuth(PyObject *self, PyObject *args,
++ PyObject *kwds)
++{
++ char *kwlist[] = {"authinfo", NULL};
++ PyIscsiNode *node = (PyIscsiNode *)self;
++ PyObject *arg;
++ const struct libiscsi_auth_info *authinfo = NULL;
++
++ if (!PyArg_ParseTupleAndKeywords(args, kwds, "O", kwlist, &arg))
++ return NULL;
++
++ if (arg == Py_None) {
++ authinfo = NULL;
++ } else if (PyObject_IsInstance(arg, (PyObject *)
++ &PyIscsiChapAuthInfo_Type)) {
++ PyIscsiChapAuthInfo *pyauthinfo = (PyIscsiChapAuthInfo *)arg;
++ authinfo = &pyauthinfo->info;
++ } else {
++ PyErr_SetString(PyExc_ValueError, "invalid authinfo type");
++ return NULL;
++ }
++
++ if (libiscsi_node_set_auth(context, &node->node, authinfo)) {
++ PyErr_SetString(PyExc_IOError,
++ libiscsi_get_error_string(context));
++ return NULL;
++ }
++ Py_RETURN_NONE;
++}
++
++static PyObject *PyIscsiNode_getAuth(PyObject *self)
++{
++ PyIscsiNode *node = (PyIscsiNode *)self;
++ PyIscsiChapAuthInfo *pyauthinfo;
++ struct libiscsi_auth_info authinfo;
++
++ if (libiscsi_node_get_auth(context, &node->node, &authinfo)) {
++ PyErr_SetString(PyExc_IOError,
++ libiscsi_get_error_string(context));
++ return NULL;
++ }
++
++ switch (authinfo.method) {
++ case libiscsi_auth_chap:
++ pyauthinfo = PyObject_New(PyIscsiChapAuthInfo,
++ &PyIscsiChapAuthInfo_Type);
++ if (!pyauthinfo)
++ return NULL;
++
++ pyauthinfo->info = authinfo;
++
++ return (PyObject *)pyauthinfo;
++
++ case libiscsi_auth_none:
++ default:
++ Py_RETURN_NONE;
++ }
++}
++
++static PyObject *PyIscsiNode_setParameter(PyObject *self, PyObject *args,
++ PyObject *kwds)
++{
++ char *kwlist[] = {"parameter", "value", NULL};
++ PyIscsiNode *node = (PyIscsiNode *)self;
++ const char *parameter, *value;
++
++ if (!PyArg_ParseTupleAndKeywords(args, kwds, "ss", kwlist,
++ ¶meter, &value))
++ return NULL;
++ if (check_string(parameter) || check_string(value))
++ return NULL;
++
++ if (libiscsi_node_set_parameter(context, &node->node, parameter,
++ value)) {
++ PyErr_SetString(PyExc_IOError,
++ libiscsi_get_error_string(context));
++ return NULL;
++ }
++ Py_RETURN_NONE;
++}
++
++static PyObject *PyIscsiNode_getParameter(PyObject *self, PyObject *args,
++ PyObject *kwds)
++{
++ char *kwlist[] = {"parameter", NULL};
++ PyIscsiNode *node = (PyIscsiNode *)self;
++ const char *parameter;
++ char value[LIBISCSI_VALUE_MAXLEN];
++
++ if (!PyArg_ParseTupleAndKeywords(args, kwds, "s", kwlist, ¶meter))
++ return NULL;
++ if (check_string(parameter))
++ return NULL;
++
++ if (libiscsi_node_get_parameter(context, &node->node, parameter,
++ value)) {
++ PyErr_SetString(PyExc_IOError,
++ libiscsi_get_error_string(context));
++ return NULL;
++ }
++ return Py_BuildValue("s", value);
++}
++
++static struct PyGetSetDef PyIscsiNode_getseters[] = {
++ {"name", (getter)PyIscsiNode_get, (setter)PyIscsiNode_set,
++ "name", "name"},
++ {"tpgt", (getter)PyIscsiNode_get, (setter)PyIscsiNode_set,
++ "tpgt", "tpgt"},
++ {"address", (getter)PyIscsiNode_get, (setter)PyIscsiNode_set,
++ "address", "address"},
++ {"port", (getter)PyIscsiNode_get, (setter)PyIscsiNode_set,
++ "port", "port"},
++ {NULL}
++};
++
++static struct PyMethodDef PyIscsiNode_methods[] = {
++ {"login", (PyCFunction) PyIscsiNode_login, METH_NOARGS,
++ "Log in to the node"},
++ {"logout", (PyCFunction) PyIscsiNode_logout, METH_NOARGS,
++ "Log out of the node"},
++ {"setAuth", (PyCFunction) PyIscsiNode_setAuth,
++ METH_VARARGS|METH_KEYWORDS,
++ "Set authentication information"},
++ {"getAuth", (PyCFunction) PyIscsiNode_getAuth, METH_NOARGS,
++ "Get authentication information"},
++ {"setParameter", (PyCFunction) PyIscsiNode_setParameter,
++ METH_VARARGS|METH_KEYWORDS,
++ "Set an iscsi node parameter"},
++ {"getParameter", (PyCFunction) PyIscsiNode_getParameter,
++ METH_VARARGS|METH_KEYWORDS,
++ "Get an iscsi node parameter"},
++ {NULL}
++};
++
++PyTypeObject PyIscsiNode_Type = {
++ PyObject_HEAD_INIT(NULL)
++ .tp_name = "libiscsi.node",
++ .tp_basicsize = sizeof (PyIscsiNode),
++ .tp_getset = PyIscsiNode_getseters,
++ .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_CHECKTYPES |
++ Py_TPFLAGS_BASETYPE,
++ .tp_methods = PyIscsiNode_methods,
++ .tp_compare = (cmpfunc)PyIscsiNode_compare,
++ .tp_init = PyIscsiNode_init,
++ .tp_str = PyIscsiNode_str,
++ .tp_new = PyType_GenericNew,
++ .tp_doc = "The iscsi node contains iscsi node information.",
++};
++
++/***************************************************************************/
++
++static PyObject *pylibiscsi_discover_sendtargets(PyObject *self,
++ PyObject *args, PyObject *kwds)
++{
++ char *kwlist[] = {"address", "port", "authinfo", NULL};
++ const char *address = NULL;
++ int i, nr_found, port = 3260;
++ PyObject *authinfo_arg = NULL;
++ const struct libiscsi_auth_info *authinfo = NULL;
++ struct libiscsi_node *found_nodes;
++ PyObject* found_node_list;
++
++ if (!PyArg_ParseTupleAndKeywords(args, kwds, "s|iO",
++ kwlist, &address, &port,
++ &authinfo_arg))
++ return NULL;
++
++ if (authinfo_arg) {
++ if (PyObject_IsInstance(authinfo_arg, (PyObject *)
++ &PyIscsiChapAuthInfo_Type)) {
++ PyIscsiChapAuthInfo *pyauthinfo =
++ (PyIscsiChapAuthInfo *)authinfo_arg;
++ authinfo = &pyauthinfo->info;
++ } else if (authinfo_arg != Py_None) {
++ PyErr_SetString(PyExc_ValueError,
++ "invalid authinfo type");
++ return NULL;
++ }
++ }
++
++ if (libiscsi_discover_sendtargets(context, address, port, authinfo,
++ &nr_found, &found_nodes)) {
++ PyErr_SetString(PyExc_IOError,
++ libiscsi_get_error_string(context));
++ return NULL;
++ }
++
++ if (nr_found == 0)
++ Py_RETURN_NONE;
++
++ found_node_list = PyList_New(nr_found);
++ if (!found_node_list)
++ return NULL;
++
++ for(i = 0; i < nr_found; i++) {
++ PyIscsiNode *pynode;
++
++ pynode = PyObject_New(PyIscsiNode, &PyIscsiNode_Type);
++ if (!pynode) {
++ /* This will deref already added nodes for us */
++ Py_DECREF(found_node_list);
++ return NULL;
++ }
++ pynode->node = found_nodes[i];
++ PyList_SET_ITEM(found_node_list, i, (PyObject *)pynode);
++ }
++
++ return found_node_list;
++}
++
++static PyObject *pylibiscsi_discover_firmware(PyObject *self)
++{
++ int i, nr_found;
++ struct libiscsi_node *found_nodes;
++ PyObject* found_node_list;
++
++ if (libiscsi_discover_firmware(context, &nr_found, &found_nodes)) {
++ PyErr_SetString(PyExc_IOError,
++ libiscsi_get_error_string(context));
++ return NULL;
++ }
++
++ if (nr_found == 0)
++ Py_RETURN_NONE;
++
++ found_node_list = PyList_New(nr_found);
++ if (!found_node_list)
++ return NULL;
++
++ for(i = 0; i < nr_found; i++) {
++ PyIscsiNode *pynode;
++
++ pynode = PyObject_New(PyIscsiNode, &PyIscsiNode_Type);
++ if (!pynode) {
++ /* This will deref already added nodes for us */
++ Py_DECREF(found_node_list);
++ return NULL;
++ }
++ pynode->node = found_nodes[i];
++ PyList_SET_ITEM(found_node_list, i, (PyObject *)pynode);
++ }
++
++ return found_node_list;
++}
++
++static PyObject *pylibiscsi_get_firmware_initiator_name(PyObject *self)
++{
++ char initiatorname[LIBISCSI_VALUE_MAXLEN];
++
++ if (libiscsi_get_firmware_initiator_name(initiatorname)) {
++ PyErr_SetString(PyExc_IOError,
++ libiscsi_get_error_string(context));
++ return NULL;
++ }
++
++ return PyString_FromString(initiatorname);
++}
++
++static PyMethodDef pylibiscsi_functions[] = {
++ { "discover_sendtargets",
++ (PyCFunction)pylibiscsi_discover_sendtargets,
++ METH_VARARGS|METH_KEYWORDS,
++ "Do sendtargets discovery and return a list of found nodes)"},
++ { "discover_firmware",
++ (PyCFunction)pylibiscsi_discover_firmware, METH_NOARGS,
++ "Do firmware discovery and return a list of found nodes)"},
++ { "get_firmware_initiator_name",
++ (PyCFunction)pylibiscsi_get_firmware_initiator_name,
++ METH_NOARGS,
++ "Get initator name (iqn) from firmware"},
++ {NULL, NULL}
++};
++
++PyMODINIT_FUNC initlibiscsi(void)
++{
++ PyObject *m;
++
++ if (!context) /* We may be called more then once */
++ context = libiscsi_init();
++ if (!context)
++ return;
++
++ if (PyType_Ready(&PyIscsiChapAuthInfo_Type) < 0)
++ return;
++
++ if (PyType_Ready(&PyIscsiNode_Type) < 0)
++ return;
++
++ m = Py_InitModule("libiscsi", pylibiscsi_functions);
++ Py_INCREF(&PyIscsiChapAuthInfo_Type);
++ PyModule_AddObject(m, "chapAuthInfo", (PyObject *) &PyIscsiChapAuthInfo_Type);
++ Py_INCREF(&PyIscsiNode_Type);
++ PyModule_AddObject(m, "node", (PyObject *) &PyIscsiNode_Type);
++}
+diff --git a/libiscsi/setup.py b/libiscsi/setup.py
+new file mode 100644
+index 0000000..bb4329b
+--- /dev/null
++++ b/libiscsi/setup.py
+@@ -0,0 +1,9 @@
++from distutils.core import setup, Extension
++
++module1 = Extension('libiscsimodule',
++ sources = ['pylibiscsi.c'],
++ libraries = ['iscsi'],
++ library_dirs = ['.'])
++
++setup (name = 'PyIscsi',version = '1.0',
++ description = 'libiscsi python bindings', ext_modules = [module1])
+diff --git a/libiscsi/tests/test_discovery_firmware.c b/libiscsi/tests/test_discovery_firmware.c
+new file mode 100644
+index 0000000..76e852a
+--- /dev/null
++++ b/libiscsi/tests/test_discovery_firmware.c
+@@ -0,0 +1,53 @@
++/*
++ * iSCSI Administration library
++ *
++ * Copyright (C) 2008-2009 Red Hat, Inc. All rights reserved.
++ * Copyright (C) 2008-2009 Hans de Goede <hdegoede(a)redhat.com>
++ * maintained by open-iscsi(a)googlegroups.com
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published
++ * by the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * General Public License for more details.
++ *
++ * See the file COPYING included with this distribution for more details.
++ */
++
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include "libiscsi.h"
++
++int main(void)
++{
++ struct libiscsi_node *found_nodes;
++ struct libiscsi_context *context;
++ int i, found, rc = 0;
++
++ context = libiscsi_init();
++ if (!context) {
++ fprintf(stderr, "Error initializing libiscsi\n");
++ return 1;
++ }
++
++ rc = libiscsi_discover_firmware(context, &found, &found_nodes);
++ if (rc)
++ fprintf(stderr, "Error discovering: %s\n",
++ libiscsi_get_error_string(context));
++
++ for (i = 0; i < found; i++) {
++ fprintf(stdout, "Found node: %s, tpgt: %d, portal: %s:%d\n",
++ found_nodes[i].name, found_nodes[i].tpgt,
++ found_nodes[i].address, found_nodes[i].port);
++ }
++
++ libiscsi_cleanup(context);
++ free (found_nodes);
++
++ return rc;
++}
+diff --git a/libiscsi/tests/test_discovery_sendtargets.c b/libiscsi/tests/test_discovery_sendtargets.c
+new file mode 100644
+index 0000000..1a3c12e
+--- /dev/null
++++ b/libiscsi/tests/test_discovery_sendtargets.c
+@@ -0,0 +1,60 @@
++/*
++ * iSCSI Administration library
++ *
++ * Copyright (C) 2008-2009 Red Hat, Inc. All rights reserved.
++ * Copyright (C) 2008-2009 Hans de Goede <hdegoede(a)redhat.com>
++ * maintained by open-iscsi(a)googlegroups.com
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published
++ * by the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * General Public License for more details.
++ *
++ * See the file COPYING included with this distribution for more details.
++ */
++
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include "libiscsi.h"
++
++int main(void)
++{
++ struct libiscsi_node *found_nodes;
++ struct libiscsi_context *context;
++ struct libiscsi_auth_info auth_info;
++ int i, found, rc = 0;
++
++ context = libiscsi_init();
++ if (!context) {
++ fprintf(stderr, "Error initializing libiscsi\n");
++ return 1;
++ }
++
++ memset(&auth_info, 0, sizeof(auth_info));
++ auth_info.method = libiscsi_auth_chap;
++ strcpy(auth_info.chap.username, "joe");
++ strcpy(auth_info.chap.password, "secret");
++
++ rc = libiscsi_discover_sendtargets(context, "127.0.0.1", 3260,
++ &auth_info, &found, &found_nodes);
++ if (rc)
++ fprintf(stderr, "Error discovering: %s\n",
++ libiscsi_get_error_string(context));
++
++ for (i = 0; i < found; i++) {
++ fprintf(stdout, "Found node: %s, tpgt: %d, portal: %s:%d\n",
++ found_nodes[i].name, found_nodes[i].tpgt,
++ found_nodes[i].address, found_nodes[i].port);
++ }
++
++ libiscsi_cleanup(context);
++ free (found_nodes);
++
++ return rc;
++}
+diff --git a/libiscsi/tests/test_get_auth.c b/libiscsi/tests/test_get_auth.c
+new file mode 100644
+index 0000000..5e234da
+--- /dev/null
++++ b/libiscsi/tests/test_get_auth.c
+@@ -0,0 +1,70 @@
++/*
++ * iSCSI Administration library
++ *
++ * Copyright (C) 2008-2009 Red Hat, Inc. All rights reserved.
++ * Copyright (C) 2008-2009 Hans de Goede <hdegoede(a)redhat.com>
++ * maintained by open-iscsi(a)googlegroups.com
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published
++ * by the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * General Public License for more details.
++ *
++ * See the file COPYING included with this distribution for more details.
++ */
++
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include "libiscsi.h"
++
++int main(void)
++{
++ struct libiscsi_node node;
++ struct libiscsi_context *context;
++ struct libiscsi_auth_info auth_info;
++ int rc = 0;
++
++ snprintf(node.name, LIBISCSI_VALUE_MAXLEN, "%s",
++ "iqn.2009-01.com.example:testdisk");
++ node.tpgt = 1;
++ snprintf(node.address, NI_MAXHOST, "%s", "127.0.0.1");
++ node.port = 3260;
++
++ context = libiscsi_init();
++ if (!context) {
++ fprintf(stderr, "Error initializing libiscsi\n");
++ return 1;
++ }
++
++ rc = libiscsi_node_get_auth(context, &node, &auth_info);
++ if (rc) {
++ fprintf(stderr, "Error setting authinfo: %s\n",
++ libiscsi_get_error_string(context));
++ goto leave;
++ }
++
++ switch (auth_info.method) {
++ case libiscsi_auth_none:
++ printf("Method: \"None\"\n");
++ break;
++ case libiscsi_auth_chap:
++ printf("Method: \"CHAP\"\n");
++ printf("User: \"%s\"\n", auth_info.chap.username);
++ printf("Pass: \"%s\"\n", auth_info.chap.password);
++ printf("RevUser: \"%s\"\n",
++ auth_info.chap.reverse_username);
++ printf("RevPass: \"%s\"\n",
++ auth_info.chap.reverse_password);
++ break;
++ }
++leave:
++ libiscsi_cleanup(context);
++
++ return rc;
++}
+diff --git a/libiscsi/tests/test_get_initiator_name.c b/libiscsi/tests/test_get_initiator_name.c
+new file mode 100644
+index 0000000..997c053
+--- /dev/null
++++ b/libiscsi/tests/test_get_initiator_name.c
+@@ -0,0 +1,38 @@
++/*
++ * iSCSI Administration library
++ *
++ * Copyright (C) 2008-2009 Red Hat, Inc. All rights reserved.
++ * Copyright (C) 2008-2009 Hans de Goede <hdegoede(a)redhat.com>
++ * maintained by open-iscsi(a)googlegroups.com
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published
++ * by the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * General Public License for more details.
++ *
++ * See the file COPYING included with this distribution for more details.
++ */
++
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include "libiscsi.h"
++
++int main(void)
++{
++ char initiatorname[LIBISCSI_VALUE_MAXLEN];
++
++ if (libiscsi_get_firmware_initiator_name(initiatorname)) {
++ fprintf(stderr, "No iscsi boot firmware found\n");
++ return 1;
++ }
++
++ printf("iqn:\t%s\n", initiatorname);
++
++ return 0;
++}
+diff --git a/libiscsi/tests/test_get_network_config.c b/libiscsi/tests/test_get_network_config.c
+new file mode 100644
+index 0000000..2dedd61
+--- /dev/null
++++ b/libiscsi/tests/test_get_network_config.c
+@@ -0,0 +1,45 @@
++/*
++ * iSCSI Administration library
++ *
++ * Copyright (C) 2008-2009 Red Hat, Inc. All rights reserved.
++ * Copyright (C) 2008-2009 Hans de Goede <hdegoede(a)redhat.com>
++ * maintained by open-iscsi(a)googlegroups.com
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published
++ * by the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * General Public License for more details.
++ *
++ * See the file COPYING included with this distribution for more details.
++ */
++
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include "libiscsi.h"
++
++int main(void)
++{
++ struct libiscsi_network_config config;
++
++ if (libiscsi_get_firmware_network_config(&config)) {
++ fprintf(stderr, "No iscsi boot firmware found\n");
++ return 1;
++ }
++
++ printf("dhcp:\t%d\n", config.dhcp);
++ printf("iface:\t%s\n", config.iface_name);
++ printf("mac:\t%s\n", config.mac_address);
++ printf("ipaddr:\t%s\n", config.ip_address);
++ printf("mask:\t%s\n", config.netmask);
++ printf("gate:\t%s\n", config.gateway);
++ printf("dns1:\t%s\n", config.primary_dns);
++ printf("dns2:\t%s\n", config.secondary_dns);
++
++ return 0;
++}
+diff --git a/libiscsi/tests/test_login.c b/libiscsi/tests/test_login.c
+new file mode 100644
+index 0000000..3eb70d6
+--- /dev/null
++++ b/libiscsi/tests/test_login.c
+@@ -0,0 +1,52 @@
++/*
++ * iSCSI Administration library
++ *
++ * Copyright (C) 2008-2009 Red Hat, Inc. All rights reserved.
++ * Copyright (C) 2008-2009 Hans de Goede <hdegoede(a)redhat.com>
++ * maintained by open-iscsi(a)googlegroups.com
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published
++ * by the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * General Public License for more details.
++ *
++ * See the file COPYING included with this distribution for more details.
++ */
++
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include "libiscsi.h"
++
++int main(void)
++{
++ struct libiscsi_node node;
++ struct libiscsi_context *context;
++ int rc = 0;
++
++ snprintf(node.name, LIBISCSI_VALUE_MAXLEN, "%s",
++ "iqn.2009-01.com.example:testdisk");
++ node.tpgt = 1;
++ snprintf(node.address, NI_MAXHOST, "%s", "127.0.0.1");
++ node.port = 3260;
++
++ context = libiscsi_init();
++ if (!context) {
++ fprintf(stderr, "Error initializing libiscsi\n");
++ return 1;
++ }
++
++ rc = libiscsi_node_login(context, &node);
++ if (rc)
++ fprintf(stderr, "Error logging in: %s\n",
++ libiscsi_get_error_string(context));
++
++ libiscsi_cleanup(context);
++
++ return rc;
++}
+diff --git a/libiscsi/tests/test_logout.c b/libiscsi/tests/test_logout.c
+new file mode 100644
+index 0000000..b734dca
+--- /dev/null
++++ b/libiscsi/tests/test_logout.c
+@@ -0,0 +1,51 @@
++/*
++ * iSCSI Administration library
++ *
++ * Copyright (C) 2008-2009 Red Hat, Inc. All rights reserved.
++ * Copyright (C) 2008-2009 Hans de Goede <hdegoede(a)redhat.com>
++ * maintained by open-iscsi(a)googlegroups.com
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published
++ * by the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * General Public License for more details.
++ *
++ * See the file COPYING included with this distribution for more details.
++ */
++
++#include <stdio.h>
++#include <stdlib.h>
++#include "libiscsi.h"
++
++int main(void)
++{
++ struct libiscsi_node node;
++ struct libiscsi_context *context;
++ int rc = 0;
++
++ snprintf(node.name, LIBISCSI_VALUE_MAXLEN, "%s",
++ "iqn.2009-01.com.example:testdisk");
++ node.tpgt = 1;
++ snprintf(node.address, NI_MAXHOST, "%s", "127.0.0.1");
++ node.port = 3260;
++
++ context = libiscsi_init();
++ if (!context) {
++ fprintf(stderr, "Error initializing libiscsi\n");
++ return 1;
++ }
++
++ rc = libiscsi_node_logout(context, &node);
++ if (rc)
++ fprintf(stderr, "Error logging out: %s\n",
++ libiscsi_get_error_string(context));
++
++ libiscsi_cleanup(context);
++
++ return rc;
++}
+diff --git a/libiscsi/tests/test_params.c b/libiscsi/tests/test_params.c
+new file mode 100644
+index 0000000..d3223be
+--- /dev/null
++++ b/libiscsi/tests/test_params.c
+@@ -0,0 +1,103 @@
++/*
++ * iSCSI Administration library
++ *
++ * Copyright (C) 2008-2009 Red Hat, Inc. All rights reserved.
++ * Copyright (C) 2008-2009 Hans de Goede <hdegoede(a)redhat.com>
++ * maintained by open-iscsi(a)googlegroups.com
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published
++ * by the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * General Public License for more details.
++ *
++ * See the file COPYING included with this distribution for more details.
++ */
++
++#include <stdio.h>
++#include <stdlib.h>
++#include <errno.h>
++#include <string.h>
++#include "libiscsi.h"
++
++int main(void)
++{
++ struct libiscsi_node node;
++ struct libiscsi_context *context;
++ char orig_value[LIBISCSI_VALUE_MAXLEN], value[LIBISCSI_VALUE_MAXLEN];
++ int rc = 0;
++
++ snprintf(node.name, LIBISCSI_VALUE_MAXLEN, "%s",
++ "iqn.2009-01.com.example:testdisk");
++ node.tpgt = 1;
++ snprintf(node.address, NI_MAXHOST, "%s", "127.0.0.1");
++ node.port = 3260;
++
++ context = libiscsi_init();
++ if (!context) {
++ fprintf(stderr, "Error initializing libiscsi\n");
++ return 1;
++ }
++
++ rc = libiscsi_node_get_parameter(context, &node, "node.startup",
++ orig_value);
++ if (rc) {
++ fprintf(stderr, "Error getting original value: %s\n",
++ libiscsi_get_error_string(context));
++ goto leave;
++ }
++
++ rc = libiscsi_node_set_parameter(context, &node, "node.startup",
++ "automatic");
++ if (rc) {
++ fprintf(stderr, "Error setting node startup param: %s\n",
++ libiscsi_get_error_string(context));
++ goto leave;
++ }
++
++ rc = libiscsi_node_get_parameter(context, &node, "node.startup",
++ value);
++ if (rc) {
++ fprintf(stderr, "Error getting node startup param: %s\n",
++ libiscsi_get_error_string(context));
++ goto leave;
++ }
++
++ if (strcmp(value, "automatic")) {
++ fprintf(stderr, "Error set and get values do not match!\n");
++ rc = EIO;
++ goto leave;
++ }
++
++ rc = libiscsi_node_set_parameter(context, &node, "node.startup",
++ orig_value);
++ if (rc) {
++ fprintf(stderr, "Error setting original value: %s\n",
++ libiscsi_get_error_string(context));
++ goto leave;
++ }
++
++ rc = libiscsi_node_get_parameter(context, &node, "node.startup",
++ value);
++ if (rc) {
++ fprintf(stderr, "Error re-getting original value: %s\n",
++ libiscsi_get_error_string(context));
++ goto leave;
++ }
++
++ if (strcmp(value, orig_value)) {
++ fprintf(stderr,
++ "Error set and get original values do not match!\n");
++ rc = EIO;
++ goto leave;
++ }
++
++leave:
++ libiscsi_cleanup(context);
++
++ return rc;
++}
+diff --git a/libiscsi/tests/test_set_auth.c b/libiscsi/tests/test_set_auth.c
+new file mode 100644
+index 0000000..a21f888
+--- /dev/null
++++ b/libiscsi/tests/test_set_auth.c
+@@ -0,0 +1,58 @@
++/*
++ * iSCSI Administration library
++ *
++ * Copyright (C) 2008-2009 Red Hat, Inc. All rights reserved.
++ * Copyright (C) 2008-2009 Hans de Goede <hdegoede(a)redhat.com>
++ * maintained by open-iscsi(a)googlegroups.com
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published
++ * by the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * General Public License for more details.
++ *
++ * See the file COPYING included with this distribution for more details.
++ */
++
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include "libiscsi.h"
++
++int main(void)
++{
++ struct libiscsi_node node;
++ struct libiscsi_context *context;
++ struct libiscsi_auth_info auth_info;
++ int rc = 0;
++
++ snprintf(node.name, LIBISCSI_VALUE_MAXLEN, "%s",
++ "iqn.2009-01.com.example:testdisk");
++ node.tpgt = 1;
++ snprintf(node.address, NI_MAXHOST, "%s", "127.0.0.1");
++ node.port = 3260;
++
++ memset(&auth_info, 0, sizeof(auth_info));
++ auth_info.method = libiscsi_auth_chap;
++ strcpy(auth_info.chap.username, "joe");
++ strcpy(auth_info.chap.password, "secret");
++
++ context = libiscsi_init();
++ if (!context) {
++ fprintf(stderr, "Error initializing libiscsi\n");
++ return 1;
++ }
++
++ rc = libiscsi_node_set_auth(context, &node, &auth_info);
++ if (rc)
++ fprintf(stderr, "Error setting authinfo: %s\n",
++ libiscsi_get_error_string(context));
++
++ libiscsi_cleanup(context);
++
++ return rc;
++}
+diff --git a/usr/discovery.c b/usr/discovery.c
+index 381f825..2233de7 100644
+--- a/usr/discovery.c
++++ b/usr/discovery.c
+@@ -36,6 +36,7 @@
+ #include "types.h"
+ #include "iscsi_proto.h"
+ #include "initiator.h"
++#include "config.h"
+ #include "log.h"
+ #include "idbm.h"
+ #include "iscsi_settings.h"
+diff --git a/usr/iscsi_ipc.h b/usr/iscsi_ipc.h
+index 74ef948..713914f 100644
+--- a/usr/iscsi_ipc.h
++++ b/usr/iscsi_ipc.h
+@@ -111,4 +111,6 @@ struct iscsi_ipc {
+ int (*recv_pdu_end) (struct iscsi_conn *conn);
+ };
+
++struct iscsi_ipc *ipc;
++
+ #endif /* ISCSI_IPC_H */
diff --git a/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-disable-isns-for-lib.patch b/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-disable-isns-for-lib.patch
new file mode 100644
index 0000000..7f5acc5
--- /dev/null
+++ b/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-disable-isns-for-lib.patch
@@ -0,0 +1,74 @@
+diff --git a/libiscsi/Makefile b/libiscsi/Makefile
+index 4aeb44f..a91d6b8 100644
+--- a/libiscsi/Makefile
++++ b/libiscsi/Makefile
+@@ -3,7 +3,7 @@
+ OSNAME=$(shell uname -s)
+ OPTFLAGS ?= -O2 -g
+ WARNFLAGS ?= -Wall -Wstrict-prototypes
+-CFLAGS = $(OPTFLAGS) $(WARNFLAGS) -I../include -I../usr -I../utils/open-isns \
++CFLAGS = $(OPTFLAGS) $(WARNFLAGS) -I../include -I../usr \
+ -D$(OSNAME) -fPIC -D_GNU_SOURCE -fvisibility=hidden
+ LIB = libiscsi.so.0
+ TESTS = tests/test_discovery_sendtargets tests/test_discovery_firmware
+@@ -43,11 +43,10 @@ fw-objs/%.o: ../utils/fwparam_ibft/%.c
+ $(CC) $(CFLAGS) -c $< -o $@
+
+ $(LIB): $(COMMON_OBJS) $(FW_OBJS) $(USR_OBJS) libiscsi.o
+- $(CC) $(CFLAGS) -L../utils/open-isns -lisns -shared -Wl,-soname,$(LIB) $^ -o $@
++ $(CC) $(CFLAGS) -shared -Wl,-soname,$(LIB) $^ -o $@
+ ln -s -f $(LIB) libiscsi.so
+
+ $(TESTS): $(FW_OBJS) $(COMMON_OBJS) $(USR_OBJS) $(LIB)
+- $(CC) $(CFLAGS) -L../utils/open-isns -lisns -c $< -o $@
+
+ html: libiscsi.h libiscsi.doxy
+ doxygen libiscsi.doxy
+diff --git a/usr/Makefile b/usr/Makefile
+index 8e505bf..13a60f9 100644
+--- a/usr/Makefile
++++ b/usr/Makefile
+@@ -31,7 +31,7 @@ endif
+ OPTFLAGS ?= -O2 -g
+ WARNFLAGS ?= -Wall -Wstrict-prototypes
+ CFLAGS += $(OPTFLAGS) $(WARNFLAGS) -I../include -I. -I../utils/open-isns \
+- -D$(OSNAME) $(IPC_CFLAGS)
++ -D$(OSNAME) $(IPC_CFLAGS) -DISNS_ENABLE
+ PROGRAMS = iscsid iscsiadm iscsistart
+
+ # libc compat files
+diff --git a/usr/discovery.c b/usr/discovery.c
+index 2233de7..02c6f25 100644
+--- a/usr/discovery.c
++++ b/usr/discovery.c
+@@ -45,9 +45,11 @@
+ #include "iscsid_req.h"
+ #include "iscsi_util.h"
+ /* libisns includes */
++#ifdef ISNS_ENABLE
+ #include "isns.h"
+ #include "paths.h"
+ #include "message.h"
++#endif
+
+ #ifdef SLP_ENABLE
+ #include "iscsi-slp-discovery.h"
+@@ -94,6 +96,7 @@ static int request_initiator_name(void)
+ return 0;
+ }
+
++#ifdef ISNS_ENABLE
+ void discovery_isns_free_servername(void)
+ {
+ if (isns_config.ic_server_name)
+@@ -367,6 +370,7 @@ retry:
+ discovery_isns_free_servername();
+ return rc;
+ }
++#endif
+
+ int discovery_fw(void *data, struct iface_rec *iface,
+ struct list_head *rec_list)
+--
+1.6.6.1
+
diff --git a/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-dont-use-static.patch b/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-dont-use-static.patch
new file mode 100644
index 0000000..763d784
--- /dev/null
+++ b/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-dont-use-static.patch
@@ -0,0 +1,12 @@
+diff -aup open-iscsi-2.0-872-rc1-bnx2i/usr/Makefile open-iscsi-2.0-872-rc1-bnx2i.work/usr/Makefile
+--- open-iscsi-2.0-872-rc1-bnx2i/usr/Makefile 2010-06-18 18:04:51.000000000 -0500
++++ open-iscsi-2.0-872-rc1-bnx2i.work/usr/Makefile 2010-06-18 18:13:33.000000000 -0500
+@@ -60,7 +60,7 @@ iscsiadm: $(ISCSI_LIB_SRCS) $(DISCOVERY_
+
+ iscsistart: $(IPC_OBJ) $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \
+ iscsistart.o statics.o
+- $(CC) $(CFLAGS) -static $^ -o $@
++ $(CC) $(CFLAGS) $^ -o $@
+ clean:
+ rm -f *.o $(PROGRAMS) .depend $(LIBSYS)
+
diff --git a/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-fix-lib-sysfs-init.patch b/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-fix-lib-sysfs-init.patch
new file mode 100644
index 0000000..7b67f66
--- /dev/null
+++ b/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-fix-lib-sysfs-init.patch
@@ -0,0 +1,49 @@
+diff -aurp open-iscsi-2.0-872-rc1-bnx2i/libiscsi/libiscsi.c open-iscsi-2.0-872-rc1-bnx2i.work/libiscsi/libiscsi.c
+--- open-iscsi-2.0-872-rc1-bnx2i/libiscsi/libiscsi.c 2010-05-18 17:57:59.000000000 -0500
++++ open-iscsi-2.0-872-rc1-bnx2i.work/libiscsi/libiscsi.c 2010-05-18 17:58:43.000000000 -0500
+@@ -40,6 +40,9 @@
+
+ #define CHECK(a) { context->error_str[0] = 0; rc = a; if (rc) goto leave; }
+
++/* UGLY, not thread safe :( */
++static int sysfs_initialized = 0;
++
+ struct libiscsi_context {
+ char error_str[256];
+ /* For get_parameter_helper() */
+@@ -66,7 +69,10 @@ struct libiscsi_context *libiscsi_init(v
+ return NULL;
+
+ log_init("libiscsi", 1024, libiscsi_log, context);
+- sysfs_init();
++ if (!sysfs_initialized) {
++ sysfs_init();
++ sysfs_initialized = 1;
++ }
+ increase_max_files();
+ if (idbm_init(NULL)) {
+ sysfs_cleanup();
+@@ -529,6 +535,11 @@ int libiscsi_get_firmware_network_config
+ {
+ struct boot_context fw_entry;
+
++ if (!sysfs_initialized) {
++ sysfs_init();
++ sysfs_initialized = 1;
++ }
++
+ memset(config, 0, sizeof *config);
+ memset(&fw_entry, 0, sizeof fw_entry);
+ if (fw_get_entry(&fw_entry))
+@@ -551,6 +562,11 @@ int libiscsi_get_firmware_initiator_name
+ {
+ struct boot_context fw_entry;
+
++ if (!sysfs_initialized) {
++ sysfs_init();
++ sysfs_initialized = 1;
++ }
++
+ memset(initiatorname, 0, LIBISCSI_VALUE_MAXLEN);
+ memset(&fw_entry, 0, sizeof fw_entry);
+ if (fw_get_entry(&fw_entry))
diff --git a/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-only-root-use.patch b/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-only-root-use.patch
new file mode 100644
index 0000000..b442ba0
--- /dev/null
+++ b/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-only-root-use.patch
@@ -0,0 +1,16 @@
+diff -up open-iscsi-2.0-870-rc1/usr/iscsiadm.c.error open-iscsi-2.0-870-rc1/usr/iscsiadm.c
+--- open-iscsi-2.0-870-rc1/usr/iscsiadm.c.error 2008-09-30 10:20:15.000000000 +0200
++++ open-iscsi-2.0-870-rc1/usr/iscsiadm.c 2008-09-30 10:20:15.000000000 +0200
+@@ -2141,6 +2141,12 @@ main(int argc, char **argv)
+ if (mode < 0)
+ usage(0);
+
++ if (getuid()) {
++ log_error("Must be run as root.");
++ rc = -1;
++ goto free_ifaces;
++ }
++
+ if (mode == MODE_FW) {
+ if ((rc = verify_mode_params(argc, argv, "ml", 0))) {
+ log_error("fw mode: option '-%c' is not "
diff --git a/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-uip-mgmt.patch b/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-uip-mgmt.patch
new file mode 100644
index 0000000..cab3690
--- /dev/null
+++ b/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-uip-mgmt.patch
@@ -0,0 +1,385 @@
+diff --git a/usr/Makefile b/usr/Makefile
+index e9d6bd1..8e505bf 100644
+--- a/usr/Makefile
++++ b/usr/Makefile
+@@ -42,7 +42,7 @@ ISCSI_LIB_SRCS = iscsi_util.o io.o auth.o login.o log.o md5.o sha1.o iface.o \
+ iscsid_req.o $(SYSDEPS_SRCS)
+ # core initiator files
+ INITIATOR_SRCS = initiator.o scsi.o actor.o event_poll.o mgmt_ipc.o \
+- transport.o cxgb3i.o be2iscsi.o
++ transport.o cxgb3i.o be2iscsi.o uip_mgmt_ipc.o
+ # fw boot files
+ FW_BOOT_SRCS = $(wildcard ../utils/fwparam_ibft/*.o)
+
+diff --git a/usr/initiator.c b/usr/initiator.c
+index 1c9d8b6..8f7a383 100644
+--- a/usr/initiator.c
++++ b/usr/initiator.c
+@@ -45,6 +45,7 @@
+ #include "iscsi_sysfs.h"
+ #include "iscsi_settings.h"
+ #include "iface.h"
++#include "host.h"
+ #include "sysdeps.h"
+
+ #define ISCSI_CONN_ERR_REOPEN_DELAY 3
+@@ -743,6 +744,38 @@ static int iscsi_conn_connect(struct iscsi_conn *conn, queue_task_t *qtask)
+ return 0;
+ }
+
++static int __set_net_config(struct iscsi_transport *t,
++ iscsi_session_t *session,
++ struct iface_rec *iface)
++{
++ if (t->template->set_net_config) {
++ /* uip needs the netdev name */
++ struct host_info hinfo;
++ int hostno, rc;
++
++ /* this assumes that the netdev or hw address is going to be
++ set */
++ hostno = iscsi_sysfs_get_host_no_from_hwinfo(iface, &rc);
++ if (rc) {
++ log_debug(4, "Couldn't get host no.\n");
++ return rc;
++ }
++
++ /* uip needs the netdev name */
++ if (!strlen(iface->netdev)) {
++ memset(&hinfo, 0, sizeof(hinfo));
++ hinfo.host_no = hostno;
++ iscsi_sysfs_get_hostinfo_by_host_no(&hinfo);
++ strcpy(iface->netdev, hinfo.iface.netdev);
++ }
++
++ return t->template->set_net_config(t, iface, session);
++ }
++
++ return 0;
++}
++
++
+ static void
+ __session_conn_reopen(iscsi_conn_t *conn, queue_task_t *qtask, int do_stop,
+ int redirected)
+@@ -784,6 +817,11 @@ __session_conn_reopen(iscsi_conn_t *conn, queue_task_t *qtask, int do_stop,
+ if (!redirected)
+ session->reopen_cnt++;
+
++ /* uIP will needs to be re-triggered on the connection re-open */
++ if (__set_net_config(conn->session->t, conn->session,
++ &conn->session->nrec.iface) != 0)
++ goto queue_reopen;
++
+ if (iscsi_conn_connect(conn, qtask)) {
+ delay = ISCSI_CONN_ERR_REOPEN_DELAY;
+ goto queue_reopen;
+@@ -2130,6 +2168,10 @@ static int iface_set_param(struct iscsi_transport *t, struct iface_rec *iface,
+ return EINVAL;
+ }
+
++ rc = __set_net_config(t, session, iface);
++ if (rc != 0)
++ return rc;
++
+ rc = __iscsi_host_set_param(t, session->hostno,
+ ISCSI_HOST_PARAM_IPADDRESS,
+ iface->ipaddress, ISCSI_STRING);
+diff --git a/usr/iscsid_req.c b/usr/iscsid_req.c
+index 5280a0a..6eb8b1d 100644
+--- a/usr/iscsid_req.c
++++ b/usr/iscsid_req.c
+@@ -22,6 +22,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <errno.h>
++#include <fcntl.h>
+ #include <sys/un.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+@@ -31,6 +32,7 @@
+ #include "mgmt_ipc.h"
+ #include "iscsi_util.h"
+ #include "config.h"
++#include "uip_mgmt_ipc.h"
+
+ static void iscsid_startup(void)
+ {
+@@ -51,7 +53,8 @@ static void iscsid_startup(void)
+
+ #define MAXSLEEP 128
+
+-static mgmt_ipc_err_e iscsid_connect(int *fd, int start_iscsid)
++static mgmt_ipc_err_e ipc_connect(int *fd, char *unix_sock_name,
++ int start_iscsid)
+ {
+ int nsec;
+ struct sockaddr_un addr;
+@@ -64,8 +67,8 @@ static mgmt_ipc_err_e iscsid_connect(int *fd, int start_iscsid)
+
+ memset(&addr, 0, sizeof(addr));
+ addr.sun_family = AF_LOCAL;
+- memcpy((char *) &addr.sun_path + 1, ISCSIADM_NAMESPACE,
+- strlen(ISCSIADM_NAMESPACE));
++ memcpy((char *) &addr.sun_path + 1, unix_sock_name,
++ strlen(unix_sock_name));
+ /*
+ * Trying to connect with exponential backoff
+ */
+@@ -93,6 +96,11 @@ static mgmt_ipc_err_e iscsid_connect(int *fd, int start_iscsid)
+ return MGMT_IPC_ERR_ISCSID_NOTCONN;
+ }
+
++static mgmt_ipc_err_e iscsid_connect(int *fd, int start_iscsid)
++{
++ return ipc_connect(fd, ISCSIADM_NAMESPACE, start_iscsid);
++}
++
+ mgmt_ipc_err_e iscsid_request(int *fd, iscsiadm_req_t *req, int start_iscsid)
+ {
+ int err;
+@@ -190,6 +198,72 @@ int iscsid_req_by_sid(iscsiadm_cmd_e cmd, int sid)
+ return iscsid_req_wait(cmd, fd);
+ }
+
++static mgmt_ipc_err_e uip_connect(int *fd)
++{
++ return ipc_connect(fd, ISCSID_UIP_NAMESPACE, 0);
++}
++
++int uip_broadcast(void *buf, size_t buf_len)
++{
++ int err;
++ int fd;
++ iscsid_uip_rsp_t rsp;
++ int flags;
++ int count;
++
++ err = uip_connect(&fd);
++ if (err) {
++ log_warning("uIP daemon is not up");
++ return err;
++ }
++
++ /* Send the data to uIP */
++ if ((err = write(fd, buf, buf_len)) != buf_len) {
++ log_error("got write error (%d/%d), daemon died?",
++ err, errno);
++ close(fd);
++ return -EIO;
++ }
++
++ /* Set the socket to a non-blocking read, this way if there are
++ * problems waiting for uIP, iscsid can bailout early */
++ flags = fcntl(fd, F_GETFL, 0);
++ if (flags == -1)
++ flags = 0;
++ err = fcntl(fd, F_SETFL, flags | O_NONBLOCK);
++ if(err != 0) {
++ log_error("could not set uip broadcast to non-blocking: %d",
++ errno);
++ close(fd);
++ return -EIO;
++ }
++
++#define MAX_UIP_BROADCAST_READ_TRIES 3
++ for(count = 0; count < MAX_UIP_BROADCAST_READ_TRIES; count++) {
++ /* Wait for the response */
++ err = read(fd, &rsp, sizeof(rsp));
++ if (err == sizeof(rsp)) {
++ log_debug(3, "Broadcasted to uIP with length: %ld\n",
++ buf_len);
++ break;
++ } else if((err == -1) && (errno == EAGAIN)) {
++ usleep(250000);
++ continue;
++ } else {
++ log_error("Could not read response (%d/%d), daemon died?",
++ err, errno);
++ break;
++ }
++ }
++
++ if(count == MAX_UIP_BROADCAST_READ_TRIES)
++ log_error("Could not broadcast to uIP");
++
++ close(fd);
++
++ return 0;
++}
++
+ void iscsid_handle_error(mgmt_ipc_err_e err)
+ {
+ static char *err_msgs[] = {
+diff --git a/usr/iscsid_req.h b/usr/iscsid_req.h
+index 3bba2f4..e2cf1c3 100644
+--- a/usr/iscsid_req.h
++++ b/usr/iscsid_req.h
+@@ -34,4 +34,6 @@ extern int iscsid_req_by_rec(int cmd, struct node_rec *rec);
+ extern int iscsid_req_by_sid_async(int cmd, int sid, int *fd);
+ extern int iscsid_req_by_sid(int cmd, int sid);
+
++extern int uip_broadcast(void *buf, size_t buf_len);
++
+ #endif
+diff --git a/usr/transport.c b/usr/transport.c
+index c0789bb..aa0395c 100644
+--- a/usr/transport.c
++++ b/usr/transport.c
+@@ -25,6 +25,7 @@
+ #include "log.h"
+ #include "iscsi_util.h"
+ #include "iscsi_sysfs.h"
++#include "uip_mgmt_ipc.h"
+ #include "cxgb3i.h"
+ #include "be2iscsi.h"
+
+@@ -58,6 +59,7 @@ struct iscsi_transport_template bnx2i = {
+ .ep_connect = ktransport_ep_connect,
+ .ep_poll = ktransport_ep_poll,
+ .ep_disconnect = ktransport_ep_disconnect,
++ .set_net_config = uip_broadcast_params,
+ };
+
+ struct iscsi_transport_template be2iscsi = {
+diff --git a/usr/transport.h b/usr/transport.h
+index 5ceedb3..2ec903c 100644
+--- a/usr/transport.h
++++ b/usr/transport.h
+@@ -35,6 +35,9 @@ struct iscsi_transport_template {
+ int (*ep_poll) (struct iscsi_conn *conn, int timeout_ms);
+ void (*ep_disconnect) (struct iscsi_conn *conn);
+ void (*create_conn) (struct iscsi_conn *conn);
++ int (*set_net_config) (struct iscsi_transport *t,
++ struct iface_rec *iface,
++ struct iscsi_session *session);
+ };
+
+ /* represents data path provider */
+diff --git a/usr/uip_mgmt_ipc.c b/usr/uip_mgmt_ipc.c
+new file mode 100644
+index 0000000..73b1632
+--- /dev/null
++++ b/usr/uip_mgmt_ipc.c
+@@ -0,0 +1,41 @@
++/*
++ * uIP iSCSI Daemon/Admin Management IPC
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published
++ * by the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * General Public License for more details.
++ *
++ * See the file COPYING included with this distribution for more details.
++ */
++
++#include <string.h>
++
++#include "log.h"
++#include "uip_mgmt_ipc.h"
++#include "iscsid_req.h"
++
++int uip_broadcast_params(struct iscsi_transport *t,
++ struct iface_rec *iface,
++ struct iscsi_session *session)
++{
++ struct iscsid_uip_broadcast broadcast;
++
++ log_debug(3, "broadcasting to uip\n");
++
++ memset(&broadcast, 0, sizeof(broadcast));
++
++ broadcast.header.command = ISCSID_UIP_IPC_GET_IFACE;
++ broadcast.header.payload_len = sizeof(*iface);
++
++ memcpy(&broadcast.u.iface_rec, iface, sizeof(*iface));
++
++ return uip_broadcast(&broadcast,
++ sizeof(iscsid_uip_broadcast_header_t) +
++ sizeof(*iface));
++}
+diff --git a/usr/uip_mgmt_ipc.h b/usr/uip_mgmt_ipc.h
+new file mode 100644
+index 0000000..dd49c0b
+--- /dev/null
++++ b/usr/uip_mgmt_ipc.h
+@@ -0,0 +1,71 @@
++/*
++ * uIP iSCSI Daemon/Admin Management IPC
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published
++ * by the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * General Public License for more details.
++ *
++ * See the file COPYING included with this distribution for more details.
++ */
++#ifndef UIP_MGMT_IPC_H
++#define UIP_MGMT_IPC_H
++
++#include "types.h"
++#include "iscsi_if.h"
++#include "config.h"
++#include "mgmt_ipc.h"
++
++#include "initiator.h"
++#include "transport.h"
++
++#define ISCSID_UIP_NAMESPACE "ISCSID_UIP_ABSTRACT_NAMESPACE"
++
++typedef enum iscsid_uip_cmd {
++ ISCSID_UIP_IPC_UNKNOWN = 0,
++ ISCSID_UIP_IPC_GET_IFACE = 1,
++
++ __ISCSID_UIP_IPC_MAX_COMMAND
++} iscsid_uip_cmd_e;
++
++typedef struct iscsid_uip_broadcast_header {
++ iscsid_uip_cmd_e command;
++ uint32_t payload_len;
++} iscsid_uip_broadcast_header_t;
++
++/* IPC Request */
++typedef struct iscsid_uip_broadcast {
++ struct iscsid_uip_broadcast_header header;
++
++ union {
++ /* messages */
++ struct ipc_broadcast_iface_rec {
++ struct iface_rec rec;
++ } iface_rec;
++ } u;
++} iscsid_uip_broadcast_t;
++
++typedef enum iscsid_uip_mgmt_ipc_err {
++ ISCSID_UIP_MGMT_IPC_OK = 0,
++ ISCISD_UIP_MGMT_IPC_ERR = 1,
++ ISCISD_UIP_MGMT_IPC_ERR_NOT_FOUND = 2,
++ ISCISD_UIP_MGMT_IPC_ERR_NOMEM = 3,
++} iscsid_uip_mgmt_ipc_err_e;
++
++/* IPC Response */
++typedef struct iscsid_uip_mgmt_rsp {
++ iscsid_uip_cmd_e command;
++ iscsid_uip_mgmt_ipc_err_e err;
++} iscsid_uip_rsp_t;
++
++extern int uip_broadcast_params(struct iscsi_transport *t,
++ struct iface_rec *iface,
++ struct iscsi_session *session);
++
++
++#endif /* UIP_MGMT_IPC_H */
+--
+1.6.6.1
+
diff --git a/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-update-initscripts-and-docs.patch b/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-update-initscripts-and-docs.patch
new file mode 100644
index 0000000..eb8003f
--- /dev/null
+++ b/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-update-initscripts-and-docs.patch
@@ -0,0 +1,114 @@
+diff -aurp open-iscsi-2.0-872-rc3-bnx2i/etc/iscsid.conf open-iscsi-2.0-872-rc3-bnx2i.diff/etc/iscsid.conf
+--- open-iscsi-2.0-872-rc3-bnx2i/etc/iscsid.conf 2010-07-11 03:45:50.000000000 -0500
++++ open-iscsi-2.0-872-rc3-bnx2i.diff/etc/iscsid.conf 2010-07-11 03:57:57.000000000 -0500
+@@ -17,10 +17,10 @@
+ # maintainers.
+ #
+ # Default for Fedora and RHEL. (uncomment to activate).
+-# iscsid.startup = /etc/rc.d/init.d/iscsid force-start
++iscsid.startup = /etc/rc.d/init.d/iscsid force-start
+ #
+ # Default for upstream open-iscsi scripts (uncomment to activate).
+-iscsid.startup = /sbin/iscsid
++# iscsid.startup = /sbin/iscsid
+
+
+ #############################
+@@ -36,8 +36,8 @@ iscsid.startup = /sbin/iscsid
+ # To request that the iscsi initd scripts startup a session set to "automatic".
+ # node.startup = automatic
+ #
+-# To manually startup the session set to "manual". The default is manual.
+-node.startup = manual
++# To manually startup the session set to "manual". The default is automatic.
++node.startup = automatic
+
+
+ # *************
+@@ -255,29 +255,26 @@ node.conn[0].iscsi.MaxXmitDataSegmentLen
+ discovery.sendtargets.iscsi.MaxRecvDataSegmentLength = 32768
+
+ # To allow the targets to control the setting of the digest checking,
+-# with the initiator requesting a preference of enabling the checking, uncomment# one or both of the following lines:
++# with the initiator requesting a preference of enabling the checking, uncomment
++# the following lines (Data digests are not supported.):
+ #node.conn[0].iscsi.HeaderDigest = CRC32C,None
+-#node.conn[0].iscsi.DataDigest = CRC32C,None
+ #
+ # To allow the targets to control the setting of the digest checking,
+ # with the initiator requesting a preference of disabling the checking,
+-# uncomment one or both of the following lines:
++# uncomment the following lines:
+ #node.conn[0].iscsi.HeaderDigest = None,CRC32C
+-#node.conn[0].iscsi.DataDigest = None,CRC32C
+ #
+ # To enable CRC32C digest checking for the header and/or data part of
+-# iSCSI PDUs, uncomment one or both of the following lines:
++# iSCSI PDUs, uncomment the following lines:
+ #node.conn[0].iscsi.HeaderDigest = CRC32C
+-#node.conn[0].iscsi.DataDigest = CRC32C
+ #
+ # To disable digest checking for the header and/or data part of
+-# iSCSI PDUs, uncomment one or both of the following lines:
++# iSCSI PDUs, uncomment the following lines:
+ #node.conn[0].iscsi.HeaderDigest = None
+-#node.conn[0].iscsi.DataDigest = None
+ #
+ # The default is to never use DataDigests or HeaderDigests.
+ #
+-
++node.conn[0].iscsi.HeaderDigest = None
+
+ #************
+ # Workarounds
+diff -aurp open-iscsi-2.0-872-rc3-bnx2i/README open-iscsi-2.0-872-rc3-bnx2i.diff/README
+--- open-iscsi-2.0-872-rc3-bnx2i/README 2010-07-11 03:45:50.000000000 -0500
++++ open-iscsi-2.0-872-rc3-bnx2i.diff/README 2010-07-11 03:57:57.000000000 -0500
+@@ -74,11 +74,6 @@ the cache sync command will fail.
+ - iscsiadm's -P 3 option will not print out scsi devices.
+ - iscsid will not automatically online devices.
+
+-You need to enable "Cryptographic API" under "Cryptographic options" in the
+-kernel config. And you must enable "CRC32c CRC algorithm" even if
+-you do not use header or data digests. They are the kernel options,
+-CONFIG_CRYPTO and CONFIG_CRYPTO_CRC32C, respectively.
+-
+ By default the kernel source found at
+ /lib/modules/`uname -a`/build
+ will be used to compile the open-iscsi modules. To specify a different
+@@ -907,7 +902,7 @@ Red Hat or Fedora:
+ -----------------
+ To start open-iscsi in Red Hat/Fedora you can do:
+
+- service open-iscsi start
++ service iscsi start
+
+ To get open-iscsi to automatically start at run time you may have to
+ run:
+@@ -1115,6 +1110,8 @@ iscsid will only perform rediscovery whe
+ # linux-isns (SLES's iSNS server) where it sometimes does not send SCN
+ # events in the proper format, so they may not get handled.
+
++To set the startup value, so that nodes are not logged into automatically
++use the value "manual".
+
+ Example:
+ --------
+Only in open-iscsi-2.0-872-rc3-bnx2i.diff/: README.orig
+diff -aurp open-iscsi-2.0-872-rc3-bnx2i/usr/idbm.c open-iscsi-2.0-872-rc3-bnx2i.diff/usr/idbm.c
+--- open-iscsi-2.0-872-rc3-bnx2i/usr/idbm.c 2010-07-11 03:45:50.000000000 -0500
++++ open-iscsi-2.0-872-rc3-bnx2i.diff/usr/idbm.c 2010-07-11 03:57:57.000000000 -0500
+@@ -346,9 +346,13 @@ idbm_recinfo_node(node_rec_t *r, recinfo
+ IDBM_SHOW, "None", "CRC32C", "CRC32C,None",
+ "None,CRC32C", num, 1);
+ sprintf(key, CONN_DATA_DIGEST, i);
++
++#if 0
++We do not support data digests
+ __recinfo_int_o4(key, ri, r, conn[i].iscsi.DataDigest, IDBM_SHOW,
+ "None", "CRC32C", "CRC32C,None",
+ "None,CRC32C", num, 1);
++#endif
+ sprintf(key, CONN_IFMARKER, i);
+ __recinfo_int_o2(key, ri, r, conn[i].iscsi.IFMarker, IDBM_SHOW,
+ "No", "Yes", num, 1);
diff --git a/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-use-red-hat-for-name.patch b/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-use-red-hat-for-name.patch
new file mode 100644
index 0000000..c29c77b
--- /dev/null
+++ b/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-use-red-hat-for-name.patch
@@ -0,0 +1,12 @@
+diff -aurp open-iscsi-2.0-871.1.1-bnx2i/utils/iscsi-iname.c open-iscsi-2.0-871.1.1-bnx2i.work/utils/iscsi-iname.c
+--- open-iscsi-2.0-871.1.1-bnx2i/utils/iscsi-iname.c 2010-01-15 02:24:02.000000000 -0600
++++ open-iscsi-2.0-871.1.1-bnx2i.work/utils/iscsi-iname.c 2010-01-15 03:44:23.000000000 -0600
+@@ -73,7 +73,7 @@ main(int argc, char *argv[])
+ exit(0);
+ }
+ } else {
+- prefix = "iqn.2005-03.org.open-iscsi";
++ prefix = "iqn.1994-05.com.redhat";
+ }
+
+ /* try to feed some entropy from the pool to MD5 in order to get
diff --git a/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-use-var-for-config.patch b/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-use-var-for-config.patch
new file mode 100644
index 0000000..6ed53e5
--- /dev/null
+++ b/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-use-var-for-config.patch
@@ -0,0 +1,234 @@
+diff -aurp open-iscsi-2.0-872-rc3-bnx2i/doc/iscsiadm.8 open-iscsi-2.0-872-rc3-bnx2i.diff/doc/iscsiadm.8
+--- open-iscsi-2.0-872-rc3-bnx2i/doc/iscsiadm.8 2010-07-11 03:45:50.000000000 -0500
++++ open-iscsi-2.0-872-rc3-bnx2i.diff/doc/iscsiadm.8 2010-07-11 04:00:35.000000000 -0500
+@@ -51,7 +51,7 @@ display help text and exit
+ .TP
+ \fB\-I\fR, \fB\-\-interface\fI[iface]\fR
+ The interface argument specifies the iSCSI interface to use for the operation.
+-iSCSI interfaces (iface) are defined in /etc/iscsi/ifaces. For hardware
++iSCSI interfaces (iface) are defined in /var/lib/iscsi/ifaces. For hardware
+ iSCSI (qla4xxx) the iface config must have the hardware address
+ (iface.hwaddress = port's MAC address)
+ and the driver/transport_name (iface.transport_name). The iface's name is
+@@ -128,7 +128,7 @@ If no other options are specified: for \
+ of their respective records are displayed; for \fIsession\fR, all active
+ sessions and connections are displayed; for \fIfw\fR, all boot firmware
+ values are displayed; for \fIhost\fR, all iSCSI hosts are displayed; and
+-for \fIiface\fR, all ifaces setup in /etc/iscsi/ifaces are displayed.
++for \fIiface\fR, all ifaces setup in /var/lib/iscsi/ifaces are displayed.
+
+ .TP
+ \fB\-n\fR, \fB\-\-name=\fIname\fR
+@@ -336,10 +336,10 @@ The configuration file read by \fBiscsid
+ The file containing the iSCSI InitiatorName and InitiatorAlias read by
+ \fBiscsid\fR and \fBiscsiadm\fR on startup.
+ .TP
+-/etc/iscsi/nodes/
++/var/lib/iscsi/nodes/
+ This directory contains the nodes with their targets.
+ .TP
+-/etc/iscsi/send_targets
++/var/lib/iscsi/send_targets
+ This directory contains the portals.
+
+ .SH "SEE ALSO"
+Only in open-iscsi-2.0-872-rc3-bnx2i.diff/doc: iscsiadm.8.orig
+diff -aurp open-iscsi-2.0-872-rc3-bnx2i/README open-iscsi-2.0-872-rc3-bnx2i.diff/README
+--- open-iscsi-2.0-872-rc3-bnx2i/README 2010-07-11 03:58:50.000000000 -0500
++++ open-iscsi-2.0-872-rc3-bnx2i.diff/README 2010-07-11 03:59:00.000000000 -0500
+@@ -144,10 +144,10 @@ available on all Linux installations.
+
+ The database contains two tables:
+
+-- Discovery table (/etc/iscsi/send_targets);
+-- Node table (/etc/iscsi/nodes).
++- Discovery table (/var/lib/iscsi/send_targets);
++- Node table (/var/lib/iscsi/nodes).
+
+-The regular place for iSCSI database files: /etc/iscsi/nodes
++The regular place for iSCSI database files: /var/lib/iscsi/nodes
+
+ The iscsiadm utility is a command-line tool to manage (update, delete,
+ insert, query) the persistent database.
+@@ -420,7 +420,7 @@ a scsi_host per HBA port).
+ To manage both types of initiator stacks, iscsiadm uses the interface (iface)
+ structure. For each HBA port or for software iscsi for each network
+ device (ethX) or NIC, that you wish to bind sessions to you must create
+-a iface config /etc/iscsi/ifaces.
++a iface config /var/lib/iscsi/ifaces.
+
+ Running:
+
+@@ -428,29 +428,29 @@ Running:
+ iface0 qla4xxx,00:c0:dd:08:63:e8,20.15.0.7,default,iqn.2005-06.com.redhat:madmax
+ iface1 qla4xxx,00:c0:dd:08:63:ea,20.15.0.9,default,iqn.2005-06.com.redhat:madmax
+
+-Will report iface configurations that are setup in /etc/iscsi/ifaces.
++Will report iface configurations that are setup in /var/lib/iscsi/ifaces.
+ The format is:
+
+ iface_name transport_name,hwaddress,ipaddress,net_ifacename,initiatorname
+
+ For software iscsi, you can create the iface configs by hand, but it is
+ reccomended that you use iscsiadm's iface mode. There is a iface.example in
+-/etc/iscsi/ifaces which can be used as a template for the daring.
++/var/lib/iscsi/ifaces which can be used as a template for the daring.
+
+ For each network object you wish to bind a session to you must create
+-a seperate iface config in /etc/iscsi/ifaces and each iface config file
++a seperate iface config in /var/lib/iscsi/ifaces and each iface config file
+ must have a unique name which is less than or equal to 64 characters.
+
+ Example:
+
+ If you have NIC1 with MAC address 00:0F:1F:92:6B:BF and NIC2 with
+ MAC address 00:C0:DD:08:63:E7 and you wanted to do software iscsi over
+-TCP/IP. Then in /etc/iscsi/ifaces/iface0 you would enter:
++TCP/IP. Then in /var/lib/iscsi/ifaces/iface0 you would enter:
+
+ iface.transport_name = tcp
+ iface.hwaddress = 00:0F:1F:92:6B:BF
+
+-and in /etc/iscsi/ifaces/iface1 you would enter:
++and in /var/lib/iscsi/ifaces/iface1 you would enter:
+
+ iface.transport_name = tcp
+ iface.hwaddress = 00:C0:DD:08:63:E7
+@@ -499,7 +499,7 @@ iser iser,<empty>,<empty>,<empty>,<empty
+ cxgb3i.00:07:43:05:97:07 cxgb3i,00:07:43:05:97:07,<empty>,<empty>,<empty>
+
+
+-Will report iface configurations that are setup in /etc/iscsi/ifaces.
++Will report iface configurations that are setup in /var/lib/iscsi/ifaces.
+ The format is:
+
+ iface_name transport_name,hwaddress,ipaddress,net_ifacename,initiatorname
+@@ -515,7 +515,7 @@ default one in /etc/iscsi/initiatorname.
+
+
+
+-To display these values in a more friendly run:
++To display these values in a more friendly way run:
+
+ iscsiadm -m iface -I cxgb3i.00:07:43:05:97:07
+ # BEGIN RECORD 2.0-871
+@@ -553,7 +553,7 @@ need a seperate network connection to th
+ *This will be fixed in the next version of open-iscsi*
+
+ For compatibility reasons, when you run iscsiadm to do discovery, it
+-will check for interfaces in /etc/iscsi/iscsi/ifaces that are using
++will check for interfaces in /var/lib/iscsi/ifaces that are using
+ tcp for the iface.transport and it will bind the portals that are discovered
+ so that they will be logged in through those ifaces. This behavior can also
+ be overriden by passing in the interfaces you want to use. For the case
+@@ -571,7 +571,7 @@ we do not bind a session to a iface, the
+
+ iscsiadm -m discoverydb -t st -p ip:port -I default --discover -P 1
+
+-And if you did not define any interfaces in /etc/iscsi/ifaces and do
++And if you did not define any interfaces in /var/lib/iscsi/ifaces and do
+ not pass anything into iscsiadm, running iscsiadm will do the default
+ behavior, where we allow the network subsystem to decide which
+ device to use.
+@@ -613,13 +613,13 @@ To now log into targets it is the same a
+
+ ./iscsiadm -m discoverydb -t st -p 192.168.1.1:3260 --discover
+
+- This will search /etc/iscsi/send_targets for a record with the
++ This will search /var/lib/iscsi/send_targets for a record with the
+ ID [portal = 192.168.1.1:3260 and type = sendtargets. If found it
+ will perform discovery using the settings stored in the record.
+ If a record does not exist, it will be created using the iscsid.conf
+ discovery settings.
+
+- For the ifaces, iscsiadm will first search /etc/iscsi/ifaces for
++ For the ifaces, iscsiadm will first search /var/lib/iscsi/ifaces for
+ interfaces using software iscsi. If any are found then nodes found
+ during discovery will be setup so that they can logged in through
+ those interfaces. To specify a specific iface, pass the
+@@ -675,7 +675,7 @@ To now log into targets it is the same a
+ This command will perform discovery, but not manipulate the node DB.
+
+ - SendTargets iSCSI Discovery with a specific interface. If you
+- wish to only use a subset of the interfaces in /etc/iscsi/ifaces
++ wish to only use a subset of the interfaces in /var/lib/iscsi/ifaces
+ then you can pass them in during discovery:
+
+ ./iscsiadm -m discoverydb -t sendtargets -p 192.168.1.1:3260 \
+@@ -982,8 +982,8 @@ where targetname is the name of the targ
+ and port of the portal. tpgt, is the portal group tag of
+ the portal, and is not used in iscsiadm commands except for static
+ record creation. And iface name is the name of the iscsi interface
+-defined in /etc/iscsi/ifaces. If no interface was defined in
+-/etc/iscsi/ifaces or passed in, the default behavior is used.
++defined in /var/lib/iscsi/ifaces. If no interface was defined in
++/var/lib/iscsi/ifaces or passed in, the default behavior is used.
+ Default here is iscsi_tcp/tcp to be used over which ever NIC the
+ network layer decides is best.
+
+@@ -1098,7 +1098,7 @@ If set, iscsid will perform discovery to
+ discovery.isns.discoveryd_poll_inval or
+ discovery.sendtargets.discoveryd_poll_inval seconds,
+ and it will log into any portals found from the discovery source using
+-the ifaces in /etc/iscsi/ifaces.
++the ifaces in /var/lib/iscsi/ifaces.
+
+ Note that for iSNS the poll_interval does not have to be set. If not set,
+ iscsid will only perform rediscovery when it gets a SCN from the server.
+Only in open-iscsi-2.0-872-rc3-bnx2i.diff/: README.orig
+diff -aurp open-iscsi-2.0-872-rc3-bnx2i/usr/idbm.c open-iscsi-2.0-872-rc3-bnx2i.diff/usr/idbm.c
+--- open-iscsi-2.0-872-rc3-bnx2i/usr/idbm.c 2010-07-11 03:58:50.000000000 -0500
++++ open-iscsi-2.0-872-rc3-bnx2i.diff/usr/idbm.c 2010-07-11 03:59:00.000000000 -0500
+@@ -2235,9 +2235,9 @@ free_info:
+ int idbm_init(idbm_get_config_file_fn *fn)
+ {
+ /* make sure root db dir is there */
+- if (access(ISCSI_CONFIG_ROOT, F_OK) != 0) {
+- if (mkdir(ISCSI_CONFIG_ROOT, 0660) != 0) {
+- log_error("Could not make %s %d\n", ISCSI_CONFIG_ROOT,
++ if (access(ISCSIVAR, F_OK) != 0) {
++ if (mkdir(ISCSIVAR, 0660) != 0) {
++ log_error("Could not make %s %d\n", ISCSIVAR,
+ errno);
+ return errno;
+ }
+Only in open-iscsi-2.0-872-rc3-bnx2i.diff/usr: idbm.c.orig
+diff -aurp open-iscsi-2.0-872-rc3-bnx2i/usr/idbm.h open-iscsi-2.0-872-rc3-bnx2i.diff/usr/idbm.h
+--- open-iscsi-2.0-872-rc3-bnx2i/usr/idbm.h 2010-07-11 03:45:50.000000000 -0500
++++ open-iscsi-2.0-872-rc3-bnx2i.diff/usr/idbm.h 2010-07-11 03:59:00.000000000 -0500
+@@ -27,12 +27,15 @@
+ #include "initiator.h"
+ #include "config.h"
+
+-#define NODE_CONFIG_DIR ISCSI_CONFIG_ROOT"nodes"
+-#define SLP_CONFIG_DIR ISCSI_CONFIG_ROOT"slp"
+-#define ISNS_CONFIG_DIR ISCSI_CONFIG_ROOT"isns"
+-#define STATIC_CONFIG_DIR ISCSI_CONFIG_ROOT"static"
+-#define FW_CONFIG_DIR ISCSI_CONFIG_ROOT"fw"
+-#define ST_CONFIG_DIR ISCSI_CONFIG_ROOT"send_targets"
++#define ISCSIVAR "/var/lib/iscsi/"
++
++#define NODE_CONFIG_DIR ISCSIVAR"nodes"
++#define SLP_CONFIG_DIR ISCSIVAR"slp"
++#define ISNS_CONFIG_DIR ISCSIVAR"isns"
++#define STATIC_CONFIG_DIR ISCSIVAR"static"
++#define ST_CONFIG_DIR ISCSIVAR"send_targets"
++#define FW_CONFIG_DIR ISCSIVAR"fw"
++
+ #define ST_CONFIG_NAME "st_config"
+ #define ISNS_CONFIG_NAME "isns_config"
+
+diff -aurp open-iscsi-2.0-872-rc3-bnx2i/usr/iface.h open-iscsi-2.0-872-rc3-bnx2i.diff/usr/iface.h
+--- open-iscsi-2.0-872-rc3-bnx2i/usr/iface.h 2010-07-11 03:45:50.000000000 -0500
++++ open-iscsi-2.0-872-rc3-bnx2i.diff/usr/iface.h 2010-07-11 03:59:00.000000000 -0500
+@@ -20,7 +20,9 @@
+ #ifndef ISCSI_IFACE_H
+ #define ISCSI_IFACE_H
+
+-#define IFACE_CONFIG_DIR ISCSI_CONFIG_ROOT"ifaces"
++#include "idbm.h"
++
++#define IFACE_CONFIG_DIR ISCSIVAR"ifaces"
+
+ struct iface_rec;
+ struct list_head;
diff --git a/pkgs/core/kbd/kbd.nm b/pkgs/core/kbd/kbd.nm
index 4cad4fa..43bf61d 100644
--- a/pkgs/core/kbd/kbd.nm
+++ b/pkgs/core/kbd/kbd.nm
@@ -25,8 +25,9 @@
include $(PKGROOT)/Include
PKG_NAME = kbd
-PKG_VER = 1.15.2
+PKG_VER = 1.15
PKG_REL = 0
+PKG_EPOCH = 1
PKG_MAINTAINER =
PKG_GROUP = System/Base
diff --git a/pkgs/core/kbd/patches/kbd-1.15-defkeymap.patch b/pkgs/core/kbd/patches/kbd-1.15-defkeymap.patch
new file mode 100644
index 0000000..5e604b7
--- /dev/null
+++ b/pkgs/core/kbd/patches/kbd-1.15-defkeymap.patch
@@ -0,0 +1,12 @@
+diff -up kbd-1.15/src/paths.h.orig kbd-1.15/src/paths.h
+--- kbd-1.15/src/paths.h.orig 2010-06-07 15:26:21.787315778 +0200
++++ kbd-1.15/src/paths.h 2010-06-07 15:26:49.353336391 +0200
+@@ -19,7 +19,7 @@
+ # define DEFMAP "sunkeymap.kmap"
+ # define KERNDIR "/usr/src/linux/drivers/sbus/char"
+ #else
+-# define DEFMAP "defkeymap.kmap"
++# define DEFMAP "defkeymap.map"
+ # define KERNDIR "/usr/src/linux/drivers/char"
+ #endif
+
diff --git a/pkgs/core/kbd/patches/kbd-1.15-keycodes-man.patch b/pkgs/core/kbd/patches/kbd-1.15-keycodes-man.patch
new file mode 100644
index 0000000..d18a8c8
--- /dev/null
+++ b/pkgs/core/kbd/patches/kbd-1.15-keycodes-man.patch
@@ -0,0 +1,52 @@
+diff -up kbd-1.15/man/man1/showkey.1_old kbd-1.15/man/man1/showkey.1
+--- kbd-1.15/man/man1/showkey.1_old 2008-03-13 17:46:23.000000000 +0100
++++ kbd-1.15/man/man1/showkey.1 2008-12-10 12:31:38.000000000 +0100
+@@ -80,6 +80,19 @@ corresponds to what the keyboard hardwar
+ to know the scan codes sent by various keys it is better to boot a
+ 2.4 kernel. Since 2.6.9 there also is the boot option atkbd.softraw=0
+ that tells the 2.6 kernel to return the actual scan codes.
++
++.SH NOTES
++The raw scan codes are available only on AT and PS/2 keyboards,
++and even then they are disabled unless the
++.B atkbd.softraw=0
++kernel parameter is used.
++When the raw scan codes are not available, the kernel uses a fixed built-in
++table to produce scan codes from keycodes. Thus,
++.BR setkeycodes (8)
++can affect the output of
++.B showkey
++in scan code dump mode.
++
+ .SH "SEE ALSO"
+ .BR loadkeys (1),
+ .BR dumpkeys (1),
+diff -up kbd-1.15/man/man8/setkeycodes.8_old kbd-1.15/man/man8/setkeycodes.8
+--- kbd-1.15/man/man8/setkeycodes.8_old 2008-12-10 12:31:56.000000000 +0100
++++ kbd-1.15/man/man8/setkeycodes.8 2008-12-10 12:37:36.000000000 +0100
+@@ -41,6 +41,10 @@ to showkey(1), the command
+ will assign the keycode 112 to it, and then loadkeys(1) can be used
+ to define the function of this key.
+
++USB keyboards have standardized keycodes and
++.B setkeycodes
++doesn't affect them at all.
++
+ .SH "2.6 KERNELS"
+ In 2.6 kernels key codes lie in the range 1-255, instead of 1-127.
+ (It might be best to confine oneself to the range 1-239.)
+@@ -54,6 +58,14 @@ None.
+ .SH BUGS
+ The keycodes of X have nothing to do with those of Linux.
+ Unusual keys can be made visible under Linux, but not under X.
++
++.B setkeycodes
++affects only the "first" input device
++that has modifiable scancode-to-keycode mapping.
++If there is more than one such device,
++.B setkeycodes
++cannot change the mapping of other devices than the "first" one.
++
+ .SH "SEE ALSO"
+ .I "dumpkeys (1), loadkeys (1), showkey (1), getkeycodes (8)"
+
diff --git a/pkgs/core/kbd/patches/kbd-1.15-po.patch b/pkgs/core/kbd/patches/kbd-1.15-po.patch
new file mode 100644
index 0000000..0221f60
--- /dev/null
+++ b/pkgs/core/kbd/patches/kbd-1.15-po.patch
@@ -0,0 +1,31 @@
+diff -up kbd-1.15/po/Makefile.in_old kbd-1.15/po/Makefile.in
+--- kbd-1.15/po/Makefile.in_old 2008-10-23 21:03:59.000000000 +0200
++++ kbd-1.15/po/Makefile.in 2008-12-09 15:35:58.000000000 +0100
+@@ -4,10 +4,10 @@ srcdir = @srcdir@
+
+ prefix = @prefix@
+ datarootdir = @datarootdir@
+-datadir = @datadir@
+-localedir = $(DESTDIR)$(datadir)/locale
+-gnulocaledir = $(DESTDIR)$(datadir)/locale
+-gettextsrcdir = $(DESTDIR)$(datadir)/gettext/po
++datadir = $(DESTDIR)@datadir@
++localedir = $(DESTDIR)@localedir@
++gnulocaledir = $(DESTDIR)@localedir@
++gettextsrcdir = $(datadir)/gettext/po
+
+ FOREIGN = @FOREIGN@
+ HAVE_XGETTEXT = @HAVE_XGETTEXT@
+@@ -36,10 +36,10 @@ INCLUDES = -I.. -I$(INTL)
+ COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
+
+ # Enter here all .po files
+-POFILES = cs.po da.po de.po el.po es.po fr.po gr.po nl.po pl.po \
++POFILES = cs.po da.po de.po el.po es.po fr.po nl.po pl.po \
+ ro.po ru.po sv.po tr.po
+ # the same but with .gmo
+-GMOFILES = cs.gmo da.gmo de.gmo el.gmo es.gmo fr.gmo gr.gmo nl.gmo \
++GMOFILES = cs.gmo da.gmo de.gmo el.gmo es.gmo fr.gmo nl.gmo \
+ pl.gmo ro.gmo ru.gmo sv.gmo tr.gmo
+
+ CATALOGS = $(GMOFILES)
diff --git a/pkgs/core/kbd/patches/kbd-1.15-quiet_doc.patch b/pkgs/core/kbd/patches/kbd-1.15-quiet_doc.patch
new file mode 100644
index 0000000..eca867b
--- /dev/null
+++ b/pkgs/core/kbd/patches/kbd-1.15-quiet_doc.patch
@@ -0,0 +1,34 @@
+diff -up kbd-1.15/man/man1/loadkeys.1.in_old kbd-1.15/man/man1/loadkeys.1.in
+--- kbd-1.15/man/man1/loadkeys.1.in_old 2008-10-23 21:03:59.000000000 +0200
++++ kbd-1.15/man/man1/loadkeys.1.in 2009-03-05 13:11:08.000000000 +0100
+@@ -19,6 +19,8 @@ loadkeys \- load keyboard translation ta
+ ] [
+ .I -m --mktable
+ ] [
++.I -q --quiet
++] [
+ .I -s --clearstrings
+ ] [
+ .I -v --verbose
+@@ -148,6 +150,10 @@ command (and does not modify the current
+ .B loadkeys
+ prints its version number and a short usage message to the programs
+ standard error output and exits.
++.TP
++.B \-q \-\-quiet
++.B loadkeys
++suppresses all normal output.
+ .SH WARNING
+ Note that anyone having read access to
+ .B /dev/console
+diff -up kbd-1.15/src/loadkeys.c_old kbd-1.15/src/loadkeys.c
+--- kbd-1.15/src/loadkeys.c_old 2008-10-23 21:03:59.000000000 +0200
++++ kbd-1.15/src/loadkeys.c 2009-03-05 13:09:00.000000000 +0100
+@@ -1966,6 +1966,7 @@ usage(void) {
+ " -d --default load \"%s\"\n"
+ " -h --help display this help text\n"
+ " -m --mktable output a \"defkeymap.c\" to stdout\n"
++" -q --quiet suppress all normal output\n"
+ " -s --clearstrings clear kernel string table\n"
+ " -u --unicode implicit conversion to Unicode\n"
+ " -v --verbose report the changes\n"), PACKAGE_VERSION, DEFMAP);
diff --git a/pkgs/core/kbd/patches/kbd-1.15-resizecon-x86_64.patch b/pkgs/core/kbd/patches/kbd-1.15-resizecon-x86_64.patch
new file mode 100644
index 0000000..5e8350a
--- /dev/null
+++ b/pkgs/core/kbd/patches/kbd-1.15-resizecon-x86_64.patch
@@ -0,0 +1,15 @@
+diff -up kbd-1.15/configure_old kbd-1.15/configure
+--- kbd-1.15/configure_old 2009-01-08 15:11:04.000000000 +0100
++++ kbd-1.15/configure 2009-01-08 15:11:45.000000000 +0100
+@@ -7637,8 +7637,9 @@ fi
+
+
+ case $host_cpu in
+- i?86*) RESIZECONS_PROGS=yes ;;
+- *) RESIZECONS_PROGS=no ;;
++ i?86*) RESIZECONS_PROGS=yes ;;
++ x86_64*) RESIZECONS_PROGS=yes ;;
++ *) RESIZECONS_PROGS=no ;;
+ esac
+ if test "$RESIZECONS_PROGS" = "yes"; then
+ RESIZECONS_PROGS_TRUE=
diff --git a/pkgs/core/kbd/patches/kbd-1.15-sparc.patch b/pkgs/core/kbd/patches/kbd-1.15-sparc.patch
new file mode 100644
index 0000000..a858a25
--- /dev/null
+++ b/pkgs/core/kbd/patches/kbd-1.15-sparc.patch
@@ -0,0 +1,97 @@
+diff -up kbd-1.15/man/man8/kbdrate.8_old kbd-1.15/man/man8/kbdrate.8
+--- kbd-1.15/man/man8/kbdrate.8_old 2008-12-10 14:20:33.000000000 +0100
++++ kbd-1.15/man/man8/kbdrate.8 2008-12-10 14:41:10.000000000 +0100
+@@ -22,7 +22,7 @@ Using
+ without any options will reset the repeat rate to 10.9 characters per second (cps)
+ and the delay to 250 milliseconds (ms) for Intel- and M68K-based systems.
+ These are the IBM defaults. On SPARC-based systems it will reset the repeat rate
+-to 5 cps and the delay to 200 ms.
++to 20 cps and the delay to 200 ms.
+
+ .SH OPTIONS
+ .TP
+@@ -69,3 +69,5 @@ When these ioctls fail an ioport interfa
+ .I /etc/rc.local
+ .br
+ .I /dev/port
++.br
++.I /dev/kbd
+diff -up kbd-1.15/src/kbdrate.c_old kbd-1.15/src/kbdrate.c
+--- kbd-1.15/src/kbdrate.c_old 2008-12-10 14:00:25.000000000 +0100
++++ kbd-1.15/src/kbdrate.c 2008-12-10 14:20:11.000000000 +0100
+@@ -77,7 +77,6 @@ beats rebuilding the kernel!
+
+ #ifdef __sparc__
+ #include <asm/param.h>
+-#include <asm/kbio.h>
+ #endif
+
+ #ifndef KDKBDREP
+@@ -109,11 +108,15 @@ static int valid_delays[] = { 250, 500,
+
+ static int
+ KDKBDREP_ioctl_ok(double rate, int delay, int silent) {
++#if defined(KDKBDREP) && !defined(__sparc__)
+ /*
+ * This ioctl is defined in <linux/kd.h> but is not
+ * implemented anywhere - must be in some m68k patches.
++ * We cannot blindly try unimplemented ioctls on sparc64 -
++ * the 32<->64bit transition layer does not like it.
+ * Since 2.4.9 also on i386.
+- */
++ */
++
+ struct my_kbd_repeat kbdrep_s;
+
+ /* don't change, just test */
+@@ -177,6 +180,9 @@ KDKBDREP_ioctl_ok(double rate, int delay
+ rate, kbdrep_s.delay );
+
+ return 1; /* success! */
++#else /* no KDKBDREP or __sparc__ */
++ return 0;
++#endif /* KDKBDREP */
+ }
+
+ static int
+@@ -221,7 +227,7 @@ sigalrmhandler( int sig ) {
+ int
+ main( int argc, char **argv ) {
+ #ifdef __sparc__
+- double rate = 5.0; /* Default rate */
++ double rate = 20.0; /* Default rate */
+ int delay = 200; /* Default delay */
+ #else
+ double rate = 10.9; /* Default rate */
+@@ -272,7 +278,9 @@ main( int argc, char **argv ) {
+
+
+ /* The ioport way */
++ /* The ioport way - will crash on sparc */
+
++#ifndef __sparc__
+ for (i = 0; i < RATE_COUNT; i++)
+ if (rate * 10 >= valid_rates[i]) {
+ value &= 0x60;
+@@ -335,5 +343,7 @@ main( int argc, char **argv ) {
+ valid_rates[value & 0x1f] / 10.0,
+ valid_delays[ (value & 0x60) >> 5 ] );
+
++#endif
++
+ return 0;
+ }
+diff -up kbd-1.15/src/setleds.c_old kbd-1.15/src/setleds.c
+--- kbd-1.15/src/setleds.c_old 2008-12-10 14:00:02.000000000 +0100
++++ kbd-1.15/src/setleds.c 2008-12-10 14:00:16.000000000 +0100
+@@ -14,10 +14,6 @@
+ #include "nls.h"
+ #include "version.h"
+
+-#ifdef __sparc__
+-#include <asm/kbio.h>
+-#endif
+-
+ static void
+ usage(void)
+ {
diff --git a/pkgs/core/kbd/patches/kbd-1.15-unicode_start.patch b/pkgs/core/kbd/patches/kbd-1.15-unicode_start.patch
new file mode 100644
index 0000000..41827cc
--- /dev/null
+++ b/pkgs/core/kbd/patches/kbd-1.15-unicode_start.patch
@@ -0,0 +1,21 @@
+diff -up kbd-1.15/src/unicode_start_old kbd-1.15/src/unicode_start
+--- kbd-1.15/src/unicode_start_old 2009-01-08 13:34:10.000000000 +0100
++++ kbd-1.15/src/unicode_start 2009-01-08 14:02:12.000000000 +0100
+@@ -72,6 +72,9 @@ stty iutf8
+ # have a Unicode map attached, or explicitly specified, e.g.,
+ # by giving `def.uni' as a second argument.
+
++DEFAULT_UNICODE_FONT=latarcyrheb-sun16
++# Also drdos8x16 is a good candidate.
++
+ case "$#" in
+ 2)
+ setfont "$1" -u "$2"
+@@ -80,6 +83,7 @@ case "$#" in
+ setfont "$1"
+ ;;
+ 0)
++ setfont $DEFAULT_UNICODE_FONT
+ ;;
+ *)
+ echo "usage: unicode_start [font [unicode map]]"
diff --git a/pkgs/core/kbd/patches/kbd-1.15.1-backspace-1.patch b/pkgs/core/kbd/patches/kbd-1.15.1-backspace-1.patch
deleted file mode 100644
index 8fec171..0000000
--- a/pkgs/core/kbd/patches/kbd-1.15.1-backspace-1.patch
+++ /dev/null
@@ -1,250 +0,0 @@
-Submitted By: Matt Burgess
-Date: 2008-12-06
-Initial Package Version: 1.15
-Upstream Status: Not submitted, possibly incomplete
-Description: Makes Backspace and Delete keys consistent in all i386 keymaps.
-Makes the Backspace key send character code 127, and Delete send a well known
-escape sequence. Obsoletes the /etc/kbd/bs-sends-del file for i386.
-
-Original patch for 1.12 by Alexander Patrakov.
-Updated for 1.13 (drop ru.map, the change is upstream, and add ru_win.map,
-ru-cp1251.map) by Ken Moffat <ken at linuxfromscratch dot org>.
-Re-diffed against 1.15 by Matt Burgess <matthew at linuxfromscratch.org>.
-
-diff -Naur kbd-1.15.orig/data/keymaps/i386/dvorak/dvorak-l.map kbd-1.15/data/keymaps/i386/dvorak/dvorak-l.map
---- kbd-1.15.orig/data/keymaps/i386/dvorak/dvorak-l.map 2008-06-20 12:36:01.000000000 +0100
-+++ kbd-1.15/data/keymaps/i386/dvorak/dvorak-l.map 2008-12-03 22:27:55.000000000 +0000
-@@ -43,7 +43,7 @@
- keycode 11 = three numbersign
- keycode 12 = two at
- keycode 13 = one exclam
-- keycode 14 = BackSpace Delete
-+ keycode 14 = Delete Delete
- ! --------------------------------------------------------------------------
- ! Row 3
- ! --------------------------------------------------------------------------
-diff -Naur kbd-1.15.orig/data/keymaps/i386/dvorak/dvorak-r.map kbd-1.15/data/keymaps/i386/dvorak/dvorak-r.map
---- kbd-1.15.orig/data/keymaps/i386/dvorak/dvorak-r.map 2008-06-20 12:36:01.000000000 +0100
-+++ kbd-1.15/data/keymaps/i386/dvorak/dvorak-r.map 2008-12-03 22:28:13.000000000 +0000
-@@ -43,7 +43,7 @@
- keycode 11 = slash question
- keycode 12 = bracketleft braceleft
- keycode 13 = bracketright braceright
-- keycode 14 = BackSpace Delete
-+ keycode 14 = Delete Delete
- ! --------------------------------------------------------------------------
- ! Row 3
- ! --------------------------------------------------------------------------
-diff -Naur kbd-1.15.orig/data/keymaps/i386/fgGIod/tr_f-latin5.map kbd-1.15/data/keymaps/i386/fgGIod/tr_f-latin5.map
---- kbd-1.15.orig/data/keymaps/i386/fgGIod/tr_f-latin5.map 2008-10-23 20:03:58.000000000 +0100
-+++ kbd-1.15/data/keymaps/i386/fgGIod/tr_f-latin5.map 2008-12-03 22:40:32.000000000 +0000
-@@ -51,7 +51,7 @@
- alt keycode 12 = Meta_minus
- keycode 13 = minus underscore
- alt keycode 13 = Meta_equal
--keycode 14 = BackSpace Delete
-+keycode 14 = Delete Delete
- alt keycode 14 = Meta_Delete
- keycode 15 = Tab Meta_Tab
- alt keycode 15 = Meta_Tab
-diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/lt.l4.map kbd-1.15/data/keymaps/i386/qwerty/lt.l4.map
---- kbd-1.15.orig/data/keymaps/i386/qwerty/lt.l4.map 2008-10-23 20:03:59.000000000 +0100
-+++ kbd-1.15/data/keymaps/i386/qwerty/lt.l4.map 2008-12-03 22:42:14.000000000 +0000
-@@ -205,7 +205,7 @@
- # edit this if you want the key above <Enter> to delete symbols above
- # cursor, not before.
- keycode 14 = \
-- BackSpace BackSpace BackSpace BackSpace \
-+ Delete Delete Delete Delete \
- Delete Delete Delete Delete \
- Meta_BackSpace Meta_BackSpace Meta_BackSpace Meta_BackSpace \
- Meta_Delete Meta_Delete Meta_Delete Meta_Delete
-@@ -506,7 +506,7 @@
-
- # Edit this if you want strict VT100 emulation.
- string F111 = "\033[3$"
--keycode 111 = Delete F111 Delete F111 \
-+keycode 111 = Remove F111 Remove F111 \
- Remove Remove Remove Remove \
- Meta_Delete Meta_Delete Meta_Delete Meta_Delete \
- Boot Boot Boot Boot
-diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/lt.map kbd-1.15/data/keymaps/i386/qwerty/lt.map
---- kbd-1.15.orig/data/keymaps/i386/qwerty/lt.map 2008-10-23 20:03:59.000000000 +0100
-+++ kbd-1.15/data/keymaps/i386/qwerty/lt.map 2008-12-03 22:42:58.000000000 +0000
-@@ -204,7 +204,7 @@
- # edit this if you want the key above <Enter> to delete symbols above
- # cursor, not before.
- keycode 14 = \
-- BackSpace BackSpace BackSpace BackSpace \
-+ Delete Delete Delete Delete \
- Delete Delete Delete Delete \
- Meta_BackSpace Meta_BackSpace Meta_BackSpace Meta_BackSpace \
- Meta_Delete Meta_Delete Meta_Delete Meta_Delete
-@@ -505,7 +505,7 @@
-
- # Edit this if you want strict VT100 emulation.
- string F111 = "\033[3$"
--keycode 111 = Delete F111 Delete F111 \
-+keycode 111 = Remove F111 Remove F111 \
- Remove Remove Remove Remove \
- Meta_Delete Meta_Delete Meta_Delete Meta_Delete \
- Boot Boot Boot Boot
-diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/no-latin1.map kbd-1.15/data/keymaps/i386/qwerty/no-latin1.map
---- kbd-1.15.orig/data/keymaps/i386/qwerty/no-latin1.map 2008-06-20 12:36:00.000000000 +0100
-+++ kbd-1.15/data/keymaps/i386/qwerty/no-latin1.map 2008-12-03 22:44:25.000000000 +0000
-@@ -3,7 +3,7 @@
- # Send comments to Kjetil T. Homme <kjetilho(a)ifi.uio.no>
- include "linux-with-alt-and-altgr"
- plain keycode 83 = KP_Comma
-- plain keycode 111 = Delete # "Remove" originally, weird...
-+ plain keycode 111 = Remove
- strings as usual
-
- keycode 1 = Escape
-diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru1.map kbd-1.15/data/keymaps/i386/qwerty/ru1.map
---- kbd-1.15.orig/data/keymaps/i386/qwerty/ru1.map 2008-10-23 20:03:59.000000000 +0100
-+++ kbd-1.15/data/keymaps/i386/qwerty/ru1.map 2008-12-03 22:45:32.000000000 +0000
-@@ -143,8 +143,8 @@
-
- # The keycode "0xFF" is too dangerous for many programs (including emacs).
- # So let it be bracket instead of Hard Sign.
--# altgr keycode 27 = +0xDF
--# altgr shift keycode 27 = +0xFF
-+altgr keycode 27 = +0xDF
-+altgr shift keycode 27 = +0xFF
- control keycode 27 = Control_bracketright
- altgr control keycode 27 = Control_bracketright
- alt keycode 27 = Meta_bracketright
-diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru2.map kbd-1.15/data/keymaps/i386/qwerty/ru2.map
---- kbd-1.15.orig/data/keymaps/i386/qwerty/ru2.map 2008-10-23 20:03:59.000000000 +0100
-+++ kbd-1.15/data/keymaps/i386/qwerty/ru2.map 2008-12-03 22:46:15.000000000 +0000
-@@ -46,7 +46,7 @@
- alt keycode 12 = Meta_minus
- keycode 13 = equal plus equal plus
- alt keycode 13 = Meta_equal
-- keycode 14 = BackSpace BackSpace BackSpace BackSpace
-+ keycode 14 = Delete Delete Delete Delete
- alt keycode 14 = Meta_Delete
- keycode 15 = Tab Tab Tab Tab
- alt keycode 15 = Meta_Tab
-diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru-cp1251.map kbd-1.15/data/keymaps/i386/qwerty/ru-cp1251.map
---- kbd-1.15.orig/data/keymaps/i386/qwerty/ru-cp1251.map 2008-10-23 20:03:59.000000000 +0100
-+++ kbd-1.15/data/keymaps/i386/qwerty/ru-cp1251.map 2008-12-03 22:47:12.000000000 +0000
-@@ -39,7 +39,7 @@
- alt keycode 12 = Meta_minus
- keycode 13 = equal plus equal plus
- alt keycode 13 = Meta_equal
-- keycode 14 = BackSpace
-+ keycode 14 = Delete
- alt keycode 14 = Meta_Delete
- keycode 15 = Tab
- alt keycode 15 = Meta_Tab
-diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru-ms.map kbd-1.15/data/keymaps/i386/qwerty/ru-ms.map
---- kbd-1.15.orig/data/keymaps/i386/qwerty/ru-ms.map 2008-10-23 20:03:59.000000000 +0100
-+++ kbd-1.15/data/keymaps/i386/qwerty/ru-ms.map 2008-12-03 22:48:10.000000000 +0000
-@@ -89,8 +89,8 @@
- altgr alt keycode 13 = Meta_equal
- shift alt keycode 13 = Meta_plus
- altgr shift alt keycode 13 = Meta_plus
-- keycode 14 = BackSpace BackSpace BackSpace BackSpace
--# keycode 14 = Delete Delete Delete Delete
-+# keycode 14 = BackSpace BackSpace BackSpace BackSpace
-+ keycode 14 = Delete Delete Delete Delete
- alt keycode 14 = Meta_Delete
- altgr alt keycode 14 = Meta_Delete
- keycode 15 = Tab Tab Tab Tab
-diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru_win.map kbd-1.15/data/keymaps/i386/qwerty/ru_win.map
---- kbd-1.15.orig/data/keymaps/i386/qwerty/ru_win.map 2008-10-23 20:03:59.000000000 +0100
-+++ kbd-1.15/data/keymaps/i386/qwerty/ru_win.map 2008-12-03 22:49:17.000000000 +0000
-@@ -42,7 +42,7 @@
- alt keycode 12 = Meta_minus
- keycode 13 = equal plus equal plus
- alt keycode 13 = Meta_equal
-- keycode 14 = BackSpace BackSpace BackSpace BackSpace
-+ keycode 14 = Delete Delete Delete Delete
- alt keycode 14 = Meta_Delete
- keycode 15 = Tab Tab Tab Tab
- alt keycode 15 = Meta_Tab
-diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/se-ir209.map kbd-1.15/data/keymaps/i386/qwerty/se-ir209.map
---- kbd-1.15.orig/data/keymaps/i386/qwerty/se-ir209.map 2008-10-23 20:03:59.000000000 +0100
-+++ kbd-1.15/data/keymaps/i386/qwerty/se-ir209.map 2008-12-03 22:50:18.000000000 +0000
-@@ -345,7 +345,7 @@
- keycode 109 = Next Scroll_Forward
- keycode 110 = Insert
-
-- keycode 111 = Delete # "Remove" originally, weird...
-+ keycode 111 = Remove
- control alt keycode 111 = Boot
- control altgr keycode 111 = Boot
-
-diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/se-lat6.map kbd-1.15/data/keymaps/i386/qwerty/se-lat6.map
---- kbd-1.15.orig/data/keymaps/i386/qwerty/se-lat6.map 2008-10-23 20:03:59.000000000 +0100
-+++ kbd-1.15/data/keymaps/i386/qwerty/se-lat6.map 2008-12-03 22:50:44.000000000 +0000
-@@ -374,6 +374,6 @@
- keycode 109 = Next Scroll_Forward
- keycode 110 = Insert
-
-- keycode 111 = Delete # "Remove" originally, weird...
-+ keycode 111 = Remove
- control alt keycode 111 = Boot
- control altgr keycode 111 = Boot
-diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/tr_q-latin5.map kbd-1.15/data/keymaps/i386/qwerty/tr_q-latin5.map
---- kbd-1.15.orig/data/keymaps/i386/qwerty/tr_q-latin5.map 2008-10-23 20:03:59.000000000 +0100
-+++ kbd-1.15/data/keymaps/i386/qwerty/tr_q-latin5.map 2008-12-03 22:52:09.000000000 +0000
-@@ -49,7 +49,7 @@
- alt keycode 12 = Meta_minus
- keycode 13 = minus underscore
- alt keycode 13 = Meta_equal
--keycode 14 = BackSpace Delete
-+keycode 14 = Delete Delete
- alt keycode 14 = Meta_Delete
- keycode 15 = Tab Meta_Tab
- alt keycode 15 = Meta_Tab
-diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua.map kbd-1.15/data/keymaps/i386/qwerty/ua.map
---- kbd-1.15.orig/data/keymaps/i386/qwerty/ua.map 2008-10-23 20:03:59.000000000 +0100
-+++ kbd-1.15/data/keymaps/i386/qwerty/ua.map 2008-12-03 22:52:52.000000000 +0000
-@@ -249,7 +249,7 @@
- shift ctrll ctrlr keycode 13 = plus
- alt ctrll ctrlr keycode 13 = Meta_equal
- shift alt ctrll ctrlr keycode 13 = Meta_plus
--keycode 14 = BackSpace Delete
-+keycode 14 = Delete Delete
- control keycode 14 = BackSpace
- alt keycode 14 = Meta_Delete
- ctrlr keycode 14 = BackSpace
-diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf.map kbd-1.15/data/keymaps/i386/qwerty/ua-utf.map
---- kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf.map 2008-10-23 20:03:59.000000000 +0100
-+++ kbd-1.15/data/keymaps/i386/qwerty/ua-utf.map 2008-12-03 22:53:36.000000000 +0000
-@@ -250,7 +250,7 @@
- shift ctrll ctrlr keycode 13 = plus
- alt ctrll ctrlr keycode 13 = Meta_equal
- shift alt ctrll ctrlr keycode 13 = Meta_plus
--keycode 14 = BackSpace Delete
-+keycode 14 = Delete Delete
- control keycode 14 = BackSpace
- alt keycode 14 = Meta_Delete
- ctrlr keycode 14 = BackSpace
-diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf-ws.map kbd-1.15/data/keymaps/i386/qwerty/ua-utf-ws.map
---- kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf-ws.map 2008-10-23 20:03:59.000000000 +0100
-+++ kbd-1.15/data/keymaps/i386/qwerty/ua-utf-ws.map 2008-12-03 22:54:06.000000000 +0000
-@@ -260,7 +260,7 @@
- shift ctrll ctrlr keycode 13 = plus
- alt ctrll ctrlr keycode 13 = Meta_equal
- shift alt ctrll ctrlr keycode 13 = Meta_plus
--keycode 14 = BackSpace Delete
-+keycode 14 = Delete Delete
- control keycode 14 = BackSpace
- alt keycode 14 = Meta_Delete
- ctrlr keycode 14 = BackSpace
-diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua-ws.map kbd-1.15/data/keymaps/i386/qwerty/ua-ws.map
---- kbd-1.15.orig/data/keymaps/i386/qwerty/ua-ws.map 2008-10-23 20:03:59.000000000 +0100
-+++ kbd-1.15/data/keymaps/i386/qwerty/ua-ws.map 2008-12-03 22:54:23.000000000 +0000
-@@ -260,7 +260,7 @@
- shift ctrll ctrlr keycode 13 = plus
- alt ctrll ctrlr keycode 13 = Meta_equal
- shift alt ctrll ctrlr keycode 13 = Meta_plus
--keycode 14 = BackSpace Delete
-+keycode 14 = Delete Delete
- control keycode 14 = BackSpace
- alt keycode 14 = Meta_Delete
- ctrlr keycode 14 = BackSpace
diff --git a/pkgs/core/nspr/nspr-config-vars.in b/pkgs/core/nspr/nspr-config-vars.in
new file mode 100644
index 0000000..ebf0aa4
--- /dev/null
+++ b/pkgs/core/nspr/nspr-config-vars.in
@@ -0,0 +1,2 @@
+ldflags=@LDFLAGS@
+os_libs=@OS_LIBS@
diff --git a/pkgs/core/nspr/nspr.nm b/pkgs/core/nspr/nspr.nm
new file mode 100644
index 0000000..4232a98
--- /dev/null
+++ b/pkgs/core/nspr/nspr.nm
@@ -0,0 +1,107 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include $(PKGROOT)/Include
+
+PKG_NAME = nspr
+PKG_VER = 4.8.6
+PKG_REL = 0
+
+PKG_MAINTAINER =
+PKG_GROUP = System/Libraries
+PKG_URL = http://www.mozilla.org/projects/nspr/
+PKG_LICENSE = MPLv1.1 or GPLv2+ or LGPLv2+
+PKG_SUMMARY = Netscape Portable Runtime.
+
+define PKG_DESCRIPTION
+ NSPR provides platform independence for non-GUI operating system \
+ facilities. These facilities include threads, thread synchronization, \
+ normal file and network I/O, interval timing and calendar time, basic \
+ memory management (malloc and free) and shared library linking.
+endef
+
+PKG_TARBALL = $(THISAPP).tar.gz
+
+PKG_PACKAGES += $(PKG_NAME_REAL)-devel
+
+# Original nspr-config is not suitable for our distribution,
+# because on different platforms it contains different dynamic content.
+# Therefore we produce an adjusted copy of nspr-config that will be
+# identical on all platforms.
+# However, we need to use original nspr-config to produce some variables
+# that go into nspr.pc for pkg-config.
+
+define STAGE_PREPARE
+ cd $(DIR_SRC) && $(DO_EXTRACT) $(DIR_DL)/$(PKG_TARBALL)
+
+ cp -vf $(DIR_APP)/mozilla/nsprpub/config/nspr-config.in \
+ $(DIR_APP)/mozilla/nsprpub/config/nspr-config-pc.in
+ cp -vf $(DIR_SOURCE)/nspr-config-vars.in \
+ $(DIR_APP)/mozilla/nsprpub/config/
+
+ $(DO_PATCHES)
+endef
+
+define STAGE_BUILD
+ cd $(DIR_APP) && $(DIR_APP)/mozilla/nsprpub/configure \
+ $(CONFIGURE_OPTIONS) \
+ --libdir=/lib \
+ --includedir=/usr/include/nspr4 \
+ --enable-optimize="$(CFLAGS)" \
+ --disable-debug
+
+ cd $(DIR_APP) && make
+endef
+
+define STAGE_INSTALL_CMDS
+ -mkdir -pv $(BUILDROOT)/usr/{bin,lib}
+ -mkdir -pv $(BUILDROOT)/lib
+ -mkdir -pv $(BUILDROOT)/usr/lib/pkgconfig
+
+ cp -vf $(DIR_APP)/config/nspr-config-pc \
+ $(BUILDROOT)/usr/bin/nspr-config
+
+ sed \
+ -e "s,%libdir%,/usr/lib,g" \
+ -e "s,%prefix%,/usr,g" \
+ -e "s,%exec_prefix%,/usr,g" \
+ -e "s,%includedir%,/usr/include/nspr4,g" \
+ -e "s,%NSPR_VERSION%,$(PKG_VER),g" \
+ -e "s,%FULL_NSPR_LIBS%,-L/usr/lib -lnspr4 -lplc4 -lplds4 -ldl -lpthread,g" \
+ -e "s,%FULL_NSPR_CFLAGS%,-I/usr/include/nspr4,g" \
+ < $(DIR_SOURCE)/nspr.pc.in \
+ > $(BUILDROOT)/usr/lib/pkgconfig/nspr.pc
+
+ #mv -v $(BUILDROOT)/usr/lib/lib{nspr,plc.plds}4.so $(BUILDROOT)/lib/
+ ln -svf ../../lib/libnspr4.so $(BUILDROOT)/usr/lib/libnspr4.so
+ ln -svf ../../lib/libplc4.so $(BUILDROOT)/usr/lib/libplc4.so
+ ln -svf ../../lib/libplds4.so $(BUILDROOT)/usr/lib/libplds4.so
+
+ # Remove unneeded stuff
+ rm -rfv \
+ $(BUILDROOT)/usr/bin/compile-et.pl \
+ $(BUILDROOT)/usr/bin/prerr.properties \
+ $(BUILDROOT)/usr/share/aclocal/nspr.m4 \
+ $(BUILDROOT)/usr/include/nspr4/md
+endef
diff --git a/pkgs/core/nspr/nspr.pc.in b/pkgs/core/nspr/nspr.pc.in
new file mode 100644
index 0000000..1d8f4a0
--- /dev/null
+++ b/pkgs/core/nspr/nspr.pc.in
@@ -0,0 +1,10 @@
+prefix=%prefix%
+exec_prefix=%exec_prefix%
+libdir=%libdir%
+includedir=%includedir%
+
+Name: NSPR
+Description: The Netscape Portable Runtime
+Version: %NSPR_VERSION%
+Libs: %FULL_NSPR_LIBS%
+Cflags: %FULL_NSPR_CFLAGS%
diff --git a/pkgs/core/nspr/patches/nspr-config-pc.patch b/pkgs/core/nspr/patches/nspr-config-pc.patch
new file mode 100644
index 0000000..24b1123
--- /dev/null
+++ b/pkgs/core/nspr/patches/nspr-config-pc.patch
@@ -0,0 +1,48 @@
+--- a/bmozilla/nsprpub/config/nspr-config-pc.in.x123 2005-05-11 02:53:41.000000000 +0200
++++ b/mozilla/nsprpub/config/nspr-config-pc.in 2006-05-24 20:52:12.000000000 +0200
+@@ -98,7 +98,7 @@
+ includedir=@includedir@
+ fi
+ if test -z "$libdir"; then
+- libdir=@libdir@
++ libdir=`pkg-config --variable=libdir nspr`
+ fi
+
+ if test "$echo_prefix" = "yes"; then
+@@ -132,12 +132,12 @@
+ if test -n "$lib_nspr"; then
+ libdirs="$libdirs -lnspr${major_version}"
+ fi
+- os_ldflags="@LDFLAGS@"
++ os_ldflags=`pkg-config --variable=ldflags nspr`
+ for i in $os_ldflags ; do
+ if echo $i | grep \^-L >/dev/null; then
+ libdirs="$libdirs $i"
+ fi
+ done
+- echo $libdirs @OS_LIBS@
++ echo $libdirs `pkg-config --variable=os_libs nspr`
+ fi
+
+--- a/mozilla/nsprpub/configure.in.x123 2006-05-24 20:52:12.000000000 +0200
++++ b/mozilla/nsprpub/configure.in 2006-05-24 20:53:53.000000000 +0200
+@@ -2667,6 +2667,8 @@
+ config/nsprincl.mk
+ config/nsprincl.sh
+ config/nspr-config
++config/nspr-config-pc
++config/nspr-config-vars
+ lib/Makefile
+ lib/ds/Makefile
+ lib/libc/Makefile
+--- a/mozilla/nsprpub/configure.x123 2006-05-24 20:52:12.000000000 +0200
++++ b/mozilla/nsprpub/configure 2006-05-24 20:54:05.000000000 +0200
+@@ -5899,6 +5899,8 @@
+ config/nsprincl.mk
+ config/nsprincl.sh
+ config/nspr-config
++config/nspr-config-pc
++config/nspr-config-vars
+ lib/Makefile
+ lib/ds/Makefile
+ lib/libc/Makefile
diff --git a/pkgs/core/nss-softokn/nss-softokn-config.in b/pkgs/core/nss-softokn/nss-softokn-config.in
new file mode 100644
index 0000000..f46ba24
--- /dev/null
+++ b/pkgs/core/nss-softokn/nss-softokn-config.in
@@ -0,0 +1,116 @@
+#!/bin/sh
+
+prefix=@prefix@
+
+major_version=@MOD_MAJOR_VERSION@
+minor_version=@MOD_MINOR_VERSION@
+patch_version=@MOD_PATCH_VERSION@
+
+usage()
+{
+ cat <<EOF
+Usage: nss-softokn-config [OPTIONS] [LIBRARIES]
+Options:
+ [--prefix[=DIR]]
+ [--exec-prefix[=DIR]]
+ [--includedir[=DIR]]
+ [--libdir[=DIR]]
+ [--version]
+ [--libs]
+ [--cflags]
+Dynamic Libraries:
+ softokn3 - Requires full dynamic linking
+ freebl3 - for internal use only (and glibc for self-integrity check)
+ nssdbm3 - for internal use only
+Dymamically linked
+EOF
+ exit $1
+}
+
+if test $# -eq 0; then
+ usage 1 1>&2
+fi
+
+while test $# -gt 0; do
+ case "$1" in
+ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+ *) optarg= ;;
+ esac
+
+ case $1 in
+ --prefix=*)
+ prefix=$optarg
+ ;;
+ --prefix)
+ echo_prefix=yes
+ ;;
+ --exec-prefix=*)
+ exec_prefix=$optarg
+ ;;
+ --exec-prefix)
+ echo_exec_prefix=yes
+ ;;
+ --includedir=*)
+ includedir=$optarg
+ ;;
+ --includedir)
+ echo_includedir=yes
+ ;;
+ --libdir=*)
+ libdir=$optarg
+ ;;
+ --libdir)
+ echo_libdir=yes
+ ;;
+ --version)
+ echo ${major_version}.${minor_version}.${patch_version}
+ ;;
+ --cflags)
+ echo_cflags=yes
+ ;;
+ --libs)
+ echo_libs=yes
+ ;;
+ *)
+ usage 1 1>&2
+ ;;
+ esac
+ shift
+done
+
+# Set variables that may be dependent upon other variables
+if test -z "$exec_prefix"; then
+ exec_prefix=`pkg-config --variable=exec_prefix nss-softokn`
+fi
+if test -z "$includedir"; then
+ includedir=`pkg-config --variable=includedir nss-softokn`
+fi
+if test -z "$libdir"; then
+ libdir=`pkg-config --variable=libdir nss-softokn`
+fi
+
+if test "$echo_prefix" = "yes"; then
+ echo $prefix
+fi
+
+if test "$echo_exec_prefix" = "yes"; then
+ echo $exec_prefix
+fi
+
+if test "$echo_includedir" = "yes"; then
+ echo $includedir
+fi
+
+if test "$echo_libdir" = "yes"; then
+ echo $libdir
+fi
+
+if test "$echo_cflags" = "yes"; then
+ echo -I$includedir
+fi
+
+if test "$echo_libs" = "yes"; then
+ libdirs="-Wl,-rpath-link,$libdir -L$libdir"
+ echo $libdirs
+fi
+
diff --git a/pkgs/core/nss-softokn/nss-softokn.nm b/pkgs/core/nss-softokn/nss-softokn.nm
new file mode 100644
index 0000000..b44ab3c
--- /dev/null
+++ b/pkgs/core/nss-softokn/nss-softokn.nm
@@ -0,0 +1,131 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include $(PKGROOT)/Include
+
+PKG_NAME = nss-softokn
+PKG_VER = 3.12.8
+PKG_REL = 0
+
+PKG_MAINTAINER =
+PKG_GROUP = System/Libraries
+PKG_URL = http://www.mozilla.org/projects/security/pki/nss/
+PKG_LICENSE = MPLv1.1 or GPLv2+ or LGPLv2+
+PKG_SUMMARY = Network Security Services Softoken Module.
+
+PKG_BUILD_DEPS+= nspr-devel nss-util-devel perl pkg-config psmisc sqlite-devel \
+ zlib-devel
+
+define PKG_DESCRIPTION
+ Network Security Services Softoken Cryptographic Module.
+endef
+
+PKG_TARBALL = $(THISAPP)-stripped.tar.bz2
+
+PKG_PACKAGES += $(PKG_NAME_REAL)-devel
+
+PKG_DEPS-$(PKG_NAME_REAL)-devel += nss-util-devel
+
+# Mozilla does no versioning :(
+define PKG_FILES-$(PKG_NAME_REAL)-devel
+ /usr/bin/*-config
+ /usr/include
+ /usr/lib/libfreebl3.so
+ /usr/lib/pkgconfig
+endef
+
+## Define some global environment variables
+
+export FREEBL_NO_DEPEND=1
+export FREEBL_USE_PRELINK=1
+
+# Enable compiler optimizations and disable debugging code
+export BUILD_OPT=1
+export XCFLAGS=$(CFLAGS)
+
+export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
+export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
+
+export NSPR_INCLUDE_DIR=/usr/include/nspr4
+export NSPR_LIB_DIR=/usr/lib
+
+export NSS_INCLUDE_DIR=/usr/include/nss3
+export NSS_LIB_DIR=/usr/lib
+
+export NSS_USE_SYSTEM_SQLITE=1
+
+define STAGE_BUILD
+ cd $(DIR_APP) && make -C ./mozilla/security/coreconf
+ cd $(DIR_APP) && make -C ./mozilla/security/dbm
+ cd $(DIR_APP) && make -C ./mozilla/security/nss
+endef
+
+define STAGE_INSTALL
+ -mkdir -pv $(BUILDROOT)/lib
+ -mkdir -pv $(BUILDROOT)/usr/include/nss3
+ -mkdir -pv $(BUILDROOT)/usr/{bin,lib}
+ -mkdir -pv $(BUILDROOT)/usr/lib/pkgconfig
+ -mkdir -pv $(BUILDROOT)/usr/lib/nss/unsupported-tools
+
+ install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/lib/libsoftokn3.so \
+ $(BUILDROOT)/usr/lib
+ install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/lib/libnssdbm3.so \
+ $(BUILDROOT)/usr/lib
+ install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/lib/libfreebl3.so \
+ $(BUILDROOT)/lib
+ ln -svf ../../lib/libfreebl3.so $(BUILDROOT)/usr/lib/libfreebl3.so
+
+ # Copy the binaries we ship as unsupported
+ install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/bin/shlibsign $(BUILDROOT)/usr/lib/nss/unsupported-tools
+
+ sed -e "s,@libdir@,/usr/lib,g" \
+ -e "s,@prefix@,/usr,g" \
+ -e "s,@exec_prefix@,/usr,g" \
+ -e "s,@includedir@,/usr/include/nss3,g" \
+ -e "s,@MOD_MAJOR_VERSION@,$$(grep "#define.*SOFTOKEN_VMAJOR" $(DIR_APP)/mozilla/security/nss/lib/softoken/softkver.h | awk '{print $3}'),g" \
+ -e "s,@MOD_MINOR_VERSION@,$$(grep "#define.*SOFTOKEN_VMINOR" $(DIR_APP)/mozilla/security/nss/lib/softoken/softkver.h | awk '{print $3}'),g" \
+ -e "s,@MOD_PATCH_VERSION@,$$(grep "#define.*SOFTOKEN_VPATCH" $(DIR_APP)/mozilla/security/nss/lib/softoken/softkver.h | awk '{print $3}'),g" \
+ < $(DIR_SOURCE)/nss-softokn-config.in \
+ > $(BUILDROOT)/usr/bin/nss-softokn-config
+ chmod -v 755 $(BUILDROOT)/usr/bin/nss-softokn-config
+
+ # XXX need to fix this
+ sed \
+ -e "s,%libdir%,/usr/lib,g" \
+ -e "s,%prefix%,/usr,g" \
+ -e "s,%exec_prefix%,/usr,g" \
+ -e "s,%includedir%,/usr/include/nss3,g" \
+ -e "s,%NSS_VERSION%,$(PKG_VER),g" \
+ -e "s,%NSPR_VERSION%,$$(nspr-config --version),g" \
+ -e "s,%NSSUTIL_VERSION%,$$(nss-util-config --version),g" \
+ -e "s,%SOFTOKEN_VERSION%,$(PKG_VER),g" \
+ < $(DIR_SOURCE)/nss-softokn.pc.in \
+ > $(BUILDROOT)/usr/lib/pkgconfig/nss-softokn.pc
+
+ # Copy the include files we want
+ cp -vf $(DIR_APP)/mozilla/dist/public/nss/*.h $(BUILDROOT)/usr/include/nss3
+ cp -vf $(DIR_APP)/mozilla/dist/private/nss/blapi.h \
+ $(BUILDROOT)/usr/include/nss3
+ chmod -v 644 $(BUILDROOT)/usr/include/nss3/*.h
+endef
diff --git a/pkgs/core/nss-softokn/nss-softokn.pc.in b/pkgs/core/nss-softokn/nss-softokn.pc.in
new file mode 100644
index 0000000..b7fc3d1
--- /dev/null
+++ b/pkgs/core/nss-softokn/nss-softokn.pc.in
@@ -0,0 +1,11 @@
+prefix=%prefix%
+exec_prefix=%exec_prefix%
+libdir=%libdir%
+includedir=%includedir%
+
+Name: NSS-SOFTOKN
+Description: Network Security Services Softoken PKCS #11 Module
+Version: %SOFTOKEN_VERSION%
+Requires: nspr >= %NSPR_VERSION%, nss-util >= %NSSUTIL_VERSION%
+Libs: -lfreebl3 -lnssdbm3 -lsoftokn3
+Cflags: -I${includedir}
diff --git a/pkgs/core/nss-softokn/nss-softokn.spec b/pkgs/core/nss-softokn/nss-softokn.spec
new file mode 100644
index 0000000..9f405d3
--- /dev/null
+++ b/pkgs/core/nss-softokn/nss-softokn.spec
@@ -0,0 +1,462 @@
+%global nspr_version 4.8.6
+%global nss_name nss
+%global nss_util_version 3.12.8
+%global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
+%global saved_files_dir %{_libdir}/nss/saved
+
+# Produce .chk files for the final stripped binaries
+%define __spec_install_post \
+ %{?__debug_package:%{__debug_install_post}} \
+ %{__arch_install_post} \
+ %{__os_install_post} \
+ $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_libdir}/libsoftokn3.so \
+ $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libfreebl3.so \
+ $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_libdir}/libnssdbm3.so \
+%{nil}
+
+Summary: Network Security Services Softoken Module
+Name: nss-softokn
+Version: 3.12.8
+Release: 2%{?dist}
+License: MPLv1.1 or GPLv2+ or LGPLv2+
+URL: http://www.mozilla.org/projects/security/pki/nss/
+Group: System Environment/Libraries
+Requires: nspr >= %{nspr_version}
+Requires: nss-util >= %{nss_util_version}
+Requires: nss-softokn-freebl%{_isa} >= %{version}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: nspr-devel >= %{nspr_version}
+BuildRequires: nss-util-devel >= %{nss_util_version}
+BuildRequires: sqlite-devel
+BuildRequires: zlib-devel
+BuildRequires: pkgconfig
+BuildRequires: gawk
+BuildRequires: psmisc
+BuildRequires: perl
+
+Source0: %{name}-%{version}-stripped.tar.bz2
+# The nss-softokn tar ball is a subset of nss-{version}-stripped.tar.bz2,
+# Therefore we use the nss-split-softokn.sh script to keep only what we need.
+# Download the nss tarball via git from the nss propect and follow these
+# steps to make the tarball for nss-util out of the one for nss:
+# fedpkg clone nss
+# fedpkg clone nss-softokn
+# cd nss-softokn
+# cp ../../nss/devel/${version}-stripped.tar.bz2 .
+# sh ./nss-split-softokn.sh ${version}
+# A file named {name}-{version}-stripped.tar.bz2 should appear
+Source1: nss-split-softokn.sh
+Source2: nss-softokn.pc.in
+Source3: nss-softokn-config.in
+
+Patch2: nss-softokn-3.12.4-prelink.patch
+Patch3: nss-softokn-3.12.4-fips-fix.patch
+
+%description
+Network Security Services Softoken Cryptographic Module
+
+%package freebl
+Summary: Freebl library for the Network Security Services
+Group: System Environment/Base
+Conflicts: nss < 3.12.2.99.3-5
+Conflicts: prelink < 0.4.3
+
+%description freebl
+NSS Softoken Cryptographic Module Freelb Library
+
+Install the nss-softokn-freebl package if you need the freebl
+library.
+
+%package freebl-devel
+Summary: Header and Library files for doing development with the Freebl library for NSS
+Group: System Environment/Base
+Provides: nss-softokn-freebl-static = %{version}-%{release}
+Requires: nss-softokn-freebl%{?_isa} = %{version}-%{release}
+
+%description freebl-devel
+NSS Softoken Cryptographic Module Freelb Library Development Tools
+
+%package devel
+Summary: Development libraries for Network Security Services
+Group: Development/Libraries
+Requires: nss-softokn%{?_isa} = %{version}-%{release}
+Requires: nspr-devel >= %{nspr_version}
+Requires: nss-util-devel >= %{nss_util_version}
+Requires: pkgconfig
+BuildRequires: nspr-devel >= %{nspr_version}
+BuildRequires: nss-util-devel >= %{nss_util_version}
+# require nss at least the version when we split via subpackages
+BuildRequires: nss-devel >= 3.12.2.99.3-11
+
+%description devel
+Header and Library files for doing development with Network Security Services.
+
+
+%prep
+%setup -q
+
+%patch2 -p0 -b .prelink
+%patch3 -p0 -b .fipsfix
+
+
+%build
+
+FREEBL_NO_DEPEND=1
+export FREEBL_NO_DEPEND
+
+FREEBL_USE_PRELINK=1
+export FREEBL_USE_PRELINK
+
+# Enable compiler optimizations and disable debugging code
+BUILD_OPT=1
+export BUILD_OPT
+
+# Generate symbolic info for debuggers
+XCFLAGS=$RPM_OPT_FLAGS
+export XCFLAGS
+
+PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
+PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
+
+export PKG_CONFIG_ALLOW_SYSTEM_LIBS
+export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS
+
+NSPR_INCLUDE_DIR=`/usr/bin/pkg-config --cflags-only-I nspr | sed 's/-I//'`
+NSPR_LIB_DIR=`/usr/bin/pkg-config --libs-only-L nspr | sed 's/-L//'`
+
+export NSPR_INCLUDE_DIR
+export NSPR_LIB_DIR
+
+NSS_INCLUDE_DIR=`/usr/bin/pkg-config --cflags-only-I nss-util | sed 's/-I//'`
+NSS_LIB_DIR=`/usr/bin/pkg-config --libs-only-L nss-util | sed 's/-L//'`
+
+export NSS_INCLUDE_DIR
+export NSS_LIB_DIR
+
+NSS_USE_SYSTEM_SQLITE=1
+export NSS_USE_SYSTEM_SQLITE
+
+%ifarch x86_64 ppc64 ia64 s390x sparc64
+USE_64=1
+export USE_64
+%endif
+
+# Compile softokn plus needed support
+%{__make} -C ./mozilla/security/coreconf
+%{__make} -C ./mozilla/security/dbm
+%{__make} -C ./mozilla/security/nss
+
+# Set up our package file
+# The nspr_version and nss_util_version globals used here
+# must match the ones nss-softokn has for its Requires.
+%{__mkdir_p} ./mozilla/dist/pkgconfig
+%{__cat} %{SOURCE2} | sed -e "s,%%libdir%%,%{_libdir},g" \
+ -e "s,%%prefix%%,%{_prefix},g" \
+ -e "s,%%exec_prefix%%,%{_prefix},g" \
+ -e "s,%%includedir%%,%{_includedir}/nss3,g" \
+ -e "s,%%NSPR_VERSION%%,%{nspr_version},g" \
+ -e "s,%%NSSUTIL_VERSION%%,%{nss_util_version},g" \
+ -e "s,%%SOFTOKEN_VERSION%%,%{version},g" > \
+ ./mozilla/dist/pkgconfig/nss-softokn.pc
+
+SOFTOKEN_VMAJOR=`cat mozilla/security/nss/lib/softoken/softkver.h | grep "#define.*SOFTOKEN_VMAJOR" | awk '{print $3}'`
+SOFTOKEN_VMINOR=`cat mozilla/security/nss/lib/softoken/softkver.h | grep "#define.*SOFTOKEN_VMINOR" | awk '{print $3}'`
+SOFTOKEN_VPATCH=`cat mozilla/security/nss/lib/softoken/softkver.h | grep "#define.*SOFTOKEN_VPATCH" | awk '{print $3}'`
+
+export SOFTOKEN_VMAJOR
+export SOFTOKEN_VMINOR
+export SOFTOKEN_VPATCH
+
+%{__cat} %{SOURCE3} | sed -e "s,@libdir@,%{_libdir},g" \
+ -e "s,@prefix@,%{_prefix},g" \
+ -e "s,@exec_prefix@,%{_prefix},g" \
+ -e "s,@includedir@,%{_includedir}/nss3,g" \
+ -e "s,@MOD_MAJOR_VERSION@,$SOFTOKEN_VMAJOR,g" \
+ -e "s,@MOD_MINOR_VERSION@,$SOFTOKEN_VMINOR,g" \
+ -e "s,@MOD_PATCH_VERSION@,$SOFTOKEN_VPATCH,g" \
+ > ./mozilla/dist/pkgconfig/nss-softokn-config
+
+chmod 755 ./mozilla/dist/pkgconfig/nss-softokn-config
+
+
+# enable the following line to force a test failure
+# find ./mozilla -name \*.chk | xargs rm -f
+
+#
+# We can't run a subset of the tests because the tools have
+# dependencies on nss libraries outside of softokn.
+# Let's leave this as a place holder.
+#
+
+
+%install
+
+%{__rm} -rf $RPM_BUILD_ROOT
+
+# There is no make install target so we'll do it ourselves.
+
+%{__mkdir_p} $RPM_BUILD_ROOT/%{_includedir}/nss3
+%{__mkdir_p} $RPM_BUILD_ROOT/%{_bindir}
+%{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}
+%{__mkdir_p} $RPM_BUILD_ROOT/%{_lib}
+%{__mkdir_p} $RPM_BUILD_ROOT/%{unsupported_tools_directory}
+%{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
+%{__mkdir_p} $RPM_BUILD_ROOT/%{saved_files_dir}
+
+# Copy the binary libraries we want
+for file in libsoftokn3.so libnssdbm3.so
+do
+ %{__install} -p -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir}
+done
+
+# Because libcrypt depends on libfreebl3.so, it is special
+# so we install it in /lib{64}, keeping a symbolic link to it
+# back in /usr/lib{64} to keep everyone else working
+for file in libfreebl3.so
+do
+ %{__install} -p -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_lib}
+ ln -sf ../../%{_lib}/libfreebl3.so $RPM_BUILD_ROOT/%{_libdir}/libfreebl3.so
+done
+
+# Make sure chk files can be found in both places
+for file in libfreebl3.chk
+do
+ ln -s ../../%{_lib}/$file $RPM_BUILD_ROOT/%{_libdir}/$file
+done
+
+# Copy the binaries we ship as unsupported
+for file in shlibsign
+do
+ %{__install} -p -m 755 mozilla/dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{unsupported_tools_directory}
+done
+
+# Copy the include files we want
+for file in mozilla/dist/public/nss/*.h
+do
+ %{__install} -p -m 644 $file $RPM_BUILD_ROOT/%{_includedir}/nss3
+done
+
+# Copy a freebl include file we also want
+for file in mozilla/dist/private/nss/blapi.h
+do
+ %{__install} -p -m 644 $file $RPM_BUILD_ROOT/%{_includedir}/nss3
+done
+
+# Copy the static freebl library
+for file in libfreebl.a
+do
+%{__install} -p -m 644 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir}
+done
+
+# Copy the package configuration files
+%{__install} -p -m 644 ./mozilla/dist/pkgconfig/nss-softokn.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nss-softokn.pc
+%{__install} -p -m 755 ./mozilla/dist/pkgconfig/nss-softokn-config $RPM_BUILD_ROOT/%{_bindir}/nss-softokn-config
+
+%clean
+%{__rm} -rf $RPM_BUILD_ROOT
+
+
+%post
+/sbin/ldconfig >/dev/null 2>/dev/null
+
+%postun
+/sbin/ldconfig >/dev/null 2>/dev/null
+
+%files
+%defattr(-,root,root)
+%{_libdir}/libnssdbm3.so
+%{_libdir}/libnssdbm3.chk
+%{_libdir}/libsoftokn3.so
+%{_libdir}/libsoftokn3.chk
+# shared with nss-tools
+%dir %{_libdir}/nss
+%dir %{saved_files_dir}
+%dir %{unsupported_tools_directory}
+%{unsupported_tools_directory}/shlibsign
+
+%files freebl
+%defattr(-,root,root)
+/%{_lib}/libfreebl3.so
+/%{_lib}/libfreebl3.chk
+# and these symbolic links
+%{_libdir}/libfreebl3.so
+%{_libdir}/libfreebl3.chk
+
+%files freebl-devel
+%defattr(-,root,root)
+%{_libdir}/libfreebl.a
+%{_includedir}/nss3/blapi.h
+
+%files devel
+%defattr(-,root,root)
+%{_libdir}/pkgconfig/nss-softokn.pc
+%{_bindir}/nss-softokn-config
+
+# co-owned with nss
+%dir %{_includedir}/nss3
+#
+# The following headers are those exported public in
+# mozilla/security/nss/lib/freebl/manifest.mn and
+# mozilla/security/nss/lib/softoken/manifest.mn
+#
+# The following list is short because many headers, such as
+# the pkcs #11 ones, have been provided by nss-util-devel
+# which installed them before us.
+#
+%{_includedir}/nss3/blapit.h
+%{_includedir}/nss3/ecl-exp.h
+%{_includedir}/nss3/hasht.h
+%{_includedir}/nss3/sechash.h
+%{_includedir}/nss3/nsslowhash.h
+%{_includedir}/nss3/secmodt.h
+%{_includedir}/nss3/shsign.h
+
+%changelog
+* Wed Sep 29 2010 jkeating - 3.12.8-2
+- Rebuilt for gcc bug 634757
+
+* Thu Sep 23 2010 Elio Maldonado <emaldona(a)redhat.com> - 3.12.8-1
+- Update to 3.12.8
+- Adhere to static library packaging guidelines (#609613)
+- Fix nss-util-devel version dependency line
+- Shorten freebl and freebl subpackages descriptions
+
+* Sat Sep 18 2010 Elio Maldonado <emaldona(a)redhat.com> - 3.12.99.4-1
+- NSS 3.12.8 RC0
+
+* Sat Sep 12 2010 Elio Maldonado <emaldona(a)redhat.com> - 3.12.7.99.3-2
+- Update the required version of nss-util to 3.12.7.99.3
+
+* Sat Sep 04 2010 Elio Maldonado <emaldona(a)redhat.com> - 3.12.7.99.3-1
+- NSS 3.12.8 Beta 3
+
+* Mon Aug 30 2010 Elio Maldonado <emaldona(a)redhat.com> - 3.12.7-3
+- Update BuildRequires on nspr-devel and nss-util-devel
+
+* Sat Aug 29 2010 Elio Maldonado <emaldona(a)redhat.com> - 3.12.7-2
+- Define NSS_USE_SYSTEM_SQLITE and remove nss-nolocalsql patch
+- Fix rpmlint warnings about macros in comments and changelog
+
+* Mon Aug 16 2010 Elio Maldonado <emaldona(a)redhat.com> - 3.12.7-1
+- Update to 3.12.7
+- Fix build files to ensure nsslowhash.h is included in public headers
+
+* Tue Jun 08 2010 Elio Maldonado <emaldona(a)redhat.com> - 3.12.6-3
+- Retagging
+
+* Mon Jun 07 2010 Elio Maldonado <emaldona(a)redhat.com> - 3.12.6-2
+- Bump NVR to be greater than those for nss-softokn subpackages in F11 (rhbz#601407)
+
+* Sun Jun 06 2010 Elio Maldonado <emaldona(a)redhat.com> - 3.12.4-23
+- Bump release number
+
+* Fri Jun 04 2010 Elio Maldonado <emaldona(a)redhat.com> - 3.12.4-22
+- Cleanup changelog comments to avoid unwanted macro expansions
+
+* Wed Jun 02 2010 Elio Maldonado <emaldona(a)redhat.com> - 3.12.4-21
+- Retagging
+
+* Wed Jun 02 2010 Elio Maldonado <emaldona(a)redhat.com> - 3.12.4-20
+- Add %%{?_isa} to the requires in the devel packages (#596840)
+- Fix typo in the package description (#598295)
+- Update nspr version to 4.8.4
+
+* Sat May 08 2010 Elio Maldonado <emaldona(a)redhat.com> - 3.12.4-19
+- Consider the system as not fips enabled when /proc/sys/crypto/fips_enabled isn't present (rhbz#590199)
+
+* Sat May 08 2010 Elio Maldonado <emaldona(a)redhat.com> - 3.12.4-18
+- Fix Conflicts line to prevent update when prelink is not yet the right version (rhbz#590199)
+
+* Mon Apr 19 2010 Elio Maldonado <emaldona(a)redhat.com> - 3.12.4-17
+- Updated prelink patch rhbz#504949
+
+* Wed Apr 15 2010 Elio Maldonado <emaldona(a)redhat.com> - 3.12.4-16
+- allow prelink of softoken and freebl. Change the verify code to use
+ prelink -u if prelink is installed. Fix by Robert Relyea rhbz#504949
+
+* Mon Jan 18 2010 Elio Maldonado <emaldona(a)redhat.com> - 3.12.4-15
+- Move libfreebl3.so and its .chk file to /lib{64} (rhbz#561544)
+
+* Mon Jan 18 2010 Elio Maldonado <emaldona(a)redhat.com> - 3.12.4-13
+- Fix in nss-softokn-spec.in
+- Require nss-util >= 3.12.4
+
+* Thu Dec 03 2009 Elio Maldonado<emaldona(a)redhat.com> - 3.12.4-12
+- Require nss-util 3.12.5
+
+* Fri Nov 20 2009 Elio Maldonado<emaldona(a)redhat.com> - 3.12.4-11
+- export freebl devel tools (#538226)
+
+* Tue Sep 23 2009 Elio Maldonado<emaldona(a)redhat.com> - 3.12.4-10
+- Fix paths in nss-softokn-prelink so signed libraries don't get touched, rhbz#524794
+
+* Thu Sep 17 2009 Elio Maldonado<emaldona(a)redhat.com> - 3.12.4-9
+- Add nssdbm3.so to nss-softokn-prelink.conf, rhbz#524077
+
+* Thu Sep 10 2009 Elio Maldonado<emaldona(a)redhat.com> - 3.12.4-8
+- Retagging for a chained build
+
+* Thu Sep 10 2009 Elio Maldonado<emaldona(a)redhat.com> - 3.12.4-6
+- Don't list libraries in nss-softokn-config, dynamic linking required
+
+* Tue Sep 08 2009 Elio Maldonado<emaldona(a)redhat.com> - 3.12.4-5
+- Installing shared libraries to %%{_libdir}
+
+* Sun Sep 06 2009 Elio Maldonado<emaldona(a)redhat.com> - 3.12.4-4
+- Postuninstall scriptlet finishes quietly
+
+* Sat Sep 05 2009 Elio Maldonado<emaldona(a)redhat.com> - 3.12.4-3
+- Remove symblic links to shared libraries from devel, rhbz#521155
+- Apply the nss-nolocalsql patch
+- No rpath-link in nss-softokn-config
+
+* Fri Sep 04 2009 serstring=Elio Maldonado<emaldona(a)redhat.cpm> - 3.12.4-2
+- Retagging to pick up the correct .cvsignore
+
+* Tue Sep 01 2009 Elio Maldonado<emaldona(a)redhat.com> - 3.12.4-1
+- Update to 3.12.4
+- Fix logic on postun
+- Don't require sqlite
+
+* Mon Aug 31 2009 Elio Maldonado<emaldona(a)redhat.com> - 3.12.3.99.3-24
+- Fixed test on %postun to avoid returning 1 when nss-softokn instances still remain
+
+* Sun Aug 30 2009 Elio Maldonado<emaldona(a)redhat.com> - 3.12.3.99.3-23
+- Explicitly state via nss_util_version the nss-util version we require
+
+* Fri Aug 28 2009 Warren Togami <wtogami(a)redhat.com> - 3.12.3.99.3-22
+- caolan's nss-softokn.pc patch
+
+* Thu Aug 27 2009 Elio Maldonado<emaldona(a)redhat.com> - 3.12.3.99.3-21
+- Bump the release number for a chained build of nss-util, nss-softokn and nss
+
+* Thu Aug 27 2009 Elio Maldonado<emaldona(a)redhat.com> - 3.12.3.99.3-20
+- List freebl, nssdbm and softokn libraries in nss-softokn-config and nss-softokn.pc
+
+* Thu Aug 27 2009 Elio Maldonado@<emaldona(a)redhat.com> - 3.12.3.99.3-19
+- Determine NSSUTIL_INCLUDE_DIR and NSSUTIL_LIB_DIR with a pkg-config query on nss-util
+- Remove the release 17 hack
+
+* Wed Aug 27 2009 Elio maldonado<emaldona(a)redhat.com> - 3.12.3.99.3-18
+- fix spurious executable permissions on nss-softokn.pc
+
+* Thu Aug 27 2009 Adel Gadllah <adel.gadllah(a)gmail.com> - 3.12.3.99.3-17
+- Add hack to fix build
+
+* Tue Aug 25 2009 Dennis Gilmore <dennis(a)ausil.us> - 3.12.3.99.3-16
+- only have a single Requires: line in the .pc file
+
+* Tue Aug 25 2009 Dennis Gilmore <dennis(a)ausil.us> - 3.12.3.99.3-12
+- bump to unique rpm nvr
+
+* Tue Aug 25 2009 Elio Maldonado<emaldona(a)redhat.com> - 3.12.3.99.3-10
+- Build after nss with subpackages and new nss-util
+
+* Thu Aug 20 2009 Dennis Gilmore <dennis(a)ausil.us> 3.12.3.99.3-9
+- revert to shipping bits
+
+* Thu Aug 19 2009 Elio Maldonado <emaldona(a)redhat.com> 3.12.3.99.3-8.1
+- Disable installing until conflicts are relsoved
+
+* Thu Aug 19 2009 Elio Maldonado <emaldona(a)redhat.com> 3.12.3.99.3-8
+- Initial build
diff --git a/pkgs/core/nss-softokn/patches/nss-softokn-3.12.4-fips-fix.patch b/pkgs/core/nss-softokn/patches/nss-softokn-3.12.4-fips-fix.patch
new file mode 100644
index 0000000..011a148
--- /dev/null
+++ b/pkgs/core/nss-softokn/patches/nss-softokn-3.12.4-fips-fix.patch
@@ -0,0 +1,12 @@
+diff -up ./mozilla/security/nss/lib/freebl/nsslowhash.c.fips ./mozilla/security/nss/lib/freebl/nsslowhash.c
+--- ./mozilla/security/nss/lib/freebl/nsslowhash.c.fips 2010-09-04 20:23:14.764313661 -0700
++++ ./mozilla/security/nss/lib/freebl/nsslowhash.c 2010-09-04 20:25:52.622313780 -0700
+@@ -275,7 +275,7 @@ static int nsslow_GetFIPSEnabled(void) {
+
+ f = fopen("/proc/sys/crypto/fips_enabled", "r");
+ if (!f)
+- return 1;
++ return 0;
+
+ size = fread(&d, 1, 1, f);
+ fclose(f);
diff --git a/pkgs/core/nss-softokn/patches/nss-softokn-3.12.4-prelink.patch b/pkgs/core/nss-softokn/patches/nss-softokn-3.12.4-prelink.patch
new file mode 100644
index 0000000..5f2e46f
--- /dev/null
+++ b/pkgs/core/nss-softokn/patches/nss-softokn-3.12.4-prelink.patch
@@ -0,0 +1,298 @@
+diff -up ./mozilla/security/nss/lib/freebl/Makefile.prelink ./mozilla/security/nss/lib/freebl/Makefile
+--- ./mozilla/security/nss/lib/freebl/Makefile.prelink 2010-09-04 14:13:58.846327263 -0700
++++ ./mozilla/security/nss/lib/freebl/Makefile 2010-09-04 14:15:11.544326993 -0700
+@@ -82,6 +82,12 @@ ifeq ($(FREEBL_NO_DEPEND),1)
+ else
+ MAPFILE_SOURCE = freebl.def
+ endif
++ifdef FREEBL_USE_PRELINK
++ DEFINES += -DFREEBL_USE_PRELINK
++endif
++ifdef FREEBL_PRELINK_COMMAND
++ DEFINES +=-DFREEBL_PRELINK_COMMAND=\"$(FREEBL_PRELINK_COMMAND)\"
++endif
+ # NSS_X86 means the target is a 32-bits x86 CPU architecture
+ # NSS_X64 means the target is a 64-bits x64 CPU architecture
+ # NSS_X86_OR_X64 means the target is either x86 or x64
+diff -up ./mozilla/security/nss/lib/freebl/shvfy.c.prelink ./mozilla/security/nss/lib/freebl/shvfy.c
+--- ./mozilla/security/nss/lib/freebl/shvfy.c.prelink 2010-09-04 14:16:01.518326988 -0700
++++ ./mozilla/security/nss/lib/freebl/shvfy.c 2010-09-04 14:25:44.770326384 -0700
+@@ -48,6 +48,168 @@
+ #include "stdio.h"
+ #include "prmem.h"
+
++#ifdef FREEBL_USE_PRELINK
++#ifndef FREELB_PRELINK_COMMAND
++#define FREEBL_PRELINK_COMMAND "/usr/sbin/prelink -u -o -"
++#endif
++#include "private/pprio.h"
++
++#include <stdlib.h>
++#include <unistd.h>
++#include <fcntl.h>
++#include <sys/wait.h>
++#include <sys/stat.h>
++
++PRFileDesc *
++bl_OpenUnPrelink(const char *shName, int *pid)
++{
++ char *command= strdup(FREEBL_PRELINK_COMMAND);
++ char *argString = NULL;
++ char **argv = NULL;
++ char *shNameArg = NULL;
++ char *cp;
++ pid_t child;
++ int argc = 0, argNext = 0;
++ struct stat statBuf;
++ int pipefd[2] = {-1,-1};
++ int ret;
++
++ *pid = 0;
++
++ /* make sure the prelink command exists first. If not, fall back to
++ * just reading the file */
++ for (cp = command; *cp ; cp++) {
++ if (*cp == ' ') {
++ *cp++ = 0;
++ argString = cp;
++ break;
++ }
++ }
++ memset (&statBuf, 0, sizeof(statBuf));
++ /* stat the file, follow the link */
++ ret = stat(command, &statBuf);
++ if (ret < 0) {
++ free(command);
++ return PR_Open(shName, PR_RDONLY, 0);
++ }
++ /* file exits, make sure it's an executable */
++ if (!S_ISREG(statBuf.st_mode) ||
++ ((statBuf.st_mode & (S_IXUSR|S_IXGRP|S_IXOTH)) == 0)) {
++ free(command);
++ return PR_Open(shName, PR_RDONLY, 0);
++ }
++
++ /* OK, the prelink command exists and looks correct, use it */
++ /* build the arglist while we can still malloc */
++ /* count the args if any */
++ if (argString && *argString) {
++ /* argString may have leading spaces, strip them off*/
++ for (cp = argString; *cp && *cp == ' '; cp++);
++ argString = cp;
++ if (*cp) {
++ /* there is at least one arg.. */
++ argc = 1;
++ }
++
++ /* count the rest: Note there is no provision for escaped
++ * spaces here */
++ for (cp = argString; *cp ; cp++) {
++ if (*cp == ' ') {
++ while (*cp && *cp == ' ') cp++;
++ if (*cp) argc++;
++ }
++ }
++ }
++
++ /* add the additional args: argv[0] (command), shName, NULL*/
++ argc += 3;
++ argv = PORT_NewArray(char *, argc);
++ if (argv == NULL) {
++ goto loser;
++ }
++
++ /* fill in the arglist */
++ argv[argNext++] = command;
++ if (argString && *argString) {
++ argv[argNext++] = argString;
++ for (cp = argString; *cp; cp++) {
++ if (*cp == ' ') {
++ *cp++ = 0;
++ while (*cp && *cp == ' ') cp++;
++ if (*cp) argv[argNext++] = cp;
++ }
++ }
++ }
++ /* exec doesn't advertise taking const char **argv, do the paranoid
++ * copy */
++ shNameArg = strdup(shName);
++ if (shNameArg == NULL) {
++ goto loser;
++ }
++ argv[argNext++] = shNameArg;
++ argv[argNext++] = 0;
++
++ ret = pipe(pipefd);
++ if (ret < 0) {
++ goto loser;
++ }
++
++ /* use vfork() so we don't trigger the pthread_at_fork() handlers */
++ child = vfork();
++ if (child < 0) goto loser;
++ if (child == 0) {
++ /* set up the file descriptors */
++ close(0);
++ /* associate pipefd[1] with stdout */
++ if (pipefd[1] != 1) dup2(pipefd[1], 1);
++ close(2);
++ close(pipefd[0]);
++ /* should probably close the other file descriptors? */
++
++
++ execv(command, argv);
++ /* avoid at_exit() handlers */
++ _exit(1); /* shouldn't reach here except on an error */
++ }
++ close(pipefd[1]);
++ pipefd[1] = -1;
++
++ /* this is safe because either vfork() as full fork() semantics, and thus
++ * already has it's own address space, or because vfork() has paused
++ * the parent util the exec or exit */
++ free(command);
++ free(shNameArg);
++ PORT_Free(argv);
++
++ *pid = child;
++
++ return PR_ImportPipe(pipefd[0]);
++
++loser:
++ if (pipefd[0] != -1) {
++ close(pipefd[0]);
++ }
++ if (pipefd[1] != -1) {
++ close(pipefd[1]);
++ }
++ free(command);
++ free(shNameArg);
++ PORT_Free(argv);
++
++ return NULL;
++}
++
++void
++bl_CloseUnPrelink( PRFileDesc *file, int pid)
++{
++ /* close the file descriptor */
++ PR_Close(file);
++ /* reap the child */
++ if (pid) {
++ waitpid(pid, NULL, 0);
++ }
++}
++#endif
+
+ /* #define DEBUG_SHVERIFY 1 */
+
+@@ -117,6 +279,9 @@ BLAPI_SHVerify(const char *name, PRFuncP
+ SECStatus rv;
+ DSAPublicKey key;
+ int count;
++#ifdef FREEBL_USE_PRELINK
++ int pid = 0;
++#endif
+
+ PRBool result = PR_FALSE; /* if anything goes wrong,
+ * the signature does not verify */
+@@ -197,7 +362,11 @@ BLAPI_SHVerify(const char *name, PRFuncP
+ checkFD = NULL;
+
+ /* open our library file */
++#ifdef FREEBL_USE_PRELINK
++ shFD = bl_OpenUnPrelink(shName,&pid);
++#else
+ shFD = PR_Open(shName, PR_RDONLY, 0);
++#endif
+ if (shFD == NULL) {
+ #ifdef DEBUG_SHVERIFY
+ fprintf(stderr, "Failed to open the library file %s: (%d, %d)\n",
+@@ -218,7 +387,11 @@ BLAPI_SHVerify(const char *name, PRFuncP
+ SHA1_Update(hashcx, buf, bytesRead);
+ count += bytesRead;
+ }
++#ifdef FREEBL_USE_PRELINK
++ bl_CloseUnPrelink(shFD, pid);
++#else
+ PR_Close(shFD);
++#endif
+ shFD = NULL;
+
+ SHA1_End(hashcx, hash.data, &hash.len, hash.len);
+diff -up ./mozilla/security/nss/lib/freebl/stubs.c.prelink ./mozilla/security/nss/lib/freebl/stubs.c
+--- ./mozilla/security/nss/lib/freebl/stubs.c.prelink 2010-09-04 14:26:27.454327120 -0700
++++ ./mozilla/security/nss/lib/freebl/stubs.c 2010-09-04 14:31:56.778327428 -0700
+@@ -69,6 +69,7 @@
+ #include <secport.h>
+ #include <secitem.h>
+ #include <blapi.h>
++#include <private/pprio.h>
+
+ #define FREEBL_NO_WEAK 1
+
+@@ -157,6 +158,8 @@ STUB_DECLARE(void,PR_Lock,(PRLock *lock)
+ STUB_DECLARE(PRLock *,PR_NewLock,(void));
+ STUB_DECLARE(PRFileDesc *,PR_Open,(const char *name, PRIntn flags,
+ PRIntn mode));
++STUB_DECLARE(PRFileDesc *,PR_ImportFile,(PROsfd osfd));
++STUB_DECLARE(PRFileDesc *,PR_ImportPipe,(PROsfd osfd));
+ STUB_DECLARE(PRInt32,PR_Read,(PRFileDesc *fd, void *buf, PRInt32 amount));
+ STUB_DECLARE(PROffset32,PR_Seek,(PRFileDesc *fd, PROffset32 offset,
+ PRSeekWhence whence));
+@@ -295,6 +298,34 @@ PR_Open_stub(const char *name, PRIntn fl
+ return (PRFileDesc *)lfd;
+ }
+
++extern PRFileDesc *
++PR_ImportFile_stub(PROsfd fd)
++{
++ int *lfd = NULL;
++
++ STUB_SAFE_CALL1(PR_ImportFile, fd);
++
++ lfd = PORT_New_stub(int);
++ if (lfd != NULL) {
++ *lfd = fd;
++ }
++ return (PRFileDesc *)lfd;
++}
++
++extern PRFileDesc *
++PR_ImportPipe_stub(PROsfd fd)
++{
++ int *lfd = NULL;
++
++ STUB_SAFE_CALL1(PR_ImportPipe, fd);
++
++ lfd = PORT_New_stub(int);
++ if (lfd != NULL) {
++ *lfd = fd;
++ }
++ return (PRFileDesc *)lfd;
++}
++
+ extern PRStatus
+ PR_Close_stub(PRFileDesc *fd)
+ {
+@@ -492,6 +523,8 @@ freebl_InitNSPR(void *lib)
+ {
+ STUB_FETCH_FUNCTION(PR_Free);
+ STUB_FETCH_FUNCTION(PR_Open);
++ STUB_FETCH_FUNCTION(PR_ImportFile);
++ STUB_FETCH_FUNCTION(PR_ImportPipe);
+ STUB_FETCH_FUNCTION(PR_Close);
+ STUB_FETCH_FUNCTION(PR_Read);
+ STUB_FETCH_FUNCTION(PR_Seek);
+diff -up ./mozilla/security/nss/lib/freebl/stubs.h.prelink ./mozilla/security/nss/lib/freebl/stubs.h
+--- ./mozilla/security/nss/lib/freebl/stubs.h.prelink 2010-09-04 14:26:41.822327256 -0700
++++ ./mozilla/security/nss/lib/freebl/stubs.h 2010-09-04 14:32:53.498540767 -0700
+@@ -78,6 +78,8 @@
+ #define PR_Lock PR_Lock_stub
+ #define PR_NewLock PR_NewLock_stub
+ #define PR_Open PR_Open_stub
++#define PR_ImportFile PR_ImportFile_stub
++#define PR_ImportPipe PR_ImportPipe_stub
+ #define PR_Read PR_Read_stub
+ #define PR_Seek PR_Seek_stub
+ #define PR_Sleep PR_Sleep_stub
diff --git a/pkgs/core/nss-util/nss-util-config.in b/pkgs/core/nss-util/nss-util-config.in
new file mode 100644
index 0000000..ef8751d
--- /dev/null
+++ b/pkgs/core/nss-util/nss-util-config.in
@@ -0,0 +1,118 @@
+#!/bin/sh
+
+prefix=@prefix@
+
+major_version=@MOD_MAJOR_VERSION@
+minor_version=@MOD_MINOR_VERSION@
+patch_version=@MOD_PATCH_VERSION@
+
+usage()
+{
+ cat <<EOF
+Usage: nss-util-config [OPTIONS] [LIBRARIES]
+Options:
+ [--prefix[=DIR]]
+ [--exec-prefix[=DIR]]
+ [--includedir[=DIR]]
+ [--libdir[=DIR]]
+ [--version]
+ [--libs]
+ [--cflags]
+Dynamic Libraries:
+ nssutil
+EOF
+ exit $1
+}
+
+if test $# -eq 0; then
+ usage 1 1>&2
+fi
+
+lib_nssutil=yes
+
+while test $# -gt 0; do
+ case "$1" in
+ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+ *) optarg= ;;
+ esac
+
+ case $1 in
+ --prefix=*)
+ prefix=$optarg
+ ;;
+ --prefix)
+ echo_prefix=yes
+ ;;
+ --exec-prefix=*)
+ exec_prefix=$optarg
+ ;;
+ --exec-prefix)
+ echo_exec_prefix=yes
+ ;;
+ --includedir=*)
+ includedir=$optarg
+ ;;
+ --includedir)
+ echo_includedir=yes
+ ;;
+ --libdir=*)
+ libdir=$optarg
+ ;;
+ --libdir)
+ echo_libdir=yes
+ ;;
+ --version)
+ echo ${major_version}.${minor_version}.${patch_version}
+ ;;
+ --cflags)
+ echo_cflags=yes
+ ;;
+ --libs)
+ echo_libs=yes
+ ;;
+ *)
+ usage 1 1>&2
+ ;;
+ esac
+ shift
+done
+
+# Set variables that may be dependent upon other variables
+if test -z "$exec_prefix"; then
+ exec_prefix=`pkg-config --variable=exec_prefix nss-util`
+fi
+if test -z "$includedir"; then
+ includedir=`pkg-config --variable=includedir nss-util`
+fi
+if test -z "$libdir"; then
+ libdir=`pkg-config --variable=libdir nss-util`
+fi
+
+if test "$echo_prefix" = "yes"; then
+ echo $prefix
+fi
+
+if test "$echo_exec_prefix" = "yes"; then
+ echo $exec_prefix
+fi
+
+if test "$echo_includedir" = "yes"; then
+ echo $includedir
+fi
+
+if test "$echo_libdir" = "yes"; then
+ echo $libdir
+fi
+
+if test "$echo_cflags" = "yes"; then
+ echo -I$includedir
+fi
+
+if test "$echo_libs" = "yes"; then
+ libdirs="-Wl,-rpath-link,$libdir -L$libdir"
+ if test -n "$lib_nssutil"; then
+ libdirs="$libdirs -lnssutil${major_version}"
+ fi
+ echo $libdirs
+fi
+
diff --git a/pkgs/core/nss-util/nss-util.nm b/pkgs/core/nss-util/nss-util.nm
new file mode 100644
index 0000000..01a4c36
--- /dev/null
+++ b/pkgs/core/nss-util/nss-util.nm
@@ -0,0 +1,109 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include $(PKGROOT)/Include
+
+PKG_NAME = nss-util
+PKG_VER = 3.12.8
+PKG_REL = 0
+
+PKG_MAINTAINER =
+PKG_GROUP = System/Libraries
+PKG_URL = http://www.mozilla.org/projects/security/pki/nss/
+PKG_LICENSE = MPLv1.1 or GPLv2+ or LGPLv2+
+PKG_SUMMARY = Network Security Services Utilities Library.
+
+PKG_BUILD_DEPS+= nspr-devel perl pkg-config psmisc zlib-devel
+
+define PKG_DESCRIPTION
+ Utilities for Network Security Services and the Softoken module.
+endef
+
+PKG_TARBALL = $(THISAPP).tar.bz2
+
+PKG_PACKAGES += $(PKG_NAME_REAL)-devel
+
+PKG_DEPS-$(PKG_NAME_REAL)-devel = $(PKG_NAME_REAL)
+
+# Mozilla does no versioning :(
+define PKG_FILES-$(PKG_NAME_REAL)-devel
+ /usr/bin/*-config
+ /usr/include
+ /usr/lib/pkgconfig
+endef
+
+## Define some global environment variables
+# Enable compiler optimizations and disable debugging code
+export BUILD_OPT=1
+export XCFLAGS=$(CFLAGS)
+
+export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
+export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
+
+export NSPR_INCLUDE_DIR=/usr/include/nspr4
+export NSPR_LIB_DIR=/usr/lib
+
+export NSS_INCLUDE_DIR=/usr/include/nss3
+export NSS_LIB_DIR=/usr/lib
+
+export NSS_USE_SYSTEM_SQLITE=1
+
+define STAGE_BUILD
+ cd $(DIR_APP) && make -C ./mozilla/security/coreconf
+ cd $(DIR_APP) && make -C ./mozilla/security/nss
+endef
+
+define STAGE_INSTALL
+ -mkdir -pv $(BUILDROOT)/usr/bin
+ -mkdir -pv $(BUILDROOT)/usr/include/nss3
+ -mkdir -pv $(BUILDROOT)/usr/lib/pkgconfig
+
+ install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/lib/libnssutil3.so \
+ $(BUILDROOT)/usr/lib
+
+ sed -e "s,@libdir@,/usr/lib,g" \
+ -e "s,@prefix@,/usr,g" \
+ -e "s,@exec_prefix@,/usr,g" \
+ -e "s,@includedir@,/usr/include/nss3,g" \
+ -e "s,@MOD_MAJOR_VERSION@,$$(grep "#define.*NSSUTIL_VMAJOR" $(DIR_APP)/mozilla/security/nss/lib/util/nssutil.h | awk '{print $3}'),g" \
+ -e "s,@MOD_MINOR_VERSION@,$$(grep "#define.*NSSUTIL_VMINOR" $(DIR_APP)/mozilla/security/nss/lib/util/nssutil.h | awk '{print $3}'),g" \
+ -e "s,@MOD_PATCH_VERSION@,$$(grep "#define.*NSSUTIL_VPATCH" $(DIR_APP)/mozilla/security/nss/lib/util/nssutil.h | awk '{print $3}'),g" \
+ < $(DIR_SOURCE)/nss-util-config.in \
+ > $(BUILDROOT)/usr/bin/nss-util-config
+ chmod -v 755 $(BUILDROOT)/usr/bin/nss-util-config
+
+ sed \
+ -e "s,%libdir%,/usr/lib,g" \
+ -e "s,%prefix%,/usr,g" \
+ -e "s,%exec_prefix%,/usr,g" \
+ -e "s,%includedir%,/usr/include/nss3,g" \
+ -e "s,%NSPR_VERSION%,$$(nspr-config --version),g" \
+ -e "s,%NSSUTIL_VERSION%,$(PKG_NAME),g" \
+ < $(DIR_SOURCE)/nss-util.pc.in \
+ > $(BUILDROOT)/usr/lib/pkgconfig/nss-util.pc
+
+ # The util headers, the rest come from softokn and nss
+ cp -vf $(DIR_APP)/mozilla/dist/public/nss/*.h $(BUILDROOT)/usr/include/nss3
+ chmod -v 644 $(BUILDROOT)/usr/include/nss3/*.h
+endef
diff --git a/pkgs/core/nss-util/nss-util.pc.in b/pkgs/core/nss-util/nss-util.pc.in
new file mode 100644
index 0000000..079f83f
--- /dev/null
+++ b/pkgs/core/nss-util/nss-util.pc.in
@@ -0,0 +1,11 @@
+prefix=%prefix%
+exec_prefix=%exec_prefix%
+libdir=%libdir%
+includedir=%includedir%
+
+Name: NSS-UTIL
+Description: Network Security Services Utility Library
+Version: %NSSUTIL_VERSION%
+Requires: nspr >= %NSPR_VERSION%
+Libs: -lnssutil3
+Cflags: -I${includedir}
diff --git a/pkgs/core/nss-util/nss-util.spec b/pkgs/core/nss-util/nss-util.spec
new file mode 100644
index 0000000..4676bb5
--- /dev/null
+++ b/pkgs/core/nss-util/nss-util.spec
@@ -0,0 +1,278 @@
+%global nspr_version 4.8.6
+
+Summary: Network Security Services Utilities Library
+Name: nss-util
+Version: 3.12.8
+Release: 2%{?dist}
+License: MPLv1.1 or GPLv2+ or LGPLv2+
+URL: http://www.mozilla.org/projects/security/pki/nss/
+Group: System Environment/Libraries
+Requires: nspr >= %{nspr_version}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: nspr-devel >= %{nspr_version}
+BuildRequires: zlib-devel
+BuildRequires: pkgconfig
+BuildRequires: gawk
+BuildRequires: psmisc
+BuildRequires: perl
+
+Source0: %{name}-%{version}.tar.bz2
+# The nss-util tar ball is a subset of nss-{version}-stripped.tar.bz2,
+# Therefore we use the nss-split-util.sh script to keeping only what we need.
+# Download the nss tarball via CVS from the nss propect and follow these
+# steps to make the r tarball for nss-util out of the for nss:
+# fedpkg clone nss
+# fedpkg clone nss-util
+# cd nss-util/master
+# cp ../../nss/devel/${version}-stripped.tar.bz2 .
+# sh ./nss-split-util.sh ${version}
+# A file named {name}-{version}.tar.bz2 should appear
+Source1: nss-split-util.sh
+Source2: nss-util.pc.in
+Source3: nss-util-config.in
+
+
+%description
+Utilities for Network Security Services and the Softoken module
+
+# We shouln't need to have a devel subpackage as util will be used in the
+# context of nss or nss-softoken. keeping to please rpmlint.
+#
+%package devel
+Summary: Development libraries for Network Security Services Utilities
+Group: Development/Libraries
+Requires: nss-util = %{version}-%{release}
+Requires: nspr-devel >= %{nspr_version}
+Requires: pkgconfig
+
+%description devel
+Header and library files for doing development with Network Security Services.
+
+
+%prep
+%setup -q
+
+
+%build
+
+# Enable compiler optimizations and disable debugging code
+BUILD_OPT=1
+export BUILD_OPT
+
+# Generate symbolic info for debuggers
+XCFLAGS=$RPM_OPT_FLAGS
+export XCFLAGS
+
+PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
+PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
+
+export PKG_CONFIG_ALLOW_SYSTEM_LIBS
+export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS
+
+NSPR_INCLUDE_DIR=`/usr/bin/pkg-config --cflags-only-I nspr | sed 's/-I//'`
+NSPR_LIB_DIR=`/usr/bin/pkg-config --libs-only-L nspr | sed 's/-L//'`
+
+export NSPR_INCLUDE_DIR
+export NSPR_LIB_DIR
+
+NSS_USE_SYSTEM_SQLITE=1
+export NSS_USE_SYSTEM_SQLITE
+
+%ifarch x86_64 ppc64 ia64 s390x sparc64
+USE_64=1
+export USE_64
+%endif
+
+# make util
+%{__make} -C ./mozilla/security/coreconf
+%{__make} -C ./mozilla/security/nss
+
+# Set up our package file
+%{__mkdir_p} ./mozilla/dist/pkgconfig
+%{__cat} %{SOURCE2} | sed -e "s,%%libdir%%,%{_libdir},g" \
+ -e "s,%%prefix%%,%{_prefix},g" \
+ -e "s,%%exec_prefix%%,%{_prefix},g" \
+ -e "s,%%includedir%%,%{_includedir}/nss3,g" \
+ -e "s,%%NSPR_VERSION%%,%{nspr_version},g" \
+ -e "s,%%NSSUTIL_VERSION%%,%{version},g" > \
+ ./mozilla/dist/pkgconfig/nss-util.pc
+
+NSSUTIL_VMAJOR=`cat mozilla/security/nss/lib/util/nssutil.h | grep "#define.*NSSUTIL_VMAJOR" | awk '{print $3}'`
+NSSUTIL_VMINOR=`cat mozilla/security/nss/lib/util/nssutil.h | grep "#define.*NSSUTIL_VMINOR" | awk '{print $3}'`
+NSSUTIL_VPATCH=`cat mozilla/security/nss/lib/util/nssutil.h | grep "#define.*NSSUTIL_VPATCH" | awk '{print $3}'`
+
+export NSSUTIL_VMAJOR
+export NSSUTIL_VMINOR
+export NSSUTIL_VPATCH
+
+%{__cat} %{SOURCE3} | sed -e "s,@libdir@,%{_libdir},g" \
+ -e "s,@prefix@,%{_prefix},g" \
+ -e "s,@exec_prefix@,%{_prefix},g" \
+ -e "s,@includedir@,%{_includedir}/nss3,g" \
+ -e "s,@MOD_MAJOR_VERSION@,$NSSUTIL_VMAJOR,g" \
+ -e "s,@MOD_MINOR_VERSION@,$NSSUTIL_VMINOR,g" \
+ -e "s,@MOD_PATCH_VERSION@,$NSSUTIL_VPATCH,g" \
+ > ./mozilla/dist/pkgconfig/nss-util-config
+
+chmod 755 ./mozilla/dist/pkgconfig/nss-util-config
+
+
+%install
+
+%{__rm} -rf $RPM_BUILD_ROOT
+
+# There is no make install target so we'll do it ourselves.
+
+%{__mkdir_p} $RPM_BUILD_ROOT/%{_includedir}/nss3
+%{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}
+%{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/nss3
+%{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
+%{__mkdir_p} $RPM_BUILD_ROOT/%{_bindir}
+
+for file in libnssutil3.so
+do
+ %{__install} -p -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir}
+done
+
+# Copy the include files we want
+# The util headers, the rest come from softokn and nss
+for file in mozilla/dist/public/nss/*.h
+do
+ %{__install} -p -m 644 $file $RPM_BUILD_ROOT/%{_includedir}/nss3
+done
+
+# Copy the package configuration files
+%{__install} -p -m 644 ./mozilla/dist/pkgconfig/nss-util.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nss-util.pc
+%{__install} -p -m 755 ./mozilla/dist/pkgconfig/nss-util-config $RPM_BUILD_ROOT/%{_bindir}/nss-util-config
+
+%clean
+%{__rm} -rf $RPM_BUILD_ROOT
+
+%post
+/sbin/ldconfig >/dev/null 2>/dev/null
+
+%postun
+/sbin/ldconfig >/dev/null 2>/dev/null
+
+%files
+%defattr(-,root,root)
+%{_libdir}/libnssutil3.so
+
+%files devel
+%defattr(-,root,root)
+# package configuration files
+%{_libdir}/pkgconfig/nss-util.pc
+%{_bindir}/nss-util-config
+
+# co-owned with nss
+%dir %{_includedir}/nss3
+# these are marked as public export in
+# mozilla/security/nss/lib/util/manifest.mk
+%{_includedir}/nss3/base64.h
+%{_includedir}/nss3/ciferfam.h
+%{_includedir}/nss3/nssb64.h
+%{_includedir}/nss3/nssb64t.h
+%{_includedir}/nss3/nsslocks.h
+%{_includedir}/nss3/nssilock.h
+%{_includedir}/nss3/nssilckt.h
+%{_includedir}/nss3/nssrwlk.h
+%{_includedir}/nss3/nssrwlkt.h
+%{_includedir}/nss3/nssutil.h
+%{_includedir}/nss3/pkcs11.h
+%{_includedir}/nss3/pkcs11f.h
+%{_includedir}/nss3/pkcs11n.h
+%{_includedir}/nss3/pkcs11p.h
+%{_includedir}/nss3/pkcs11t.h
+%{_includedir}/nss3/pkcs11u.h
+%{_includedir}/nss3/portreg.h
+%{_includedir}/nss3/secasn1.h
+%{_includedir}/nss3/secasn1t.h
+%{_includedir}/nss3/seccomon.h
+%{_includedir}/nss3/secder.h
+%{_includedir}/nss3/secdert.h
+%{_includedir}/nss3/secdig.h
+%{_includedir}/nss3/secdigt.h
+%{_includedir}/nss3/secerr.h
+%{_includedir}/nss3/secitem.h
+%{_includedir}/nss3/secoid.h
+%{_includedir}/nss3/secoidt.h
+%{_includedir}/nss3/secport.h
+%{_includedir}/nss3/utilrename.h
+
+%changelog
+* Wed Sep 29 2010 jkeating - 3.12.8-2
+- Rebuilt for gcc bug 634757
+
+* Thu Sep 23 2010 Elio Maldonado <emaldona(a)redhat.com> - 3.12.8-1
+- Update to 3.12.8
+
+* Sat Sep 18 2010 Elio Maldonado <emaldona(a)redhat.com> - 3.12.7.99.4-1
+- NSS 3.12.8 RC0
+
+* Sat Sep 04 2010 Elio Maldonado <emaldona(a)redhat.com> - 3.12.7.99.3-1
+- NSS 3.12.8 Beta 3
+
+* Sat Aug 29 2010 Elio Maldonado <emaldona(a)redhat.com> - 3.12.7-2
+- Define NSS_USE_SYSTEM_SQLITE and remove nolocalsql patch
+
+* Mon Aug 16 2010 Elio Maldonado <emaldona(a)redhat.com> - 3.12.7-1
+- Update to 3.12.7
+
+* Fri Mar 05 2010 Elio Maldonado <emaldona(a)redhat.com> - 3.12.6-1
+- Update to 3.12.6
+
+* Mon Jan 18 2010 Elio Maldonado <emaldona(a)redhat.com> - 3.12.5-2
+- Fix in nss-util-config.in
+
+* Thu Dec 03 2009 Elio Maldonado<emaldona(a)redhat.com> - 3.12.5-1
+- Update to 3.12.5
+
+* Thu Sep 10 2009 Elio Maldonado<emaldona(a)redhat.com> - 3.12.4-8
+- Retagging for a chained build with nss-softokn and nss
+
+* Thu Sep 10 2009 Elio Maldonado<emaldona(a)redhat.com> - 3.12.4-5
+- Restoring -rpath-link to nss-util-config
+
+* Tue Sep 08 2009 Elio Maldonado<emaldona(a)redhat.com> - 3.12.4-4
+- Installing shared libraries to %%{_libdir}
+
+* Sat Sep 05 2009 Elio Maldonado<emaldona(a)redhat.com> - 3.12.4-3
+- Remove symbolic links to shared libraries from devel - 521155
+- Apply nss-nolocalsql patch subset for nss-util
+- No rpath-link in nss-util-config
+
+* Fri Sep 04 2009 Elio Maldonado<emaldona(a)redhat.com> - 3.12.4-2
+- Retagging for a chained build
+
+* Thu Sep 03 2009 Elio Maldonado<emaldona(a)redhat.com> - 3.12.4-1
+- Update to 3.12.4
+- Don't require sqlite
+
+* Thu Aug 27 2009 Elio Maldonado<emaldona(a)redhat.com> - 3.12.3.99.3-15
+- Bump the release number for a chained build of nss-util, nss-softokn and nss
+
+* Thu Aug 27 2009 Elio Maldonado<emaldona(a)redhat.com> - 3.12.3.99.3-14
+- Cleanup nss-util-config.in
+
+* Thu Aug 27 2009 Elio Maldonado<emaldona(a)redhat.com> - 3.12.3.99.3-13
+- nss-util-devel doesn't require nss-devel
+
+* Wed Aug 26 2009 Elio Maldonado<emaldona(a)redhat.com> - 3.12.3.99.3-12
+- bump to unique nvr
+
+* Wed Aug 26 2009 Elio Maldonado<emaldona(a)redhat.com> - 3.12.3.99.3-11
+- Remove spurious executable permissions from nss-util-config
+- Shorten some descriptions to keep rpmlint happy
+
+* Mon Aug 24 2009 Dennis Gilmore <dennis(a)ausil.us> 3.12.3.99.3-10
+- dont include the headers in nss-util only in the -devel package
+- nss-util-devel Requires nss-devel since its only providing a subset of the headers.
+
+* Thu Aug 20 2009 Dennis Gilmore <dennis(a)ausil.us> 3.12.3.99.3-9
+- Provide nss-devel since we obsolete it
+
+* Thu Aug 19 2009 Elio Maldonado <emaldona(a)redhat.com> 3.12.3.99.3-8.1
+- nss-util-devel obsoletes nss-devel < 3.12.3.99.3-8
+
+* Thu Aug 19 2009 Elio Maldonado <emaldona(a)redhat.com> 3.12.3.99.3-8
+- Initial build
diff --git a/pkgs/core/nss/PayPalEE.cert b/pkgs/core/nss/PayPalEE.cert
new file mode 100644
index 0000000..e49d8bd
Binary files /dev/null and b/pkgs/core/nss/PayPalEE.cert differ
diff --git a/pkgs/core/nss/cert8.db b/pkgs/core/nss/cert8.db
new file mode 100644
index 0000000..ac40a33
Binary files /dev/null and b/pkgs/core/nss/cert8.db differ
diff --git a/pkgs/core/nss/cert9.db b/pkgs/core/nss/cert9.db
new file mode 100644
index 0000000..1763264
Binary files /dev/null and b/pkgs/core/nss/cert9.db differ
diff --git a/pkgs/core/nss/key3.db b/pkgs/core/nss/key3.db
new file mode 100644
index 0000000..31e3975
Binary files /dev/null and b/pkgs/core/nss/key3.db differ
diff --git a/pkgs/core/nss/key4.db b/pkgs/core/nss/key4.db
new file mode 100644
index 0000000..6bd60cb
Binary files /dev/null and b/pkgs/core/nss/key4.db differ
diff --git a/pkgs/core/nss/nss-config.in b/pkgs/core/nss/nss-config.in
new file mode 100644
index 0000000..f8f893e
--- /dev/null
+++ b/pkgs/core/nss/nss-config.in
@@ -0,0 +1,145 @@
+#!/bin/sh
+
+prefix=@prefix@
+
+major_version=@MOD_MAJOR_VERSION@
+minor_version=@MOD_MINOR_VERSION@
+patch_version=@MOD_PATCH_VERSION@
+
+usage()
+{
+ cat <<EOF
+Usage: nss-config [OPTIONS] [LIBRARIES]
+Options:
+ [--prefix[=DIR]]
+ [--exec-prefix[=DIR]]
+ [--includedir[=DIR]]
+ [--libdir[=DIR]]
+ [--version]
+ [--libs]
+ [--cflags]
+Dynamic Libraries:
+ nss
+ nssutil
+ ssl
+ smime
+EOF
+ exit $1
+}
+
+if test $# -eq 0; then
+ usage 1 1>&2
+fi
+
+lib_ssl=yes
+lib_smime=yes
+lib_nss=yes
+lib_nssutil=yes
+
+while test $# -gt 0; do
+ case "$1" in
+ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+ *) optarg= ;;
+ esac
+
+ case $1 in
+ --prefix=*)
+ prefix=$optarg
+ ;;
+ --prefix)
+ echo_prefix=yes
+ ;;
+ --exec-prefix=*)
+ exec_prefix=$optarg
+ ;;
+ --exec-prefix)
+ echo_exec_prefix=yes
+ ;;
+ --includedir=*)
+ includedir=$optarg
+ ;;
+ --includedir)
+ echo_includedir=yes
+ ;;
+ --libdir=*)
+ libdir=$optarg
+ ;;
+ --libdir)
+ echo_libdir=yes
+ ;;
+ --version)
+ echo ${major_version}.${minor_version}.${patch_version}
+ ;;
+ --cflags)
+ echo_cflags=yes
+ ;;
+ --libs)
+ echo_libs=yes
+ ;;
+ ssl)
+ lib_ssl=yes
+ ;;
+ smime)
+ lib_smime=yes
+ ;;
+ nss)
+ lib_nss=yes
+ ;;
+ nssutil)
+ lib_nssutil=yes
+ ;;
+ *)
+ usage 1 1>&2
+ ;;
+ esac
+ shift
+done
+
+# Set variables that may be dependent upon other variables
+if test -z "$exec_prefix"; then
+ exec_prefix=`pkg-config --variable=exec_prefix nss`
+fi
+if test -z "$includedir"; then
+ includedir=`pkg-config --variable=includedir nss`
+fi
+if test -z "$libdir"; then
+ libdir=`pkg-config --variable=libdir nss`
+fi
+
+if test "$echo_prefix" = "yes"; then
+ echo $prefix
+fi
+
+if test "$echo_exec_prefix" = "yes"; then
+ echo $exec_prefix
+fi
+
+if test "$echo_includedir" = "yes"; then
+ echo $includedir
+fi
+
+if test "$echo_libdir" = "yes"; then
+ echo $libdir
+fi
+
+if test "$echo_cflags" = "yes"; then
+ echo -I$includedir
+fi
+
+if test "$echo_libs" = "yes"; then
+ libdirs="-Wl,-rpath-link,$libdir -L$libdir"
+ if test -n "$lib_ssl"; then
+ libdirs="$libdirs -lssl${major_version}"
+ fi
+ if test -n "$lib_smime"; then
+ libdirs="$libdirs -lsmime${major_version}"
+ fi
+ if test -n "$lib_nss"; then
+ libdirs="$libdirs -lnss${major_version}"
+ fi
+ if test -n "$lib_nssutil"; then
+ libdirs="$libdirs -lnssutil${major_version}"
+ fi
+ echo $libdirs
+fi
+
diff --git a/pkgs/core/nss/nss.nm b/pkgs/core/nss/nss.nm
new file mode 100644
index 0000000..d1a9e34
--- /dev/null
+++ b/pkgs/core/nss/nss.nm
@@ -0,0 +1,225 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include $(PKGROOT)/Include
+
+PKG_NAME = nss
+PKG_VER = 3.12.8
+PKG_REL = 3
+
+PKG_MAINTAINER =
+PKG_GROUP = System/Libraries
+PKG_URL = http://www.mozilla.org/projects/security/pki/nss/
+PKG_LICENSE = MPLv1.1 or GPLv2+ or LGPLv2+
+PKG_SUMMARY = Network Security Services.
+
+PKG_BUILD_DEPS+= nspr-devel nss-softokn-devel nss-util-devel perl pkg-config \
+ psmisc sqlite-devel zlib-devel
+
+define PKG_DESCRIPTION
+ Network Security Services (NSS) is a set of libraries designed to \
+ support cross-platform development of security-enabled client and \
+ server applications. Applications built with NSS can support SSL v2 \
+ and v3, TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509 \
+ v3 certificates, and other security standards.
+endef
+
+PKG_TARBALL = $(THISAPP)-stripped.tar.bz2
+PKG_OBJECTS += nss-pem-20100809.tar.bz2
+
+PKG_PACKAGES += $(PKG_NAME_REAL)-devel $(PKG_NAME_REAL)-libs
+
+PKG_DEPS-$(PKG_NAME_REAL)-devel += nss nss-softokn-devel nss-util-devel
+
+# Mozilla does no versioning :(
+define PKG_FILES-$(PKG_NAME_REAL)-devel
+ /usr/bin/*-config
+ /usr/include
+ /usr/lib/pkgconfig
+endef
+
+define PKG_FILES-$(PKG_NAME_REAL)-libs
+ /usr/lib/*.so
+endef
+
+# XXX -> need to be removed
+define QUALITY_AGENT_WHITELIST_RPATH
+ $$ORIGIN/../lib
+endef
+
+## Define some global environment variables
+
+export FREEBL_NO_DEPEND=1
+
+# Enable compiler optimizations and disable debugging code
+export BUILD_OPT=1
+export XCFLAGS=$(CFLAGS)
+
+export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
+export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
+
+export NSPR_INCLUDE_DIR=/usr/include/nspr4
+export NSPR_LIB_DIR=/usr/lib
+
+export NSS_INCLUDE_DIR=/usr/include/nss3
+export NSS_LIB_DIR=/usr/lib
+
+export NSS_USE_SYSTEM_SQLITE=1
+
+define STAGE_PREPARE
+ cd $(DIR_SRC) && $(DO_EXTRACT) $(DIR_DL)/$(PKG_TARBALL)
+ cd $(DIR_APP) && $(DO_EXTRACT) $(DIR_DL)/nss-pem-20100809.tar.bz2
+
+ $(DO_PATCHES)
+
+ cp -vf $(DIR_SOURCE)/PayPalEE.cert \
+ $(DIR_APP)/mozilla/security/nss/tests/libpkix/certs
+endef
+
+define STAGE_BUILD
+ cd $(DIR_APP) && make -C ./mozilla/security/coreconf
+ cd $(DIR_APP) && make -C ./mozilla/security/dbm
+ cd $(DIR_APP) && make -C ./mozilla/security/nss
+endef
+
+define STAGE_INSTALL
+ -mkdir -pv $(BUILDROOT)/usr/include/nss3
+ -mkdir -pv $(BUILDROOT)/usr/{bin,lib}
+ -mkdir -pv $(BUILDROOT)/usr/lib/pkgconfig
+ -mkdir -pv $(BUILDROOT)/usr/lib/nss/unsupported-tools
+
+ install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/lib/libnss3.so \
+ $(BUILDROOT)/usr/lib
+ install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/lib/libnssckbi.so \
+ $(BUILDROOT)/usr/lib
+ install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/lib/libnsspem.so \
+ $(BUILDROOT)/usr/lib
+ install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/lib/libnsssysinit.so \
+ $(BUILDROOT)/usr/lib
+ install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/lib/libsmime3.so \
+ $(BUILDROOT)/usr/lib
+ install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/lib/libssl3.so \
+ $(BUILDROOT)/usr/lib
+
+ # Install the empty NSS db files
+ -mkdir -pv $(BUILDROOT)/etc/pki/nssdb
+ cp -vf $(DIR_SOURCE)/*.db $(BUILDROOT)/etc/pki/nssdb/
+ install -p -v -m 644 $(DIR_SOURCE)/system-pkcs11.txt \
+ $(BUILDROOT)/etc/pki/nssdb/pkcs11.txt
+
+ # Copy the binaries we want
+ install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/bin/certutil $(BUILDROOT)/usr/bin
+ install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/bin/cmsutil $(BUILDROOT)/usr/bin
+ install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/bin/crlutil $(BUILDROOT)/usr/bin
+ install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/bin/modutil $(BUILDROOT)/usr/bin
+ install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/bin/pk12util $(BUILDROOT)/usr/bin
+ install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/bin/signtool $(BUILDROOT)/usr/bin
+ install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/bin/signver $(BUILDROOT)/usr/bin
+ install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/bin/ssltap $(BUILDROOT)/usr/bin
+
+ # Copy the binaries we ship as unsupported
+ install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/bin/atob $(BUILDROOT)/usr/lib/nss/unsupported-tools
+ install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/bin/btoa $(BUILDROOT)/usr/lib/nss/unsupported-tools
+ install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/bin/derdump $(BUILDROOT)/usr/lib/nss/unsupported-tools
+ install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/bin/ocspclnt $(BUILDROOT)/usr/lib/nss/unsupported-tools
+ install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/bin/pp $(BUILDROOT)/usr/lib/nss/unsupported-tools
+ install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/bin/selfserv $(BUILDROOT)/usr/lib/nss/unsupported-tools
+ install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/bin/strsclnt $(BUILDROOT)/usr/lib/nss/unsupported-tools
+ install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/bin/symkeyutil $(BUILDROOT)/usr/lib/nss/unsupported-tools
+ install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/bin/tstclnt $(BUILDROOT)/usr/lib/nss/unsupported-tools
+ install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/bin/vfyserv $(BUILDROOT)/usr/lib/nss/unsupported-tools
+ install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/bin/vfychain $(BUILDROOT)/usr/lib/nss/unsupported-tools
+
+ sed -e "s,@libdir@,/usr/lib,g" \
+ -e "s,@prefix@,/usr,g" \
+ -e "s,@exec_prefix@,/usr,g" \
+ -e "s,@includedir@,/usr/include/nss3,g" \
+ -e "s,@MOD_MAJOR_VERSION@,$$(grep "#define.*NSS_VMAJOR" $(DIR_APP)/mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'),g" \
+ -e "s,@MOD_MINOR_VERSION@,$$(grep "#define.*NSS_VMINOR" $(DIR_APP)/mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'),g" \
+ -e "s,@MOD_PATCH_VERSION@,$$(grep "#define.*NSS_VPATCH" $(DIR_APP)/mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'),g" \
+ < $(DIR_SOURCE)/nss-config.in \
+ > $(BUILDROOT)/usr/bin/nss-config
+ chmod -v 755 $(BUILDROOT)/usr/bin/nss-config
+
+ install -p -v -m 755 $(DIR_SOURCE)/setup-nsssysinit.sh $(BUILDROOT)/usr/bin
+
+ # Set up our package file
+ # The nspr_version and nss_{util|softokn}_version globals used
+ # here match the ones nss has for its Requires.
+
+ # XXX need to fix this
+ sed \
+ -e "s,%libdir%,/usr/lib,g" \
+ -e "s,%prefix%,/usr,g" \
+ -e "s,%exec_prefix%,/usr,g" \
+ -e "s,%includedir%,/usr/include/nss3,g" \
+ -e "s,%NSS_VERSION%,$(PKG_VER),g" \
+ -e "s,%NSPR_VERSION%,$$(nspr-config --version),g" \
+ -e "s,%NSSUTIL_VERSION%,$$(nss-util-config --version),g" \
+ -e "s,%SOFTOKEN_VERSION%,$$(nss-softokn-config --version),g" \
+ < $(DIR_SOURCE)/nss.pc.in \
+ > $(BUILDROOT)/usr/lib/pkgconfig/nss.pc
+
+ # Copy the include files we want
+ cp -vf $(DIR_APP)/mozilla/dist/public/nss/*.h $(BUILDROOT)/usr/include/nss3
+ chmod -v 644 $(BUILDROOT)/usr/include/nss3/*.h
+
+ # remove the nss-util-devel headers
+ cd $(BUILDROOT)/usr/include/nss3 && rm -vf \
+ base64.h \
+ ciferfam.h \
+ nssb64.h \
+ nssb64t.h \
+ nsslocks.h \
+ nssilock.h \
+ nssilckt.h \
+ nssrwlk.h \
+ nssrwlkt.h \
+ nssutil.h \
+ pkcs11{,f,n,p,t,u}.h \
+ portreg.h \
+ secasn1.h \
+ secasn1t.h \
+ seccomon.h \
+ secder.h \
+ secdert.h \
+ secdig.h \
+ secdigt.h \
+ secerr.h \
+ secitem.h \
+ secoid.h \
+ secoidt.h \
+ secport.h \
+ utilrename.h
+
+ # remove header shipped in nss-softokn-devel
+ cd $(BUILDROOT)/usr/include/nss3 && rm -vf \
+ blapit.h \
+ ecl-exp.h \
+ hasht.h \
+ sechash.h \
+ secmodt.h \
+ shsign.h \
+ nsslowhash.h
+endef
diff --git a/pkgs/core/nss/nss.pc.in b/pkgs/core/nss/nss.pc.in
new file mode 100644
index 0000000..d23d15a
--- /dev/null
+++ b/pkgs/core/nss/nss.pc.in
@@ -0,0 +1,11 @@
+prefix=%prefix%
+exec_prefix=%exec_prefix%
+libdir=%libdir%
+includedir=%includedir%
+
+Name: NSS
+Description: Network Security Services
+Version: %NSS_VERSION%
+Requires: nspr >= %NSPR_VERSION%, nss-util >= %NSSUTIL_VERSION%
+Libs: -lssl3 -lsmime3 -lnss3
+Cflags: -I${includedir}
diff --git a/pkgs/core/nss/patches/0001-Add-support-for-PKCS-8-encoded-private-keys.patch b/pkgs/core/nss/patches/0001-Add-support-for-PKCS-8-encoded-private-keys.patch
new file mode 100644
index 0000000..108bb9a
--- /dev/null
+++ b/pkgs/core/nss/patches/0001-Add-support-for-PKCS-8-encoded-private-keys.patch
@@ -0,0 +1,237 @@
+From 8bd0a0427e034262ff982fed98ca5e8c623165db Mon Sep 17 00:00:00 2001
+From: Rich Megginson <rmeggins(a)redhat.com>
+Date: Mon, 12 Jul 2010 16:31:01 -0600
+Subject: [PATCH] Add support for PKCS#8 encoded private keys
+
+The code supports PKCS#1 encoded RSA private keys that begin with the
+BEGIN RSA PRIVATE KEY header in PEM files. This patch adds support for
+RSA private keys encoded in PEM files that begin with the header
+BEGIN PRIVATE KEY which are in PKCS#8 format.
+---
+ prsa.c | 150 ++++++++++++++++++++++++++++++++++++++++++++++------------------
+ util.c | 3 +-
+ 2 files changed, 110 insertions(+), 43 deletions(-)
+
+diff --git a/prsa.c b/prsa.c
+index 5b2f379..8d4fb92 100644
+--- a/mozilla/security/nss/lib/ckfw/pem/prsa.c
++++ b/mozilla/security/nss/lib/ckfw/pem/prsa.c
+@@ -63,6 +63,35 @@ const SEC_ASN1Template pem_RSAPrivateKeyTemplate[] = {
+ {0}
+ };
+
++static const SEC_ASN1Template pem_AttributeTemplate[] = {
++ { SEC_ASN1_SEQUENCE,
++ 0, NULL, sizeof(NSSLOWKEYAttribute) },
++ { SEC_ASN1_OBJECT_ID, offsetof(NSSLOWKEYAttribute, attrType) },
++ { SEC_ASN1_SET_OF | SEC_ASN1_XTRN, offsetof(NSSLOWKEYAttribute, attrValue),
++ SEC_ASN1_SUB(SEC_AnyTemplate) },
++ { 0 }
++};
++
++static const SEC_ASN1Template pem_SetOfAttributeTemplate[] = {
++ { SEC_ASN1_SET_OF, 0, pem_AttributeTemplate },
++};
++
++const SEC_ASN1Template pem_PrivateKeyInfoTemplate[] = {
++ { SEC_ASN1_SEQUENCE,
++ 0, NULL, sizeof(NSSLOWKEYPrivateKeyInfo) },
++ { SEC_ASN1_INTEGER,
++ offsetof(NSSLOWKEYPrivateKeyInfo,version) },
++ { SEC_ASN1_INLINE | SEC_ASN1_XTRN,
++ offsetof(NSSLOWKEYPrivateKeyInfo,algorithm),
++ SEC_ASN1_SUB(SECOID_AlgorithmIDTemplate) },
++ { SEC_ASN1_OCTET_STRING,
++ offsetof(NSSLOWKEYPrivateKeyInfo,privateKey) },
++ { SEC_ASN1_OPTIONAL | SEC_ASN1_CONSTRUCTED | SEC_ASN1_CONTEXT_SPECIFIC | 0,
++ offsetof(NSSLOWKEYPrivateKeyInfo, attributes),
++ pem_SetOfAttributeTemplate },
++ { 0 }
++};
++
+ /* Declarations */
+ SECStatus pem_RSA_Sign(pemLOWKEYPrivateKey * key, unsigned char *output,
+ unsigned int *outputLen, unsigned int maxOutputLen,
+@@ -116,6 +145,79 @@ pem_DestroyPrivateKey(pemLOWKEYPrivateKey * privk)
+ nss_ZFreeIf(privk);
+ }
+
++/* decode and parse the rawkey into the lpk structure */
++static pemLOWKEYPrivateKey *
++pem_getPrivateKey(PLArenaPool *arena, SECItem *rawkey, CK_RV * pError, NSSItem *modulus)
++{
++ pemLOWKEYPrivateKey *lpk = NULL;
++ SECStatus rv = SECFailure;
++ NSSLOWKEYPrivateKeyInfo *pki = NULL;
++ SECItem *keysrc = NULL;
++
++ /* make sure SECOID is initialized - not sure why we have to do this outside of nss_Init */
++ if (SECSuccess != (rv = SECOID_Init())) {
++ *pError = CKR_GENERAL_ERROR;
++ return NULL; /* wha???? */
++ }
++
++ pki = (NSSLOWKEYPrivateKeyInfo*)PORT_ArenaZAlloc(arena,
++ sizeof(NSSLOWKEYPrivateKeyInfo));
++ if(!pki) {
++ *pError = CKR_HOST_MEMORY;
++ goto done;
++ }
++
++ /* let's first see if this is a "raw" RSA private key or an RSA private key in PKCS#8 format */
++ rv = SEC_ASN1DecodeItem(arena, pki, pem_PrivateKeyInfoTemplate, rawkey);
++ if (rv != SECSuccess) {
++ /* not PKCS#8 - assume it's a "raw" RSA private key */
++ keysrc = rawkey;
++ } else if (SECOID_GetAlgorithmTag(&pki->algorithm) == SEC_OID_PKCS1_RSA_ENCRYPTION) {
++ keysrc = &pki->privateKey;
++ } else { /* unsupported */
++ *pError = CKR_FUNCTION_NOT_SUPPORTED;
++ goto done;
++ }
++
++ lpk = (pemLOWKEYPrivateKey *) nss_ZAlloc(NULL,
++ sizeof(pemLOWKEYPrivateKey));
++ if (lpk == NULL) {
++ *pError = CKR_HOST_MEMORY;
++ goto done;
++ }
++
++ lpk->arena = arena;
++ lpk->keyType = pemLOWKEYRSAKey;
++ prepare_low_rsa_priv_key_for_asn1(lpk);
++
++ /* I don't know what this is supposed to accomplish. We free the old
++ modulus data and set it again, making a copy of the new data.
++ But we just allocated a new empty key structure above with
++ nss_ZAlloc. So lpk->u.rsa.modulus.data is NULL and
++ lpk->u.rsa.modulus.len. If the intention is to free the old
++ modulus data, why not just set it to NULL after freeing? Why
++ go through this unnecessary and confusing copying code?
++ */
++ if (modulus) {
++ nss_ZFreeIf(modulus->data);
++ modulus->data = (void *) nss_ZAlloc(NULL, lpk->u.rsa.modulus.len);
++ modulus->size = lpk->u.rsa.modulus.len;
++ nsslibc_memcpy(modulus->data, lpk->u.rsa.modulus.data,
++ lpk->u.rsa.modulus.len);
++ }
++
++ /* decode the private key and any algorithm parameters */
++ rv = SEC_QuickDERDecodeItem(arena, lpk, pem_RSAPrivateKeyTemplate,
++ keysrc);
++
++ if (rv != SECSuccess) {
++ goto done;
++ }
++
++done:
++ return lpk;
++}
++
+ void
+ pem_PopulateModulusExponent(pemInternalObject * io)
+ {
+@@ -123,7 +225,7 @@ pem_PopulateModulusExponent(pemInternalObject * io)
+ const NSSItem *keyType = pem_FetchAttribute(io, CKA_KEY_TYPE);
+ pemLOWKEYPrivateKey *lpk = NULL;
+ PLArenaPool *arena;
+- SECStatus rv;
++ CK_RV pError = 0;
+
+ /* make sure we have the right objects */
+ if (((const NSSItem *) NULL == classItem) ||
+@@ -140,26 +242,12 @@ pem_PopulateModulusExponent(pemInternalObject * io)
+ return;
+ }
+
+- lpk = (pemLOWKEYPrivateKey *) nss_ZAlloc(NULL,
+- sizeof(pemLOWKEYPrivateKey));
++ lpk = pem_getPrivateKey(arena, io->u.key.key.privateKey, &pError, NULL);
+ if (lpk == NULL) {
+ PORT_FreeArena(arena, PR_FALSE);
+ return;
+ }
+
+- lpk->arena = arena;
+- lpk->keyType = pemLOWKEYRSAKey;
+- prepare_low_rsa_priv_key_for_asn1(lpk);
+-
+- /* decode the private key and any algorithm parameters */
+- rv = SEC_QuickDERDecodeItem(arena, lpk, pem_RSAPrivateKeyTemplate,
+- io->u.key.key.privateKey);
+-
+- if (rv != SECSuccess) {
+- PORT_FreeArena(arena, PR_FALSE);
+- return;
+- }
+-
+ nss_ZFreeIf(io->u.key.key.modulus.data);
+ io->u.key.key.modulus.data =
+ (void *) nss_ZAlloc(NULL, lpk->u.rsa.modulus.len);
+@@ -252,13 +340,6 @@ pem_mdCryptoOperationRSAPriv_Create
+ pemInternalCryptoOperationRSAPriv *iOperation;
+ pemLOWKEYPrivateKey *lpk = NULL;
+ PLArenaPool *arena;
+- SECStatus rv;
+-
+- arena = PORT_NewArena(2048);
+- if (!arena) {
+- *pError = CKR_HOST_MEMORY;
+- return (NSSCKMDCryptoOperation *) NULL;
+- }
+
+ /* make sure we have the right objects */
+ if (((const NSSItem *) NULL == classItem) ||
+@@ -271,30 +352,15 @@ pem_mdCryptoOperationRSAPriv_Create
+ return (NSSCKMDCryptoOperation *) NULL;
+ }
+
+- lpk = (pemLOWKEYPrivateKey *) nss_ZAlloc(NULL,
+- sizeof (pemLOWKEYPrivateKey));
+- if (lpk == NULL) {
++ arena = PORT_NewArena(2048);
++ if (!arena) {
+ *pError = CKR_HOST_MEMORY;
+ return (NSSCKMDCryptoOperation *) NULL;
+ }
+- lpk->arena = arena;
+- lpk->keyType = pemLOWKEYRSAKey;
+- prepare_low_rsa_priv_key_for_asn1(lpk);
+
+- nss_ZFreeIf(iKey->u.key.key.modulus.data);
+- iKey->u.key.key.modulus.data =
+- (void *) nss_ZAlloc(NULL, lpk->u.rsa.modulus.len);
+- iKey->u.key.key.modulus.size = lpk->u.rsa.modulus.len;
+- nsslibc_memcpy(iKey->u.key.key.modulus.data, lpk->u.rsa.modulus.data,
+- lpk->u.rsa.modulus.len);
+-
+- /* decode the private key and any algorithm parameters */
+- rv = SEC_QuickDERDecodeItem(arena, lpk, pem_RSAPrivateKeyTemplate,
+- iKey->u.key.key.privateKey);
+-
+- if (rv != SECSuccess) {
++ lpk = pem_getPrivateKey(arena, iKey->u.key.key.privateKey, pError, &iKey->u.key.key.modulus);
++ if (lpk == NULL) {
+ PORT_FreeArena(arena, PR_FALSE);
+- *pError = CKR_HOST_MEMORY;
+ return (NSSCKMDCryptoOperation *) NULL;
+ }
+
+diff --git a/util.c b/util.c
+index a6ca094..d02ee87 100644
+--- a/mozilla/security/nss/lib/ckfw/pem/util.c
++++ b/mozilla/security/nss/lib/ckfw/pem/util.c
+@@ -164,7 +164,8 @@ ReadDERFromFile(SECItem *** derlist, char *filename, PRBool ascii,
+ int key = 0;
+ while ((asc) && ((body = strstr(asc, "-----BEGIN")) != NULL)) {
+ key = 0;
+- if (strncmp(body, "-----BEGIN RSA PRIVATE KEY", 25) == 0) {
++ if ((strncmp(body, "-----BEGIN RSA PRIVATE KEY", 25) == 0) ||
++ (strncmp(body, "-----BEGIN PRIVATE KEY", 21) == 0)) {
+ key = 1;
+ c = body;
+ body = strchr(body, '\n');
+--
+1.5.5.6
+
diff --git a/pkgs/core/nss/patches/0001-Do-not-define-SEC_SkipTemplate.patch b/pkgs/core/nss/patches/0001-Do-not-define-SEC_SkipTemplate.patch
new file mode 100644
index 0000000..23eb47d
--- /dev/null
+++ b/pkgs/core/nss/patches/0001-Do-not-define-SEC_SkipTemplate.patch
@@ -0,0 +1,35 @@
+From 9b7334b61cf3277e5eb48b716f6719b4636e2572 Mon Sep 17 00:00:00 2001
+From: Rich Megginson <rmeggins(a)redhat.com>
+Date: Mon, 12 Jul 2010 17:21:01 -0600
+Subject: [PATCH] Do not define SEC_SkipTemplate
+
+Building NSS with PEM support gives an error in pbobject due to multiple
+definitions of SEC_SkipTemplate. This is already defined in libnssutil
+---
+ pobject.c | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/pobject.c b/pobject.c
+index 81b9028..48f5e78 100644
+--- a/mozilla/security/nss/lib/ckfw/pem/pobject.c
++++ b/mozilla/security/nss/lib/ckfw/pem/pobject.c
+@@ -172,6 +172,8 @@ static const NSSItem pem_trusted = {
+ (void *) &ckt_netscape_trusted, (PRUint32) sizeof(CK_TRUST)
+ };
+
++/* SEC_SkipTemplate is already defined and exported by libnssutil */
++#ifdef SEC_SKIP_TEMPLATE
+ /*
+ * Template for skipping a subitem.
+ *
+@@ -182,6 +184,7 @@ static const NSSItem pem_trusted = {
+ const SEC_ASN1Template SEC_SkipTemplate[] = {
+ {SEC_ASN1_SKIP}
+ };
++#endif
+
+ /*
+ * Find the subjectName in a DER encoded certificate
+--
+1.5.5.6
+
diff --git a/pkgs/core/nss/patches/nss-enable-pem.patch b/pkgs/core/nss/patches/nss-enable-pem.patch
new file mode 100644
index 0000000..a84907c
--- /dev/null
+++ b/pkgs/core/nss/patches/nss-enable-pem.patch
@@ -0,0 +1,12 @@
+diff -up ./mozilla/security/nss/lib/ckfw/manifest.mn.prepem ./mozilla/security/nss/lib/ckfw/manifest.mn
+--- a/mozilla/security/nss/lib/ckfw/manifest.mn.prepem 2008-08-05 16:34:23.000000000 -0700
++++ b/mozilla/security/nss/lib/ckfw/manifest.mn 2008-08-05 16:34:30.000000000 -0700
+@@ -38,7 +38,7 @@ MANIFEST_CVS_ID = "@(#) $RCSfile: manife
+
+ CORE_DEPTH = ../../..
+
+-DIRS = builtins
++DIRS = builtins pem
+
+ PRIVATE_EXPORTS = \
+ ck.h \
diff --git a/pkgs/core/nss/patches/nss-sysinit-userdb-first.patch b/pkgs/core/nss/patches/nss-sysinit-userdb-first.patch
new file mode 100755
index 0000000..cbfbb9a
--- /dev/null
+++ b/pkgs/core/nss/patches/nss-sysinit-userdb-first.patch
@@ -0,0 +1,65 @@
+diff -up ./mozilla/security/nss/lib/sysinit/nsssysinit.c.orig ./mozilla/security/nss/lib/sysinit/nsssysinit.c
+--- ./mozilla/security/nss/lib/sysinit/nsssysinit.c.orig 2010-06-17 09:17:30.732643399 -0700
++++ ./mozilla/security/nss/lib/sysinit/nsssysinit.c 2010-06-17 09:20:22.691642397 -0700
+@@ -263,9 +263,18 @@ get_list(char *filename, char *stripped_
+ sysdb = getSystemDB();
+ userdb = getUserDB();
+
+- /* Don't open root's user DB */
++ /* return a list of databases to open. First the system database. */
++ if (sysdb) {
++ const char *readonly = userCanModifySystemDB() ? "" : "flags=readonly";
++ module_list[next++] = PR_smprintf(
++ "library= "
++ "module=\"NSS system database\" "
++ "parameters=\"configdir='sql:%s' tokenDescription='NSS system database' %s\" "
++ "NSS=\"%sflags=internal,critical\"",sysdb, readonly, nssflags);
++ }
++
++ /* Next the user database, but not for root. */
+ if (userdb != NULL && !userIsRoot()) {
+- /* return a list of databases to open. First the user Database */
+ module_list[next++] = PR_smprintf(
+ "library= "
+ "module=\"NSS User database\" "
+@@ -284,40 +293,6 @@ get_list(char *filename, char *stripped_
+ userdb, stripped_parameters);
+ }
+
+-#if 0
+- /* This doesn't actually work. If we register
+- both this and the sysdb (in either order)
+- then only one of them actually shows up */
+-
+- /* Using a NULL filename as a Boolean flag to
+- * prevent registering both an application-defined
+- * db and the system db. rhbz #546211.
+- */
+- PORT_Assert(filename);
+- if (sysdb && PL_CompareStrings(filename, sysdb))
+- filename = NULL;
+- else if (userdb && PL_CompareStrings(filename, userdb))
+- filename = NULL;
+-
+- if (filename && !userIsRoot()) {
+- module_list[next++] = PR_smprintf(
+- "library= "
+- "module=\"NSS database\" "
+- "parameters=\"configdir='sql:%s' tokenDescription='NSS database sql:%s'\" "
+- "NSS=\"%sflags=internal\"",filename, filename, nssflags);
+- }
+-#endif
+-
+- /* now the system database (always read only unless it's root) */
+- if (sysdb) {
+- const char *readonly = userCanModifySystemDB() ? "" : "flags=readonly";
+- module_list[next++] = PR_smprintf(
+- "library= "
+- "module=\"NSS system database\" "
+- "parameters=\"configdir='sql:%s' tokenDescription='NSS system database' %s\" "
+- "NSS=\"%sflags=internal,critical\"",sysdb, readonly, nssflags);
+- }
+-
+ /* that was the last module */
+ module_list[next] = 0;
+
diff --git a/pkgs/core/nss/patches/nsspem-596674.patch b/pkgs/core/nss/patches/nsspem-596674.patch
new file mode 100644
index 0000000..cfa44e6
--- /dev/null
+++ b/pkgs/core/nss/patches/nsspem-596674.patch
@@ -0,0 +1,127 @@
+diff -up a/mozilla/security/nss/lib/ckfw/pem/pinst.c.596783 b/mozilla/security/nss/lib/ckfw/pem/pinst.c
+--- a/mozilla/security/nss/lib/ckfw/pem/pinst.c.596783 2010-06-06 18:27:27.256318318 -0700
++++ b/mozilla/security/nss/lib/ckfw/pem/pinst.c 2010-06-06 20:45:28.158442982 -0700
+@@ -151,7 +151,7 @@ GetCertFields(unsigned char *cert, int c
+ buf = issuer->data + issuer->len;
+
+ /* only wanted issuer/SN */
+- if (valid == NULL) {
++ if (subject == NULL || valid == NULL || subjkey == NULL) {
+ return SECSuccess;
+ }
+ /* validity */
+@@ -219,53 +219,93 @@ CreateObject(CK_OBJECT_CLASS objClass,
+ memset(&o->u.trust, 0, sizeof(o->u.trust));
+ break;
+ }
++
++ o->nickname = (char *) nss_ZAlloc(NULL, strlen(nickname) + 1);
++ if (o->nickname == NULL)
++ goto fail;
++ strcpy(o->nickname, nickname);
++
++ sprintf(id, "%d", objid);
++ len = strlen(id) + 1; /* zero terminate */
++ o->id.data = (void *) nss_ZAlloc(NULL, len);
++ if (o->id.data == NULL)
++ goto fail;
++ (void) nsslibc_memcpy(o->id.data, id, len);
++ o->id.size = len;
++
+ o->objClass = objClass;
+ o->type = type;
+ o->slotID = slotID;
++
+ o->derCert = nss_ZNEW(NULL, SECItem);
++ if (o->derCert == NULL)
++ goto fail;
+ o->derCert->data = (void *) nss_ZAlloc(NULL, certDER->len);
++ if (o->derCert->data == NULL)
++ goto fail;
+ o->derCert->len = certDER->len;
+ nsslibc_memcpy(o->derCert->data, certDER->data, certDER->len);
+
+ switch (objClass) {
+ case CKO_CERTIFICATE:
+ case CKO_NETSCAPE_TRUST:
+- GetCertFields(o->derCert->data,
+- o->derCert->len, &issuer, &serial,
+- &derSN, &subject, &valid, &subjkey);
++ if (SECSuccess != GetCertFields(o->derCert->data, o->derCert->len,
++ &issuer, &serial, &derSN, &subject,
++ &valid, &subjkey))
++ goto fail;
+
+ o->u.cert.subject.data = (void *) nss_ZAlloc(NULL, subject.len);
++ if (o->u.cert.subject.data == NULL)
++ goto fail;
+ o->u.cert.subject.size = subject.len;
+ nsslibc_memcpy(o->u.cert.subject.data, subject.data, subject.len);
+
+ o->u.cert.issuer.data = (void *) nss_ZAlloc(NULL, issuer.len);
++ if (o->u.cert.issuer.data == NULL) {
++ nss_ZFreeIf(o->u.cert.subject.data);
++ goto fail;
++ }
+ o->u.cert.issuer.size = issuer.len;
+ nsslibc_memcpy(o->u.cert.issuer.data, issuer.data, issuer.len);
+
+ o->u.cert.serial.data = (void *) nss_ZAlloc(NULL, serial.len);
++ if (o->u.cert.serial.data == NULL) {
++ nss_ZFreeIf(o->u.cert.issuer.data);
++ nss_ZFreeIf(o->u.cert.subject.data);
++ goto fail;
++ }
+ o->u.cert.serial.size = serial.len;
+ nsslibc_memcpy(o->u.cert.serial.data, serial.data, serial.len);
+ break;
+ case CKO_PRIVATE_KEY:
+ o->u.key.key.privateKey = nss_ZNEW(NULL, SECItem);
++ if (o->u.key.key.privateKey == NULL)
++ goto fail;
+ o->u.key.key.privateKey->data =
+ (void *) nss_ZAlloc(NULL, keyDER->len);
++ if (o->u.key.key.privateKey->data == NULL) {
++ nss_ZFreeIf(o->u.key.key.privateKey);
++ goto fail;
++ }
+ o->u.key.key.privateKey->len = keyDER->len;
+ nsslibc_memcpy(o->u.key.key.privateKey->data, keyDER->data,
+ keyDER->len);
+ }
+
+- o->nickname = (char *) nss_ZAlloc(NULL, strlen(nickname) + 1);
+- strcpy(o->nickname, nickname);
+-
+- sprintf(id, "%d", objid);
+-
+- len = strlen(id) + 1; /* zero terminate */
+- o->id.data = (void *) nss_ZAlloc(NULL, len);
+- (void) nsslibc_memcpy(o->id.data, id, len);
+- o->id.size = len;
+
+ return o;
++
++fail:
++ if (o) {
++ if (o->derCert) {
++ nss_ZFreeIf(o->derCert->data);
++ nss_ZFreeIf(o->derCert);
++ }
++ nss_ZFreeIf(o->id.data);
++ nss_ZFreeIf(o->nickname);
++ nss_ZFreeIf(o);
++ }
++ return NULL;
+ }
+
+ pemInternalObject *
+@@ -306,6 +346,8 @@ AddObjectIfNeeded(CK_OBJECT_CLASS objCla
+ /* object not found, we need to create it */
+ pemInternalObject *io = CreateObject(objClass, type, certDER, keyDER,
+ filename, objid, slotID);
++ if (io == NULL)
++ return NULL;
+
+ io->gobjIndex = count;
+
diff --git a/pkgs/core/nss/patches/renegotiate-transitional.patch b/pkgs/core/nss/patches/renegotiate-transitional.patch
new file mode 100644
index 0000000..0cd6556
--- /dev/null
+++ b/pkgs/core/nss/patches/renegotiate-transitional.patch
@@ -0,0 +1,12 @@
+diff -up ./mozilla/security/nss/lib/ssl/sslsock.c.transitional ./mozilla/security/nss/lib/ssl/sslsock.c
+--- a/mozilla/security/nss/lib/ssl/sslsock.c.transitional 2010-09-04 09:46:50.331327676 -0700
++++ b/mozilla/security/nss/lib/ssl/sslsock.c 2010-09-04 09:50:02.814325605 -0700
+@@ -181,7 +181,7 @@ static sslOptions ssl_defaults = {
+ PR_FALSE, /* noLocks */
+ PR_FALSE, /* enableSessionTickets */
+ PR_FALSE, /* enableDeflate */
+- 2, /* enableRenegotiation (default: requires extension) */
++ 3, /* enableRenegotiation (default: transitional) */
+ PR_FALSE, /* requireSafeNegotiation */
+ PR_FALSE, /* enableFalseStart */
+ };
diff --git a/pkgs/core/nss/secmod.db b/pkgs/core/nss/secmod.db
new file mode 100644
index 0000000..9a02807
Binary files /dev/null and b/pkgs/core/nss/secmod.db differ
diff --git a/pkgs/core/nss/setup-nsssysinit.sh b/pkgs/core/nss/setup-nsssysinit.sh
new file mode 100755
index 0000000..8e1f5f7
--- /dev/null
+++ b/pkgs/core/nss/setup-nsssysinit.sh
@@ -0,0 +1,68 @@
+#!/bin/sh
+#
+# Turns on or off the nss-sysinit module db by editing the
+# global PKCS #11 congiguration file. Displays the status.
+#
+# This script can be invoked by the user as super user.
+# It is invoked at nss-sysinit post install time with argument on.
+#
+usage()
+{
+ cat <<EOF
+Usage: setup-nsssysinit [on|off]
+ on - turns on nsssysinit
+ off - turns off nsssysinit
+ status - reports whether nsssysinit is turned on or off
+EOF
+ exit $1
+}
+
+# validate
+if [ $# -eq 0 ]; then
+ usage 1 1>&2
+fi
+
+# the system-wide configuration file
+p11conf="/etc/pki/nssdb/pkcs11.txt"
+# must exist, otherwise report it and exit with failure
+if [ ! -f $p11conf ]; then
+ echo "Could not find ${p11conf}"
+ exit 1
+fi
+
+# check if nsssysinit is currently enabled or disabled
+sysinit_enabled()
+{
+ grep -q '^library=libnsssysinit' ${p11conf}
+}
+
+umask 022
+case "$1" in
+ on | ON )
+ if sysinit_enabled; then
+ exit 0
+ fi
+ cat ${p11conf} | \
+ sed -e 's/^library=$/library=libnsssysinit.so/' \
+ -e '/^NSS/s/\(Flags=internal\)\(,[^m]\)/\1,moduleDBOnly\2/' > \
+ ${p11conf}.on
+ mv ${p11conf}.on ${p11conf}
+ ;;
+ off | OFF )
+ if ! sysinit_enabled; then
+ exit 0
+ fi
+ cat ${p11conf} | \
+ sed -e 's/^library=libnsssysinit.so/library=/' \
+ -e '/^NSS/s/Flags=internal,moduleDBOnly/Flags=internal/' > \
+ ${p11conf}.off
+ mv ${p11conf}.off ${p11conf}
+ ;;
+ status )
+ echo -n 'NSS sysinit is '
+ sysinit_enabled && echo 'enabled' || echo 'disabled'
+ ;;
+ * )
+ usage 1 1>&2
+ ;;
+esac
diff --git a/pkgs/core/nss/system-pkcs11.txt b/pkgs/core/nss/system-pkcs11.txt
new file mode 100644
index 0000000..c2f5704
--- /dev/null
+++ b/pkgs/core/nss/system-pkcs11.txt
@@ -0,0 +1,5 @@
+library=libnsssysinit.so
+name=NSS Internal PKCS #11 Module
+parameters=configdir='sql:/etc/pki/nssdb' certPrefix='' keyPrefix='' secmod='secmod.db' flags= updatedir='' updateCertPrefix='' updateKeyPrefix='' updateid='' updateTokenDescription=''
+NSS=Flags=internal,moduleDBOnly,critical trustOrder=75 cipherOrder=100 slotParams=(1={slotFlags=[RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512] askpw=any timeout=30})
+
diff --git a/pkgs/core/pciutils/pciutils.nm b/pkgs/core/pciutils/pciutils.nm
index 80d5ae7..6f4be47 100644
--- a/pkgs/core/pciutils/pciutils.nm
+++ b/pkgs/core/pciutils/pciutils.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = pciutils
PKG_VER = 3.1.7
-PKG_REL = 0
+PKG_REL = 1
PKG_MAINTAINER =
PKG_GROUP = System/Base
@@ -44,12 +44,13 @@ PKG_TARBALL = $(THISAPP).tar.bz2
PKG_PACKAGES += $(PKG_NAME)-devel $(PKG_NAME)-libs
define STAGE_BUILD
- cd $(DIR_APP) && make SHARED=yes OPT="$(CFLAGS)" PREFIX=/usr ZLIB=no $(PARALLELISMFLAGS)
+ cd $(DIR_APP) && make SHARED=yes OPT="$(CFLAGS)" PREFIX=/usr \
+ IDSDIR=/usr/share/hwdata ZLIB=no $(PARALLELISMFLAGS)
endef
define STAGE_INSTALL
cd $(DIR_APP) && make SHARED=yes PREFIX=/usr install DESTDIR=$(BUILDROOT) \
- MANDIR=/usr/share/man
+ IDSDIR=/usr/share/hwdata MANDIR=/usr/share/man
-mkdir -pv $(BUILDROOT)/usr/include/pci
install -v -m 644 $(DIR_APP)/lib/*.h $(BUILDROOT)/usr/include/pci
diff --git a/pkgs/core/util-linux-ng/util-linux-ng.nm b/pkgs/core/util-linux-ng/util-linux-ng.nm
index efb421d..85a6486 100644
--- a/pkgs/core/util-linux-ng/util-linux-ng.nm
+++ b/pkgs/core/util-linux-ng/util-linux-ng.nm
@@ -25,7 +25,7 @@
include $(PKGROOT)/Include
PKG_NAME = util-linux-ng
-PKG_VER = 2.17.2
+PKG_VER = 2.18
PKG_REL = 0
PKG_MAINTAINER =
@@ -43,7 +43,7 @@ define PKG_DESCRIPTION
program.
endef
-PKG_TARBALL = $(THISAPP).tar.bz2
+PKG_TARBALL = $(THISAPP).tar.gz
PKG_PACKAGES += $(PKG_NAME)-devel
hooks/post-receive
--
IPFire 3.x development tree
1
0
[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 9d4e63229159a9e982774b04f1b3a5d651d62ab4
by git＠ipfire.org 16 Oct '10
by git＠ipfire.org 16 Oct '10
16 Oct '10
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 9d4e63229159a9e982774b04f1b3a5d651d62ab4 (commit)
via 54f4a62c064ecda0db205053ed1a0a1ea66f2ba4 (commit)
from e4e28e19c69001f363933552ea997de7f012a947 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 9d4e63229159a9e982774b04f1b3a5d651d62ab4
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Oct 16 12:12:31 2010 +0200
Add a patch for speedup cache writeback.
commit 54f4a62c064ecda0db205053ed1a0a1ea66f2ba4
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Oct 16 12:09:46 2010 +0200
Add cpio and ldd to core update.
Dracut need this.
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/test/filelists/cpio | 1 +
config/rootfiles/core/test/filelists/files | 1 +
lfs/linux | 3 ++
lfs/linux-pae | 3 ++
...-2.6-vmscan_remove_wait_on_page_writeback.patch | 37 ++++++++++++++++++++
5 files changed, 45 insertions(+), 0 deletions(-)
create mode 120000 config/rootfiles/core/test/filelists/cpio
create mode 100644 src/patches/linux-2.6-vmscan_remove_wait_on_page_writeback.patch
Difference in files:
diff --git a/config/rootfiles/core/test/filelists/cpio b/config/rootfiles/core/test/filelists/cpio
new file mode 120000
index 0000000..fbab21a
--- /dev/null
+++ b/config/rootfiles/core/test/filelists/cpio
@@ -0,0 +1 @@
+../../../common/cpio
\ No newline at end of file
diff --git a/config/rootfiles/core/test/filelists/files b/config/rootfiles/core/test/filelists/files
index d7ed8ab..2a6d23b 100644
--- a/config/rootfiles/core/test/filelists/files
+++ b/config/rootfiles/core/test/filelists/files
@@ -4,3 +4,4 @@ etc/rc.d/init.d/squid
srv/web/ipfire/cgi-bin/proxy.cgi
srv/web/ipfire/cgi-bin/speed.cgi
usr/local/bin/rebuild-initrd
+usr/bin/ldd
diff --git a/lfs/linux b/lfs/linux
index 4e465bb..2955ac6 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -131,6 +131,9 @@ endif
# Reiser4 (don't check if fail (some patches are already in xen patchset)
-cd $(DIR_APP) && bzcat $(DIR_DL)/reiser4-for-2.6.32.patch.bz2 | patch -Np1
+ # Fix lag's at cache access (eg. quit of mc)
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6-vmscan_remove_wait_on_page_writeback.patch
+
# ipp2p 0.8.2-pomng
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.8-ipp2p-0.8.2-pomng.patch
diff --git a/lfs/linux-pae b/lfs/linux-pae
index cbaeefe..d71a0cf 100644
--- a/lfs/linux-pae
+++ b/lfs/linux-pae
@@ -23,6 +23,9 @@
###############################################################################
include Config
+
+VER = kernel
+
include linux
PROG = linux-pae
diff --git a/src/patches/linux-2.6-vmscan_remove_wait_on_page_writeback.patch b/src/patches/linux-2.6-vmscan_remove_wait_on_page_writeback.patch
new file mode 100644
index 0000000..02e9cd1
--- /dev/null
+++ b/src/patches/linux-2.6-vmscan_remove_wait_on_page_writeback.patch
@@ -0,0 +1,37 @@
+--- linux-next.orig/mm/vmscan.c 2010-07-28 16:22:21.000000000 +0800
++++ linux-next/mm/vmscan.c 2010-07-28 16:23:35.000000000 +0800
+@@ -324,8 +324,7 @@ typedef enum {
+ * pageout is called by shrink_page_list() for each dirty page.
+ * Calls ->writepage().
+ */
+-static pageout_t pageout(struct page *page, struct address_space *mapping,
+- enum pageout_io sync_writeback)
++static pageout_t pageout(struct page *page, struct address_space *mapping)
+ {
+ /*
+ * If the page is dirty, only perform writeback if that write
+@@ -384,14 +383,6 @@ static pageout_t pageout(struct page *pa
+ return PAGE_ACTIVATE;
+ }
+
+- /*
+- * Wait on writeback if requested to. This happens when
+- * direct reclaiming a large contiguous area and the
+- * first attempt to free a range of pages fails.
+- */
+- if (PageWriteback(page) && sync_writeback == PAGEOUT_IO_SYNC)
+- wait_on_page_writeback(page);
+-
+ if (!PageWriteback(page)) {
+ /* synchronous write or broken a_ops? */
+ ClearPageReclaim(page);
+@@ -727,7 +718,7 @@ static unsigned long shrink_page_list(st
+ goto keep_locked;
+
+ /* Page is dirty, try to write it out here */
+- switch (pageout(page, mapping, sync_writeback)) {
++ switch (pageout(page, mapping)) {
+ case PAGE_KEEP:
+ goto keep_locked;
+ case PAGE_ACTIVATE:
+
hooks/post-receive
--
IPFire 2.x development tree
1
0
[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 6eed299202d2f9c25abc53def2304af28e81ec21
by git＠ipfire.org 16 Oct '10
by git＠ipfire.org 16 Oct '10
16 Oct '10
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
via 6eed299202d2f9c25abc53def2304af28e81ec21 (commit)
via 08f99c0bf2cd07af04042f33952094c301d517ca (commit)
via d63c8b65559cbfa1c65494293538b2613cf33a20 (commit)
via 4abb69b46b4d99e83f94168ac80db46df9912506 (commit)
via a5904b132edeba172227740e812fd954569acc6c (commit)
via e02d6c9f24387976f8815adb250b81feeac8683f (commit)
via 3e69bca85659ab7ba1139faac0796c4ef84cc7a7 (commit)
via b0a062af7e79856e2ef8403b9e5b4b5e8a20436f (commit)
via ce7c94009fa4d09853089156b19ef4b0c0b3cd6a (commit)
via 8bf88f872b66040a5ea7d8363574873006ff570a (commit)
via a5bd9f97029f98924de6920d8cc75969a44065a9 (commit)
via a2f76c9b4946465c8b056217b2fa767e6810e787 (commit)
via 109746396f29c3de38864cbace0666ae2f3a5439 (commit)
via cc16e27cc6a0f75d19062899268ed7a16e390e83 (commit)
via 7ccb8e0f45225f59572fff063b72e5cefacc0db0 (commit)
via 102b5fec5a5daeaa6266ee53884a86332dce956b (commit)
via 90555dbbebe0fa64da5f6973bef0fef835ad0f89 (commit)
via 3731388e085c36802983af9e1457c5775f731c5b (commit)
via 8a640d93bb716aa3bb44b06819c5e37c01fa0c9b (commit)
via d629ce07b970e26c5242786c830d2f520e9e849b (commit)
via c900042febb6572521794cd450cd7943bde336d3 (commit)
via 24f909e193bc2b62f4ca21707320b1ed6cb055b0 (commit)
via 727fbf6c4207021d2afdd327844ebd547ec783d1 (commit)
via 926930a55f391ee75f8311a5937e66158206b962 (commit)
via 813dff1c311eb632fc84d778cb50409c066e038a (commit)
via f600c4272ffcec91bb5926ab111acf1d824e56d7 (commit)
via a751616f9e05e670e7b177273a8734f1f961347b (commit)
via b675033af3ebda8239d6dfa0d92243fbedf5f539 (commit)
via 964b02ee2d050a6389e01ba7067182c9e19da192 (commit)
via 3f9164ae391b990eac7d3046fc674c195c9bad64 (commit)
via 131fc8383317be89217520c579e5ec3769bd2dc1 (commit)
via cdd4579c323672b6d121eb4ff4829f51b8743d6d (commit)
via c220bd27a051c46fb3889b25115c2ec1066dfa17 (commit)
via 03eb19be0b1ef1b8caa5d3c7fa55b74a4a06ffdd (commit)
from 356d79777494200c3170dc469ad62dac448b8f5a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 6eed299202d2f9c25abc53def2304af28e81ec21
Merge: 08f99c0 a5904b1
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Oct 16 09:09:38 2010 +0200
Merge branch 'master' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-3.x into next
commit 08f99c0bf2cd07af04042f33952094c301d517ca
Merge: d63c8b6 3731388
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Oct 16 09:08:48 2010 +0200
Merge remote branch 'maniacikarus/fail2ban' into next
commit d63c8b65559cbfa1c65494293538b2613cf33a20
Merge: 4abb69b 8a640d9
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Oct 16 09:08:45 2010 +0200
Merge remote branch 'maniacikarus/proxy' into next
commit 4abb69b46b4d99e83f94168ac80db46df9912506
Merge: a5bd9f9 c900042
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Oct 16 09:08:08 2010 +0200
Merge remote branch 'maniacikarus/samba' into next
commit a5904b132edeba172227740e812fd954569acc6c
Merge: e02d6c9 a751616
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 12 14:44:21 2010 +0200
Merge remote branch 'ms/xen' into next
commit e02d6c9f24387976f8815adb250b81feeac8683f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 12 13:49:04 2010 +0200
perl-XML-Parser: Add build dependency perl-core.
Currently, the dependency resolution for perl modules is not finished.
So we extract all perl modules that were shipped with the perl source
code tarball.
commit 3e69bca85659ab7ba1139faac0796c4ef84cc7a7
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 12 13:43:33 2010 +0200
bzip2: Update to 1.0.6.
This release fixes a potential integer overflow vulnerability, reported as
CVE-2010-0405.
commit b0a062af7e79856e2ef8403b9e5b4b5e8a20436f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 12 13:31:26 2010 +0200
libtool: Update to 2.4.
commit ce7c94009fa4d09853089156b19ef4b0c0b3cd6a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 12 13:31:01 2010 +0200
autoconf: Update to 2.68.
commit 8bf88f872b66040a5ea7d8363574873006ff570a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 12 13:29:52 2010 +0200
naoki: Remove extractor and use tar's features.
commit a5bd9f97029f98924de6920d8cc75969a44065a9
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Oct 11 23:11:33 2010 +0200
perl: Build with -fstack-protector-all.
commit a2f76c9b4946465c8b056217b2fa767e6810e787
Merge: 1097463 102b5fe
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Oct 11 21:24:18 2010 +0200
Merge branch 'perl' into next
commit 109746396f29c3de38864cbace0666ae2f3a5439
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Oct 11 21:22:36 2010 +0200
udev: Remove unneeded rules.
commit cc16e27cc6a0f75d19062899268ed7a16e390e83
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Oct 11 21:22:15 2010 +0200
xfsprogs: Link against libblkid.
commit 7ccb8e0f45225f59572fff063b72e5cefacc0db0
Merge: 131fc83 356d797
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Oct 11 21:21:51 2010 +0200
Merge branch 'master' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-3.x into next
commit 102b5fec5a5daeaa6266ee53884a86332dce956b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Oct 11 21:21:27 2010 +0200
perl: Split into lots of subpackages.
commit 90555dbbebe0fa64da5f6973bef0fef835ad0f89
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Oct 11 21:21:01 2010 +0200
naoki: Add support for empty packages (meta packages).
commit 3731388e085c36802983af9e1457c5775f731c5b
Author: Christian Schmidt <christian.schmidt(a)ipfire.org>
Date: Sat Oct 9 19:13:58 2010 +0200
fail2ban: Added fail2ban deamon.
commit 8a640d93bb716aa3bb44b06819c5e37c01fa0c9b
Author: Christian Schmidt <christian.schmidt(a)ipfire.org>
Date: Sat Oct 9 18:19:28 2010 +0200
squid: Deleted custom ipfire er pages. We will use the standard ones.
commit d629ce07b970e26c5242786c830d2f520e9e849b
Author: Christian Schmidt <christian.schmidt(a)ipfire.org>
Date: Sat Oct 9 18:17:18 2010 +0200
squid: Updated to 3.1.8.
commit c900042febb6572521794cd450cd7943bde336d3
Author: Christian Schmidt <christian.schmidt(a)ipfire.org>
Date: Sat Oct 9 14:24:24 2010 +0200
samba: Updated to 3.5.6.
commit 24f909e193bc2b62f4ca21707320b1ed6cb055b0
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Oct 3 00:52:38 2010 +0200
perl-XML-Parser: Rename package.
commit 727fbf6c4207021d2afdd327844ebd547ec783d1
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Oct 3 00:51:08 2010 +0200
naoki: Add support for perl provides/perl requires.
commit 926930a55f391ee75f8311a5937e66158206b962
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Oct 3 00:49:34 2010 +0200
naoki: Create automatic dependencies between main, -libs and -devel package.
The -devel package depends on the main package.
commit 813dff1c311eb632fc84d778cb50409c066e038a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Oct 3 00:49:07 2010 +0200
naoki: Introduce THISVER.
commit f600c4272ffcec91bb5926ab111acf1d824e56d7
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Oct 3 00:48:38 2010 +0200
naoki: Add functionality to have different version numbers than main package.
commit a751616f9e05e670e7b177273a8734f1f961347b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Oct 1 18:50:20 2010 +0200
xen: Repackage libs.
commit b675033af3ebda8239d6dfa0d92243fbedf5f539
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Oct 1 18:37:18 2010 +0200
xen: Add commenting about ldconfig call.
commit 964b02ee2d050a6389e01ba7067182c9e19da192
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Oct 1 18:36:58 2010 +0200
xen: Fix typo (in dependency line).
commit 3f9164ae391b990eac7d3046fc674c195c9bad64
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Oct 1 18:36:15 2010 +0200
xen: Remove old patches.
commit 131fc8383317be89217520c579e5ec3769bd2dc1
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Oct 1 18:13:23 2010 +0200
xen: Update to 4.0.1.
Squashed commit of the following:
commit 922154fc149bfef6e018ae4afc758e6c5f28f213
Author: Ben Schweikert <trikolon(a)ipfire.org>
Date: Fri Oct 1 18:01:30 2010 +0200
libvirt: added xen support.
commit 108f274f424528c413a88aa570725e4c8da90211
Author: Ben Schweikert <trikolon(a)ipfire.org>
Date: Fri Oct 1 17:52:00 2010 +0200
Xen: Added spaces and adjusted length of comments.
commit 7ff3e02a090dfb3534e13081564a985cad41329c
Author: Ben Schweikert <trikolon(a)ipfire.org>
Date: Fri Oct 1 17:46:42 2010 +0200
Forgot to sort deps.
commit 676b494d5fe7435a1717bd8f7582701f32df6b68
Author: Ben Schweikert <trikolon(a)ipfire.org>
Date: Fri Oct 1 17:40:12 2010 +0200
Seperated Xen and Xen-tools to devel, hypervisor, libs, runtime for
better modularity.
commit 542cfcf431bf6dcc70ca3d6abfe5aa01f061748b
Author: Ben Schweikert <trikolon(a)ipfire.org>
Date: Wed Sep 29 14:36:24 2010 +0200
Updated Xen to version 4.0.1 and added the xen tools.
commit cdd4579c323672b6d121eb4ff4829f51b8743d6d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Oct 1 16:12:44 2010 +0200
perl: Make this package more in a redhat style.
commit c220bd27a051c46fb3889b25115c2ec1066dfa17
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Oct 1 16:12:21 2010 +0200
perl: Update to 5.12.2.
commit 03eb19be0b1ef1b8caa5d3c7fa55b74a4a06ffdd
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Oct 1 16:11:38 2010 +0200
naoki: Add support for a distro vendor.
-----------------------------------------------------------------------
Summary of changes:
config/naoki.conf | 3 +
naoki/constants.py | 2 +
pkgs/Constants | 10 +-
pkgs/Functions | 5 +-
pkgs/Templates | 13 +-
pkgs/core/autoconf/autoconf.nm | 4 +-
pkgs/core/bzip2/bzip2.nm | 2 +-
pkgs/core/fail2ban/fail2ban.logrotate | 9 +
.../python-pyaspects.nm => fail2ban/fail2ban.nm} | 26 +-
.../fail2ban/patches/fail2ban-0.8.1-sshd.patch | 17 +
.../patches/fail2ban-0.8.2-fd_cloexec.patch | 22 +
.../fail2ban/patches/fail2ban-0.8.3-init.patch | 20 +
.../patches/fail2ban-0.8.3-log2syslog.patch | 11 +
pkgs/core/libtool/libtool.nm | 2 +-
pkgs/core/libvirt/libvirt.nm | 4 +-
.../perl-XML-Parser.nm} | 4 +-
...libresolv.patch => perl-5.10.0-libresolv.patch} | 0
pkgs/core/perl/patches/perl-5.8.0-libdir64.patch | 46 +
...path-make.patch => perl-5.8.8-rpath-make.patch} | 0
.../perl/patches/perl-USE_MM_LD_RUN_PATH.patch | 109 +++
.../perl/patches/perl-disable_test_hosts.patch | 12 +
pkgs/core/perl/patches/perl-perlbug-tag.patch | 51 +
pkgs/core/perl/perl.nm | 956 +++++++++++++++++++-
pkgs/core/samba/samba.nm | 2 +-
.../squid/errors.ipfire/English/ERR_ACCESS_DENIED | 44 -
.../errors.ipfire/English/ERR_CACHE_ACCESS_DENIED | 53 --
.../English/ERR_CACHE_MGR_ACCESS_DENIED | 52 --
.../squid/errors.ipfire/English/ERR_CANNOT_FORWARD | 49 -
.../squid/errors.ipfire/English/ERR_CONNECT_FAIL | 47 -
pkgs/core/squid/errors.ipfire/English/ERR_DNS_FAIL | 51 -
.../errors.ipfire/English/ERR_FORWARDING_DENIED | 45 -
.../squid/errors.ipfire/English/ERR_FTP_DISABLED | 43 -
.../squid/errors.ipfire/English/ERR_FTP_FAILURE | 39 -
.../squid/errors.ipfire/English/ERR_FTP_FORBIDDEN | 39 -
.../squid/errors.ipfire/English/ERR_FTP_NOT_FOUND | 42 -
.../errors.ipfire/English/ERR_FTP_PUT_CREATED | 23 -
.../squid/errors.ipfire/English/ERR_FTP_PUT_ERROR | 46 -
.../errors.ipfire/English/ERR_FTP_PUT_MODIFIED | 23 -
.../errors.ipfire/English/ERR_FTP_UNAVAILABLE | 35 -
.../squid/errors.ipfire/English/ERR_INVALID_REQ | 53 --
.../squid/errors.ipfire/English/ERR_INVALID_RESP | 49 -
.../squid/errors.ipfire/English/ERR_INVALID_URL | 49 -
.../squid/errors.ipfire/English/ERR_LIFETIME_EXP | 44 -
pkgs/core/squid/errors.ipfire/English/ERR_NO_RELAY | 43 -
.../errors.ipfire/English/ERR_ONLY_IF_CACHED_MISS | 48 -
.../squid/errors.ipfire/English/ERR_READ_ERROR | 48 -
.../squid/errors.ipfire/English/ERR_READ_TIMEOUT | 48 -
.../squid/errors.ipfire/English/ERR_SHUTTING_DOWN | 38 -
.../squid/errors.ipfire/English/ERR_SOCKET_FAILURE | 48 -
pkgs/core/squid/errors.ipfire/English/ERR_TOO_BIG | 48 -
.../core/squid/errors.ipfire/English/ERR_UNSUP_REQ | 44 -
.../squid/errors.ipfire/English/ERR_URN_RESOLVE | 43 -
.../squid/errors.ipfire/English/ERR_WRITE_ERROR | 48 -
.../errors.ipfire/English/ERR_ZERO_SIZE_OBJECT | 43 -
.../squid/errors.ipfire/German/ERR_ACCESS_DENIED | 46 -
.../errors.ipfire/German/ERR_CACHE_ACCESS_DENIED | 50 -
.../German/ERR_CACHE_MGR_ACCESS_DENIED | 52 --
.../squid/errors.ipfire/German/ERR_CANNOT_FORWARD | 48 -
.../squid/errors.ipfire/German/ERR_CONNECT_FAIL | 46 -
pkgs/core/squid/errors.ipfire/German/ERR_DNS_FAIL | 52 --
.../errors.ipfire/German/ERR_FORWARDING_DENIED | 45 -
.../squid/errors.ipfire/German/ERR_FTP_DISABLED | 41 -
.../squid/errors.ipfire/German/ERR_FTP_FAILURE | 47 -
.../squid/errors.ipfire/German/ERR_FTP_FORBIDDEN | 41 -
.../squid/errors.ipfire/German/ERR_FTP_NOT_FOUND | 46 -
.../squid/errors.ipfire/German/ERR_FTP_PUT_CREATED | 23 -
.../squid/errors.ipfire/German/ERR_FTP_PUT_ERROR | 42 -
.../errors.ipfire/German/ERR_FTP_PUT_MODIFIED | 23 -
.../squid/errors.ipfire/German/ERR_FTP_UNAVAILABLE | 41 -
.../squid/errors.ipfire/German/ERR_INVALID_REQ | 54 --
.../squid/errors.ipfire/German/ERR_INVALID_RESP | 49 -
.../squid/errors.ipfire/German/ERR_INVALID_URL | 50 -
.../squid/errors.ipfire/German/ERR_LIFETIME_EXP | 44 -
pkgs/core/squid/errors.ipfire/German/ERR_NO_RELAY | 41 -
.../errors.ipfire/German/ERR_ONLY_IF_CACHED_MISS | 47 -
.../core/squid/errors.ipfire/German/ERR_READ_ERROR | 48 -
.../squid/errors.ipfire/German/ERR_READ_TIMEOUT | 50 -
.../squid/errors.ipfire/German/ERR_SHUTTING_DOWN | 40 -
.../squid/errors.ipfire/German/ERR_SOCKET_FAILURE | 49 -
pkgs/core/squid/errors.ipfire/German/ERR_TOO_BIG | 50 -
pkgs/core/squid/errors.ipfire/German/ERR_UNSUP_REQ | 45 -
.../squid/errors.ipfire/German/ERR_URN_RESOLVE | 43 -
.../squid/errors.ipfire/German/ERR_WRITE_ERROR | 48 -
.../errors.ipfire/German/ERR_ZERO_SIZE_OBJECT | 43 -
.../squid/patches/squid-3.0.STABLE1-perlpath.patch | 9 +
.../patches/squid-3.0.STABLE7-from_manpg.patch | 80 ++
.../squid/patches/squid-3.1.0.15-smb-path.patch | 37 +
pkgs/core/squid/patches/squid-3.1.0.9-config.patch | 26 +
.../squid/patches/squid-3.1.0.9-location.patch | 41 +
pkgs/core/squid/squid.nm | 15 +-
pkgs/core/udev/rules/23-usb.rules | 2 -
pkgs/core/udev/rules/55-ipfire.rules | 64 --
pkgs/core/udev/rules/61-cdrom.rules | 3 -
.../core/xen/patches/xen-3.4.0-co_assignment.patch | 22 -
pkgs/core/xen/patches/xen-3.4.0-cpufreq.patch | 19 -
pkgs/core/xen/patches/xen-tools.patch | 11 +
pkgs/core/xen/patches/xend-config-3.4.0.patch | 99 --
pkgs/core/xen/xen.nm | 52 +-
pkgs/core/xfsprogs/xfsprogs.nm | 6 +-
tools/extractor | 40 -
tools/functions-packager-find | 23 +-
tools/packager | 6 +-
tools/perl.prov | 199 ++++
tools/perl.req | 249 +++++
104 files changed, 2024 insertions(+), 2978 deletions(-)
create mode 100644 pkgs/core/fail2ban/fail2ban.logrotate
copy pkgs/core/{python-pyaspects/python-pyaspects.nm => fail2ban/fail2ban.nm} (76%)
create mode 100644 pkgs/core/fail2ban/patches/fail2ban-0.8.1-sshd.patch
create mode 100644 pkgs/core/fail2ban/patches/fail2ban-0.8.2-fd_cloexec.patch
create mode 100644 pkgs/core/fail2ban/patches/fail2ban-0.8.3-init.patch
create mode 100644 pkgs/core/fail2ban/patches/fail2ban-0.8.3-log2syslog.patch
rename pkgs/core/{perl-xml-parser/perl-xml-parser.nm => perl-XML-Parser/perl-XML-Parser.nm} (95%)
rename pkgs/core/perl/patches/{perl-5.10.1-libresolv.patch => perl-5.10.0-libresolv.patch} (100%)
create mode 100644 pkgs/core/perl/patches/perl-5.8.0-libdir64.patch
rename pkgs/core/perl/patches/{perl-5.10.1-rpath-make.patch => perl-5.8.8-rpath-make.patch} (100%)
create mode 100644 pkgs/core/perl/patches/perl-USE_MM_LD_RUN_PATH.patch
create mode 100644 pkgs/core/perl/patches/perl-disable_test_hosts.patch
create mode 100644 pkgs/core/perl/patches/perl-perlbug-tag.patch
delete mode 100644 pkgs/core/squid/errors.ipfire/English/ERR_ACCESS_DENIED
delete mode 100644 pkgs/core/squid/errors.ipfire/English/ERR_CACHE_ACCESS_DENIED
delete mode 100644 pkgs/core/squid/errors.ipfire/English/ERR_CACHE_MGR_ACCESS_DENIED
delete mode 100644 pkgs/core/squid/errors.ipfire/English/ERR_CANNOT_FORWARD
delete mode 100644 pkgs/core/squid/errors.ipfire/English/ERR_CONNECT_FAIL
delete mode 100644 pkgs/core/squid/errors.ipfire/English/ERR_DNS_FAIL
delete mode 100644 pkgs/core/squid/errors.ipfire/English/ERR_FORWARDING_DENIED
delete mode 100644 pkgs/core/squid/errors.ipfire/English/ERR_FTP_DISABLED
delete mode 100644 pkgs/core/squid/errors.ipfire/English/ERR_FTP_FAILURE
delete mode 100644 pkgs/core/squid/errors.ipfire/English/ERR_FTP_FORBIDDEN
delete mode 100644 pkgs/core/squid/errors.ipfire/English/ERR_FTP_NOT_FOUND
delete mode 100644 pkgs/core/squid/errors.ipfire/English/ERR_FTP_PUT_CREATED
delete mode 100644 pkgs/core/squid/errors.ipfire/English/ERR_FTP_PUT_ERROR
delete mode 100644 pkgs/core/squid/errors.ipfire/English/ERR_FTP_PUT_MODIFIED
delete mode 100644 pkgs/core/squid/errors.ipfire/English/ERR_FTP_UNAVAILABLE
delete mode 100644 pkgs/core/squid/errors.ipfire/English/ERR_INVALID_REQ
delete mode 100644 pkgs/core/squid/errors.ipfire/English/ERR_INVALID_RESP
delete mode 100644 pkgs/core/squid/errors.ipfire/English/ERR_INVALID_URL
delete mode 100644 pkgs/core/squid/errors.ipfire/English/ERR_LIFETIME_EXP
delete mode 100644 pkgs/core/squid/errors.ipfire/English/ERR_NO_RELAY
delete mode 100644 pkgs/core/squid/errors.ipfire/English/ERR_ONLY_IF_CACHED_MISS
delete mode 100644 pkgs/core/squid/errors.ipfire/English/ERR_READ_ERROR
delete mode 100644 pkgs/core/squid/errors.ipfire/English/ERR_READ_TIMEOUT
delete mode 100644 pkgs/core/squid/errors.ipfire/English/ERR_SHUTTING_DOWN
delete mode 100644 pkgs/core/squid/errors.ipfire/English/ERR_SOCKET_FAILURE
delete mode 100644 pkgs/core/squid/errors.ipfire/English/ERR_TOO_BIG
delete mode 100644 pkgs/core/squid/errors.ipfire/English/ERR_UNSUP_REQ
delete mode 100644 pkgs/core/squid/errors.ipfire/English/ERR_URN_RESOLVE
delete mode 100644 pkgs/core/squid/errors.ipfire/English/ERR_WRITE_ERROR
delete mode 100644 pkgs/core/squid/errors.ipfire/English/ERR_ZERO_SIZE_OBJECT
delete mode 100644 pkgs/core/squid/errors.ipfire/German/ERR_ACCESS_DENIED
delete mode 100644 pkgs/core/squid/errors.ipfire/German/ERR_CACHE_ACCESS_DENIED
delete mode 100644 pkgs/core/squid/errors.ipfire/German/ERR_CACHE_MGR_ACCESS_DENIED
delete mode 100644 pkgs/core/squid/errors.ipfire/German/ERR_CANNOT_FORWARD
delete mode 100644 pkgs/core/squid/errors.ipfire/German/ERR_CONNECT_FAIL
delete mode 100644 pkgs/core/squid/errors.ipfire/German/ERR_DNS_FAIL
delete mode 100644 pkgs/core/squid/errors.ipfire/German/ERR_FORWARDING_DENIED
delete mode 100644 pkgs/core/squid/errors.ipfire/German/ERR_FTP_DISABLED
delete mode 100644 pkgs/core/squid/errors.ipfire/German/ERR_FTP_FAILURE
delete mode 100644 pkgs/core/squid/errors.ipfire/German/ERR_FTP_FORBIDDEN
delete mode 100644 pkgs/core/squid/errors.ipfire/German/ERR_FTP_NOT_FOUND
delete mode 100644 pkgs/core/squid/errors.ipfire/German/ERR_FTP_PUT_CREATED
delete mode 100644 pkgs/core/squid/errors.ipfire/German/ERR_FTP_PUT_ERROR
delete mode 100644 pkgs/core/squid/errors.ipfire/German/ERR_FTP_PUT_MODIFIED
delete mode 100644 pkgs/core/squid/errors.ipfire/German/ERR_FTP_UNAVAILABLE
delete mode 100644 pkgs/core/squid/errors.ipfire/German/ERR_INVALID_REQ
delete mode 100644 pkgs/core/squid/errors.ipfire/German/ERR_INVALID_RESP
delete mode 100644 pkgs/core/squid/errors.ipfire/German/ERR_INVALID_URL
delete mode 100644 pkgs/core/squid/errors.ipfire/German/ERR_LIFETIME_EXP
delete mode 100644 pkgs/core/squid/errors.ipfire/German/ERR_NO_RELAY
delete mode 100644 pkgs/core/squid/errors.ipfire/German/ERR_ONLY_IF_CACHED_MISS
delete mode 100644 pkgs/core/squid/errors.ipfire/German/ERR_READ_ERROR
delete mode 100644 pkgs/core/squid/errors.ipfire/German/ERR_READ_TIMEOUT
delete mode 100644 pkgs/core/squid/errors.ipfire/German/ERR_SHUTTING_DOWN
delete mode 100644 pkgs/core/squid/errors.ipfire/German/ERR_SOCKET_FAILURE
delete mode 100644 pkgs/core/squid/errors.ipfire/German/ERR_TOO_BIG
delete mode 100644 pkgs/core/squid/errors.ipfire/German/ERR_UNSUP_REQ
delete mode 100644 pkgs/core/squid/errors.ipfire/German/ERR_URN_RESOLVE
delete mode 100644 pkgs/core/squid/errors.ipfire/German/ERR_WRITE_ERROR
delete mode 100644 pkgs/core/squid/errors.ipfire/German/ERR_ZERO_SIZE_OBJECT
create mode 100644 pkgs/core/squid/patches/squid-3.0.STABLE1-perlpath.patch
create mode 100644 pkgs/core/squid/patches/squid-3.0.STABLE7-from_manpg.patch
create mode 100644 pkgs/core/squid/patches/squid-3.1.0.15-smb-path.patch
create mode 100644 pkgs/core/squid/patches/squid-3.1.0.9-config.patch
create mode 100644 pkgs/core/squid/patches/squid-3.1.0.9-location.patch
delete mode 100644 pkgs/core/udev/rules/23-usb.rules
delete mode 100644 pkgs/core/udev/rules/55-ipfire.rules
delete mode 100644 pkgs/core/udev/rules/61-cdrom.rules
delete mode 100644 pkgs/core/xen/patches/xen-3.4.0-co_assignment.patch
delete mode 100644 pkgs/core/xen/patches/xen-3.4.0-cpufreq.patch
create mode 100644 pkgs/core/xen/patches/xen-tools.patch
delete mode 100644 pkgs/core/xen/patches/xend-config-3.4.0.patch
delete mode 100755 tools/extractor
create mode 100755 tools/perl.prov
create mode 100755 tools/perl.req
Difference in files:
diff --git a/config/naoki.conf b/config/naoki.conf
index 822a4ae..da68fe9 100644
--- a/config/naoki.conf
+++ b/config/naoki.conf
@@ -20,6 +20,9 @@ version = %(epoch)s.0-prealpha2
; A descriptive slogan
slogan = "Gluttony"
+; The distribution vendor
+vendor = The IPFire Team
+
[sources]
diff --git a/naoki/constants.py b/naoki/constants.py
index a64ceb8..f19b8e9 100644
--- a/naoki/constants.py
+++ b/naoki/constants.py
@@ -93,6 +93,7 @@ class Config(object):
"distro_epoch" : "unknown",
"distro_version" : "unknown",
"distro_slogan" : "unknown",
+ "disto_vendor" : "unknown",
#
# Logging
"log_config_file" : os.path.join(CONFIGDIR, "logging.ini"),
@@ -153,6 +154,7 @@ class Config(object):
"DISTRO_EPOCH" : self["distro_epoch"],
"DISTRO_VERSION" : self["distro_version"],
"DISTRO_SLOGAN" : self["distro_slogan"],
+ "DISTRO_VENDOR" : self["distro_vendor"],
#
"PARALLELISMFLAGS" : "-j%d" % self["parallelism"],
}
diff --git a/pkgs/Constants b/pkgs/Constants
index e88552b..92d6477 100644
--- a/pkgs/Constants
+++ b/pkgs/Constants
@@ -26,7 +26,7 @@ DIR_TOOLS = $(BASEDIR)/tools
VPATH = $(DIR_DL)
# Paths to scripts
-DO_EXTRACT = $(DIR_TOOLS)/extractor
+DO_EXTRACT = tar xaf
DO_QUALITY_AGENT = $(DIR_TOOLS)/quality-agent
###############################################################################
@@ -83,13 +83,6 @@ export BUILD_ID
#
###############################################################################
#
-# Constants
-#
-
-# The suffix of the package name
-PKG_SUFFIX = -$(PKG_VER)-$(DISTRO_SNAME)$(DISTRO_EPOCH)-$(PKG_ARCH).$(PKG_REL).ipk
-
-#
# Variables
#
@@ -102,6 +95,7 @@ PKG_EPOCH = 0
# Shortcut to package name + version
THISAPP = $(PKG_NAME)-$(PKG_VER)
+THISVER = $(PKG_EPOCH):$(PKG_VER)-$(PKG_REL)
# All packages depend on gcc and headers by default.
PKG_BUILD_DEPS+= gcc glibc-devel kernel-headers
diff --git a/pkgs/Functions b/pkgs/Functions
index 258a02f..ff64af3 100644
--- a/pkgs/Functions
+++ b/pkgs/Functions
@@ -7,7 +7,10 @@
include $(PKGROOT)/gmsl
-DO_PACKAGE_FILENAME = $(1)$(PKG_SUFFIX)
+DO_PACKAGE_FILENAME = $(1)$(call DO_PKG_SUFFIX,$(1))
+
+DO_PKG_SUFFIX = \
+ -$(if $(PKG_VER-$(1)),$(PKG_VER-$(1)),$(PKG_VER))-$(DISTRO_SNAME)$(DISTRO_EPOCH)-$(PKG_ARCH).$(if $(PKG_REL-$(1)),$(PKG_REL-$(1)),$(PKG_REL)).ipk
define DO_PACKAGE
@echo "#####################################################################"
diff --git a/pkgs/Templates b/pkgs/Templates
index fd291cd..a1a921e 100644
--- a/pkgs/Templates
+++ b/pkgs/Templates
@@ -5,6 +5,14 @@
#
###############################################################################
+###############################################################################
+# Default template
+###############################################################################
+
+PKG_PROVIDES-$(PKG_NAME_REAL) = $(PKG_NAME_REAL)=$(THISVER)
+
+# Package all files by default
+PKG_FILES = /
###############################################################################
# Devel template
@@ -13,7 +21,8 @@
PKG_DESCRIPTION-$(PKG_NAME_REAL)-devel = Development files of $(THISAPP).
PKG_SUMMARY-$(PKG_NAME_REAL)-devel = $(PKG_DESCRIPTION-$(PKG_NAME_REAL)-devel)
-PKG_DEPS-$(PKG_NAME_REAL)-devel = $(foreach dep,$(PKG_BUILD_DEPS),$(if $(findstring -devel,$(dep)),$(dep)))
+PKG_DEPS-$(PKG_NAME_REAL)-devel = $(PKG_NAME_REAL)=$(THISVER) \
+ $(foreach dep,$(PKG_BUILD_DEPS),$(if $(findstring -devel,$(dep)),$(dep)))
define PKG_FILES-$(PKG_NAME_REAL)-devel
/usr/bin/*-config
@@ -35,6 +44,8 @@ endef
PKG_DESCRIPTION-$(PKG_NAME_REAL)-libs = Library files of $(THISAPP).
PKG_SUMMARY-$(PKG_NAME_REAL)-libs = $(PKG_DESCRIPTION-$(PKG_NAME_REAL)-libs)
+PKG_DEPS-$(PKG_NAME_REAL)-libs = $(PKG_NAME_REAL)=$(THISVER)
+
define PKG_FILES-$(PKG_NAME_REAL)-libs
/lib/lib*.so.*
/usr/lib/lib*.so.*
diff --git a/pkgs/core/autoconf/autoconf.nm b/pkgs/core/autoconf/autoconf.nm
index 695e222..90b84c2 100644
--- a/pkgs/core/autoconf/autoconf.nm
+++ b/pkgs/core/autoconf/autoconf.nm
@@ -25,7 +25,7 @@
include $(PKGROOT)/Include
PKG_NAME = autoconf
-PKG_VER = 2.67
+PKG_VER = 2.68
PKG_REL = 0
PKG_MAINTAINER =
@@ -44,4 +44,4 @@ define PKG_DESCRIPTION
specify various configuration options.
endef
-PKG_TARBALL = $(THISAPP).tar.gz
+PKG_TARBALL = $(THISAPP).tar.xz
diff --git a/pkgs/core/bzip2/bzip2.nm b/pkgs/core/bzip2/bzip2.nm
index 14e1f59..1bb063e 100644
--- a/pkgs/core/bzip2/bzip2.nm
+++ b/pkgs/core/bzip2/bzip2.nm
@@ -25,7 +25,7 @@
include $(PKGROOT)/Include
PKG_NAME = bzip2
-PKG_VER = 1.0.5
+PKG_VER = 1.0.6
PKG_REL = 0
PKG_MAINTAINER =
diff --git a/pkgs/core/fail2ban/fail2ban.logrotate b/pkgs/core/fail2ban/fail2ban.logrotate
new file mode 100644
index 0000000..4d7a6c9
--- /dev/null
+++ b/pkgs/core/fail2ban/fail2ban.logrotate
@@ -0,0 +1,9 @@
+/var/log/fail2ban.log {
+ missingok
+ notifempty
+ size 30k
+ create 0600 root root
+ postrotate
+ /usr/bin/fail2ban-client set logtarget SYSLOG 2> /dev/null || true
+ endscript
+}
diff --git a/pkgs/core/fail2ban/fail2ban.nm b/pkgs/core/fail2ban/fail2ban.nm
new file mode 100644
index 0000000..4463eb8
--- /dev/null
+++ b/pkgs/core/fail2ban/fail2ban.nm
@@ -0,0 +1,54 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include $(PKGROOT)/Include
+
+PKG_NAME = fail2ban
+PKG_VER = 0.8.4
+PKG_REL = 0
+
+PKG_MAINTAINER =
+PKG_GROUP = Security/Tools
+PKG_URL = http://fail2ban.sourceforge.net/
+PKG_LICENSE = GPLv2+
+PKG_SUMMARY = Ban IPs that make too many password failures.
+
+PKG_BUILD_DEPS+= python-devel
+
+
+define PKG_DESCRIPTION
+ Fail2ban scans log files like /var/log/pwdfail or
+ /var/log/apache/error_log and bans IP that makes too many password
+ failures. It updates firewall rules to reject the IP address.
+endef
+
+PKG_TARBALL = $(THISAPP).tar.bz2
+
+STAGE_BUILD = # nothing to do
+
+define STAGE_INSTALL
+ cd $(DIR_APP) && python setup.py install --root=$(BUILDROOT)
+ -mkdir -pv $(BUILDROOT)/etc/logrotate.d/
+ cp -vf $(DIR_SOURCE)/fail2ban.logrotate $(BUILDROOT)/etc/logrotate.d/fail2ban
+endef
diff --git a/pkgs/core/fail2ban/patches/fail2ban-0.8.1-sshd.patch b/pkgs/core/fail2ban/patches/fail2ban-0.8.1-sshd.patch
new file mode 100644
index 0000000..29a768e
--- /dev/null
+++ b/pkgs/core/fail2ban/patches/fail2ban-0.8.1-sshd.patch
@@ -0,0 +1,17 @@
+--- fail2ban-0.8.1/config/jail.conf.sshd 2007-08-09 00:49:59.000000000 +0200
++++ fail2ban-0.8.1/config/jail.conf 2007-08-15 21:41:33.000000000 +0200
+@@ -42,11 +42,11 @@
+
+ [ssh-iptables]
+
+-enabled = false
++enabled = true
+ filter = sshd
+ action = iptables[name=SSH, port=ssh, protocol=tcp]
+- sendmail-whois[name=SSH, dest=you(a)mail.com, sender=fail2ban(a)mail.com]
+-logpath = /var/log/sshd.log
++ sendmail-whois[name=SSH, dest=root, sender=fail2ban(a)mail.com]
++logpath = /var/log/secure
+ maxretry = 5
+
+ [proftpd-iptables]
diff --git a/pkgs/core/fail2ban/patches/fail2ban-0.8.2-fd_cloexec.patch b/pkgs/core/fail2ban/patches/fail2ban-0.8.2-fd_cloexec.patch
new file mode 100644
index 0000000..5c89f7f
--- /dev/null
+++ b/pkgs/core/fail2ban/patches/fail2ban-0.8.2-fd_cloexec.patch
@@ -0,0 +1,22 @@
+--- fail2ban-0.8.2/server/filter.py.orig 2008-03-27 16:26:59.000000000 +0000
++++ fail2ban-0.8.2/server/filter.py 2008-03-27 15:29:48.000000000 +0000
+@@ -428,6 +428,7 @@
+ # is computed and compared to the previous hash of this line.
+
+ import md5
++import fcntl
+
+ class FileContainer:
+
+@@ -455,6 +456,11 @@
+
+ def open(self):
+ self.__handler = open(self.__filename)
++
++ # Set the file descriptor to be FD_CLOEXEC
++ fd = self.__handler.fileno()
++ fcntl.fcntl (self.__handler.fileno(), fcntl.F_SETFD, fd | fcntl.FD_CLOEXEC)
++
+ firstLine = self.__handler.readline()
+ # Computes the MD5 of the first line.
+ myHash = md5.new(firstLine).digest()
diff --git a/pkgs/core/fail2ban/patches/fail2ban-0.8.3-init.patch b/pkgs/core/fail2ban/patches/fail2ban-0.8.3-init.patch
new file mode 100644
index 0000000..3ed8609
--- /dev/null
+++ b/pkgs/core/fail2ban/patches/fail2ban-0.8.3-init.patch
@@ -0,0 +1,20 @@
+--- fail2ban-0.8.3/files/redhat-initd.init 2008-03-10 23:36:22.000000000 +0100
++++ fail2ban-0.8.3/files/redhat-initd 2008-08-24 20:46:01.000000000 +0200
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ #
+-# chkconfig: 345 92 08
++# chkconfig: - 92 08
+ # description: Fail2ban daemon
+ # http://fail2ban.sourceforge.net/wiki/index.php/Main_Page
+ # process name: fail2ban-server
+@@ -27,8 +27,7 @@
+ echo -n $"Starting fail2ban: "
+ getpid
+ if [ -z "$pid" ]; then
+- rm -rf /var/run/fail2ban/fail2ban.sock # in case of unclean shutdown
+- $FAIL2BAN start > /dev/null
++ $FAIL2BAN -x start > /dev/null
+ RETVAL=$?
+ fi
+ if [ $RETVAL -eq 0 ]; then
diff --git a/pkgs/core/fail2ban/patches/fail2ban-0.8.3-log2syslog.patch b/pkgs/core/fail2ban/patches/fail2ban-0.8.3-log2syslog.patch
new file mode 100644
index 0000000..5ee11f6
--- /dev/null
+++ b/pkgs/core/fail2ban/patches/fail2ban-0.8.3-log2syslog.patch
@@ -0,0 +1,11 @@
+--- fail2ban-0.8.3/config/fail2ban.conf~ 2008-02-27 22:44:55.000000000 +0100
++++ fail2ban-0.8.3/config/fail2ban.conf 2009-08-27 20:48:25.000000000 +0200
+@@ -22,7 +22,7 @@
+ # Only one log target can be specified.
+ # Values: STDOUT STDERR SYSLOG file Default: /var/log/fail2ban.log
+ #
+-logtarget = /var/log/fail2ban.log
++logtarget = SYSLOG
+
+ # Option: socket
+ # Notes.: Set the socket file. This is used to communicate with the daemon. Do
diff --git a/pkgs/core/libtool/libtool.nm b/pkgs/core/libtool/libtool.nm
index bec5870..f54b0e2 100644
--- a/pkgs/core/libtool/libtool.nm
+++ b/pkgs/core/libtool/libtool.nm
@@ -25,7 +25,7 @@
include $(PKGROOT)/Include
PKG_NAME = libtool
-PKG_VER = 2.2.10
+PKG_VER = 2.4
PKG_REL = 0
PKG_MAINTAINER =
diff --git a/pkgs/core/libvirt/libvirt.nm b/pkgs/core/libvirt/libvirt.nm
index 6ce4878..b4196f4 100644
--- a/pkgs/core/libvirt/libvirt.nm
+++ b/pkgs/core/libvirt/libvirt.nm
@@ -36,7 +36,7 @@ PKG_SUMMARY = A library for controlling VMs.
PKG_BUILD_DEPS+= avahi-devel libcurl-devel cyrus-sasl-devel gnutls-devel \
libpciaccess-devel libssh2-devel libtool libxml2-devel lvm2 parted-devel \
- pkg-config readline-devel libudev-devel
+ pkg-config readline-devel libudev-devel xen-tools
PKG_DEPS += lvm2
define PKG_DESCRIPTION
@@ -57,7 +57,7 @@ CONFIGURE_OPTIONS += \
--without-polkit \
--without-uml \
--without-vbox \
- --without-xen \
+ --with-xen \
--with-storage-fs \
--with-storage-lvm \
--with-storage-mpath \
diff --git a/pkgs/core/perl-XML-Parser/perl-XML-Parser.nm b/pkgs/core/perl-XML-Parser/perl-XML-Parser.nm
new file mode 100644
index 0000000..1011c69
--- /dev/null
+++ b/pkgs/core/perl-XML-Parser/perl-XML-Parser.nm
@@ -0,0 +1,55 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include $(PKGROOT)/Include
+
+PKG_NAME = XML-Parser
+PKG_VER = 2.36
+PKG_REL = 0
+
+PKG_MAINTAINER =
+PKG_GROUP = Development/Libraries
+PKG_URL = http://search.cpan.org/dist/XML-Parser/
+PKG_LICENSE = GPL+ or Artistic
+PKG_SUMMARY = Perl module for parsing XML files.
+
+PKG_BUILD_DEPS+= expat-devel perl-core perl-devel
+PKG_DEPS += perl
+
+define PKG_DESCRIPTION
+ This module provides ways to parse XML documents. It is built on \
+ top of XML::Parser::Expat, which is a lower level interface to \
+ James Clark's expat library.
+endef
+
+PKG_TARBALL = $(THISAPP).tar.gz
+
+define QUALITY_AGENT_WHITELIST_RPATH
+ /lib
+endef
+
+define STAGE_BUILD
+ cd $(DIR_APP) && perl Makefile.PL INSTALLDIRS=vendor
+ cd $(DIR_APP) && make $(PARALLELISMFLAGS)
+endef
diff --git a/pkgs/core/perl-xml-parser/perl-xml-parser.nm b/pkgs/core/perl-xml-parser/perl-xml-parser.nm
deleted file mode 100644
index 73f03af..0000000
--- a/pkgs/core/perl-xml-parser/perl-xml-parser.nm
+++ /dev/null
@@ -1,55 +0,0 @@
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt #
-# #
-# This program is free software: you can redistribute it and/or modify #
-# it under the terms of the GNU General Public License as published by #
-# the Free Software Foundation, either version 3 of the License, or #
-# (at your option) any later version. #
-# #
-# This program is distributed in the hope that it will be useful, #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
-# GNU General Public License for more details. #
-# #
-# You should have received a copy of the GNU General Public License #
-# along with this program. If not, see <http://www.gnu.org/licenses/>. #
-# #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include $(PKGROOT)/Include
-
-PKG_NAME = XML-Parser
-PKG_VER = 2.36
-PKG_REL = 0
-
-PKG_MAINTAINER =
-PKG_GROUP = Development/Libraries
-PKG_URL = http://search.cpan.org/dist/XML-Parser/
-PKG_LICENSE = GPL+ or Artistic
-PKG_SUMMARY = Perl module for parsing XML files.
-
-PKG_BUILD_DEPS+= expat-devel perl
-PKG_DEPS += perl
-
-define PKG_DESCRIPTION
- This module provides ways to parse XML documents. It is built on \
- top of XML::Parser::Expat, which is a lower level interface to \
- James Clark's expat library.
-endef
-
-PKG_TARBALL = $(THISAPP).tar.gz
-
-define QUALITY_AGENT_WHITELIST_RPATH
- /lib
-endef
-
-define STAGE_BUILD
- cd $(DIR_APP) && perl Makefile.PL
- cd $(DIR_APP) && make $(PARALLELISMFLAGS)
-endef
diff --git a/pkgs/core/perl/patches/perl-5.10.0-libresolv.patch b/pkgs/core/perl/patches/perl-5.10.0-libresolv.patch
new file mode 100644
index 0000000..7676bbb
--- /dev/null
+++ b/pkgs/core/perl/patches/perl-5.10.0-libresolv.patch
@@ -0,0 +1,12 @@
+diff -up perl-5.10.0/Configure.didi perl-5.10.0/Configure
+--- perl-5.10.0/Configure.didi 2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/Configure 2008-07-21 10:51:16.000000000 +0200
+@@ -1327,7 +1327,7 @@ libswanted_uselargefiles=''
+ : set usesocks on the Configure command line to enable socks.
+ : List of libraries we want.
+ : If anyone needs extra -lxxx, put those in a hint file.
+-libswanted="sfio socket bind inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun"
++libswanted="sfio socket resolv inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun"
+ libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD"
+ : We probably want to search /usr/shlib before most other libraries.
+ : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist.
diff --git a/pkgs/core/perl/patches/perl-5.10.1-libresolv.patch b/pkgs/core/perl/patches/perl-5.10.1-libresolv.patch
deleted file mode 100644
index 7676bbb..0000000
--- a/pkgs/core/perl/patches/perl-5.10.1-libresolv.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up perl-5.10.0/Configure.didi perl-5.10.0/Configure
---- perl-5.10.0/Configure.didi 2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/Configure 2008-07-21 10:51:16.000000000 +0200
-@@ -1327,7 +1327,7 @@ libswanted_uselargefiles=''
- : set usesocks on the Configure command line to enable socks.
- : List of libraries we want.
- : If anyone needs extra -lxxx, put those in a hint file.
--libswanted="sfio socket bind inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun"
-+libswanted="sfio socket resolv inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun"
- libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD"
- : We probably want to search /usr/shlib before most other libraries.
- : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist.
diff --git a/pkgs/core/perl/patches/perl-5.10.1-rpath-make.patch b/pkgs/core/perl/patches/perl-5.10.1-rpath-make.patch
deleted file mode 100644
index 9d24326..0000000
--- a/pkgs/core/perl/patches/perl-5.10.1-rpath-make.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- perl-5.8.8-RC1/Makefile.SH.makerpath 2006-01-20 16:41:26.000000000 -0500
-+++ perl-5.8.8-RC1/Makefile.SH 2006-01-20 16:41:57.000000000 -0500
-@@ -125,26 +125,10 @@
- esac
-
- case "$osname" in
-- linux)
-- # If there is a pre-existing $libperl from a previous
-- # installation, Linux needs to use LD_PRELOAD to
-- # override the LD_LIBRARY_PATH setting. See the
-- # INSTALL file, under "Building a shared perl library".
-- # If there is no pre-existing $libperl, we don't need
-- # to do anything further.
-- if test -f $archlib/CORE/$libperl; then
-- rm -f preload
-- cat <<'EOT' > preload
--#! /bin/sh
--lib=$1
--shift
--test -r $lib && export LD_PRELOAD="$lib $LD_PRELOAD"
--exec "$@"
--EOT
-- chmod 755 preload
-- ldlibpth="$ldlibpth `pwd`/preload `pwd`/$libperl"
-- fi
-+ linux*)
-+ ldlibpth="LD_PRELOAD=`pwd`/libperl.so $ldlibpth"
- ;;
-+
- os390) test -f /bin/env && ldlibpth="/bin/env $ldlibpth"
- ;;
- esac
diff --git a/pkgs/core/perl/patches/perl-5.8.0-libdir64.patch b/pkgs/core/perl/patches/perl-5.8.0-libdir64.patch
new file mode 100644
index 0000000..0ab67a0
--- /dev/null
+++ b/pkgs/core/perl/patches/perl-5.8.0-libdir64.patch
@@ -0,0 +1,46 @@
+--- perl-5.8.0/Configure.orig 2002-09-09 11:31:19.000000000 -0400
++++ perl-5.8.0/Configure 2002-09-09 11:40:37.000000000 -0400
+@@ -6458,8 +6458,8 @@
+ : Reproduce behavior of 5.005 and earlier, maybe drop that in 5.7.
+ case "$installstyle" in
+ '') case "$prefix" in
+- *perl*) dflt='lib';;
+- *) dflt='lib/perl5' ;;
++ *perl*) dflt='lib64';;
++ *) dflt='lib64/perl5' ;;
+ esac
+ ;;
+ *) dflt="$installstyle" ;;
+@@ -6475,8 +6475,8 @@
+ : /opt/perl/lib/perl5... would be redundant.
+ : The default "style" setting is made in installstyle.U
+ case "$installstyle" in
+-*lib/perl5*) set dflt privlib lib/$package/$version ;;
+-*) set dflt privlib lib/$version ;;
++*lib64/perl5*) set dflt privlib lib64/$package/$version ;;
++*) set dflt privlib lib64/$version ;;
+ esac
+ eval $prefixit
+ $cat <<EOM
+@@ -6934,8 +6934,8 @@
+ prog=`echo $package | $sed 's/-*[0-9.]*$//'`
+ case "$sitelib" in
+ '') case "$installstyle" in
+- *lib/perl5*) dflt=$siteprefix/lib/$package/site_$prog/$version ;;
+- *) dflt=$siteprefix/lib/site_$prog/$version ;;
++ *lib64/perl5*) dflt=$siteprefix/lib64/$package/site_$prog/$version ;;
++ *) dflt=$siteprefix/lib64/site_$prog/$version ;;
+ esac
+ ;;
+ *) dflt="$sitelib"
+@@ -7061,8 +7061,8 @@
+ '')
+ prog=`echo $package | $sed 's/-*[0-9.]*$//'`
+ case "$installstyle" in
+- *lib/perl5*) dflt=$vendorprefix/lib/$package/vendor_$prog/$version ;;
+- *) dflt=$vendorprefix/lib/vendor_$prog/$version ;;
++ *lib64/perl5*) dflt=$vendorprefix/lib64/$package/vendor_$prog/$version ;;
++ *) dflt=$vendorprefix/lib64/vendor_$prog/$version ;;
+ esac
+ ;;
+ *) dflt="$vendorlib"
diff --git a/pkgs/core/perl/patches/perl-5.8.8-rpath-make.patch b/pkgs/core/perl/patches/perl-5.8.8-rpath-make.patch
new file mode 100644
index 0000000..9d24326
--- /dev/null
+++ b/pkgs/core/perl/patches/perl-5.8.8-rpath-make.patch
@@ -0,0 +1,32 @@
+--- perl-5.8.8-RC1/Makefile.SH.makerpath 2006-01-20 16:41:26.000000000 -0500
++++ perl-5.8.8-RC1/Makefile.SH 2006-01-20 16:41:57.000000000 -0500
+@@ -125,26 +125,10 @@
+ esac
+
+ case "$osname" in
+- linux)
+- # If there is a pre-existing $libperl from a previous
+- # installation, Linux needs to use LD_PRELOAD to
+- # override the LD_LIBRARY_PATH setting. See the
+- # INSTALL file, under "Building a shared perl library".
+- # If there is no pre-existing $libperl, we don't need
+- # to do anything further.
+- if test -f $archlib/CORE/$libperl; then
+- rm -f preload
+- cat <<'EOT' > preload
+-#! /bin/sh
+-lib=$1
+-shift
+-test -r $lib && export LD_PRELOAD="$lib $LD_PRELOAD"
+-exec "$@"
+-EOT
+- chmod 755 preload
+- ldlibpth="$ldlibpth `pwd`/preload `pwd`/$libperl"
+- fi
++ linux*)
++ ldlibpth="LD_PRELOAD=`pwd`/libperl.so $ldlibpth"
+ ;;
++
+ os390) test -f /bin/env && ldlibpth="/bin/env $ldlibpth"
+ ;;
+ esac
diff --git a/pkgs/core/perl/patches/perl-USE_MM_LD_RUN_PATH.patch b/pkgs/core/perl/patches/perl-USE_MM_LD_RUN_PATH.patch
new file mode 100644
index 0000000..5b1ef76
--- /dev/null
+++ b/pkgs/core/perl/patches/perl-USE_MM_LD_RUN_PATH.patch
@@ -0,0 +1,109 @@
+diff -up perl-5.12.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm.runpath perl-5.12.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm
+--- perl-5.12.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm.runpath 2010-01-18 19:52:49.000000000 +0100
++++ perl-5.12.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm 2010-04-13 15:56:55.859789425 +0200
+@@ -88,6 +88,11 @@ libraries. LD_RUN_PATH is a colon separ
+ in LDLOADLIBS. It is passed as an environment variable to the process
+ that links the shared library.
+
++Fedora extension: This generation of LD_RUN_PATH is disabled by default.
++To use the generated LD_RUN_PATH for all links, set the USE_MM_LD_RUN_PATH
++MakeMaker object attribute / argument, (or set the $USE_MM_LD_RUN_PATH
++environment variable).
++
+ =head2 BSLOADLIBS
+
+ List of those libraries that are needed but can be linked in
+diff -up perl-5.12.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm.runpath perl-5.12.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm
+--- perl-5.12.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm.runpath 2010-01-18 19:52:49.000000000 +0100
++++ perl-5.12.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm 2010-04-13 16:00:32.941778159 +0200
+@@ -262,7 +262,7 @@ sub full_setup {
+ PERL_SRC PERM_DIR PERM_RW PERM_RWX
+ PL_FILES PM PM_FILTER PMLIBDIRS PMLIBPARENTDIRS POLLUTE PPM_INSTALL_EXEC
+ PPM_INSTALL_SCRIPT PREREQ_FATAL PREREQ_PM PREREQ_PRINT PRINT_PREREQ
+- SIGN SKIP TYPEMAPS VERSION VERSION_FROM XS XSOPT XSPROTOARG
++ SIGN SKIP TYPEMAPS USE_MM_LD_RUN_PATH VERSION VERSION_FROM XS XSOPT XSPROTOARG
+ XS_VERSION clean depend dist dynamic_lib linkext macro realclean
+ tool_autosplit
+
+@@ -406,7 +406,27 @@ sub new {
+ # PRINT_PREREQ is RedHatism.
+ if ("@ARGV" =~ /\bPRINT_PREREQ\b/) {
+ $self->_PRINT_PREREQ;
+- }
++ }
++
++ # USE_MM_LD_RUN_PATH - another RedHatism to disable automatic RPATH generation
++ if ( ( ! $self->{USE_MM_LD_RUN_PATH} )
++ &&( ("@ARGV" =~ /\bUSE_MM_LD_RUN_PATH(=([01]))?\b/)
++ ||( exists( $ENV{USE_MM_LD_RUN_PATH} )
++ &&( $ENV{USE_MM_LD_RUN_PATH} =~ /([01])?$/ )
++ )
++ )
++ )
++ {
++ my $v = $1;
++ if( $v )
++ {
++ $v = ($v=~/=([01])$/)[0];
++ }else
++ {
++ $v = 1;
++ };
++ $self->{USE_MM_LD_RUN_PATH}=$v;
++ };
+
+ print STDOUT "MakeMaker (v$VERSION)\n" if $Verbose;
+ if (-f "MANIFEST" && ! -f "Makefile"){
+@@ -2320,6 +2340,40 @@ precedence. A typemap in the current di
+ precedence, even if it isn't listed in TYPEMAPS. The default system
+ typemap has lowest precedence.
+
++=item USE_MM_LD_RUN_PATH
++
++boolean
++The Fedora perl MakeMaker distribution differs from the standard
++upstream release in that it disables use of the MakeMaker generated
++LD_RUN_PATH by default, UNLESS this attribute is specified , or the
++USE_MM_LD_RUN_PATH environment variable is set during the MakeMaker run.
++
++The upstream MakeMaker will set the ld(1) environment variable LD_RUN_PATH
++to the concatenation of every -L ld(1) option directory in which a -l ld(1)
++option library is found, which is used as the ld(1) -rpath option if none
++is specified. This means that, if your application builds shared libraries
++and your MakeMaker application links to them, that the absolute paths of the
++libraries in the build tree will be inserted into the RPATH header of all
++MakeMaker generated binaries, and that such binaries will be unable to link
++to these libraries if they do not still reside in the build tree directories
++(unlikely) or in the system library directories (/lib or /usr/lib), regardless
++of any LD_LIBRARY_PATH setting. So if you specified -L../mylib -lmylib , and
++ your 'libmylib.so' gets installed into /some_directory_other_than_usr_lib,
++ your MakeMaker application will be unable to link to it, even if LD_LIBRARY_PATH
++is set to include /some_directory_other_than_usr_lib, because RPATH overrides
++LD_LIBRARY_PATH.
++
++So for Fedora MakeMaker builds LD_RUN_PATH is NOT generated by default for
++every link. You can still use explicit -rpath ld options or the LD_RUN_PATH
++environment variable during the build to generate an RPATH for the binaries.
++
++You can set the USE_MM_LD_RUN_PATH attribute to 1 on the MakeMaker command
++line or in the WriteMakefile arguments to enable generation of LD_RUN_PATH
++for every link command.
++
++USE_MM_LD_RUN_PATH will default to 1 (LD_RUN_PATH will be used) IF the
++$USE_MM_LD_RUN_PATH environment variable is set during a MakeMaker run.
++
+ =item VENDORPREFIX
+
+ Like PERLPREFIX, but only for the vendor install locations.
+diff -up perl-5.12.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm.runpath perl-5.12.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
+--- perl-5.12.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm.runpath 2010-01-18 19:52:49.000000000 +0100
++++ perl-5.12.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm 2010-04-13 15:56:10.656775285 +0200
+@@ -944,7 +944,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $
+ }
+
+ my $ld_run_path_shell = "";
+- if ($self->{LD_RUN_PATH} ne "") {
++ if (($self->{LD_RUN_PATH} ne "") && ($self->{USE_MM_LD_RUN_PATH})) {
+ $ld_run_path_shell = 'LD_RUN_PATH="$(LD_RUN_PATH)" ';
+ }
+
diff --git a/pkgs/core/perl/patches/perl-disable_test_hosts.patch b/pkgs/core/perl/patches/perl-disable_test_hosts.patch
new file mode 100644
index 0000000..dc86a34
--- /dev/null
+++ b/pkgs/core/perl/patches/perl-disable_test_hosts.patch
@@ -0,0 +1,12 @@
+diff -up perl-5.12.0/cpan/libnet/Net/Config.pm.disable perl-5.12.0/cpan/libnet/Net/Config.pm
+--- perl-5.12.0/cpan/libnet/Net/Config.pm.disable 2010-01-18 19:52:49.000000000 +0100
++++ perl-5.12.0/cpan/libnet/Net/Config.pm 2010-04-13 16:03:50.090770813 +0200
+@@ -29,7 +29,7 @@ eval { local $SIG{__DIE__}; require Net:
+ ftp_firewall => undef,
+ ftp_ext_passive => 1,
+ ftp_int_passive => 1,
+- test_hosts => 1,
++ test_hosts => 0,
+ test_exist => 1,
+ );
+
diff --git a/pkgs/core/perl/patches/perl-perlbug-tag.patch b/pkgs/core/perl/patches/perl-perlbug-tag.patch
new file mode 100644
index 0000000..e4b0976
--- /dev/null
+++ b/pkgs/core/perl/patches/perl-perlbug-tag.patch
@@ -0,0 +1,51 @@
+--- perl-5.10.1/utils/perlbug.PL.fedora 2009-08-12 20:49:24.000000000 +0200
++++ perl-5.10.1/utils/perlbug.PL 2009-11-18 15:56:15.000000000 +0100
+@@ -27,8 +27,6 @@ open OUT, ">$file" or die "Can't create
+ open PATCH_LEVEL, "<" . catfile(updir, "patchlevel.h")
+ or die "Can't open patchlevel.h: $!";
+
+-my $patchlevel_date = (stat PATCH_LEVEL)[9];
+-
+ while (<PATCH_LEVEL>) {
+ last if $_ =~ /^\s*static\s+(?:const\s+)?char.*?local_patches\[\]\s*=\s*{\s*$/;
+ }
+@@ -71,9 +69,8 @@ $Config{startperl}
+ eval 'exec $Config{perlpath} -S \$0 \${1+"\$@"}'
+ if \$running_under_some_shell;
+
+-my \$config_tag1 = '$extract_version - $Config{cf_time}';
++my \$config_tag1 = '$extract_version';
+
+-my \$patchlevel_date = $patchlevel_date;
+ my \$patch_tags = '$patch_tags';
+ my \@patches = (
+ $patch_desc
+@@ -333,17 +330,6 @@ sub Init {
+ $ok = '';
+ if ($::opt_o) {
+ if ($::opt_o eq 'k' or $::opt_o eq 'kay') {
+- my $age = time - $patchlevel_date;
+- if ($::opt_o eq 'k' and $age > 60 * 24 * 60 * 60 ) {
+- my $date = localtime $patchlevel_date;
+- print <<"EOF";
+-"perlbug -ok" and "perlbug -nok" do not report on Perl versions which
+-are more than 60 days old. This Perl version was constructed on
+-$date. If you really want to report this, use
+-"perlbug -okay" or "perlbug -nokay".
+-EOF
+- exit();
+- }
+ # force these options
+ unless ($::opt_n) {
+ $::opt_S = 1; # don't prompt for send
+@@ -730,8 +716,8 @@ EFF
+ print OUT <<EFF;
+ ---
+ EFF
+- print OUT "This perlbug was built using Perl $config_tag1\n",
+- "It is being executed now by Perl $config_tag2.\n\n"
++ print OUT "This perlbug was built using Perl $config_tag1 in the Fedora build system.\n",
++ "It is being executed now by Perl $config_tag2.\n\n"
+ if $config_tag2 ne $config_tag1;
+
+ print OUT <<EOF;
diff --git a/pkgs/core/perl/perl.nm b/pkgs/core/perl/perl.nm
index 44dc563..c132584 100644
--- a/pkgs/core/perl/perl.nm
+++ b/pkgs/core/perl/perl.nm
@@ -25,8 +25,8 @@
include $(PKGROOT)/Include
PKG_NAME = perl
-PKG_VER = 5.12.1
-PKG_REL = 0
+PKG_VER = 5.12.2
+PKG_REL = 1
PKG_MAINTAINER =
PKG_GROUP = Development/Languages
@@ -34,7 +34,7 @@ PKG_URL = http://www.perl.org/
PKG_LICENSE = GPL+ or Artistic and GPLv2+ or Artistic
PKG_SUMMARY = Practical Extraction and Report Language.
-PKG_BUILD_DEPS+= db-devel gcc-c++ gdbm-devel iana-etc procps zlib-devel
+PKG_BUILD_DEPS+= db-devel gcc-c++ gdbm-devel iana-etc perl procps zlib-devel
define PKG_DESCRIPTION
Perl is a high-level programming language with roots in C, sed, awk \
@@ -53,12 +53,17 @@ PKG_TARBALL = $(THISAPP).tar.gz
define QUALITY_AGENT_WHITELIST_RPATH
/lib
/usr/lib
+ /usr/lib/perl5/CORE
endef
define STAGE_PREPARE_CMDS
cd $(DIR_APP) && sed -i 's/command /command[ -]/' makedepend.SH
endef
+# Perl passes -fstack-protector, if no argument is passed that enables the SSP.
+# So we need to pass it explicitely.
+CFLAGS += -fstack-protector-all
+
define STAGE_BUILD
cd $(DIR_APP) && sed -i -e "s|BUILD_ZLIB\s*= True|BUILD_ZLIB = False|" \
-e "s|INCLUDE\s*= ./zlib-src|INCLUDE = /usr/include|" \
@@ -68,16 +73,29 @@ define STAGE_BUILD
cd $(DIR_APP) && \
sh ./Configure -des \
-Doptimize="$(CFLAGS)" \
+ -Dccdlflags="-Wl,--enable-new-dtags" \
+ -Dversion=$(PKG_VER) \
+ -Dmyhostname=localhost \
+ -Dperladmin=root@localhost \
+ -Dcc="gcc" \
+ -Dcf_by="$(DISTRO_VENDOR)" \
-Dprefix=/usr \
+ -Dvendorprefix=/usr \
+ -Dsiteprefix="/usr/local" \
+ -Dsitelib="/usr/local/share/perl5" \
+ -Dsitearch="/usr/local/lib/perl5" \
+ -Dprivlib="/usr/share/perl5" \
+ -Dvendorlib="/usr/share/perl5/vendor_perl" \
+ -Darchlib="/usr/lib/perl5" \
+ -Dvendorarch="/usr/lib/perl5/vendor_perl" \
+ -Darchname=$(PKG_ARCH)-linux-thread-multi \
+ -Dpager="/usr/bin/less -isr" \
-Dman1dir=/usr/share/man/man1 \
-Dman3dir=/usr/share/man/man3 \
- -Dpager="/usr/bin/less -isR" \
- -Dmyhostname=localhost
-Duseshrplib \
-Dusethreads \
-Duseithreads \
-Duselargefiles \
- -Dd_dosuid \
-Dd_semctl_semun \
-Di_db \
-Ui_ndbm \
@@ -95,7 +113,8 @@ define STAGE_BUILD
-Ud_endprotoent_r_proto \
-Ud_setprotoent_r_proto \
-Ud_endservent_r_proto \
- -Ud_setservent_r_proto
+ -Ud_setservent_r_proto \
+ -Dscriptdir="/usr/bin"
cd $(DIR_APP) && make $(PARALLELISMFLAGS)
endef
@@ -103,3 +122,926 @@ endef
define STAGE_TEST
cd $(DIR_APP) && make test
endef
+
+define STAGE_INSTALL_CMDS
+ # Remove precreated directories
+ rm -rfv $(BUILDROOT)/usr/local
+endef
+
+### Split the perl package into lots of subpackages
+
+# perl-libs
+PKG_PACKAGES += perl-libs
+
+define PKG_FILES-perl-libs
+ /usr/lib/perl5/CORE/libperl.so
+endef
+PKG_DEPS-perl += perl-libs=$(THISVER)
+PKG_PROVIDES-perl-libs += libperl.so
+
+
+# perl-devel
+PKG_PACKAGES += perl-devel
+
+define PKG_FILES-perl-devel
+ /usr/bin/enc2xs
+ /usr/share/man/man1/enc2xs*
+ /usr/share/perl5/Encode/
+ /usr/bin/h2xs
+ /usr/share/man/man1/h2xs*
+ /usr/bin/libnetcfg
+ /usr/share/man/man1/libnetcfg*
+ /usr/bin/perlivp
+ /usr/share/man/man1/perlivp*
+ /usr/lib/perl5/CORE/*.h
+ /usr/bin/xsubpp
+ /usr/share/man/man1/xsubpp*
+ /usr/share/man/man1/perlxs*
+endef
+
+# perl-tests
+#PKG_PACKAGES += perl-tests
+#define PKG_DESCRIPTION-perl-tests
+# This package contains the test suite included with perl $(THISVER). \
+# Install this if you want to test your Perl installation (binary and core \
+# modules).
+#endef
+#define PKG_FILES-perl-tests
+# /usr/lib/perl5-tests
+#endef
+
+# Archive-Extract
+PKG_PACKAGES += perl-Archive-Extract
+
+PKG_EPOCH-perl-Archive-Extract = 0
+PKG_VER-perl-Archive-Extract = 0.38
+
+PKG_SUMMARY-perl-Archive-Extract = Generic archive extracting mechanism.
+define PKG_DESCRIPTION-perl-Archive-Extract
+ Archive::Extract is a generic archive extraction mechanism.
+endef
+
+PKG_DEPS-perl-Archive-Extract = perl=$(THISVER)
+define PKG_FILES-perl-Archive-Extract
+ /usr/share/perl5/Archive/Extract.pm
+ /usr/share/man/man3/Archive::Extract.3*
+endef
+
+# Archive-Tar
+PKG_PACKAGES += perl-Archive-Tar
+
+PKG_EPOCH-perl-Archive-Tar = 0
+PKG_VER-perl-Archive-Tar = 1.54
+
+PKG_SUMMARY-perl-Archive-Tar = A module for Perl manipulation of .tar files.
+define PKG_DESCRIPTION-perl-Archive-Tar
+ Archive::Tar provides an object oriented mechanism for handling tar files. It \
+ provides class methods for quick and easy files handling while also allowing \
+ for the creation of tar file objects for custom manipulation. If you have the \
+ IO::Zlib module installed, Archive::Tar will also support compressed or \
+ gzipped tar files.
+endef
+
+PKG_DEPS-perl-Archive-Tar = perl=$(THISVER)
+
+define PKG_FILES-perl-Archive-Tar
+ /usr/bin/ptar
+ /usr/bin/ptardiff
+ /usr/share/perl5/Archive/Tar.pm
+ /usr/share/man/man1/ptar.1*
+ /usr/share/man/man1/ptardiff.1*
+ /usr/share/man/man3/Archive::Tar*
+endef
+
+# Compress-Raw-Lib
+PKG_PACKAGES += perl-Compress-Raw-Zlib
+
+PKG_EPOCH-perl-Compress-Raw-Zlib = 0
+PKG_VER-perl-Compress-Raw-Zlib = 2.024
+
+PKG_SUMMARY-perl-Compress-Raw-Zlib = \
+ Low-Level Interface to the zlib compression library.
+define PKG_DESCRIPTION-perl-Compress-Raw-Zlib
+ This module provides a Perl interface to the zlib compression library. \
+ It is used by IO::Compress::Zlib.
+endef
+
+PKG_DEPS-perl-Compress-Raw-Zlib = perl=$(THISVER)
+
+define PKG_FILES-perl-Compress-Raw-Zlib
+ /usr/share/perl5/Compress/Raw/Zlib/
+ /usr/share/man/man3/Compress::Raw::Zlib*
+endef
+
+# CPAN
+PKG_PACKAGES += perl-CPAN
+
+PKG_EPOCH-perl-CPAN = 0
+PKG_VER-perl-CPAN = 1.9402
+
+PKG_SUMMARY-perl-CPAN = \
+ Query, download and build perl modules from CPAN sites.
+define PKG_DESCRIPTION-perl-CPAN
+ Query, download and build perl modules from CPAN sites.
+endef
+
+PKG_DEPS-perl-CPAN = perl=$(THISVER) perl(Digest::SHA)
+PKG_PROVIDES-perl-CPAN += cpan cpan=$(PKG_VER-perl-CPAN)
+
+define PKG_FILES-perl-CPAN
+ /usr/bin/cpan
+ /usr/share/perl5/CPAN*
+ /usr/share/man/man1/cpan.1*
+ /usr/share/man/man3/CPAN*
+endef
+
+# CPANPLUS
+PKG_PACKAGES += perl-CPANPLUS
+
+PKG_EPOCH-perl-CPANPLUS = 0
+PKG_VER-perl-CPANPLUS = 0.9
+
+PKG_SUMMARY-perl-CPANPLUS = \
+ API & CLI access to the CPAN mirrors.
+define PKG_DESCRIPTION-perl-CPANPLUS
+ The CPANPLUS library is an API to the CPAN mirrors and a collection of \
+ interactive shells, commandline programs, etc, that use this API.
+endef
+
+PKG_DEPS-perl-CPANPLUS = perl=$(THISVER) perl(Digest::SHA) \
+ perl(Module::Pluggable)>=2.4 perl(Module::CoreList) perl(DBIx::Simple)
+PKG_PROVIDES-perl-CPANPLUS += perl-CPANPLUS-Dist-Build=0.06
+
+define PKG_FILES-perl-CPANPLUS
+ /usr/bin/cpan2dist
+ /usr/bin/cpanp
+ /usr/bin/cpanp-run-perl
+ /usr/share/perl5/CPANPLUS*
+ /usr/share/man/man1/cpan2dist.1*
+ /usr/share/man/man1/cpanp.1*
+ /usr/share/man/man3/CPANPLUS*
+endef
+
+# Digest-SHA
+PKG_PACKAGES += perl-Digest-SHA
+
+PKG_EPOCH-perl-Digest-SHA = 0
+PKG_VER-perl-Digest-SHA = 5.47
+
+PKG_SUMMARY-perl-Digest-SHA = \
+ Perl extension for SHA-1/224/256/384/512.
+define PKG_DESCRIPTION-perl-Digest-SHA
+ Digest::SHA is a complete implementation of the NIST Secure Hash \
+ Standard. It gives Perl programmers a convenient way to calculate \
+ SHA-1, SHA-224, SHA-256, SHA-384, and SHA-512 message digests. The \
+ module can handle all types of input, including partial-byte data.
+endef
+
+PKG_DEPS-perl-Digest-SHA = perl=$(THISVER)
+
+define PKG_FILES-perl-Digest-SHA
+ /usr/bin/shasum
+ /usr/share/perl5/Digest*
+ /usr/share/man/man1/shasum.1*
+ /usr/share/man/man3/Digest::SHA.3*
+endef
+
+# ExtUtils-CBuilder
+PKG_PACKAGES += perl-ExtUtils-CBuilder
+
+PKG_EPOCH-perl-ExtUtils-CBuilder = 0
+PKG_VER-perl-ExtUtils-CBuilder = 0.27
+
+PKG_SUMMARY-perl-ExtUtils-CBuilder = \
+ Compile and link C code for Perl modules.
+define PKG_DESCRIPTION-perl-ExtUtils-CBuilder
+ This module can build the C portions of Perl modules by invoking the \
+ appropriate compilers and linkers in a cross-platform manner. It was \
+ motivated by the Module::Build project, but may be useful for other \
+ purposes as well.
+endef
+
+PKG_DEPS-perl-ExtUtils-CBuilder = perl=$(THISVER) perl-devel
+
+define PKG_FILES-perl-ExtUtils-CBuilder
+ /usr/share/perl5/ExtUtils/CBuilder*
+ /usr/share/man/man3/ExtUtils::CBuilder*
+endef
+
+# ExtUtils-Embed
+PKG_PACKAGES += perl-ExtUtils-Embed
+
+PKG_EPOCH-perl-ExtUtils-Embed = 0
+PKG_VER-perl-ExtUtils-Embed = 1.28
+
+PKG_SUMMARY-perl-ExtUtils-Embed = \
+ Utilities for embedding Perl in C/C++ applications.
+define PKG_DESCRIPTION-perl-ExtUtils-Embed
+ Utilities for embedding Perl in C/C++ applications.
+endef
+
+PKG_DEPS-perl-ExtUtils-Embed = perl=$(THISVER) perl-devel
+
+define PKG_FILES-perl-ExtUtils-Embed
+ /usr/share/perl5/ExtUtils/Embed*
+ /usr/share/man/man3/ExtUtils::Embed*
+endef
+
+# ExtUtils-MakeMaker
+PKG_PACKAGES += perl-ExtUtils-MakeMaker
+
+PKG_EPOCH-perl-ExtUtils-MakeMaker = 0
+PKG_VER-perl-ExtUtils-MakeMaker = 6.56
+
+PKG_SUMMARY-perl-ExtUtils-MakeMaker = Create a module Makefile.
+define PKG_DESCRIPTION-perl-ExtUtils-MakeMaker
+ Create a module Makefile.
+endef
+
+PKG_DEPS-perl-ExtUtils-MakeMaker = perl=$(THISVER) perl-devel perl(Test::Harness)
+
+define PKG_FILES-perl-ExtUtils-MakeMaker
+ /usr/bin/instmodsh
+ /usr/share/perl5/ExtUtils/Command/
+ /usr/share/perl5/ExtUtils/Install.pm
+ /usr/share/perl5/ExtUtils/Installed.pm
+ /usr/share/perl5/ExtUtils/Liblist/
+ /usr/share/perl5/ExtUtils/Liblist.pm
+ /usr/share/perl5/ExtUtils/MakeMaker/
+ /usr/share/perl5/ExtUtils/MakeMaker.pm
+ /usr/share/perl5/ExtUtils/MANIFEST.SKIP
+ /usr/share/perl5/ExtUtils/MM*.pm
+ /usr/share/perl5/ExtUtils/MY.pm
+ /usr/share/perl5/ExtUtils/Manifest.pm
+ /usr/share/perl5/ExtUtils/Mkbootstrap.pm
+ /usr/share/perl5/ExtUtils/Mksymlists.pm
+ /usr/share/perl5/ExtUtils/Packlist.pm
+ /usr/share/perl5/ExtUtils/testlib.pm
+ /usr/share/man/man1/instmodsh.1*
+ /usr/share/man/man3/ExtUtils::Command::MM*
+ /usr/share/man/man3/ExtUtils::Install.3*
+ /usr/share/man/man3/ExtUtils::Installed.3*
+ /usr/share/man/man3/ExtUtils::Liblist.3*
+ /usr/share/man/man3/ExtUtils::MM*
+ /usr/share/man/man3/ExtUtils::MY.3*
+ /usr/share/man/man3/ExtUtils::MakeMaker*
+ /usr/share/man/man3/ExtUtils::Manifest.3*
+ /usr/share/man/man3/ExtUtils::Mkbootstrap.3*
+ /usr/share/man/man3/ExtUtils::Mksymlists.3*
+ /usr/share/man/man3/ExtUtils::Packlist.3*
+ /usr/share/man/man3/ExtUtils::testlib.3*
+endef
+
+# ExtUtils-ParseXS
+PKG_PACKAGES += perl-ExtUtils-ParseXS
+
+PKG_EPOCH-perl-ExtUtils-ParseXS = 0
+PKG_VER-perl-ExtUtils-ParseXS = 2.21
+
+PKG_SUMMARY-perl-ExtUtils-ParseXS = \
+ Module and a script for converting Perl XS code into C code.
+define PKG_DESCRIPTION-perl-ExtUtils-ParseXS
+ ExtUtils::ParseXS will compile XS code into C code by embedding the \
+ constructs necessary to let C functions manipulate Perl values and creates \
+ the glue necessary to let Perl access those functions.
+endef
+
+PKG_DEPS-perl-ExtUtils-ParseXS = perl=$(THISVER) perl-devel
+
+define PKG_FILES-perl-ExtUtils-ParseXS
+ /usr/share/perl5/ExtUtils/ParseXS.pm
+ /usr/share/perl5/ExtUtils/xsubpp
+ /usr/share/man/man3/ExtUtils::ParseXS.3*
+endef
+
+# File-Fetch
+PKG_PACKAGES += perl-File-Fetch
+
+PKG_EPOCH-perl-File-Fetch = 0
+PKG_VER-perl-File-Fetch = 6.56
+
+PKG_SUMMARY-perl-File-Fetch = Generic file fetching mechanism.
+define PKG_DESCRIPTION-perl-File-Fetch
+ File::Fetch is a generic file fetching mechanism.
+endef
+
+PKG_DEPS-perl-File-Fetch = perl=$(THISVER) perl(IPC::Cmd)>=0.36 \
+ perl(Module::Load::Conditional)>=0.04 perl(Params::Check)>=0.07
+
+define PKG_FILES-perl-File-Fetch
+ /usr/share/perl5/File/Fetch.pm
+ /usr/share/man/man3/File::Fetch.3*
+endef
+
+# IO-Compress
+PKG_PACKAGES += perl-IO-Compress
+
+PKG_EPOCH-perl-IO-Compress = 0
+PKG_VER-perl-IO-Compress = 2.026
+
+PKG_SUMMARY-perl-IO-Compress = IO::Compress wrapper for modules.
+define PKG_DESCRIPTION-perl-IO-Compress
+ This module is the base class for all IO::Compress and IO::Uncompress \
+ modules. This module is not intended for direct use in application code. \
+ Its sole purpose is to to be sub-classed by IO::Compress modules.
+endef
+
+PKG_DEPS-perl-IO-Compress = perl=$(THISVER)
+PKG_PROVIDES-perl-IO-Compress += perl(IO::Uncompress::Bunzip2)
+
+define PKG_FILES-perl-IO-Compress
+ /usr/share/perl5/Compress/Zlib.pm
+ /usr/lib/perl5/auto/Compress/Zlib/
+ /usr/share/man/man3/Compress::Zlib*
+ /usr/share/perl5/File/GlobMapper.pm
+ /usr/share/perl5/IO/Compress/Base/
+ /usr/share/perl5/IO/Compress/Base.pm
+ /usr/share/perl5/IO/Uncompress/AnyUncompress.pm
+ /usr/share/perl5/IO/Uncompress/Base.pm
+ /usr/share/man/man3/File::GlobMapper.*
+ /usr/share/man/man3/IO::Compress::Base.*
+ /usr/share/man/man3/IO::Uncompress::AnyUncompress.*
+ /usr/share/man/man3/IO::Uncompress::Base.*
+endef
+
+# IO-Zlib
+PKG_PACKAGES += perl-IO-Zlib
+
+PKG_EPOCH-perl-IO-Zlib = 0
+PKG_VER-perl-IO-Zlib = 1.10
+
+PKG_SUMMARY-perl-IO-Zlib = Perl IO:: style interface to Compress::Zlib.
+define PKG_DESCRIPTION-perl-IO-Zlib
+ This modules provides an IO:: style interface to the Compress::Zlib \
+ package. The main advantage is that you can use an IO::Zlib object in much \
+ the same way as an IO::File object so you can have common code that doesn't \
+ know which sort of file it is using.
+endef
+
+PKG_DEPS-perl-IO-Zlib = perl=$(THISVER) perl(Compress::Zlib)
+
+define PKG_FILES-perl-IO-Zlib
+ /usr/share/perl5/IO/Zlib.pm
+ /usr/share/man/man3/IO::Zlib.*
+endef
+
+# IPC-Cmd
+PKG_PACKAGES += perl-IPC-Cmd
+
+PKG_EPOCH-perl-IPC-Cmd = 0
+PKG_VER-perl-IPC-Cmd = 0.54
+
+PKG_SUMMARY-perl-IPC-Cmd = Finding and running system commands made easy.
+define PKG_DESCRIPTION-perl-IPC-Cmd
+ IPC::Cmd allows you to run commands, interactively if desired, in a \
+ platform independent way, but have them still work.
+endef
+
+PKG_DEPS-perl-IPC-Cmd = perl=$(THISVER)
+
+define PKG_FILES-perl-IPC-Cmd
+ /usr/share/perl5/IPC/Cmd.pm
+ /usr/share/man/man3/IPC::Cmd.3*
+endef
+
+# Locale-Maketext-Simple
+PKG_PACKAGES += perl-Locale-Maketext-Simple
+
+PKG_EPOCH-perl-Locale-Maketext-Simple = 0
+PKG_VER-perl-Locale-Maketext-Simple = 0.21
+PKG_LICENSE-perl-Locale-Maketext-Simple = MIT
+
+PKG_SUMMARY-perl-Locale-Maketext-Simple = \
+ Simple interface to Locale::Maketext::Lexicon.
+define PKG_DESCRIPTION-perl-Locale-Maketext-Simple
+ This module is a simple wrapper around Locale::Maketext::Lexicon, designed \
+ to alleviate the need of creating Language Classes for module authors.
+endef
+
+PKG_DEPS-perl-Locale-Maketext-Simple = perl=$(THISVER)
+
+define PKG_FILES-perl-Locale-Maketext-Simple
+ /usr/share/perl5/Locale/Maketext/Simple.pm
+ /usr/share/man/man3/Locale::Maketext::Simple.*
+endef
+
+# Log-Message
+PKG_PACKAGES += perl-Log-Message
+
+PKG_EPOCH-perl-Log-Message = 0
+PKG_VER-perl-Log-Message = 0.02
+
+PKG_SUMMARY-perl-Log-Message = Generic message storage mechanism.
+define PKG_DESCRIPTION-perl-Log-Message
+ Log::Message is a generic message storage mechanism. It allows you to store \
+ messages on a stack -- either shared or private -- and assign meta-data to it. \
+ Some meta-data will automatically be added for you, like a timestamp and a \
+ stack trace, but some can be filled in by the user, like a tag by which to \
+ identify it or group it, and a level at which to handle the message (for \
+ example, log it, or die with it).
+endef
+
+PKG_DEPS-perl-Log-Message = perl=$(THISVER)
+PKG_PROVIDES-perl-Log-Message += perl(Log::Message::Handlers)=$(PKG_VER)
+
+define PKG_FILES-perl-Log-Message
+ /usr/share/perl5/Log/Message.pm
+ /usr/share/perl5/Log/Message/Config.pm
+ /usr/share/perl5/Log/Message/Handlers.pm
+ /usr/share/perl5/Log/Message/Item.pm
+ /usr/share/man/man3/Log::Message.3*
+ /usr/share/man/man3/Log::Message::Config.3*
+ /usr/share/man/man3/Log::Message::Handlers.3*
+ /usr/share/man/man3/Log::Message::Item.3*
+endef
+
+# Log-Message-Simple
+PKG_PACKAGES += perl-Log-Message-Simple
+
+PKG_EPOCH-perl-Log-Message-Simple = 0
+PKG_VER-perl-Log-Message-Simple = 0.06
+
+PKG_SUMMARY-perl-Log-Message-Simple = Simplified frontend to Log::Message.
+define PKG_DESCRIPTION-perl-Log-Message-Simple
+ This module provides standardized logging facilities using the \
+ Log::Message module.
+endef
+
+PKG_DEPS-perl-Log-Message-Simple = perl=$(THISVER)
+
+define PKG_FILES-perl-Log-Message-Simple
+ /usr/share/perl5/Log/Message/Simple.pm
+ /usr/share/man/man3/Log::Message::Simple.3*
+endef
+
+# Module-Build
+PKG_PACKAGES += perl-Module-Build
+
+PKG_EPOCH-perl-Module-Build = 0
+PKG_VER-perl-Module-Build = 0.3603
+
+PKG_SUMMARY-perl-Module-Build = \
+ Perl module for building and installing Perl modules.
+define PKG_DESCRIPTION-perl-Module-Build
+ Module::Build is a system for building, testing, and installing Perl modules. \
+ It is meant to be an alternative to ExtUtils::MakeMaker. Developers may alter \
+ the behavior of the module through subclassing in a much more straightforward \
+ way than with MakeMaker. It also does not require a make on your system - most \
+ of the Module::Build code is pure-perl and written in a very cross-platform \
+ way. In fact, you don't even need a shell, so even platforms like MacOS \
+ (traditional) can use it fairly easily. Its only prerequisites are modules that \
+ are included with perl 5.6.0, and it works fine on perl 5.005 if you can \
+ install a few additional modules.
+endef
+
+PKG_DEPS-perl-Module-Build = perl=$(THISVER) perl(Archive::Tar)>=1.08 \
+ perl(ExtUtils::CBuilder)>=0.15 perl(ExtUtils::ParseXS)>=1.02
+
+define PKG_FILES-perl-Module-Build
+ /usr/bin/config_data
+ /usr/share/perl5/inc/
+ /usr/share/perl5/Module/Build*
+ /usr/share/man/man1/config_data.1*
+ /usr/share/man/man3/Module::Build*
+ /usr/share/man/man3/inc::latest.3*
+endef
+
+# Module-CoreList
+PKG_PACKAGES += perl-Module-CoreList
+
+PKG_EPOCH-perl-Module-CoreList = 0
+PKG_VER-perl-Module-CoreList = 2.29
+
+PKG_SUMMARY-perl-Module-CoreList = \
+ Perl core modules indexed by perl versions.
+define PKG_DESCRIPTION-perl-Module-CoreList
+ Module::CoreList contains the hash of hashes %Module::CoreList::version, this \
+ is keyed on perl version as indicated in $]. The second level hash is module \
+ => version pairs.
+endef
+
+PKG_DEPS-perl-Module-CoreList = perl=$(THISVER)
+
+define PKG_FILES-perl-Module-CoreList
+ /usr/bin/corelist
+ /usr/share/perl5/Module/CoreList.pm
+ /usr/share/man/man1/corelist*
+ /usr/share/man/man3/Module::CoreList*
+endef
+
+# Module-Load
+PKG_PACKAGES += perl-Module-Load
+
+PKG_EPOCH-perl-Module-Load = 0
+PKG_VER-perl-Module-Load = 0.16
+
+PKG_SUMMARY-perl-Module-Load = \
+ Runtime require of both modules and files.
+define PKG_DESCRIPTION-perl-Module-Load
+ Module::Load eliminates the need to know whether you are trying to require \
+ either a file or a module.
+endef
+
+PKG_DEPS-perl-Module-Load = perl=$(THISVER)
+
+define PKG_FILES-perl-Module-Load
+ /usr/share/perl5/Module/Load.pm
+ /usr/share/man/man3/Module::Load.*
+endef
+
+# Module-Load-Conditional
+PKG_PACKAGES += perl-Module-Load-Conditional
+
+PKG_EPOCH-perl-Module-Load-Conditional = 0
+PKG_VER-perl-Module-Load-Conditional = 0.34
+
+PKG_SUMMARY-perl-Module-Load-Conditional = \
+ Looking up module information / loading at runtime.
+define PKG_DESCRIPTION-perl-Module-Load-Conditional
+ Module::Load::Conditional provides simple ways to query and possibly load \
+ any of the modules you have installed on your system during runtime.
+endef
+
+PKG_DEPS-perl-Module-Load-Conditional = perl=$(THISVER)
+
+define PKG_FILES-perl-Module-Load-Conditional
+ /usr/share/perl5/Module/Load/
+ /usr/share/man/man3/Module::Load::Conditional*
+endef
+
+# Module-Loaded
+PKG_PACKAGES += perl-Module-Loaded
+
+PKG_EPOCH-perl-Module-Loaded = 0
+PKG_VER-perl-Module-Loaded = 0.06
+
+PKG_SUMMARY-perl-Module-Loaded = \
+ Mark modules as loaded or unloaded.
+define PKG_DESCRIPTION-perl-Module-Loaded
+ When testing applications, often you find yourself needing to provide \
+ functionality in your test environment that would usually be provided by \
+ external modules. Rather than munging the %INC by hand to mark these external \
+ modules as loaded, so they are not attempted to be loaded by perl, this module \
+ offers you a very simple way to mark modules as loaded and/or unloaded.
+endef
+
+PKG_DEPS-perl-Module-Loaded = perl=$(THISVER)
+
+define PKG_FILES-perl-Module-Loaded
+ /usr/share/perl5/Module/Loaded.pm
+ /usr/share/man/man3/Module::Loaded*
+endef
+
+# Module-Plugable
+PKG_PACKAGES += perl-Module-Plugable
+
+PKG_EPOCH-perl-Module-Plugable = 0
+PKG_VER-perl-Module-Plugable = 3.90
+
+PKG_SUMMARY-perl-Module-Plugable = \
+ Automatically give your module the ability to have plugins.
+define PKG_DESCRIPTION-perl-Module-Plugable
+ Provides a simple but, hopefully, extensible way of having 'plugins' for \
+ your module.
+endef
+
+PKG_DEPS-perl-Module-Plugable = perl=$(THISVER)
+
+define PKG_FILES-perl-Module-Plugable
+ /usr/share/perl5/Devel/InnerPackage.pm
+ /usr/share/perl5/Module/Pluggable/
+ /usr/share/perl5/Module/Pluggable.pm
+ /usr/share/man/man3/Devel::InnerPackage*
+ /usr/share/man/man3/Module::Pluggable*
+endef
+
+# Object-Accessor
+PKG_PACKAGES += perl-Object-Accessor
+
+PKG_EPOCH-perl-Object-Accessor = 0
+PKG_VER-perl-Object-Accessor = 0.36
+
+PKG_SUMMARY-perl-Object-Accessor = \
+ Perl module that allows per object accessors.
+define PKG_DESCRIPTION-perl-Object-Accessor
+ Object::Accessor provides an interface to create per object accessors (as \
+ opposed to per Class accessors, as, for example, Class::Accessor provides).
+endef
+
+PKG_DEPS-perl-Object-Accessor = perl=$(THISVER)
+
+define PKG_FILES-perl-Object-Accessor
+ /usr/share/perl5/Object/
+ /usr/share/man/man3/Object::Accessor*
+endef
+
+# Package-Constants
+PKG_PACKAGES += perl-Package-Constants
+
+PKG_EPOCH-perl-Package-Constants = 0
+PKG_VER-perl-Package-Constants = 0.02
+
+PKG_SUMMARY-perl-Package-Constants = \
+ List all constants declared in a package.
+define PKG_DESCRIPTION-perl-Package-Constants
+ Package::Constants lists all the constants defined in a certain package. This \
+ can be useful for, among others, setting up an autogenerated @EXPORT/@EXPORT_OK \
+ for a Constants.pm file.
+endef
+
+PKG_DEPS-perl-Package-Constants = perl=$(THISVER)
+
+define PKG_FILES-perl-Package-Constants
+ /usr/share/perl5/Package/
+ /usr/share/man/man3/Package::Constants*
+endef
+
+# Params-Check
+PKG_PACKAGES += perl-Params-Check
+
+PKG_EPOCH-perl-Params-Check = 0
+PKG_VER-perl-Params-Check = 0.26
+
+PKG_SUMMARY-perl-Params-Check = \
+ Generic input parsing/checking mechanism.
+define PKG_DESCRIPTION-perl-Params-Check
+ Params::Check is a generic input parsing/checking mechanism.
+endef
+
+PKG_DEPS-perl-Params-Check = perl=$(THISVER)
+
+define PKG_FILES-perl-Params-Check
+ /usr/share/perl5/Params/
+ /usr/share/man/man3/Params::Check*
+endef
+
+# Parse-CPAN-Meta
+PKG_PACKAGES += perl-Parse-CPAN-Meta
+
+PKG_EPOCH-perl-Parse-CPAN-Meta = 0
+PKG_VER-perl-Parse-CPAN-Meta = 1.40
+
+PKG_SUMMARY-perl-Parse-CPAN-Meta = \
+ Parse META.yml and other similar CPAN metadata files.
+define PKG_DESCRIPTION-perl-Parse-CPAN-Meta
+ Parse::CPAN::Meta is a parser for META.yml files, based on the parser half of \
+ YAML::Tiny.
+endef
+
+PKG_DEPS-perl-Parse-CPAN-Meta = perl=$(THISVER)
+
+define PKG_FILES-perl-Parse-CPAN-Meta
+ /usr/share/perl5/Parse/CPAN/Meta.pm
+ /usr/share/man/man3/Parse::CPAN::Meta.3*
+endef
+
+# Pod-Escapes
+PKG_PACKAGES += perl-Pod-Escapes
+
+PKG_EPOCH-perl-Pod-Escapes = 0
+PKG_VER-perl-Pod-Escapes = 1.04
+
+PKG_SUMMARY-perl-Pod-Escapes = \
+ Perl module for resolving POD escape sequences.
+define PKG_DESCRIPTION-perl-Pod-Escapes
+ This module provides things that are useful in decoding Pod E<...> sequences. \
+ Presumably, it should be used only by Pod parsers and/or formatters.
+endef
+
+PKG_DEPS-perl-Pod-Escapes = perl=$(THISVER)
+
+define PKG_FILES-perl-Pod-Escapes
+ /usr/share/perl5/Pod/Escapes.pm
+ /usr/share/man/man3/Pod::Escapes.*
+endef
+
+# Pod-Simple
+PKG_PACKAGES += perl-Pod-Simple
+
+PKG_EPOCH-perl-Pod-Simple = 0
+PKG_VER-perl-Pod-Simple = 3.13
+
+PKG_SUMMARY-perl-Pod-Simple = \
+ Framework for parsing POD documentation.
+define PKG_DESCRIPTION-perl-Pod-Simple
+ Pod::Simple is a Perl library for parsing text in the Pod (plain old \
+ documentation) markup language that is typically used for writing \
+ documentation for Perl and for Perl modules.
+endef
+
+PKG_DEPS-perl-Pod-Simple = perl=$(THISVER)
+
+define PKG_FILES-perl-Pod-Simple
+ /usr/share/perl5/Pod/Simple/
+ /usr/share/perl5/Pod/Simple.pm
+ /usr/share/perl5/Pod/Simple.pod
+ /usr/share/man/man3/Pod::Simple*
+endef
+
+# Term-UI
+PKG_PACKAGES += perl-Term-UI
+
+PKG_EPOCH-perl-Term-UI = 0
+PKG_VER-perl-Term-UI = 0.20
+
+PKG_SUMMARY-perl-Term-UI = \
+ Term::ReadLine UI made easy.
+define PKG_DESCRIPTION-perl-Term-UI
+ Term::UI is a transparent way of eliminating the overhead of having to format \
+ a question and then validate the reply, informing the user if the answer was not \
+ proper and re-issuing the question.
+endef
+
+PKG_DEPS-perl-Term-UI = perl=$(THISVER) perl(Log::Message::Simple)
+
+define PKG_FILES-perl-Term-UI
+ /usr/share/perl5/Term/UI/
+ /usr/share/perl5/Term/UI.pm
+ /usr/share/man/man3/Term::UI*
+endef
+
+# Test-Harness
+PKG_PACKAGES += perl-Test-Harness
+
+PKG_EPOCH-perl-Test-Harness = 0
+PKG_VER-perl-Test-Harness = 3.17
+
+PKG_SUMMARY-perl-Test-Harness = \
+ Run Perl standard test scripts with statistics.
+define PKG_DESCRIPTION-perl-Test-Harness
+ Run Perl standard test scripts with statistics. \
+ Use TAP::Parser, Test::Harness package was whole rewritten.
+endef
+
+PKG_DEPS-perl-Test-Harness = perl=$(THISVER)
+
+define PKG_FILES-perl-Test-Harness
+ /usr/bin/prove
+ /usr/share/perl5/App*
+ /usr/share/perl5/TAP*
+ /usr/share/perl5/Test/Harness*
+ /usr/share/man/man1/prove.1*
+ /usr/share/man/man3/App*
+ /usr/share/man/man3/TAP*
+ /usr/share/man/man3/Test::Harness*
+endef
+
+# Test-Simple
+PKG_PACKAGES += perl-Test-Simple
+
+PKG_EPOCH-perl-Test-Simple = 0
+PKG_VER-perl-Test-Simple = 0.94
+
+PKG_SUMMARY-perl-Test-Simple = \
+ Basic utilities for writing tests.
+define PKG_DESCRIPTION-perl-Test-Simple
+ Basic utilities for writing tests.
+endef
+
+PKG_DEPS-perl-Test-Simple = perl=$(THISVER)
+
+define PKG_FILES-perl-Test-Simple
+ /usr/share/perl5/Test/More*
+ /usr/share/perl5/Test/Builder*
+ /usr/share/perl5/Test/Simple*
+ /usr/share/perl5/Test/Tutorial*
+ /usr/share/man/man3/Test::More*
+ /usr/share/man/man3/Test::Builder*
+ /usr/share/man/man3/Test::Simple*
+ /usr/share/man/man3/Test::Tutorial*
+endef
+
+# Time-Piece
+PKG_PACKAGES += perl-Time-Piece
+
+PKG_EPOCH-perl-Time-Piece = 0
+PKG_VER-perl-Time-Piece = 1.15
+
+PKG_SUMMARY-perl-Time-Piece = \
+ Time objects from localtime and gmtime.
+define PKG_DESCRIPTION-perl-Time-Piece
+ The Time::Piece module replaces the standard localtime and gmtime functions \
+ with implementations that return objects. It does so in a backwards compatible \
+ manner, so that using localtime or gmtime as documented in perlfunc still \
+ behave as expected.
+endef
+
+PKG_DEPS-perl-Time-Piece = perl=$(THISVER)
+
+define PKG_FILES-perl-Time-Piece
+ /usr/lib/perl5/Time/Piece.pm
+ /usr/lib/perl5/Time/Seconds.pm
+ /usr/lib/perl5/auto/Time/Piece/
+ /usr/share/man/man3/Time::Piece.3*
+ /usr/share/man/man3/Time::Seconds.3*
+endef
+
+# parent
+PKG_PACKAGES += perl-parent
+
+PKG_EPOCH-perl-parent = 0
+PKG_VER-perl-parent = 0.223
+
+PKG_SUMMARY-perl-parent = \
+ Establish an ISA relationship with base classes at compile time.
+define PKG_DESCRIPTION-perl-parent
+ parent allows you to both load one or more modules, while setting up
+ inheritance from those modules at the same time.
+endef
+
+PKG_DEPS-perl-parent = perl=$(THISVER)
+
+define PKG_FILES-perl-parent
+ /usr/share/perl5/parent.pm
+ /usr/share/man/man3/parent.3*
+endef
+
+# threads
+PKG_PACKAGES += perl-threads
+
+PKG_EPOCH-perl-threads = 0
+PKG_VER-perl-threads = 1.75
+
+PKG_SUMMARY-perl-threads = \
+ Perl interpreter-based threads.
+define PKG_DESCRIPTION-perl-threads
+ Since Perl 5.8, thread programming has been available using a model called \
+ interpreter threads which provides a new Perl interpreter for each thread, \
+ and, by default, results in no data or state information being shared between \
+ threads. (Prior to Perl 5.8, 5005threads was available through the Thread.pm \
+ API. This threading model has been deprecated, and was removed as of Perl \
+ 5.10.0.) As just mentioned, all variables are, by default, thread local. To use \
+ shared variables, you need to also load threads::shared.
+endef
+
+PKG_DEPS-perl-threads = perl=$(THISVER)
+
+define PKG_FILES-perl-threads
+ /usr/lib/perl5/auto/threads/threads*
+ /usr/lib/perl5/threads.pm
+ /usr/share/man/man3/threads.3*
+endef
+
+# threads-shared
+PKG_PACKAGES += perl-threads-shared
+
+PKG_EPOCH-perl-threads-shared = 0
+PKG_VER-perl-threads-shared = 1.32
+
+PKG_SUMMARY-perl-threads-shared = \
+ Perl extension for sharing data structures between threads.
+define PKG_DESCRIPTION-perl-threads-shared
+ By default, variables are private to each thread, and each newly created thread \
+ gets a private copy of each existing variable. This module allows you to share \
+ variables across different threads (and pseudo-forks on Win32). It is used \
+ together with the threads module. This module supports the sharing of the \
+ following data types only: scalars and scalar refs, arrays and array refs, and \
+ hashes and hash refs.
+endef
+
+PKG_DEPS-perl-threads-shared = perl=$(THISVER)
+
+define PKG_FILES-perl-threads-shared
+ /usr/lib/perl5/auto/threads/shared*
+ /usr/lib/perl5/threads/shared*
+ /usr/share/man/man3/threads::shared*
+endef
+
+# version
+PKG_PACKAGES += perl-version
+
+PKG_EPOCH-perl-version = 0
+PKG_VER-perl-version = 0.82
+
+PKG_SUMMARY-perl-version = \
+ Perl extension for Version Objects.
+define PKG_DESCRIPTION-perl-version
+ Perl extension for Version Objects.
+endef
+
+PKG_DEPS-perl-version = perl=$(THISVER)
+
+define PKG_FILES-perl-version
+ /usr/share/perl5/version.pm
+ /usr/share/perl5/version.pod
+ /usr/share/perl5/version/
+ /usr/share/man/man3/version.3*
+ /usr/share/man/man3/version::Internals.3*
+endef
+
+# core
+PKG_PACKAGES += perl-core
+
+PKG_EPOCH-perl-core = 0
+PKG_VER-perl-core = $(PKG_VER)
+
+PKG_SUMMARY-perl-core = \
+ Base perl metapackage.
+define PKG_DESCRIPTION-perl-core
+ A metapackage which requires all of the perl bits and modules in the upstream \
+ tarball from perl.org.
+endef
+
+PKG_DEPS-perl-core = perl=$(THISVER) $(PKG_PACKAGES)
+
+PKG_FILES-perl-core = Nothing. Nada. Zilch. Zarro. Uh uh. Nope. Sorry.
diff --git a/pkgs/core/samba/samba.nm b/pkgs/core/samba/samba.nm
index d89c7c6..f419eec 100644
--- a/pkgs/core/samba/samba.nm
+++ b/pkgs/core/samba/samba.nm
@@ -25,7 +25,7 @@
include $(PKGROOT)/Include
PKG_NAME = samba
-PKG_VER = 3.5.4
+PKG_VER = 3.5.6
PKG_REL = 0
PKG_MAINTAINER = Christian Schmidt <christian.schmidt(a)ipfire.org>
diff --git a/pkgs/core/squid/errors.ipfire/English/ERR_ACCESS_DENIED b/pkgs/core/squid/errors.ipfire/English/ERR_ACCESS_DENIED
deleted file mode 100644
index 45b686b..0000000
--- a/pkgs/core/squid/errors.ipfire/English/ERR_ACCESS_DENIED
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... The requested URL could not be retrieved</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-While trying to retrieve the URL:
-<A HREF="%U">%U</A>
-<P>
-The following error was encountered:
-<UL>
-<LI>
-<STRONG>
-Access Denied.
-</STRONG>
-<P>
-Access control configuration prevents your request from
-being allowed at this time. Please contact your service provider if
-you feel this is incorrect.
-</UL>
-<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/errors.ipfire/English/ERR_CACHE_ACCESS_DENIED b/pkgs/core/squid/errors.ipfire/English/ERR_CACHE_ACCESS_DENIED
deleted file mode 100644
index beccfe3..0000000
--- a/pkgs/core/squid/errors.ipfire/English/ERR_CACHE_ACCESS_DENIED
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>ERROR: Cache Access Denied</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... Cache Access Denied</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-While trying to retrieve the URL:
-<A HREF="%U">%U</A>
-<P>
-The following error was encountered:
-<UL>
-<LI>
-<STRONG>
-Cache Access Denied.
-</STRONG>
-</UL>
-</P>
-
-<P>Sorry, you are not currently allowed to request:
-<PRE> %U</PRE>
-from this cache until you have authenticated yourself.
-</P>
-
-<P>
-You need to use Netscape version 2.0 or greater, or Microsoft Internet
-Explorer 3.0, or an HTTP/1.1 compliant browser for this to work. Please
-contact the <A HREF="mailto:%w">cache administrator</a> if you have
-difficulties authenticating yourself or
-<A HREF="http://%h/cgi-bin/chpasswd.cgi">change</a> your default password.
-</P>
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/errors.ipfire/English/ERR_CACHE_MGR_ACCESS_DENIED b/pkgs/core/squid/errors.ipfire/English/ERR_CACHE_MGR_ACCESS_DENIED
deleted file mode 100644
index b8beae0..0000000
--- a/pkgs/core/squid/errors.ipfire/English/ERR_CACHE_MGR_ACCESS_DENIED
+++ /dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>ERROR: Cache Manager Access Denied</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... Cache Manager Access Denied</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-While trying to retrieve the URL:
-<A HREF="%U">%U</A>
-<P>
-The following error was encountered:
-<UL>
-<LI>
-<STRONG>
-Cache Manager Access Denied.
-</STRONG>
-</UL>
-</P>
-
-<P>Sorry, you are not currently allowed to request:
-<PRE> %U</PRE>
-from this cache manager until you have authenticated yourself.
-</P>
-
-<P> You need to use Netscape version 2.0 or greater, or Microsoft Internet
-Explorer 3.0, or an HTTP/1.1 compliant browser for this to work. Please
-contact the <A HREF="mailto:%w">cache administrator</a> if you have
-difficulties authenticating yourself or, if you <em>are</em> the
-administrator, read Squid documentation on cache manager interface and check
-cache log for more detailed error messages.</P>
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/errors.ipfire/English/ERR_CANNOT_FORWARD b/pkgs/core/squid/errors.ipfire/English/ERR_CANNOT_FORWARD
deleted file mode 100644
index 6356a7c..0000000
--- a/pkgs/core/squid/errors.ipfire/English/ERR_CANNOT_FORWARD
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... The requested URL could not be retrieved</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-While trying to retrieve the URL:
-<A HREF="%U">%U</A>
-<P>
-The following error was encountered:
-<UL>
-<LI>
-<STRONG>
-Unable to forward this request at this time.
-</STRONG>
-</UL>
-
-<P>
-This request could not be forwarded to the origin server or to any
-parent caches. The most likely cause for this error is that:
-<UL>
-<LI>The cache administrator does not allow this cache to make
- direct connections to origin servers, and
-<LI>All configured parent caches are currently unreachable.
-</UL>
-<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/errors.ipfire/English/ERR_CONNECT_FAIL b/pkgs/core/squid/errors.ipfire/English/ERR_CONNECT_FAIL
deleted file mode 100644
index 40af3e5..0000000
--- a/pkgs/core/squid/errors.ipfire/English/ERR_CONNECT_FAIL
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... The requested URL could not be retrieved</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-While trying to retrieve the URL:
-<A HREF="%U">%U</A>
-<P>
-The following error was encountered:
-<UL>
-<LI>
-<STRONG>
-Connection to %I Failed
-</STRONG>
-</UL>
-
-<P>
-The system returned:
-<PRE><I> %E</I></PRE>
-
-<P>
-The remote host or network may be down. Please try the request again.
-<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/errors.ipfire/English/ERR_DNS_FAIL b/pkgs/core/squid/errors.ipfire/English/ERR_DNS_FAIL
deleted file mode 100644
index 99cd519..0000000
--- a/pkgs/core/squid/errors.ipfire/English/ERR_DNS_FAIL
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... The requested URL could not be retrieved</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-While trying to retrieve the URL:
-<A HREF="%U">%U</A>
-<P>
-The following error was encountered:
-<BLOCKQUOTE>
-Unable to determine IP address from host name for
-<I>%H</I>
-</BLOCKQUOTE>
-
-<P>
-The dnsserver returned:
-<BLOCKQUOTE>
-%z
-</BLOCKQUOTE>
-
-<P>
-This means that:
-<PRE>
- The cache was not able to resolve the hostname presented in the URL.
- Check if the address is correct.
-</PRE>
-<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/errors.ipfire/English/ERR_FORWARDING_DENIED b/pkgs/core/squid/errors.ipfire/English/ERR_FORWARDING_DENIED
deleted file mode 100644
index cd2aedc..0000000
--- a/pkgs/core/squid/errors.ipfire/English/ERR_FORWARDING_DENIED
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... The requested URL could not be retrieved</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-While trying to retrieve the URL:
-<A HREF="%U">%U</A>
-<P>
-The following error was encountered:
-<UL>
-<LI>
-<STRONG>
-Forwarding Denied.
-</STRONG>
-</UL>
-
-<P>
-This cache will not forward your request because it is trying to enforce a
-sibling relationship. Perhaps the client at %i is a cache which has been
-misconfigured.
-<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/errors.ipfire/English/ERR_FTP_DISABLED b/pkgs/core/squid/errors.ipfire/English/ERR_FTP_DISABLED
deleted file mode 100644
index 4823ba9..0000000
--- a/pkgs/core/squid/errors.ipfire/English/ERR_FTP_DISABLED
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... The requested URL could not be retrieved</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-While trying to retrieve the URL:
-<A HREF="%U">%U</A>
-<P>
-The following error was encountered:
-<UL>
-<LI>
-<STRONG>
-FTP is Disabled
-</STRONG>
-</UL>
-
-<P>
-This cache does not support FTP.
-<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/errors.ipfire/English/ERR_FTP_FAILURE b/pkgs/core/squid/errors.ipfire/English/ERR_FTP_FAILURE
deleted file mode 100644
index 9e20f44..0000000
--- a/pkgs/core/squid/errors.ipfire/English/ERR_FTP_FAILURE
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... The requested URL could not be retrieved</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-An FTP protocol error occurred
-while trying to retrieve the URL:
-<A HREF="%U">%U</A>
-<P>
-Squid sent the following FTP command:
-<blockquote><strong><pre>%f</pre></strong></blockquote>
-and then received this reply
-<blockquote><strong><pre>%F</pre></strong></blockquote>
-<blockquote><strong><pre>%g</pre></strong></blockquote>
-<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/errors.ipfire/English/ERR_FTP_FORBIDDEN b/pkgs/core/squid/errors.ipfire/English/ERR_FTP_FORBIDDEN
deleted file mode 100644
index 6eea8d8..0000000
--- a/pkgs/core/squid/errors.ipfire/English/ERR_FTP_FORBIDDEN
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... The requested URL could not be retrieved</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-An FTP authentication failure occurred
-while trying to retrieve the URL:
-<A HREF="%U">%U</A>
-<P>
-Squid sent the following FTP command:
-<blockquote><strong><pre>%f</pre></strong></blockquote>
-and then received this reply
-<blockquote><strong><pre>%F</pre></strong></blockquote>
-<blockquote><strong><pre>%g</pre></strong></blockquote>
-<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/errors.ipfire/English/ERR_FTP_NOT_FOUND b/pkgs/core/squid/errors.ipfire/English/ERR_FTP_NOT_FOUND
deleted file mode 100644
index ead0b2a..0000000
--- a/pkgs/core/squid/errors.ipfire/English/ERR_FTP_NOT_FOUND
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... The requested URL could not be retrieved</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-The following URL could not be retrieved:
-<A HREF="%U">%U</A>
-<P>
-Squid sent the following FTP command:
-<blockquote><strong><pre>%f</pre></strong></blockquote>
-and then received this reply
-<blockquote><strong><pre>%F</pre></strong></blockquote>
-<blockquote><strong><pre>%g</pre></strong></blockquote>
-<P>
-This might be caused by an FTP URL with an absolute path (which does
-not comply with RFC 1738). If this is the cause, then the file
-can be found at <A HREF="%B">%B</A>.
-<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/errors.ipfire/English/ERR_FTP_PUT_CREATED b/pkgs/core/squid/errors.ipfire/English/ERR_FTP_PUT_CREATED
deleted file mode 100644
index 3c9c296..0000000
--- a/pkgs/core/squid/errors.ipfire/English/ERR_FTP_PUT_CREATED
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FTP PUT Successful: File Created</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>File created</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/errors.ipfire/English/ERR_FTP_PUT_ERROR b/pkgs/core/squid/errors.ipfire/English/ERR_FTP_PUT_ERROR
deleted file mode 100644
index b501c13..0000000
--- a/pkgs/core/squid/errors.ipfire/English/ERR_FTP_PUT_ERROR
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>ERROR: FTP upload failed</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... FTP PUT/upload failed</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-While trying to PUT the following URL:
-<A HREF="%U">%U</A>
-<P>
-Squid sent the following FTP command:
-<PRE><STRONG>
- %f
-</STRONG></PRE>
-and then received this reply
-<PRE><STRONG>
- %F
-</STRONG></PRE>
-<P>
-This means that:
-<PRE>
-Check path, permissions, diskspace and try again.
-</PRE>
-<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/errors.ipfire/English/ERR_FTP_PUT_MODIFIED b/pkgs/core/squid/errors.ipfire/English/ERR_FTP_PUT_MODIFIED
deleted file mode 100644
index 14b36ff..0000000
--- a/pkgs/core/squid/errors.ipfire/English/ERR_FTP_PUT_MODIFIED
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FTP PUT Successful: File updated</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>File updated</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/errors.ipfire/English/ERR_FTP_UNAVAILABLE b/pkgs/core/squid/errors.ipfire/English/ERR_FTP_UNAVAILABLE
deleted file mode 100644
index 5aadaf5..0000000
--- a/pkgs/core/squid/errors.ipfire/English/ERR_FTP_UNAVAILABLE
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... The requested URL could not be retrieved</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-Squid sent the following FTP command:
-<blockquote><strong><pre>%f</pre></strong></blockquote>
-and then received this reply
-<blockquote><strong><pre>%F</pre></strong></blockquote>
-<blockquote><strong><pre>%g</pre></strong></blockquote>
-<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/errors.ipfire/English/ERR_INVALID_REQ b/pkgs/core/squid/errors.ipfire/English/ERR_INVALID_REQ
deleted file mode 100644
index 24930c6..0000000
--- a/pkgs/core/squid/errors.ipfire/English/ERR_INVALID_REQ
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... The requested URL could not be retrieved</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-While trying to process the request:
-<PRE>
-%R
-</PRE>
-<P>
-The following error was encountered:
-<UL>
-<LI>
-<STRONG>
-Invalid Request
-</STRONG>
-</UL>
-
-<P>
-Some aspect of the HTTP Request is invalid. Possible problems:
-<UL>
-<LI>Missing or unknown request method
-<LI>Missing URL
-<LI>Missing HTTP Identifier (HTTP/1.0)
-<LI>Request is too large
-<LI>Content-Length missing for POST or PUT requests
-<LI>Illegal character in hostname; underscores are not allowed
-</UL>
-<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/errors.ipfire/English/ERR_INVALID_RESP b/pkgs/core/squid/errors.ipfire/English/ERR_INVALID_RESP
deleted file mode 100644
index ed87a0c..0000000
--- a/pkgs/core/squid/errors.ipfire/English/ERR_INVALID_RESP
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... The requested URL could not be retrieved</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-While trying to process the request:
-<PRE>
-%R
-</PRE>
-<P>
-The following error was encountered:
-<UL>
-<LI>
-<STRONG>
-Invalid Response
-</STRONG>
-</UL>
-
-<P>
-The HTTP Response message received from the contacted server
-could not be understood or was otherwise malformed. Please contact
-the site operator. Your cache administrator may be able to provide
-you with more details about the exact nature of the problem if needed.
-
-<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/errors.ipfire/English/ERR_INVALID_URL b/pkgs/core/squid/errors.ipfire/English/ERR_INVALID_URL
deleted file mode 100644
index ca445c4..0000000
--- a/pkgs/core/squid/errors.ipfire/English/ERR_INVALID_URL
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... The requested URL could not be retrieved</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-While trying to retrieve the URL:
-<A HREF="%U">%U</A>
-<P>
-The following error was encountered:
-<UL>
-<LI>
-<STRONG>
-Invalid URL
-</STRONG>
-</UL>
-
-<P>
-Some aspect of the requested URL is incorrect. Possible problems:
-<UL>
-<LI>Missing or incorrect access protocol (should be `http://'' or similar)
-<LI>Missing hostname
-<LI>Illegal double-escape in the URL-Path
-<LI>Illegal character in hostname; underscores are not allowed
-</UL>
-<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/errors.ipfire/English/ERR_LIFETIME_EXP b/pkgs/core/squid/errors.ipfire/English/ERR_LIFETIME_EXP
deleted file mode 100644
index 1adadc6..0000000
--- a/pkgs/core/squid/errors.ipfire/English/ERR_LIFETIME_EXP
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... The requested URL could not be retrieved</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-While trying to retrieve the URL:
-<A HREF="%U">%U</A>
-<P>
-The following error was encountered:
-<UL>
-<LI>
-<STRONG>
-Connection Lifetime Expired
-</STRONG>
-</UL>
-
-<P>
-Squid has terminated the request because it has exceeded the maximum
-connection lifetime.
-<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/errors.ipfire/English/ERR_NO_RELAY b/pkgs/core/squid/errors.ipfire/English/ERR_NO_RELAY
deleted file mode 100644
index 567ec5f..0000000
--- a/pkgs/core/squid/errors.ipfire/English/ERR_NO_RELAY
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... The requested URL could not be retrieved</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-While trying to retrieve the URL:
-<A HREF="%U">%U</A>
-<P>
-The following error was encountered:
-<UL>
-<LI>
-<STRONG>
-No Wais Relay
-</STRONG>
-</UL>
-
-<P>
-There is no WAIS Relay host defined for this Cache! Yell at the administrator.
-<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/errors.ipfire/English/ERR_ONLY_IF_CACHED_MISS b/pkgs/core/squid/errors.ipfire/English/ERR_ONLY_IF_CACHED_MISS
deleted file mode 100644
index 592e175..0000000
--- a/pkgs/core/squid/errors.ipfire/English/ERR_ONLY_IF_CACHED_MISS
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... The requested URL could not be retrieved</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-While trying to retrieve the URL:
-<A HREF="%U">%U</A>
-<P>
-The following error was encountered:
-<UL>
-<LI>
-<STRONG>
-Valid document was not found in the cache and <code>only-if-cached</code>
-directive was specified.
-</STRONG>
-</UL>
-
-<P>
-
-You have issued a request with a <code>only-if-cached</code> cache control
-directive. The document was not found in the cache, <em>or</em> it required
-revalidation prohibited by <code>only-if-cached</code> directive.
-
-<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/errors.ipfire/English/ERR_READ_ERROR b/pkgs/core/squid/errors.ipfire/English/ERR_READ_ERROR
deleted file mode 100644
index 41541b8..0000000
--- a/pkgs/core/squid/errors.ipfire/English/ERR_READ_ERROR
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... The requested URL could not be retrieved</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-While trying to retrieve the URL:
-<A HREF="%U">%U</A>
-<P>
-The following error was encountered:
-<UL>
-<LI>
-<STRONG>
-Read Error
-</STRONG>
-</UL>
-
-<P>
-The system returned:
-<PRE><I> %E</I></PRE>
-
-<P>
-An error condition occurred while reading data from the network. Please
-retry your request.
-<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/errors.ipfire/English/ERR_READ_TIMEOUT b/pkgs/core/squid/errors.ipfire/English/ERR_READ_TIMEOUT
deleted file mode 100644
index 8dc2545..0000000
--- a/pkgs/core/squid/errors.ipfire/English/ERR_READ_TIMEOUT
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... The requested URL could not be retrieved</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-While trying to retrieve the URL:
-<A HREF="%U">%U</A>
-<P>
-The following error was encountered:
-<UL>
-<LI>
-<STRONG>
-Read Timeout
-</STRONG>
-</UL>
-
-<P>
-The system returned:
-<PRE><I> %E</I></PRE>
-
-<P>
-A Timeout occurred while waiting to read data from the network. The network
-or server may be down or congested. Please retry your request.
-<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/errors.ipfire/English/ERR_SHUTTING_DOWN b/pkgs/core/squid/errors.ipfire/English/ERR_SHUTTING_DOWN
deleted file mode 100644
index 63d17b0..0000000
--- a/pkgs/core/squid/errors.ipfire/English/ERR_SHUTTING_DOWN
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... The requested URL could not be retrieved</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-While trying to retrieve the URL:
-<A HREF="%U">%U</A>
-<P>
-The following error was encountered:
-<P>
-This cache is in the process of shutting down and can not
-service your request at this time. Please retry your
-request again soon.
-<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/errors.ipfire/English/ERR_SOCKET_FAILURE b/pkgs/core/squid/errors.ipfire/English/ERR_SOCKET_FAILURE
deleted file mode 100644
index e8d309c..0000000
--- a/pkgs/core/squid/errors.ipfire/English/ERR_SOCKET_FAILURE
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... The requested URL could not be retrieved</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-While trying to retrieve the URL:
-<A HREF="%U">%U</A>
-<P>
-The following error was encountered:
-<UL>
-<LI>
-<STRONG>
-Socket Failure
-</STRONG>
-</UL>
-
-<P>
-The system returned:
-<PRE><I> %E</I></PRE>
-
-<P>
-Squid is unable to create a TCP socket, presumably due to excessive load.
-Please retry your request.
-<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/errors.ipfire/English/ERR_TOO_BIG b/pkgs/core/squid/errors.ipfire/English/ERR_TOO_BIG
deleted file mode 100644
index 802fe3e..0000000
--- a/pkgs/core/squid/errors.ipfire/English/ERR_TOO_BIG
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... The requested URL could not be retrieved</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-While trying to retrieve the URL:
-<A HREF="%U">%U</A>
-<P>
-The following error was encountered:
-<UL>
-<LI>
-<STRONG>
-The request or reply is too large.
-</STRONG>
-<P>
-If you are making a POST or PUT request, then your request body
-(the thing you are trying to upload) is too large. If you are
-making a GET request, then the reply body (what you are trying
-to download) is too large. These limits have been established
-by the Internet Service Provider who operates this cache. Please
-contact them directly if you feel this is an error.
-</UL>
-<P>
-Your cache administrator is <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/errors.ipfire/English/ERR_UNSUP_REQ b/pkgs/core/squid/errors.ipfire/English/ERR_UNSUP_REQ
deleted file mode 100644
index b69569f..0000000
--- a/pkgs/core/squid/errors.ipfire/English/ERR_UNSUP_REQ
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... The requested URL could not be retrieved</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-While trying to retrieve the URL:
-<A HREF="%U">%U</A>
-<P>
-The following error was encountered:
-<UL>
-<LI>
-<STRONG>
-Unsupported Request Method and Protocol
-</STRONG>
-</UL>
-
-<P>
-Squid does not support all request methods for all access protocols.
-For example, you can not POST a Gopher request.
-<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/errors.ipfire/English/ERR_URN_RESOLVE b/pkgs/core/squid/errors.ipfire/English/ERR_URN_RESOLVE
deleted file mode 100644
index dba21bc..0000000
--- a/pkgs/core/squid/errors.ipfire/English/ERR_URN_RESOLVE
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>ERROR: The requested URN not be retrieved</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... A URL for the requested URN could not be retrieved</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-While trying to retrieve the URN:
-<A HREF="%U">%U</A>
-<P>
-The following error was encountered:
-<UL>
-<LI>
-<STRONG>
-Cannot Resolve URN
-</STRONG>
-</UL>
-
-<P>
-Hey, don't expect too much from URNs on %T :)
-<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/errors.ipfire/English/ERR_WRITE_ERROR b/pkgs/core/squid/errors.ipfire/English/ERR_WRITE_ERROR
deleted file mode 100644
index 8363e2e..0000000
--- a/pkgs/core/squid/errors.ipfire/English/ERR_WRITE_ERROR
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... The requested URL could not be retrieved</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-While trying to retrieve the URL:
-<A HREF="%U">%U</A>
-<P>
-The following error was encountered:
-<UL>
-<LI>
-<STRONG>
-Write Error
-</STRONG>
-</UL>
-
-<P>
-The system returned:
-<PRE><I> %E</I></PRE>
-
-<P>
-An error condition occurred while writing to the network. Please retry your
-request.
-<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/errors.ipfire/English/ERR_ZERO_SIZE_OBJECT b/pkgs/core/squid/errors.ipfire/English/ERR_ZERO_SIZE_OBJECT
deleted file mode 100644
index 3b0a3e6..0000000
--- a/pkgs/core/squid/errors.ipfire/English/ERR_ZERO_SIZE_OBJECT
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... The requested URL could not be retrieved</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-While trying to retrieve the URL:
-<A HREF="%U">%U</A>
-<P>
-The following error was encountered:
-<UL>
-<LI>
-<STRONG>
-Zero Sized Reply
-</STRONG>
-</UL>
-
-<P>
-Squid did not receive any data for this request.
-<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/errors.ipfire/German/ERR_ACCESS_DENIED b/pkgs/core/squid/errors.ipfire/German/ERR_ACCESS_DENIED
deleted file mode 100644
index 09fdfd3..0000000
--- a/pkgs/core/squid/errors.ipfire/German/ERR_ACCESS_DENIED
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-Während des Versuches, den URL<BR>
-<A HREF="%U">%U</A><BR>
-zu laden, trat der folgende Fehler auf:
-<UL>
-<LI>
-<STRONG>Zugriff verweigert</STRONG>
-</UL>
-
-<P>
-Aufgrund von Zugriffsbeschränkungen ist Ihre Anfrage zur Zeit
-nicht erlaubt.<br>
-Bitte kontaktieren Sie Ihren Service Provider, wenn Sie der Meinung
-sind, daß dies nicht korrekt ist.
-</P>
-
-<P>
-Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/errors.ipfire/German/ERR_CACHE_ACCESS_DENIED b/pkgs/core/squid/errors.ipfire/German/ERR_CACHE_ACCESS_DENIED
deleted file mode 100644
index 787455a..0000000
--- a/pkgs/core/squid/errors.ipfire/German/ERR_CACHE_ACCESS_DENIED
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FEHLER: Cache-Zugriff Verweigert</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... Cache-Zugriff Verweigert</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-Während des Versuches, den URL<BR>
-<A HREF="%U">%U</A><BR>
-zu laden, trat der folgende Fehler auf:
-<UL>
-<LI>
-<STRONG>Cache-Zugriff verweigert</STRONG>
-</P>
-</UL>
-
-<P>Leider sind Sie zur Zeit nicht berechtigt
-<PRE> %U</PRE>
-von diesem Cache zu beziehen, bis Sie sich authentifiziert haben.
-</P>
-
-<P>
-Sie benötigen hierzu Netscape Version 2.0 (oder höher), Microsoft Internet
-Explorer 3.0 oder einen anderen HTTP/1.1 Browser. Bitte kontaktieren Sie
-den <A HREF="mailto:%w">Cache-Administrator</a>, wenn Sie Probleme haben,
-sich zu authentifizieren, oder
-<A HREF="http://%h/cgi-bin/chpasswd.cgi">ändern</a> Sie Ihr Passwort.
-</P>
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/errors.ipfire/German/ERR_CACHE_MGR_ACCESS_DENIED b/pkgs/core/squid/errors.ipfire/German/ERR_CACHE_MGR_ACCESS_DENIED
deleted file mode 100644
index 91934be..0000000
--- a/pkgs/core/squid/errors.ipfire/German/ERR_CACHE_MGR_ACCESS_DENIED
+++ /dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FEHLER: Cache-Manager-Zugriff Verweigert</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... Cache-Manager-Zugriff verweigert</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-Während des Versuches, den URL<BR>
-<A HREF="%U">%U</A><BR>
-zu laden, trat der folgende Fehler auf:
-<UL>
-<LI>
-<STRONG>Cache-Manager-Zugriff verweigert</STRONG>
-</UL>
-</P>
-
-<P>Leider sind Sie zur Zeit nicht berechtigt
-<PRE> %U</PRE>
-von diesem Cache zu beziehen, bis Sie sich authentifiziert haben.
-</P>
-
-<P>
-Sie benötigen hierzu Netscape Version 2.0 (oder höher), Microsoft Internet
-Explorer 3.0 oder einen anderen HTTP/1.1 Browser.
-Bitte kontaktieren Sie den <A HREF="mailto:%w">Cache-Administrator</a>, wenn Sie Probleme haben,
-sich zu authentifizieren, oder wenn Sie der Administrator <em>sind</em>,
-lesen Sie die Squid-Dokumentation über das Cache-Manager
-Interface und überprüfen Sie das Cache-Log für detailiertere
-Fehlermeldungen.
-</P>
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/errors.ipfire/German/ERR_CANNOT_FORWARD b/pkgs/core/squid/errors.ipfire/German/ERR_CANNOT_FORWARD
deleted file mode 100644
index ec0fbf5..0000000
--- a/pkgs/core/squid/errors.ipfire/German/ERR_CANNOT_FORWARD
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-Während des Versuches, den URL<BR>
-<A HREF="%U">%U</A><BR>
-zu laden, trat der folgende Fehler auf:
-<UL>
-<LI>
-<STRONG>Die Anfrage kann zur Zeit nicht weitergeleitet werden</STRONG>
-</UL>
-
-<P>
-Diese Anfrage konnte nicht zum WWW-Server oder einem
-Parent-Cache weitergeleitet werden. Der wahrscheinlichste Grund für
-diesen Fehler ist:
-<UL>
-<LI>Der Cache-Administrator erlaubt nicht, daß dieser Server
- direkte Verbindungen zu WWW-Servern aufbaut, und
-<LI>alle konfigurierten Parent-Caches sind zur Zeit nicht erreichbar.
-</UL>
-</P>
-<P>
-Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/errors.ipfire/German/ERR_CONNECT_FAIL b/pkgs/core/squid/errors.ipfire/German/ERR_CONNECT_FAIL
deleted file mode 100644
index c37f441..0000000
--- a/pkgs/core/squid/errors.ipfire/German/ERR_CONNECT_FAIL
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-Während des Versuches, den URL<BR>
-<A HREF="%U">%U</A><BR>
-zu laden, trat der folgende Fehler auf:
-<UL>
-<LI>
-<STRONG>Verbindung schlug fehl</STRONG>
-</UL>
-
-<P>
-Das System gab:
-<PRE><I> %E</I></PRE>
-zurück.
-<P>
-Der Zielrechner oder das Zielnetzwerk könnten deaktiviert sein.
-Bitte versuchen Sie die Anfrage noch einmal.
-</P>
-<P>
-Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/errors.ipfire/German/ERR_DNS_FAIL b/pkgs/core/squid/errors.ipfire/German/ERR_DNS_FAIL
deleted file mode 100644
index ee15b52..0000000
--- a/pkgs/core/squid/errors.ipfire/German/ERR_DNS_FAIL
+++ /dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033"><TD WIDTH="25"></TD>
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="RIGHT" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-Während des Versuches, den URL<BR>
-<A HREF="%U">%U</A><BR>
-zu laden, trat der folgende Fehler auf:
-<UL>
-<LI>
-<STRONG>Es war unmöglich, eine IP-Adresse für <I>%H</I>
-zu bestimmen.
-</STRONG>
-</UL>
-
-<P>
-Der DNS-Server gab:
-<BLOCKQUOTE>
-%z
-</BLOCKQUOTE>
-zurück.
-<P>
- Der Cache war nicht in der Lage, den in der URL enthaltenen Hostnamen
- aufzulösen.
- Überprüfen Sie, ob die Adresse korrekt ist.
-</P>
-<P>
-Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/errors.ipfire/German/ERR_FORWARDING_DENIED b/pkgs/core/squid/errors.ipfire/German/ERR_FORWARDING_DENIED
deleted file mode 100644
index d805c1a..0000000
--- a/pkgs/core/squid/errors.ipfire/German/ERR_FORWARDING_DENIED
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-Während des Versuches, den URL<BR>
-<A HREF="%U">%U</A><BR>
-zu laden, trat der folgende Fehler auf:
-<UL>
-<LI>
-<STRONG>Weiterleiten verweigert</STRONG>
-</UL>
-
-<P>
-Dieser Cache wird Ihre Anfrage nicht weiterleiten, da er versucht, eine
-Sibling-Beziehung zu erzwingen.
-Wahrscheinlich ist der Client bei %i ein Cache, der falsch
-konfiguriert wurde. Informieren Sie dessen Administrator und/oder überprüfen
-Sie Ihre Proxy-Einstellungen.
-</P>
-<P>
-Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/errors.ipfire/German/ERR_FTP_DISABLED b/pkgs/core/squid/errors.ipfire/German/ERR_FTP_DISABLED
deleted file mode 100644
index 325dd24..0000000
--- a/pkgs/core/squid/errors.ipfire/German/ERR_FTP_DISABLED
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-Während des Versuches, den URL<BR>
-<A HREF="%U">%U</A><BR>
-zu laden, trat der folgende Fehler auf:
-<UL>
-<LI>
-<STRONG>FTP ist deaktiviert</STRONG>
-</UL>
-
-<P>
-Dieser Cache unterstützt kein FTP.
-</P>
-<P>
-Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/errors.ipfire/German/ERR_FTP_FAILURE b/pkgs/core/squid/errors.ipfire/German/ERR_FTP_FAILURE
deleted file mode 100644
index 514335c..0000000
--- a/pkgs/core/squid/errors.ipfire/German/ERR_FTP_FAILURE
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-Ein FTP-Protokollfehler ist aufgetreten
-während des Versuches, den URL:
-<A HREF="%U">%U</A><BR>
-zu laden.
-
-<P>
-Squid sendete den folgenden FTP-Befehl:
-<PRE><STRONG> %f</STRONG></PRE>
-und erhielt die Antwort:
-<PRE><STRONG> %F</STRONG></PRE>
-<P>
-Dies könnte durch einen FTP-URL verursacht worden sein, der ein
-absoluter Pfad ist (was nicht der RFC 1738 entspricht).
-Wenn dies der Fall sein sollte, kann die Datei unter <A
-HREF="%B">%B</A> gefunden werden.
-</P>
-<P>
-Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/errors.ipfire/German/ERR_FTP_FORBIDDEN b/pkgs/core/squid/errors.ipfire/German/ERR_FTP_FORBIDDEN
deleted file mode 100644
index e48bf26..0000000
--- a/pkgs/core/squid/errors.ipfire/German/ERR_FTP_FORBIDDEN
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-Ein FTP-Berechtigungsfehlschlag ist aufgetreten während des Versuches, den URL: <A HREF="%U">%U</A><BR>
-zu laden.
-<P>
-Squid sendete den folgenden FTP-Befehl:
-<blockquote><strong><pre>%f</pre></strong></blockquote>
-und erhielt die Antwort:
-<blockquote><strong><pre>%F</pre></strong></blockquote>
-<blockquote><strong><pre>%g</pre></strong></blockquote>
-</P>
-
-<P>
-Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/errors.ipfire/German/ERR_FTP_NOT_FOUND b/pkgs/core/squid/errors.ipfire/German/ERR_FTP_NOT_FOUND
deleted file mode 100644
index cf66f73..0000000
--- a/pkgs/core/squid/errors.ipfire/German/ERR_FTP_NOT_FOUND
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-Während des Versuches, den URL<BR>
-<A HREF="%U">%U</A><BR>
-zu laden, trat ein Problem auf:
-<P>
-Squid sendete den folgenden FTP-Befehl:
-<blockquote><strong><pre>%f</pre></strong></blockquote>
-und erhielt die Antwort:
-<blockquote><strong><pre>%F</pre></strong></blockquote>
-<blockquote><strong><pre>%g</pre></strong></blockquote>
-<P>
-Dies könnte durch einen FTP-URL verursacht worden sein, der ein
-absoluter Pfad ist (was nicht der RFC 1738 entspricht).
-Wenn dies der Fall sein sollte, kann die Datei unter <A href="%B">%B</A> gefunden werden.
-</P>
-
-<P>
-Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/errors.ipfire/German/ERR_FTP_PUT_CREATED b/pkgs/core/squid/errors.ipfire/German/ERR_FTP_PUT_CREATED
deleted file mode 100644
index 28d34d4..0000000
--- a/pkgs/core/squid/errors.ipfire/German/ERR_FTP_PUT_CREATED
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FTP PUT Erfolgreich: Datei angelegt</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Datei angelegt</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/errors.ipfire/German/ERR_FTP_PUT_ERROR b/pkgs/core/squid/errors.ipfire/German/ERR_FTP_PUT_ERROR
deleted file mode 100644
index 59a7620..0000000
--- a/pkgs/core/squid/errors.ipfire/German/ERR_FTP_PUT_ERROR
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FEHLER: FTP Upload fehlgeschlagen</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>/
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... FTP PUT/Upload fehlgeschlagen</H2>
-<HR noshade size="1px">
-<CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-Während dem PUT/Upload-Versuch zum URL:
-<A HREF="%U">%U</A><BR>
-<P>
-Squid sendete den folgenden FTP-Befehl:
-<PRE><STRONG> %f</STRONG></PRE>
-und erhielt die Antwort:
-<PRE><STRONG> %F</STRONG></PRE>
-<P>
-Überprüfen Sie den Pfad, die Zugriffsrechte und den
-Plattenplatz. Versuchen Sie es dann erneut.
-</P>
-<P>
-Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-<CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/errors.ipfire/German/ERR_FTP_PUT_MODIFIED b/pkgs/core/squid/errors.ipfire/German/ERR_FTP_PUT_MODIFIED
deleted file mode 100644
index 26aa7ff..0000000
--- a/pkgs/core/squid/errors.ipfire/German/ERR_FTP_PUT_MODIFIED
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FTP PUT erfolgreich: Datei aktualisiert</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Datei aktualisiert</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/errors.ipfire/German/ERR_FTP_UNAVAILABLE b/pkgs/core/squid/errors.ipfire/German/ERR_FTP_UNAVAILABLE
deleted file mode 100644
index 3413832..0000000
--- a/pkgs/core/squid/errors.ipfire/German/ERR_FTP_UNAVAILABLE
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY><CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-Der FTP Server war zu beschäftigt während des Versuches, den URL<BR>
-<A HREF="%U">%U</A><BR>
-zu laden.
-<P>
-Squid sendete den folgenden FTP-Befehl:
-<blockquote><strong><pre>%f</pre></strong></blockquote>
-und erhielt die Antwort:
-<blockquote><strong><pre>%F</pre></strong></blockquote>
-<blockquote><strong><pre>%g</pre></strong></blockquote>
-</P>
-
-<P>
-Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/errors.ipfire/German/ERR_INVALID_REQ b/pkgs/core/squid/errors.ipfire/German/ERR_INVALID_REQ
deleted file mode 100644
index e6a72a4..0000000
--- a/pkgs/core/squid/errors.ipfire/German/ERR_INVALID_REQ
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-Während des Versuches, die Anfrage
-<PRE>
-%R
-</PRE>
-zu verarbeiten, trat der folgende Fehler auf:
-<UL>
-<LI>
-<STRONG>Ungültige Anfrage</STRONG>
-</UL>
-
-<P>
-Ein Teil der HTTP-Anfrage ist ungültig. Mögliche Gründe:
-<UL>
-<LI>Fehlende oder unbekannte Anfrage-Methode (GET, POST)
-<LI>Fehlender URL
-<LI>Fehlender HTTP Identifier (HTTP/1.0)
-<LI>Anfrage ist zu groß
-<LI>Content-Length fehlt für POST- oder PUT-Anfragen
-<LI>Ungültige Zeichen im Hostnamen - z.B. Unterstriche ('_'),
- Umlaute und Kommata sind nicht erlaubt.
-</UL>
-</P>
-
-<P>
-Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/errors.ipfire/German/ERR_INVALID_RESP b/pkgs/core/squid/errors.ipfire/German/ERR_INVALID_RESP
deleted file mode 100644
index e695c41..0000000
--- a/pkgs/core/squid/errors.ipfire/German/ERR_INVALID_RESP
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-Während des Versuches, die Anfrage
-<PRE>
-%R
-</PRE>
-<P>
-zu verarbeiten, trat der folgende Fehler auf:
-<UL>
-<LI>
-<STRONG>
-Ungültige Antwort
-</STRONG>
-</UL>
-
-<P>
-Die HTTP Antwortmeldung des kontaktierten Servers konnte nicht verstanden werden
-oder war auf andere Weise missgebildet. Bitte kontaktieren Sie den Betreiber der
-betreffenden Webseite. Wenn nötig kann Ihr Cache Administrator in der Lage sein,
-Sie mit mehr Details über die genaue Ursache des Problems zu versorgen.
-
-<P>Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/errors.ipfire/German/ERR_INVALID_URL b/pkgs/core/squid/errors.ipfire/German/ERR_INVALID_URL
deleted file mode 100644
index fdf23f9..0000000
--- a/pkgs/core/squid/errors.ipfire/German/ERR_INVALID_URL
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-Während des Versuches, den URL<BR>
-<A HREF="%U">%U</A><BR>
-zu laden, trat der folgende Fehler auf:
-<UL>
-<LI>
-<STRONG>Ungültiger URL</STRONG>
-</UL>
-
-<P>
-Ein Teil des angefragten URL ist ungültig. Mögliche Gründe:
-<UL>
-<LI>Fehlendes oder unkorrektes Zugriffsprotokoll (sollte 'http://' oder ähnlich sein)
-<LI>Fehlender Hostname
-<LI>Ungültiges 'double-escape' im URL-Pfad
-<LI>Ungültige Zeichen im Hostnamen - z.B. Unterstriche ('_'),
- Umlaute und Kommata sind nicht erlaubt.
-</UL>
-</P>
-
-<P>
-Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/errors.ipfire/German/ERR_LIFETIME_EXP b/pkgs/core/squid/errors.ipfire/German/ERR_LIFETIME_EXP
deleted file mode 100644
index ca97508..0000000
--- a/pkgs/core/squid/errors.ipfire/German/ERR_LIFETIME_EXP
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-Während des Versuches, den URL<BR>
-<A HREF="%U">%U</A><BR>
-zu laden, trat der folgende Fehler auf:
-<UL>
-<LI>
-<STRONG>Verbindungs-Lebensdauer ist abgelaufen</STRONG>
-</UL>
-
-<P>
-Squid hat die Anfrage abgebrochen, weil sie die maximale
-Verbindungs-Lebensdauer überschritten hat.
-</P>
-
-<P>
-Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/errors.ipfire/German/ERR_NO_RELAY b/pkgs/core/squid/errors.ipfire/German/ERR_NO_RELAY
deleted file mode 100644
index 46bc51e..0000000
--- a/pkgs/core/squid/errors.ipfire/German/ERR_NO_RELAY
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-Während des Versuches, den URL<BR>
-<A HREF="%U">%U</A><BR>
-zu laden, trat der folgende Fehler auf:
-<UL>
-<LI>
-<STRONG>Kein WAIS-Relay</STRONG>
-</UL>
-
-<P>
-Es sind keine WAIS-Relay-Rechner für diesen Cache definiert.
-Teilen Sie dies Ihrem <A HREF="mailto:%w">Cache Administrator</A> mit.
-</P>
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/errors.ipfire/German/ERR_ONLY_IF_CACHED_MISS b/pkgs/core/squid/errors.ipfire/German/ERR_ONLY_IF_CACHED_MISS
deleted file mode 100644
index e77d17b..0000000
--- a/pkgs/core/squid/errors.ipfire/German/ERR_ONLY_IF_CACHED_MISS
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-Während des Versuches, den URL<BR>
-<A HREF="%U">%U</A><BR>
-zu laden, trat der folgende Fehler auf:
-<UL>
-<LI>
-<STRONG>Ein gültiges Dokument wurde nicht im Cache gefunden, und die '<code>only-if-cached</code> directive' war angegeben.
-</STRONG>
-</UL>
-
-<P>
-Sie haben eine Anfrage mit einer <code>only-if-cached</code>
-Cache-Control-Direktive abgeschickt. Das Dokument wurde nicht im Cache gefunden,
-<em>oder</em> es hätte eine Überprüfung benötigt,
-die durch die <code>only-if-cached</code> dicective verboten wurde.
-</P>
-
-<P>
-Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/errors.ipfire/German/ERR_READ_ERROR b/pkgs/core/squid/errors.ipfire/German/ERR_READ_ERROR
deleted file mode 100644
index c4f8a78..0000000
--- a/pkgs/core/squid/errors.ipfire/German/ERR_READ_ERROR
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-Während des Versuches, den URL<BR>
-<A HREF="%U">%U</A><BR>
-zu laden, trat der folgende Fehler auf:
-<UL>
-<LI>
-<STRONG>Lesefehler</STRONG>
-</UL>
-
-<P>
-Das System gab:
-<PRE><I> %E</I></PRE>
-zurück.
-<P>
-Bei dem Versuch, Daten vom Netzwerk zu lesen, trat ein Fehler
-auf. Bitte versuchen Sie Ihre Anfrage erneut.
-</P>
-
-<P>
-Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/errors.ipfire/German/ERR_READ_TIMEOUT b/pkgs/core/squid/errors.ipfire/German/ERR_READ_TIMEOUT
deleted file mode 100644
index 04c72bf..0000000
--- a/pkgs/core/squid/errors.ipfire/German/ERR_READ_TIMEOUT
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-Während des Versuches, den URL<BR>
-<A HREF="%U">%U</A><BR>
-zu laden, trat der folgende Fehler auf:
-<UL>
-<LI>
-<STRONG>Read Timeout</STRONG>
-</UL>
-
-<P>
-Das System gab:
-<PRE><I> %E</I></PRE>
-zurück.
-<P>
-Bei dem Versuch Daten vom Netzwerk zu lesen, mußte zu lange
-gewartet werden (timeout).
-Das Netzwerk oder der Server könnten deaktiviert oder
-überlastet sein. Bitte versuchen Sie Ihre Anfrage erneut.
-</P>
-
-<P>
-Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/errors.ipfire/German/ERR_SHUTTING_DOWN b/pkgs/core/squid/errors.ipfire/German/ERR_SHUTTING_DOWN
deleted file mode 100644
index 66b001e..0000000
--- a/pkgs/core/squid/errors.ipfire/German/ERR_SHUTTING_DOWN
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-Während des Versuches, den URL<BR>
-<A HREF="%U">%U</A><BR>
-zu laden, trat folgendes Problem auf:
-
-<UL>
-<LI>Dieser Cache ist im Begriff herunterzufahren und kann Ihre Anfrage
-zur Zeit nicht bearbeiten. Bitte wiederholen Sie Ihre Anfrage etwas später.
-</UL>
-
-<P>
-Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/errors.ipfire/German/ERR_SOCKET_FAILURE b/pkgs/core/squid/errors.ipfire/German/ERR_SOCKET_FAILURE
deleted file mode 100644
index 27241e2..0000000
--- a/pkgs/core/squid/errors.ipfire/German/ERR_SOCKET_FAILURE
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-Während des Versuches, den URL<BR>
-<A HREF="%U">%U</A><BR>
-zu laden, trat der folgende Fehler auf:
-<UL>
-<LI>
-<STRONG>Socket Failure</STRONG>
-</UL>
-
-<P>
-Das System gab:
-<PRE><I> %E</I></PRE>
-zurück.
-<P>
-Squid ist nicht in der Lage, einen TCP-Socket zu öffnen,
-wahrscheinlich wegen extremer Überlastung.
-Bitte versuchen Sie Ihre Anfrage erneut.
-</P>
-
-<P>
-Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/errors.ipfire/German/ERR_TOO_BIG b/pkgs/core/squid/errors.ipfire/German/ERR_TOO_BIG
deleted file mode 100644
index 445c086..0000000
--- a/pkgs/core/squid/errors.ipfire/German/ERR_TOO_BIG
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-Während des Versuches, den URL<BR>
-<A HREF="%U">%U</A><BR>
-zu laden, trat folgendes Problem auf:
-<UL>
-<LI>
-<STRONG>
-Die Anfrage oder die Antwort ist zu groß.
-</STRONG>
-</UL>
-
-<P>
-Wenn Sie eine POST oder PUT Anfrage gemacht haben, dann ist der 'request body'
-(das was Sie versucht haben hochzuladen) zu groß. Wenn Sie eine GET
-Anfrage gemacht haben, dann ist der 'reply body' (das was Sie versuchen
-herunterzuladen) zu groß. Diese Beschränkungen wurden von Ihrem
-Internet Service Provider, der diesen Cache Server unterhält, festgelegt.
-Bitte setzen Sie sich direkt mit ihm in Kontakt wenn Sie meinen, daß
-dies ein Fehler ist.
-
-<P>
-Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/errors.ipfire/German/ERR_UNSUP_REQ b/pkgs/core/squid/errors.ipfire/German/ERR_UNSUP_REQ
deleted file mode 100644
index 6abfd3f..0000000
--- a/pkgs/core/squid/errors.ipfire/German/ERR_UNSUP_REQ
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-Während des Versuches, den URL<BR>
-<A HREF="%U">%U</A><BR>
-zu laden, trat der folgende Fehler auf:
-<UL>
-<LI>
-<STRONG>Nicht unterstützte Zugriffsmethode oder nicht unterstütztes Protokoll</STRONG>
-</UL>
-
-<P>
-Squid unterstützt nicht alle Anfragemethoden für alle
-Zugriffsprotokolle.
-Beispielsweise können Sie keine Gopher-Anfrage POST'en.
-</P>
-
-<P>
-Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/errors.ipfire/German/ERR_URN_RESOLVE b/pkgs/core/squid/errors.ipfire/German/ERR_URN_RESOLVE
deleted file mode 100644
index bed94e3..0000000
--- a/pkgs/core/squid/errors.ipfire/German/ERR_URN_RESOLVE
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FEHLER: Die angeforderete URN konnte nicht geholt werden</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... Ein URL für den angeforderten URN konnte nicht geholt werden</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-Während des Versuches, den URN
-<A HREF="%U">%U</A><BR>
-zu laden, trat der folgende Fehler auf:
-<UL>
-<LI>
-<STRONG>Die URN konnte nicht aufgelöst werden</STRONG>
-</UL>
-
-<P>
-Erwarten Sie nicht zu viel von URNs auf %T
-</P>
-
-<P>
-Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/errors.ipfire/German/ERR_WRITE_ERROR b/pkgs/core/squid/errors.ipfire/German/ERR_WRITE_ERROR
deleted file mode 100644
index 0d29f22..0000000
--- a/pkgs/core/squid/errors.ipfire/German/ERR_WRITE_ERROR
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-Während des Versuches, den URL<BR>
-<A HREF="%U">%U</A><BR>
-zu laden, trat der folgende Fehler auf:
-<UL>
-<LI>
-<STRONG>Schreibfehler</STRONG>
-</UL>
-
-<P>
-Das System gab:
-<PRE><I> %E</I></PRE>
-zurück.
-<P>
-Ein Fehler trat während des Schreibens zum Netzwerk auf.
-Bitte wiederholen Sie Ihre Anfrage.
-</P>
-
-<P>
-Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/errors.ipfire/German/ERR_ZERO_SIZE_OBJECT b/pkgs/core/squid/errors.ipfire/German/ERR_ZERO_SIZE_OBJECT
deleted file mode 100644
index be1a830..0000000
--- a/pkgs/core/squid/errors.ipfire/German/ERR_ZERO_SIZE_OBJECT
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-Während des Versuches, den URL<BR>
-<A HREF="%U">%U</A><BR>
-zu laden, trat der folgende Fehler auf:
-<UL>
-<LI>
-<STRONG>Leeres Dokument</STRONG>
-</UL>
-
-<P>
-Squid hat keinerlei Daten auf diese Anfrage empfangen.
-</P>
-
-<P>
-Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/pkgs/core/squid/patches/squid-3.0.STABLE1-perlpath.patch b/pkgs/core/squid/patches/squid-3.0.STABLE1-perlpath.patch
new file mode 100644
index 0000000..19b512e
--- /dev/null
+++ b/pkgs/core/squid/patches/squid-3.0.STABLE1-perlpath.patch
@@ -0,0 +1,9 @@
+diff -up squid-3.0.STABLE1/contrib/url-normalizer.pl.perlpath squid-3.0.STABLE1/contrib/url-normalizer.pl
+--- squid-3.0.STABLE1/contrib/url-normalizer.pl.perlpath 1996-12-06 18:54:31.000000000 +0100
++++ squid-3.0.STABLE1/contrib/url-normalizer.pl 2008-01-23 12:07:50.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl -Tw
++#!/usr/bin/perl -Tw
+
+ # From: Markus Gyger <mgyger(a)itr.ch>
+ #
diff --git a/pkgs/core/squid/patches/squid-3.0.STABLE7-from_manpg.patch b/pkgs/core/squid/patches/squid-3.0.STABLE7-from_manpg.patch
new file mode 100644
index 0000000..368e634
--- /dev/null
+++ b/pkgs/core/squid/patches/squid-3.0.STABLE7-from_manpg.patch
@@ -0,0 +1,80 @@
+diff -up squid-3.0.STABLE7/helpers/basic_auth/NCSA/ncsa_auth.8.from_manpg squid-3.0.STABLE7/helpers/basic_auth/NCSA/ncsa_auth.8
+--- squid-3.0.STABLE7/helpers/basic_auth/NCSA/ncsa_auth.8.from_manpg 2008-06-22 05:35:49.000000000 +0200
++++ squid-3.0.STABLE7/helpers/basic_auth/NCSA/ncsa_auth.8 2007-06-06 18:25:30.000000000 +0200
+@@ -1,38 +1,38 @@
+-.\" This file is distributed in the hope that it will be useful,
+-.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
+-.\" the GNU General Public License for more details.
+-.\"
+-.\" You should have received a copy of the GNU General Public License
+-.\" along with this file; if not, write to the Free Software
+-.\" Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+-.\" MA 02111-1307 USA
+-.\"
+-.\" HISTORY:
+-.\" 2006-05-16, created by Rodrigo Rubira Branco <rrbranco(a)br.ibm.com>
+-.TH ncsa_auth 8 "May 16, 2006" "Squid NCSA Auth helper"
+-.SH NAME
+-ncsa_auth \- NCSA httpd-style password file authentication helper for Squid
+-\fB
+-.SH SYNOPSIS
+-.nf
+-.fam C
+-\fBncsa_auth\fP \fIpasswdfile\fP
+-.fam T
+-.fi
+-.SH DESCRIPTION
+-\fBncsa_auth\fP allows Squid to read and authenticate user and password information from an NCSA/Apache httpd-style password file when using basic HTTP authentication.
+-.PP
+-The only parameter is the password file. It must have permissions to be read by the user that Squid is running as (cache_effective_user in squid.conf).
+-.PP
+-This password file can be manipulated using htpasswd.
+-.SH OPTIONS
+-Only specify the password file name.
+-.SH EXAMPLE
+-\fBncsa_auth\fP /etc/squid/squid.pass
+-.SH SECURITY
+-\fBncsa_auth\fP must have access to the password file to be executed.
+-.SH SEE ALSO
+-\fBhtpasswd\fP(1), \fBsquid\fP(8)
+-.SH AUTHOR
+-Manpage written by Rodrigo Rubira Branco <rrbranco(a)br.ibm.com>
++.\" This file is distributed in the hope that it will be useful,
++.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
++.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
++.\" the GNU General Public License for more details.
++.\"
++.\" You should have received a copy of the GNU General Public License
++.\" along with this file; if not, write to the Free Software
++.\" Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++.\" MA 02111-1307 USA
++.\"
++.\" HISTORY:
++.\" 2006-05-16, created by Rodrigo Rubira Branco <rrbranco(a)br.ibm.com>
++.TH ncsa_auth 8 "May 16, 2006" "User Manuals" "User Manuals"
++.SH NAME
++ncsa_auth \- NCSA httpd-style password file authentication helper for Squid
++\fB
++.SH SYNOPSIS
++.nf
++.fam C
++\fBncsa_auth\fP \fIpasswdfile\fP
++.fam T
++.fi
++.SH DESCRIPTION
++\fBncsa_auth\fP allows Squid to read and authenticate user and password information from an NCSA httpd-style password file when using basic HTTP authentication.
++.PP
++The only parameter is the password file. It must have permissions to be read by the user that Squid is running as. By default this user is proxy. This can be changed using the cache_effective_user directive in the squid.conf file.
++.PP
++This password file can be manipulated using htpasswd.
++.SH OPTIONS
++Only specify the password file name.
++.SH EXAMPLE
++\fBncsa_auth\fP /etc/squid/squid.pass
++.SH SECURITY
++\fBncsa_auth\fP must have access to the password file to be executed.
++.SH SEE ALSO
++\fBhtpasswd\fP(1), \fBsquid\fP(8)
++.SH AUTHOR
++Manpage written by Rodrigo Rubira Branco <rrbranco(a)br.ibm.com>
diff --git a/pkgs/core/squid/patches/squid-3.1.0.15-smb-path.patch b/pkgs/core/squid/patches/squid-3.1.0.15-smb-path.patch
new file mode 100644
index 0000000..27bcc97
--- /dev/null
+++ b/pkgs/core/squid/patches/squid-3.1.0.15-smb-path.patch
@@ -0,0 +1,37 @@
+diff -up squid-3.1.8/helpers/basic_auth/SMB/Makefile.am.smb-path squid-3.1.8/helpers/basic_auth/SMB/Makefile.am
+--- squid-3.1.8/helpers/basic_auth/SMB/Makefile.am.smb-path 2010-09-04 05:25:57.000000000 +0200
++++ squid-3.1.8/helpers/basic_auth/SMB/Makefile.am 2010-09-05 18:38:05.000000000 +0200
+@@ -9,14 +9,14 @@
+ include $(top_srcdir)/src/Common.am
+
+ # SAMBAPREFIX must point to the directory where Samba has been installed.
+-# By default, Samba is installed in /usr/local/samba. If you changed this
++# By default, Samba is installed in /usr. If you changed this
+ # by using the --prefix option when configuring Samba, you need to change
+ # SAMBAPREFIX accordingly.
+
+ ## FIXME: autoconf should test for the samba path.
+
+ SMB_AUTH_HELPER = smb_auth.sh
+-SAMBAPREFIX=/usr/local/samba
++SAMBAPREFIX=/usr
+ SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER)
+
+ libexec_SCRIPTS = $(SMB_AUTH_HELPER)
+diff -up squid-3.1.8/helpers/basic_auth/SMB/Makefile.in.smb-path squid-3.1.8/helpers/basic_auth/SMB/Makefile.in
+--- squid-3.1.8/helpers/basic_auth/SMB/Makefile.in.smb-path 2010-09-04 05:26:21.000000000 +0200
++++ squid-3.1.8/helpers/basic_auth/SMB/Makefile.in 2010-09-05 18:39:47.000000000 +0200
+@@ -291,11 +291,11 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdi
+ -I$(srcdir)
+
+ # SAMBAPREFIX must point to the directory where Samba has been installed.
+-# By default, Samba is installed in /usr/local/samba. If you changed this
++# By default, Samba is installed in /usr. If you changed this
+ # by using the --prefix option when configuring Samba, you need to change
+ # SAMBAPREFIX accordingly.
+ SMB_AUTH_HELPER = smb_auth.sh
+-SAMBAPREFIX = /usr/local/samba
++SAMBAPREFIX = /usr
+ SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER)
+ libexec_SCRIPTS = $(SMB_AUTH_HELPER)
+ smb_auth_CFLAGS = -DSAMBAPREFIX=\"$(SAMBAPREFIX)\" -DHELPERSCRIPT=\"$(SMB_AUTH_HELPER_PATH)\"
diff --git a/pkgs/core/squid/patches/squid-3.1.0.9-config.patch b/pkgs/core/squid/patches/squid-3.1.0.9-config.patch
new file mode 100644
index 0000000..09d7a15
--- /dev/null
+++ b/pkgs/core/squid/patches/squid-3.1.0.9-config.patch
@@ -0,0 +1,26 @@
+diff -up squid-3.0.STABLE9/src/cf.data.pre.config squid-3.0.STABLE9/src/cf.data.pre
+--- squid-3.0.STABLE9/src/cf.data.pre.config 2008-09-09 18:06:44.000000000 +0200
++++ squid-3.0.STABLE9/src/cf.data.pre 2008-10-19 23:34:17.000000000 +0200
+@@ -2135,7 +2136,7 @@ DOC_END
+
+ NAME: logfile_rotate
+ TYPE: int
+-DEFAULT: 10
++DEFAULT: 0
+ LOC: Config.Log.rotateNumber
+ DOC_START
+ Specifies the number of logfile rotations to make when you
+@@ -3254,11 +3256,11 @@ COMMENT_END
+
+ NAME: cache_mgr
+ TYPE: string
+-DEFAULT: webmaster
++DEFAULT: root
+ LOC: Config.adminEmail
+ DOC_START
+ Email-address of local cache manager who will receive
+- mail if the cache dies. The default is "webmaster."
++ mail if the cache dies. The default is "root."
+ DOC_END
+
+ NAME: mail_from
diff --git a/pkgs/core/squid/patches/squid-3.1.0.9-location.patch b/pkgs/core/squid/patches/squid-3.1.0.9-location.patch
new file mode 100644
index 0000000..816b358
--- /dev/null
+++ b/pkgs/core/squid/patches/squid-3.1.0.9-location.patch
@@ -0,0 +1,41 @@
+diff -up squid-3.1.0.9/QUICKSTART.location squid-3.1.0.9/QUICKSTART
+--- squid-3.1.0.9/QUICKSTART.location 2009-06-26 12:35:27.000000000 +0200
++++ squid-3.1.0.9/QUICKSTART 2009-07-17 14:03:10.000000000 +0200
+@@ -12,10 +12,9 @@ After you retrieved, compiled and instal
+ INSTALL in the same directory), you have to configure the squid.conf
+ file. This is the list of the values you *need* to change, because no
+ sensible defaults could be defined. Do not touch the other variables
+-for now. We assume you have installed Squid in the default location:
+-/usr/local/squid
++for now.
+
+-Uncomment and edit the following lines in /usr/local/squid/etc/squid.conf:
++Uncomment and edit the following lines in /etc/squid/squid.conf:
+
+ ==============================================================================
+
+@@ -56,7 +55,7 @@ cache_effective_user
+ Some configuration lines which are optional but may be needed.
+
+
+-cache_dir ufs /usr/local/squid/var/cache 100 16 256
++cache_dir ufs /var/spool/squid 100 16 256
+
+ Add here (first number, here 100) the amount of hard disk space
+ (in megabytes) to devote to caching.
+@@ -84,12 +83,12 @@ After editing squid.conf to your liking,
+ line TWICE:
+
+ To create any disk cache_dir configured:
+- % /usr/local/squid/sbin/squid -z
++ % /usr/sbin/squid -z
+
+ To start squid:
+- % /usr/local/squid/sbin/squid
++ % /usr/sbin/squid
+
+-Check in the cache.log (/usr/local/squid/var/logs/cache.log) that
++Check in the cache.log (/var/log/squid/cache.log) that
+ everything is all right.
+
+ Once Squid created all its files (it can take several minutes on some
diff --git a/pkgs/core/squid/squid.nm b/pkgs/core/squid/squid.nm
index beb02b1..04a384e 100644
--- a/pkgs/core/squid/squid.nm
+++ b/pkgs/core/squid/squid.nm
@@ -25,16 +25,18 @@
include $(PKGROOT)/Include
PKG_NAME = squid
-PKG_VER = 3.0.STABLE25
+PKG_VER = 3.1.8
PKG_REL = 0
-PKG_MAINTAINER =
+PKG_MAINTAINER = Christian Schmidt <christian.schmidt(a)ipfire.org>
PKG_GROUP = Networking/Daemons
PKG_URL = http://www.squid-cache.org/
PKG_LICENSE = GPLv2+
PKG_SUMMARY = The Squid proxy caching server.
-PKG_BUILD_DEPS+= gcc-c++ libxml2-devel openssl-devel openldap-devel
+PKG_BUILD_DEPS+= gcc-c++ libxml2-devel openssl-devel openldap-devel samba-devel \
+ iptables-devel $(PKG_DEPS)
+PKG_DEPS += /usr/bin/smbclient
define PKG_DESCRIPTION
Squid is a high-performance proxy caching server for Web clients, \
@@ -53,7 +55,7 @@ CONFIGURE_OPTIONS += \
--libexecdir=/usr/lib/squid \
--localstatedir=/var \
--sysconfdir=/etc/squid \
- --enable-storeio="aufs,diskd,ufs,null" \
+ --enable-storeio="aufs,diskd,ufs" \
--enable-removal-policies="heap,lru" \
--enable-icmp \
--enable-delay-pools \
@@ -66,6 +68,7 @@ CONFIGURE_OPTIONS += \
--enable-kill-parent-hack \
--enable-snmp \
--enable-arp-acl \
+ --enable-ipf-transparent \
--enable-htcp \
--enable-ssl \
--enable-forw-via-db \
@@ -80,8 +83,9 @@ CONFIGURE_OPTIONS += \
--enable-internal-dns \
--enable-auth=basic,ntlm \
--enable-basic-auth-helpers="LDAP,MSNT,multi-domain-NTLM,PAM,NCSA,SMB,squid_radius_auth" \
- --enable-ntlm-auth-helpers="SMB" \
+ --enable-ntlm-auth-helpers="smb_lm,no_check,fakeauth" \
--enable-ntlm-fail-open \
+ --with-filedescriptors=16384 \
--enable-unlinkd \
--with-pthreads \
--with-aio \
@@ -91,7 +95,6 @@ CONFIGURE_OPTIONS += \
define STAGE_INSTALL_CMDS
rm -vf $(BUILDROOT)/etc/squid/errors
rmdir $(BUILDROOT)/var/logs
- ln -svf ../../usr/lib/squid/errors/English $(BUILDROOT)/etc/squid/errors
-mkdir -pv $(BUILDROOT)/var/log/cache $(BUILDROOT)/var/log/squid
touch $(BUILDROOT)/var/log/squid/access.log
diff --git a/pkgs/core/udev/rules/23-usb.rules b/pkgs/core/udev/rules/23-usb.rules
deleted file mode 100644
index fa02c43..0000000
--- a/pkgs/core/udev/rules/23-usb.rules
+++ /dev/null
@@ -1,2 +0,0 @@
-# Set group ownership for raw USB devices
-SUBSYSTEM=="usb_device", GROUP="usb"
diff --git a/pkgs/core/udev/rules/55-ipfire.rules b/pkgs/core/udev/rules/55-ipfire.rules
deleted file mode 100644
index 4d41520..0000000
--- a/pkgs/core/udev/rules/55-ipfire.rules
+++ /dev/null
@@ -1,64 +0,0 @@
-# /etc/udev/rules.d/55-lfs.rules: Rule definitions for LFS.
-
-# Core kernel devices
-
-KERNEL=="aio", MODE="0444"
-SUBSYSTEM=="rtc", MODE="0644", ACTION=="add", RUN+="/etc/init.d/setclock start"
-
-# Comms devices
-
-KERNEL=="ippp[0-9]*", GROUP="uucp"
-KERNEL=="isdn[0-9]*", GROUP="uucp"
-KERNEL=="isdnctrl[0-9]*", GROUP="uucp"
-KERNEL=="capi", NAME="capi20", SYMLINK+="isdn/capi20"
-KERNEL=="capi?*", NAME="capi/%n", GROUP="uucp"
-KERNEL=="dcbri[0-9]*", GROUP="uucp"
-
-# ALSA devices go in their own subdirectory
-
-KERNEL=="controlC[0-9]*", GROUP="audio", NAME="snd/%k"
-KERNEL=="hwC[0-9]*D[0-9]*", GROUP="audio", NAME="snd/%k"
-KERNEL=="pcmC[0-9]*D[0-9]*[cp]", GROUP="audio", NAME="snd/%k"
-KERNEL=="midiC[0-9]*D[0-9]*", GROUP="audio", NAME="snd/%k"
-KERNEL=="timer", GROUP="audio", NAME="snd/%k"
-KERNEL=="seq", GROUP="audio", NAME="snd/%k"
-
-# Sound devices
-
-KERNEL=="admmidi*", GROUP="audio"
-KERNEL=="adsp*", GROUP="audio"
-KERNEL=="aload*", GROUP="audio"
-KERNEL=="amidi*", GROUP="audio"
-KERNEL=="amixer*", GROUP="audio"
-KERNEL=="audio*", GROUP="audio"
-KERNEL=="dmfm*", GROUP="audio"
-KERNEL=="dmmidi*", GROUP="audio"
-KERNEL=="dsp*", GROUP="audio"
-KERNEL=="midi*", GROUP="audio"
-KERNEL=="mixer*", GROUP="audio"
-KERNEL=="music", GROUP="audio"
-KERNEL=="sequencer*", GROUP="audio"
-
-# Input devices
-
-# override MODE on these four
-KERNEL=="mice", SYMLINK+="mouse"
-
-# DRI devices are managed by the X server, so prevent udev from creating them
-
-KERNEL=="card*", OPTIONS+="ignore_device"
-
-# Video devices
-
-KERNEL=="fb[0-9]*", GROUP="video"
-
-# Storage/memory devices
-
-# dmsetup and lvm2 related programs create devicemapper devices so we prevent
-# udev from creating them
-
-KERNEL=="dm-*", OPTIONS+="ignore_device"
-
-# Override floppy devices
-KERNEL=="fd[0-9]", ACTION=="add|change", ATTRS{cmos}=="?*", \
- RUN+="create_floppy_devices -c -t $attr{cmos} -m %M -M 0660 -G floppy $root/%k"
diff --git a/pkgs/core/udev/rules/61-cdrom.rules b/pkgs/core/udev/rules/61-cdrom.rules
deleted file mode 100644
index 4db9efe..0000000
--- a/pkgs/core/udev/rules/61-cdrom.rules
+++ /dev/null
@@ -1,3 +0,0 @@
-# /etc/udev/rules.d/61-cdrom.rules: Set CD-ROM permissions.
-
-ACTION=="add|change", SUBSYSTEM=="block", ENV{ID_TYPE}=="cd", GROUP="cdrom"
diff --git a/pkgs/core/xen/patches/xen-3.4.0-co_assignment.patch b/pkgs/core/xen/patches/xen-3.4.0-co_assignment.patch
deleted file mode 100644
index f0b59f0..0000000
--- a/pkgs/core/xen/patches/xen-3.4.0-co_assignment.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -r 6ab55f716ce3 tools/python/xen/util/pci.py
---- a/tools/python/xen/util/pci.py Thu Oct 09 17:18:11 2008 +0100
-+++ b/tools/python/xen/util/pci.py Fri Oct 10 13:16:00 2008 +0800
-@@ -696,6 +696,7 @@ class PciDevice:
- def do_FLR(self):
- """ Perform FLR (Functional Level Reset) for the device.
- """
-+ return
- if self.dev_type == DEV_TYPE_PCIe_ENDPOINT:
- # If PCIe device supports FLR, we use it.
- if self.pcie_flr:
-diff -r 6ab55f716ce3 tools/python/xen/xend/server/pciif.py
---- a/tools/python/xen/xend/server/pciif.py Thu Oct 09 17:18:11 2008 +0100
-+++ b/tools/python/xen/xend/server/pciif.py Fri Oct 10 13:18:25 2008 +0800
-@@ -375,6 +375,7 @@ class PciController(DevController):
- pci_dev_list = pci_dev_list + [(domain, bus, slot, func)]
-
- for (domain, bus, slot, func) in pci_dev_list:
-+ continue
- try:
- dev = PciDevice(domain, bus, slot, func)
- except Exception, e:
diff --git a/pkgs/core/xen/patches/xen-3.4.0-cpufreq.patch b/pkgs/core/xen/patches/xen-3.4.0-cpufreq.patch
deleted file mode 100644
index 4a8f3f3..0000000
--- a/pkgs/core/xen/patches/xen-3.4.0-cpufreq.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/xen/arch/x86/platform_hypercall.c 2009-07-23 07:26:18.000000000 +0000
-+++ b/xen/arch/x86/platform_hypercall.c 2009-07-23 07:28:30.000000000 +0000
-@@ -313,7 +313,6 @@
- {
- uint32_t cpu;
- uint64_t idletime, now = NOW();
-- struct vcpu *v;
- struct xenctl_cpumap ctlmap;
- cpumask_t cpumap;
- XEN_GUEST_HANDLE(uint8) cpumap_bitmap;
-@@ -336,7 +335,7 @@
-
- for_each_cpu_mask ( cpu, cpumap )
- {
-- if ( (v = idle_vcpu[cpu]) != NULL )
-+ if ( !idle_vcpu[cpu] )
- cpu_clear(cpu, cpumap);
- idletime = get_cpu_idle_time(cpu);
-
diff --git a/pkgs/core/xen/patches/xen-tools.patch b/pkgs/core/xen/patches/xen-tools.patch
new file mode 100644
index 0000000..1df3803
--- /dev/null
+++ b/pkgs/core/xen/patches/xen-tools.patch
@@ -0,0 +1,11 @@
+--- xen-4.0.1/tools/Rules.mk 2010-09-26 19:28:02.748059404 +0000
++++ xen-4.0.1/tools/Rules.mk 2010-09-26 19:25:30.769293405 +0000
+@@ -15,6 +15,7 @@ XEN_XENSTORE = $(XEN_ROOT)/tools/x
+ XEN_LIBXENSTAT = $(XEN_ROOT)/tools/xenstat/libxenstat/src
+
+ CFLAGS_include = -I$(XEN_INCLUDE)
++CFLAGS-y += -fno-pie -fno-stack-protector
+
+ CFLAGS_libxenctrl = -I$(XEN_LIBXC) $(CFLAGS_include)
+ LDFLAGS_libxenctrl = -L$(XEN_LIBXC) -lxenctrl
+
diff --git a/pkgs/core/xen/patches/xend-config-3.4.0.patch b/pkgs/core/xen/patches/xend-config-3.4.0.patch
deleted file mode 100644
index fce98f9..0000000
--- a/pkgs/core/xen/patches/xend-config-3.4.0.patch
+++ /dev/null
@@ -1,99 +0,0 @@
---- a/tools/examples/xend-config.sxp 2009-05-18 11:05:38.000000000 +0000
-+++ b/tools/examples/xend-config.sxp 2009-07-23 08:00:23.000000000 +0000
-@@ -14,10 +14,6 @@
- #(logfile /var/log/xen/xend.log)
- #(loglevel DEBUG)
-
--# Uncomment the line below. Set the value to flask, acm, or dummy to
--# select a security module.
--
--#(xsm_module_name dummy)
-
- # The Xen-API server configuration.
- #
-@@ -58,21 +54,20 @@
-
-
- #(xend-http-server no)
--#(xend-unix-server no)
--#(xend-tcp-xmlrpc-server no)
--#(xend-unix-xmlrpc-server yes)
-+(xend-unix-server yes)
-+(xend-tcp-xmlrpc-server yes)
-+(xend-unix-xmlrpc-server yes)
- #(xend-relocation-server no)
- (xend-relocation-server yes)
- #(xend-relocation-ssl-server no)
--#(xend-udev-event-server no)
-
- #(xend-unix-path /var/lib/xend/xend-socket)
-
-
- # Address and port xend should use for the legacy TCP XMLRPC interface,
- # if xend-tcp-xmlrpc-server is set.
--#(xend-tcp-xmlrpc-server-address 'localhost')
--#(xend-tcp-xmlrpc-server-port 8006)
-+(xend-tcp-xmlrpc-server-address 'localhost')
-+(xend-tcp-xmlrpc-server-port 8006)
-
- # SSL key and certificate to use for the legacy TCP XMLRPC interface.
- # Setting these will mean that this port serves only SSL connections as
-@@ -82,11 +77,11 @@
-
-
- # Port xend should use for the HTTP interface, if xend-http-server is set.
--#(xend-port 8000)
-+(xend-port 8000)
-
- # Port xend should use for the relocation interface, if xend-relocation-server
- # is set.
--#(xend-relocation-port 8002)
-+(xend-relocation-port 8002)
-
- # Port xend should use for the ssl relocation interface, if
- # xend-relocation-ssl-server is set.
-@@ -154,7 +149,7 @@
- # two fake interfaces per guest domain. To do things like this, write
- # yourself a wrapper script, and call network-bridge from it, as appropriate.
- #
--(network-script network-bridge)
-+(network-script network-dummy)
-
- # The script used to control virtual interfaces. This can be overridden on a
- # per-vif basis when creating a domain or a configuring a new vif. The
-@@ -169,7 +164,7 @@
- # If you are using only one bridge, the vif-bridge script will discover that,
- # so there is no need to specify it explicitly.
- #
--(vif-script vif-bridge)
-+#(vif-script vif-bridge)
-
-
- ## Use the following if network traffic is routed, as an alternative to the
-@@ -194,7 +189,7 @@
-
- # In SMP system, dom0 will use dom0-cpus # of CPUS
- # If dom0-cpus = 0, dom0 will take all cpus available
--(dom0-cpus 0)
-+#(dom0-cpus 0)
-
- # Whether to enable core-dumps when domains crash.
- #(enable-dump no)
-@@ -205,7 +200,7 @@
- # The interface for VNC servers to listen on. Defaults
- # to 127.0.0.1 To restore old 'listen everywhere' behaviour
- # set this to 0.0.0.0
--#(vnc-listen '127.0.0.1')
-+(vnc-listen '0.0.0.0')
-
- # The default password for VNC console on HVM domain.
- # Empty string is no authentication.
-@@ -243,7 +238,7 @@
-
- # The default keymap to use for the VM's virtual keyboard
- # when not specififed in VM's configuration
--#(keymap 'en-us')
-+(keymap 'de')
-
- # Script to run when the label of a resource has changed.
- #(resource-label-change-script '')
diff --git a/pkgs/core/xen/xen.nm b/pkgs/core/xen/xen.nm
index 3b941d9..09f13e1 100644
--- a/pkgs/core/xen/xen.nm
+++ b/pkgs/core/xen/xen.nm
@@ -25,33 +25,67 @@
include $(PKGROOT)/Include
PKG_NAME = xen
-PKG_VER = 3.4.0-2
+PKG_VER = 4.0.1
PKG_REL = 0
PKG_MAINTAINER = Ben Schweikert <ben.schweikert(a)ipfire.org>
PKG_GROUP = Applications/Virtualization
PKG_URL = http://www.xen.org/
PKG_LICENSE = GPLv2+
-PKG_SUMMARY = The Xen hypervisor.
+PKG_SUMMARY = The Xen tools.
define PKG_DESCRIPTION
- The Xen hypervisor, the powerful open source industry standard \
- for virtualization, offers a powerful, efficient, and secure \
- feature set for virtualization.
+ The Xen hypervisor, the powerful open source industry standard \
+ for virtualization, offers a powerful, efficient, and secure \
+ feature set for virtualization.
endef
+PKG_BUILD_DEPS+= gettext-devel openssl-devel python python-devel sdl-devel \
+ util-linux-ng-devel xorg-x11-proto-devel zlib-devel
+
PKG_TARBALL = $(THISAPP).tar.gz
-define QUALITY_AGENT_WHITELIST_EXECSTACK
+PKG_PACKAGES += $(PKG_NAME)-devel $(PKG_NAME)-libs $(PKG_NAME)-hypervisor \
+ $(PKG_NAME)-runtime
+
+PKG_SUMMARY-$(PKG_NAME)-hypervisor = This package contains the Xen hypervisor
+PKG_SUMMARY-$(PKG_NAME)-devel = This package contains what's needed to \
+ develop applications which manage Xen virtual machines.
+PKG_SUMMARY-$(PKG_NAME)-libs = This package contains the libraries needed to \
+ run applications which manage Xen virtual machines
+PKG_SUMMARY-$(PKG_NAME)-runtime = This package contains the runtime programs \
+ and daemons which form the core Xen userspace environment.
+
+define PKG_FILES-$(PKG_NAME)-hypervisor
/boot/*
endef
-DIR_APP = $(DIR_SRC)/$(PKG_NAME)-3.4.0
+define PKG_FILES-$(PKG_NAME)-runtime
+ /usr/bin/*
+endef
+
+# libs: Use files from template and add /usr/lib/fs.
+PKG_FILES-$(PKG_NAME)-libs += /usr/lib/fs
+
+define QUALITY_AGENT_WHITELIST_EXECSTACK
+ /boot/*
+endef
define STAGE_BUILD
- cd $(DIR_APP) && make xen $(PARALLELISMFLAGS)
+ # This needs to be called because the configuration routine is
+ # damn crappy.
+ ldconfig
+
+ # Following two lines are disabling HVM. HVM does not work because \
+ # of soem PIE errors we get when we try to build the firmware part \
+ # needed for different architektures.
+ cd $(DIR_APP) && sed -i -e '/^CONFIG_IOEMU := y$$/d' config/*.mk
+ cd $(DIR_APP) && sed -i -e '/SUBDIRS-$$(CONFIG_X86) += firmware/d' tools/Makefile
+
+ cd $(DIR_APP) && make tools xen $(PARALLELISMFLAGS)
endef
define STAGE_INSTALL
- cd $(DIR_APP) && make install-xen DESTDIR=$(BUILDROOT)
+ cd $(DIR_APP) && make install-tools install-xen DESTDIR=$(BUILDROOT)
+ rm -R $(BUILDROOT)/etc/init.d
endef
diff --git a/pkgs/core/xfsprogs/xfsprogs.nm b/pkgs/core/xfsprogs/xfsprogs.nm
index 7a6850d..0650784 100644
--- a/pkgs/core/xfsprogs/xfsprogs.nm
+++ b/pkgs/core/xfsprogs/xfsprogs.nm
@@ -34,7 +34,8 @@ PKG_URL = http://oss.sgi.com/projects/xfs/
PKG_LICENSE = GPL+ and LGPLv2+
PKG_SUMMARY = Utilities for managing the XFS filesystem
-PKG_BUILD_DEPS+= libacl-devel e2fsprogs-devel libtool gettext readline-devel
+PKG_BUILD_DEPS+= libacl-devel e2fsprogs-devel libtool gettext readline-devel \
+ util-linux-ng-devel
define PKG_DESCRIPTION
A set of commands to use the XFS filesystem, including mkfs.xfs.
@@ -54,6 +55,7 @@ define STAGE_BUILD
--libdir=/lib \
--libexecdir=/usr/lib \
--enable-readline=yes \
+ --enable-blkid=yes \
--disable-static
# Kill rpaths
@@ -61,7 +63,7 @@ define STAGE_BUILD
-e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
-e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g'
- cd $(DIR_APP) && make DEBUG=-DNDEBUG
+ cd $(DIR_APP) && make V=1 DEBUG=-DNDEBUG
endef
define STAGE_INSTALL
diff --git a/tools/extractor b/tools/extractor
deleted file mode 100755
index 009dffc..0000000
--- a/tools/extractor
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt #
-# #
-# This program is free software: you can redistribute it and/or modify #
-# it under the terms of the GNU General Public License as published by #
-# the Free Software Foundation, either version 3 of the License, or #
-# (at your option) any later version. #
-# #
-# This program is distributed in the hope that it will be useful, #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
-# GNU General Public License for more details. #
-# #
-# You should have received a copy of the GNU General Public License #
-# along with this program. If not, see <http://www.gnu.org/licenses/>. #
-# #
-###############################################################################
-
-FILE=$1
-GLOBAL_OPTIONS=xf
-
-# Matches tar.gz and tgz
-if grep -q gz$ <<<$FILE; then
- OPTIONS="z$GLOBAL_OPTIONS"
-
-# Matches tar.bz2, tz2 and tbz2
-elif grep -q z2$ <<<$FILE; then
- OPTIONS="j$GLOBAL_OPTIONS"
-
-# Matches tar.lzma and tlz
-elif grep -q lzma$ <<<$FILE || grep -q lz$ <<<$FILE; then
- OPTIONS="--lzma -$GLOBAL_OPTIONS"
-
-fi
-
-echo "Extracting $(basename $FILE)..."
-exec tar $OPTIONS $FILE
diff --git a/tools/functions-packager-find b/tools/functions-packager-find
index e89831a..803a1b1 100644
--- a/tools/functions-packager-find
+++ b/tools/functions-packager-find
@@ -37,6 +37,7 @@ function find_requires() {
# Others
local others=$(find_python_requires ${dirs})
others="${others} $(find_weak_symbols_requires ${dirs})"
+ others="${others} $(find_perl_requires ${dirs})"
# Get provides, because packages should not depend on features they provide
# by themselves.
@@ -45,7 +46,7 @@ function find_requires() {
# Return a sorted and unique(!) list
local require
local requires
- for require in $(listsort ${interpreters} ${neededs} ${links} ${others}); do
+ for require in $(listsort ${PKG_DEPS} ${interpreters} ${neededs} ${links} ${others}); do
[ "${require:0:3}" = "ld-" ] && continue
listmatch ${require} ${provides} || requires="${requires} ${require}"
done
@@ -66,8 +67,9 @@ function find_provides() {
# Others
local others=$(find_python_provides ${dirs})
others="${others} $(find_weak_symbols_provides ${dirs})"
+ others="${others} $(find_perl_provides ${dirs})"
- listsort ${sonames} ${others}
+ listsort ${PKG_PROVIDES} ${sonames} ${others}
}
function find_interpreters() {
@@ -152,6 +154,23 @@ function find_python_requires() {
done
}
+function find_perl_files() {
+ local extension
+ for extension in pm pl; do
+ find $@ -name "*.${extension}" 2>/dev/null
+ done
+}
+
+function find_perl_provides() {
+ [ -x "/usr/bin/perl" ] || return 0
+ ${BASEDIR}/perl.prov $(find_perl_files $@) | sort -u
+}
+
+function find_perl_requires() {
+ [ -x "/usr/bin/perl" ] || return 0
+ ${BASEDIR}/perl.req $(find_perl_files $@) | sort -u
+}
+
function find_weak_symbols_provides() {
local dirs=$@
diff --git a/tools/packager b/tools/packager
index 67e91b1..c998780 100755
--- a/tools/packager
+++ b/tools/packager
@@ -80,7 +80,7 @@ PKG_SUMMARY="${PKG_SUMMARY}"
PKG_DESCRIPTION="${PKG_DESCRIPTION}"
# Dependency info
-PKG_DEPS="${PKG_DEPS} $(find_requires ${files})"
+PKG_DEPS="$(find_requires ${files})"
PKG_PROVIDES="$(find_provides ${files})"
PKG_DATA_SIZE="$(du -cb ${files} | tail -n1 | awk '{ print $1 }')"
@@ -162,8 +162,8 @@ function __filelist() {
# Enable globbing again
set +f
- # If not paths were found take all files
- [ -z "${paths}" ] && paths="${BUILDROOT}"
+ # If not paths were found -> break
+ [ -z "${paths}" ] && return
local excludes
if [ -n "${exclude_paths}" ]; then
diff --git a/tools/perl.prov b/tools/perl.prov
new file mode 100755
index 0000000..73bec51
--- /dev/null
+++ b/tools/perl.prov
@@ -0,0 +1,199 @@
+#!/usr/bin/perl
+
+# RPM (and it's source code) is covered under two separate licenses.
+
+# The entire code base may be distributed under the terms of the GNU
+# General Public License (GPL), which appears immediately below.
+# Alternatively, all of the source code in the lib subdirectory of the
+# RPM source code distribution as well as any code derived from that
+# code may instead be distributed under the GNU Library General Public
+# License (LGPL), at the choice of the distributor. The complete text
+# of the LGPL appears at the bottom of this file.
+
+# This alternative is allowed to enable applications to be linked
+# against the RPM library (commonly called librpm) without forcing
+# such applications to be distributed under the GPL.
+
+# Any questions regarding the licensing of RPM should be addressed to
+# Erik Troan <ewt(a)redhat.com>.
+
+# a simple script to print the proper name for perl libraries.
+
+# To save development time I do not parse the perl grammmar but
+# instead just lex it looking for what I want. I take special care to
+# ignore comments and pod's.
+
+# it would be much better if perl could tell us the proper name of a
+# given script.
+
+# The filenames to scan are either passed on the command line or if
+# that is empty they are passed via stdin.
+
+# If there are lines in the file which match the pattern
+# (m/^\s*\$VERSION\s*=\s+/)
+# then these are taken to be the version numbers of the modules.
+# Special care is taken with a few known idioms for specifying version
+# numbers of files under rcs/cvs control.
+
+# If there are strings in the file which match the pattern
+# m/^\s*\$RPM_Provides\s*=\s*["'](.*)['"]/i
+# then these are treated as additional names which are provided by the
+# file and are printed as well.
+
+# I plan to rewrite this in C so that perl is not required by RPM at
+# build time.
+
+# by Ken Estes Mail.com kestes(a)staff.mail.com
+
+if ("@ARGV") {
+ foreach (@ARGV) {
+ process_file($_);
+ }
+} else {
+
+ # notice we are passed a list of filenames NOT as common in unix the
+ # contents of the file.
+
+ foreach (<>) {
+ process_file($_);
+ }
+}
+
+
+foreach $module (sort keys %require) {
+ if (length($require{$module}) == 0) {
+ print "perl($module)\n";
+ } else {
+
+ # I am not using rpm3.0 so I do not want spaces arround my
+ # operators. Also I will need to change the processing of the
+ # $RPM_* variable when I upgrade.
+
+ print "perl($module)=$require{$module}\n";
+ }
+}
+
+exit 0;
+
+
+
+sub process_file {
+
+ my ($file) = @_;
+ chomp $file;
+
+ open(FILE, "<$file") || return;
+
+ my ($package, $version, $incomment, $inover) = ();
+
+ while (<FILE>) {
+
+ # skip the documentation
+
+ # we should not need to have item in this if statement (it
+ # properly belongs in the over/back section) but people do not
+ # read the perldoc.
+
+ if (m/^=(head[1-4]|pod|item)/) {
+ $incomment = 1;
+ }
+
+ if (m/^=(cut)/) {
+ $incomment = 0;
+ $inover = 0;
+ }
+
+ if (m/^=(over)/) {
+ $inover = 1;
+ }
+
+ if (m/^=(back)/) {
+ $inover = 0;
+ }
+
+ if ($incomment || $inover) {
+ next;
+ }
+
+ # skip the data section
+ if (m/^__(DATA|END)__$/) {
+ last;
+ }
+
+ # not everyone puts the package name of the file as the first
+ # package name so we report all namespaces except some common
+ # false positives as if they were provided packages (really ugly).
+
+ if (m/^\s*package\s+([_:a-zA-Z0-9]+)\s*;/) {
+ $package=$1;
+ undef $version;
+ if ($package eq 'main') {
+ undef $package;
+ } else {
+ # If $package already exists in the $require hash, it means
+ # the package definition is broken up over multiple blocks.
+ # In that case, don't stomp a previous $VERSION we might have
+ # found. (See BZ#214496.)
+ $require{$package}=undef unless (exists $require{$package});
+ }
+ }
+
+ # after we found the package name take the first assignment to
+ # $VERSION as the version number. Exporter requires that the
+ # variable be called VERSION so we are safe.
+
+ # here are examples of VERSION lines from the perl distribution
+
+ #FindBin.pm:$VERSION = $VERSION = sprintf("%d.%02d", q$Revision: 1.9 $ =~ /(\d+)\.(\d+)/);
+ #ExtUtils/Install.pm:$VERSION = substr q$Revision: 1.9 $, 10;
+ #CGI/Apache.pm:$VERSION = (qw$Revision: 1.9 $)[1];
+ #DynaLoader.pm:$VERSION = $VERSION = "1.03"; # avoid typo warning
+ #General.pm:$Config::General::VERSION = 2.33;
+ #
+ # or with the new "our" pragma you could (read will) see:
+ #
+ # our $VERSION = '1.00'
+ if (($package) && (m/^\s*(our\s+)?\$(\Q$package\E::)?VERSION\s*=\s+/)) {
+
+ # first see if the version string contains the string
+ # '$Revision' this often causes bizzare strings and is the most
+ # common method of non static numbering.
+
+ if (m/(\$Revision: (\d+[.0-9]+))/) {
+ $version= $2;
+ } elsif (m/[\'\"]?(\d+[.0-9]+)[\'\"]?/) {
+
+ # look for a static number hard coded in the script
+
+ $version= $1;
+ }
+ $require{$package}=$version;
+ }
+
+ # Allow someone to have a variable that defines virtual packages
+ # The variable is called $RPM_Provides. It must be scoped with
+ # "our", but not "local" or "my" (just would not make sense).
+ #
+ # For instance:
+ #
+ # $RPM_Provides = "blah bleah"
+ #
+ # Will generate provides for "blah" and "bleah".
+ #
+ # Each keyword can appear multiple times. Don't
+ # bother with datastructures to store these strings,
+ # if we need to print it print it now.
+
+ if ( m/^\s*(our\s+)?\$RPM_Provides\s*=\s*["'](.*)['"]/i) {
+ foreach $_ (split(/\s+/, $2)) {
+ print "$_\n";
+ }
+ }
+
+ }
+
+ close(FILE) ||
+ die("$0: Could not close file: '$file' : $!\n");
+
+ return ;
+}
diff --git a/tools/perl.req b/tools/perl.req
new file mode 100755
index 0000000..d0a1cd7
--- /dev/null
+++ b/tools/perl.req
@@ -0,0 +1,249 @@
+#!/usr/bin/perl
+
+# RPM (and its source code) is covered under two separate licenses.
+
+# The entire code base may be distributed under the terms of the GNU
+# General Public License (GPL), which appears immediately below.
+# Alternatively, all of the source code in the lib subdirectory of the
+# RPM source code distribution as well as any code derived from that
+# code may instead be distributed under the GNU Library General Public
+# License (LGPL), at the choice of the distributor. The complete text
+# of the LGPL appears at the bottom of this file.
+
+# This alternatively is allowed to enable applications to be linked
+# against the RPM library (commonly called librpm) without forcing
+# such applications to be distributed under the GPL.
+
+# Any questions regarding the licensing of RPM should be addressed to
+# Erik Troan <ewt(a)redhat.com>.
+
+# a simple makedepend like script for perl.
+
+# To save development time I do not parse the perl grammmar but
+# instead just lex it looking for what I want. I take special care to
+# ignore comments and pod's.
+
+# It would be much better if perl could tell us the dependencies of a
+# given script.
+
+# The filenames to scan are either passed on the command line or if
+# that is empty they are passed via stdin.
+
+# If there are strings in the file which match the pattern
+# m/^\s*\$RPM_Requires\s*=\s*["'](.*)['"]/i
+# then these are treated as additional names which are required by the
+# file and are printed as well.
+
+# I plan to rewrite this in C so that perl is not required by RPM at
+# build time.
+
+# by Ken Estes Mail.com kestes(a)staff.mail.com
+
+if ("@ARGV") {
+ foreach (@ARGV) {
+ process_file($_);
+ }
+} else {
+
+ # notice we are passed a list of filenames NOT as common in unix the
+ # contents of the file.
+
+ foreach (<>) {
+ process_file($_);
+ }
+}
+
+
+foreach $module (sort keys %require) {
+ if (length($require{$module}) == 0) {
+ print "perl($module)\n";
+ } else {
+
+ # I am not using rpm3.0 so I do not want spaces around my
+ # operators. Also I will need to change the processing of the
+ # $RPM_* variable when I upgrade.
+
+ print "perl($module)>=$require{$module}\n";
+ }
+}
+
+exit 0;
+
+
+
+sub process_file {
+
+ my ($file) = @_;
+ chomp $file;
+
+ open(FILE, "<$file") || return;
+
+ while (<FILE>) {
+
+ # skip the "= <<" block
+
+ if ( ( m/^\s*\$(?:.*)\s*=\s*<<\s*(["'`])(.*)\1/) ||
+ ( m/^\s*\$(.*)\s*=\s*<<(\w*)\s*;/) ) {
+ $tag = $2;
+ while (<FILE>) {
+ chomp;
+ ( $_ eq $tag ) && last;
+ }
+ $_ = <FILE>;
+ }
+
+ # skip q{} quoted sections - just hope we don't have curly brackets
+ # within the quote, nor an escaped hash mark that isn't a comment
+ # marker, such as occurs right here. Draw the line somewhere.
+ if ( m/^.*\Wq[qxwr]?\s*([\{\(\[#|\/])[^})\]#|\/]*$/ && ! m/^\s*(require|use)\s/ ) {
+ $tag = $1;
+ $tag =~ tr/{\(\[\#|\//})]#|\//;
+ while (<FILE>) {
+ ( $_ =~ m/\}/ ) && last;
+ }
+ }
+
+ # skip the documentation
+
+ # we should not need to have item in this if statement (it
+ # properly belongs in the over/back section) but people do not
+ # read the perldoc.
+
+ if ( (m/^=(head[1-4]|pod|item)/) .. (m/^=(cut)/) ) {
+ next;
+ }
+
+ if ( (m/^=(over)/) .. (m/^=(back)/) ) {
+ next;
+ }
+
+ # skip the data section
+ if (m/^__(DATA|END)__$/) {
+ last;
+ }
+
+ # Each keyword can appear multiple times. Don't
+ # bother with datastructures to store these strings,
+ # if we need to print it print it now.
+ #
+ # Again allow for "our".
+ if ( m/^\s*(our\s+)?\$RPM_Requires\s*=\s*["'](.*)['"]/i) {
+ foreach $_ (split(/\s+/, $2)) {
+ print "$_\n";
+ }
+ }
+
+ if (
+
+# ouch could be in a eval, perhaps we do not want these since we catch
+# an exception they must not be required
+
+# eval { require Term::ReadLine } or die $@;
+# eval "require Term::Rendezvous;" or die $@;
+# eval { require Carp } if defined $^S; # If error/warning during compilation,
+
+
+ (m/^(\s*) # we hope the inclusion starts the line
+ (require|use)\s+(?!\{) # do not want 'do {' loops
+ # quotes around name are always legal
+ [\'\"]?([^\;\ \'\"\t]*)[\'\"]?[\t\;\ ]
+ # the syntax for 'use' allows version requirements
+ \s*([.0-9]*)
+ /x)
+ ) {
+ my ($whitespace, $statement, $module, $version) = ($1, $2, $3,$4);
+
+ # we only consider require statements that are flush against
+ # the left edge. any other require statements give too many
+ # false positives, as they are usually inside of an if statement
+ # as a fallback module or a rarely used option
+
+ ($whitespace ne "" && $statement eq "require") && next;
+
+ # if there is some interpolation of variables just skip this
+ # dependency, we do not want
+ # do "$ENV{LOGDIR}/$rcfile";
+
+ ($module =~ m/\$/) && next;
+
+ # skip if the phrase was "use of" -- shows up in gimp-perl, et al.
+ next if $module eq 'of';
+
+ # if the module ends in a comma we probaly caught some
+ # documentation of the form 'check stuff,\n do stuff, clean
+ # stuff.' there are several of these in the perl distribution
+
+ ($module =~ m/[,>]$/) && next;
+
+ # if the module name starts in a dot it is not a module name.
+ # Is this necessary? Please give me an example if you turn this
+ # back on.
+
+ # ($module =~ m/^\./) && next;
+
+ # if the module ends with .pm strip it to leave only basename.
+ # starts with /, which means its an absolute path to a file
+ if ($module =~ m(^/)) {
+ print "$module\n";
+ next;
+ }
+
+ # sometimes people do use POSIX qw(foo), or use POSIX(qw(foo)) etc.
+ # we can strip qw.*$, as well as (.*$:
+ $module =~ s/qw.*$//;
+ $module =~ s/\(.*$//;
+
+ $module =~ s/\.pm$//;
+
+ # some perl programmers write 'require URI/URL;' when
+ # they mean 'require URI::URL;'
+
+ $module =~ s/\//::/;
+
+ # trim off trailing parentheses if any. Sometimes people pass
+ # the module an empty list.
+
+ $module =~ s/\(\s*\)$//;
+
+ if ( $module =~ m/^v?([0-9._]+)$/ ) {
+ # if module is a number then both require and use interpret that
+ # to mean that a particular version of perl is specified
+
+ my $ver=$1;
+ if ($ver =~ /5.00/) {
+ print "perl>=0:$ver\n";
+ next;
+ }
+ else {
+ print "perl>=1:$ver\n";
+ next;
+ }
+
+ };
+
+ # ph files do not use the package name inside the file.
+ # perlmodlib documentation says:
+
+ # the .ph files made by h2ph will probably end up as
+ # extension modules made by h2xs.
+
+ # so do not expend much effort on these.
+
+
+ # there is no easy way to find out if a file named systeminfo.ph
+ # will be included with the name sys/systeminfo.ph so only use the
+ # basename of *.ph files
+
+ ($module =~ m/\.ph$/) && next;
+
+ $require{$module}=$version;
+ $line{$module}=$_;
+ }
+
+ }
+
+ close(FILE) ||
+ die("$0: Could not close file: '$file' : $!\n");
+
+ return ;
+}
hooks/post-receive
--
IPFire 3.x development tree
1
0
[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 66d54d5bc104924f88f3a36e836ec50594b0476e
by git＠ipfire.org 14 Oct '10
by git＠ipfire.org 14 Oct '10
14 Oct '10
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, master has been updated
via 66d54d5bc104924f88f3a36e836ec50594b0476e (commit)
via b8f45245a0c2c1c8e4b5ca3cda2f1023c3eb2e37 (commit)
from 5d2075e2b080b49e72f38a4974342e3d2fd7d100 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 66d54d5bc104924f88f3a36e836ec50594b0476e
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Oct 14 21:26:11 2010 +0200
Add strongswan changes to core41.
commit b8f45245a0c2c1c8e4b5ca3cda2f1023c3eb2e37
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Oct 14 21:21:55 2010 +0200
strongswan: enabled curl for http fetching revoking lists.
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/strongswan | 3 +++
config/rootfiles/core/41/exclude | 4 ++++
.../rootfiles/core/{38 => 41}/filelists/strongswan | 0
lfs/strongswan | 5 ++++-
4 files changed, 11 insertions(+), 1 deletions(-)
copy config/rootfiles/core/{38 => 41}/filelists/strongswan (100%)
Difference in files:
diff --git a/config/rootfiles/common/strongswan b/config/rootfiles/common/strongswan
index 8b9ec78..2f723a8 100644
--- a/config/rootfiles/common/strongswan
+++ b/config/rootfiles/common/strongswan
@@ -40,6 +40,9 @@ usr/libexec/ipsec/plugins/libstrongswan-aes.so
#usr/libexec/ipsec/plugins/libstrongswan-attr.a
#usr/libexec/ipsec/plugins/libstrongswan-attr.la
usr/libexec/ipsec/plugins/libstrongswan-attr.so
+#usr/libexec/ipsec/plugins/libstrongswan-curl.a
+#usr/libexec/ipsec/plugins/libstrongswan-curl.la
+usr/libexec/ipsec/plugins/libstrongswan-curl.so
#usr/libexec/ipsec/plugins/libstrongswan-des.a
#usr/libexec/ipsec/plugins/libstrongswan-des.la
usr/libexec/ipsec/plugins/libstrongswan-des.so
diff --git a/config/rootfiles/core/41/exclude b/config/rootfiles/core/41/exclude
index e69de29..086e445 100644
--- a/config/rootfiles/core/41/exclude
+++ b/config/rootfiles/core/41/exclude
@@ -0,0 +1,4 @@
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
diff --git a/config/rootfiles/core/41/filelists/strongswan b/config/rootfiles/core/41/filelists/strongswan
new file mode 120000
index 0000000..90c727e
--- /dev/null
+++ b/config/rootfiles/core/41/filelists/strongswan
@@ -0,0 +1 @@
+../../../common/strongswan
\ No newline at end of file
diff --git a/lfs/strongswan b/lfs/strongswan
index 51fae77..c57f6c9 100644
--- a/lfs/strongswan
+++ b/lfs/strongswan
@@ -73,7 +73,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-4.4.0_ipfire.patch
- cd $(DIR_APP) && ./configure --prefix="/usr" --sysconfdir="/etc" --enable-cisco-quirks
+ cd $(DIR_APP) && ./configure --prefix="/usr" --sysconfdir="/etc" \
+ --enable-cisco-quirks \
+ --enable-curl
+
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
hooks/post-receive
--
IPFire 2.x development tree
1
0
[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. e4e28e19c69001f363933552ea997de7f012a947
by git＠ipfire.org 14 Oct '10
by git＠ipfire.org 14 Oct '10
14 Oct '10
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via e4e28e19c69001f363933552ea997de7f012a947 (commit)
from ea80530c4228f1271af5aadfc373470c9a21f408 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit e4e28e19c69001f363933552ea997de7f012a947
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Oct 14 21:21:55 2010 +0200
strongswan: enabled curl for http fetching revoking lists.
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/strongswan | 3 +++
lfs/strongswan | 5 ++++-
2 files changed, 7 insertions(+), 1 deletions(-)
Difference in files:
diff --git a/config/rootfiles/common/strongswan b/config/rootfiles/common/strongswan
index 8b9ec78..2f723a8 100644
--- a/config/rootfiles/common/strongswan
+++ b/config/rootfiles/common/strongswan
@@ -40,6 +40,9 @@ usr/libexec/ipsec/plugins/libstrongswan-aes.so
#usr/libexec/ipsec/plugins/libstrongswan-attr.a
#usr/libexec/ipsec/plugins/libstrongswan-attr.la
usr/libexec/ipsec/plugins/libstrongswan-attr.so
+#usr/libexec/ipsec/plugins/libstrongswan-curl.a
+#usr/libexec/ipsec/plugins/libstrongswan-curl.la
+usr/libexec/ipsec/plugins/libstrongswan-curl.so
#usr/libexec/ipsec/plugins/libstrongswan-des.a
#usr/libexec/ipsec/plugins/libstrongswan-des.la
usr/libexec/ipsec/plugins/libstrongswan-des.so
diff --git a/lfs/strongswan b/lfs/strongswan
index 51fae77..c57f6c9 100644
--- a/lfs/strongswan
+++ b/lfs/strongswan
@@ -73,7 +73,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-4.4.0_ipfire.patch
- cd $(DIR_APP) && ./configure --prefix="/usr" --sysconfdir="/etc" --enable-cisco-quirks
+ cd $(DIR_APP) && ./configure --prefix="/usr" --sysconfdir="/etc" \
+ --enable-cisco-quirks \
+ --enable-curl
+
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
hooks/post-receive
--
IPFire 2.x development tree
1
0
[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 5d2075e2b080b49e72f38a4974342e3d2fd7d100
by git＠ipfire.org 14 Oct '10
by git＠ipfire.org 14 Oct '10
14 Oct '10
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, master has been updated
via 5d2075e2b080b49e72f38a4974342e3d2fd7d100 (commit)
from 4c4a3475521a5a3196d180a2af626c5e2d7846b0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 5d2075e2b080b49e72f38a4974342e3d2fd7d100
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Oct 14 21:01:57 2010 +0200
Removed packages-list.txt from git.
Conflicts:
doc/packages-list.txt
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 1 +
doc/packages-list.txt | 372 -------------------------------------------------
2 files changed, 1 insertions(+), 372 deletions(-)
delete mode 100644 doc/packages-list.txt
Difference in files:
diff --git a/.gitignore b/.gitignore
index 64dbb37..ed6c767 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
/cache
/ccache
/doc/ChangeLog
+/doc/packages-list.txt
/log
/packages
/tmp
diff --git a/doc/packages-list.txt b/doc/packages-list.txt
deleted file mode 100644
index b4d15fa..0000000
--- a/doc/packages-list.txt
+++ /dev/null
@@ -1,372 +0,0 @@
-== List of softwares used to build IPFire Version: 2.7 ==
-* Archive-Tar-1.29
-* Archive-Zip-1.16
-* BerkeleyDB-0.27
-* ClientForm-0.2.9
-* Compress-Zlib-1.35
-* Convert-TNEF-0.17
-* Convert-UUlib-1.06
-* DBD-mysql-4.010
-* DBI-1.607
-* DFB++-1.0.0
-* Digest-1.08
-* Digest-HMAC-1.01
-* Digest-SHA1-2.10
-* DirectFB-1.1.1
-* GD-2.35
-* GDGraph-1.4308
-* GDTextUtil-0.86
-* Geo-IP-PurePerl-1.17
-* HTML-Parser-3.45
-* HTML-Tagset-3.04
-* IO-stringy-2.110
-* Linux-PAM-0.99.4.0
-* Locale-Codes-2.07
-* MIME-tools-5.420
-* Mail-SpamAssassin-3.1.3
-* MailTools-1.74
-* Net-DNS-0.47
-* Net-IPv4Addr-0.10
-* Net-SSLeay-1.36
-* Net-Server-0.97
-* Pound-2.5
-* Python-2.7
-* SDL-1.2.11
-* Text-Tabs+Wrap-2005.0824
-* URI-1.35
-* Unix-Syslog-0.100
-* XML-Parser-2.34
-* alsa-lib-1.0.23
-* alsa-lib-1.0.23-kmod-2.6.32.15-ipfire
-* amavisd-new-2.5.2
-* apcupsd-3.14.4
-* applejuice-0.31
-* arping-2.05
-* as86-0.16.17
-* asterisk-1.4.28
-* autoconf-2.59
-* automake-1.9.6
-* backup-ipfire
-* bash-3.1
-* bc-1.06
-* beep-1.2.2
-* bind-9.3.2
-* binutils-2.17
-* bison-2.2
-* bluez-libs-3.36
-* br2684ctl
-* bridge-utils-1.1
-* busybox-1.2.2
-* bwm-ng-0.6
-* bzip2-1.0.5
-* cacti-0.8.7e
-* calamaris-2.59
-* capi4k-utils-2005-07-18
-* ccache-3.0pre0
-* cdrtools-2.01.01
-* centerim-4.22.1
-* clamav-0.96.2
-* cmake-2.4.8
-* collectd-4.9.1
-* compat-wireless-2.6.35-1-kmod-2.6.32.15-ipfire
-* compat-wireless-2.6.35-1-kmod-2.6.32.15-ipfire-xen
-* coreutils-5.96
-* cpio-2.11
-* cpufrequtils-007
-* cryptodev-20091126-kmod-2.6.32.15-ipfire
-* cryptodev-20091126-kmod-2.6.32.15-ipfire-xen
-* cups-1.4.4
-* curl-7.19.5
-* cyrus-imapd-2.2.12
-* cyrus-sasl-2.1.21
-* dahdi-2.2.1
-* dahdi-2.2.1-kmod-2.6.32.15-ipfire
-* dahdi-2.2.1-kmod-2.6.32.15-ipfire-xen
-* db-4.4.20
-* dbus-1.0.3
-* ddrescue-1.12
-* dhcp-3.1.0
-* dhcpcd-5.1.3
-* diffutils-2.8.1
-* dnsmasq-2.45
-* dosfstools-3.0.9
-* e1000-8.0.19-kmod-2.6.32.15-ipfire
-* e1000-8.0.19-kmod-2.6.32.15-ipfire-xen
-* e1000e-1.1.19-kmod-2.6.32.15-ipfire
-* e1000e-1.1.19-kmod-2.6.32.15-ipfire-xen
-* e2fsprogs-1.41.11
-* ebtables-v2.0.8-2
-* ed-0.2
-* eject-2.1.5
-* elinks-0.11.7
-* espgs-8.15.1
-* etherwake-1.09
-* ethtool-3
-* expat-2.0.0
-* ez-ipupdate-3.0.11b8
-* faad2-2.7
-* fbset-2.1
-* fcron-3.0.4
-* feedparser-4.1
-* fetchmail-6.3.16
-* ffmpeg-export-2008-04-13
-* file-4.17
-* findutils-4.2.27
-* flex-2.5.33
-* fontconfig-2.5.91
-* foomatic-3.0-20070813
-* freefont-20060126
-* freetype-2.1.10
-* fuse-2.8.3
-* fwhits
-* gawk-3.1.5
-* gcc-4.0.4
-* gd-2.0.33
-* gdbm-1.8.3
-* gettext-0.14.5
-* git-1.6.3.1
-* glib-2.22.2
-* glibc-2.3.6
-* gmp-4.2
-* gnump3d-3.0
-* gnupg-1.4.5
-* grep-2.5.1a
-* groff-1.18.1.1
-* grub-0.97
-* guardian-ipfire
-* gutenprint-5.2.5
-* gzip-1.3.5
-* hddtemp-0.3-beta14
-* hdparm-8.9
-* hostapd-0.7.2
-* hplip-2.7.10
-* htop-0.8.3
-* httpd-2.2.15
-* hwdata
-* iana-etc-2.10
-* icecast-2.3.2
-* icecream-0.9.4.8
-* icegenerator-0.5.5-pre2
-* iftop-0.17
-* igb-2.3.4-kmod-2.6.32.15-ipfire
-* igb-2.3.4-kmod-2.6.32.15-ipfire-xen
-* igmpproxy-0.1
-* imspector-20101008
-* inetutils-1.4.2
-* ipaddr-1.2
-* iperf-2.0.4
-* ipfireseeder-1.00
-* iproute2-2.6.16-060323
-* iptables-1.4.6
-* iptstate-2.1
-* iputils-ss020927
-* iw-0.9.15
-* java-1.6.0_12-for-ipfire
-* joe-3.7
-* jpegsrc.v6b
-* kbd-1.12
-* klibc-1.5.14
-* kqemu-1.4.0pre1-kmod-2.6.32.15-ipfire
-* kqemu-1.4.0pre1-kmod-2.6.32.15-ipfire-xen
-* kudzu-1.2.64
-* kvm-kmod-2.6.33.1-kmod-2.6.32.15-ipfire
-* l7-protocols-2009-05-10
-* lame-3.97
-* lcd4linux-0.10.1-RC2
-* lcr-20100601
-* less-394
-* libaal-1.0.5
-* libart_lgpl-2.3.17
-* libcap-1.10
-* libdvbpsi5-0.1.6
-* libevent-1.4.14b-stable
-* libid3tag-0.15.1b
-* libidn-0.6.14
-* libmad-0.15.1b
-* libmpdclient-2.1
-* libnet-1.1.2.1
-* libnl-1.1
-* libogg-1.1.4
-* liboping-1.3.4
-* libpcap-1.0.0
-* libpng-1.2.44
-* libpri-1.4.10.2
-* libsafe_2.0-16
-* libshout-2.2.2
-* libsigc++-2.0.17
-* libtool-1.5.22
-* libtorrent-0.12.6
-* libupnp-1.6.6
-* libusb-0.1.12
-* libvorbis-1.2.3
-* libwww-perl-5.803
-* libxml2-2.6.26
-* libxslt-1.1.17
-* linux-2.6.32.15-ipfire
-* linux-2.6.32.15-ipfire-xen
-* linux-atm-2.4.1
-* linux-firmware-20100318
-* linux-libc-headers-2.6.12.0
-* lm_sensors-3.1.2
-* logrotate-3.7.1
-* logwatch-7.3.6
-* lsof-4.78
-* lynis-1.2.9
-* lzo-2.02
-* m4-1.4.4
-* mISDN-20100525-kmod-2.6.32.15-ipfire
-* mISDN-20100525-kmod-2.6.32.15-ipfire-xen
-* mISDNuser-20100525
-* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.15-ipfire
-* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.15-ipfire-xen
-* make-3.81
-* man-db-2.4.3
-* man-pages-2.34
-* mbr-1.1.8
-* mc-4.7.3
-* mdadm-3.1.1
-* mechanize-0.1.8
-* mediatomb-svn2020
-* memtest86+-4.10
-* miau-0.6.5
-* minicom-2.4
-* misc-progs
-* mkinitcpio-0.5.9
-* mktemp-1.5
-* mldonkey-3.0.0
-* module-init-tools-3.5
-* motion-3.2.11
-* mpc-0.19
-* mpd-0.15.12
-* mpeg2dec-0.4.0b
-* mpfire-ipfire
-* mtd-CVS-20070507
-* mtools-3.9.10
-* mysql-5.0.24a
-* nagios-3.0.6
-* nagiosql-303
-* nano-2.0.9
-* nasm-0.98.39
-* ncftp-3.2.1-src
-* ncurses-5.5
-* net-snmp-5.4.2.1
-* net-tools-1.60
-* netcat-0.7.1
-* netpbm-10.26.46
-* newt-0.51.6
-* nfs-utils-1.2.2
-* nmap-5.20
-* noip_updater_v1.6
-* ntfs-3g-2009.4.4
-* ntp-4.2.4p7
-* nut-2.4.3
-* ocaml-3.09.2
-* oinkmaster-2.0
-* open-vm-tools-8.4.2-261024
-* openldap-2.3.20
-* openmailadmin-1.0.0
-* openssh-5.4p1
-* openssl-0.9.8o
-* openvpn-2.1.2
-* p7zip_4.65
-* pam_mysql-0.7RC1
-* patch-2.5.4
-* pciutils-2.2.3
-* pcmciautils-014
-* pcre-7.7
-* perl-5.8.8
-* perl-gettext-1.05
-* php-5.2.4
-* phpSANE-0.3.3
-* pkg-config-0.20
-* popt-1.10.4
-* portmap_6.0
-* postfix-2.6.5
-* ppp-2.4.5
-* pptp-1.7.2
-* procps-3.2.6
-* psmisc-22.2
-* qemu-0.11.1-kqemu
-* qemu-0.12.3
-* r8101-1.016.00-kmod-2.6.32.15-ipfire
-* r8101-1.016.00-kmod-2.6.32.15-ipfire-xen
-* r8168-8.018.00-kmod-2.6.32.15-ipfire
-* r8168-8.018.00-kmod-2.6.32.15-ipfire-xen
-* r8169-6.013.00-kmod-2.6.32.15-ipfire
-* r8169-6.013.00-kmod-2.6.32.15-ipfire-xen
-* readline-5.1
-* reiser4progs-1.0.6
-* reiserfsprogs-3.6.21
-* rrdtool-1.2.30
-* rssdler-0.4.0a
-* rsync-3.0.7
-* rtorrent-0.8.6
-* samba-3.5.6
-* sane-1.0.19
-* screen-4.0.3
-* sdparm-1.01
-* sed-4.1.5
-* setserial-2.17
-* setuptools-0.6c11
-* shadow-4.0.15
-* slang-1.4.9
-* smartmontools-5.39.1
-* snort-2.8.6.1
-* sox-12.18.1
-* spandsp-0.0.6pre12
-* splix-2.0.0-rc2
-* sqlite-3.6.10
-* squashfs-lzma-cvs20100214
-* squid-2.7.STABLE9
-* squidGuard-1.4.1
-* squidclamav-5.4
-* sshfs-fuse-2.2
-* sslh-1.7a
-* streamripper-1.63.5
-* strongswan-4.4.1
-* sudo-1.6.8p12
-* sysfsutils-1.3.0
-* sysklogd-1.5
-* syslinux-3.62
-* sysstat-6.0.2
-* sysvinit-2.86
-* taglib-1.5
-* tar-1.22
-* tcp_wrappers_7.6
-* tcpdump-4.0.0
-* teamspeak-2.0.24.1
-* texinfo-4.8
-* tftp-hpa-0.48
-* tiff-3.9.4
-* traceroute-2.0.12
-* tripwire-2.4.1.2
-* tunctl
-* udev-096
-* udev-096-klibc
-* unzip552
-* urlgrabber-3.1.0
-* usb-modeswitch-1.1.2
-* usbutils-0.72
-* util-linux-2.12r
-* v4l-dvb-b576509ea6d2-kmod-2.6.32.15-ipfire
-* v4l-dvb-b576509ea6d2-kmod-2.6.32.15-ipfire-xen
-* vdr-1.6.0
-* vdradmin-am-3.6.7
-* vim-7.0
-* vlan.1.9
-* vlc-0.8.6i
-* vnstat-1.6
-* vnstati-beta3
-* vsftpd-2.2.2
-* w_scan-20080105
-* watchdog-5.9
-* wget-1.10.2
-* whatmask-1.2
-* which-2.16
-* wireless_tools.30.pre6
-* wpa_supplicant-0.6.9
-* xfsprogs-2.9.4
-* xvidcore-1.2.1
-* xz-4.999.9beta
-* zerofree-1.0.1
-* zlib-1.2.3
hooks/post-receive
--
IPFire 2.x development tree
1
0
[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. ea80530c4228f1271af5aadfc373470c9a21f408
by git＠ipfire.org 14 Oct '10
by git＠ipfire.org 14 Oct '10
14 Oct '10
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via ea80530c4228f1271af5aadfc373470c9a21f408 (commit)
via 799cc0f3a9524abbbd6cca803795206e2112a00e (commit)
via d4c6ba21eb1aed558c60f5a30a4de028f06584c0 (commit)
via a4aae93d9616aff917de21317a917246f9417b07 (commit)
via e21bd39e1271891eb3105e980c85bdd72306ccbd (commit)
via 26c1cc7153a627400de3902c0e569cf6100a4b51 (commit)
via d732b9c9b94b88d9bcf52007d3337a74eb322dd0 (commit)
via 4c4a3475521a5a3196d180a2af626c5e2d7846b0 (commit)
via 68dd6726af4cc47056353f51ebb1c5e92eb68326 (commit)
via 707b4fa1485867304144fbfb2c74b1e602cc5d6e (commit)
via bb198266ac4950d7f7fc15c5398e423dc01660c2 (commit)
via 0b2307b2f078e871cd416edd1dae0567084953f2 (commit)
via 5e8b836225227470fb16971ebf54b76c354e55ea (commit)
from 528f824cfbb0e8bed7e56e9ebf4d2624ac27eefc (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit ea80530c4228f1271af5aadfc373470c9a21f408
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Oct 14 08:37:39 2010 +0200
Removed packages-list.txt from git.
commit 799cc0f3a9524abbbd6cca803795206e2112a00e
Merge: d4c6ba2 4c4a347
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Oct 14 08:33:27 2010 +0200
Merge commit 'origin/master' into next
Conflicts:
config/rootfiles/core/41/filelists/files
commit d4c6ba21eb1aed558c60f5a30a4de028f06584c0
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Oct 14 08:31:54 2010 +0200
Updated squid (3.1.8).
commit a4aae93d9616aff917de21317a917246f9417b07
Merge: e21bd39 528f824
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Oct 14 08:29:18 2010 +0200
Merge branch 'next' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x into next
Conflicts:
doc/packages-list.txt
commit e21bd39e1271891eb3105e980c85bdd72306ccbd
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Oct 13 14:47:39 2010 +0200
Fix build logfiles list sometimes files that are not new.
commit 26c1cc7153a627400de3902c0e569cf6100a4b51
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Oct 13 11:03:51 2010 +0200
Add pae-kernel package.
commit d732b9c9b94b88d9bcf52007d3337a74eb322dd0
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Oct 12 23:10:04 2010 +0200
Updated findutils (4.4.2).
commit 707b4fa1485867304144fbfb2c74b1e602cc5d6e
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Oct 12 08:01:53 2010 +0200
Fix linux-xen install.sh root detection with UUID.
commit bb198266ac4950d7f7fc15c5398e423dc01660c2
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Oct 12 07:17:46 2010 +0200
Fix initramdisk build at xen-kernel update.
commit 0b2307b2f078e871cd416edd1dae0567084953f2
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Oct 11 23:56:06 2010 +0200
Updated libcap (2.19).
commit 5e8b836225227470fb16971ebf54b76c354e55ea
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Oct 11 17:36:06 2010 +0200
Add attr (2.4.43).
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 1 +
config/kernel/kernel.config.i586-ipfire-pae | 3953 ++++++++++++++++++++
config/outgoingfw/outgoingfw.pl | 2 +-
config/proxy/auth/msnt_auth | Bin 38708 -> 0 bytes
config/proxy/auth/ncsa_auth | Bin 14732 -> 0 bytes
config/proxy/auth/ntlm_auth | Bin 47500 -> 0 bytes
config/proxy/auth/squid_ldap_auth | Bin 18280 -> 0 bytes
config/proxy/auth/squid_ldap_group | Bin 19080 -> 0 bytes
config/proxy/auth/squid_radius_auth | Bin 13064 -> 0 bytes
.../errors.ipfire/{German => de}/ERR_ACCESS_DENIED | 0
.../{German => de}/ERR_CACHE_ACCESS_DENIED | 0
.../{German => de}/ERR_CACHE_MGR_ACCESS_DENIED | 0
.../{German => de}/ERR_CANNOT_FORWARD | 0
.../errors.ipfire/{German => de}/ERR_CONNECT_FAIL | 0
config/proxy/errors.ipfire/de/ERR_DIR_LISTING | 1 +
.../errors.ipfire/{German => de}/ERR_DNS_FAIL | 0
config/proxy/errors.ipfire/de/ERR_ESI | 1 +
.../{German => de}/ERR_FORWARDING_DENIED | 0
.../errors.ipfire/{German => de}/ERR_FTP_DISABLED | 0
.../errors.ipfire/{German => de}/ERR_FTP_FAILURE | 0
.../errors.ipfire/{German => de}/ERR_FTP_FORBIDDEN | 0
.../errors.ipfire/{German => de}/ERR_FTP_NOT_FOUND | 0
.../{German => de}/ERR_FTP_PUT_CREATED | 0
.../errors.ipfire/{German => de}/ERR_FTP_PUT_ERROR | 0
.../{German => de}/ERR_FTP_PUT_MODIFIED | 0
.../{German => de}/ERR_FTP_UNAVAILABLE | 0
config/proxy/errors.ipfire/de/ERR_ICAP_FAILURE | 1 +
.../errors.ipfire/{German => de}/ERR_INVALID_REQ | 0
.../errors.ipfire/{German => de}/ERR_INVALID_RESP | 0
.../errors.ipfire/{German => de}/ERR_INVALID_URL | 0
.../errors.ipfire/{German => de}/ERR_LIFETIME_EXP | 0
.../errors.ipfire/{German => de}/ERR_NO_RELAY | 0
.../{German => de}/ERR_ONLY_IF_CACHED_MISS | 0
.../errors.ipfire/{German => de}/ERR_READ_ERROR | 0
.../errors.ipfire/{German => de}/ERR_READ_TIMEOUT | 0
.../proxy/errors.ipfire/de/ERR_SECURE_CONNECT_FAIL | 1 +
.../errors.ipfire/{German => de}/ERR_SHUTTING_DOWN | 0
.../{German => de}/ERR_SOCKET_FAILURE | 0
.../proxy/errors.ipfire/{German => de}/ERR_TOO_BIG | 0
.../proxy/errors.ipfire/de/ERR_UNSUP_HTTPVERSION | 1 +
.../errors.ipfire/{German => de}/ERR_UNSUP_REQ | 0
.../errors.ipfire/{German => de}/ERR_URN_RESOLVE | 0
.../errors.ipfire/{German => de}/ERR_WRITE_ERROR | 0
.../{German => de}/ERR_ZERO_SIZE_OBJECT | 0
.../{English => en}/ERR_ACCESS_DENIED | 0
.../{English => en}/ERR_CACHE_ACCESS_DENIED | 0
.../{English => en}/ERR_CACHE_MGR_ACCESS_DENIED | 0
.../{English => en}/ERR_CANNOT_FORWARD | 0
.../errors.ipfire/{English => en}/ERR_CONNECT_FAIL | 0
config/proxy/errors.ipfire/en/ERR_DIR_LISTING | 1 +
.../errors.ipfire/{English => en}/ERR_DNS_FAIL | 0
config/proxy/errors.ipfire/en/ERR_ESI | 1 +
.../{English => en}/ERR_FORWARDING_DENIED | 0
.../errors.ipfire/{English => en}/ERR_FTP_DISABLED | 0
.../errors.ipfire/{English => en}/ERR_FTP_FAILURE | 0
.../{English => en}/ERR_FTP_FORBIDDEN | 0
.../{English => en}/ERR_FTP_NOT_FOUND | 0
.../{English => en}/ERR_FTP_PUT_CREATED | 0
.../{English => en}/ERR_FTP_PUT_ERROR | 0
.../{English => en}/ERR_FTP_PUT_MODIFIED | 0
.../{English => en}/ERR_FTP_UNAVAILABLE | 0
config/proxy/errors.ipfire/en/ERR_ICAP_FAILURE | 1 +
.../errors.ipfire/{English => en}/ERR_INVALID_REQ | 0
.../errors.ipfire/{English => en}/ERR_INVALID_RESP | 0
.../errors.ipfire/{English => en}/ERR_INVALID_URL | 0
.../errors.ipfire/{English => en}/ERR_LIFETIME_EXP | 0
.../errors.ipfire/{English => en}/ERR_NO_RELAY | 0
.../{English => en}/ERR_ONLY_IF_CACHED_MISS | 0
.../errors.ipfire/{English => en}/ERR_READ_ERROR | 0
.../errors.ipfire/{English => en}/ERR_READ_TIMEOUT | 0
.../proxy/errors.ipfire/en/ERR_SECURE_CONNECT_FAIL | 1 +
.../{English => en}/ERR_SHUTTING_DOWN | 0
.../{English => en}/ERR_SOCKET_FAILURE | 0
.../errors.ipfire/{English => en}/ERR_TOO_BIG | 0
.../proxy/errors.ipfire/en/ERR_UNSUP_HTTPVERSION | 1 +
.../errors.ipfire/{English => en}/ERR_UNSUP_REQ | 0
.../errors.ipfire/{English => en}/ERR_URN_RESOLVE | 0
.../errors.ipfire/{English => en}/ERR_WRITE_ERROR | 0
.../{English => en}/ERR_ZERO_SIZE_OBJECT | 0
config/rootfiles/common/attr | 24 +
config/rootfiles/common/findutils | 14 +-
config/rootfiles/common/libcap | 58 +-
config/rootfiles/common/squid | 2791 +++++++++------
config/rootfiles/core/test/filelists/attr | 1 +
config/rootfiles/core/test/filelists/files | 4 +-
config/rootfiles/core/test/filelists/findutils | 1 +
config/rootfiles/core/test/filelists/libcap | 1 +
.../{oldcore/32 => core/test}/filelists/squid | 0
config/rootfiles/packages/linux-pae | 1872 +++++++++
doc/packages-list.txt | 370 --
html/cgi-bin/outgoingfw.cgi | 8 +-
lfs/Config | 12 +-
lfs/alsa | 6 +-
lfs/attr | 83 +
lfs/compat-wireless | 6 +-
lfs/cryptodev | 6 +-
lfs/dahdi | 6 +-
lfs/e1000 | 4 +
lfs/e1000e | 4 +
lfs/findutils | 6 +-
lfs/igb | 4 +
lfs/kqemu | 6 +-
lfs/kvm-kmod | 6 +-
lfs/libcap | 12 +-
lfs/linux | 22 +-
lfs/linux-pae | 28 +
lfs/mISDN | 4 +
lfs/madwifi | 7 +-
lfs/r8101 | 4 +
lfs/r8168 | 6 +-
lfs/r8169 | 4 +
lfs/squid | 13 +-
lfs/v4l-dvb | 6 +-
make.sh | 17 +
src/initscripts/init.d/squid | 4 +-
src/paks/linux-pae/install.sh | 65 +
src/paks/linux-pae/uninstall.sh | 26 +
src/paks/{linux-xen => linux-pae}/update.sh | 0
src/paks/linux-xen/install.sh | 15 +-
119 files changed, 7922 insertions(+), 1570 deletions(-)
create mode 100644 config/kernel/kernel.config.i586-ipfire-pae
delete mode 100644 config/proxy/auth/msnt_auth
delete mode 100644 config/proxy/auth/ncsa_auth
delete mode 100644 config/proxy/auth/ntlm_auth
delete mode 100644 config/proxy/auth/squid_ldap_auth
delete mode 100644 config/proxy/auth/squid_ldap_group
delete mode 100644 config/proxy/auth/squid_radius_auth
rename config/proxy/errors.ipfire/{German => de}/ERR_ACCESS_DENIED (100%)
rename config/proxy/errors.ipfire/{German => de}/ERR_CACHE_ACCESS_DENIED (100%)
rename config/proxy/errors.ipfire/{German => de}/ERR_CACHE_MGR_ACCESS_DENIED (100%)
rename config/proxy/errors.ipfire/{German => de}/ERR_CANNOT_FORWARD (100%)
rename config/proxy/errors.ipfire/{German => de}/ERR_CONNECT_FAIL (100%)
create mode 100644 config/proxy/errors.ipfire/de/ERR_DIR_LISTING
rename config/proxy/errors.ipfire/{German => de}/ERR_DNS_FAIL (100%)
create mode 100644 config/proxy/errors.ipfire/de/ERR_ESI
rename config/proxy/errors.ipfire/{German => de}/ERR_FORWARDING_DENIED (100%)
rename config/proxy/errors.ipfire/{German => de}/ERR_FTP_DISABLED (100%)
rename config/proxy/errors.ipfire/{German => de}/ERR_FTP_FAILURE (100%)
rename config/proxy/errors.ipfire/{German => de}/ERR_FTP_FORBIDDEN (100%)
rename config/proxy/errors.ipfire/{German => de}/ERR_FTP_NOT_FOUND (100%)
rename config/proxy/errors.ipfire/{German => de}/ERR_FTP_PUT_CREATED (100%)
rename config/proxy/errors.ipfire/{German => de}/ERR_FTP_PUT_ERROR (100%)
rename config/proxy/errors.ipfire/{German => de}/ERR_FTP_PUT_MODIFIED (100%)
rename config/proxy/errors.ipfire/{German => de}/ERR_FTP_UNAVAILABLE (100%)
create mode 100644 config/proxy/errors.ipfire/de/ERR_ICAP_FAILURE
rename config/proxy/errors.ipfire/{German => de}/ERR_INVALID_REQ (100%)
rename config/proxy/errors.ipfire/{German => de}/ERR_INVALID_RESP (100%)
rename config/proxy/errors.ipfire/{German => de}/ERR_INVALID_URL (100%)
rename config/proxy/errors.ipfire/{German => de}/ERR_LIFETIME_EXP (100%)
rename config/proxy/errors.ipfire/{German => de}/ERR_NO_RELAY (100%)
rename config/proxy/errors.ipfire/{German => de}/ERR_ONLY_IF_CACHED_MISS (100%)
rename config/proxy/errors.ipfire/{German => de}/ERR_READ_ERROR (100%)
rename config/proxy/errors.ipfire/{German => de}/ERR_READ_TIMEOUT (100%)
create mode 100644 config/proxy/errors.ipfire/de/ERR_SECURE_CONNECT_FAIL
rename config/proxy/errors.ipfire/{German => de}/ERR_SHUTTING_DOWN (100%)
rename config/proxy/errors.ipfire/{German => de}/ERR_SOCKET_FAILURE (100%)
rename config/proxy/errors.ipfire/{German => de}/ERR_TOO_BIG (100%)
create mode 100644 config/proxy/errors.ipfire/de/ERR_UNSUP_HTTPVERSION
rename config/proxy/errors.ipfire/{German => de}/ERR_UNSUP_REQ (100%)
rename config/proxy/errors.ipfire/{German => de}/ERR_URN_RESOLVE (100%)
rename config/proxy/errors.ipfire/{German => de}/ERR_WRITE_ERROR (100%)
rename config/proxy/errors.ipfire/{German => de}/ERR_ZERO_SIZE_OBJECT (100%)
rename config/proxy/errors.ipfire/{English => en}/ERR_ACCESS_DENIED (100%)
rename config/proxy/errors.ipfire/{English => en}/ERR_CACHE_ACCESS_DENIED (100%)
rename config/proxy/errors.ipfire/{English => en}/ERR_CACHE_MGR_ACCESS_DENIED (100%)
rename config/proxy/errors.ipfire/{English => en}/ERR_CANNOT_FORWARD (100%)
rename config/proxy/errors.ipfire/{English => en}/ERR_CONNECT_FAIL (100%)
create mode 100644 config/proxy/errors.ipfire/en/ERR_DIR_LISTING
rename config/proxy/errors.ipfire/{English => en}/ERR_DNS_FAIL (100%)
create mode 100644 config/proxy/errors.ipfire/en/ERR_ESI
rename config/proxy/errors.ipfire/{English => en}/ERR_FORWARDING_DENIED (100%)
rename config/proxy/errors.ipfire/{English => en}/ERR_FTP_DISABLED (100%)
rename config/proxy/errors.ipfire/{English => en}/ERR_FTP_FAILURE (100%)
rename config/proxy/errors.ipfire/{English => en}/ERR_FTP_FORBIDDEN (100%)
rename config/proxy/errors.ipfire/{English => en}/ERR_FTP_NOT_FOUND (100%)
rename config/proxy/errors.ipfire/{English => en}/ERR_FTP_PUT_CREATED (100%)
rename config/proxy/errors.ipfire/{English => en}/ERR_FTP_PUT_ERROR (100%)
rename config/proxy/errors.ipfire/{English => en}/ERR_FTP_PUT_MODIFIED (100%)
rename config/proxy/errors.ipfire/{English => en}/ERR_FTP_UNAVAILABLE (100%)
create mode 100644 config/proxy/errors.ipfire/en/ERR_ICAP_FAILURE
rename config/proxy/errors.ipfire/{English => en}/ERR_INVALID_REQ (100%)
rename config/proxy/errors.ipfire/{English => en}/ERR_INVALID_RESP (100%)
rename config/proxy/errors.ipfire/{English => en}/ERR_INVALID_URL (100%)
rename config/proxy/errors.ipfire/{English => en}/ERR_LIFETIME_EXP (100%)
rename config/proxy/errors.ipfire/{English => en}/ERR_NO_RELAY (100%)
rename config/proxy/errors.ipfire/{English => en}/ERR_ONLY_IF_CACHED_MISS (100%)
rename config/proxy/errors.ipfire/{English => en}/ERR_READ_ERROR (100%)
rename config/proxy/errors.ipfire/{English => en}/ERR_READ_TIMEOUT (100%)
create mode 100644 config/proxy/errors.ipfire/en/ERR_SECURE_CONNECT_FAIL
rename config/proxy/errors.ipfire/{English => en}/ERR_SHUTTING_DOWN (100%)
rename config/proxy/errors.ipfire/{English => en}/ERR_SOCKET_FAILURE (100%)
rename config/proxy/errors.ipfire/{English => en}/ERR_TOO_BIG (100%)
create mode 100644 config/proxy/errors.ipfire/en/ERR_UNSUP_HTTPVERSION
rename config/proxy/errors.ipfire/{English => en}/ERR_UNSUP_REQ (100%)
rename config/proxy/errors.ipfire/{English => en}/ERR_URN_RESOLVE (100%)
rename config/proxy/errors.ipfire/{English => en}/ERR_WRITE_ERROR (100%)
rename config/proxy/errors.ipfire/{English => en}/ERR_ZERO_SIZE_OBJECT (100%)
create mode 100644 config/rootfiles/common/attr
create mode 120000 config/rootfiles/core/test/filelists/attr
create mode 120000 config/rootfiles/core/test/filelists/findutils
create mode 120000 config/rootfiles/core/test/filelists/libcap
copy config/rootfiles/{oldcore/32 => core/test}/filelists/squid (100%)
create mode 100644 config/rootfiles/packages/linux-pae
delete mode 100644 doc/packages-list.txt
create mode 100644 lfs/attr
create mode 100644 lfs/linux-pae
create mode 100644 src/paks/linux-pae/install.sh
create mode 100644 src/paks/linux-pae/uninstall.sh
copy src/paks/{linux-xen => linux-pae}/update.sh (100%)
Difference in files:
diff --git a/.gitignore b/.gitignore
index 64dbb37..ed6c767 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
/cache
/ccache
/doc/ChangeLog
+/doc/packages-list.txt
/log
/packages
/tmp
diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae
new file mode 100644
index 0000000..c00cf8a
--- /dev/null
+++ b/config/kernel/kernel.config.i586-ipfire-pae
@@ -0,0 +1,3953 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.32.24
+# Tue Oct 12 18:22:33 2010
+#
+# CONFIG_64BIT is not set
+CONFIG_X86_32=y
+# CONFIG_X86_64 is not set
+CONFIG_X86=y
+CONFIG_OUTPUT_FORMAT="elf32-i386"
+CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+CONFIG_CLOCKSOURCE_WATCHDOG=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_HAVE_LATENCYTOP_SUPPORT=y
+CONFIG_MMU=y
+CONFIG_ZONE_DMA=y
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_GENERIC_IOMAP=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+# CONFIG_GENERIC_TIME_VSYSCALL is not set
+CONFIG_ARCH_HAS_CPU_RELAX=y
+CONFIG_ARCH_HAS_DEFAULT_IDLE=y
+CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
+CONFIG_HAVE_SETUP_PER_CPU_AREA=y
+CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
+CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
+# CONFIG_HAVE_CPUMASK_OF_CPU_MAP is not set
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+# CONFIG_ZONE_DMA32 is not set
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+# CONFIG_AUDIT_ARCH is not set
+CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+CONFIG_HAVE_INTEL_TXT=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_PENDING_IRQ=y
+CONFIG_USE_GENERIC_SMP_HELPERS=y
+CONFIG_X86_32_SMP=y
+CONFIG_X86_HT=y
+CONFIG_X86_TRAMPOLINE=y
+CONFIG_X86_32_LAZY_GS=y
+CONFIG_KTIME_SCALAR=y
+CONFIG_ARCH_CPU_PROBE_RELEASE=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+CONFIG_CONSTRUCTORS=y
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_LOCK_KERNEL=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_BZIP2=y
+CONFIG_HAVE_KERNEL_LZMA=y
+# CONFIG_KERNEL_GZIP is not set
+# CONFIG_KERNEL_BZIP2 is not set
+CONFIG_KERNEL_LZMA=y
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+CONFIG_AUDIT=y
+CONFIG_AUDITSYSCALL=y
+CONFIG_AUDIT_TREE=y
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_RCU=y
+# CONFIG_TREE_PREEMPT_RCU is not set
+# CONFIG_RCU_TRACE is not set
+CONFIG_RCU_FANOUT=32
+# CONFIG_RCU_FANOUT_EXACT is not set
+# CONFIG_TREE_RCU_TRACE is not set
+# CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=17
+CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
+# CONFIG_GROUP_SCHED is not set
+# CONFIG_CGROUPS is not set
+CONFIG_SYSFS_DEPRECATED=y
+CONFIG_SYSFS_DEPRECATED_V2=y
+# CONFIG_RELAY is not set
+CONFIG_NAMESPACES=y
+# CONFIG_UTS_NS is not set
+# CONFIG_IPC_NS is not set
+# CONFIG_USER_NS is not set
+# CONFIG_PID_NS is not set
+# CONFIG_NET_NS is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+CONFIG_RD_BZIP2=y
+CONFIG_RD_LZMA=y
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+CONFIG_ANON_INODES=y
+# CONFIG_EMBEDDED is not set
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_PCSPKR_PLATFORM=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+CONFIG_HAVE_PERF_EVENTS=y
+
+#
+# Kernel Performance Events And Counters
+#
+# CONFIG_PERF_EVENTS is not set
+# CONFIG_PERF_COUNTERS is not set
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_PCI_QUIRKS=y
+CONFIG_SLUB_DEBUG=y
+# CONFIG_COMPAT_BRK is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+# CONFIG_SLOB is not set
+# CONFIG_PROFILING is not set
+CONFIG_HAVE_OPROFILE=y
+# CONFIG_KPROBES is not set
+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_HAVE_IOREMAP_PROT=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_HAVE_DMA_API_DEBUG=y
+
+#
+# GCOV-based kernel profiling
+#
+CONFIG_SLOW_WORK=y
+CONFIG_HAVE_GENERIC_DMA_COHERENT=y
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_STOP_MACHINE=y
+CONFIG_BLOCK=y
+CONFIG_LBDAF=y
+# CONFIG_BLK_DEV_BSG is not set
+# CONFIG_BLK_DEV_INTEGRITY is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_DEFAULT_AS is not set
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_PREEMPT_NOTIFIERS=y
+CONFIG_FREEZER=y
+
+#
+# Processor type and features
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_SMP=y
+CONFIG_SPARSE_IRQ=y
+CONFIG_X86_MPPARSE=y
+# CONFIG_X86_BIGSMP is not set
+CONFIG_X86_EXTENDED_PLATFORM=y
+# CONFIG_X86_ELAN is not set
+# CONFIG_X86_MRST is not set
+# CONFIG_X86_RDC321X is not set
+# CONFIG_X86_32_NON_STANDARD is not set
+CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
+CONFIG_SCHED_OMIT_FRAME_POINTER=y
+CONFIG_PARAVIRT_GUEST=y
+CONFIG_XEN=y
+CONFIG_XEN_MAX_DOMAIN_MEMORY=8
+CONFIG_XEN_SAVE_RESTORE=y
+CONFIG_VMI=y
+CONFIG_KVM_CLOCK=y
+CONFIG_KVM_GUEST=y
+CONFIG_LGUEST_GUEST=y
+CONFIG_PARAVIRT=y
+CONFIG_PARAVIRT_SPINLOCKS=y
+CONFIG_PARAVIRT_CLOCK=y
+# CONFIG_MEMTEST is not set
+# CONFIG_M386 is not set
+# CONFIG_M486 is not set
+# CONFIG_M586 is not set
+CONFIG_M586TSC=y
+# CONFIG_M586MMX is not set
+# CONFIG_M686 is not set
+# CONFIG_MPENTIUMII is not set
+# CONFIG_MPENTIUMIII is not set
+# CONFIG_MPENTIUMM is not set
+# CONFIG_MPENTIUM4 is not set
+# CONFIG_MK6 is not set
+# CONFIG_MK7 is not set
+# CONFIG_MK8 is not set
+# CONFIG_MCRUSOE is not set
+# CONFIG_MEFFICEON is not set
+# CONFIG_MWINCHIPC6 is not set
+# CONFIG_MWINCHIP3D is not set
+# CONFIG_MGEODEGX1 is not set
+# CONFIG_MGEODE_LX is not set
+# CONFIG_MCYRIXIII is not set
+# CONFIG_MVIAC3_2 is not set
+# CONFIG_MVIAC7 is not set
+# CONFIG_MPSC is not set
+# CONFIG_MCORE2 is not set
+# CONFIG_MATOM is not set
+# CONFIG_GENERIC_CPU is not set
+CONFIG_X86_GENERIC=y
+CONFIG_X86_CPU=y
+CONFIG_X86_L1_CACHE_BYTES=64
+CONFIG_X86_INTERNODE_CACHE_BYTES=64
+CONFIG_X86_CMPXCHG=y
+CONFIG_X86_L1_CACHE_SHIFT=5
+CONFIG_X86_XADD=y
+CONFIG_X86_PPRO_FENCE=y
+CONFIG_X86_F00F_BUG=y
+CONFIG_X86_WP_WORKS_OK=y
+CONFIG_X86_INVLPG=y
+CONFIG_X86_BSWAP=y
+CONFIG_X86_POPAD_OK=y
+CONFIG_X86_ALIGNMENT_16=y
+CONFIG_X86_INTEL_USERCOPY=y
+CONFIG_X86_TSC=y
+CONFIG_X86_CMPXCHG64=y
+CONFIG_X86_MINIMUM_CPU_FAMILY=5
+CONFIG_CPU_SUP_INTEL=y
+CONFIG_CPU_SUP_CYRIX_32=y
+CONFIG_CPU_SUP_AMD=y
+CONFIG_CPU_SUP_CENTAUR=y
+CONFIG_CPU_SUP_TRANSMETA_32=y
+CONFIG_CPU_SUP_UMC_32=y
+CONFIG_HPET_TIMER=y
+CONFIG_HPET_EMULATE_RTC=y
+CONFIG_DMI=y
+# CONFIG_IOMMU_HELPER is not set
+CONFIG_IOMMU_API=y
+CONFIG_NR_CPUS=8
+CONFIG_SCHED_SMT=y
+CONFIG_SCHED_MC=y
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+CONFIG_X86_LOCAL_APIC=y
+CONFIG_X86_IO_APIC=y
+CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
+CONFIG_X86_MCE=y
+CONFIG_X86_MCE_INTEL=y
+CONFIG_X86_MCE_AMD=y
+CONFIG_X86_ANCIENT_MCE=y
+CONFIG_X86_MCE_THRESHOLD=y
+CONFIG_X86_MCE_INJECT=m
+CONFIG_X86_THERMAL_VECTOR=y
+CONFIG_VM86=y
+CONFIG_TOSHIBA=m
+CONFIG_I8K=m
+CONFIG_X86_REBOOTFIXUPS=y
+CONFIG_MICROCODE=m
+CONFIG_MICROCODE_INTEL=y
+CONFIG_MICROCODE_AMD=y
+CONFIG_MICROCODE_OLD_INTERFACE=y
+CONFIG_X86_MSR=m
+CONFIG_X86_CPUID=y
+# CONFIG_NOHIGHMEM is not set
+# CONFIG_HIGHMEM4G is not set
+CONFIG_HIGHMEM64G=y
+CONFIG_PAGE_OFFSET=0xC0000000
+CONFIG_HIGHMEM=y
+CONFIG_X86_PAE=y
+CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ILLEGAL_POINTER_VALUE=0
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_SPARSEMEM_STATIC=y
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_PHYS_ADDR_T_64BIT=y
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+CONFIG_HAVE_MLOCK=y
+CONFIG_HAVE_MLOCKED_PAGE_BIT=y
+CONFIG_MMU_NOTIFIER=y
+# CONFIG_KSM is not set
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
+# CONFIG_MEMORY_FAILURE is not set
+# CONFIG_HIGHPTE is not set
+# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
+CONFIG_X86_RESERVE_LOW_64K=y
+CONFIG_MATH_EMULATION=y
+CONFIG_MTRR=y
+# CONFIG_MTRR_SANITIZER is not set
+# CONFIG_X86_PAT is not set
+# CONFIG_EFI is not set
+CONFIG_SECCOMP=y
+# CONFIG_CC_STACKPROTECTOR is not set
+CONFIG_HZ_100=y
+# CONFIG_HZ_250 is not set
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=100
+CONFIG_SCHED_HRTICK=y
+# CONFIG_KEXEC is not set
+# CONFIG_CRASH_DUMP is not set
+CONFIG_PHYSICAL_START=0x1000000
+# CONFIG_RELOCATABLE is not set
+CONFIG_PHYSICAL_ALIGN=0x100000
+CONFIG_HOTPLUG_CPU=y
+CONFIG_COMPAT_VDSO=y
+# CONFIG_CMDLINE_BOOL is not set
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+
+#
+# Power management and ACPI options
+#
+CONFIG_PM=y
+# CONFIG_PM_DEBUG is not set
+CONFIG_PM_SLEEP_SMP=y
+CONFIG_PM_SLEEP=y
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+# CONFIG_HIBERNATION is not set
+# CONFIG_PM_RUNTIME is not set
+CONFIG_ACPI=y
+CONFIG_ACPI_SLEEP=y
+# CONFIG_ACPI_PROCFS is not set
+CONFIG_ACPI_PROCFS_POWER=y
+CONFIG_ACPI_POWER_METER=m
+CONFIG_ACPI_SYSFS_POWER=y
+CONFIG_ACPI_PROC_EVENT=y
+CONFIG_ACPI_AC=m
+CONFIG_ACPI_BATTERY=m
+CONFIG_ACPI_BUTTON=m
+CONFIG_ACPI_VIDEO=m
+CONFIG_ACPI_FAN=m
+CONFIG_ACPI_DOCK=y
+CONFIG_ACPI_PROCESSOR=m
+CONFIG_ACPI_HOTPLUG_CPU=y
+CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
+CONFIG_ACPI_THERMAL=m
+CONFIG_ACPI_CUSTOM_DSDT_FILE=""
+# CONFIG_ACPI_CUSTOM_DSDT is not set
+CONFIG_ACPI_BLACKLIST_YEAR=0
+# CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_PCI_SLOT=m
+CONFIG_X86_PM_TIMER=y
+CONFIG_ACPI_CONTAINER=m
+CONFIG_ACPI_SBS=m
+# CONFIG_SFI is not set
+CONFIG_X86_APM_BOOT=y
+CONFIG_APM=m
+CONFIG_APM_IGNORE_USER_SUSPEND=y
+# CONFIG_APM_DO_ENABLE is not set
+CONFIG_APM_CPU_IDLE=y
+# CONFIG_APM_DISPLAY_BLANK is not set
+# CONFIG_APM_ALLOW_INTS is not set
+
+#
+# CPU Frequency scaling
+#
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_TABLE=y
+# CONFIG_CPU_FREQ_DEBUG is not set
+CONFIG_CPU_FREQ_STAT=y
+CONFIG_CPU_FREQ_STAT_DETAILS=y
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=m
+CONFIG_CPU_FREQ_GOV_USERSPACE=m
+CONFIG_CPU_FREQ_GOV_ONDEMAND=m
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
+
+#
+# CPUFreq processor drivers
+#
+CONFIG_X86_ACPI_CPUFREQ=m
+CONFIG_X86_POWERNOW_K6=m
+CONFIG_X86_POWERNOW_K7=m
+CONFIG_X86_POWERNOW_K7_ACPI=y
+CONFIG_X86_POWERNOW_K8=m
+CONFIG_X86_GX_SUSPMOD=m
+CONFIG_X86_SPEEDSTEP_CENTRINO=m
+CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y
+CONFIG_X86_SPEEDSTEP_ICH=m
+CONFIG_X86_SPEEDSTEP_SMI=m
+CONFIG_X86_P4_CLOCKMOD=m
+CONFIG_X86_CPUFREQ_NFORCE2=m
+CONFIG_X86_LONGRUN=m
+CONFIG_X86_LONGHAUL=m
+CONFIG_X86_E_POWERSAVER=m
+
+#
+# shared options
+#
+CONFIG_X86_SPEEDSTEP_LIB=m
+# CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK is not set
+CONFIG_CPU_IDLE=y
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_IDLE_GOV_MENU=y
+
+#
+# Bus options (PCI etc.)
+#
+CONFIG_PCI=y
+# CONFIG_PCI_GOBIOS is not set
+# CONFIG_PCI_GOMMCONFIG is not set
+# CONFIG_PCI_GODIRECT is not set
+# CONFIG_PCI_GOOLPC is not set
+CONFIG_PCI_GOANY=y
+CONFIG_PCI_BIOS=y
+CONFIG_PCI_DIRECT=y
+CONFIG_PCI_MMCONFIG=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_DMAR=y
+CONFIG_DMAR_DEFAULT_ON=y
+CONFIG_DMAR_FLOPPY_WA=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_PCIEAER=y
+# CONFIG_PCIE_ECRC is not set
+# CONFIG_PCIEAER_INJECT is not set
+# CONFIG_PCIEASPM is not set
+CONFIG_ARCH_SUPPORTS_MSI=y
+CONFIG_PCI_MSI=y
+CONFIG_PCI_LEGACY=y
+CONFIG_PCI_STUB=m
+CONFIG_HT_IRQ=y
+CONFIG_PCI_IOV=y
+CONFIG_ISA_DMA_API=y
+CONFIG_ISA=y
+CONFIG_EISA=y
+CONFIG_EISA_VLB_PRIMING=y
+CONFIG_EISA_PCI_EISA=y
+CONFIG_EISA_VIRTUAL_ROOT=y
+CONFIG_EISA_NAMES=y
+CONFIG_MCA=y
+CONFIG_MCA_LEGACY=y
+# CONFIG_MCA_PROC_FS is not set
+CONFIG_SCx200=m
+CONFIG_SCx200HR_TIMER=m
+# CONFIG_OLPC is not set
+CONFIG_K8_NB=y
+CONFIG_PCCARD=m
+# CONFIG_PCMCIA_DEBUG is not set
+CONFIG_PCMCIA=m
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_PCMCIA_IOCTL=y
+CONFIG_CARDBUS=y
+
+#
+# PC-card bridges
+#
+CONFIG_YENTA=m
+CONFIG_YENTA_O2=y
+CONFIG_YENTA_RICOH=y
+CONFIG_YENTA_TI=y
+CONFIG_YENTA_ENE_TUNE=y
+CONFIG_YENTA_TOSHIBA=y
+CONFIG_PD6729=m
+CONFIG_I82092=m
+CONFIG_I82365=m
+CONFIG_TCIC=m
+CONFIG_PCMCIA_PROBE=y
+CONFIG_PCCARD_NONSTATIC=m
+# CONFIG_HOTPLUG_PCI is not set
+
+#
+# Executable file formats / Emulations
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_HAVE_AOUT=y
+# CONFIG_BINFMT_AOUT is not set
+# CONFIG_BINFMT_MISC is not set
+CONFIG_HAVE_ATOMIC_IOMAP=y
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_PACKET_MMAP=y
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+CONFIG_XFRM_USER=m
+# CONFIG_XFRM_SUB_POLICY is not set
+CONFIG_XFRM_MIGRATE=y
+CONFIG_XFRM_STATISTICS=y
+CONFIG_XFRM_IPCOMP=m
+CONFIG_NET_KEY=m
+CONFIG_NET_KEY_MIGRATE=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_ASK_IP_FIB_HASH=y
+# CONFIG_IP_FIB_TRIE is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+# CONFIG_IP_PNP is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+CONFIG_ARPD=y
+CONFIG_SYN_COOKIES=y
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_XFRM_TUNNEL=m
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
+CONFIG_INET_LRO=y
+CONFIG_INET_DIAG=m
+CONFIG_INET_TCP_DIAG=m
+CONFIG_TCP_CONG_ADVANCED=y
+CONFIG_TCP_CONG_BIC=m
+CONFIG_TCP_CONG_CUBIC=m
+CONFIG_TCP_CONG_WESTWOOD=m
+CONFIG_TCP_CONG_HTCP=m
+CONFIG_TCP_CONG_HSTCP=m
+CONFIG_TCP_CONG_HYBLA=m
+CONFIG_TCP_CONG_VEGAS=m
+CONFIG_TCP_CONG_SCALABLE=m
+CONFIG_TCP_CONG_LP=m
+CONFIG_TCP_CONG_VENO=m
+CONFIG_TCP_CONG_YEAH=m
+CONFIG_TCP_CONG_ILLINOIS=m
+# CONFIG_DEFAULT_BIC is not set
+# CONFIG_DEFAULT_CUBIC is not set
+# CONFIG_DEFAULT_HTCP is not set
+# CONFIG_DEFAULT_VEGAS is not set
+# CONFIG_DEFAULT_WESTWOOD is not set
+CONFIG_DEFAULT_RENO=y
+CONFIG_DEFAULT_TCP_CONG="reno"
+# CONFIG_TCP_MD5SIG is not set
+# CONFIG_IPV6 is not set
+# CONFIG_NETWORK_SECMARK is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=y
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CT_ACCT=y
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CT_PROTO_DCCP=m
+CONFIG_NF_CT_PROTO_GRE=m
+CONFIG_NF_CT_PROTO_SCTP=m
+CONFIG_NF_CT_PROTO_UDPLITE=m
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NETFILTER_TPROXY=m
+CONFIG_NETFILTER_XTABLES=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HL=m
+CONFIG_NETFILTER_XT_TARGET_LED=m
+CONFIG_NETFILTER_XT_TARGET_IMQ=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_RATEEST=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_HL=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT=y
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_LAYER7=m
+# CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG is not set
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
+# CONFIG_IP_VS is not set
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_NF_CONNTRACK_IPV4=m
+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
+CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PROTO_DCCP=m
+CONFIG_NF_NAT_PROTO_GRE=m
+CONFIG_NF_NAT_PROTO_UDPLITE=m
+CONFIG_NF_NAT_PROTO_SCTP=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_H323=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+CONFIG_IP_NF_MATCH_IPP2P=m
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_ULOG=m
+CONFIG_BRIDGE_EBT_NFLOG=m
+# CONFIG_IP_DCCP is not set
+# CONFIG_IP_SCTP is not set
+CONFIG_RDS=m
+CONFIG_RDS_TCP=m
+# CONFIG_RDS_DEBUG is not set
+# CONFIG_TIPC is not set
+CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
+CONFIG_ATM_CLIP_NO_ICMP=y
+# CONFIG_ATM_LANE is not set
+CONFIG_ATM_BR2684=m
+# CONFIG_ATM_BR2684_IPFILTER is not set
+CONFIG_STP=m
+CONFIG_GARP=m
+CONFIG_BRIDGE=m
+CONFIG_NET_DSA=y
+CONFIG_NET_DSA_TAG_DSA=y
+CONFIG_NET_DSA_TAG_EDSA=y
+CONFIG_NET_DSA_TAG_TRAILER=y
+CONFIG_NET_DSA_MV88E6XXX=y
+CONFIG_NET_DSA_MV88E6060=y
+CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y
+CONFIG_NET_DSA_MV88E6131=y
+CONFIG_NET_DSA_MV88E6123_61_65=y
+CONFIG_VLAN_8021Q=m
+CONFIG_VLAN_8021Q_GVRP=y
+# CONFIG_DECNET is not set
+CONFIG_LLC=m
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+CONFIG_PHONET=m
+CONFIG_IEEE802154=m
+CONFIG_NET_SCHED=y
+
+#
+# Queueing/Scheduling
+#
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_ATM=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_MULTIQ=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_DSMARK=m
+CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_DRR=m
+CONFIG_NET_SCH_INGRESS=m
+
+#
+# Classification
+#
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_ROUTE=y
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+CONFIG_CLS_U32_PERF=y
+CONFIG_CLS_U32_MARK=y
+CONFIG_NET_CLS_RSVP=m
+# CONFIG_NET_CLS_RSVP6 is not set
+CONFIG_NET_CLS_FLOW=m
+CONFIG_NET_EMATCH=y
+CONFIG_NET_EMATCH_STACK=32
+CONFIG_NET_EMATCH_CMP=m
+CONFIG_NET_EMATCH_NBYTE=m
+CONFIG_NET_EMATCH_U32=m
+CONFIG_NET_EMATCH_META=m
+CONFIG_NET_EMATCH_TEXT=m
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=m
+CONFIG_NET_ACT_GACT=m
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_NAT=m
+CONFIG_NET_ACT_PEDIT=m
+# CONFIG_NET_ACT_SIMP is not set
+CONFIG_NET_ACT_SKBEDIT=m
+CONFIG_NET_CLS_IND=y
+CONFIG_NET_SCH_FIFO=y
+# CONFIG_DCB is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_CAN is not set
+CONFIG_IRDA=m
+
+#
+# IrDA protocols
+#
+CONFIG_IRLAN=m
+CONFIG_IRNET=m
+CONFIG_IRCOMM=m
+# CONFIG_IRDA_ULTRA is not set
+
+#
+# IrDA options
+#
+# CONFIG_IRDA_CACHE_LAST_LSAP is not set
+# CONFIG_IRDA_FAST_RR is not set
+# CONFIG_IRDA_DEBUG is not set
+
+#
+# Infrared-port device drivers
+#
+
+#
+# SIR device drivers
+#
+CONFIG_IRTTY_SIR=m
+
+#
+# Dongle support
+#
+# CONFIG_DONGLE is not set
+CONFIG_KINGSUN_DONGLE=m
+CONFIG_KSDAZZLE_DONGLE=m
+CONFIG_KS959_DONGLE=m
+
+#
+# FIR device drivers
+#
+CONFIG_USB_IRDA=m
+CONFIG_SIGMATEL_FIR=m
+CONFIG_NSC_FIR=m
+CONFIG_WINBOND_FIR=m
+CONFIG_TOSHIBA_FIR=m
+CONFIG_SMC_IRCC_FIR=m
+CONFIG_ALI_FIR=m
+CONFIG_VLSI_FIR=m
+CONFIG_VIA_FIR=m
+CONFIG_MCS_FIR=m
+CONFIG_BT=m
+CONFIG_BT_L2CAP=m
+CONFIG_BT_SCO=m
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_CMTP=m
+CONFIG_BT_HIDP=m
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_HCIBTUSB=m
+CONFIG_BT_HCIBTSDIO=m
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIUART_LL=y
+CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBPA10X=m
+CONFIG_BT_HCIBFUSB=m
+CONFIG_BT_HCIDTL1=m
+CONFIG_BT_HCIBT3C=m
+CONFIG_BT_HCIBLUECARD=m
+CONFIG_BT_HCIBTUART=m
+CONFIG_BT_HCIVHCI=m
+CONFIG_BT_MRVL=m
+CONFIG_BT_MRVL_SDIO=m
+CONFIG_AF_RXRPC=m
+# CONFIG_AF_RXRPC_DEBUG is not set
+CONFIG_RXKAD=m
+CONFIG_FIB_RULES=y
+CONFIG_WIRELESS=y
+CONFIG_CFG80211=m
+# CONFIG_NL80211_TESTMODE is not set
+# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
+# CONFIG_CFG80211_REG_DEBUG is not set
+# CONFIG_CFG80211_DEFAULT_PS is not set
+CONFIG_CFG80211_DEFAULT_PS_VALUE=0
+CONFIG_WIRELESS_OLD_REGULATORY=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_WIRELESS_EXT_SYSFS=y
+CONFIG_LIB80211=m
+CONFIG_LIB80211_CRYPT_WEP=m
+CONFIG_LIB80211_CRYPT_CCMP=m
+CONFIG_LIB80211_CRYPT_TKIP=m
+# CONFIG_LIB80211_DEBUG is not set
+CONFIG_MAC80211=m
+CONFIG_MAC80211_HAS_RC=y
+CONFIG_MAC80211_RC_MINSTREL=y
+# CONFIG_MAC80211_RC_DEFAULT_PID is not set
+CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT="minstrel"
+CONFIG_MAC80211_MESH=y
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUG_MENU is not set
+CONFIG_WIMAX=m
+CONFIG_WIMAX_DEBUG_LEVEL=8
+CONFIG_RFKILL=m
+CONFIG_RFKILL_LEDS=y
+CONFIG_RFKILL_INPUT=y
+# CONFIG_NET_9P is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+# CONFIG_DEVTMPFS is not set
+# CONFIG_STANDALONE is not set
+# CONFIG_PREVENT_FIRMWARE_BUILD is not set
+CONFIG_FW_LOADER=y
+# CONFIG_FIRMWARE_IN_KERNEL is not set
+CONFIG_EXTRA_FIRMWARE=""
+CONFIG_SYS_HYPERVISOR=y
+CONFIG_CONNECTOR=m
+CONFIG_MTD=m
+# CONFIG_MTD_DEBUG is not set
+CONFIG_MTD_TESTS=m
+CONFIG_MTD_CONCAT=m
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+CONFIG_MTD_AR7_PARTS=m
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=m
+CONFIG_MTD_BLKDEVS=m
+CONFIG_MTD_BLOCK=m
+# CONFIG_MTD_BLOCK_RO is not set
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+# CONFIG_MTD_OOPS is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+# CONFIG_MTD_CFI is not set
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+CONFIG_MTD_PHYSMAP=m
+# CONFIG_MTD_PHYSMAP_COMPAT is not set
+# CONFIG_MTD_TS5500 is not set
+# CONFIG_MTD_INTEL_VR_NOR is not set
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+# CONFIG_MTD_NAND is not set
+# CONFIG_MTD_ONENAND is not set
+
+#
+# LPDDR flash memory drivers
+#
+CONFIG_MTD_LPDDR=m
+CONFIG_MTD_QINFO_PROBE=m
+
+#
+# UBI - Unsorted block images
+#
+CONFIG_MTD_UBI=m
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI_BEB_RESERVE=1
+# CONFIG_MTD_UBI_GLUEBI is not set
+
+#
+# UBI debugging options
+#
+# CONFIG_MTD_UBI_DEBUG is not set
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+CONFIG_PARPORT_SERIAL=m
+CONFIG_PARPORT_PC_FIFO=y
+CONFIG_PARPORT_PC_SUPERIO=y
+CONFIG_PARPORT_PC_PCMCIA=m
+# CONFIG_PARPORT_GSC is not set
+CONFIG_PARPORT_AX88796=m
+CONFIG_PARPORT_1284=y
+CONFIG_PARPORT_NOT_PC=y
+CONFIG_PNP=y
+# CONFIG_PNP_DEBUG_MESSAGES is not set
+
+#
+# Protocols
+#
+CONFIG_ISAPNP=y
+CONFIG_PNPBIOS=y
+CONFIG_PNPBIOS_PROC_FS=y
+CONFIG_PNPACPI=y
+CONFIG_BLK_DEV=y
+CONFIG_BLK_DEV_FD=m
+# CONFIG_BLK_DEV_XD is not set
+# CONFIG_PARIDE is not set
+CONFIG_BLK_CPQ_DA=m
+CONFIG_BLK_CPQ_CISS_DA=m
+# CONFIG_CISS_SCSI_TAPE is not set
+CONFIG_BLK_DEV_DAC960=m
+# CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_CRYPTOLOOP=m
+CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_OSD=m
+CONFIG_BLK_DEV_SX8=m
+# CONFIG_BLK_DEV_UB is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=8
+CONFIG_BLK_DEV_RAM_SIZE=16384
+# CONFIG_BLK_DEV_XIP is not set
+# CONFIG_CDROM_PKTCDVD is not set
+CONFIG_ATA_OVER_ETH=m
+CONFIG_XEN_BLKDEV_FRONTEND=y
+CONFIG_VIRTIO_BLK=m
+# CONFIG_BLK_DEV_HD is not set
+CONFIG_MISC_DEVICES=y
+# CONFIG_IBM_ASM is not set
+# CONFIG_PHANTOM is not set
+# CONFIG_SGI_IOC4 is not set
+CONFIG_TIFM_CORE=m
+CONFIG_TIFM_7XX1=m
+CONFIG_ICS932S401=m
+CONFIG_ENCLOSURE_SERVICES=m
+CONFIG_HP_ILO=m
+CONFIG_ISL29003=m
+CONFIG_C2PORT=m
+CONFIG_C2PORT_DURAMAR_2150=m
+
+#
+# EEPROM support
+#
+CONFIG_EEPROM_AT24=m
+CONFIG_EEPROM_LEGACY=m
+CONFIG_EEPROM_MAX6875=m
+CONFIG_EEPROM_93CX6=m
+CONFIG_CB710_CORE=m
+# CONFIG_CB710_DEBUG is not set
+CONFIG_CB710_DEBUG_ASSUMPTIONS=y
+CONFIG_HAVE_IDE=y
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+CONFIG_RAID_ATTRS=y
+CONFIG_SCSI=m
+CONFIG_SCSI_DMA=y
+# CONFIG_SCSI_TGT is not set
+CONFIG_SCSI_NETLINK=y
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=m
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
+CONFIG_BLK_DEV_SR=m
+CONFIG_BLK_DEV_SR_VENDOR=y
+CONFIG_CHR_DEV_SG=m
+CONFIG_CHR_DEV_SCH=m
+CONFIG_SCSI_ENCLOSURE=m
+CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
+
+#
+# SCSI Transports
+#
+CONFIG_SCSI_SPI_ATTRS=m
+CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_ISCSI_ATTRS=m
+CONFIG_SCSI_SAS_ATTRS=m
+CONFIG_SCSI_SAS_LIBSAS=m
+CONFIG_SCSI_SAS_ATA=y
+CONFIG_SCSI_SAS_HOST_SMP=y
+CONFIG_SCSI_SAS_LIBSAS_DEBUG=y
+CONFIG_SCSI_SRP_ATTRS=m
+CONFIG_SCSI_LOWLEVEL=y
+CONFIG_ISCSI_TCP=m
+CONFIG_SCSI_CXGB3_ISCSI=m
+CONFIG_SCSI_BNX2_ISCSI=m
+CONFIG_BE2ISCSI=m
+CONFIG_BLK_DEV_3W_XXXX_RAID=m
+CONFIG_SCSI_3W_9XXX=m
+CONFIG_SCSI_7000FASST=m
+CONFIG_SCSI_ACARD=m
+CONFIG_SCSI_AHA152X=m
+CONFIG_SCSI_AHA1542=m
+CONFIG_SCSI_AHA1740=m
+CONFIG_SCSI_AACRAID=m
+CONFIG_SCSI_AIC7XXX=m
+CONFIG_AIC7XXX_CMDS_PER_DEVICE=253
+CONFIG_AIC7XXX_RESET_DELAY_MS=15000
+# CONFIG_AIC7XXX_BUILD_FIRMWARE is not set
+# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
+CONFIG_AIC7XXX_DEBUG_MASK=0
+# CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+CONFIG_SCSI_AIC79XX=m
+CONFIG_AIC79XX_CMDS_PER_DEVICE=32
+CONFIG_AIC79XX_RESET_DELAY_MS=15000
+# CONFIG_AIC79XX_BUILD_FIRMWARE is not set
+# CONFIG_AIC79XX_DEBUG_ENABLE is not set
+CONFIG_AIC79XX_DEBUG_MASK=0
+# CONFIG_AIC79XX_REG_PRETTY_PRINT is not set
+CONFIG_SCSI_AIC94XX=m
+# CONFIG_AIC94XX_DEBUG is not set
+CONFIG_SCSI_MVSAS=m
+CONFIG_SCSI_MVSAS_DEBUG=y
+CONFIG_SCSI_DPT_I2O=m
+CONFIG_SCSI_ADVANSYS=m
+CONFIG_SCSI_IN2000=m
+CONFIG_SCSI_ARCMSR=m
+# CONFIG_SCSI_ARCMSR_AER is not set
+CONFIG_MEGARAID_NEWGEN=y
+CONFIG_MEGARAID_MM=m
+CONFIG_MEGARAID_MAILBOX=m
+CONFIG_MEGARAID_LEGACY=m
+CONFIG_MEGARAID_SAS=m
+CONFIG_SCSI_MPT2SAS=m
+CONFIG_SCSI_MPT2SAS_MAX_SGE=128
+# CONFIG_SCSI_MPT2SAS_LOGGING is not set
+CONFIG_SCSI_HPTIOP=m
+CONFIG_SCSI_BUSLOGIC=m
+CONFIG_SCSI_FLASHPOINT=y
+CONFIG_LIBFC=m
+CONFIG_LIBFCOE=m
+CONFIG_FCOE=m
+CONFIG_FCOE_FNIC=m
+CONFIG_SCSI_DMX3191D=m
+CONFIG_SCSI_DTC3280=m
+CONFIG_SCSI_EATA=m
+CONFIG_SCSI_EATA_TAGGED_QUEUE=y
+CONFIG_SCSI_EATA_LINKED_COMMANDS=y
+CONFIG_SCSI_EATA_MAX_TAGS=16
+CONFIG_SCSI_FUTURE_DOMAIN=m
+CONFIG_SCSI_FD_MCS=m
+CONFIG_SCSI_GDTH=m
+CONFIG_SCSI_GENERIC_NCR5380=m
+CONFIG_SCSI_GENERIC_NCR5380_MMIO=m
+CONFIG_SCSI_GENERIC_NCR53C400=y
+CONFIG_SCSI_IBMMCA=m
+# CONFIG_IBMMCA_SCSI_ORDER_STANDARD is not set
+# CONFIG_IBMMCA_SCSI_DEV_RESET is not set
+CONFIG_SCSI_IPS=m
+CONFIG_SCSI_INITIO=m
+CONFIG_SCSI_INIA100=m
+CONFIG_SCSI_PPA=m
+CONFIG_SCSI_IMM=m
+# CONFIG_SCSI_IZIP_EPP16 is not set
+# CONFIG_SCSI_IZIP_SLOW_CTR is not set
+CONFIG_SCSI_NCR53C406A=m
+CONFIG_SCSI_NCR_D700=m
+CONFIG_SCSI_STEX=m
+CONFIG_SCSI_SYM53C8XX_2=m
+CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
+CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
+CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
+CONFIG_SCSI_SYM53C8XX_MMIO=y
+CONFIG_SCSI_IPR=m
+CONFIG_SCSI_IPR_TRACE=y
+CONFIG_SCSI_IPR_DUMP=y
+CONFIG_SCSI_NCR_Q720=m
+CONFIG_SCSI_NCR53C8XX_DEFAULT_TAGS=8
+CONFIG_SCSI_NCR53C8XX_MAX_TAGS=32
+CONFIG_SCSI_NCR53C8XX_SYNC=20
+CONFIG_SCSI_PAS16=m
+CONFIG_SCSI_QLOGIC_FAS=m
+CONFIG_SCSI_QLOGIC_1280=m
+CONFIG_SCSI_QLA_FC=m
+CONFIG_SCSI_QLA_ISCSI=m
+CONFIG_SCSI_LPFC=m
+CONFIG_SCSI_SIM710=m
+CONFIG_SCSI_SYM53C416=m
+CONFIG_SCSI_DC395x=m
+CONFIG_SCSI_DC390T=m
+CONFIG_SCSI_T128=m
+CONFIG_SCSI_U14_34F=m
+CONFIG_SCSI_U14_34F_TAGGED_QUEUE=y
+CONFIG_SCSI_U14_34F_LINKED_COMMANDS=y
+CONFIG_SCSI_U14_34F_MAX_TAGS=8
+CONFIG_SCSI_ULTRASTOR=m
+CONFIG_SCSI_NSP32=m
+# CONFIG_SCSI_DEBUG is not set
+CONFIG_SCSI_PMCRAID=m
+# CONFIG_SCSI_SRP is not set
+CONFIG_SCSI_BFA_FC=m
+CONFIG_SCSI_LOWLEVEL_PCMCIA=y
+CONFIG_PCMCIA_AHA152X=m
+CONFIG_PCMCIA_FDOMAIN=m
+CONFIG_PCMCIA_NINJA_SCSI=m
+CONFIG_PCMCIA_QLOGIC=m
+CONFIG_PCMCIA_SYM53C500=m
+CONFIG_SCSI_DH=m
+CONFIG_SCSI_DH_RDAC=m
+CONFIG_SCSI_DH_HP_SW=m
+CONFIG_SCSI_DH_EMC=m
+CONFIG_SCSI_DH_ALUA=m
+CONFIG_SCSI_OSD_INITIATOR=m
+CONFIG_SCSI_OSD_ULD=m
+CONFIG_SCSI_OSD_DPRINT_SENSE=1
+# CONFIG_SCSI_OSD_DEBUG is not set
+CONFIG_ATA=m
+# CONFIG_ATA_NONSTANDARD is not set
+CONFIG_ATA_VERBOSE_ERROR=y
+CONFIG_ATA_ACPI=y
+CONFIG_SATA_PMP=y
+CONFIG_SATA_AHCI=m
+CONFIG_SATA_SIL24=m
+CONFIG_ATA_SFF=y
+CONFIG_SATA_SVW=m
+CONFIG_ATA_PIIX=m
+CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_PDC_ADMA=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_SX4=m
+CONFIG_SATA_SIL=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
+CONFIG_SATA_INIC162X=m
+CONFIG_PATA_ACPI=m
+CONFIG_PATA_ALI=m
+CONFIG_PATA_AMD=m
+CONFIG_PATA_ARTOP=m
+CONFIG_PATA_ATP867X=m
+CONFIG_PATA_ATIIXP=m
+CONFIG_PATA_CMD640_PCI=m
+CONFIG_PATA_CMD64X=m
+CONFIG_PATA_CS5520=m
+CONFIG_PATA_CS5530=m
+CONFIG_PATA_CS5535=m
+CONFIG_PATA_CS5536=m
+CONFIG_PATA_CYPRESS=m
+CONFIG_PATA_EFAR=m
+CONFIG_ATA_GENERIC=m
+CONFIG_PATA_HPT366=m
+CONFIG_PATA_HPT37X=m
+CONFIG_PATA_HPT3X2N=m
+CONFIG_PATA_HPT3X3=m
+CONFIG_PATA_HPT3X3_DMA=y
+CONFIG_PATA_ISAPNP=m
+CONFIG_PATA_IT821X=m
+CONFIG_PATA_IT8213=m
+CONFIG_PATA_JMICRON=m
+CONFIG_PATA_LEGACY=m
+CONFIG_PATA_TRIFLEX=m
+CONFIG_PATA_MARVELL=m
+CONFIG_PATA_MPIIX=m
+CONFIG_PATA_OLDPIIX=m
+CONFIG_PATA_NETCELL=m
+CONFIG_PATA_NINJA32=m
+CONFIG_PATA_NS87410=m
+CONFIG_PATA_NS87415=m
+CONFIG_PATA_OPTI=m
+CONFIG_PATA_OPTIDMA=m
+CONFIG_PATA_PCMCIA=m
+CONFIG_PATA_PDC_OLD=m
+CONFIG_PATA_QDI=m
+CONFIG_PATA_RADISYS=m
+CONFIG_PATA_RDC=m
+CONFIG_PATA_RZ1000=m
+CONFIG_PATA_SC1200=m
+CONFIG_PATA_SERVERWORKS=m
+CONFIG_PATA_PDC2027X=m
+CONFIG_PATA_SIL680=m
+CONFIG_PATA_SIS=m
+CONFIG_PATA_VIA=m
+CONFIG_PATA_WINBOND=m
+CONFIG_PATA_WINBOND_VLB=m
+CONFIG_PATA_SCH=m
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=m
+CONFIG_MD_LINEAR=m
+CONFIG_MD_RAID0=m
+CONFIG_MD_RAID1=m
+CONFIG_MD_RAID10=m
+CONFIG_MD_RAID456=m
+CONFIG_MULTICORE_RAID456=y
+CONFIG_MD_RAID6_PQ=m
+CONFIG_ASYNC_RAID6_TEST=m
+CONFIG_MD_MULTIPATH=m
+# CONFIG_MD_FAULTY is not set
+CONFIG_BLK_DEV_DM=m
+# CONFIG_DM_DEBUG is not set
+CONFIG_DM_CRYPT=m
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_MIRROR=m
+CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_QL=m
+CONFIG_DM_MULTIPATH_ST=m
+CONFIG_DM_DELAY=m
+CONFIG_DM_UEVENT=y
+CONFIG_FUSION=y
+CONFIG_FUSION_SPI=m
+CONFIG_FUSION_FC=m
+CONFIG_FUSION_SAS=m
+CONFIG_FUSION_MAX_SGE=128
+CONFIG_FUSION_CTL=m
+# CONFIG_FUSION_LOGGING is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+
+#
+# You can enable one or both FireWire driver stacks.
+#
+
+#
+# See the help texts for more information.
+#
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_OHCI_DEBUG=y
+CONFIG_FIREWIRE_SBP2=m
+CONFIG_FIREWIRE_NET=m
+# CONFIG_IEEE1394 is not set
+# CONFIG_I2O is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
+CONFIG_NETDEVICES=y
+CONFIG_IFB=m
+CONFIG_DUMMY=m
+CONFIG_BONDING=m
+CONFIG_MACVLAN=m
+CONFIG_EQUALIZER=m
+CONFIG_IMQ=m
+# CONFIG_IMQ_BEHAVIOR_AA is not set
+CONFIG_IMQ_BEHAVIOR_AB=y
+# CONFIG_IMQ_BEHAVIOR_BA is not set
+# CONFIG_IMQ_BEHAVIOR_BB is not set
+CONFIG_IMQ_NUM_DEVS=2
+CONFIG_TUN=m
+CONFIG_VETH=m
+CONFIG_NET_SB1000=m
+# CONFIG_ARCNET is not set
+CONFIG_PHYLIB=y
+
+#
+# MII PHY device drivers
+#
+CONFIG_MARVELL_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_CICADA_PHY=m
+CONFIG_VITESSE_PHY=m
+CONFIG_SMSC_PHY=m
+CONFIG_BROADCOM_PHY=m
+CONFIG_ICPLUS_PHY=m
+CONFIG_REALTEK_PHY=m
+CONFIG_NATIONAL_PHY=m
+CONFIG_STE10XP=m
+CONFIG_LSI_ET1011C_PHY=m
+# CONFIG_FIXED_PHY is not set
+CONFIG_MDIO_BITBANG=m
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=m
+CONFIG_HAPPYMEAL=m
+CONFIG_SUNGEM=m
+CONFIG_CASSINI=m
+CONFIG_NET_VENDOR_3COM=y
+CONFIG_EL1=m
+CONFIG_EL2=m
+CONFIG_ELPLUS=m
+CONFIG_EL16=m
+CONFIG_EL3=m
+CONFIG_3C515=m
+CONFIG_ELMC=m
+CONFIG_ELMC_II=m
+CONFIG_VORTEX=m
+CONFIG_TYPHOON=m
+CONFIG_LANCE=m
+CONFIG_NET_VENDOR_SMC=y
+CONFIG_WD80x3=m
+CONFIG_ULTRAMCA=m
+CONFIG_ULTRA=m
+CONFIG_ULTRA32=m
+CONFIG_SMC9194=m
+CONFIG_ETHOC=m
+CONFIG_NET_VENDOR_RACAL=y
+CONFIG_NI52=m
+CONFIG_NI65=m
+CONFIG_DNET=m
+CONFIG_NET_TULIP=y
+CONFIG_DE2104X=m
+CONFIG_DE2104X_DSL=0
+CONFIG_TULIP=m
+# CONFIG_TULIP_MWI is not set
+# CONFIG_TULIP_MMIO is not set
+# CONFIG_TULIP_NAPI is not set
+CONFIG_DE4X5=m
+CONFIG_WINBOND_840=m
+CONFIG_DM9102=m
+CONFIG_ULI526X=m
+CONFIG_PCMCIA_XIRCOM=m
+CONFIG_AT1700=m
+CONFIG_DEPCA=m
+CONFIG_HP100=m
+CONFIG_NET_ISA=y
+CONFIG_E2100=m
+CONFIG_EWRK3=m
+CONFIG_EEXPRESS=m
+CONFIG_EEXPRESS_PRO=m
+CONFIG_HPLAN_PLUS=m
+CONFIG_HPLAN=m
+CONFIG_LP486E=m
+CONFIG_ETH16I=m
+CONFIG_NE2000=m
+CONFIG_ZNET=m
+CONFIG_SEEQ8005=m
+CONFIG_NE2_MCA=m
+CONFIG_IBMLANA=m
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
+CONFIG_NET_PCI=y
+CONFIG_PCNET32=m
+CONFIG_AMD8111_ETH=m
+CONFIG_ADAPTEC_STARFIRE=m
+CONFIG_AC3200=m
+CONFIG_APRICOT=m
+CONFIG_B44=m
+CONFIG_B44_PCI_AUTOSELECT=y
+CONFIG_B44_PCICORE_AUTOSELECT=y
+CONFIG_B44_PCI=y
+CONFIG_FORCEDETH=m
+# CONFIG_FORCEDETH_NAPI is not set
+CONFIG_CS89x0=m
+CONFIG_E100=m
+CONFIG_LNE390=m
+CONFIG_FEALNX=m
+CONFIG_NATSEMI=m
+CONFIG_NE2K_PCI=m
+CONFIG_NE3210=m
+CONFIG_ES3210=m
+CONFIG_8139CP=m
+CONFIG_8139TOO=m
+# CONFIG_8139TOO_PIO is not set
+CONFIG_8139TOO_TUNE_TWISTER=y
+CONFIG_8139TOO_8129=y
+# CONFIG_8139_OLD_RX_RESET is not set
+CONFIG_R6040=m
+CONFIG_SIS900=m
+CONFIG_EPIC100=m
+CONFIG_SMSC9420=m
+CONFIG_SUNDANCE=m
+CONFIG_SUNDANCE_MMIO=y
+CONFIG_TLAN=m
+CONFIG_KS8842=m
+CONFIG_KS8851_MLL=m
+CONFIG_VIA_RHINE=m
+CONFIG_VIA_RHINE_MMIO=y
+CONFIG_SC92031=m
+CONFIG_NET_POCKET=y
+CONFIG_ATP=m
+CONFIG_DE600=m
+CONFIG_DE620=m
+CONFIG_ATL2=m
+CONFIG_NETDEV_1000=y
+CONFIG_ACENIC=m
+# CONFIG_ACENIC_OMIT_TIGON_I is not set
+CONFIG_DL2K=m
+CONFIG_E1000=m
+CONFIG_E1000E=m
+CONFIG_IP1000=m
+CONFIG_IGB=m
+CONFIG_IGB_DCA=y
+CONFIG_IGBVF=m
+CONFIG_NS83820=m
+CONFIG_HAMACHI=m
+CONFIG_YELLOWFIN=m
+CONFIG_R8169=m
+CONFIG_R8169_VLAN=y
+CONFIG_SIS190=m
+CONFIG_SKGE=m
+CONFIG_SKY2=m
+CONFIG_VIA_VELOCITY=m
+CONFIG_TIGON3=m
+CONFIG_BNX2=m
+CONFIG_CNIC=m
+CONFIG_QLA3XXX=m
+CONFIG_ATL1=m
+CONFIG_ATL1E=m
+CONFIG_ATL1C=m
+CONFIG_JME=m
+CONFIG_NETDEV_10000=y
+CONFIG_MDIO=m
+CONFIG_CHELSIO_T1=m
+CONFIG_CHELSIO_T1_1G=y
+CONFIG_CHELSIO_T3_DEPENDS=y
+CONFIG_CHELSIO_T3=m
+CONFIG_ENIC=m
+CONFIG_IXGBE=m
+CONFIG_IXGBE_DCA=y
+CONFIG_IXGB=m
+CONFIG_S2IO=m
+CONFIG_VXGE=m
+# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
+CONFIG_MYRI10GE=m
+CONFIG_MYRI10GE_DCA=y
+CONFIG_NETXEN_NIC=m
+CONFIG_NIU=m
+CONFIG_MLX4_EN=m
+CONFIG_MLX4_CORE=m
+CONFIG_MLX4_DEBUG=y
+CONFIG_TEHUTI=m
+CONFIG_BNX2X=m
+CONFIG_QLGE=m
+CONFIG_SFC=m
+CONFIG_SFC_MTD=y
+CONFIG_BE2NET=m
+# CONFIG_TR is not set
+CONFIG_WLAN=y
+# CONFIG_WLAN_PRE80211 is not set
+CONFIG_WLAN_80211=y
+CONFIG_PCMCIA_RAYCS=m
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_USB=m
+CONFIG_LIBERTAS_CS=m
+CONFIG_LIBERTAS_SDIO=m
+# CONFIG_LIBERTAS_DEBUG is not set
+CONFIG_LIBERTAS_THINFIRM=m
+CONFIG_LIBERTAS_THINFIRM_USB=m
+CONFIG_AIRO=m
+CONFIG_ATMEL=m
+CONFIG_PCI_ATMEL=m
+CONFIG_PCMCIA_ATMEL=m
+CONFIG_AT76C50X_USB=m
+CONFIG_AIRO_CS=m
+CONFIG_PCMCIA_WL3501=m
+CONFIG_PRISM54=m
+CONFIG_USB_ZD1201=m
+CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_RTL8180=m
+CONFIG_RTL8187=m
+CONFIG_RTL8187_LEDS=y
+CONFIG_ADM8211=m
+# CONFIG_MAC80211_HWSIM is not set
+CONFIG_MWL8K=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+CONFIG_P54_LEDS=y
+CONFIG_ATH_COMMON=m
+CONFIG_ATH5K=m
+# CONFIG_ATH5K_DEBUG is not set
+CONFIG_ATH9K=m
+# CONFIG_ATH9K_DEBUG is not set
+CONFIG_AR9170_USB=m
+CONFIG_AR9170_LEDS=y
+CONFIG_IPW2100=m
+# CONFIG_IPW2100_MONITOR is not set
+# CONFIG_IPW2100_DEBUG is not set
+CONFIG_IPW2200=m
+# CONFIG_IPW2200_MONITOR is not set
+# CONFIG_IPW2200_QOS is not set
+# CONFIG_IPW2200_DEBUG is not set
+CONFIG_LIBIPW=m
+# CONFIG_LIBIPW_DEBUG is not set
+CONFIG_IWLWIFI=m
+# CONFIG_IWLWIFI_LEDS is not set
+# CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT is not set
+# CONFIG_IWLWIFI_DEBUG is not set
+CONFIG_IWLAGN=m
+CONFIG_IWL4965=y
+CONFIG_IWL5000=y
+CONFIG_IWL3945=m
+# CONFIG_IWL3945_SPECTRUM_MEASUREMENT is not set
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
+CONFIG_HOSTAP_PLX=m
+CONFIG_HOSTAP_PCI=m
+CONFIG_HOSTAP_CS=m
+CONFIG_B43=m
+CONFIG_B43_PCI_AUTOSELECT=y
+CONFIG_B43_PCICORE_AUTOSELECT=y
+CONFIG_B43_PCMCIA=y
+CONFIG_B43_SDIO=y
+CONFIG_B43_PIO=y
+CONFIG_B43_PHY_LP=y
+CONFIG_B43_LEDS=y
+CONFIG_B43_HWRNG=y
+# CONFIG_B43_DEBUG is not set
+CONFIG_B43LEGACY=m
+CONFIG_B43LEGACY_PCI_AUTOSELECT=y
+CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
+CONFIG_B43LEGACY_LEDS=y
+CONFIG_B43LEGACY_HWRNG=y
+CONFIG_B43LEGACY_DEBUG=y
+CONFIG_B43LEGACY_DMA=y
+CONFIG_B43LEGACY_PIO=y
+CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
+# CONFIG_B43LEGACY_DMA_MODE is not set
+# CONFIG_B43LEGACY_PIO_MODE is not set
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_RT2X00=m
+CONFIG_RT2400PCI=m
+CONFIG_RT2500PCI=m
+CONFIG_RT61PCI=m
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+CONFIG_RT2X00_LIB_PCI=m
+CONFIG_RT2X00_LIB_USB=m
+CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_HT=y
+CONFIG_RT2X00_LIB_FIRMWARE=y
+CONFIG_RT2X00_LIB_CRYPTO=y
+CONFIG_RT2X00_LIB_LEDS=y
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_HERMES=m
+CONFIG_HERMES_CACHE_FW_ON_INIT=y
+CONFIG_PLX_HERMES=m
+CONFIG_TMD_HERMES=m
+CONFIG_NORTEL_HERMES=m
+CONFIG_PCI_HERMES=m
+CONFIG_PCMCIA_HERMES=m
+CONFIG_PCMCIA_SPECTRUM=m
+CONFIG_WL12XX=m
+CONFIG_WL1251=m
+CONFIG_WL1251_SDIO=m
+CONFIG_IWM=m
+
+#
+# WiMAX Wireless Broadband devices
+#
+CONFIG_WIMAX_I2400M=m
+CONFIG_WIMAX_I2400M_USB=m
+CONFIG_WIMAX_I2400M_SDIO=m
+CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
+
+#
+# USB Network Adapters
+#
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_CDCETHER=m
+CONFIG_USB_NET_CDC_EEM=m
+CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SMSC95XX=m
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_NET1080=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_MCS7830=m
+CONFIG_USB_NET_RNDIS_HOST=m
+CONFIG_USB_NET_CDC_SUBSET=m
+CONFIG_USB_ALI_M5632=y
+CONFIG_USB_AN2720=y
+CONFIG_USB_BELKIN=y
+CONFIG_USB_ARMLINUX=y
+CONFIG_USB_EPSON2888=y
+CONFIG_USB_KC2190=y
+CONFIG_USB_NET_ZAURUS=m
+CONFIG_USB_HSO=m
+CONFIG_USB_NET_INT51X1=m
+CONFIG_USB_CDC_PHONET=m
+CONFIG_NET_PCMCIA=y
+CONFIG_PCMCIA_3C589=m
+CONFIG_PCMCIA_3C574=m
+CONFIG_PCMCIA_FMVJ18X=m
+CONFIG_PCMCIA_PCNET=m
+CONFIG_PCMCIA_NMCLAN=m
+CONFIG_PCMCIA_SMC91C92=m
+CONFIG_PCMCIA_XIRC2PS=m
+CONFIG_PCMCIA_AXNET=m
+CONFIG_WAN=y
+CONFIG_HOSTESS_SV11=m
+CONFIG_COSA=m
+CONFIG_LANMEDIA=m
+CONFIG_SEALEVEL_4021=m
+CONFIG_HDLC=m
+CONFIG_HDLC_RAW=m
+CONFIG_HDLC_RAW_ETH=m
+CONFIG_HDLC_CISCO=m
+CONFIG_HDLC_FR=m
+CONFIG_HDLC_PPP=m
+
+#
+# X.25/LAPB support is disabled
+#
+CONFIG_PCI200SYN=m
+CONFIG_WANXL=m
+# CONFIG_WANXL_BUILD_FIRMWARE is not set
+CONFIG_PC300TOO=m
+CONFIG_N2=m
+CONFIG_C101=m
+CONFIG_FARSYNC=m
+CONFIG_DSCC4=m
+CONFIG_DSCC4_PCISYNC=y
+CONFIG_DSCC4_PCI_RST=y
+CONFIG_DLCI=m
+CONFIG_DLCI_MAX=8
+CONFIG_SDLA=m
+CONFIG_SBNI=m
+CONFIG_SBNI_MULTILINE=y
+CONFIG_ATM_DRIVERS=y
+# CONFIG_ATM_DUMMY is not set
+CONFIG_ATM_TCP=m
+CONFIG_ATM_LANAI=m
+CONFIG_ATM_ENI=m
+CONFIG_ATM_ENI_DEBUG=y
+CONFIG_ATM_ENI_TUNE_BURST=y
+CONFIG_ATM_ENI_BURST_TX_16W=y
+CONFIG_ATM_ENI_BURST_TX_8W=y
+CONFIG_ATM_ENI_BURST_TX_4W=y
+CONFIG_ATM_ENI_BURST_TX_2W=y
+CONFIG_ATM_ENI_BURST_RX_16W=y
+CONFIG_ATM_ENI_BURST_RX_8W=y
+CONFIG_ATM_ENI_BURST_RX_4W=y
+CONFIG_ATM_ENI_BURST_RX_2W=y
+CONFIG_ATM_FIRESTREAM=m
+CONFIG_ATM_ZATM=m
+# CONFIG_ATM_ZATM_DEBUG is not set
+CONFIG_ATM_NICSTAR=m
+CONFIG_ATM_NICSTAR_USE_SUNI=y
+CONFIG_ATM_NICSTAR_USE_IDT77105=y
+CONFIG_ATM_IDT77252=m
+# CONFIG_ATM_IDT77252_DEBUG is not set
+# CONFIG_ATM_IDT77252_RCV_ALL is not set
+CONFIG_ATM_IDT77252_USE_SUNI=y
+CONFIG_ATM_AMBASSADOR=m
+# CONFIG_ATM_AMBASSADOR_DEBUG is not set
+CONFIG_ATM_HORIZON=m
+# CONFIG_ATM_HORIZON_DEBUG is not set
+CONFIG_ATM_IA=m
+# CONFIG_ATM_IA_DEBUG is not set
+CONFIG_ATM_FORE200E=m
+CONFIG_ATM_FORE200E_USE_TASKLET=y
+CONFIG_ATM_FORE200E_TX_RETRY=16
+CONFIG_ATM_FORE200E_DEBUG=0
+CONFIG_ATM_HE=m
+CONFIG_ATM_HE_USE_SUNI=y
+CONFIG_ATM_SOLOS=m
+CONFIG_IEEE802154_DRIVERS=m
+CONFIG_IEEE802154_FAKEHARD=m
+CONFIG_XEN_NETDEV_FRONTEND=m
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_PLIP is not set
+CONFIG_PPP=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_MPPE=m
+CONFIG_PPPOE=m
+CONFIG_PPPOATM=m
+CONFIG_PPPOL2TP=m
+CONFIG_SLIP=m
+CONFIG_SLIP_COMPRESSED=y
+CONFIG_SLHC=m
+CONFIG_SLIP_SMART=y
+CONFIG_SLIP_MODE_SLIP6=y
+# CONFIG_NET_FC is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+CONFIG_VIRTIO_NET=m
+CONFIG_VMXNET3=m
+CONFIG_ISDN=y
+CONFIG_ISDN_I4L=m
+CONFIG_MISDN=m
+CONFIG_MISDN_DSP=m
+CONFIG_MISDN_L1OIP=m
+
+#
+# mISDN hardware drivers
+#
+CONFIG_MISDN_HFCPCI=m
+CONFIG_MISDN_HFCMULTI=m
+CONFIG_MISDN_HFCUSB=m
+CONFIG_MISDN_AVMFRITZ=m
+CONFIG_MISDN_SPEEDFAX=m
+CONFIG_MISDN_INFINEON=m
+CONFIG_MISDN_W6692=m
+CONFIG_MISDN_NETJET=m
+CONFIG_MISDN_IPAC=m
+CONFIG_MISDN_ISAR=m
+CONFIG_ISDN_PPP=y
+CONFIG_ISDN_PPP_VJ=y
+CONFIG_ISDN_MPP=y
+CONFIG_IPPP_FILTER=y
+CONFIG_ISDN_PPP_BSDCOMP=m
+CONFIG_ISDN_AUDIO=y
+CONFIG_ISDN_TTY_FAX=y
+
+#
+# ISDN feature submodules
+#
+CONFIG_ISDN_DIVERSION=m
+
+#
+# ISDN4Linux hardware drivers
+#
+
+#
+# Passive cards
+#
+CONFIG_ISDN_DRV_HISAX=m
+
+#
+# D-channel protocol features
+#
+CONFIG_HISAX_EURO=y
+CONFIG_DE_AOC=y
+# CONFIG_HISAX_NO_SENDCOMPLETE is not set
+# CONFIG_HISAX_NO_LLC is not set
+# CONFIG_HISAX_NO_KEYPAD is not set
+CONFIG_HISAX_1TR6=y
+CONFIG_HISAX_NI1=y
+CONFIG_HISAX_MAX_CARDS=8
+
+#
+# HiSax supported cards
+#
+CONFIG_HISAX_16_0=y
+CONFIG_HISAX_16_3=y
+CONFIG_HISAX_TELESPCI=y
+CONFIG_HISAX_S0BOX=y
+CONFIG_HISAX_AVM_A1=y
+CONFIG_HISAX_FRITZPCI=y
+CONFIG_HISAX_AVM_A1_PCMCIA=y
+CONFIG_HISAX_ELSA=y
+CONFIG_HISAX_IX1MICROR2=y
+CONFIG_HISAX_DIEHLDIVA=y
+CONFIG_HISAX_ASUSCOM=y
+CONFIG_HISAX_TELEINT=y
+CONFIG_HISAX_HFCS=y
+CONFIG_HISAX_SEDLBAUER=y
+CONFIG_HISAX_SPORTSTER=y
+CONFIG_HISAX_MIC=y
+CONFIG_HISAX_NETJET=y
+CONFIG_HISAX_NETJET_U=y
+CONFIG_HISAX_NICCY=y
+CONFIG_HISAX_ISURF=y
+CONFIG_HISAX_HSTSAPHIR=y
+CONFIG_HISAX_BKM_A4T=y
+CONFIG_HISAX_SCT_QUADRO=y
+CONFIG_HISAX_GAZEL=y
+CONFIG_HISAX_HFC_PCI=y
+CONFIG_HISAX_W6692=y
+CONFIG_HISAX_HFC_SX=y
+CONFIG_HISAX_ENTERNOW_PCI=y
+CONFIG_HISAX_DEBUG=y
+
+#
+# HiSax PCMCIA card service modules
+#
+CONFIG_HISAX_SEDLBAUER_CS=m
+CONFIG_HISAX_ELSA_CS=m
+CONFIG_HISAX_AVM_A1_CS=m
+CONFIG_HISAX_TELES_CS=m
+
+#
+# HiSax sub driver modules
+#
+CONFIG_HISAX_ST5481=m
+CONFIG_HISAX_HFCUSB=m
+CONFIG_HISAX_HFC4S8S=m
+CONFIG_HISAX_FRITZ_PCIPNP=m
+
+#
+# Active cards
+#
+CONFIG_ISDN_DRV_ICN=m
+CONFIG_ISDN_DRV_PCBIT=m
+CONFIG_ISDN_DRV_SC=m
+CONFIG_ISDN_DRV_ACT2000=m
+CONFIG_HYSDN=m
+CONFIG_HYSDN_CAPI=y
+CONFIG_ISDN_HDLC=m
+CONFIG_ISDN_CAPI=m
+CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
+CONFIG_CAPI_TRACE=y
+CONFIG_ISDN_CAPI_MIDDLEWARE=y
+CONFIG_ISDN_CAPI_CAPI20=m
+CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
+CONFIG_ISDN_CAPI_CAPIFS=m
+CONFIG_ISDN_CAPI_CAPIDRV=m
+
+#
+# CAPI hardware drivers
+#
+CONFIG_CAPI_AVM=y
+CONFIG_ISDN_DRV_AVMB1_B1ISA=m
+CONFIG_ISDN_DRV_AVMB1_B1PCI=m
+CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
+CONFIG_ISDN_DRV_AVMB1_T1ISA=m
+CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
+CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
+CONFIG_ISDN_DRV_AVMB1_T1PCI=m
+CONFIG_ISDN_DRV_AVMB1_C4=m
+CONFIG_CAPI_EICON=y
+CONFIG_ISDN_DIVAS=m
+CONFIG_ISDN_DIVAS_BRIPCI=y
+CONFIG_ISDN_DIVAS_PRIPCI=y
+CONFIG_ISDN_DIVAS_DIVACAPI=m
+CONFIG_ISDN_DIVAS_USERIDI=m
+CONFIG_ISDN_DIVAS_MAINT=m
+CONFIG_ISDN_DRV_GIGASET=m
+CONFIG_GIGASET_BASE=m
+CONFIG_GIGASET_M105=m
+CONFIG_GIGASET_M101=m
+# CONFIG_GIGASET_DEBUG is not set
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+CONFIG_INPUT_FF_MEMLESS=m
+CONFIG_INPUT_POLLDEV=m
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+CONFIG_XEN_KBDDEV_FRONTEND=m
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ADP5588=m
+CONFIG_KEYBOARD_ATKBD=y
+CONFIG_QT2160=m
+CONFIG_KEYBOARD_LKKBD=m
+CONFIG_KEYBOARD_LM8323=m
+CONFIG_KEYBOARD_MAX7359=m
+CONFIG_KEYBOARD_NEWTON=m
+CONFIG_KEYBOARD_OPENCORES=m
+CONFIG_KEYBOARD_STOWAWAY=m
+CONFIG_KEYBOARD_SUNKBD=m
+CONFIG_KEYBOARD_XTKBD=m
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_PCSPKR=m
+CONFIG_INPUT_APANEL=m
+# CONFIG_INPUT_WISTRON_BTNS is not set
+# CONFIG_INPUT_ATLAS_BTNS is not set
+CONFIG_INPUT_ATI_REMOTE=m
+CONFIG_INPUT_ATI_REMOTE2=m
+CONFIG_INPUT_KEYSPAN_REMOTE=m
+CONFIG_INPUT_POWERMATE=m
+CONFIG_INPUT_YEALINK=m
+CONFIG_INPUT_CM109=m
+# CONFIG_INPUT_UINPUT is not set
+CONFIG_INPUT_WINBOND_CIR=m
+CONFIG_INPUT_PCF50633_PMU=m
+CONFIG_INPUT_WM831X_ON=m
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_SERPORT=y
+# CONFIG_SERIO_CT82C710 is not set
+# CONFIG_SERIO_PARKBD is not set
+# CONFIG_SERIO_PCIPS2 is not set
+CONFIG_SERIO_LIBPS2=y
+# CONFIG_SERIO_RAW is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
+CONFIG_DEVKMEM=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+CONFIG_NOZOMI=m
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_PNP=y
+CONFIG_SERIAL_8250_CS=m
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_MANY_PORTS=y
+CONFIG_SERIAL_8250_FOURPORT=m
+CONFIG_SERIAL_8250_ACCENT=m
+CONFIG_SERIAL_8250_BOCA=m
+CONFIG_SERIAL_8250_EXAR_ST16C554=m
+CONFIG_SERIAL_8250_HUB6=m
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+CONFIG_SERIAL_8250_DETECT_IRQ=y
+CONFIG_SERIAL_8250_RSA=y
+# CONFIG_SERIAL_8250_MCA is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_JSM is not set
+CONFIG_UNIX98_PTYS=y
+# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
+# CONFIG_LEGACY_PTYS is not set
+CONFIG_PRINTER=m
+# CONFIG_LP_CONSOLE is not set
+CONFIG_PPDEV=m
+CONFIG_HVC_DRIVER=y
+CONFIG_HVC_IRQ=y
+CONFIG_HVC_XEN=y
+CONFIG_VIRTIO_CONSOLE=y
+CONFIG_IPMI_HANDLER=m
+CONFIG_IPMI_PANIC_EVENT=y
+# CONFIG_IPMI_PANIC_STRING is not set
+CONFIG_IPMI_DEVICE_INTERFACE=m
+CONFIG_IPMI_SI=m
+CONFIG_IPMI_WATCHDOG=m
+CONFIG_IPMI_POWEROFF=m
+CONFIG_HW_RANDOM=m
+CONFIG_HW_RANDOM_TIMERIOMEM=m
+CONFIG_HW_RANDOM_INTEL=m
+CONFIG_HW_RANDOM_AMD=m
+CONFIG_HW_RANDOM_GEODE=m
+CONFIG_HW_RANDOM_VIA=m
+CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_NVRAM=m
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+# CONFIG_SONYPI is not set
+
+#
+# PCMCIA character devices
+#
+CONFIG_SYNCLINK_CS=m
+# CONFIG_CARDMAN_4000 is not set
+# CONFIG_CARDMAN_4040 is not set
+CONFIG_IPWIRELESS=m
+CONFIG_MWAVE=m
+CONFIG_SCx200_GPIO=m
+CONFIG_PC8736x_GPIO=m
+CONFIG_NSC_GPIO=m
+CONFIG_CS5535_GPIO=m
+# CONFIG_RAW_DRIVER is not set
+CONFIG_HPET=y
+CONFIG_HPET_MMAP=y
+CONFIG_HANGCHECK_TIMER=m
+# CONFIG_TCG_TPM is not set
+# CONFIG_TELCLOCK is not set
+CONFIG_DEVPORT=y
+CONFIG_I2C=m
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_COMPAT=y
+CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_HELPER_AUTO=y
+CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALGOPCA=m
+
+#
+# I2C Hardware Bus support
+#
+
+#
+# PC SMBus host controller drivers
+#
+CONFIG_I2C_ALI1535=m
+CONFIG_I2C_ALI1563=m
+CONFIG_I2C_ALI15X3=m
+CONFIG_I2C_AMD756=m
+CONFIG_I2C_AMD756_S4882=m
+CONFIG_I2C_AMD8111=m
+CONFIG_I2C_I801=m
+CONFIG_I2C_ISCH=m
+CONFIG_I2C_PIIX4=m
+CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_NFORCE2_S4985=m
+CONFIG_I2C_SIS5595=m
+CONFIG_I2C_SIS630=m
+CONFIG_I2C_SIS96X=m
+CONFIG_I2C_VIA=m
+CONFIG_I2C_VIAPRO=m
+
+#
+# ACPI drivers
+#
+CONFIG_I2C_SCMI=m
+
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+CONFIG_I2C_OCORES=m
+CONFIG_I2C_SIMTEC=m
+
+#
+# External I2C/SMBus adapter drivers
+#
+CONFIG_I2C_PARPORT=m
+CONFIG_I2C_PARPORT_LIGHT=m
+# CONFIG_I2C_TAOS_EVM is not set
+CONFIG_I2C_TINY_USB=m
+
+#
+# Graphics adapter I2C/DDC channel drivers
+#
+CONFIG_I2C_VOODOO3=m
+
+#
+# Other I2C/SMBus bus drivers
+#
+CONFIG_I2C_PCA_ISA=m
+CONFIG_I2C_PCA_PLATFORM=m
+CONFIG_I2C_STUB=m
+# CONFIG_SCx200_I2C is not set
+CONFIG_SCx200_ACB=m
+
+#
+# Miscellaneous I2C Chip support
+#
+CONFIG_DS1682=m
+CONFIG_SENSORS_TSL2550=m
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CHIP is not set
+# CONFIG_SPI is not set
+
+#
+# PPS support
+#
+CONFIG_PPS=m
+# CONFIG_PPS_DEBUG is not set
+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
+# CONFIG_GPIOLIB is not set
+CONFIG_W1=m
+CONFIG_W1_CON=y
+
+#
+# 1-wire Bus Masters
+#
+CONFIG_W1_MASTER_MATROX=m
+CONFIG_W1_MASTER_DS2490=m
+CONFIG_W1_MASTER_DS2482=m
+
+#
+# 1-wire Slaves
+#
+CONFIG_W1_SLAVE_THERM=m
+CONFIG_W1_SLAVE_SMEM=m
+CONFIG_W1_SLAVE_DS2431=m
+CONFIG_W1_SLAVE_DS2433=m
+CONFIG_W1_SLAVE_DS2433_CRC=y
+CONFIG_W1_SLAVE_DS2760=m
+CONFIG_W1_SLAVE_BQ27000=m
+CONFIG_POWER_SUPPLY=y
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+# CONFIG_PDA_POWER is not set
+CONFIG_WM831X_POWER=m
+CONFIG_WM8350_POWER=m
+# CONFIG_BATTERY_DS2760 is not set
+CONFIG_BATTERY_DS2782=m
+CONFIG_BATTERY_BQ27x00=m
+CONFIG_BATTERY_MAX17040=m
+CONFIG_CHARGER_PCF50633=m
+CONFIG_HWMON=m
+CONFIG_HWMON_VID=m
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Native drivers
+#
+CONFIG_SENSORS_ABITUGURU=m
+CONFIG_SENSORS_ABITUGURU3=m
+CONFIG_SENSORS_AD7414=m
+CONFIG_SENSORS_AD7418=m
+CONFIG_SENSORS_ADM1021=m
+CONFIG_SENSORS_ADM1025=m
+CONFIG_SENSORS_ADM1026=m
+CONFIG_SENSORS_ADM1029=m
+CONFIG_SENSORS_ADM1031=m
+CONFIG_SENSORS_ADM9240=m
+CONFIG_SENSORS_ADT7462=m
+CONFIG_SENSORS_ADT7470=m
+CONFIG_SENSORS_ADT7473=m
+CONFIG_SENSORS_ADT7475=m
+CONFIG_SENSORS_K8TEMP=m
+CONFIG_SENSORS_ASB100=m
+CONFIG_SENSORS_ATXP1=m
+CONFIG_SENSORS_DS1621=m
+CONFIG_SENSORS_I5K_AMB=m
+CONFIG_SENSORS_F71805F=m
+CONFIG_SENSORS_F71882FG=m
+CONFIG_SENSORS_F75375S=m
+CONFIG_SENSORS_FSCHMD=m
+CONFIG_SENSORS_G760A=m
+CONFIG_SENSORS_GL518SM=m
+CONFIG_SENSORS_GL520SM=m
+CONFIG_SENSORS_CORETEMP=m
+CONFIG_SENSORS_IBMAEM=m
+CONFIG_SENSORS_IBMPEX=m
+CONFIG_SENSORS_IT87=m
+CONFIG_SENSORS_LM63=m
+CONFIG_SENSORS_LM75=m
+CONFIG_SENSORS_LM77=m
+CONFIG_SENSORS_LM78=m
+CONFIG_SENSORS_LM80=m
+CONFIG_SENSORS_LM83=m
+CONFIG_SENSORS_LM85=m
+CONFIG_SENSORS_LM87=m
+CONFIG_SENSORS_LM90=m
+CONFIG_SENSORS_LM92=m
+CONFIG_SENSORS_LM93=m
+CONFIG_SENSORS_LTC4215=m
+CONFIG_SENSORS_LTC4245=m
+CONFIG_SENSORS_LM95241=m
+CONFIG_SENSORS_MAX1619=m
+CONFIG_SENSORS_MAX6650=m
+CONFIG_SENSORS_PC87360=m
+CONFIG_SENSORS_PC87427=m
+CONFIG_SENSORS_PCF8591=m
+CONFIG_SENSORS_SIS5595=m
+CONFIG_SENSORS_DME1737=m
+CONFIG_SENSORS_SMSC47M1=m
+CONFIG_SENSORS_SMSC47M192=m
+CONFIG_SENSORS_SMSC47B397=m
+CONFIG_SENSORS_ADS7828=m
+CONFIG_SENSORS_THMC50=m
+CONFIG_SENSORS_TMP401=m
+CONFIG_SENSORS_TMP421=m
+CONFIG_SENSORS_VIA686A=m
+CONFIG_SENSORS_VT1211=m
+CONFIG_SENSORS_VT8231=m
+CONFIG_SENSORS_W83781D=m
+CONFIG_SENSORS_W83791D=m
+CONFIG_SENSORS_W83792D=m
+CONFIG_SENSORS_W83793=m
+CONFIG_SENSORS_W83L785TS=m
+CONFIG_SENSORS_W83L786NG=m
+CONFIG_SENSORS_W83627HF=m
+CONFIG_SENSORS_W83627EHF=m
+CONFIG_SENSORS_WM831X=m
+CONFIG_SENSORS_WM8350=m
+CONFIG_SENSORS_HDAPS=m
+CONFIG_SENSORS_APPLESMC=m
+
+#
+# ACPI drivers
+#
+CONFIG_SENSORS_ATK0110=m
+CONFIG_SENSORS_LIS3LV02D=m
+CONFIG_THERMAL=y
+CONFIG_WATCHDOG=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+
+#
+# Watchdog Device Drivers
+#
+CONFIG_SOFT_WATCHDOG=m
+CONFIG_WM831X_WATCHDOG=m
+CONFIG_WM8350_WATCHDOG=m
+CONFIG_ACQUIRE_WDT=m
+CONFIG_ADVANTECH_WDT=m
+CONFIG_ALIM1535_WDT=m
+CONFIG_ALIM7101_WDT=m
+CONFIG_SC520_WDT=m
+CONFIG_SBC_FITPC2_WATCHDOG=m
+CONFIG_EUROTECH_WDT=m
+CONFIG_IB700_WDT=m
+CONFIG_IBMASR=m
+CONFIG_WAFER_WDT=m
+CONFIG_I6300ESB_WDT=m
+CONFIG_ITCO_WDT=m
+# CONFIG_ITCO_VENDOR_SUPPORT is not set
+CONFIG_IT8712F_WDT=m
+CONFIG_IT87_WDT=m
+CONFIG_HP_WATCHDOG=m
+CONFIG_SC1200_WDT=m
+CONFIG_SCx200_WDT=m
+CONFIG_PC87413_WDT=m
+CONFIG_60XX_WDT=m
+CONFIG_SBC8360_WDT=m
+CONFIG_SBC7240_WDT=m
+CONFIG_CPU5_WDT=m
+CONFIG_SMSC_SCH311X_WDT=m
+CONFIG_SMSC37B787_WDT=m
+CONFIG_W83627HF_WDT=m
+CONFIG_W83697HF_WDT=m
+CONFIG_W83697UG_WDT=m
+CONFIG_W83877F_WDT=m
+CONFIG_W83977F_WDT=m
+CONFIG_MACHZ_WDT=m
+CONFIG_SBC_EPX_C3_WATCHDOG=m
+
+#
+# ISA-based Watchdog Cards
+#
+# CONFIG_PCWATCHDOG is not set
+# CONFIG_MIXCOMWD is not set
+# CONFIG_WDT is not set
+
+#
+# PCI-based Watchdog Cards
+#
+CONFIG_PCIPCWATCHDOG=m
+CONFIG_WDTPCI=m
+
+#
+# USB-based Watchdog Cards
+#
+CONFIG_USBPCWATCHDOG=m
+CONFIG_SSB_POSSIBLE=y
+
+#
+# Sonics Silicon Backplane
+#
+CONFIG_SSB=m
+CONFIG_SSB_SPROM=y
+CONFIG_SSB_BLOCKIO=y
+CONFIG_SSB_PCIHOST_POSSIBLE=y
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_B43_PCI_BRIDGE=y
+CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
+CONFIG_SSB_PCMCIAHOST=y
+CONFIG_SSB_SDIOHOST_POSSIBLE=y
+CONFIG_SSB_SDIOHOST=y
+# CONFIG_SSB_DEBUG is not set
+CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
+CONFIG_SSB_DRIVER_PCICORE=y
+
+#
+# Multifunction device drivers
+#
+CONFIG_MFD_CORE=m
+CONFIG_MFD_SM501=m
+CONFIG_HTC_PASIC3=m
+# CONFIG_MFD_TMIO is not set
+CONFIG_MFD_WM8400=m
+CONFIG_MFD_WM831X=m
+CONFIG_MFD_WM8350=m
+CONFIG_MFD_WM8350_I2C=m
+CONFIG_MFD_PCF50633=m
+CONFIG_PCF50633_ADC=m
+CONFIG_PCF50633_GPIO=m
+CONFIG_AB3100_CORE=m
+CONFIG_AB3100_OTP=m
+# CONFIG_REGULATOR is not set
+CONFIG_MEDIA_SUPPORT=m
+
+#
+# Multimedia core support
+#
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_V4L2_COMMON=m
+# CONFIG_VIDEO_ALLOW_V4L1 is not set
+CONFIG_VIDEO_V4L1_COMPAT=y
+CONFIG_DVB_CORE=m
+CONFIG_VIDEO_MEDIA=m
+
+#
+# Multimedia drivers
+#
+# CONFIG_MEDIA_ATTACH is not set
+CONFIG_MEDIA_TUNER=m
+# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_VIDEO_V4L2=m
+CONFIG_VIDEO_CAPTURE_DRIVERS=y
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
+
+#
+# Encoders/decoders and other helper chips
+#
+
+#
+# Audio decoders
+#
+# CONFIG_VIDEO_TVAUDIO is not set
+# CONFIG_VIDEO_TDA7432 is not set
+# CONFIG_VIDEO_TDA9840 is not set
+# CONFIG_VIDEO_TDA9875 is not set
+# CONFIG_VIDEO_TEA6415C is not set
+# CONFIG_VIDEO_TEA6420 is not set
+# CONFIG_VIDEO_MSP3400 is not set
+# CONFIG_VIDEO_CS5345 is not set
+# CONFIG_VIDEO_CS53L32A is not set
+# CONFIG_VIDEO_M52790 is not set
+# CONFIG_VIDEO_TLV320AIC23B is not set
+# CONFIG_VIDEO_WM8775 is not set
+# CONFIG_VIDEO_WM8739 is not set
+# CONFIG_VIDEO_VP27SMPX is not set
+
+#
+# RDS decoders
+#
+# CONFIG_VIDEO_SAA6588 is not set
+
+#
+# Video decoders
+#
+# CONFIG_VIDEO_ADV7180 is not set
+# CONFIG_VIDEO_BT819 is not set
+# CONFIG_VIDEO_BT856 is not set
+# CONFIG_VIDEO_BT866 is not set
+# CONFIG_VIDEO_KS0127 is not set
+# CONFIG_VIDEO_OV7670 is not set
+# CONFIG_VIDEO_MT9V011 is not set
+# CONFIG_VIDEO_TCM825X is not set
+# CONFIG_VIDEO_SAA7110 is not set
+# CONFIG_VIDEO_SAA711X is not set
+# CONFIG_VIDEO_SAA717X is not set
+# CONFIG_VIDEO_TVP514X is not set
+# CONFIG_VIDEO_TVP5150 is not set
+# CONFIG_VIDEO_VPX3220 is not set
+
+#
+# Video and audio decoders
+#
+# CONFIG_VIDEO_CX25840 is not set
+
+#
+# MPEG video encoders
+#
+# CONFIG_VIDEO_CX2341X is not set
+
+#
+# Video encoders
+#
+# CONFIG_VIDEO_SAA7127 is not set
+# CONFIG_VIDEO_SAA7185 is not set
+# CONFIG_VIDEO_ADV7170 is not set
+# CONFIG_VIDEO_ADV7175 is not set
+# CONFIG_VIDEO_THS7303 is not set
+# CONFIG_VIDEO_ADV7343 is not set
+
+#
+# Video improvement chips
+#
+# CONFIG_VIDEO_UPD64031A is not set
+# CONFIG_VIDEO_UPD64083 is not set
+# CONFIG_VIDEO_VIVI is not set
+# CONFIG_VIDEO_BT848 is not set
+# CONFIG_VIDEO_SAA5246A is not set
+# CONFIG_VIDEO_SAA5249 is not set
+# CONFIG_VIDEO_ZORAN is not set
+# CONFIG_VIDEO_SAA7134 is not set
+# CONFIG_VIDEO_HEXIUM_ORION is not set
+# CONFIG_VIDEO_HEXIUM_GEMINI is not set
+# CONFIG_VIDEO_CX88 is not set
+# CONFIG_VIDEO_CX23885 is not set
+# CONFIG_VIDEO_AU0828 is not set
+# CONFIG_VIDEO_IVTV is not set
+# CONFIG_VIDEO_CX18 is not set
+# CONFIG_VIDEO_SAA7164 is not set
+# CONFIG_VIDEO_CAFE_CCIC is not set
+# CONFIG_SOC_CAMERA is not set
+CONFIG_V4L_USB_DRIVERS=y
+# CONFIG_USB_VIDEO_CLASS is not set
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
+# CONFIG_USB_GSPCA is not set
+# CONFIG_VIDEO_PVRUSB2 is not set
+# CONFIG_VIDEO_HDPVR is not set
+# CONFIG_VIDEO_EM28XX is not set
+# CONFIG_VIDEO_CX231XX is not set
+# CONFIG_VIDEO_USBVISION is not set
+# CONFIG_USB_ET61X251 is not set
+# CONFIG_USB_SN9C102 is not set
+# CONFIG_USB_ZC0301 is not set
+# CONFIG_USB_PWC_INPUT_EVDEV is not set
+# CONFIG_USB_ZR364XX is not set
+# CONFIG_USB_STKWEBCAM is not set
+# CONFIG_USB_S2255 is not set
+CONFIG_RADIO_ADAPTERS=y
+# CONFIG_RADIO_CADET is not set
+# CONFIG_RADIO_RTRACK is not set
+# CONFIG_RADIO_RTRACK2 is not set
+# CONFIG_RADIO_AZTECH is not set
+# CONFIG_RADIO_GEMTEK is not set
+# CONFIG_RADIO_GEMTEK_PCI is not set
+# CONFIG_RADIO_MAXIRADIO is not set
+# CONFIG_RADIO_MAESTRO is not set
+# CONFIG_RADIO_SF16FMI is not set
+# CONFIG_RADIO_SF16FMR2 is not set
+# CONFIG_RADIO_TERRATEC is not set
+# CONFIG_RADIO_TRUST is not set
+# CONFIG_RADIO_TYPHOON is not set
+# CONFIG_RADIO_ZOLTRIX is not set
+# CONFIG_I2C_SI4713 is not set
+# CONFIG_RADIO_SI4713 is not set
+# CONFIG_USB_DSBR is not set
+# CONFIG_RADIO_SI470X is not set
+# CONFIG_USB_MR800 is not set
+# CONFIG_RADIO_TEA5764 is not set
+CONFIG_DVB_MAX_ADAPTERS=8
+# CONFIG_DVB_DYNAMIC_MINORS is not set
+CONFIG_DVB_CAPTURE_DRIVERS=y
+
+#
+# Supported SAA7146 based PCI Adapters
+#
+# CONFIG_TTPCI_EEPROM is not set
+# CONFIG_DVB_AV7110 is not set
+# CONFIG_DVB_BUDGET_CORE is not set
+
+#
+# Supported USB Adapters
+#
+# CONFIG_DVB_USB is not set
+# CONFIG_DVB_TTUSB_BUDGET is not set
+# CONFIG_DVB_TTUSB_DEC is not set
+# CONFIG_SMS_SIANO_MDTV is not set
+
+#
+# Supported FlexCopII (B2C2) Adapters
+#
+# CONFIG_DVB_B2C2_FLEXCOP is not set
+
+#
+# Supported BT878 Adapters
+#
+
+#
+# Supported Pluto2 Adapters
+#
+# CONFIG_DVB_PLUTO2 is not set
+
+#
+# Supported SDMC DM1105 Adapters
+#
+# CONFIG_DVB_DM1105 is not set
+
+#
+# Supported Earthsoft PT1 Adapters
+#
+# CONFIG_DVB_PT1 is not set
+
+#
+# Supported DVB Frontends
+#
+# CONFIG_DVB_FE_CUSTOMISE is not set
+CONFIG_DAB=y
+# CONFIG_USB_DABUSB is not set
+
+#
+# Graphics support
+#
+CONFIG_AGP=m
+CONFIG_AGP_ALI=m
+CONFIG_AGP_ATI=m
+CONFIG_AGP_AMD=m
+CONFIG_AGP_AMD64=m
+CONFIG_AGP_INTEL=m
+CONFIG_AGP_NVIDIA=m
+CONFIG_AGP_SIS=m
+CONFIG_AGP_SWORKS=m
+CONFIG_AGP_VIA=m
+CONFIG_AGP_EFFICEON=m
+CONFIG_VGA_ARB=y
+CONFIG_DRM=m
+CONFIG_DRM_KMS_HELPER=m
+CONFIG_DRM_TTM=m
+CONFIG_DRM_TDFX=m
+CONFIG_DRM_R128=m
+CONFIG_DRM_RADEON=m
+CONFIG_DRM_I810=m
+CONFIG_DRM_I830=m
+CONFIG_DRM_I915=m
+CONFIG_DRM_I915_KMS=y
+CONFIG_DRM_MGA=m
+CONFIG_DRM_SIS=m
+CONFIG_DRM_VIA=m
+CONFIG_DRM_SAVAGE=m
+CONFIG_VGASTATE=m
+CONFIG_VIDEO_OUTPUT_CONTROL=m
+CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
+CONFIG_FB_DDC=m
+CONFIG_FB_BOOT_VESA_SUPPORT=y
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+CONFIG_FB_SYS_FILLRECT=m
+CONFIG_FB_SYS_COPYAREA=m
+CONFIG_FB_SYS_IMAGEBLIT=m
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+CONFIG_FB_SYS_FOPS=m
+CONFIG_FB_DEFERRED_IO=y
+CONFIG_FB_SVGALIB=m
+# CONFIG_FB_MACMODES is not set
+CONFIG_FB_BACKLIGHT=y
+CONFIG_FB_MODE_HELPERS=y
+CONFIG_FB_TILEBLITTING=y
+
+#
+# Frame buffer hardware drivers
+#
+CONFIG_FB_CIRRUS=m
+CONFIG_FB_PM2=m
+CONFIG_FB_PM2_FIFO_DISCONNECT=y
+CONFIG_FB_CYBER2000=m
+# CONFIG_FB_ARC is not set
+CONFIG_FB_ASILIANT=y
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_VGA16 is not set
+CONFIG_FB_UVESA=m
+CONFIG_FB_VESA=y
+# CONFIG_FB_N411 is not set
+# CONFIG_FB_HGA is not set
+# CONFIG_FB_S1D13XXX is not set
+CONFIG_FB_NVIDIA=m
+CONFIG_FB_NVIDIA_I2C=y
+# CONFIG_FB_NVIDIA_DEBUG is not set
+CONFIG_FB_NVIDIA_BACKLIGHT=y
+CONFIG_FB_RIVA=m
+CONFIG_FB_RIVA_I2C=y
+# CONFIG_FB_RIVA_DEBUG is not set
+CONFIG_FB_RIVA_BACKLIGHT=y
+CONFIG_FB_I810=m
+CONFIG_FB_I810_GTF=y
+CONFIG_FB_I810_I2C=y
+CONFIG_FB_LE80578=m
+CONFIG_FB_CARILLO_RANCH=m
+CONFIG_FB_MATROX=m
+CONFIG_FB_MATROX_MILLENIUM=y
+CONFIG_FB_MATROX_MYSTIQUE=y
+CONFIG_FB_MATROX_G=y
+CONFIG_FB_MATROX_I2C=m
+CONFIG_FB_MATROX_MAVEN=m
+CONFIG_FB_RADEON=m
+CONFIG_FB_RADEON_I2C=y
+CONFIG_FB_RADEON_BACKLIGHT=y
+# CONFIG_FB_RADEON_DEBUG is not set
+CONFIG_FB_ATY128=m
+CONFIG_FB_ATY128_BACKLIGHT=y
+CONFIG_FB_ATY=m
+CONFIG_FB_ATY_CT=y
+# CONFIG_FB_ATY_GENERIC_LCD is not set
+CONFIG_FB_ATY_GX=y
+CONFIG_FB_ATY_BACKLIGHT=y
+CONFIG_FB_S3=m
+CONFIG_FB_SAVAGE=m
+CONFIG_FB_SAVAGE_I2C=y
+CONFIG_FB_SAVAGE_ACCEL=y
+CONFIG_FB_SIS=m
+CONFIG_FB_SIS_300=y
+CONFIG_FB_SIS_315=y
+CONFIG_FB_VIA=m
+CONFIG_FB_NEOMAGIC=m
+CONFIG_FB_KYRO=m
+CONFIG_FB_3DFX=m
+CONFIG_FB_3DFX_ACCEL=y
+CONFIG_FB_3DFX_I2C=y
+CONFIG_FB_VOODOO1=m
+CONFIG_FB_VT8623=m
+CONFIG_FB_TRIDENT=m
+CONFIG_FB_ARK=m
+CONFIG_FB_PM3=m
+# CONFIG_FB_CARMINE is not set
+CONFIG_FB_GEODE=y
+CONFIG_FB_GEODE_LX=m
+CONFIG_FB_GEODE_GX=m
+CONFIG_FB_GEODE_GX1=m
+CONFIG_FB_TMIO=m
+CONFIG_FB_TMIO_ACCELL=y
+CONFIG_FB_SM501=m
+# CONFIG_FB_VIRTUAL is not set
+CONFIG_XEN_FBDEV_FRONTEND=m
+CONFIG_FB_METRONOME=m
+# CONFIG_FB_MB862XX is not set
+# CONFIG_FB_BROADSHEET is not set
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_LCD_CLASS_DEVICE=m
+# CONFIG_LCD_ILI9320 is not set
+CONFIG_LCD_PLATFORM=m
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_GENERIC=m
+CONFIG_BACKLIGHT_PROGEAR=m
+CONFIG_BACKLIGHT_CARILLO_RANCH=m
+CONFIG_BACKLIGHT_MBP_NVIDIA=m
+CONFIG_BACKLIGHT_SAHARA=m
+CONFIG_BACKLIGHT_WM831X=m
+
+#
+# Display device support
+#
+CONFIG_DISPLAY_SUPPORT=m
+
+#
+# Display hardware drivers
+#
+
+#
+# Console display driver support
+#
+CONFIG_VGA_CONSOLE=y
+# CONFIG_VGACON_SOFT_SCROLLBACK is not set
+# CONFIG_MDA_CONSOLE is not set
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+# CONFIG_FONTS is not set
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+CONFIG_LOGO=y
+CONFIG_LOGO_LINUX_MONO=y
+CONFIG_LOGO_LINUX_VGA16=y
+CONFIG_LOGO_LINUX_CLUT224=y
+CONFIG_SOUND=m
+CONFIG_SOUND_OSS_CORE=y
+CONFIG_SOUND_OSS_CORE_PRECLAIM=y
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DUMMY=m
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_PCM_OSS_PLUGINS=y
+CONFIG_SND_SEQUENCER_OSS=y
+# CONFIG_SND_HRTIMER is not set
+# CONFIG_SND_DYNAMIC_MINORS is not set
+# CONFIG_SND_SUPPORT_OLD_API is not set
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+CONFIG_SND_DMA_SGBUF=y
+# CONFIG_SND_RAWMIDI_SEQ is not set
+# CONFIG_SND_OPL3_LIB_SEQ is not set
+# CONFIG_SND_OPL4_LIB_SEQ is not set
+# CONFIG_SND_SBAWE_SEQ is not set
+# CONFIG_SND_EMU10K1_SEQ is not set
+CONFIG_SND_DRIVERS=y
+# CONFIG_SND_PCSP is not set
+CONFIG_SND_DUMMY=m
+# CONFIG_SND_VIRMIDI is not set
+# CONFIG_SND_MTPAV is not set
+# CONFIG_SND_MTS64 is not set
+# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_MPU401 is not set
+# CONFIG_SND_PORTMAN2X4 is not set
+CONFIG_SND_ISA=y
+# CONFIG_SND_ADLIB is not set
+# CONFIG_SND_AD1816A is not set
+# CONFIG_SND_AD1848 is not set
+# CONFIG_SND_ALS100 is not set
+# CONFIG_SND_AZT2320 is not set
+# CONFIG_SND_CMI8330 is not set
+# CONFIG_SND_CS4231 is not set
+# CONFIG_SND_CS4236 is not set
+# CONFIG_SND_DT019X is not set
+# CONFIG_SND_ES968 is not set
+# CONFIG_SND_ES1688 is not set
+# CONFIG_SND_ES18XX is not set
+# CONFIG_SND_SC6000 is not set
+# CONFIG_SND_GUSCLASSIC is not set
+# CONFIG_SND_GUSEXTREME is not set
+# CONFIG_SND_GUSMAX is not set
+# CONFIG_SND_INTERWAVE is not set
+# CONFIG_SND_INTERWAVE_STB is not set
+# CONFIG_SND_OPL3SA2 is not set
+# CONFIG_SND_OPTI92X_AD1848 is not set
+# CONFIG_SND_OPTI92X_CS4231 is not set
+# CONFIG_SND_OPTI93X is not set
+# CONFIG_SND_MIRO is not set
+# CONFIG_SND_SB8 is not set
+# CONFIG_SND_SB16 is not set
+# CONFIG_SND_SBAWE is not set
+# CONFIG_SND_SGALAXY is not set
+# CONFIG_SND_SSCAPE is not set
+# CONFIG_SND_WAVEFRONT is not set
+# CONFIG_SND_MSND_PINNACLE is not set
+# CONFIG_SND_MSND_CLASSIC is not set
+CONFIG_SND_PCI=y
+# CONFIG_SND_AD1889 is not set
+# CONFIG_SND_ALS300 is not set
+# CONFIG_SND_ALS4000 is not set
+# CONFIG_SND_ALI5451 is not set
+# CONFIG_SND_ATIIXP is not set
+# CONFIG_SND_ATIIXP_MODEM is not set
+# CONFIG_SND_AU8810 is not set
+# CONFIG_SND_AU8820 is not set
+# CONFIG_SND_AU8830 is not set
+# CONFIG_SND_AW2 is not set
+# CONFIG_SND_AZT3328 is not set
+# CONFIG_SND_BT87X is not set
+# CONFIG_SND_CA0106 is not set
+# CONFIG_SND_CMIPCI is not set
+# CONFIG_SND_OXYGEN is not set
+# CONFIG_SND_CS4281 is not set
+# CONFIG_SND_CS46XX is not set
+# CONFIG_SND_CS5530 is not set
+# CONFIG_SND_CS5535AUDIO is not set
+# CONFIG_SND_CTXFI is not set
+# CONFIG_SND_DARLA20 is not set
+# CONFIG_SND_GINA20 is not set
+# CONFIG_SND_LAYLA20 is not set
+# CONFIG_SND_DARLA24 is not set
+# CONFIG_SND_GINA24 is not set
+# CONFIG_SND_LAYLA24 is not set
+# CONFIG_SND_MONA is not set
+# CONFIG_SND_MIA is not set
+# CONFIG_SND_ECHO3G is not set
+# CONFIG_SND_INDIGO is not set
+# CONFIG_SND_INDIGOIO is not set
+# CONFIG_SND_INDIGODJ is not set
+# CONFIG_SND_INDIGOIOX is not set
+# CONFIG_SND_INDIGODJX is not set
+# CONFIG_SND_EMU10K1 is not set
+# CONFIG_SND_EMU10K1X is not set
+# CONFIG_SND_ENS1370 is not set
+# CONFIG_SND_ENS1371 is not set
+# CONFIG_SND_ES1938 is not set
+# CONFIG_SND_ES1968 is not set
+# CONFIG_SND_FM801 is not set
+# CONFIG_SND_HDA_INTEL is not set
+# CONFIG_SND_HDSP is not set
+# CONFIG_SND_HDSPM is not set
+# CONFIG_SND_HIFIER is not set
+# CONFIG_SND_ICE1712 is not set
+# CONFIG_SND_ICE1724 is not set
+# CONFIG_SND_INTEL8X0 is not set
+# CONFIG_SND_INTEL8X0M is not set
+# CONFIG_SND_KORG1212 is not set
+# CONFIG_SND_LX6464ES is not set
+# CONFIG_SND_MAESTRO3 is not set
+# CONFIG_SND_MIXART is not set
+# CONFIG_SND_NM256 is not set
+# CONFIG_SND_PCXHR is not set
+# CONFIG_SND_RIPTIDE is not set
+# CONFIG_SND_RME32 is not set
+# CONFIG_SND_RME96 is not set
+# CONFIG_SND_RME9652 is not set
+# CONFIG_SND_SIS7019 is not set
+# CONFIG_SND_SONICVIBES is not set
+# CONFIG_SND_TRIDENT is not set
+# CONFIG_SND_VIA82XX is not set
+# CONFIG_SND_VIA82XX_MODEM is not set
+# CONFIG_SND_VIRTUOSO is not set
+# CONFIG_SND_VX222 is not set
+# CONFIG_SND_YMFPCI is not set
+CONFIG_SND_USB=y
+# CONFIG_SND_USB_AUDIO is not set
+# CONFIG_SND_USB_USX2Y is not set
+# CONFIG_SND_USB_CAIAQ is not set
+# CONFIG_SND_USB_US122L is not set
+CONFIG_SND_PCMCIA=y
+# CONFIG_SND_VXPOCKET is not set
+# CONFIG_SND_PDAUDIOCF is not set
+# CONFIG_SND_SOC is not set
+# CONFIG_SOUND_PRIME is not set
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
+# CONFIG_HIDRAW is not set
+
+#
+# USB Input Devices
+#
+CONFIG_USB_HID=m
+# CONFIG_HID_PID is not set
+CONFIG_USB_HIDDEV=y
+
+#
+# Special HID drivers
+#
+CONFIG_HID_A4TECH=m
+CONFIG_HID_APPLE=m
+CONFIG_HID_BELKIN=m
+CONFIG_HID_CHERRY=m
+CONFIG_HID_CHICONY=m
+CONFIG_HID_CYPRESS=m
+CONFIG_HID_DRAGONRISE=m
+CONFIG_DRAGONRISE_FF=y
+CONFIG_HID_EZKEY=m
+CONFIG_HID_KYE=m
+CONFIG_HID_GYRATION=m
+CONFIG_HID_TWINHAN=m
+CONFIG_HID_KENSINGTON=m
+CONFIG_HID_LOGITECH=m
+CONFIG_LOGITECH_FF=y
+CONFIG_LOGIRUMBLEPAD2_FF=y
+CONFIG_HID_MICROSOFT=m
+CONFIG_HID_MONTEREY=m
+CONFIG_HID_NTRIG=m
+CONFIG_HID_PANTHERLORD=m
+CONFIG_PANTHERLORD_FF=y
+CONFIG_HID_PETALYNX=m
+CONFIG_HID_SAMSUNG=m
+CONFIG_HID_SONY=m
+CONFIG_HID_SUNPLUS=m
+CONFIG_HID_GREENASIA=m
+CONFIG_GREENASIA_FF=y
+CONFIG_HID_SMARTJOYPLUS=m
+CONFIG_SMARTJOYPLUS_FF=y
+CONFIG_HID_TOPSEED=m
+CONFIG_HID_THRUSTMASTER=m
+CONFIG_THRUSTMASTER_FF=y
+CONFIG_HID_WACOM=m
+CONFIG_HID_ZEROPLUS=m
+CONFIG_ZEROPLUS_FF=y
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARCH_HAS_EHCI=y
+CONFIG_USB=m
+# CONFIG_USB_DEBUG is not set
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+CONFIG_USB_DEVICE_CLASS=y
+CONFIG_USB_DYNAMIC_MINORS=y
+# CONFIG_USB_SUSPEND is not set
+# CONFIG_USB_OTG is not set
+# CONFIG_USB_MON is not set
+CONFIG_USB_WUSB=m
+CONFIG_USB_WUSB_CBAF=m
+# CONFIG_USB_WUSB_CBAF_DEBUG is not set
+
+#
+# USB Host Controller Drivers
+#
+# CONFIG_USB_C67X00_HCD is not set
+CONFIG_USB_XHCI_HCD=m
+# CONFIG_USB_XHCI_HCD_DEBUGGING is not set
+CONFIG_USB_EHCI_HCD=m
+# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
+# CONFIG_USB_EHCI_TT_NEWSCHED is not set
+CONFIG_USB_OXU210HP_HCD=m
+CONFIG_USB_ISP116X_HCD=m
+# CONFIG_USB_ISP1760_HCD is not set
+CONFIG_USB_ISP1362_HCD=m
+CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_OHCI_HCD_SSB=y
+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+CONFIG_USB_UHCI_HCD=m
+CONFIG_USB_U132_HCD=m
+CONFIG_USB_SL811_HCD=m
+# CONFIG_USB_SL811_CS is not set
+CONFIG_USB_R8A66597_HCD=m
+CONFIG_USB_WHCI_HCD=m
+CONFIG_USB_HWA_HCD=m
+
+#
+# Enable Host or Gadget support to see Inventra options
+#
+
+#
+# USB Device Class drivers
+#
+CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+CONFIG_USB_WDM=m
+CONFIG_USB_TMC=m
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+
+#
+# also be needed; see USB_STORAGE Help for more info
+#
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+CONFIG_USB_STORAGE_FREECOM=m
+CONFIG_USB_STORAGE_ISD200=m
+CONFIG_USB_STORAGE_USBAT=m
+CONFIG_USB_STORAGE_SDDR09=m
+CONFIG_USB_STORAGE_SDDR55=m
+CONFIG_USB_STORAGE_JUMPSHOT=m
+CONFIG_USB_STORAGE_ALAUDA=m
+CONFIG_USB_STORAGE_ONETOUCH=m
+CONFIG_USB_STORAGE_KARMA=m
+CONFIG_USB_STORAGE_CYPRESS_ATACB=m
+# CONFIG_USB_LIBUSUAL is not set
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+
+#
+# USB port drivers
+#
+CONFIG_USB_USS720=m
+CONFIG_USB_SERIAL=m
+CONFIG_USB_EZUSB=y
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_AIRCABLE=m
+CONFIG_USB_SERIAL_ARK3116=m
+CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_CH341=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_CP210X=m
+CONFIG_USB_SERIAL_CYPRESS_M8=m
+CONFIG_USB_SERIAL_EMPEG=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+# CONFIG_USB_SERIAL_FUNSOFT is not set
+# CONFIG_USB_SERIAL_VISOR is not set
+# CONFIG_USB_SERIAL_IPAQ is not set
+# CONFIG_USB_SERIAL_IR is not set
+CONFIG_USB_SERIAL_EDGEPORT=m
+# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
+CONFIG_USB_SERIAL_GARMIN=m
+CONFIG_USB_SERIAL_IPW=m
+CONFIG_USB_SERIAL_IUU=m
+# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
+# CONFIG_USB_SERIAL_KEYSPAN is not set
+# CONFIG_USB_SERIAL_KLSI is not set
+# CONFIG_USB_SERIAL_KOBIL_SCT is not set
+CONFIG_USB_SERIAL_MCT_U232=m
+CONFIG_USB_SERIAL_MOS7720=m
+CONFIG_USB_SERIAL_MOS7840=m
+CONFIG_USB_SERIAL_MOTOROLA=m
+# CONFIG_USB_SERIAL_NAVMAN is not set
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_SERIAL_OTI6858=m
+CONFIG_USB_SERIAL_QUALCOMM=m
+CONFIG_USB_SERIAL_SPCP8X5=m
+CONFIG_USB_SERIAL_HP4X=m
+CONFIG_USB_SERIAL_SAFE=m
+# CONFIG_USB_SERIAL_SAFE_PADDED is not set
+CONFIG_USB_SERIAL_SIEMENS_MPI=m
+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
+CONFIG_USB_SERIAL_SYMBOL=m
+CONFIG_USB_SERIAL_TI=m
+# CONFIG_USB_SERIAL_CYBERJACK is not set
+CONFIG_USB_SERIAL_XIRCOM=m
+CONFIG_USB_SERIAL_OPTION=m
+# CONFIG_USB_SERIAL_OMNINET is not set
+CONFIG_USB_SERIAL_OPTICON=m
+# CONFIG_USB_SERIAL_DEBUG is not set
+
+#
+# USB Miscellaneous drivers
+#
+CONFIG_USB_EMI62=m
+CONFIG_USB_EMI26=m
+# CONFIG_USB_ADUTUX is not set
+CONFIG_USB_SEVSEG=m
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+CONFIG_USB_LCD=m
+CONFIG_USB_BERRY_CHARGE=m
+CONFIG_USB_LED=m
+CONFIG_USB_CYPRESS_CY7C63=m
+CONFIG_USB_CYTHERM=m
+# CONFIG_USB_IDMOUSE is not set
+CONFIG_USB_FTDI_ELAN=m
+# CONFIG_USB_APPLEDISPLAY is not set
+CONFIG_USB_SISUSBVGA=m
+CONFIG_USB_SISUSBVGA_CON=y
+# CONFIG_USB_LD is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+CONFIG_USB_IOWARRIOR=m
+# CONFIG_USB_TEST is not set
+CONFIG_USB_ISIGHTFW=m
+CONFIG_USB_VST=m
+CONFIG_USB_ATM=m
+CONFIG_USB_SPEEDTOUCH=m
+CONFIG_USB_CXACRU=m
+CONFIG_USB_UEAGLEATM=m
+CONFIG_USB_XUSBATM=m
+# CONFIG_USB_GADGET is not set
+
+#
+# OTG and related infrastructure
+#
+CONFIG_USB_OTG_UTILS=y
+CONFIG_NOP_USB_XCEIV=m
+CONFIG_UWB=m
+CONFIG_UWB_HWA=m
+CONFIG_UWB_WHCI=m
+CONFIG_UWB_WLP=m
+CONFIG_UWB_I1480U=m
+CONFIG_UWB_I1480U_WLP=m
+CONFIG_MMC=m
+# CONFIG_MMC_DEBUG is not set
+# CONFIG_MMC_UNSAFE_RESUME is not set
+
+#
+# MMC/SD/SDIO Card Drivers
+#
+CONFIG_MMC_BLOCK=m
+CONFIG_MMC_BLOCK_BOUNCE=y
+CONFIG_SDIO_UART=m
+CONFIG_MMC_TEST=m
+
+#
+# MMC/SD/SDIO Host Controller Drivers
+#
+CONFIG_MMC_SDHCI=m
+CONFIG_MMC_SDHCI_PCI=m
+CONFIG_MMC_RICOH_MMC=m
+CONFIG_MMC_SDHCI_PLTFM=m
+CONFIG_MMC_WBSD=m
+# CONFIG_MMC_AT91 is not set
+# CONFIG_MMC_ATMELMCI is not set
+CONFIG_MMC_TIFM_SD=m
+CONFIG_MMC_SDRICOH_CS=m
+CONFIG_MMC_CB710=m
+CONFIG_MMC_VIA_SDMMC=m
+CONFIG_MEMSTICK=m
+# CONFIG_MEMSTICK_DEBUG is not set
+
+#
+# MemoryStick drivers
+#
+# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
+CONFIG_MSPRO_BLOCK=m
+
+#
+# MemoryStick Host Controller Drivers
+#
+CONFIG_MEMSTICK_TIFM_MS=m
+CONFIG_MEMSTICK_JMICRON_38X=m
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=m
+
+#
+# LED drivers
+#
+CONFIG_LEDS_NET48XX=m
+CONFIG_LEDS_WRAP=m
+CONFIG_LEDS_ALIX2=m
+CONFIG_LEDS_PCA9532=m
+CONFIG_LEDS_LP3944=m
+CONFIG_LEDS_CLEVO_MAIL=m
+CONFIG_LEDS_PCA955X=m
+CONFIG_LEDS_WM831X_STATUS=m
+CONFIG_LEDS_WM8350=m
+CONFIG_LEDS_BD2802=m
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+CONFIG_LEDS_TRIGGER_BACKLIGHT=m
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
+CONFIG_LEDS_TRIGGER_NETDEV=m
+# CONFIG_ACCESSIBILITY is not set
+# CONFIG_INFINIBAND is not set
+# CONFIG_EDAC is not set
+CONFIG_RTC_LIB=m
+CONFIG_RTC_CLASS=m
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+CONFIG_RTC_DRV_TEST=m
+
+#
+# I2C RTC drivers
+#
+CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_DS1374=m
+CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_MAX6900=m
+CONFIG_RTC_DRV_RS5C372=m
+CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_X1205=m
+CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_M41T80=m
+# CONFIG_RTC_DRV_M41T80_WDT is not set
+CONFIG_RTC_DRV_S35390A=m
+CONFIG_RTC_DRV_FM3130=m
+CONFIG_RTC_DRV_RX8581=m
+CONFIG_RTC_DRV_RX8025=m
+
+#
+# SPI RTC drivers
+#
+
+#
+# Platform RTC drivers
+#
+CONFIG_RTC_DRV_CMOS=m
+CONFIG_RTC_DRV_DS1286=m
+CONFIG_RTC_DRV_DS1511=m
+CONFIG_RTC_DRV_DS1553=m
+CONFIG_RTC_DRV_DS1742=m
+CONFIG_RTC_DRV_STK17TA8=m
+CONFIG_RTC_DRV_M48T86=m
+CONFIG_RTC_DRV_M48T35=m
+CONFIG_RTC_DRV_M48T59=m
+CONFIG_RTC_DRV_BQ4802=m
+CONFIG_RTC_DRV_V3020=m
+CONFIG_RTC_DRV_WM831X=m
+CONFIG_RTC_DRV_WM8350=m
+CONFIG_RTC_DRV_PCF50633=m
+CONFIG_RTC_DRV_AB3100=m
+
+#
+# on-CPU RTC drivers
+#
+CONFIG_DMADEVICES=y
+
+#
+# DMA Devices
+#
+CONFIG_ASYNC_TX_DISABLE_CHANNEL_SWITCH=y
+CONFIG_INTEL_IOATDMA=m
+CONFIG_DMA_ENGINE=y
+
+#
+# DMA Clients
+#
+CONFIG_NET_DMA=y
+CONFIG_ASYNC_TX_DMA=y
+CONFIG_DMATEST=m
+CONFIG_DCA=m
+# CONFIG_AUXDISPLAY is not set
+CONFIG_UIO=m
+CONFIG_UIO_CIF=m
+CONFIG_UIO_PDRV=m
+CONFIG_UIO_PDRV_GENIRQ=m
+CONFIG_UIO_SMX=m
+CONFIG_UIO_AEC=m
+CONFIG_UIO_SERCOS3=m
+CONFIG_UIO_PCI_GENERIC=m
+
+#
+# TI VLYNQ
+#
+CONFIG_XEN_BALLOON=y
+CONFIG_XEN_SCRUB_PAGES=y
+CONFIG_XEN_DEV_EVTCHN=m
+CONFIG_XENFS=m
+CONFIG_XEN_COMPAT_XENFS=y
+CONFIG_XEN_SYS_HYPERVISOR=y
+CONFIG_STAGING=y
+# CONFIG_STAGING_EXCLUDE_BUILD is not set
+CONFIG_ET131X=m
+# CONFIG_ET131X_DEBUG is not set
+CONFIG_SLICOSS=m
+# CONFIG_VIDEO_GO7007 is not set
+# CONFIG_VIDEO_CX25821 is not set
+# CONFIG_USB_IP_COMMON is not set
+# CONFIG_W35UND is not set
+# CONFIG_PRISM2_USB is not set
+# CONFIG_ECHO is not set
+# CONFIG_POCH is not set
+# CONFIG_OTUS is not set
+# CONFIG_RT2860 is not set
+# CONFIG_RT2870 is not set
+# CONFIG_RT3090 is not set
+# CONFIG_COMEDI is not set
+# CONFIG_ASUS_OLED is not set
+# CONFIG_PANEL is not set
+# CONFIG_ALTERA_PCIE_CHDMA is not set
+# CONFIG_RTL8187SE is not set
+# CONFIG_RTL8192SU is not set
+# CONFIG_RTL8192E is not set
+# CONFIG_TRANZPORT is not set
+
+#
+# Android
+#
+
+#
+# Qualcomm MSM Camera And Video
+#
+
+#
+# Camera Sensor Selection
+#
+# CONFIG_INPUT_GPIO is not set
+# CONFIG_DST is not set
+# CONFIG_POHMELFS is not set
+# CONFIG_B3DFG is not set
+CONFIG_IDE_PHISON=m
+# CONFIG_PLAN9AUTH is not set
+# CONFIG_LINE6_USB is not set
+# CONFIG_DRM_RADEON_KMS is not set
+# CONFIG_USB_SERIAL_QUATECH2 is not set
+# CONFIG_USB_SERIAL_QUATECH_USB2 is not set
+# CONFIG_VT6655 is not set
+# CONFIG_VT6656 is not set
+# CONFIG_FB_UDL is not set
+CONFIG_HYPERV=m
+CONFIG_HYPERV_STORAGE=m
+CONFIG_HYPERV_BLOCK=m
+CONFIG_HYPERV_NET=m
+# CONFIG_VME_BUS is not set
+
+#
+# RAR Register Driver
+#
+# CONFIG_RAR_REGISTER is not set
+# CONFIG_IIO is not set
+CONFIG_X86_PLATFORM_DEVICES=y
+CONFIG_ACER_WMI=m
+CONFIG_ASUS_LAPTOP=m
+CONFIG_DELL_WMI=m
+CONFIG_FUJITSU_LAPTOP=m
+CONFIG_FUJITSU_LAPTOP_DEBUG=y
+CONFIG_TC1100_WMI=m
+CONFIG_HP_WMI=m
+CONFIG_MSI_LAPTOP=m
+CONFIG_PANASONIC_LAPTOP=m
+CONFIG_COMPAL_LAPTOP=m
+CONFIG_SONY_LAPTOP=m
+# CONFIG_SONYPI_COMPAT is not set
+CONFIG_THINKPAD_ACPI=m
+# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
+# CONFIG_THINKPAD_ACPI_DEBUG is not set
+# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
+CONFIG_THINKPAD_ACPI_VIDEO=y
+CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
+CONFIG_INTEL_MENLOW=m
+CONFIG_ACPI_WMI=m
+CONFIG_ACPI_ASUS=m
+CONFIG_TOPSTAR_LAPTOP=m
+CONFIG_ACPI_TOSHIBA=m
+
+#
+# Firmware Drivers
+#
+# CONFIG_EDD is not set
+CONFIG_FIRMWARE_MEMMAP=y
+# CONFIG_DELL_RBU is not set
+# CONFIG_DCDBAS is not set
+CONFIG_DMIID=y
+CONFIG_ISCSI_IBFT_FIND=y
+CONFIG_ISCSI_IBFT=m
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=m
+CONFIG_EXT2_FS_XATTR=y
+CONFIG_EXT2_FS_POSIX_ACL=y
+CONFIG_EXT2_FS_SECURITY=y
+# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT3_FS=m
+# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
+CONFIG_EXT3_FS_XATTR=y
+CONFIG_EXT3_FS_POSIX_ACL=y
+CONFIG_EXT3_FS_SECURITY=y
+CONFIG_EXT4_FS=m
+CONFIG_EXT4_FS_XATTR=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+# CONFIG_EXT4_DEBUG is not set
+CONFIG_JBD=m
+CONFIG_JBD2=m
+CONFIG_FS_MBCACHE=m
+CONFIG_REISER4_FS=m
+# CONFIG_REISER4_DEBUG is not set
+CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_CHECK is not set
+CONFIG_REISERFS_PROC_INFO=y
+CONFIG_REISERFS_FS_XATTR=y
+CONFIG_REISERFS_FS_POSIX_ACL=y
+CONFIG_REISERFS_FS_SECURITY=y
+CONFIG_JFS_FS=m
+CONFIG_JFS_POSIX_ACL=y
+CONFIG_JFS_SECURITY=y
+# CONFIG_JFS_DEBUG is not set
+CONFIG_JFS_STATISTICS=y
+CONFIG_FS_POSIX_ACL=y
+CONFIG_XFS_FS=m
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+# CONFIG_XFS_RT is not set
+CONFIG_XFS_DEBUG=y
+# CONFIG_GFS2_FS is not set
+# CONFIG_OCFS2_FS is not set
+# CONFIG_BTRFS_FS is not set
+# CONFIG_NILFS2_FS is not set
+CONFIG_FILE_LOCKING=y
+CONFIG_FSNOTIFY=y
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+CONFIG_QUOTA=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+CONFIG_PRINT_QUOTA_WARNING=y
+CONFIG_QUOTA_TREE=m
+CONFIG_QFMT_V1=m
+CONFIG_QFMT_V2=m
+CONFIG_QUOTACTL=y
+CONFIG_AUTOFS_FS=m
+CONFIG_AUTOFS4_FS=m
+CONFIG_FUSE_FS=m
+CONFIG_CUSE=m
+
+#
+# Caches
+#
+CONFIG_FSCACHE=m
+# CONFIG_FSCACHE_STATS is not set
+# CONFIG_FSCACHE_HISTOGRAM is not set
+# CONFIG_FSCACHE_DEBUG is not set
+# CONFIG_FSCACHE_OBJECT_LIST is not set
+CONFIG_CACHEFILES=m
+# CONFIG_CACHEFILES_DEBUG is not set
+# CONFIG_CACHEFILES_HISTOGRAM is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+CONFIG_UDF_NLS=y
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=m
+# CONFIG_MSDOS_FS is not set
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=850
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+# CONFIG_PROC_KCORE is not set
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_HUGETLBFS is not set
+# CONFIG_HUGETLB_PAGE is not set
+# CONFIG_CONFIGFS_FS is not set
+CONFIG_MISC_FILESYSTEMS=y
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+CONFIG_ECRYPT_FS=m
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+# CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_FS_XATTR is not set
+CONFIG_JFFS2_COMPRESSION_OPTIONS=y
+CONFIG_JFFS2_ZLIB=y
+# CONFIG_JFFS2_LZO is not set
+CONFIG_JFFS2_RTIME=y
+CONFIG_JFFS2_RUBIN=y
+# CONFIG_JFFS2_CMODE_NONE is not set
+CONFIG_JFFS2_CMODE_PRIORITY=y
+# CONFIG_JFFS2_CMODE_SIZE is not set
+# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
+# CONFIG_UBIFS_FS is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_SQUASHFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_OMFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+# CONFIG_EXOFS_FS is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=m
+CONFIG_NFS_V3=y
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=y
+# CONFIG_NFS_V4_1 is not set
+# CONFIG_NFS_FSCACHE is not set
+CONFIG_NFSD=m
+CONFIG_NFSD_V2_ACL=y
+CONFIG_NFSD_V3=y
+CONFIG_NFSD_V3_ACL=y
+CONFIG_NFSD_V4=y
+CONFIG_LOCKD=m
+CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=m
+CONFIG_NFS_ACL_SUPPORT=m
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=m
+CONFIG_SUNRPC_GSS=m
+CONFIG_RPCSEC_GSS_KRB5=m
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+CONFIG_SMB_FS=m
+# CONFIG_SMB_NLS_DEFAULT is not set
+CONFIG_CIFS=m
+CONFIG_CIFS_STATS=y
+CONFIG_CIFS_STATS2=y
+# CONFIG_CIFS_WEAK_PW_HASH is not set
+# CONFIG_CIFS_UPCALL is not set
+CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
+# CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_DFS_UPCALL is not set
+# CONFIG_CIFS_EXPERIMENTAL is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_OSF_PARTITION is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ATARI_PARTITION is not set
+# CONFIG_MAC_PARTITION is not set
+CONFIG_MSDOS_PARTITION=y
+# CONFIG_BSD_DISKLABEL is not set
+# CONFIG_MINIX_SUBPARTITION is not set
+# CONFIG_SOLARIS_X86_PARTITION is not set
+# CONFIG_UNIXWARE_DISKLABEL is not set
+CONFIG_LDM_PARTITION=y
+# CONFIG_LDM_DEBUG is not set
+# CONFIG_SGI_PARTITION is not set
+# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_SUN_PARTITION is not set
+# CONFIG_KARMA_PARTITION is not set
+CONFIG_EFI_PARTITION=y
+# CONFIG_SYSV68_PARTITION is not set
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="cp850"
+# CONFIG_NLS_CODEPAGE_437 is not set
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+CONFIG_NLS_CODEPAGE_850=y
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_ASCII is not set
+CONFIG_NLS_ISO8859_1=y
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+CONFIG_NLS_UTF8=y
+# CONFIG_DLM is not set
+
+#
+# Kernel hacking
+#
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+# CONFIG_PRINTK_TIME is not set
+# CONFIG_ENABLE_WARN_DEPRECATED is not set
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=1024
+# CONFIG_MAGIC_SYSRQ is not set
+CONFIG_STRIP_ASM_SYMS=y
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_KERNEL is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+CONFIG_SLUB_STATS=y
+CONFIG_DEBUG_BUGVERBOSE=y
+CONFIG_DEBUG_MEMORY_INIT=y
+CONFIG_ARCH_WANT_FRAME_POINTERS=y
+CONFIG_FRAME_POINTER=y
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
+# CONFIG_LATENCYTOP is not set
+# CONFIG_SYSCTL_SYSCALL_CHECK is not set
+CONFIG_USER_STACKTRACE_SUPPORT=y
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
+CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_TRACING_SUPPORT=y
+# CONFIG_FTRACE is not set
+# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
+# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
+# CONFIG_DMA_API_DEBUG is not set
+# CONFIG_SAMPLES is not set
+CONFIG_HAVE_ARCH_KGDB=y
+CONFIG_HAVE_ARCH_KMEMCHECK=y
+# CONFIG_STRICT_DEVMEM is not set
+CONFIG_X86_VERBOSE_BOOTUP=y
+CONFIG_EARLY_PRINTK=y
+# CONFIG_EARLY_PRINTK_DBGP is not set
+# CONFIG_4KSTACKS is not set
+CONFIG_DOUBLEFAULT=y
+# CONFIG_IOMMU_STRESS is not set
+CONFIG_HAVE_MMIOTRACE_SUPPORT=y
+CONFIG_IO_DELAY_TYPE_0X80=0
+CONFIG_IO_DELAY_TYPE_0XED=1
+CONFIG_IO_DELAY_TYPE_UDELAY=2
+CONFIG_IO_DELAY_TYPE_NONE=3
+CONFIG_IO_DELAY_0X80=y
+# CONFIG_IO_DELAY_0XED is not set
+# CONFIG_IO_DELAY_UDELAY is not set
+# CONFIG_IO_DELAY_NONE is not set
+CONFIG_DEFAULT_IO_DELAY_TYPE=0
+# CONFIG_OPTIMIZE_INLINING is not set
+
+#
+# Security options
+#
+CONFIG_KEYS=y
+# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
+# CONFIG_SECURITY is not set
+# CONFIG_SECURITYFS is not set
+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
+# CONFIG_INTEL_TXT is not set
+# CONFIG_IMA is not set
+CONFIG_XOR_BLOCKS=m
+CONFIG_ASYNC_CORE=m
+CONFIG_ASYNC_MEMCPY=m
+CONFIG_ASYNC_XOR=m
+CONFIG_ASYNC_PQ=m
+CONFIG_ASYNC_RAID6_RECOV=m
+CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y
+CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_FIPS=y
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_AEAD=m
+CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_BLKCIPHER=m
+CONFIG_CRYPTO_BLKCIPHER2=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG=m
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_PCOMP=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
+CONFIG_CRYPTO_GF128MUL=m
+# CONFIG_CRYPTO_NULL is not set
+CONFIG_CRYPTO_WORKQUEUE=y
+CONFIG_CRYPTO_CRYPTD=m
+CONFIG_CRYPTO_AUTHENC=m
+# CONFIG_CRYPTO_TEST is not set
+
+#
+# Authenticated Encryption with Associated Data
+#
+CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_GCM=m
+CONFIG_CRYPTO_SEQIV=m
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=m
+CONFIG_CRYPTO_CTR=m
+CONFIG_CRYPTO_CTS=m
+CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_XTS=m
+
+#
+# Hash modes
+#
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_XCBC=m
+CONFIG_CRYPTO_VMAC=m
+
+#
+# Digest
+#
+CONFIG_CRYPTO_CRC32C=m
+CONFIG_CRYPTO_CRC32C_INTEL=m
+CONFIG_CRYPTO_GHASH=m
+# CONFIG_CRYPTO_MD4 is not set
+CONFIG_CRYPTO_MD5=m
+CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_RMD128=m
+CONFIG_CRYPTO_RMD160=m
+CONFIG_CRYPTO_RMD256=m
+CONFIG_CRYPTO_RMD320=m
+CONFIG_CRYPTO_SHA1=m
+CONFIG_CRYPTO_SHA256=m
+CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_TGR192=m
+CONFIG_CRYPTO_WP512=m
+
+#
+# Ciphers
+#
+CONFIG_CRYPTO_AES=m
+CONFIG_CRYPTO_AES_586=m
+CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_CAMELLIA=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_FCRYPT=m
+CONFIG_CRYPTO_KHAZAD=m
+CONFIG_CRYPTO_SALSA20=m
+CONFIG_CRYPTO_SALSA20_586=m
+CONFIG_CRYPTO_SEED=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
+CONFIG_CRYPTO_TWOFISH_586=m
+
+#
+# Compression
+#
+CONFIG_CRYPTO_DEFLATE=y
+CONFIG_CRYPTO_ZLIB=m
+CONFIG_CRYPTO_LZO=m
+
+#
+# Random Number Generation
+#
+CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_HW=y
+CONFIG_CRYPTO_DEV_PADLOCK=m
+CONFIG_CRYPTO_DEV_PADLOCK_AES=m
+CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
+CONFIG_CRYPTO_DEV_GEODE=m
+CONFIG_CRYPTO_DEV_HIFN_795X=m
+CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
+CONFIG_HAVE_KVM=y
+CONFIG_HAVE_KVM_IRQCHIP=y
+CONFIG_HAVE_KVM_EVENTFD=y
+CONFIG_KVM_APIC_ARCHITECTURE=y
+CONFIG_VIRTUALIZATION=y
+CONFIG_KVM=m
+CONFIG_KVM_INTEL=m
+CONFIG_KVM_AMD=m
+CONFIG_LGUEST=m
+CONFIG_VIRTIO=y
+CONFIG_VIRTIO_RING=y
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_BALLOON=m
+# CONFIG_BINARY_PRINTF is not set
+
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+CONFIG_GENERIC_FIND_FIRST_BIT=y
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+CONFIG_GENERIC_FIND_LAST_BIT=y
+CONFIG_CRC_CCITT=m
+CONFIG_CRC16=m
+CONFIG_CRC_T10DIF=m
+CONFIG_CRC_ITU_T=m
+CONFIG_CRC32=y
+CONFIG_CRC7=m
+CONFIG_LIBCRC32C=m
+CONFIG_AUDIT_GENERIC=y
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_LZO_COMPRESS=m
+CONFIG_LZO_DECOMPRESS=m
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_LZMA=y
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+CONFIG_CHECK_SIGNATURE=y
+CONFIG_NLATTR=y
diff --git a/config/outgoingfw/outgoingfw.pl b/config/outgoingfw/outgoingfw.pl
index 8d4d27d..6709ee6 100644
--- a/config/outgoingfw/outgoingfw.pl
+++ b/config/outgoingfw/outgoingfw.pl
@@ -187,7 +187,7 @@ foreach $configentry (sort @configs)
foreach $SOURCE (@SOURCE) {
$SOURCE =~ s/\s//gi;
- if ( $SOURCE eq "" ){next;}
+ if ( $SOURCE eq "" || $configline[1] eq "" ){next;}
if ( ( $configline[6] ne "" || $configline[2] eq 'mac' ) && $configline[2] ne 'all'){
$SOURCE =~ s/[^a-zA-Z0-9]/:/gi;
diff --git a/config/proxy/auth/msnt_auth b/config/proxy/auth/msnt_auth
deleted file mode 100644
index bbc56e8..0000000
Binary files a/config/proxy/auth/msnt_auth and /dev/null differ
diff --git a/config/proxy/auth/ncsa_auth b/config/proxy/auth/ncsa_auth
deleted file mode 100644
index 393a7c1..0000000
Binary files a/config/proxy/auth/ncsa_auth and /dev/null differ
diff --git a/config/proxy/auth/ntlm_auth b/config/proxy/auth/ntlm_auth
deleted file mode 100644
index b65889c..0000000
Binary files a/config/proxy/auth/ntlm_auth and /dev/null differ
diff --git a/config/proxy/auth/squid_ldap_auth b/config/proxy/auth/squid_ldap_auth
deleted file mode 100644
index 93d54a5..0000000
Binary files a/config/proxy/auth/squid_ldap_auth and /dev/null differ
diff --git a/config/proxy/auth/squid_ldap_group b/config/proxy/auth/squid_ldap_group
deleted file mode 100644
index 23421be..0000000
Binary files a/config/proxy/auth/squid_ldap_group and /dev/null differ
diff --git a/config/proxy/auth/squid_radius_auth b/config/proxy/auth/squid_radius_auth
deleted file mode 100644
index 8e5f923..0000000
Binary files a/config/proxy/auth/squid_radius_auth and /dev/null differ
diff --git a/config/proxy/errors.ipfire/English/ERR_ACCESS_DENIED b/config/proxy/errors.ipfire/English/ERR_ACCESS_DENIED
deleted file mode 100644
index 45b686b..0000000
--- a/config/proxy/errors.ipfire/English/ERR_ACCESS_DENIED
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... The requested URL could not be retrieved</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-While trying to retrieve the URL:
-<A HREF="%U">%U</A>
-<P>
-The following error was encountered:
-<UL>
-<LI>
-<STRONG>
-Access Denied.
-</STRONG>
-<P>
-Access control configuration prevents your request from
-being allowed at this time. Please contact your service provider if
-you feel this is incorrect.
-</UL>
-<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/English/ERR_CACHE_ACCESS_DENIED b/config/proxy/errors.ipfire/English/ERR_CACHE_ACCESS_DENIED
deleted file mode 100644
index beccfe3..0000000
--- a/config/proxy/errors.ipfire/English/ERR_CACHE_ACCESS_DENIED
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>ERROR: Cache Access Denied</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... Cache Access Denied</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-While trying to retrieve the URL:
-<A HREF="%U">%U</A>
-<P>
-The following error was encountered:
-<UL>
-<LI>
-<STRONG>
-Cache Access Denied.
-</STRONG>
-</UL>
-</P>
-
-<P>Sorry, you are not currently allowed to request:
-<PRE> %U</PRE>
-from this cache until you have authenticated yourself.
-</P>
-
-<P>
-You need to use Netscape version 2.0 or greater, or Microsoft Internet
-Explorer 3.0, or an HTTP/1.1 compliant browser for this to work. Please
-contact the <A HREF="mailto:%w">cache administrator</a> if you have
-difficulties authenticating yourself or
-<A HREF="http://%h/cgi-bin/chpasswd.cgi">change</a> your default password.
-</P>
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/English/ERR_CACHE_MGR_ACCESS_DENIED b/config/proxy/errors.ipfire/English/ERR_CACHE_MGR_ACCESS_DENIED
deleted file mode 100644
index b8beae0..0000000
--- a/config/proxy/errors.ipfire/English/ERR_CACHE_MGR_ACCESS_DENIED
+++ /dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>ERROR: Cache Manager Access Denied</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... Cache Manager Access Denied</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-While trying to retrieve the URL:
-<A HREF="%U">%U</A>
-<P>
-The following error was encountered:
-<UL>
-<LI>
-<STRONG>
-Cache Manager Access Denied.
-</STRONG>
-</UL>
-</P>
-
-<P>Sorry, you are not currently allowed to request:
-<PRE> %U</PRE>
-from this cache manager until you have authenticated yourself.
-</P>
-
-<P> You need to use Netscape version 2.0 or greater, or Microsoft Internet
-Explorer 3.0, or an HTTP/1.1 compliant browser for this to work. Please
-contact the <A HREF="mailto:%w">cache administrator</a> if you have
-difficulties authenticating yourself or, if you <em>are</em> the
-administrator, read Squid documentation on cache manager interface and check
-cache log for more detailed error messages.</P>
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/English/ERR_CANNOT_FORWARD b/config/proxy/errors.ipfire/English/ERR_CANNOT_FORWARD
deleted file mode 100644
index 6356a7c..0000000
--- a/config/proxy/errors.ipfire/English/ERR_CANNOT_FORWARD
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... The requested URL could not be retrieved</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-While trying to retrieve the URL:
-<A HREF="%U">%U</A>
-<P>
-The following error was encountered:
-<UL>
-<LI>
-<STRONG>
-Unable to forward this request at this time.
-</STRONG>
-</UL>
-
-<P>
-This request could not be forwarded to the origin server or to any
-parent caches. The most likely cause for this error is that:
-<UL>
-<LI>The cache administrator does not allow this cache to make
- direct connections to origin servers, and
-<LI>All configured parent caches are currently unreachable.
-</UL>
-<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/English/ERR_CONNECT_FAIL b/config/proxy/errors.ipfire/English/ERR_CONNECT_FAIL
deleted file mode 100644
index 40af3e5..0000000
--- a/config/proxy/errors.ipfire/English/ERR_CONNECT_FAIL
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... The requested URL could not be retrieved</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-While trying to retrieve the URL:
-<A HREF="%U">%U</A>
-<P>
-The following error was encountered:
-<UL>
-<LI>
-<STRONG>
-Connection to %I Failed
-</STRONG>
-</UL>
-
-<P>
-The system returned:
-<PRE><I> %E</I></PRE>
-
-<P>
-The remote host or network may be down. Please try the request again.
-<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/English/ERR_DNS_FAIL b/config/proxy/errors.ipfire/English/ERR_DNS_FAIL
deleted file mode 100644
index 99cd519..0000000
--- a/config/proxy/errors.ipfire/English/ERR_DNS_FAIL
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... The requested URL could not be retrieved</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-While trying to retrieve the URL:
-<A HREF="%U">%U</A>
-<P>
-The following error was encountered:
-<BLOCKQUOTE>
-Unable to determine IP address from host name for
-<I>%H</I>
-</BLOCKQUOTE>
-
-<P>
-The dnsserver returned:
-<BLOCKQUOTE>
-%z
-</BLOCKQUOTE>
-
-<P>
-This means that:
-<PRE>
- The cache was not able to resolve the hostname presented in the URL.
- Check if the address is correct.
-</PRE>
-<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/English/ERR_FORWARDING_DENIED b/config/proxy/errors.ipfire/English/ERR_FORWARDING_DENIED
deleted file mode 100644
index cd2aedc..0000000
--- a/config/proxy/errors.ipfire/English/ERR_FORWARDING_DENIED
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... The requested URL could not be retrieved</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-While trying to retrieve the URL:
-<A HREF="%U">%U</A>
-<P>
-The following error was encountered:
-<UL>
-<LI>
-<STRONG>
-Forwarding Denied.
-</STRONG>
-</UL>
-
-<P>
-This cache will not forward your request because it is trying to enforce a
-sibling relationship. Perhaps the client at %i is a cache which has been
-misconfigured.
-<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/English/ERR_FTP_DISABLED b/config/proxy/errors.ipfire/English/ERR_FTP_DISABLED
deleted file mode 100644
index 4823ba9..0000000
--- a/config/proxy/errors.ipfire/English/ERR_FTP_DISABLED
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... The requested URL could not be retrieved</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-While trying to retrieve the URL:
-<A HREF="%U">%U</A>
-<P>
-The following error was encountered:
-<UL>
-<LI>
-<STRONG>
-FTP is Disabled
-</STRONG>
-</UL>
-
-<P>
-This cache does not support FTP.
-<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/English/ERR_FTP_FAILURE b/config/proxy/errors.ipfire/English/ERR_FTP_FAILURE
deleted file mode 100644
index 9e20f44..0000000
--- a/config/proxy/errors.ipfire/English/ERR_FTP_FAILURE
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... The requested URL could not be retrieved</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-An FTP protocol error occurred
-while trying to retrieve the URL:
-<A HREF="%U">%U</A>
-<P>
-Squid sent the following FTP command:
-<blockquote><strong><pre>%f</pre></strong></blockquote>
-and then received this reply
-<blockquote><strong><pre>%F</pre></strong></blockquote>
-<blockquote><strong><pre>%g</pre></strong></blockquote>
-<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/English/ERR_FTP_FORBIDDEN b/config/proxy/errors.ipfire/English/ERR_FTP_FORBIDDEN
deleted file mode 100644
index 6eea8d8..0000000
--- a/config/proxy/errors.ipfire/English/ERR_FTP_FORBIDDEN
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... The requested URL could not be retrieved</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-An FTP authentication failure occurred
-while trying to retrieve the URL:
-<A HREF="%U">%U</A>
-<P>
-Squid sent the following FTP command:
-<blockquote><strong><pre>%f</pre></strong></blockquote>
-and then received this reply
-<blockquote><strong><pre>%F</pre></strong></blockquote>
-<blockquote><strong><pre>%g</pre></strong></blockquote>
-<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/English/ERR_FTP_NOT_FOUND b/config/proxy/errors.ipfire/English/ERR_FTP_NOT_FOUND
deleted file mode 100644
index ead0b2a..0000000
--- a/config/proxy/errors.ipfire/English/ERR_FTP_NOT_FOUND
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... The requested URL could not be retrieved</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-The following URL could not be retrieved:
-<A HREF="%U">%U</A>
-<P>
-Squid sent the following FTP command:
-<blockquote><strong><pre>%f</pre></strong></blockquote>
-and then received this reply
-<blockquote><strong><pre>%F</pre></strong></blockquote>
-<blockquote><strong><pre>%g</pre></strong></blockquote>
-<P>
-This might be caused by an FTP URL with an absolute path (which does
-not comply with RFC 1738). If this is the cause, then the file
-can be found at <A HREF="%B">%B</A>.
-<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/English/ERR_FTP_PUT_CREATED b/config/proxy/errors.ipfire/English/ERR_FTP_PUT_CREATED
deleted file mode 100644
index 3c9c296..0000000
--- a/config/proxy/errors.ipfire/English/ERR_FTP_PUT_CREATED
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FTP PUT Successful: File Created</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>File created</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/English/ERR_FTP_PUT_ERROR b/config/proxy/errors.ipfire/English/ERR_FTP_PUT_ERROR
deleted file mode 100644
index b501c13..0000000
--- a/config/proxy/errors.ipfire/English/ERR_FTP_PUT_ERROR
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>ERROR: FTP upload failed</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... FTP PUT/upload failed</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-While trying to PUT the following URL:
-<A HREF="%U">%U</A>
-<P>
-Squid sent the following FTP command:
-<PRE><STRONG>
- %f
-</STRONG></PRE>
-and then received this reply
-<PRE><STRONG>
- %F
-</STRONG></PRE>
-<P>
-This means that:
-<PRE>
-Check path, permissions, diskspace and try again.
-</PRE>
-<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/English/ERR_FTP_PUT_MODIFIED b/config/proxy/errors.ipfire/English/ERR_FTP_PUT_MODIFIED
deleted file mode 100644
index 14b36ff..0000000
--- a/config/proxy/errors.ipfire/English/ERR_FTP_PUT_MODIFIED
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FTP PUT Successful: File updated</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>File updated</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/English/ERR_FTP_UNAVAILABLE b/config/proxy/errors.ipfire/English/ERR_FTP_UNAVAILABLE
deleted file mode 100644
index 5aadaf5..0000000
--- a/config/proxy/errors.ipfire/English/ERR_FTP_UNAVAILABLE
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... The requested URL could not be retrieved</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-Squid sent the following FTP command:
-<blockquote><strong><pre>%f</pre></strong></blockquote>
-and then received this reply
-<blockquote><strong><pre>%F</pre></strong></blockquote>
-<blockquote><strong><pre>%g</pre></strong></blockquote>
-<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/English/ERR_INVALID_REQ b/config/proxy/errors.ipfire/English/ERR_INVALID_REQ
deleted file mode 100644
index 24930c6..0000000
--- a/config/proxy/errors.ipfire/English/ERR_INVALID_REQ
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... The requested URL could not be retrieved</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-While trying to process the request:
-<PRE>
-%R
-</PRE>
-<P>
-The following error was encountered:
-<UL>
-<LI>
-<STRONG>
-Invalid Request
-</STRONG>
-</UL>
-
-<P>
-Some aspect of the HTTP Request is invalid. Possible problems:
-<UL>
-<LI>Missing or unknown request method
-<LI>Missing URL
-<LI>Missing HTTP Identifier (HTTP/1.0)
-<LI>Request is too large
-<LI>Content-Length missing for POST or PUT requests
-<LI>Illegal character in hostname; underscores are not allowed
-</UL>
-<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/English/ERR_INVALID_RESP b/config/proxy/errors.ipfire/English/ERR_INVALID_RESP
deleted file mode 100644
index ed87a0c..0000000
--- a/config/proxy/errors.ipfire/English/ERR_INVALID_RESP
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... The requested URL could not be retrieved</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-While trying to process the request:
-<PRE>
-%R
-</PRE>
-<P>
-The following error was encountered:
-<UL>
-<LI>
-<STRONG>
-Invalid Response
-</STRONG>
-</UL>
-
-<P>
-The HTTP Response message received from the contacted server
-could not be understood or was otherwise malformed. Please contact
-the site operator. Your cache administrator may be able to provide
-you with more details about the exact nature of the problem if needed.
-
-<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/English/ERR_INVALID_URL b/config/proxy/errors.ipfire/English/ERR_INVALID_URL
deleted file mode 100644
index ca445c4..0000000
--- a/config/proxy/errors.ipfire/English/ERR_INVALID_URL
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... The requested URL could not be retrieved</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-While trying to retrieve the URL:
-<A HREF="%U">%U</A>
-<P>
-The following error was encountered:
-<UL>
-<LI>
-<STRONG>
-Invalid URL
-</STRONG>
-</UL>
-
-<P>
-Some aspect of the requested URL is incorrect. Possible problems:
-<UL>
-<LI>Missing or incorrect access protocol (should be `http://'' or similar)
-<LI>Missing hostname
-<LI>Illegal double-escape in the URL-Path
-<LI>Illegal character in hostname; underscores are not allowed
-</UL>
-<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/English/ERR_LIFETIME_EXP b/config/proxy/errors.ipfire/English/ERR_LIFETIME_EXP
deleted file mode 100644
index 1adadc6..0000000
--- a/config/proxy/errors.ipfire/English/ERR_LIFETIME_EXP
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... The requested URL could not be retrieved</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-While trying to retrieve the URL:
-<A HREF="%U">%U</A>
-<P>
-The following error was encountered:
-<UL>
-<LI>
-<STRONG>
-Connection Lifetime Expired
-</STRONG>
-</UL>
-
-<P>
-Squid has terminated the request because it has exceeded the maximum
-connection lifetime.
-<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/English/ERR_NO_RELAY b/config/proxy/errors.ipfire/English/ERR_NO_RELAY
deleted file mode 100644
index 567ec5f..0000000
--- a/config/proxy/errors.ipfire/English/ERR_NO_RELAY
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... The requested URL could not be retrieved</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-While trying to retrieve the URL:
-<A HREF="%U">%U</A>
-<P>
-The following error was encountered:
-<UL>
-<LI>
-<STRONG>
-No Wais Relay
-</STRONG>
-</UL>
-
-<P>
-There is no WAIS Relay host defined for this Cache! Yell at the administrator.
-<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/English/ERR_ONLY_IF_CACHED_MISS b/config/proxy/errors.ipfire/English/ERR_ONLY_IF_CACHED_MISS
deleted file mode 100644
index 592e175..0000000
--- a/config/proxy/errors.ipfire/English/ERR_ONLY_IF_CACHED_MISS
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... The requested URL could not be retrieved</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-While trying to retrieve the URL:
-<A HREF="%U">%U</A>
-<P>
-The following error was encountered:
-<UL>
-<LI>
-<STRONG>
-Valid document was not found in the cache and <code>only-if-cached</code>
-directive was specified.
-</STRONG>
-</UL>
-
-<P>
-
-You have issued a request with a <code>only-if-cached</code> cache control
-directive. The document was not found in the cache, <em>or</em> it required
-revalidation prohibited by <code>only-if-cached</code> directive.
-
-<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/English/ERR_READ_ERROR b/config/proxy/errors.ipfire/English/ERR_READ_ERROR
deleted file mode 100644
index 41541b8..0000000
--- a/config/proxy/errors.ipfire/English/ERR_READ_ERROR
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... The requested URL could not be retrieved</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-While trying to retrieve the URL:
-<A HREF="%U">%U</A>
-<P>
-The following error was encountered:
-<UL>
-<LI>
-<STRONG>
-Read Error
-</STRONG>
-</UL>
-
-<P>
-The system returned:
-<PRE><I> %E</I></PRE>
-
-<P>
-An error condition occurred while reading data from the network. Please
-retry your request.
-<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/English/ERR_READ_TIMEOUT b/config/proxy/errors.ipfire/English/ERR_READ_TIMEOUT
deleted file mode 100644
index 8dc2545..0000000
--- a/config/proxy/errors.ipfire/English/ERR_READ_TIMEOUT
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... The requested URL could not be retrieved</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-While trying to retrieve the URL:
-<A HREF="%U">%U</A>
-<P>
-The following error was encountered:
-<UL>
-<LI>
-<STRONG>
-Read Timeout
-</STRONG>
-</UL>
-
-<P>
-The system returned:
-<PRE><I> %E</I></PRE>
-
-<P>
-A Timeout occurred while waiting to read data from the network. The network
-or server may be down or congested. Please retry your request.
-<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/English/ERR_SHUTTING_DOWN b/config/proxy/errors.ipfire/English/ERR_SHUTTING_DOWN
deleted file mode 100644
index 63d17b0..0000000
--- a/config/proxy/errors.ipfire/English/ERR_SHUTTING_DOWN
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... The requested URL could not be retrieved</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-While trying to retrieve the URL:
-<A HREF="%U">%U</A>
-<P>
-The following error was encountered:
-<P>
-This cache is in the process of shutting down and can not
-service your request at this time. Please retry your
-request again soon.
-<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/English/ERR_SOCKET_FAILURE b/config/proxy/errors.ipfire/English/ERR_SOCKET_FAILURE
deleted file mode 100644
index e8d309c..0000000
--- a/config/proxy/errors.ipfire/English/ERR_SOCKET_FAILURE
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... The requested URL could not be retrieved</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-While trying to retrieve the URL:
-<A HREF="%U">%U</A>
-<P>
-The following error was encountered:
-<UL>
-<LI>
-<STRONG>
-Socket Failure
-</STRONG>
-</UL>
-
-<P>
-The system returned:
-<PRE><I> %E</I></PRE>
-
-<P>
-Squid is unable to create a TCP socket, presumably due to excessive load.
-Please retry your request.
-<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/English/ERR_TOO_BIG b/config/proxy/errors.ipfire/English/ERR_TOO_BIG
deleted file mode 100644
index 802fe3e..0000000
--- a/config/proxy/errors.ipfire/English/ERR_TOO_BIG
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... The requested URL could not be retrieved</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-While trying to retrieve the URL:
-<A HREF="%U">%U</A>
-<P>
-The following error was encountered:
-<UL>
-<LI>
-<STRONG>
-The request or reply is too large.
-</STRONG>
-<P>
-If you are making a POST or PUT request, then your request body
-(the thing you are trying to upload) is too large. If you are
-making a GET request, then the reply body (what you are trying
-to download) is too large. These limits have been established
-by the Internet Service Provider who operates this cache. Please
-contact them directly if you feel this is an error.
-</UL>
-<P>
-Your cache administrator is <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/English/ERR_UNSUP_REQ b/config/proxy/errors.ipfire/English/ERR_UNSUP_REQ
deleted file mode 100644
index b69569f..0000000
--- a/config/proxy/errors.ipfire/English/ERR_UNSUP_REQ
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... The requested URL could not be retrieved</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-While trying to retrieve the URL:
-<A HREF="%U">%U</A>
-<P>
-The following error was encountered:
-<UL>
-<LI>
-<STRONG>
-Unsupported Request Method and Protocol
-</STRONG>
-</UL>
-
-<P>
-Squid does not support all request methods for all access protocols.
-For example, you can not POST a Gopher request.
-<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/English/ERR_URN_RESOLVE b/config/proxy/errors.ipfire/English/ERR_URN_RESOLVE
deleted file mode 100644
index dba21bc..0000000
--- a/config/proxy/errors.ipfire/English/ERR_URN_RESOLVE
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>ERROR: The requested URN not be retrieved</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... A URL for the requested URN could not be retrieved</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-While trying to retrieve the URN:
-<A HREF="%U">%U</A>
-<P>
-The following error was encountered:
-<UL>
-<LI>
-<STRONG>
-Cannot Resolve URN
-</STRONG>
-</UL>
-
-<P>
-Hey, don't expect too much from URNs on %T :)
-<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/English/ERR_WRITE_ERROR b/config/proxy/errors.ipfire/English/ERR_WRITE_ERROR
deleted file mode 100644
index 8363e2e..0000000
--- a/config/proxy/errors.ipfire/English/ERR_WRITE_ERROR
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... The requested URL could not be retrieved</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-While trying to retrieve the URL:
-<A HREF="%U">%U</A>
-<P>
-The following error was encountered:
-<UL>
-<LI>
-<STRONG>
-Write Error
-</STRONG>
-</UL>
-
-<P>
-The system returned:
-<PRE><I> %E</I></PRE>
-
-<P>
-An error condition occurred while writing to the network. Please retry your
-request.
-<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/English/ERR_ZERO_SIZE_OBJECT b/config/proxy/errors.ipfire/English/ERR_ZERO_SIZE_OBJECT
deleted file mode 100644
index 3b0a3e6..0000000
--- a/config/proxy/errors.ipfire/English/ERR_ZERO_SIZE_OBJECT
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... The requested URL could not be retrieved</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-While trying to retrieve the URL:
-<A HREF="%U">%U</A>
-<P>
-The following error was encountered:
-<UL>
-<LI>
-<STRONG>
-Zero Sized Reply
-</STRONG>
-</UL>
-
-<P>
-Squid did not receive any data for this request.
-<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/German/ERR_ACCESS_DENIED b/config/proxy/errors.ipfire/German/ERR_ACCESS_DENIED
deleted file mode 100644
index 09fdfd3..0000000
--- a/config/proxy/errors.ipfire/German/ERR_ACCESS_DENIED
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-Während des Versuches, den URL<BR>
-<A HREF="%U">%U</A><BR>
-zu laden, trat der folgende Fehler auf:
-<UL>
-<LI>
-<STRONG>Zugriff verweigert</STRONG>
-</UL>
-
-<P>
-Aufgrund von Zugriffsbeschränkungen ist Ihre Anfrage zur Zeit
-nicht erlaubt.<br>
-Bitte kontaktieren Sie Ihren Service Provider, wenn Sie der Meinung
-sind, daß dies nicht korrekt ist.
-</P>
-
-<P>
-Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/German/ERR_CACHE_ACCESS_DENIED b/config/proxy/errors.ipfire/German/ERR_CACHE_ACCESS_DENIED
deleted file mode 100644
index 787455a..0000000
--- a/config/proxy/errors.ipfire/German/ERR_CACHE_ACCESS_DENIED
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FEHLER: Cache-Zugriff Verweigert</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... Cache-Zugriff Verweigert</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-Während des Versuches, den URL<BR>
-<A HREF="%U">%U</A><BR>
-zu laden, trat der folgende Fehler auf:
-<UL>
-<LI>
-<STRONG>Cache-Zugriff verweigert</STRONG>
-</P>
-</UL>
-
-<P>Leider sind Sie zur Zeit nicht berechtigt
-<PRE> %U</PRE>
-von diesem Cache zu beziehen, bis Sie sich authentifiziert haben.
-</P>
-
-<P>
-Sie benötigen hierzu Netscape Version 2.0 (oder höher), Microsoft Internet
-Explorer 3.0 oder einen anderen HTTP/1.1 Browser. Bitte kontaktieren Sie
-den <A HREF="mailto:%w">Cache-Administrator</a>, wenn Sie Probleme haben,
-sich zu authentifizieren, oder
-<A HREF="http://%h/cgi-bin/chpasswd.cgi">ändern</a> Sie Ihr Passwort.
-</P>
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/German/ERR_CACHE_MGR_ACCESS_DENIED b/config/proxy/errors.ipfire/German/ERR_CACHE_MGR_ACCESS_DENIED
deleted file mode 100644
index 91934be..0000000
--- a/config/proxy/errors.ipfire/German/ERR_CACHE_MGR_ACCESS_DENIED
+++ /dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FEHLER: Cache-Manager-Zugriff Verweigert</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... Cache-Manager-Zugriff verweigert</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-Während des Versuches, den URL<BR>
-<A HREF="%U">%U</A><BR>
-zu laden, trat der folgende Fehler auf:
-<UL>
-<LI>
-<STRONG>Cache-Manager-Zugriff verweigert</STRONG>
-</UL>
-</P>
-
-<P>Leider sind Sie zur Zeit nicht berechtigt
-<PRE> %U</PRE>
-von diesem Cache zu beziehen, bis Sie sich authentifiziert haben.
-</P>
-
-<P>
-Sie benötigen hierzu Netscape Version 2.0 (oder höher), Microsoft Internet
-Explorer 3.0 oder einen anderen HTTP/1.1 Browser.
-Bitte kontaktieren Sie den <A HREF="mailto:%w">Cache-Administrator</a>, wenn Sie Probleme haben,
-sich zu authentifizieren, oder wenn Sie der Administrator <em>sind</em>,
-lesen Sie die Squid-Dokumentation über das Cache-Manager
-Interface und überprüfen Sie das Cache-Log für detailiertere
-Fehlermeldungen.
-</P>
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/German/ERR_CANNOT_FORWARD b/config/proxy/errors.ipfire/German/ERR_CANNOT_FORWARD
deleted file mode 100644
index ec0fbf5..0000000
--- a/config/proxy/errors.ipfire/German/ERR_CANNOT_FORWARD
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-Während des Versuches, den URL<BR>
-<A HREF="%U">%U</A><BR>
-zu laden, trat der folgende Fehler auf:
-<UL>
-<LI>
-<STRONG>Die Anfrage kann zur Zeit nicht weitergeleitet werden</STRONG>
-</UL>
-
-<P>
-Diese Anfrage konnte nicht zum WWW-Server oder einem
-Parent-Cache weitergeleitet werden. Der wahrscheinlichste Grund für
-diesen Fehler ist:
-<UL>
-<LI>Der Cache-Administrator erlaubt nicht, daß dieser Server
- direkte Verbindungen zu WWW-Servern aufbaut, und
-<LI>alle konfigurierten Parent-Caches sind zur Zeit nicht erreichbar.
-</UL>
-</P>
-<P>
-Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/German/ERR_CONNECT_FAIL b/config/proxy/errors.ipfire/German/ERR_CONNECT_FAIL
deleted file mode 100644
index c37f441..0000000
--- a/config/proxy/errors.ipfire/German/ERR_CONNECT_FAIL
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-Während des Versuches, den URL<BR>
-<A HREF="%U">%U</A><BR>
-zu laden, trat der folgende Fehler auf:
-<UL>
-<LI>
-<STRONG>Verbindung schlug fehl</STRONG>
-</UL>
-
-<P>
-Das System gab:
-<PRE><I> %E</I></PRE>
-zurück.
-<P>
-Der Zielrechner oder das Zielnetzwerk könnten deaktiviert sein.
-Bitte versuchen Sie die Anfrage noch einmal.
-</P>
-<P>
-Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/German/ERR_DNS_FAIL b/config/proxy/errors.ipfire/German/ERR_DNS_FAIL
deleted file mode 100644
index ee15b52..0000000
--- a/config/proxy/errors.ipfire/German/ERR_DNS_FAIL
+++ /dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033"><TD WIDTH="25"></TD>
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="RIGHT" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-Während des Versuches, den URL<BR>
-<A HREF="%U">%U</A><BR>
-zu laden, trat der folgende Fehler auf:
-<UL>
-<LI>
-<STRONG>Es war unmöglich, eine IP-Adresse für <I>%H</I>
-zu bestimmen.
-</STRONG>
-</UL>
-
-<P>
-Der DNS-Server gab:
-<BLOCKQUOTE>
-%z
-</BLOCKQUOTE>
-zurück.
-<P>
- Der Cache war nicht in der Lage, den in der URL enthaltenen Hostnamen
- aufzulösen.
- Überprüfen Sie, ob die Adresse korrekt ist.
-</P>
-<P>
-Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/German/ERR_FORWARDING_DENIED b/config/proxy/errors.ipfire/German/ERR_FORWARDING_DENIED
deleted file mode 100644
index d805c1a..0000000
--- a/config/proxy/errors.ipfire/German/ERR_FORWARDING_DENIED
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-Während des Versuches, den URL<BR>
-<A HREF="%U">%U</A><BR>
-zu laden, trat der folgende Fehler auf:
-<UL>
-<LI>
-<STRONG>Weiterleiten verweigert</STRONG>
-</UL>
-
-<P>
-Dieser Cache wird Ihre Anfrage nicht weiterleiten, da er versucht, eine
-Sibling-Beziehung zu erzwingen.
-Wahrscheinlich ist der Client bei %i ein Cache, der falsch
-konfiguriert wurde. Informieren Sie dessen Administrator und/oder überprüfen
-Sie Ihre Proxy-Einstellungen.
-</P>
-<P>
-Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/German/ERR_FTP_DISABLED b/config/proxy/errors.ipfire/German/ERR_FTP_DISABLED
deleted file mode 100644
index 325dd24..0000000
--- a/config/proxy/errors.ipfire/German/ERR_FTP_DISABLED
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-Während des Versuches, den URL<BR>
-<A HREF="%U">%U</A><BR>
-zu laden, trat der folgende Fehler auf:
-<UL>
-<LI>
-<STRONG>FTP ist deaktiviert</STRONG>
-</UL>
-
-<P>
-Dieser Cache unterstützt kein FTP.
-</P>
-<P>
-Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/German/ERR_FTP_FAILURE b/config/proxy/errors.ipfire/German/ERR_FTP_FAILURE
deleted file mode 100644
index 514335c..0000000
--- a/config/proxy/errors.ipfire/German/ERR_FTP_FAILURE
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-Ein FTP-Protokollfehler ist aufgetreten
-während des Versuches, den URL:
-<A HREF="%U">%U</A><BR>
-zu laden.
-
-<P>
-Squid sendete den folgenden FTP-Befehl:
-<PRE><STRONG> %f</STRONG></PRE>
-und erhielt die Antwort:
-<PRE><STRONG> %F</STRONG></PRE>
-<P>
-Dies könnte durch einen FTP-URL verursacht worden sein, der ein
-absoluter Pfad ist (was nicht der RFC 1738 entspricht).
-Wenn dies der Fall sein sollte, kann die Datei unter <A
-HREF="%B">%B</A> gefunden werden.
-</P>
-<P>
-Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/German/ERR_FTP_FORBIDDEN b/config/proxy/errors.ipfire/German/ERR_FTP_FORBIDDEN
deleted file mode 100644
index e48bf26..0000000
--- a/config/proxy/errors.ipfire/German/ERR_FTP_FORBIDDEN
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-Ein FTP-Berechtigungsfehlschlag ist aufgetreten während des Versuches, den URL: <A HREF="%U">%U</A><BR>
-zu laden.
-<P>
-Squid sendete den folgenden FTP-Befehl:
-<blockquote><strong><pre>%f</pre></strong></blockquote>
-und erhielt die Antwort:
-<blockquote><strong><pre>%F</pre></strong></blockquote>
-<blockquote><strong><pre>%g</pre></strong></blockquote>
-</P>
-
-<P>
-Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/German/ERR_FTP_NOT_FOUND b/config/proxy/errors.ipfire/German/ERR_FTP_NOT_FOUND
deleted file mode 100644
index cf66f73..0000000
--- a/config/proxy/errors.ipfire/German/ERR_FTP_NOT_FOUND
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-Während des Versuches, den URL<BR>
-<A HREF="%U">%U</A><BR>
-zu laden, trat ein Problem auf:
-<P>
-Squid sendete den folgenden FTP-Befehl:
-<blockquote><strong><pre>%f</pre></strong></blockquote>
-und erhielt die Antwort:
-<blockquote><strong><pre>%F</pre></strong></blockquote>
-<blockquote><strong><pre>%g</pre></strong></blockquote>
-<P>
-Dies könnte durch einen FTP-URL verursacht worden sein, der ein
-absoluter Pfad ist (was nicht der RFC 1738 entspricht).
-Wenn dies der Fall sein sollte, kann die Datei unter <A href="%B">%B</A> gefunden werden.
-</P>
-
-<P>
-Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/German/ERR_FTP_PUT_CREATED b/config/proxy/errors.ipfire/German/ERR_FTP_PUT_CREATED
deleted file mode 100644
index 28d34d4..0000000
--- a/config/proxy/errors.ipfire/German/ERR_FTP_PUT_CREATED
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FTP PUT Erfolgreich: Datei angelegt</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Datei angelegt</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/German/ERR_FTP_PUT_ERROR b/config/proxy/errors.ipfire/German/ERR_FTP_PUT_ERROR
deleted file mode 100644
index 59a7620..0000000
--- a/config/proxy/errors.ipfire/German/ERR_FTP_PUT_ERROR
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FEHLER: FTP Upload fehlgeschlagen</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>/
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... FTP PUT/Upload fehlgeschlagen</H2>
-<HR noshade size="1px">
-<CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-Während dem PUT/Upload-Versuch zum URL:
-<A HREF="%U">%U</A><BR>
-<P>
-Squid sendete den folgenden FTP-Befehl:
-<PRE><STRONG> %f</STRONG></PRE>
-und erhielt die Antwort:
-<PRE><STRONG> %F</STRONG></PRE>
-<P>
-Überprüfen Sie den Pfad, die Zugriffsrechte und den
-Plattenplatz. Versuchen Sie es dann erneut.
-</P>
-<P>
-Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-<CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/German/ERR_FTP_PUT_MODIFIED b/config/proxy/errors.ipfire/German/ERR_FTP_PUT_MODIFIED
deleted file mode 100644
index 26aa7ff..0000000
--- a/config/proxy/errors.ipfire/German/ERR_FTP_PUT_MODIFIED
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FTP PUT erfolgreich: Datei aktualisiert</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Datei aktualisiert</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/German/ERR_FTP_UNAVAILABLE b/config/proxy/errors.ipfire/German/ERR_FTP_UNAVAILABLE
deleted file mode 100644
index 3413832..0000000
--- a/config/proxy/errors.ipfire/German/ERR_FTP_UNAVAILABLE
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY><CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-Der FTP Server war zu beschäftigt während des Versuches, den URL<BR>
-<A HREF="%U">%U</A><BR>
-zu laden.
-<P>
-Squid sendete den folgenden FTP-Befehl:
-<blockquote><strong><pre>%f</pre></strong></blockquote>
-und erhielt die Antwort:
-<blockquote><strong><pre>%F</pre></strong></blockquote>
-<blockquote><strong><pre>%g</pre></strong></blockquote>
-</P>
-
-<P>
-Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/German/ERR_INVALID_REQ b/config/proxy/errors.ipfire/German/ERR_INVALID_REQ
deleted file mode 100644
index e6a72a4..0000000
--- a/config/proxy/errors.ipfire/German/ERR_INVALID_REQ
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-Während des Versuches, die Anfrage
-<PRE>
-%R
-</PRE>
-zu verarbeiten, trat der folgende Fehler auf:
-<UL>
-<LI>
-<STRONG>Ungültige Anfrage</STRONG>
-</UL>
-
-<P>
-Ein Teil der HTTP-Anfrage ist ungültig. Mögliche Gründe:
-<UL>
-<LI>Fehlende oder unbekannte Anfrage-Methode (GET, POST)
-<LI>Fehlender URL
-<LI>Fehlender HTTP Identifier (HTTP/1.0)
-<LI>Anfrage ist zu groß
-<LI>Content-Length fehlt für POST- oder PUT-Anfragen
-<LI>Ungültige Zeichen im Hostnamen - z.B. Unterstriche ('_'),
- Umlaute und Kommata sind nicht erlaubt.
-</UL>
-</P>
-
-<P>
-Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/German/ERR_INVALID_RESP b/config/proxy/errors.ipfire/German/ERR_INVALID_RESP
deleted file mode 100644
index e695c41..0000000
--- a/config/proxy/errors.ipfire/German/ERR_INVALID_RESP
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-Während des Versuches, die Anfrage
-<PRE>
-%R
-</PRE>
-<P>
-zu verarbeiten, trat der folgende Fehler auf:
-<UL>
-<LI>
-<STRONG>
-Ungültige Antwort
-</STRONG>
-</UL>
-
-<P>
-Die HTTP Antwortmeldung des kontaktierten Servers konnte nicht verstanden werden
-oder war auf andere Weise missgebildet. Bitte kontaktieren Sie den Betreiber der
-betreffenden Webseite. Wenn nötig kann Ihr Cache Administrator in der Lage sein,
-Sie mit mehr Details über die genaue Ursache des Problems zu versorgen.
-
-<P>Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/German/ERR_INVALID_URL b/config/proxy/errors.ipfire/German/ERR_INVALID_URL
deleted file mode 100644
index fdf23f9..0000000
--- a/config/proxy/errors.ipfire/German/ERR_INVALID_URL
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-Während des Versuches, den URL<BR>
-<A HREF="%U">%U</A><BR>
-zu laden, trat der folgende Fehler auf:
-<UL>
-<LI>
-<STRONG>Ungültiger URL</STRONG>
-</UL>
-
-<P>
-Ein Teil des angefragten URL ist ungültig. Mögliche Gründe:
-<UL>
-<LI>Fehlendes oder unkorrektes Zugriffsprotokoll (sollte 'http://' oder ähnlich sein)
-<LI>Fehlender Hostname
-<LI>Ungültiges 'double-escape' im URL-Pfad
-<LI>Ungültige Zeichen im Hostnamen - z.B. Unterstriche ('_'),
- Umlaute und Kommata sind nicht erlaubt.
-</UL>
-</P>
-
-<P>
-Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/German/ERR_LIFETIME_EXP b/config/proxy/errors.ipfire/German/ERR_LIFETIME_EXP
deleted file mode 100644
index ca97508..0000000
--- a/config/proxy/errors.ipfire/German/ERR_LIFETIME_EXP
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-Während des Versuches, den URL<BR>
-<A HREF="%U">%U</A><BR>
-zu laden, trat der folgende Fehler auf:
-<UL>
-<LI>
-<STRONG>Verbindungs-Lebensdauer ist abgelaufen</STRONG>
-</UL>
-
-<P>
-Squid hat die Anfrage abgebrochen, weil sie die maximale
-Verbindungs-Lebensdauer überschritten hat.
-</P>
-
-<P>
-Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/German/ERR_NO_RELAY b/config/proxy/errors.ipfire/German/ERR_NO_RELAY
deleted file mode 100644
index 46bc51e..0000000
--- a/config/proxy/errors.ipfire/German/ERR_NO_RELAY
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-Während des Versuches, den URL<BR>
-<A HREF="%U">%U</A><BR>
-zu laden, trat der folgende Fehler auf:
-<UL>
-<LI>
-<STRONG>Kein WAIS-Relay</STRONG>
-</UL>
-
-<P>
-Es sind keine WAIS-Relay-Rechner für diesen Cache definiert.
-Teilen Sie dies Ihrem <A HREF="mailto:%w">Cache Administrator</A> mit.
-</P>
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/German/ERR_ONLY_IF_CACHED_MISS b/config/proxy/errors.ipfire/German/ERR_ONLY_IF_CACHED_MISS
deleted file mode 100644
index e77d17b..0000000
--- a/config/proxy/errors.ipfire/German/ERR_ONLY_IF_CACHED_MISS
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-Während des Versuches, den URL<BR>
-<A HREF="%U">%U</A><BR>
-zu laden, trat der folgende Fehler auf:
-<UL>
-<LI>
-<STRONG>Ein gültiges Dokument wurde nicht im Cache gefunden, und die '<code>only-if-cached</code> directive' war angegeben.
-</STRONG>
-</UL>
-
-<P>
-Sie haben eine Anfrage mit einer <code>only-if-cached</code>
-Cache-Control-Direktive abgeschickt. Das Dokument wurde nicht im Cache gefunden,
-<em>oder</em> es hätte eine Überprüfung benötigt,
-die durch die <code>only-if-cached</code> dicective verboten wurde.
-</P>
-
-<P>
-Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/German/ERR_READ_ERROR b/config/proxy/errors.ipfire/German/ERR_READ_ERROR
deleted file mode 100644
index c4f8a78..0000000
--- a/config/proxy/errors.ipfire/German/ERR_READ_ERROR
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-Während des Versuches, den URL<BR>
-<A HREF="%U">%U</A><BR>
-zu laden, trat der folgende Fehler auf:
-<UL>
-<LI>
-<STRONG>Lesefehler</STRONG>
-</UL>
-
-<P>
-Das System gab:
-<PRE><I> %E</I></PRE>
-zurück.
-<P>
-Bei dem Versuch, Daten vom Netzwerk zu lesen, trat ein Fehler
-auf. Bitte versuchen Sie Ihre Anfrage erneut.
-</P>
-
-<P>
-Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/German/ERR_READ_TIMEOUT b/config/proxy/errors.ipfire/German/ERR_READ_TIMEOUT
deleted file mode 100644
index 04c72bf..0000000
--- a/config/proxy/errors.ipfire/German/ERR_READ_TIMEOUT
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-Während des Versuches, den URL<BR>
-<A HREF="%U">%U</A><BR>
-zu laden, trat der folgende Fehler auf:
-<UL>
-<LI>
-<STRONG>Read Timeout</STRONG>
-</UL>
-
-<P>
-Das System gab:
-<PRE><I> %E</I></PRE>
-zurück.
-<P>
-Bei dem Versuch Daten vom Netzwerk zu lesen, mußte zu lange
-gewartet werden (timeout).
-Das Netzwerk oder der Server könnten deaktiviert oder
-überlastet sein. Bitte versuchen Sie Ihre Anfrage erneut.
-</P>
-
-<P>
-Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/German/ERR_SHUTTING_DOWN b/config/proxy/errors.ipfire/German/ERR_SHUTTING_DOWN
deleted file mode 100644
index 66b001e..0000000
--- a/config/proxy/errors.ipfire/German/ERR_SHUTTING_DOWN
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-Während des Versuches, den URL<BR>
-<A HREF="%U">%U</A><BR>
-zu laden, trat folgendes Problem auf:
-
-<UL>
-<LI>Dieser Cache ist im Begriff herunterzufahren und kann Ihre Anfrage
-zur Zeit nicht bearbeiten. Bitte wiederholen Sie Ihre Anfrage etwas später.
-</UL>
-
-<P>
-Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/German/ERR_SOCKET_FAILURE b/config/proxy/errors.ipfire/German/ERR_SOCKET_FAILURE
deleted file mode 100644
index 27241e2..0000000
--- a/config/proxy/errors.ipfire/German/ERR_SOCKET_FAILURE
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-Während des Versuches, den URL<BR>
-<A HREF="%U">%U</A><BR>
-zu laden, trat der folgende Fehler auf:
-<UL>
-<LI>
-<STRONG>Socket Failure</STRONG>
-</UL>
-
-<P>
-Das System gab:
-<PRE><I> %E</I></PRE>
-zurück.
-<P>
-Squid ist nicht in der Lage, einen TCP-Socket zu öffnen,
-wahrscheinlich wegen extremer Überlastung.
-Bitte versuchen Sie Ihre Anfrage erneut.
-</P>
-
-<P>
-Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/German/ERR_TOO_BIG b/config/proxy/errors.ipfire/German/ERR_TOO_BIG
deleted file mode 100644
index 445c086..0000000
--- a/config/proxy/errors.ipfire/German/ERR_TOO_BIG
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-Während des Versuches, den URL<BR>
-<A HREF="%U">%U</A><BR>
-zu laden, trat folgendes Problem auf:
-<UL>
-<LI>
-<STRONG>
-Die Anfrage oder die Antwort ist zu groß.
-</STRONG>
-</UL>
-
-<P>
-Wenn Sie eine POST oder PUT Anfrage gemacht haben, dann ist der 'request body'
-(das was Sie versucht haben hochzuladen) zu groß. Wenn Sie eine GET
-Anfrage gemacht haben, dann ist der 'reply body' (das was Sie versuchen
-herunterzuladen) zu groß. Diese Beschränkungen wurden von Ihrem
-Internet Service Provider, der diesen Cache Server unterhält, festgelegt.
-Bitte setzen Sie sich direkt mit ihm in Kontakt wenn Sie meinen, daß
-dies ein Fehler ist.
-
-<P>
-Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/German/ERR_UNSUP_REQ b/config/proxy/errors.ipfire/German/ERR_UNSUP_REQ
deleted file mode 100644
index 6abfd3f..0000000
--- a/config/proxy/errors.ipfire/German/ERR_UNSUP_REQ
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-Während des Versuches, den URL<BR>
-<A HREF="%U">%U</A><BR>
-zu laden, trat der folgende Fehler auf:
-<UL>
-<LI>
-<STRONG>Nicht unterstützte Zugriffsmethode oder nicht unterstütztes Protokoll</STRONG>
-</UL>
-
-<P>
-Squid unterstützt nicht alle Anfragemethoden für alle
-Zugriffsprotokolle.
-Beispielsweise können Sie keine Gopher-Anfrage POST'en.
-</P>
-
-<P>
-Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/German/ERR_URN_RESOLVE b/config/proxy/errors.ipfire/German/ERR_URN_RESOLVE
deleted file mode 100644
index bed94e3..0000000
--- a/config/proxy/errors.ipfire/German/ERR_URN_RESOLVE
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FEHLER: Die angeforderete URN konnte nicht geholt werden</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... Ein URL für den angeforderten URN konnte nicht geholt werden</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-Während des Versuches, den URN
-<A HREF="%U">%U</A><BR>
-zu laden, trat der folgende Fehler auf:
-<UL>
-<LI>
-<STRONG>Die URN konnte nicht aufgelöst werden</STRONG>
-</UL>
-
-<P>
-Erwarten Sie nicht zu viel von URNs auf %T
-</P>
-
-<P>
-Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/German/ERR_WRITE_ERROR b/config/proxy/errors.ipfire/German/ERR_WRITE_ERROR
deleted file mode 100644
index 0d29f22..0000000
--- a/config/proxy/errors.ipfire/German/ERR_WRITE_ERROR
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-Während des Versuches, den URL<BR>
-<A HREF="%U">%U</A><BR>
-zu laden, trat der folgende Fehler auf:
-<UL>
-<LI>
-<STRONG>Schreibfehler</STRONG>
-</UL>
-
-<P>
-Das System gab:
-<PRE><I> %E</I></PRE>
-zurück.
-<P>
-Ein Fehler trat während des Schreibens zum Netzwerk auf.
-Bitte wiederholen Sie Ihre Anfrage.
-</P>
-
-<P>
-Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/German/ERR_ZERO_SIZE_OBJECT b/config/proxy/errors.ipfire/German/ERR_ZERO_SIZE_OBJECT
deleted file mode 100644
index be1a830..0000000
--- a/config/proxy/errors.ipfire/German/ERR_ZERO_SIZE_OBJECT
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
-<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
-</HEAD><BODY>
-<CENTER>
-<HR noshade size="1px">
-<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
-<HR noshade size="1px">
-</CENTER>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
-<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
-<TD>
-<!-- Disable footer: %s -->
-<BLOCKQUOTE>
-<P>
-<BR/>
-Während des Versuches, den URL<BR>
-<A HREF="%U">%U</A><BR>
-zu laden, trat der folgende Fehler auf:
-<UL>
-<LI>
-<STRONG>Leeres Dokument</STRONG>
-</UL>
-
-<P>
-Squid hat keinerlei Daten auf diese Anfrage empfangen.
-</P>
-
-<P>
-Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
-<BR clear="all">
-<P></P>
-</BLOCKQUOTE>
-</TD></TR></TABLE>
-<CENTER>
-<HR noshade size="1px">
-<ADDRESS>
-Generated %T by %h (%s)
-</ADDRESS>
-<HR noshade size="1px">
-</CENTER>
-</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/de/ERR_ACCESS_DENIED b/config/proxy/errors.ipfire/de/ERR_ACCESS_DENIED
new file mode 100644
index 0000000..09fdfd3
--- /dev/null
+++ b/config/proxy/errors.ipfire/de/ERR_ACCESS_DENIED
@@ -0,0 +1,46 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY>
+<CENTER>
+<HR noshade size="1px">
+<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
+<HR noshade size="1px">
+</CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+<BLOCKQUOTE>
+<P>
+<BR/>
+Während des Versuches, den URL<BR>
+<A HREF="%U">%U</A><BR>
+zu laden, trat der folgende Fehler auf:
+<UL>
+<LI>
+<STRONG>Zugriff verweigert</STRONG>
+</UL>
+
+<P>
+Aufgrund von Zugriffsbeschränkungen ist Ihre Anfrage zur Zeit
+nicht erlaubt.<br>
+Bitte kontaktieren Sie Ihren Service Provider, wenn Sie der Meinung
+sind, daß dies nicht korrekt ist.
+</P>
+
+<P>
+Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
+<BR clear="all">
+<P></P>
+</BLOCKQUOTE>
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+</CENTER>
+</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/de/ERR_CACHE_ACCESS_DENIED b/config/proxy/errors.ipfire/de/ERR_CACHE_ACCESS_DENIED
new file mode 100644
index 0000000..787455a
--- /dev/null
+++ b/config/proxy/errors.ipfire/de/ERR_CACHE_ACCESS_DENIED
@@ -0,0 +1,50 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>FEHLER: Cache-Zugriff Verweigert</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY>
+<CENTER>
+<HR noshade size="1px">
+<H2>Sorry ... Cache-Zugriff Verweigert</H2>
+<HR noshade size="1px">
+</CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+<BLOCKQUOTE>
+<P>
+<BR/>
+Während des Versuches, den URL<BR>
+<A HREF="%U">%U</A><BR>
+zu laden, trat der folgende Fehler auf:
+<UL>
+<LI>
+<STRONG>Cache-Zugriff verweigert</STRONG>
+</P>
+</UL>
+
+<P>Leider sind Sie zur Zeit nicht berechtigt
+<PRE> %U</PRE>
+von diesem Cache zu beziehen, bis Sie sich authentifiziert haben.
+</P>
+
+<P>
+Sie benötigen hierzu Netscape Version 2.0 (oder höher), Microsoft Internet
+Explorer 3.0 oder einen anderen HTTP/1.1 Browser. Bitte kontaktieren Sie
+den <A HREF="mailto:%w">Cache-Administrator</a>, wenn Sie Probleme haben,
+sich zu authentifizieren, oder
+<A HREF="http://%h/cgi-bin/chpasswd.cgi">ändern</a> Sie Ihr Passwort.
+</P>
+<BR clear="all">
+<P></P>
+</BLOCKQUOTE>
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+</CENTER>
+</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/de/ERR_CACHE_MGR_ACCESS_DENIED b/config/proxy/errors.ipfire/de/ERR_CACHE_MGR_ACCESS_DENIED
new file mode 100644
index 0000000..91934be
--- /dev/null
+++ b/config/proxy/errors.ipfire/de/ERR_CACHE_MGR_ACCESS_DENIED
@@ -0,0 +1,52 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>FEHLER: Cache-Manager-Zugriff Verweigert</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY>
+<CENTER>
+<HR noshade size="1px">
+<H2>Sorry ... Cache-Manager-Zugriff verweigert</H2>
+<HR noshade size="1px">
+</CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+<BLOCKQUOTE>
+<P>
+<BR/>
+Während des Versuches, den URL<BR>
+<A HREF="%U">%U</A><BR>
+zu laden, trat der folgende Fehler auf:
+<UL>
+<LI>
+<STRONG>Cache-Manager-Zugriff verweigert</STRONG>
+</UL>
+</P>
+
+<P>Leider sind Sie zur Zeit nicht berechtigt
+<PRE> %U</PRE>
+von diesem Cache zu beziehen, bis Sie sich authentifiziert haben.
+</P>
+
+<P>
+Sie benötigen hierzu Netscape Version 2.0 (oder höher), Microsoft Internet
+Explorer 3.0 oder einen anderen HTTP/1.1 Browser.
+Bitte kontaktieren Sie den <A HREF="mailto:%w">Cache-Administrator</a>, wenn Sie Probleme haben,
+sich zu authentifizieren, oder wenn Sie der Administrator <em>sind</em>,
+lesen Sie die Squid-Dokumentation über das Cache-Manager
+Interface und überprüfen Sie das Cache-Log für detailiertere
+Fehlermeldungen.
+</P>
+<BR clear="all">
+<P></P>
+</BLOCKQUOTE>
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+</CENTER>
+</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/de/ERR_CANNOT_FORWARD b/config/proxy/errors.ipfire/de/ERR_CANNOT_FORWARD
new file mode 100644
index 0000000..ec0fbf5
--- /dev/null
+++ b/config/proxy/errors.ipfire/de/ERR_CANNOT_FORWARD
@@ -0,0 +1,48 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY>
+<CENTER>
+<HR noshade size="1px">
+<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
+<HR noshade size="1px">
+</CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+<BLOCKQUOTE>
+<P>
+<BR/>
+Während des Versuches, den URL<BR>
+<A HREF="%U">%U</A><BR>
+zu laden, trat der folgende Fehler auf:
+<UL>
+<LI>
+<STRONG>Die Anfrage kann zur Zeit nicht weitergeleitet werden</STRONG>
+</UL>
+
+<P>
+Diese Anfrage konnte nicht zum WWW-Server oder einem
+Parent-Cache weitergeleitet werden. Der wahrscheinlichste Grund für
+diesen Fehler ist:
+<UL>
+<LI>Der Cache-Administrator erlaubt nicht, daß dieser Server
+ direkte Verbindungen zu WWW-Servern aufbaut, und
+<LI>alle konfigurierten Parent-Caches sind zur Zeit nicht erreichbar.
+</UL>
+</P>
+<P>
+Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.<BR clear="all">
+<P></P>
+</BLOCKQUOTE>
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+</CENTER>
+</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/de/ERR_CONNECT_FAIL b/config/proxy/errors.ipfire/de/ERR_CONNECT_FAIL
new file mode 100644
index 0000000..c37f441
--- /dev/null
+++ b/config/proxy/errors.ipfire/de/ERR_CONNECT_FAIL
@@ -0,0 +1,46 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY>
+<CENTER>
+<HR noshade size="1px">
+<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
+<HR noshade size="1px">
+</CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+<BLOCKQUOTE>
+<P>
+<BR/>
+Während des Versuches, den URL<BR>
+<A HREF="%U">%U</A><BR>
+zu laden, trat der folgende Fehler auf:
+<UL>
+<LI>
+<STRONG>Verbindung schlug fehl</STRONG>
+</UL>
+
+<P>
+Das System gab:
+<PRE><I> %E</I></PRE>
+zurück.
+<P>
+Der Zielrechner oder das Zielnetzwerk könnten deaktiviert sein.
+Bitte versuchen Sie die Anfrage noch einmal.
+</P>
+<P>
+Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.<BR clear="all">
+<P></P>
+</BLOCKQUOTE>
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+</CENTER>
+</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/de/ERR_DIR_LISTING b/config/proxy/errors.ipfire/de/ERR_DIR_LISTING
new file mode 100644
index 0000000..aabe656
--- /dev/null
+++ b/config/proxy/errors.ipfire/de/ERR_DIR_LISTING
@@ -0,0 +1 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> <html><head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <title>Verzeichnis: %U</title> <style type="text/css"><!-- %l body :lang(fa) { direction: rtl; font-size: 100%; font-family: Tahoma, Roya, sans-serif; float: right; } :lang(he) { direction: rtl; float: right; } --></style> </head><body> <div id="titles"> <h2>Verzeichnis: <a href="%U">%U</a>/</h2> </div> <hr> <div id="content"> <h4>Verzeichnisinhalt:</h4> <blockquote id="data"> <pre id="dirmsg">%z</pre> </blockquote> <table id="dirlisting" summary="Verzeichnis Auflistung"> <tr> <th><a href="../"><img border="0" src="/squid-internal-static/icons/anthony-dirup.gif" alt="Ãbergeordnetes Verzeichnis"></a></th> <th nowrap="nowrap"><a href="../">Ãbergeordnetes Verzeichnis</a> (<a href="/">Stammverzeichnis</a>)</th> </tr> %g </table> </div> <hr> <div id="footer"> <p>Erzeugt am %T von %h (%s)</p> <!-- %c
--> </div> </body></html>
\ No newline at end of file
diff --git a/config/proxy/errors.ipfire/de/ERR_DNS_FAIL b/config/proxy/errors.ipfire/de/ERR_DNS_FAIL
new file mode 100644
index 0000000..ee15b52
--- /dev/null
+++ b/config/proxy/errors.ipfire/de/ERR_DNS_FAIL
@@ -0,0 +1,52 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY>
+<CENTER>
+<HR noshade size="1px">
+<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
+<HR noshade size="1px">
+</CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033"><TD WIDTH="25"></TD>
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="RIGHT" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+<BLOCKQUOTE>
+<P>
+<BR/>
+Während des Versuches, den URL<BR>
+<A HREF="%U">%U</A><BR>
+zu laden, trat der folgende Fehler auf:
+<UL>
+<LI>
+<STRONG>Es war unmöglich, eine IP-Adresse für <I>%H</I>
+zu bestimmen.
+</STRONG>
+</UL>
+
+<P>
+Der DNS-Server gab:
+<BLOCKQUOTE>
+%z
+</BLOCKQUOTE>
+zurück.
+<P>
+ Der Cache war nicht in der Lage, den in der URL enthaltenen Hostnamen
+ aufzulösen.
+ Überprüfen Sie, ob die Adresse korrekt ist.
+</P>
+<P>
+Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
+<BR clear="all">
+<P></P>
+</BLOCKQUOTE>
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+</CENTER>
+</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/de/ERR_ESI b/config/proxy/errors.ipfire/de/ERR_ESI
new file mode 100644
index 0000000..61ffbc0
--- /dev/null
+++ b/config/proxy/errors.ipfire/de/ERR_ESI
@@ -0,0 +1 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> <html><head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <title>FEHLER: Die angeforderte URL konnte nicht gefunden werden</title> <style type="text/css"><!-- %l body :lang(fa) { direction: rtl; font-size: 100%; font-family: Tahoma, Roya, sans-serif; float: right; } :lang(he) { direction: rtl; float: right; } --></style> </head><body> <div id="titles"> <h1>ERROR</h1> <h2>The requested URL could not be retrieved</h2> </div> <hr> <div id="content"> <p>Der folgende Fehler wurde beim Versuch die URL <a href="%U">%U</a> zu holen festgestellt:</p> <blockquote id="error"> <p><b>ESI-Verarbeitung fehlgeschlagen.</b></p> </blockquote> <p>Der ESI-Prozessor meldete:</p> <blockquote id="data"> <pre>%Z</pre> </blockquote> <p>Das heiÃt, dass der Ersatz nicht in der Lage war das ESI Template zu verarbeiten. Bitte melden sie diesen Fehler dem Webmaster.</p> <p>Ihr Webma
ster ist <a href="mailto:%w">%w</a>.</p> <br> </div> <hr> <div id="footer"> <p>Erzeugt am %T von %h (%s)</p> <!-- %c --> </div> </body></html>
\ No newline at end of file
diff --git a/config/proxy/errors.ipfire/de/ERR_FORWARDING_DENIED b/config/proxy/errors.ipfire/de/ERR_FORWARDING_DENIED
new file mode 100644
index 0000000..d805c1a
--- /dev/null
+++ b/config/proxy/errors.ipfire/de/ERR_FORWARDING_DENIED
@@ -0,0 +1,45 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY>
+<CENTER>
+<HR noshade size="1px">
+<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
+<HR noshade size="1px">
+</CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+<BLOCKQUOTE>
+<P>
+<BR/>
+Während des Versuches, den URL<BR>
+<A HREF="%U">%U</A><BR>
+zu laden, trat der folgende Fehler auf:
+<UL>
+<LI>
+<STRONG>Weiterleiten verweigert</STRONG>
+</UL>
+
+<P>
+Dieser Cache wird Ihre Anfrage nicht weiterleiten, da er versucht, eine
+Sibling-Beziehung zu erzwingen.
+Wahrscheinlich ist der Client bei %i ein Cache, der falsch
+konfiguriert wurde. Informieren Sie dessen Administrator und/oder überprüfen
+Sie Ihre Proxy-Einstellungen.
+</P>
+<P>
+Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.<BR clear="all">
+<P></P>
+</BLOCKQUOTE>
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+</CENTER>
+</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/de/ERR_FTP_DISABLED b/config/proxy/errors.ipfire/de/ERR_FTP_DISABLED
new file mode 100644
index 0000000..325dd24
--- /dev/null
+++ b/config/proxy/errors.ipfire/de/ERR_FTP_DISABLED
@@ -0,0 +1,41 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY>
+<CENTER>
+<HR noshade size="1px">
+<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
+<HR noshade size="1px">
+</CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+<BLOCKQUOTE>
+<P>
+<BR/>
+Während des Versuches, den URL<BR>
+<A HREF="%U">%U</A><BR>
+zu laden, trat der folgende Fehler auf:
+<UL>
+<LI>
+<STRONG>FTP ist deaktiviert</STRONG>
+</UL>
+
+<P>
+Dieser Cache unterstützt kein FTP.
+</P>
+<P>
+Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.<BR clear="all">
+<P></P>
+</BLOCKQUOTE>
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+</CENTER>
+</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/de/ERR_FTP_FAILURE b/config/proxy/errors.ipfire/de/ERR_FTP_FAILURE
new file mode 100644
index 0000000..514335c
--- /dev/null
+++ b/config/proxy/errors.ipfire/de/ERR_FTP_FAILURE
@@ -0,0 +1,47 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY>
+<CENTER>
+<HR noshade size="1px">
+<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
+<HR noshade size="1px">
+</CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+<BLOCKQUOTE>
+<P>
+<BR/>
+Ein FTP-Protokollfehler ist aufgetreten
+während des Versuches, den URL:
+<A HREF="%U">%U</A><BR>
+zu laden.
+
+<P>
+Squid sendete den folgenden FTP-Befehl:
+<PRE><STRONG> %f</STRONG></PRE>
+und erhielt die Antwort:
+<PRE><STRONG> %F</STRONG></PRE>
+<P>
+Dies könnte durch einen FTP-URL verursacht worden sein, der ein
+absoluter Pfad ist (was nicht der RFC 1738 entspricht).
+Wenn dies der Fall sein sollte, kann die Datei unter <A
+HREF="%B">%B</A> gefunden werden.
+</P>
+<P>
+Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
+<BR clear="all">
+<P></P>
+</BLOCKQUOTE>
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+</CENTER>
+</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/de/ERR_FTP_FORBIDDEN b/config/proxy/errors.ipfire/de/ERR_FTP_FORBIDDEN
new file mode 100644
index 0000000..e48bf26
--- /dev/null
+++ b/config/proxy/errors.ipfire/de/ERR_FTP_FORBIDDEN
@@ -0,0 +1,41 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY>
+<CENTER>
+<HR noshade size="1px">
+<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
+<HR noshade size="1px">
+</CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+<BLOCKQUOTE>
+<P>
+<BR/>
+Ein FTP-Berechtigungsfehlschlag ist aufgetreten während des Versuches, den URL: <A HREF="%U">%U</A><BR>
+zu laden.
+<P>
+Squid sendete den folgenden FTP-Befehl:
+<blockquote><strong><pre>%f</pre></strong></blockquote>
+und erhielt die Antwort:
+<blockquote><strong><pre>%F</pre></strong></blockquote>
+<blockquote><strong><pre>%g</pre></strong></blockquote>
+</P>
+
+<P>
+Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
+<BR clear="all">
+<P></P>
+</BLOCKQUOTE>
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+</CENTER>
+</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/de/ERR_FTP_NOT_FOUND b/config/proxy/errors.ipfire/de/ERR_FTP_NOT_FOUND
new file mode 100644
index 0000000..cf66f73
--- /dev/null
+++ b/config/proxy/errors.ipfire/de/ERR_FTP_NOT_FOUND
@@ -0,0 +1,46 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY>
+<CENTER>
+<HR noshade size="1px">
+<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
+<HR noshade size="1px">
+</CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+<BLOCKQUOTE>
+<P>
+<BR/>
+Während des Versuches, den URL<BR>
+<A HREF="%U">%U</A><BR>
+zu laden, trat ein Problem auf:
+<P>
+Squid sendete den folgenden FTP-Befehl:
+<blockquote><strong><pre>%f</pre></strong></blockquote>
+und erhielt die Antwort:
+<blockquote><strong><pre>%F</pre></strong></blockquote>
+<blockquote><strong><pre>%g</pre></strong></blockquote>
+<P>
+Dies könnte durch einen FTP-URL verursacht worden sein, der ein
+absoluter Pfad ist (was nicht der RFC 1738 entspricht).
+Wenn dies der Fall sein sollte, kann die Datei unter <A href="%B">%B</A> gefunden werden.
+</P>
+
+<P>
+Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
+<BR clear="all">
+<P></P>
+</BLOCKQUOTE>
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+</CENTER>
+</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/de/ERR_FTP_PUT_CREATED b/config/proxy/errors.ipfire/de/ERR_FTP_PUT_CREATED
new file mode 100644
index 0000000..28d34d4
--- /dev/null
+++ b/config/proxy/errors.ipfire/de/ERR_FTP_PUT_CREATED
@@ -0,0 +1,23 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>FTP PUT Erfolgreich: Datei angelegt</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY>
+<CENTER>
+<HR noshade size="1px">
+<H2>Datei angelegt</H2>
+<HR noshade size="1px">
+</CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+</CENTER>
+</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/de/ERR_FTP_PUT_ERROR b/config/proxy/errors.ipfire/de/ERR_FTP_PUT_ERROR
new file mode 100644
index 0000000..59a7620
--- /dev/null
+++ b/config/proxy/errors.ipfire/de/ERR_FTP_PUT_ERROR
@@ -0,0 +1,42 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>FEHLER: FTP Upload fehlgeschlagen</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY>/
+<CENTER>
+<HR noshade size="1px">
+<H2>Sorry ... FTP PUT/Upload fehlgeschlagen</H2>
+<HR noshade size="1px">
+<CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+<BLOCKQUOTE>
+<P>
+<BR/>
+Während dem PUT/Upload-Versuch zum URL:
+<A HREF="%U">%U</A><BR>
+<P>
+Squid sendete den folgenden FTP-Befehl:
+<PRE><STRONG> %f</STRONG></PRE>
+und erhielt die Antwort:
+<PRE><STRONG> %F</STRONG></PRE>
+<P>
+Überprüfen Sie den Pfad, die Zugriffsrechte und den
+Plattenplatz. Versuchen Sie es dann erneut.
+</P>
+<P>
+Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
+<BR clear="all">
+<P></P>
+</BLOCKQUOTE>
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+<CENTER>
+</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/de/ERR_FTP_PUT_MODIFIED b/config/proxy/errors.ipfire/de/ERR_FTP_PUT_MODIFIED
new file mode 100644
index 0000000..26aa7ff
--- /dev/null
+++ b/config/proxy/errors.ipfire/de/ERR_FTP_PUT_MODIFIED
@@ -0,0 +1,23 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>FTP PUT erfolgreich: Datei aktualisiert</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY>
+<CENTER>
+<HR noshade size="1px">
+<H2>Datei aktualisiert</H2>
+<HR noshade size="1px">
+</CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+</CENTER>
+</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/de/ERR_FTP_UNAVAILABLE b/config/proxy/errors.ipfire/de/ERR_FTP_UNAVAILABLE
new file mode 100644
index 0000000..3413832
--- /dev/null
+++ b/config/proxy/errors.ipfire/de/ERR_FTP_UNAVAILABLE
@@ -0,0 +1,41 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY><CENTER>
+<HR noshade size="1px">
+<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
+<HR noshade size="1px">
+</CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+<BLOCKQUOTE>
+<P>
+<BR/>
+Der FTP Server war zu beschäftigt während des Versuches, den URL<BR>
+<A HREF="%U">%U</A><BR>
+zu laden.
+<P>
+Squid sendete den folgenden FTP-Befehl:
+<blockquote><strong><pre>%f</pre></strong></blockquote>
+und erhielt die Antwort:
+<blockquote><strong><pre>%F</pre></strong></blockquote>
+<blockquote><strong><pre>%g</pre></strong></blockquote>
+</P>
+
+<P>
+Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
+<BR clear="all">
+<P></P>
+</BLOCKQUOTE>
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+</CENTER>
+</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/de/ERR_ICAP_FAILURE b/config/proxy/errors.ipfire/de/ERR_ICAP_FAILURE
new file mode 100644
index 0000000..ed9246f
--- /dev/null
+++ b/config/proxy/errors.ipfire/de/ERR_ICAP_FAILURE
@@ -0,0 +1 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> <html><head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <title>FEHLER: Die angeforderte URL konnte nicht gefunden werden</title> <style type="text/css"><!-- %l body :lang(fa) { direction: rtl; font-size: 100%; font-family: Tahoma, Roya, sans-serif; float: right; } :lang(he) { direction: rtl; float: right; } --></style> </head><body> <div id="titles"> <h1>ERROR</h1> <h2>The requested URL could not be retrieved</h2> </div> <hr> <div id="content"> <p>Der folgende Fehler wurde beim Versuch die URL <a href="%U">%U</a> zu holen festgestellt:</p> <blockquote id="error"> <p><b>ICAP Protokoll Fehler.</b></p> </blockquote> <p id="sysmsg">Das System antwortete: <i>%E</i></p> <p>Das heiÃt, dass etwas mit der ICAP Kommunikation nicht stimmt.</p> <p>Mögliche Probleme sind:</p> <ul> <li><p>Der ICAP Server ist nicht erreichbar.</p></li> <li><p>Die Antwort des ICAP S
ervers war ungÃŒltig.</p></li> </ul> <br> </div> <hr> <div id="footer"> <p>Erzeugt am %T von %h (%s)</p> <!-- %c --> </div> </body></html>
\ No newline at end of file
diff --git a/config/proxy/errors.ipfire/de/ERR_INVALID_REQ b/config/proxy/errors.ipfire/de/ERR_INVALID_REQ
new file mode 100644
index 0000000..e6a72a4
--- /dev/null
+++ b/config/proxy/errors.ipfire/de/ERR_INVALID_REQ
@@ -0,0 +1,54 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY>
+<CENTER>
+<HR noshade size="1px">
+<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
+<HR noshade size="1px">
+</CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+<BLOCKQUOTE>
+<P>
+<BR/>
+Während des Versuches, die Anfrage
+<PRE>
+%R
+</PRE>
+zu verarbeiten, trat der folgende Fehler auf:
+<UL>
+<LI>
+<STRONG>Ungültige Anfrage</STRONG>
+</UL>
+
+<P>
+Ein Teil der HTTP-Anfrage ist ungültig. Mögliche Gründe:
+<UL>
+<LI>Fehlende oder unbekannte Anfrage-Methode (GET, POST)
+<LI>Fehlender URL
+<LI>Fehlender HTTP Identifier (HTTP/1.0)
+<LI>Anfrage ist zu groß
+<LI>Content-Length fehlt für POST- oder PUT-Anfragen
+<LI>Ungültige Zeichen im Hostnamen - z.B. Unterstriche ('_'),
+ Umlaute und Kommata sind nicht erlaubt.
+</UL>
+</P>
+
+<P>
+Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
+<BR clear="all">
+<P></P>
+</BLOCKQUOTE>
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+</CENTER>
+</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/de/ERR_INVALID_RESP b/config/proxy/errors.ipfire/de/ERR_INVALID_RESP
new file mode 100644
index 0000000..e695c41
--- /dev/null
+++ b/config/proxy/errors.ipfire/de/ERR_INVALID_RESP
@@ -0,0 +1,49 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY>
+<CENTER>
+<HR noshade size="1px">
+<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
+<HR noshade size="1px">
+</CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+<BLOCKQUOTE>
+<P>
+<BR/>
+Während des Versuches, die Anfrage
+<PRE>
+%R
+</PRE>
+<P>
+zu verarbeiten, trat der folgende Fehler auf:
+<UL>
+<LI>
+<STRONG>
+Ungültige Antwort
+</STRONG>
+</UL>
+
+<P>
+Die HTTP Antwortmeldung des kontaktierten Servers konnte nicht verstanden werden
+oder war auf andere Weise missgebildet. Bitte kontaktieren Sie den Betreiber der
+betreffenden Webseite. Wenn nötig kann Ihr Cache Administrator in der Lage sein,
+Sie mit mehr Details über die genaue Ursache des Problems zu versorgen.
+
+<P>Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
+<BR clear="all">
+<P></P>
+</BLOCKQUOTE>
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+</CENTER>
+</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/de/ERR_INVALID_URL b/config/proxy/errors.ipfire/de/ERR_INVALID_URL
new file mode 100644
index 0000000..fdf23f9
--- /dev/null
+++ b/config/proxy/errors.ipfire/de/ERR_INVALID_URL
@@ -0,0 +1,50 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY>
+<CENTER>
+<HR noshade size="1px">
+<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
+<HR noshade size="1px">
+</CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+<BLOCKQUOTE>
+<P>
+<BR/>
+Während des Versuches, den URL<BR>
+<A HREF="%U">%U</A><BR>
+zu laden, trat der folgende Fehler auf:
+<UL>
+<LI>
+<STRONG>Ungültiger URL</STRONG>
+</UL>
+
+<P>
+Ein Teil des angefragten URL ist ungültig. Mögliche Gründe:
+<UL>
+<LI>Fehlendes oder unkorrektes Zugriffsprotokoll (sollte 'http://' oder ähnlich sein)
+<LI>Fehlender Hostname
+<LI>Ungültiges 'double-escape' im URL-Pfad
+<LI>Ungültige Zeichen im Hostnamen - z.B. Unterstriche ('_'),
+ Umlaute und Kommata sind nicht erlaubt.
+</UL>
+</P>
+
+<P>
+Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
+<BR clear="all">
+<P></P>
+</BLOCKQUOTE>
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+</CENTER>
+</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/de/ERR_LIFETIME_EXP b/config/proxy/errors.ipfire/de/ERR_LIFETIME_EXP
new file mode 100644
index 0000000..ca97508
--- /dev/null
+++ b/config/proxy/errors.ipfire/de/ERR_LIFETIME_EXP
@@ -0,0 +1,44 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY>
+<CENTER>
+<HR noshade size="1px">
+<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
+<HR noshade size="1px">
+</CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+<BLOCKQUOTE>
+<P>
+<BR/>
+Während des Versuches, den URL<BR>
+<A HREF="%U">%U</A><BR>
+zu laden, trat der folgende Fehler auf:
+<UL>
+<LI>
+<STRONG>Verbindungs-Lebensdauer ist abgelaufen</STRONG>
+</UL>
+
+<P>
+Squid hat die Anfrage abgebrochen, weil sie die maximale
+Verbindungs-Lebensdauer überschritten hat.
+</P>
+
+<P>
+Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
+<BR clear="all">
+<P></P>
+</BLOCKQUOTE>
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+</CENTER>
+</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/de/ERR_NO_RELAY b/config/proxy/errors.ipfire/de/ERR_NO_RELAY
new file mode 100644
index 0000000..46bc51e
--- /dev/null
+++ b/config/proxy/errors.ipfire/de/ERR_NO_RELAY
@@ -0,0 +1,41 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY>
+<CENTER>
+<HR noshade size="1px">
+<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
+<HR noshade size="1px">
+</CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+<BLOCKQUOTE>
+<P>
+<BR/>
+Während des Versuches, den URL<BR>
+<A HREF="%U">%U</A><BR>
+zu laden, trat der folgende Fehler auf:
+<UL>
+<LI>
+<STRONG>Kein WAIS-Relay</STRONG>
+</UL>
+
+<P>
+Es sind keine WAIS-Relay-Rechner für diesen Cache definiert.
+Teilen Sie dies Ihrem <A HREF="mailto:%w">Cache Administrator</A> mit.
+</P>
+<BR clear="all">
+<P></P>
+</BLOCKQUOTE>
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+</CENTER>
+</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/de/ERR_ONLY_IF_CACHED_MISS b/config/proxy/errors.ipfire/de/ERR_ONLY_IF_CACHED_MISS
new file mode 100644
index 0000000..e77d17b
--- /dev/null
+++ b/config/proxy/errors.ipfire/de/ERR_ONLY_IF_CACHED_MISS
@@ -0,0 +1,47 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY>
+<CENTER>
+<HR noshade size="1px">
+<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
+<HR noshade size="1px">
+</CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+<BLOCKQUOTE>
+<P>
+<BR/>
+Während des Versuches, den URL<BR>
+<A HREF="%U">%U</A><BR>
+zu laden, trat der folgende Fehler auf:
+<UL>
+<LI>
+<STRONG>Ein gültiges Dokument wurde nicht im Cache gefunden, und die '<code>only-if-cached</code> directive' war angegeben.
+</STRONG>
+</UL>
+
+<P>
+Sie haben eine Anfrage mit einer <code>only-if-cached</code>
+Cache-Control-Direktive abgeschickt. Das Dokument wurde nicht im Cache gefunden,
+<em>oder</em> es hätte eine Überprüfung benötigt,
+die durch die <code>only-if-cached</code> dicective verboten wurde.
+</P>
+
+<P>
+Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
+<BR clear="all">
+<P></P>
+</BLOCKQUOTE>
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+</CENTER>
+</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/de/ERR_READ_ERROR b/config/proxy/errors.ipfire/de/ERR_READ_ERROR
new file mode 100644
index 0000000..c4f8a78
--- /dev/null
+++ b/config/proxy/errors.ipfire/de/ERR_READ_ERROR
@@ -0,0 +1,48 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY>
+<CENTER>
+<HR noshade size="1px">
+<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
+<HR noshade size="1px">
+</CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+<BLOCKQUOTE>
+<P>
+<BR/>
+Während des Versuches, den URL<BR>
+<A HREF="%U">%U</A><BR>
+zu laden, trat der folgende Fehler auf:
+<UL>
+<LI>
+<STRONG>Lesefehler</STRONG>
+</UL>
+
+<P>
+Das System gab:
+<PRE><I> %E</I></PRE>
+zurück.
+<P>
+Bei dem Versuch, Daten vom Netzwerk zu lesen, trat ein Fehler
+auf. Bitte versuchen Sie Ihre Anfrage erneut.
+</P>
+
+<P>
+Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
+<BR clear="all">
+<P></P>
+</BLOCKQUOTE>
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+</CENTER>
+</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/de/ERR_READ_TIMEOUT b/config/proxy/errors.ipfire/de/ERR_READ_TIMEOUT
new file mode 100644
index 0000000..04c72bf
--- /dev/null
+++ b/config/proxy/errors.ipfire/de/ERR_READ_TIMEOUT
@@ -0,0 +1,50 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY>
+<CENTER>
+<HR noshade size="1px">
+<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
+<HR noshade size="1px">
+</CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+<BLOCKQUOTE>
+<P>
+<BR/>
+Während des Versuches, den URL<BR>
+<A HREF="%U">%U</A><BR>
+zu laden, trat der folgende Fehler auf:
+<UL>
+<LI>
+<STRONG>Read Timeout</STRONG>
+</UL>
+
+<P>
+Das System gab:
+<PRE><I> %E</I></PRE>
+zurück.
+<P>
+Bei dem Versuch Daten vom Netzwerk zu lesen, mußte zu lange
+gewartet werden (timeout).
+Das Netzwerk oder der Server könnten deaktiviert oder
+überlastet sein. Bitte versuchen Sie Ihre Anfrage erneut.
+</P>
+
+<P>
+Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
+<BR clear="all">
+<P></P>
+</BLOCKQUOTE>
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+</CENTER>
+</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/de/ERR_SECURE_CONNECT_FAIL b/config/proxy/errors.ipfire/de/ERR_SECURE_CONNECT_FAIL
new file mode 100644
index 0000000..4f42383
--- /dev/null
+++ b/config/proxy/errors.ipfire/de/ERR_SECURE_CONNECT_FAIL
@@ -0,0 +1 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> <html><head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <title>FEHLER: Die angeforderte URL konnte nicht gefunden werden</title> <style type="text/css"><!-- %l body :lang(fa) { direction: rtl; font-size: 100%; font-family: Tahoma, Roya, sans-serif; float: right; } :lang(he) { direction: rtl; float: right; } --></style> </head><body> <div id="titles"> <h1>ERROR</h1> <h2>The requested URL could not be retrieved</h2> </div> <hr> <div id="content"> <p>Der folgende Fehler wurde beim Versuch die URL <a href="%U">%U</a> zu holen festgestellt:</p> <blockquote id="error"> <p><b>Konnte keine sichere Verbindung zu %I herstellen</b></p> </blockquote> <p id="sysmsg">Das System antwortete: <i>%E</i></p> <p>Dieser Proxy und der Zielhost waren nicht in der Lage Sicherheitseinstellungen auszuhandeln die beidseitig akzeptiert werden. Es ist möglich dass der Zielhost kei
ne sicheren Verbindungen unterstÃŒtzte oder der Proxy nicht mit dem Sicherheitszertifikat des Hosts einverstanden ist.</p> <p>Ihr Cache Administrator ist <a href="mailto:%w%W">%w</a>.</p> <br> </div> <hr> <div id="footer"> <p>Erzeugt am %T von %h (%s)</p> <!-- %c --> </div> </body></html>
\ No newline at end of file
diff --git a/config/proxy/errors.ipfire/de/ERR_SHUTTING_DOWN b/config/proxy/errors.ipfire/de/ERR_SHUTTING_DOWN
new file mode 100644
index 0000000..66b001e
--- /dev/null
+++ b/config/proxy/errors.ipfire/de/ERR_SHUTTING_DOWN
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY>
+<CENTER>
+<HR noshade size="1px">
+<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
+<HR noshade size="1px">
+</CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+<BLOCKQUOTE>
+<P>
+<BR/>
+Während des Versuches, den URL<BR>
+<A HREF="%U">%U</A><BR>
+zu laden, trat folgendes Problem auf:
+
+<UL>
+<LI>Dieser Cache ist im Begriff herunterzufahren und kann Ihre Anfrage
+zur Zeit nicht bearbeiten. Bitte wiederholen Sie Ihre Anfrage etwas später.
+</UL>
+
+<P>
+Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
+<BR clear="all">
+<P></P>
+</BLOCKQUOTE>
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+</CENTER>
+</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/de/ERR_SOCKET_FAILURE b/config/proxy/errors.ipfire/de/ERR_SOCKET_FAILURE
new file mode 100644
index 0000000..27241e2
--- /dev/null
+++ b/config/proxy/errors.ipfire/de/ERR_SOCKET_FAILURE
@@ -0,0 +1,49 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY>
+<CENTER>
+<HR noshade size="1px">
+<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
+<HR noshade size="1px">
+</CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+<BLOCKQUOTE>
+<P>
+<BR/>
+Während des Versuches, den URL<BR>
+<A HREF="%U">%U</A><BR>
+zu laden, trat der folgende Fehler auf:
+<UL>
+<LI>
+<STRONG>Socket Failure</STRONG>
+</UL>
+
+<P>
+Das System gab:
+<PRE><I> %E</I></PRE>
+zurück.
+<P>
+Squid ist nicht in der Lage, einen TCP-Socket zu öffnen,
+wahrscheinlich wegen extremer Überlastung.
+Bitte versuchen Sie Ihre Anfrage erneut.
+</P>
+
+<P>
+Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
+<BR clear="all">
+<P></P>
+</BLOCKQUOTE>
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+</CENTER>
+</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/de/ERR_TOO_BIG b/config/proxy/errors.ipfire/de/ERR_TOO_BIG
new file mode 100644
index 0000000..445c086
--- /dev/null
+++ b/config/proxy/errors.ipfire/de/ERR_TOO_BIG
@@ -0,0 +1,50 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY>
+<CENTER>
+<HR noshade size="1px">
+<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
+<HR noshade size="1px">
+</CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+<BLOCKQUOTE>
+<P>
+<BR/>
+Während des Versuches, den URL<BR>
+<A HREF="%U">%U</A><BR>
+zu laden, trat folgendes Problem auf:
+<UL>
+<LI>
+<STRONG>
+Die Anfrage oder die Antwort ist zu groß.
+</STRONG>
+</UL>
+
+<P>
+Wenn Sie eine POST oder PUT Anfrage gemacht haben, dann ist der 'request body'
+(das was Sie versucht haben hochzuladen) zu groß. Wenn Sie eine GET
+Anfrage gemacht haben, dann ist der 'reply body' (das was Sie versuchen
+herunterzuladen) zu groß. Diese Beschränkungen wurden von Ihrem
+Internet Service Provider, der diesen Cache Server unterhält, festgelegt.
+Bitte setzen Sie sich direkt mit ihm in Kontakt wenn Sie meinen, daß
+dies ein Fehler ist.
+
+<P>
+Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
+<BR clear="all">
+<P></P>
+</BLOCKQUOTE>
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+</CENTER>
+</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/de/ERR_UNSUP_HTTPVERSION b/config/proxy/errors.ipfire/de/ERR_UNSUP_HTTPVERSION
new file mode 100644
index 0000000..4cc1cda
--- /dev/null
+++ b/config/proxy/errors.ipfire/de/ERR_UNSUP_HTTPVERSION
@@ -0,0 +1 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> <html><head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <title>FEHLER: Die angeforderte URL konnte nicht gefunden werden</title> <style type="text/css"><!-- %l body :lang(fa) { direction: rtl; font-size: 100%; font-family: Tahoma, Roya, sans-serif; float: right; } :lang(he) { direction: rtl; float: right; } --></style> </head><body> <div id="titles"> <h1>ERROR</h1> <h2>Nicht unterstÃŒtzte HTTP Version</h2> </div> <hr> <div id="content"> <p>Der folgende Fehler wurde beim Versuch die URL <a href="%U">%U</a> zu holen festgestellt:</p> <blockquote id="error"> <p><b>Unsupported HTTP version</b></p> </blockquote> <p>Dieser Squid akzeptiert die angeforderte HTTP Version nicht.</p> <p>Ihr Cache Administrator ist <a href="mailto:%w%W">%w</a>.</p> <br> </div> <hr> <div id="footer"> <p>Erzeugt am %T von %h (%s)</p> <!-- %c --> </div> </body></html>
\ No newline at end of file
diff --git a/config/proxy/errors.ipfire/de/ERR_UNSUP_REQ b/config/proxy/errors.ipfire/de/ERR_UNSUP_REQ
new file mode 100644
index 0000000..6abfd3f
--- /dev/null
+++ b/config/proxy/errors.ipfire/de/ERR_UNSUP_REQ
@@ -0,0 +1,45 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY>
+<CENTER>
+<HR noshade size="1px">
+<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
+<HR noshade size="1px">
+</CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+<BLOCKQUOTE>
+<P>
+<BR/>
+Während des Versuches, den URL<BR>
+<A HREF="%U">%U</A><BR>
+zu laden, trat der folgende Fehler auf:
+<UL>
+<LI>
+<STRONG>Nicht unterstützte Zugriffsmethode oder nicht unterstütztes Protokoll</STRONG>
+</UL>
+
+<P>
+Squid unterstützt nicht alle Anfragemethoden für alle
+Zugriffsprotokolle.
+Beispielsweise können Sie keine Gopher-Anfrage POST'en.
+</P>
+
+<P>
+Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
+<BR clear="all">
+<P></P>
+</BLOCKQUOTE>
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+</CENTER>
+</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/de/ERR_URN_RESOLVE b/config/proxy/errors.ipfire/de/ERR_URN_RESOLVE
new file mode 100644
index 0000000..bed94e3
--- /dev/null
+++ b/config/proxy/errors.ipfire/de/ERR_URN_RESOLVE
@@ -0,0 +1,43 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>FEHLER: Die angeforderete URN konnte nicht geholt werden</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY>
+<CENTER>
+<HR noshade size="1px">
+<H2>Sorry ... Ein URL für den angeforderten URN konnte nicht geholt werden</H2>
+<HR noshade size="1px">
+</CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+<BLOCKQUOTE>
+<P>
+<BR/>
+Während des Versuches, den URN
+<A HREF="%U">%U</A><BR>
+zu laden, trat der folgende Fehler auf:
+<UL>
+<LI>
+<STRONG>Die URN konnte nicht aufgelöst werden</STRONG>
+</UL>
+
+<P>
+Erwarten Sie nicht zu viel von URNs auf %T
+</P>
+
+<P>
+Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
+<BR clear="all">
+<P></P>
+</BLOCKQUOTE>
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+</CENTER>
+</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/de/ERR_WRITE_ERROR b/config/proxy/errors.ipfire/de/ERR_WRITE_ERROR
new file mode 100644
index 0000000..0d29f22
--- /dev/null
+++ b/config/proxy/errors.ipfire/de/ERR_WRITE_ERROR
@@ -0,0 +1,48 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY>
+<CENTER>
+<HR noshade size="1px">
+<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
+<HR noshade size="1px">
+</CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+<BLOCKQUOTE>
+<P>
+<BR/>
+Während des Versuches, den URL<BR>
+<A HREF="%U">%U</A><BR>
+zu laden, trat der folgende Fehler auf:
+<UL>
+<LI>
+<STRONG>Schreibfehler</STRONG>
+</UL>
+
+<P>
+Das System gab:
+<PRE><I> %E</I></PRE>
+zurück.
+<P>
+Ein Fehler trat während des Schreibens zum Netzwerk auf.
+Bitte wiederholen Sie Ihre Anfrage.
+</P>
+
+<P>
+Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
+<BR clear="all">
+<P></P>
+</BLOCKQUOTE>
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+</CENTER>
+</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/de/ERR_ZERO_SIZE_OBJECT b/config/proxy/errors.ipfire/de/ERR_ZERO_SIZE_OBJECT
new file mode 100644
index 0000000..be1a830
--- /dev/null
+++ b/config/proxy/errors.ipfire/de/ERR_ZERO_SIZE_OBJECT
@@ -0,0 +1,43 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>FEHLER: Die angeforderte URL konnte nicht geholt werden</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY>
+<CENTER>
+<HR noshade size="1px">
+<H2>Sorry ... Die angeforderte URL konnte nicht geholt werden</H2>
+<HR noshade size="1px">
+</CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+<BLOCKQUOTE>
+<P>
+<BR/>
+Während des Versuches, den URL<BR>
+<A HREF="%U">%U</A><BR>
+zu laden, trat der folgende Fehler auf:
+<UL>
+<LI>
+<STRONG>Leeres Dokument</STRONG>
+</UL>
+
+<P>
+Squid hat keinerlei Daten auf diese Anfrage empfangen.
+</P>
+
+<P>
+Ihr Cache Administrator ist <A HREF="mailto:%w">%w</A>.
+<BR clear="all">
+<P></P>
+</BLOCKQUOTE>
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+</CENTER>
+</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/en/ERR_ACCESS_DENIED b/config/proxy/errors.ipfire/en/ERR_ACCESS_DENIED
new file mode 100644
index 0000000..45b686b
--- /dev/null
+++ b/config/proxy/errors.ipfire/en/ERR_ACCESS_DENIED
@@ -0,0 +1,44 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY>
+<CENTER>
+<HR noshade size="1px">
+<H2>Sorry ... The requested URL could not be retrieved</H2>
+<HR noshade size="1px">
+</CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+<BLOCKQUOTE>
+<P>
+<BR/>
+While trying to retrieve the URL:
+<A HREF="%U">%U</A>
+<P>
+The following error was encountered:
+<UL>
+<LI>
+<STRONG>
+Access Denied.
+</STRONG>
+<P>
+Access control configuration prevents your request from
+being allowed at this time. Please contact your service provider if
+you feel this is incorrect.
+</UL>
+<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
+<BR clear="all">
+<P></P>
+</BLOCKQUOTE>
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+</CENTER>
+</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/en/ERR_CACHE_ACCESS_DENIED b/config/proxy/errors.ipfire/en/ERR_CACHE_ACCESS_DENIED
new file mode 100644
index 0000000..beccfe3
--- /dev/null
+++ b/config/proxy/errors.ipfire/en/ERR_CACHE_ACCESS_DENIED
@@ -0,0 +1,53 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>ERROR: Cache Access Denied</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY>
+<CENTER>
+<HR noshade size="1px">
+<H2>Sorry ... Cache Access Denied</H2>
+<HR noshade size="1px">
+</CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+<BLOCKQUOTE>
+<P>
+<BR/>
+While trying to retrieve the URL:
+<A HREF="%U">%U</A>
+<P>
+The following error was encountered:
+<UL>
+<LI>
+<STRONG>
+Cache Access Denied.
+</STRONG>
+</UL>
+</P>
+
+<P>Sorry, you are not currently allowed to request:
+<PRE> %U</PRE>
+from this cache until you have authenticated yourself.
+</P>
+
+<P>
+You need to use Netscape version 2.0 or greater, or Microsoft Internet
+Explorer 3.0, or an HTTP/1.1 compliant browser for this to work. Please
+contact the <A HREF="mailto:%w">cache administrator</a> if you have
+difficulties authenticating yourself or
+<A HREF="http://%h/cgi-bin/chpasswd.cgi">change</a> your default password.
+</P>
+<BR clear="all">
+<P></P>
+</BLOCKQUOTE>
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+</CENTER>
+</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/en/ERR_CACHE_MGR_ACCESS_DENIED b/config/proxy/errors.ipfire/en/ERR_CACHE_MGR_ACCESS_DENIED
new file mode 100644
index 0000000..b8beae0
--- /dev/null
+++ b/config/proxy/errors.ipfire/en/ERR_CACHE_MGR_ACCESS_DENIED
@@ -0,0 +1,52 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>ERROR: Cache Manager Access Denied</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY>
+<CENTER>
+<HR noshade size="1px">
+<H2>Sorry ... Cache Manager Access Denied</H2>
+<HR noshade size="1px">
+</CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+<BLOCKQUOTE>
+<P>
+<BR/>
+While trying to retrieve the URL:
+<A HREF="%U">%U</A>
+<P>
+The following error was encountered:
+<UL>
+<LI>
+<STRONG>
+Cache Manager Access Denied.
+</STRONG>
+</UL>
+</P>
+
+<P>Sorry, you are not currently allowed to request:
+<PRE> %U</PRE>
+from this cache manager until you have authenticated yourself.
+</P>
+
+<P> You need to use Netscape version 2.0 or greater, or Microsoft Internet
+Explorer 3.0, or an HTTP/1.1 compliant browser for this to work. Please
+contact the <A HREF="mailto:%w">cache administrator</a> if you have
+difficulties authenticating yourself or, if you <em>are</em> the
+administrator, read Squid documentation on cache manager interface and check
+cache log for more detailed error messages.</P>
+<BR clear="all">
+<P></P>
+</BLOCKQUOTE>
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+</CENTER>
+</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/en/ERR_CANNOT_FORWARD b/config/proxy/errors.ipfire/en/ERR_CANNOT_FORWARD
new file mode 100644
index 0000000..6356a7c
--- /dev/null
+++ b/config/proxy/errors.ipfire/en/ERR_CANNOT_FORWARD
@@ -0,0 +1,49 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY>
+<CENTER>
+<HR noshade size="1px">
+<H2>Sorry ... The requested URL could not be retrieved</H2>
+<HR noshade size="1px">
+</CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+<BLOCKQUOTE>
+<P>
+<BR/>
+While trying to retrieve the URL:
+<A HREF="%U">%U</A>
+<P>
+The following error was encountered:
+<UL>
+<LI>
+<STRONG>
+Unable to forward this request at this time.
+</STRONG>
+</UL>
+
+<P>
+This request could not be forwarded to the origin server or to any
+parent caches. The most likely cause for this error is that:
+<UL>
+<LI>The cache administrator does not allow this cache to make
+ direct connections to origin servers, and
+<LI>All configured parent caches are currently unreachable.
+</UL>
+<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
+<BR clear="all">
+<P></P>
+</BLOCKQUOTE>
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+</CENTER>
+</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/en/ERR_CONNECT_FAIL b/config/proxy/errors.ipfire/en/ERR_CONNECT_FAIL
new file mode 100644
index 0000000..40af3e5
--- /dev/null
+++ b/config/proxy/errors.ipfire/en/ERR_CONNECT_FAIL
@@ -0,0 +1,47 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY>
+<CENTER>
+<HR noshade size="1px">
+<H2>Sorry ... The requested URL could not be retrieved</H2>
+<HR noshade size="1px">
+</CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+<BLOCKQUOTE>
+<P>
+<BR/>
+While trying to retrieve the URL:
+<A HREF="%U">%U</A>
+<P>
+The following error was encountered:
+<UL>
+<LI>
+<STRONG>
+Connection to %I Failed
+</STRONG>
+</UL>
+
+<P>
+The system returned:
+<PRE><I> %E</I></PRE>
+
+<P>
+The remote host or network may be down. Please try the request again.
+<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
+<BR clear="all">
+<P></P>
+</BLOCKQUOTE>
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+</CENTER>
+</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/en/ERR_DIR_LISTING b/config/proxy/errors.ipfire/en/ERR_DIR_LISTING
new file mode 100644
index 0000000..d7f0f38
--- /dev/null
+++ b/config/proxy/errors.ipfire/en/ERR_DIR_LISTING
@@ -0,0 +1 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> <html><head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <title>Directory: %U</title> <style type="text/css"><!-- %l body :lang(fa) { direction: rtl; font-size: 100%; font-family: Tahoma, Roya, sans-serif; float: right; } :lang(he) { direction: rtl; float: right; } --></style> </head><body> <div id="titles"> <h2>Directory: <a href="%U">%U</a>/</h2> </div> <hr> <div id="content"> <h4>Directory Content:</h4> <blockquote id="data"> <pre id="dirmsg">%z</pre> </blockquote> <table id="dirlisting" summary="Directory Listing"> <tr> <th><a href="../"><img border="0" src="/squid-internal-static/icons/anthony-dirup.gif" alt="Parent Directory"></a></th> <th nowrap="nowrap"><a href="../">Parent Directory</a> (<a href="/">Root Directory</a>)</th> </tr> %g </table> </div> <hr> <div id="footer"> <p>Generated %T by %h (%s)</p> <!-- %c --> </div> </body></html>
\ No newline at end of file
diff --git a/config/proxy/errors.ipfire/en/ERR_DNS_FAIL b/config/proxy/errors.ipfire/en/ERR_DNS_FAIL
new file mode 100644
index 0000000..99cd519
--- /dev/null
+++ b/config/proxy/errors.ipfire/en/ERR_DNS_FAIL
@@ -0,0 +1,51 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY>
+<CENTER>
+<HR noshade size="1px">
+<H2>Sorry ... The requested URL could not be retrieved</H2>
+<HR noshade size="1px">
+</CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+<BLOCKQUOTE>
+<P>
+<BR/>
+While trying to retrieve the URL:
+<A HREF="%U">%U</A>
+<P>
+The following error was encountered:
+<BLOCKQUOTE>
+Unable to determine IP address from host name for
+<I>%H</I>
+</BLOCKQUOTE>
+
+<P>
+The dnsserver returned:
+<BLOCKQUOTE>
+%z
+</BLOCKQUOTE>
+
+<P>
+This means that:
+<PRE>
+ The cache was not able to resolve the hostname presented in the URL.
+ Check if the address is correct.
+</PRE>
+<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
+<BR clear="all">
+<P></P>
+</BLOCKQUOTE>
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+</CENTER>
+</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/en/ERR_ESI b/config/proxy/errors.ipfire/en/ERR_ESI
new file mode 100644
index 0000000..21b3803
--- /dev/null
+++ b/config/proxy/errors.ipfire/en/ERR_ESI
@@ -0,0 +1 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> <html><head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <title>ERROR: The requested URL could not be retrieved</title> <style type="text/css"><!-- %l body :lang(fa) { direction: rtl; font-size: 100%; font-family: Tahoma, Roya, sans-serif; float: right; } :lang(he) { direction: rtl; float: right; } --></style> </head><body> <div id="titles"> <h1>ERROR</h1> <h2>The requested URL could not be retrieved</h2> </div> <hr> <div id="content"> <p>The following error was encountered while trying to retrieve the URL: <a href="%U">%U</a></p> <blockquote id="error"> <p><b>ESI Processing failed.</b></p> </blockquote> <p>The ESI processor returned:</p> <blockquote id="data"> <pre>%Z</pre> </blockquote> <p>This means that the surrogate was not able to process the ESI template. Please report this error to the webmaster.</p> <p>Your webmaster is <a href="mailto:%w">%w</
a>.</p> <br> </div> <hr> <div id="footer"> <p>Generated %T by %h (%s)</p> <!-- %c --> </div> </body></html>
\ No newline at end of file
diff --git a/config/proxy/errors.ipfire/en/ERR_FORWARDING_DENIED b/config/proxy/errors.ipfire/en/ERR_FORWARDING_DENIED
new file mode 100644
index 0000000..cd2aedc
--- /dev/null
+++ b/config/proxy/errors.ipfire/en/ERR_FORWARDING_DENIED
@@ -0,0 +1,45 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY>
+<CENTER>
+<HR noshade size="1px">
+<H2>Sorry ... The requested URL could not be retrieved</H2>
+<HR noshade size="1px">
+</CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+<BLOCKQUOTE>
+<P>
+<BR/>
+While trying to retrieve the URL:
+<A HREF="%U">%U</A>
+<P>
+The following error was encountered:
+<UL>
+<LI>
+<STRONG>
+Forwarding Denied.
+</STRONG>
+</UL>
+
+<P>
+This cache will not forward your request because it is trying to enforce a
+sibling relationship. Perhaps the client at %i is a cache which has been
+misconfigured.
+<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
+<BR clear="all">
+<P></P>
+</BLOCKQUOTE>
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+</CENTER>
+</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/en/ERR_FTP_DISABLED b/config/proxy/errors.ipfire/en/ERR_FTP_DISABLED
new file mode 100644
index 0000000..4823ba9
--- /dev/null
+++ b/config/proxy/errors.ipfire/en/ERR_FTP_DISABLED
@@ -0,0 +1,43 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY>
+<CENTER>
+<HR noshade size="1px">
+<H2>Sorry ... The requested URL could not be retrieved</H2>
+<HR noshade size="1px">
+</CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+<BLOCKQUOTE>
+<P>
+<BR/>
+While trying to retrieve the URL:
+<A HREF="%U">%U</A>
+<P>
+The following error was encountered:
+<UL>
+<LI>
+<STRONG>
+FTP is Disabled
+</STRONG>
+</UL>
+
+<P>
+This cache does not support FTP.
+<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
+<BR clear="all">
+<P></P>
+</BLOCKQUOTE>
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+</CENTER>
+</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/en/ERR_FTP_FAILURE b/config/proxy/errors.ipfire/en/ERR_FTP_FAILURE
new file mode 100644
index 0000000..9e20f44
--- /dev/null
+++ b/config/proxy/errors.ipfire/en/ERR_FTP_FAILURE
@@ -0,0 +1,39 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY>
+<CENTER>
+<HR noshade size="1px">
+<H2>Sorry ... The requested URL could not be retrieved</H2>
+<HR noshade size="1px">
+</CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+<BLOCKQUOTE>
+<P>
+<BR/>
+An FTP protocol error occurred
+while trying to retrieve the URL:
+<A HREF="%U">%U</A>
+<P>
+Squid sent the following FTP command:
+<blockquote><strong><pre>%f</pre></strong></blockquote>
+and then received this reply
+<blockquote><strong><pre>%F</pre></strong></blockquote>
+<blockquote><strong><pre>%g</pre></strong></blockquote>
+<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
+<BR clear="all">
+<P></P>
+</BLOCKQUOTE>
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+</CENTER>
+</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/en/ERR_FTP_FORBIDDEN b/config/proxy/errors.ipfire/en/ERR_FTP_FORBIDDEN
new file mode 100644
index 0000000..6eea8d8
--- /dev/null
+++ b/config/proxy/errors.ipfire/en/ERR_FTP_FORBIDDEN
@@ -0,0 +1,39 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY>
+<CENTER>
+<HR noshade size="1px">
+<H2>Sorry ... The requested URL could not be retrieved</H2>
+<HR noshade size="1px">
+</CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+<BLOCKQUOTE>
+<P>
+<BR/>
+An FTP authentication failure occurred
+while trying to retrieve the URL:
+<A HREF="%U">%U</A>
+<P>
+Squid sent the following FTP command:
+<blockquote><strong><pre>%f</pre></strong></blockquote>
+and then received this reply
+<blockquote><strong><pre>%F</pre></strong></blockquote>
+<blockquote><strong><pre>%g</pre></strong></blockquote>
+<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
+<BR clear="all">
+<P></P>
+</BLOCKQUOTE>
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+</CENTER>
+</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/en/ERR_FTP_NOT_FOUND b/config/proxy/errors.ipfire/en/ERR_FTP_NOT_FOUND
new file mode 100644
index 0000000..ead0b2a
--- /dev/null
+++ b/config/proxy/errors.ipfire/en/ERR_FTP_NOT_FOUND
@@ -0,0 +1,42 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY>
+<CENTER>
+<HR noshade size="1px">
+<H2>Sorry ... The requested URL could not be retrieved</H2>
+<HR noshade size="1px">
+</CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+<BLOCKQUOTE>
+<P>
+<BR/>
+The following URL could not be retrieved:
+<A HREF="%U">%U</A>
+<P>
+Squid sent the following FTP command:
+<blockquote><strong><pre>%f</pre></strong></blockquote>
+and then received this reply
+<blockquote><strong><pre>%F</pre></strong></blockquote>
+<blockquote><strong><pre>%g</pre></strong></blockquote>
+<P>
+This might be caused by an FTP URL with an absolute path (which does
+not comply with RFC 1738). If this is the cause, then the file
+can be found at <A HREF="%B">%B</A>.
+<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
+<BR clear="all">
+<P></P>
+</BLOCKQUOTE>
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+</CENTER>
+</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/en/ERR_FTP_PUT_CREATED b/config/proxy/errors.ipfire/en/ERR_FTP_PUT_CREATED
new file mode 100644
index 0000000..3c9c296
--- /dev/null
+++ b/config/proxy/errors.ipfire/en/ERR_FTP_PUT_CREATED
@@ -0,0 +1,23 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>FTP PUT Successful: File Created</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY>
+<CENTER>
+<HR noshade size="1px">
+<H2>File created</H2>
+<HR noshade size="1px">
+</CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+</CENTER>
+</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/en/ERR_FTP_PUT_ERROR b/config/proxy/errors.ipfire/en/ERR_FTP_PUT_ERROR
new file mode 100644
index 0000000..b501c13
--- /dev/null
+++ b/config/proxy/errors.ipfire/en/ERR_FTP_PUT_ERROR
@@ -0,0 +1,46 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>ERROR: FTP upload failed</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY>
+<CENTER>
+<HR noshade size="1px">
+<H2>Sorry ... FTP PUT/upload failed</H2>
+<HR noshade size="1px">
+</CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+<BLOCKQUOTE>
+<P>
+<BR/>
+While trying to PUT the following URL:
+<A HREF="%U">%U</A>
+<P>
+Squid sent the following FTP command:
+<PRE><STRONG>
+ %f
+</STRONG></PRE>
+and then received this reply
+<PRE><STRONG>
+ %F
+</STRONG></PRE>
+<P>
+This means that:
+<PRE>
+Check path, permissions, diskspace and try again.
+</PRE>
+<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
+<BR clear="all">
+<P></P>
+</BLOCKQUOTE>
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+</CENTER>
+</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/en/ERR_FTP_PUT_MODIFIED b/config/proxy/errors.ipfire/en/ERR_FTP_PUT_MODIFIED
new file mode 100644
index 0000000..14b36ff
--- /dev/null
+++ b/config/proxy/errors.ipfire/en/ERR_FTP_PUT_MODIFIED
@@ -0,0 +1,23 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>FTP PUT Successful: File updated</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY>
+<CENTER>
+<HR noshade size="1px">
+<H2>File updated</H2>
+<HR noshade size="1px">
+</CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+</CENTER>
+</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/en/ERR_FTP_UNAVAILABLE b/config/proxy/errors.ipfire/en/ERR_FTP_UNAVAILABLE
new file mode 100644
index 0000000..5aadaf5
--- /dev/null
+++ b/config/proxy/errors.ipfire/en/ERR_FTP_UNAVAILABLE
@@ -0,0 +1,35 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY>
+<CENTER>
+<HR noshade size="1px">
+<H2>Sorry ... The requested URL could not be retrieved</H2>
+<HR noshade size="1px">
+</CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+<BLOCKQUOTE>
+<P>
+<BR/>
+Squid sent the following FTP command:
+<blockquote><strong><pre>%f</pre></strong></blockquote>
+and then received this reply
+<blockquote><strong><pre>%F</pre></strong></blockquote>
+<blockquote><strong><pre>%g</pre></strong></blockquote>
+<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
+<BR clear="all">
+<P></P>
+</BLOCKQUOTE>
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+</CENTER>
+</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/en/ERR_ICAP_FAILURE b/config/proxy/errors.ipfire/en/ERR_ICAP_FAILURE
new file mode 100644
index 0000000..a9066ca
--- /dev/null
+++ b/config/proxy/errors.ipfire/en/ERR_ICAP_FAILURE
@@ -0,0 +1 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> <html><head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <title>ERROR: The requested URL could not be retrieved</title> <style type="text/css"><!-- %l body :lang(fa) { direction: rtl; font-size: 100%; font-family: Tahoma, Roya, sans-serif; float: right; } :lang(he) { direction: rtl; float: right; } --></style> </head><body> <div id="titles"> <h1>ERROR</h1> <h2>The requested URL could not be retrieved</h2> </div> <hr> <div id="content"> <p>The following error was encountered while trying to retrieve the URL: <a href="%U">%U</a></p> <blockquote id="error"> <p><b>ICAP protocol error.</b></p> </blockquote> <p id="sysmsg">The system returned: <i>%E</i></p> <p>This means that some aspect of the ICAP communication failed.</p> <p>Some possible problems are:</p> <ul> <li><p>The ICAP server is not reachable.</p></li> <li><p>An Illegal response was received from t
he ICAP server.</p></li> </ul> <br> </div> <hr> <div id="footer"> <p>Generated %T by %h (%s)</p> <!-- %c --> </div> </body></html>
\ No newline at end of file
diff --git a/config/proxy/errors.ipfire/en/ERR_INVALID_REQ b/config/proxy/errors.ipfire/en/ERR_INVALID_REQ
new file mode 100644
index 0000000..24930c6
--- /dev/null
+++ b/config/proxy/errors.ipfire/en/ERR_INVALID_REQ
@@ -0,0 +1,53 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY>
+<CENTER>
+<HR noshade size="1px">
+<H2>Sorry ... The requested URL could not be retrieved</H2>
+<HR noshade size="1px">
+</CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+<BLOCKQUOTE>
+<P>
+<BR/>
+While trying to process the request:
+<PRE>
+%R
+</PRE>
+<P>
+The following error was encountered:
+<UL>
+<LI>
+<STRONG>
+Invalid Request
+</STRONG>
+</UL>
+
+<P>
+Some aspect of the HTTP Request is invalid. Possible problems:
+<UL>
+<LI>Missing or unknown request method
+<LI>Missing URL
+<LI>Missing HTTP Identifier (HTTP/1.0)
+<LI>Request is too large
+<LI>Content-Length missing for POST or PUT requests
+<LI>Illegal character in hostname; underscores are not allowed
+</UL>
+<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
+<BR clear="all">
+<P></P>
+</BLOCKQUOTE>
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+</CENTER>
+</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/en/ERR_INVALID_RESP b/config/proxy/errors.ipfire/en/ERR_INVALID_RESP
new file mode 100644
index 0000000..ed87a0c
--- /dev/null
+++ b/config/proxy/errors.ipfire/en/ERR_INVALID_RESP
@@ -0,0 +1,49 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY>
+<CENTER>
+<HR noshade size="1px">
+<H2>Sorry ... The requested URL could not be retrieved</H2>
+<HR noshade size="1px">
+</CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+<BLOCKQUOTE>
+<P>
+<BR/>
+While trying to process the request:
+<PRE>
+%R
+</PRE>
+<P>
+The following error was encountered:
+<UL>
+<LI>
+<STRONG>
+Invalid Response
+</STRONG>
+</UL>
+
+<P>
+The HTTP Response message received from the contacted server
+could not be understood or was otherwise malformed. Please contact
+the site operator. Your cache administrator may be able to provide
+you with more details about the exact nature of the problem if needed.
+
+<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
+<BR clear="all">
+<P></P>
+</BLOCKQUOTE>
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+</CENTER>
+</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/en/ERR_INVALID_URL b/config/proxy/errors.ipfire/en/ERR_INVALID_URL
new file mode 100644
index 0000000..ca445c4
--- /dev/null
+++ b/config/proxy/errors.ipfire/en/ERR_INVALID_URL
@@ -0,0 +1,49 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY>
+<CENTER>
+<HR noshade size="1px">
+<H2>Sorry ... The requested URL could not be retrieved</H2>
+<HR noshade size="1px">
+</CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+<BLOCKQUOTE>
+<P>
+<BR/>
+While trying to retrieve the URL:
+<A HREF="%U">%U</A>
+<P>
+The following error was encountered:
+<UL>
+<LI>
+<STRONG>
+Invalid URL
+</STRONG>
+</UL>
+
+<P>
+Some aspect of the requested URL is incorrect. Possible problems:
+<UL>
+<LI>Missing or incorrect access protocol (should be `http://'' or similar)
+<LI>Missing hostname
+<LI>Illegal double-escape in the URL-Path
+<LI>Illegal character in hostname; underscores are not allowed
+</UL>
+<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
+<BR clear="all">
+<P></P>
+</BLOCKQUOTE>
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+</CENTER>
+</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/en/ERR_LIFETIME_EXP b/config/proxy/errors.ipfire/en/ERR_LIFETIME_EXP
new file mode 100644
index 0000000..1adadc6
--- /dev/null
+++ b/config/proxy/errors.ipfire/en/ERR_LIFETIME_EXP
@@ -0,0 +1,44 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY>
+<CENTER>
+<HR noshade size="1px">
+<H2>Sorry ... The requested URL could not be retrieved</H2>
+<HR noshade size="1px">
+</CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+<BLOCKQUOTE>
+<P>
+<BR/>
+While trying to retrieve the URL:
+<A HREF="%U">%U</A>
+<P>
+The following error was encountered:
+<UL>
+<LI>
+<STRONG>
+Connection Lifetime Expired
+</STRONG>
+</UL>
+
+<P>
+Squid has terminated the request because it has exceeded the maximum
+connection lifetime.
+<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
+<BR clear="all">
+<P></P>
+</BLOCKQUOTE>
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+</CENTER>
+</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/en/ERR_NO_RELAY b/config/proxy/errors.ipfire/en/ERR_NO_RELAY
new file mode 100644
index 0000000..567ec5f
--- /dev/null
+++ b/config/proxy/errors.ipfire/en/ERR_NO_RELAY
@@ -0,0 +1,43 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY>
+<CENTER>
+<HR noshade size="1px">
+<H2>Sorry ... The requested URL could not be retrieved</H2>
+<HR noshade size="1px">
+</CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+<BLOCKQUOTE>
+<P>
+<BR/>
+While trying to retrieve the URL:
+<A HREF="%U">%U</A>
+<P>
+The following error was encountered:
+<UL>
+<LI>
+<STRONG>
+No Wais Relay
+</STRONG>
+</UL>
+
+<P>
+There is no WAIS Relay host defined for this Cache! Yell at the administrator.
+<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
+<BR clear="all">
+<P></P>
+</BLOCKQUOTE>
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+</CENTER>
+</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/en/ERR_ONLY_IF_CACHED_MISS b/config/proxy/errors.ipfire/en/ERR_ONLY_IF_CACHED_MISS
new file mode 100644
index 0000000..592e175
--- /dev/null
+++ b/config/proxy/errors.ipfire/en/ERR_ONLY_IF_CACHED_MISS
@@ -0,0 +1,48 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY>
+<CENTER>
+<HR noshade size="1px">
+<H2>Sorry ... The requested URL could not be retrieved</H2>
+<HR noshade size="1px">
+</CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+<BLOCKQUOTE>
+<P>
+<BR/>
+While trying to retrieve the URL:
+<A HREF="%U">%U</A>
+<P>
+The following error was encountered:
+<UL>
+<LI>
+<STRONG>
+Valid document was not found in the cache and <code>only-if-cached</code>
+directive was specified.
+</STRONG>
+</UL>
+
+<P>
+
+You have issued a request with a <code>only-if-cached</code> cache control
+directive. The document was not found in the cache, <em>or</em> it required
+revalidation prohibited by <code>only-if-cached</code> directive.
+
+<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
+<BR clear="all">
+<P></P>
+</BLOCKQUOTE>
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+</CENTER>
+</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/en/ERR_READ_ERROR b/config/proxy/errors.ipfire/en/ERR_READ_ERROR
new file mode 100644
index 0000000..41541b8
--- /dev/null
+++ b/config/proxy/errors.ipfire/en/ERR_READ_ERROR
@@ -0,0 +1,48 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY>
+<CENTER>
+<HR noshade size="1px">
+<H2>Sorry ... The requested URL could not be retrieved</H2>
+<HR noshade size="1px">
+</CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+<BLOCKQUOTE>
+<P>
+<BR/>
+While trying to retrieve the URL:
+<A HREF="%U">%U</A>
+<P>
+The following error was encountered:
+<UL>
+<LI>
+<STRONG>
+Read Error
+</STRONG>
+</UL>
+
+<P>
+The system returned:
+<PRE><I> %E</I></PRE>
+
+<P>
+An error condition occurred while reading data from the network. Please
+retry your request.
+<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
+<BR clear="all">
+<P></P>
+</BLOCKQUOTE>
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+</CENTER>
+</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/en/ERR_READ_TIMEOUT b/config/proxy/errors.ipfire/en/ERR_READ_TIMEOUT
new file mode 100644
index 0000000..8dc2545
--- /dev/null
+++ b/config/proxy/errors.ipfire/en/ERR_READ_TIMEOUT
@@ -0,0 +1,48 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY>
+<CENTER>
+<HR noshade size="1px">
+<H2>Sorry ... The requested URL could not be retrieved</H2>
+<HR noshade size="1px">
+</CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+<BLOCKQUOTE>
+<P>
+<BR/>
+While trying to retrieve the URL:
+<A HREF="%U">%U</A>
+<P>
+The following error was encountered:
+<UL>
+<LI>
+<STRONG>
+Read Timeout
+</STRONG>
+</UL>
+
+<P>
+The system returned:
+<PRE><I> %E</I></PRE>
+
+<P>
+A Timeout occurred while waiting to read data from the network. The network
+or server may be down or congested. Please retry your request.
+<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
+<BR clear="all">
+<P></P>
+</BLOCKQUOTE>
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+</CENTER>
+</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/en/ERR_SECURE_CONNECT_FAIL b/config/proxy/errors.ipfire/en/ERR_SECURE_CONNECT_FAIL
new file mode 100644
index 0000000..ed24cf6
--- /dev/null
+++ b/config/proxy/errors.ipfire/en/ERR_SECURE_CONNECT_FAIL
@@ -0,0 +1 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> <html><head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <title>ERROR: The requested URL could not be retrieved</title> <style type="text/css"><!-- %l body :lang(fa) { direction: rtl; font-size: 100%; font-family: Tahoma, Roya, sans-serif; float: right; } :lang(he) { direction: rtl; float: right; } --></style> </head><body> <div id="titles"> <h1>ERROR</h1> <h2>The requested URL could not be retrieved</h2> </div> <hr> <div id="content"> <p>The following error was encountered while trying to retrieve the URL: <a href="%U">%U</a></p> <blockquote id="error"> <p><b>Failed to establish a secure connection to %I</b></p> </blockquote> <p id="sysmsg">The system returned: <i>%E</i></p> <p>This proxy and the remote host failed to negotiate a mutually acceptable security settings for handling your request. It is possible that the remote host does not support secure
connections, or the proxy is not satisfied with the host security credentials.</p> <p>Your cache administrator is <a href="mailto:%w%W">%w</a>.</p> <br> </div> <hr> <div id="footer"> <p>Generated %T by %h (%s)</p> <!-- %c --> </div> </body></html>
\ No newline at end of file
diff --git a/config/proxy/errors.ipfire/en/ERR_SHUTTING_DOWN b/config/proxy/errors.ipfire/en/ERR_SHUTTING_DOWN
new file mode 100644
index 0000000..63d17b0
--- /dev/null
+++ b/config/proxy/errors.ipfire/en/ERR_SHUTTING_DOWN
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY>
+<CENTER>
+<HR noshade size="1px">
+<H2>Sorry ... The requested URL could not be retrieved</H2>
+<HR noshade size="1px">
+</CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+<BLOCKQUOTE>
+<P>
+<BR/>
+While trying to retrieve the URL:
+<A HREF="%U">%U</A>
+<P>
+The following error was encountered:
+<P>
+This cache is in the process of shutting down and can not
+service your request at this time. Please retry your
+request again soon.
+<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
+<BR clear="all">
+<P></P>
+</BLOCKQUOTE>
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+</CENTER>
+</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/en/ERR_SOCKET_FAILURE b/config/proxy/errors.ipfire/en/ERR_SOCKET_FAILURE
new file mode 100644
index 0000000..e8d309c
--- /dev/null
+++ b/config/proxy/errors.ipfire/en/ERR_SOCKET_FAILURE
@@ -0,0 +1,48 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY>
+<CENTER>
+<HR noshade size="1px">
+<H2>Sorry ... The requested URL could not be retrieved</H2>
+<HR noshade size="1px">
+</CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+<BLOCKQUOTE>
+<P>
+<BR/>
+While trying to retrieve the URL:
+<A HREF="%U">%U</A>
+<P>
+The following error was encountered:
+<UL>
+<LI>
+<STRONG>
+Socket Failure
+</STRONG>
+</UL>
+
+<P>
+The system returned:
+<PRE><I> %E</I></PRE>
+
+<P>
+Squid is unable to create a TCP socket, presumably due to excessive load.
+Please retry your request.
+<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
+<BR clear="all">
+<P></P>
+</BLOCKQUOTE>
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+</CENTER>
+</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/en/ERR_TOO_BIG b/config/proxy/errors.ipfire/en/ERR_TOO_BIG
new file mode 100644
index 0000000..802fe3e
--- /dev/null
+++ b/config/proxy/errors.ipfire/en/ERR_TOO_BIG
@@ -0,0 +1,48 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY>
+<CENTER>
+<HR noshade size="1px">
+<H2>Sorry ... The requested URL could not be retrieved</H2>
+<HR noshade size="1px">
+</CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+<BLOCKQUOTE>
+<P>
+<BR/>
+While trying to retrieve the URL:
+<A HREF="%U">%U</A>
+<P>
+The following error was encountered:
+<UL>
+<LI>
+<STRONG>
+The request or reply is too large.
+</STRONG>
+<P>
+If you are making a POST or PUT request, then your request body
+(the thing you are trying to upload) is too large. If you are
+making a GET request, then the reply body (what you are trying
+to download) is too large. These limits have been established
+by the Internet Service Provider who operates this cache. Please
+contact them directly if you feel this is an error.
+</UL>
+<P>
+Your cache administrator is <A HREF="mailto:%w">%w</A>.
+<BR clear="all">
+<P></P>
+</BLOCKQUOTE>
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+</CENTER>
+</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/en/ERR_UNSUP_HTTPVERSION b/config/proxy/errors.ipfire/en/ERR_UNSUP_HTTPVERSION
new file mode 100644
index 0000000..4f92bdb
--- /dev/null
+++ b/config/proxy/errors.ipfire/en/ERR_UNSUP_HTTPVERSION
@@ -0,0 +1 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> <html><head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <title>ERROR: The requested URL could not be retrieved</title> <style type="text/css"><!-- %l body :lang(fa) { direction: rtl; font-size: 100%; font-family: Tahoma, Roya, sans-serif; float: right; } :lang(he) { direction: rtl; float: right; } --></style> </head><body> <div id="titles"> <h1>ERROR</h1> <h2>Unsupported HTTP version</h2> </div> <hr> <div id="content"> <p>The following error was encountered while trying to retrieve the URL: <a href="%U">%U</a></p> <blockquote id="error"> <p><b>Unsupported HTTP version</b></p> </blockquote> <p>This Squid does not accept the HTTP version you are attempting to use.</p> <p>Your cache administrator is <a href="mailto:%w%W">%w</a>.</p> <br> </div> <hr> <div id="footer"> <p>Generated %T by %h (%s)</p> <!-- %c --> </div> </body></html>
\ No newline at end of file
diff --git a/config/proxy/errors.ipfire/en/ERR_UNSUP_REQ b/config/proxy/errors.ipfire/en/ERR_UNSUP_REQ
new file mode 100644
index 0000000..b69569f
--- /dev/null
+++ b/config/proxy/errors.ipfire/en/ERR_UNSUP_REQ
@@ -0,0 +1,44 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY>
+<CENTER>
+<HR noshade size="1px">
+<H2>Sorry ... The requested URL could not be retrieved</H2>
+<HR noshade size="1px">
+</CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+<BLOCKQUOTE>
+<P>
+<BR/>
+While trying to retrieve the URL:
+<A HREF="%U">%U</A>
+<P>
+The following error was encountered:
+<UL>
+<LI>
+<STRONG>
+Unsupported Request Method and Protocol
+</STRONG>
+</UL>
+
+<P>
+Squid does not support all request methods for all access protocols.
+For example, you can not POST a Gopher request.
+<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
+<BR clear="all">
+<P></P>
+</BLOCKQUOTE>
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+</CENTER>
+</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/en/ERR_URN_RESOLVE b/config/proxy/errors.ipfire/en/ERR_URN_RESOLVE
new file mode 100644
index 0000000..dba21bc
--- /dev/null
+++ b/config/proxy/errors.ipfire/en/ERR_URN_RESOLVE
@@ -0,0 +1,43 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>ERROR: The requested URN not be retrieved</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY>
+<CENTER>
+<HR noshade size="1px">
+<H2>Sorry ... A URL for the requested URN could not be retrieved</H2>
+<HR noshade size="1px">
+</CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+<BLOCKQUOTE>
+<P>
+<BR/>
+While trying to retrieve the URN:
+<A HREF="%U">%U</A>
+<P>
+The following error was encountered:
+<UL>
+<LI>
+<STRONG>
+Cannot Resolve URN
+</STRONG>
+</UL>
+
+<P>
+Hey, don't expect too much from URNs on %T :)
+<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
+<BR clear="all">
+<P></P>
+</BLOCKQUOTE>
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+</CENTER>
+</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/en/ERR_WRITE_ERROR b/config/proxy/errors.ipfire/en/ERR_WRITE_ERROR
new file mode 100644
index 0000000..8363e2e
--- /dev/null
+++ b/config/proxy/errors.ipfire/en/ERR_WRITE_ERROR
@@ -0,0 +1,48 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY>
+<CENTER>
+<HR noshade size="1px">
+<H2>Sorry ... The requested URL could not be retrieved</H2>
+<HR noshade size="1px">
+</CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+<BLOCKQUOTE>
+<P>
+<BR/>
+While trying to retrieve the URL:
+<A HREF="%U">%U</A>
+<P>
+The following error was encountered:
+<UL>
+<LI>
+<STRONG>
+Write Error
+</STRONG>
+</UL>
+
+<P>
+The system returned:
+<PRE><I> %E</I></PRE>
+
+<P>
+An error condition occurred while writing to the network. Please retry your
+request.
+<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
+<BR clear="all">
+<P></P>
+</BLOCKQUOTE>
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+</CENTER>
+</BODY></HTML>
diff --git a/config/proxy/errors.ipfire/en/ERR_ZERO_SIZE_OBJECT b/config/proxy/errors.ipfire/en/ERR_ZERO_SIZE_OBJECT
new file mode 100644
index 0000000..3b0a3e6
--- /dev/null
+++ b/config/proxy/errors.ipfire/en/ERR_ZERO_SIZE_OBJECT
@@ -0,0 +1,43 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:white;margin-left:25px;margin-right:25px;margin-top:25px;margin-bottom:25px;margin-width:25px;margin-height:25px;font-family:verdana,sans-serif}a:focus{color:white;}a:active{color:white;}a:hover{color:white;}a:link{color:white;}a:visited{color:white;}PRE{font-family:sans-serif}--></STYLE>
+</HEAD><BODY>
+<CENTER>
+<HR noshade size="1px">
+<H2>Sorry ... The requested URL could not be retrieved</H2>
+<HR noshade size="1px">
+</CENTER>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0"><TR BGCOLOR="#cc0033">
+<TD><IMG SRC="http://%h:81/images/IPFire.png" ALIGN="left" ALT="IPFire"></TD>
+<TD>
+<!-- Disable footer: %s -->
+<BLOCKQUOTE>
+<P>
+<BR/>
+While trying to retrieve the URL:
+<A HREF="%U">%U</A>
+<P>
+The following error was encountered:
+<UL>
+<LI>
+<STRONG>
+Zero Sized Reply
+</STRONG>
+</UL>
+
+<P>
+Squid did not receive any data for this request.
+<P>Your cache administrator is <A HREF="mailto:%w">%w</A>.
+<BR clear="all">
+<P></P>
+</BLOCKQUOTE>
+</TD></TR></TABLE>
+<CENTER>
+<HR noshade size="1px">
+<ADDRESS>
+Generated %T by %h (%s)
+</ADDRESS>
+<HR noshade size="1px">
+</CENTER>
+</BODY></HTML>
diff --git a/config/rootfiles/common/attr b/config/rootfiles/common/attr
new file mode 100644
index 0000000..60da05e
--- /dev/null
+++ b/config/rootfiles/common/attr
@@ -0,0 +1,24 @@
+usr/bin/attr
+usr/bin/getfattr
+usr/bin/setfattr
+#usr/lib/libattr.la
+usr/lib/libattr.so
+usr/lib/libattr.so.1
+usr/lib/libattr.so.1.1.0
+#usr/man/man1/attr.1
+#usr/man/man1/getfattr.1
+#usr/man/man1/setfattr.1
+#usr/man/man5/attr.5
+#usr/share/doc/attr
+#usr/share/doc/attr/CHANGES.gz
+#usr/share/doc/attr/COPYING
+#usr/share/doc/attr/PORTING
+#usr/share/doc/attr/README
+#usr/share/locale/cs/LC_MESSAGES/attr.mo
+#usr/share/locale/de/LC_MESSAGES/attr.mo
+#usr/share/locale/es/LC_MESSAGES/attr.mo
+#usr/share/locale/fr/LC_MESSAGES/attr.mo
+#usr/share/locale/gl/LC_MESSAGES/attr.mo
+#usr/share/locale/nl/LC_MESSAGES/attr.mo
+#usr/share/locale/pl/LC_MESSAGES/attr.mo
+#usr/share/locale/sv/LC_MESSAGES/attr.mo
diff --git a/config/rootfiles/common/findutils b/config/rootfiles/common/findutils
index a6d95a3..d8e5c1b 100644
--- a/config/rootfiles/common/findutils
+++ b/config/rootfiles/common/findutils
@@ -1,14 +1,16 @@
bin/find
usr/bin/locate
+#usr/bin/oldfind
usr/bin/updatedb
usr/bin/xargs
-#usr/info/find.info
#usr/lib/findutils
#usr/lib/findutils/bigram
#usr/lib/findutils/code
#usr/lib/findutils/frcode
-#usr/man/man1/find.1
-#usr/man/man1/locate.1
-#usr/man/man1/updatedb.1
-#usr/man/man1/xargs.1
-#usr/man/man5/locatedb.5
+#usr/share/info/find-maint.info
+#usr/share/info/find.info
+#usr/share/man/man1/find.1
+#usr/share/man/man1/locate.1
+#usr/share/man/man1/updatedb.1
+#usr/share/man/man1/xargs.1
+#usr/share/man/man5/locatedb.5
diff --git a/config/rootfiles/common/libcap b/config/rootfiles/common/libcap
index 710f1c2..90e2365 100644
--- a/config/rootfiles/common/libcap
+++ b/config/rootfiles/common/libcap
@@ -1,28 +1,40 @@
+#lib/libcap.a
lib/libcap.so
lib/libcap.so.1
-lib/libcap.so.1.10
-sbin/execcap
+lib/libcap.so.2
+lib/libcap.so.2.19
+lib/security/pam_cap.so
+sbin/capsh
+sbin/getcap
sbin/getpcaps
-sbin/setpcaps
-sbin/sucap
+sbin/setcap
#usr/include/sys/capability.h
usr/lib/libnewt.so.0.51
-#usr/man/man2
-#usr/man/man2/capget.2
-#usr/man/man2/capset.2
-#usr/man/man3/_cap_names.3
-#usr/man/man3/cap_clear.3
-#usr/man/man3/cap_copy_ext.3
-#usr/man/man3/cap_copy_int.3
-#usr/man/man3/cap_dup.3
-#usr/man/man3/cap_free.3
-#usr/man/man3/cap_from_text.3
-#usr/man/man3/cap_get_flag.3
-#usr/man/man3/cap_get_proc.3
-#usr/man/man3/cap_init.3
-#usr/man/man3/cap_set_flag.3
-#usr/man/man3/cap_set_proc.3
-#usr/man/man3/cap_size.3
-#usr/man/man3/cap_to_text.3
-#usr/man/man3/capgetp.3
-#usr/man/man3/capsetp.3
+#usr/share/man/man1/capsh.1
+#usr/share/man/man3/cap_clear.3
+#usr/share/man/man3/cap_clear_flag.3
+#usr/share/man/man3/cap_compare.3
+#usr/share/man/man3/cap_copy_ext.3
+#usr/share/man/man3/cap_copy_int.3
+#usr/share/man/man3/cap_dup.3
+#usr/share/man/man3/cap_free.3
+#usr/share/man/man3/cap_from_name.3
+#usr/share/man/man3/cap_from_text.3
+#usr/share/man/man3/cap_get_fd.3
+#usr/share/man/man3/cap_get_file.3
+#usr/share/man/man3/cap_get_flag.3
+#usr/share/man/man3/cap_get_pid.3
+#usr/share/man/man3/cap_get_proc.3
+#usr/share/man/man3/cap_init.3
+#usr/share/man/man3/cap_set_fd.3
+#usr/share/man/man3/cap_set_file.3
+#usr/share/man/man3/cap_set_flag.3
+#usr/share/man/man3/cap_set_proc.3
+#usr/share/man/man3/cap_size.3
+#usr/share/man/man3/cap_to_name.3
+#usr/share/man/man3/cap_to_text.3
+#usr/share/man/man3/capgetp.3
+#usr/share/man/man3/capsetp.3
+#usr/share/man/man3/libcap.3
+#usr/share/man/man8/getcap.8
+#usr/share/man/man8/setcap.8
diff --git a/config/rootfiles/common/squid b/config/rootfiles/common/squid
index 8b8f6f0..d2c8114 100644
--- a/config/rootfiles/common/squid
+++ b/config/rootfiles/common/squid
@@ -1,5 +1,8 @@
#etc/squid
etc/squid/cachemgr.conf
+#etc/squid/cachemgr.conf.default
+etc/squid/errorpage.css
+#etc/squid/errorpage.css.default
etc/squid/errors
etc/squid/mime.conf
#etc/squid/mime.conf.default
@@ -7,1133 +10,1668 @@ etc/squid/msntauth.conf
#etc/squid/msntauth.conf.default
etc/squid/squid.conf
#etc/squid/squid.conf.default
+#etc/squid/squid.conf.documented
+srv/web/ipfire/cgi-bin/cachemgr.cgi
srv/web/ipfire/html/proxy.pac
srv/web/ipfire/html/wpad.dat
-srv/web/ipfire/cgi-bin/cachemgr.cgi
-#usr/bin/RunCache
-#usr/bin/cossdump
usr/bin/squidclient
#usr/lib/squid
usr/lib/squid/auth
-usr/lib/squid/diskd-daemon
+#usr/lib/squid/cachemgr.cgi
+usr/lib/squid/diskd
#usr/lib/squid/errors
#usr/lib/squid/errors.ipfire
-#usr/lib/squid/errors.ipfire/English
-usr/lib/squid/errors.ipfire/English/ERR_ACCESS_DENIED
-usr/lib/squid/errors.ipfire/English/ERR_CACHE_ACCESS_DENIED
-usr/lib/squid/errors.ipfire/English/ERR_CACHE_MGR_ACCESS_DENIED
-usr/lib/squid/errors.ipfire/English/ERR_CANNOT_FORWARD
-usr/lib/squid/errors.ipfire/English/ERR_CONNECT_FAIL
-usr/lib/squid/errors.ipfire/English/ERR_DNS_FAIL
-usr/lib/squid/errors.ipfire/English/ERR_FORWARDING_DENIED
-usr/lib/squid/errors.ipfire/English/ERR_FTP_DISABLED
-usr/lib/squid/errors.ipfire/English/ERR_FTP_FAILURE
-usr/lib/squid/errors.ipfire/English/ERR_FTP_FORBIDDEN
-usr/lib/squid/errors.ipfire/English/ERR_FTP_NOT_FOUND
-usr/lib/squid/errors.ipfire/English/ERR_FTP_PUT_CREATED
-usr/lib/squid/errors.ipfire/English/ERR_FTP_PUT_ERROR
-usr/lib/squid/errors.ipfire/English/ERR_FTP_PUT_MODIFIED
-usr/lib/squid/errors.ipfire/English/ERR_FTP_UNAVAILABLE
-usr/lib/squid/errors.ipfire/English/ERR_INVALID_REQ
-usr/lib/squid/errors.ipfire/English/ERR_INVALID_RESP
-usr/lib/squid/errors.ipfire/English/ERR_INVALID_URL
-usr/lib/squid/errors.ipfire/English/ERR_LIFETIME_EXP
-usr/lib/squid/errors.ipfire/English/ERR_NO_RELAY
-usr/lib/squid/errors.ipfire/English/ERR_ONLY_IF_CACHED_MISS
-usr/lib/squid/errors.ipfire/English/ERR_READ_ERROR
-usr/lib/squid/errors.ipfire/English/ERR_READ_TIMEOUT
-usr/lib/squid/errors.ipfire/English/ERR_SHUTTING_DOWN
-usr/lib/squid/errors.ipfire/English/ERR_SOCKET_FAILURE
-usr/lib/squid/errors.ipfire/English/ERR_TOO_BIG
-usr/lib/squid/errors.ipfire/English/ERR_UNSUP_REQ
-usr/lib/squid/errors.ipfire/English/ERR_URN_RESOLVE
-usr/lib/squid/errors.ipfire/English/ERR_WRITE_ERROR
-usr/lib/squid/errors.ipfire/English/ERR_ZERO_SIZE_OBJECT
-#usr/lib/squid/errors.ipfire/German
-usr/lib/squid/errors.ipfire/German/ERR_ACCESS_DENIED
-usr/lib/squid/errors.ipfire/German/ERR_CACHE_ACCESS_DENIED
-usr/lib/squid/errors.ipfire/German/ERR_CACHE_MGR_ACCESS_DENIED
-usr/lib/squid/errors.ipfire/German/ERR_CANNOT_FORWARD
-usr/lib/squid/errors.ipfire/German/ERR_CONNECT_FAIL
-usr/lib/squid/errors.ipfire/German/ERR_DNS_FAIL
-usr/lib/squid/errors.ipfire/German/ERR_FORWARDING_DENIED
-usr/lib/squid/errors.ipfire/German/ERR_FTP_DISABLED
-usr/lib/squid/errors.ipfire/German/ERR_FTP_FAILURE
-usr/lib/squid/errors.ipfire/German/ERR_FTP_FORBIDDEN
-usr/lib/squid/errors.ipfire/German/ERR_FTP_NOT_FOUND
-usr/lib/squid/errors.ipfire/German/ERR_FTP_PUT_CREATED
-usr/lib/squid/errors.ipfire/German/ERR_FTP_PUT_ERROR
-usr/lib/squid/errors.ipfire/German/ERR_FTP_PUT_MODIFIED
-usr/lib/squid/errors.ipfire/German/ERR_FTP_UNAVAILABLE
-usr/lib/squid/errors.ipfire/German/ERR_INVALID_REQ
-usr/lib/squid/errors.ipfire/German/ERR_INVALID_RESP
-usr/lib/squid/errors.ipfire/German/ERR_INVALID_URL
-usr/lib/squid/errors.ipfire/German/ERR_LIFETIME_EXP
-usr/lib/squid/errors.ipfire/German/ERR_NO_RELAY
-usr/lib/squid/errors.ipfire/German/ERR_ONLY_IF_CACHED_MISS
-usr/lib/squid/errors.ipfire/German/ERR_READ_ERROR
-usr/lib/squid/errors.ipfire/German/ERR_READ_TIMEOUT
-usr/lib/squid/errors.ipfire/German/ERR_SHUTTING_DOWN
-usr/lib/squid/errors.ipfire/German/ERR_SOCKET_FAILURE
-usr/lib/squid/errors.ipfire/German/ERR_TOO_BIG
-usr/lib/squid/errors.ipfire/German/ERR_UNSUP_REQ
-usr/lib/squid/errors.ipfire/German/ERR_URN_RESOLVE
-usr/lib/squid/errors.ipfire/German/ERR_WRITE_ERROR
-usr/lib/squid/errors.ipfire/German/ERR_ZERO_SIZE_OBJECT
-#usr/lib/squid/errors/Armenian
-#usr/lib/squid/errors/Armenian/ERR_ACCESS_DENIED
-#usr/lib/squid/errors/Armenian/ERR_CACHE_ACCESS_DENIED
-#usr/lib/squid/errors/Armenian/ERR_CACHE_MGR_ACCESS_DENIED
-#usr/lib/squid/errors/Armenian/ERR_CANNOT_FORWARD
-#usr/lib/squid/errors/Armenian/ERR_CONNECT_FAIL
-#usr/lib/squid/errors/Armenian/ERR_DNS_FAIL
-#usr/lib/squid/errors/Armenian/ERR_FORWARDING_DENIED
-#usr/lib/squid/errors/Armenian/ERR_FTP_DISABLED
-#usr/lib/squid/errors/Armenian/ERR_FTP_FAILURE
-#usr/lib/squid/errors/Armenian/ERR_FTP_FORBIDDEN
-#usr/lib/squid/errors/Armenian/ERR_FTP_NOT_FOUND
-#usr/lib/squid/errors/Armenian/ERR_FTP_PUT_CREATED
-#usr/lib/squid/errors/Armenian/ERR_FTP_PUT_ERROR
-#usr/lib/squid/errors/Armenian/ERR_FTP_PUT_MODIFIED
-#usr/lib/squid/errors/Armenian/ERR_FTP_UNAVAILABLE
-#usr/lib/squid/errors/Armenian/ERR_INVALID_REQ
-#usr/lib/squid/errors/Armenian/ERR_INVALID_RESP
-#usr/lib/squid/errors/Armenian/ERR_INVALID_URL
-#usr/lib/squid/errors/Armenian/ERR_LIFETIME_EXP
-#usr/lib/squid/errors/Armenian/ERR_NO_RELAY
-#usr/lib/squid/errors/Armenian/ERR_ONLY_IF_CACHED_MISS
-#usr/lib/squid/errors/Armenian/ERR_READ_ERROR
-#usr/lib/squid/errors/Armenian/ERR_READ_TIMEOUT
-#usr/lib/squid/errors/Armenian/ERR_SHUTTING_DOWN
-#usr/lib/squid/errors/Armenian/ERR_SOCKET_FAILURE
-#usr/lib/squid/errors/Armenian/ERR_TOO_BIG
-#usr/lib/squid/errors/Armenian/ERR_UNSUP_REQ
-#usr/lib/squid/errors/Armenian/ERR_URN_RESOLVE
-#usr/lib/squid/errors/Armenian/ERR_WRITE_ERROR
-#usr/lib/squid/errors/Armenian/ERR_ZERO_SIZE_OBJECT
-#usr/lib/squid/errors/Azerbaijani
-#usr/lib/squid/errors/Azerbaijani/ERR_ACCESS_DENIED
-#usr/lib/squid/errors/Azerbaijani/ERR_CACHE_ACCESS_DENIED
-#usr/lib/squid/errors/Azerbaijani/ERR_CACHE_MGR_ACCESS_DENIED
-#usr/lib/squid/errors/Azerbaijani/ERR_CANNOT_FORWARD
-#usr/lib/squid/errors/Azerbaijani/ERR_CONNECT_FAIL
-#usr/lib/squid/errors/Azerbaijani/ERR_DNS_FAIL
-#usr/lib/squid/errors/Azerbaijani/ERR_FORWARDING_DENIED
-#usr/lib/squid/errors/Azerbaijani/ERR_FTP_DISABLED
-#usr/lib/squid/errors/Azerbaijani/ERR_FTP_FAILURE
-#usr/lib/squid/errors/Azerbaijani/ERR_FTP_FORBIDDEN
-#usr/lib/squid/errors/Azerbaijani/ERR_FTP_NOT_FOUND
-#usr/lib/squid/errors/Azerbaijani/ERR_FTP_PUT_CREATED
-#usr/lib/squid/errors/Azerbaijani/ERR_FTP_PUT_ERROR
-#usr/lib/squid/errors/Azerbaijani/ERR_FTP_PUT_MODIFIED
-#usr/lib/squid/errors/Azerbaijani/ERR_FTP_UNAVAILABLE
-#usr/lib/squid/errors/Azerbaijani/ERR_INVALID_REQ
-#usr/lib/squid/errors/Azerbaijani/ERR_INVALID_RESP
-#usr/lib/squid/errors/Azerbaijani/ERR_INVALID_URL
-#usr/lib/squid/errors/Azerbaijani/ERR_LIFETIME_EXP
-#usr/lib/squid/errors/Azerbaijani/ERR_NO_RELAY
-#usr/lib/squid/errors/Azerbaijani/ERR_ONLY_IF_CACHED_MISS
-#usr/lib/squid/errors/Azerbaijani/ERR_READ_ERROR
-#usr/lib/squid/errors/Azerbaijani/ERR_READ_TIMEOUT
-#usr/lib/squid/errors/Azerbaijani/ERR_SHUTTING_DOWN
-#usr/lib/squid/errors/Azerbaijani/ERR_SOCKET_FAILURE
-#usr/lib/squid/errors/Azerbaijani/ERR_TOO_BIG
-#usr/lib/squid/errors/Azerbaijani/ERR_UNSUP_REQ
-#usr/lib/squid/errors/Azerbaijani/ERR_URN_RESOLVE
-#usr/lib/squid/errors/Azerbaijani/ERR_WRITE_ERROR
-#usr/lib/squid/errors/Azerbaijani/ERR_ZERO_SIZE_OBJECT
-#usr/lib/squid/errors/Bulgarian
-#usr/lib/squid/errors/Bulgarian/ERR_ACCESS_DENIED
-#usr/lib/squid/errors/Bulgarian/ERR_CACHE_ACCESS_DENIED
-#usr/lib/squid/errors/Bulgarian/ERR_CACHE_MGR_ACCESS_DENIED
-#usr/lib/squid/errors/Bulgarian/ERR_CANNOT_FORWARD
-#usr/lib/squid/errors/Bulgarian/ERR_CONNECT_FAIL
-#usr/lib/squid/errors/Bulgarian/ERR_DNS_FAIL
-#usr/lib/squid/errors/Bulgarian/ERR_FORWARDING_DENIED
-#usr/lib/squid/errors/Bulgarian/ERR_FTP_DISABLED
-#usr/lib/squid/errors/Bulgarian/ERR_FTP_FAILURE
-#usr/lib/squid/errors/Bulgarian/ERR_FTP_FORBIDDEN
-#usr/lib/squid/errors/Bulgarian/ERR_FTP_NOT_FOUND
-#usr/lib/squid/errors/Bulgarian/ERR_FTP_PUT_CREATED
-#usr/lib/squid/errors/Bulgarian/ERR_FTP_PUT_ERROR
-#usr/lib/squid/errors/Bulgarian/ERR_FTP_PUT_MODIFIED
-#usr/lib/squid/errors/Bulgarian/ERR_FTP_UNAVAILABLE
-#usr/lib/squid/errors/Bulgarian/ERR_INVALID_REQ
-#usr/lib/squid/errors/Bulgarian/ERR_INVALID_RESP
-#usr/lib/squid/errors/Bulgarian/ERR_INVALID_URL
-#usr/lib/squid/errors/Bulgarian/ERR_LIFETIME_EXP
-#usr/lib/squid/errors/Bulgarian/ERR_NO_RELAY
-#usr/lib/squid/errors/Bulgarian/ERR_ONLY_IF_CACHED_MISS
-#usr/lib/squid/errors/Bulgarian/ERR_READ_ERROR
-#usr/lib/squid/errors/Bulgarian/ERR_READ_TIMEOUT
-#usr/lib/squid/errors/Bulgarian/ERR_SHUTTING_DOWN
-#usr/lib/squid/errors/Bulgarian/ERR_SOCKET_FAILURE
-#usr/lib/squid/errors/Bulgarian/ERR_TOO_BIG
-#usr/lib/squid/errors/Bulgarian/ERR_UNSUP_REQ
-#usr/lib/squid/errors/Bulgarian/ERR_URN_RESOLVE
-#usr/lib/squid/errors/Bulgarian/ERR_WRITE_ERROR
-#usr/lib/squid/errors/Bulgarian/ERR_ZERO_SIZE_OBJECT
-#usr/lib/squid/errors/Catalan
-#usr/lib/squid/errors/Catalan/ERR_ACCESS_DENIED
-#usr/lib/squid/errors/Catalan/ERR_CACHE_ACCESS_DENIED
-#usr/lib/squid/errors/Catalan/ERR_CACHE_MGR_ACCESS_DENIED
-#usr/lib/squid/errors/Catalan/ERR_CANNOT_FORWARD
-#usr/lib/squid/errors/Catalan/ERR_CONNECT_FAIL
-#usr/lib/squid/errors/Catalan/ERR_DNS_FAIL
-#usr/lib/squid/errors/Catalan/ERR_FORWARDING_DENIED
-#usr/lib/squid/errors/Catalan/ERR_FTP_DISABLED
-#usr/lib/squid/errors/Catalan/ERR_FTP_FAILURE
-#usr/lib/squid/errors/Catalan/ERR_FTP_FORBIDDEN
-#usr/lib/squid/errors/Catalan/ERR_FTP_NOT_FOUND
-#usr/lib/squid/errors/Catalan/ERR_FTP_PUT_CREATED
-#usr/lib/squid/errors/Catalan/ERR_FTP_PUT_ERROR
-#usr/lib/squid/errors/Catalan/ERR_FTP_PUT_MODIFIED
-#usr/lib/squid/errors/Catalan/ERR_FTP_UNAVAILABLE
-#usr/lib/squid/errors/Catalan/ERR_INVALID_REQ
-#usr/lib/squid/errors/Catalan/ERR_INVALID_RESP
-#usr/lib/squid/errors/Catalan/ERR_INVALID_URL
-#usr/lib/squid/errors/Catalan/ERR_LIFETIME_EXP
-#usr/lib/squid/errors/Catalan/ERR_NO_RELAY
-#usr/lib/squid/errors/Catalan/ERR_ONLY_IF_CACHED_MISS
-#usr/lib/squid/errors/Catalan/ERR_READ_ERROR
-#usr/lib/squid/errors/Catalan/ERR_READ_TIMEOUT
-#usr/lib/squid/errors/Catalan/ERR_SHUTTING_DOWN
-#usr/lib/squid/errors/Catalan/ERR_SOCKET_FAILURE
-#usr/lib/squid/errors/Catalan/ERR_TOO_BIG
-#usr/lib/squid/errors/Catalan/ERR_UNSUP_REQ
-#usr/lib/squid/errors/Catalan/ERR_URN_RESOLVE
-#usr/lib/squid/errors/Catalan/ERR_WRITE_ERROR
-#usr/lib/squid/errors/Catalan/ERR_ZERO_SIZE_OBJECT
-#usr/lib/squid/errors/Czech
-#usr/lib/squid/errors/Czech/ERR_ACCESS_DENIED
-#usr/lib/squid/errors/Czech/ERR_CACHE_ACCESS_DENIED
-#usr/lib/squid/errors/Czech/ERR_CACHE_MGR_ACCESS_DENIED
-#usr/lib/squid/errors/Czech/ERR_CANNOT_FORWARD
-#usr/lib/squid/errors/Czech/ERR_CONNECT_FAIL
-#usr/lib/squid/errors/Czech/ERR_DNS_FAIL
-#usr/lib/squid/errors/Czech/ERR_FORWARDING_DENIED
-#usr/lib/squid/errors/Czech/ERR_FTP_DISABLED
-#usr/lib/squid/errors/Czech/ERR_FTP_FAILURE
-#usr/lib/squid/errors/Czech/ERR_FTP_FORBIDDEN
-#usr/lib/squid/errors/Czech/ERR_FTP_NOT_FOUND
-#usr/lib/squid/errors/Czech/ERR_FTP_PUT_CREATED
-#usr/lib/squid/errors/Czech/ERR_FTP_PUT_ERROR
-#usr/lib/squid/errors/Czech/ERR_FTP_PUT_MODIFIED
-#usr/lib/squid/errors/Czech/ERR_FTP_UNAVAILABLE
-#usr/lib/squid/errors/Czech/ERR_INVALID_REQ
-#usr/lib/squid/errors/Czech/ERR_INVALID_RESP
-#usr/lib/squid/errors/Czech/ERR_INVALID_URL
-#usr/lib/squid/errors/Czech/ERR_LIFETIME_EXP
-#usr/lib/squid/errors/Czech/ERR_NO_RELAY
-#usr/lib/squid/errors/Czech/ERR_ONLY_IF_CACHED_MISS
-#usr/lib/squid/errors/Czech/ERR_READ_ERROR
-#usr/lib/squid/errors/Czech/ERR_READ_TIMEOUT
-#usr/lib/squid/errors/Czech/ERR_SHUTTING_DOWN
-#usr/lib/squid/errors/Czech/ERR_SOCKET_FAILURE
-#usr/lib/squid/errors/Czech/ERR_TOO_BIG
-#usr/lib/squid/errors/Czech/ERR_UNSUP_REQ
-#usr/lib/squid/errors/Czech/ERR_URN_RESOLVE
-#usr/lib/squid/errors/Czech/ERR_WRITE_ERROR
-#usr/lib/squid/errors/Czech/ERR_ZERO_SIZE_OBJECT
-#usr/lib/squid/errors/Danish
-#usr/lib/squid/errors/Danish/ERR_ACCESS_DENIED
-#usr/lib/squid/errors/Danish/ERR_CACHE_ACCESS_DENIED
-#usr/lib/squid/errors/Danish/ERR_CACHE_MGR_ACCESS_DENIED
-#usr/lib/squid/errors/Danish/ERR_CANNOT_FORWARD
-#usr/lib/squid/errors/Danish/ERR_CONNECT_FAIL
-#usr/lib/squid/errors/Danish/ERR_DNS_FAIL
-#usr/lib/squid/errors/Danish/ERR_FORWARDING_DENIED
-#usr/lib/squid/errors/Danish/ERR_FTP_DISABLED
-#usr/lib/squid/errors/Danish/ERR_FTP_FAILURE
-#usr/lib/squid/errors/Danish/ERR_FTP_FORBIDDEN
-#usr/lib/squid/errors/Danish/ERR_FTP_NOT_FOUND
-#usr/lib/squid/errors/Danish/ERR_FTP_PUT_CREATED
-#usr/lib/squid/errors/Danish/ERR_FTP_PUT_ERROR
-#usr/lib/squid/errors/Danish/ERR_FTP_PUT_MODIFIED
-#usr/lib/squid/errors/Danish/ERR_FTP_UNAVAILABLE
-#usr/lib/squid/errors/Danish/ERR_INVALID_REQ
-#usr/lib/squid/errors/Danish/ERR_INVALID_RESP
-#usr/lib/squid/errors/Danish/ERR_INVALID_URL
-#usr/lib/squid/errors/Danish/ERR_LIFETIME_EXP
-#usr/lib/squid/errors/Danish/ERR_NO_RELAY
-#usr/lib/squid/errors/Danish/ERR_ONLY_IF_CACHED_MISS
-#usr/lib/squid/errors/Danish/ERR_READ_ERROR
-#usr/lib/squid/errors/Danish/ERR_READ_TIMEOUT
-#usr/lib/squid/errors/Danish/ERR_SHUTTING_DOWN
-#usr/lib/squid/errors/Danish/ERR_SOCKET_FAILURE
-#usr/lib/squid/errors/Danish/ERR_TOO_BIG
-#usr/lib/squid/errors/Danish/ERR_UNSUP_REQ
-#usr/lib/squid/errors/Danish/ERR_URN_RESOLVE
-#usr/lib/squid/errors/Danish/ERR_WRITE_ERROR
-#usr/lib/squid/errors/Danish/ERR_ZERO_SIZE_OBJECT
-#usr/lib/squid/errors/Dutch
-#usr/lib/squid/errors/Dutch/ERR_ACCESS_DENIED
-#usr/lib/squid/errors/Dutch/ERR_CACHE_ACCESS_DENIED
-#usr/lib/squid/errors/Dutch/ERR_CACHE_MGR_ACCESS_DENIED
-#usr/lib/squid/errors/Dutch/ERR_CANNOT_FORWARD
-#usr/lib/squid/errors/Dutch/ERR_CONNECT_FAIL
-#usr/lib/squid/errors/Dutch/ERR_DNS_FAIL
-#usr/lib/squid/errors/Dutch/ERR_FORWARDING_DENIED
-#usr/lib/squid/errors/Dutch/ERR_FTP_DISABLED
-#usr/lib/squid/errors/Dutch/ERR_FTP_FAILURE
-#usr/lib/squid/errors/Dutch/ERR_FTP_FORBIDDEN
-#usr/lib/squid/errors/Dutch/ERR_FTP_NOT_FOUND
-#usr/lib/squid/errors/Dutch/ERR_FTP_PUT_CREATED
-#usr/lib/squid/errors/Dutch/ERR_FTP_PUT_ERROR
-#usr/lib/squid/errors/Dutch/ERR_FTP_PUT_MODIFIED
-#usr/lib/squid/errors/Dutch/ERR_FTP_UNAVAILABLE
-#usr/lib/squid/errors/Dutch/ERR_INVALID_REQ
-#usr/lib/squid/errors/Dutch/ERR_INVALID_RESP
-#usr/lib/squid/errors/Dutch/ERR_INVALID_URL
-#usr/lib/squid/errors/Dutch/ERR_LIFETIME_EXP
-#usr/lib/squid/errors/Dutch/ERR_NO_RELAY
-#usr/lib/squid/errors/Dutch/ERR_ONLY_IF_CACHED_MISS
-#usr/lib/squid/errors/Dutch/ERR_READ_ERROR
-#usr/lib/squid/errors/Dutch/ERR_READ_TIMEOUT
-#usr/lib/squid/errors/Dutch/ERR_SHUTTING_DOWN
-#usr/lib/squid/errors/Dutch/ERR_SOCKET_FAILURE
-#usr/lib/squid/errors/Dutch/ERR_TOO_BIG
-#usr/lib/squid/errors/Dutch/ERR_UNSUP_REQ
-#usr/lib/squid/errors/Dutch/ERR_URN_RESOLVE
-#usr/lib/squid/errors/Dutch/ERR_WRITE_ERROR
-#usr/lib/squid/errors/Dutch/ERR_ZERO_SIZE_OBJECT
-usr/lib/squid/errors/English
-#usr/lib/squid/errors/English/ERR_ACCESS_DENIED
-#usr/lib/squid/errors/English/ERR_CACHE_ACCESS_DENIED
-#usr/lib/squid/errors/English/ERR_CACHE_MGR_ACCESS_DENIED
-#usr/lib/squid/errors/English/ERR_CANNOT_FORWARD
-#usr/lib/squid/errors/English/ERR_CONNECT_FAIL
-#usr/lib/squid/errors/English/ERR_DNS_FAIL
-#usr/lib/squid/errors/English/ERR_FORWARDING_DENIED
-#usr/lib/squid/errors/English/ERR_FTP_DISABLED
-#usr/lib/squid/errors/English/ERR_FTP_FAILURE
-#usr/lib/squid/errors/English/ERR_FTP_FORBIDDEN
-#usr/lib/squid/errors/English/ERR_FTP_NOT_FOUND
-#usr/lib/squid/errors/English/ERR_FTP_PUT_CREATED
-#usr/lib/squid/errors/English/ERR_FTP_PUT_ERROR
-#usr/lib/squid/errors/English/ERR_FTP_PUT_MODIFIED
-#usr/lib/squid/errors/English/ERR_FTP_UNAVAILABLE
-#usr/lib/squid/errors/English/ERR_INVALID_REQ
-#usr/lib/squid/errors/English/ERR_INVALID_RESP
-#usr/lib/squid/errors/English/ERR_INVALID_URL
-#usr/lib/squid/errors/English/ERR_LIFETIME_EXP
-#usr/lib/squid/errors/English/ERR_NO_RELAY
-#usr/lib/squid/errors/English/ERR_ONLY_IF_CACHED_MISS
-#usr/lib/squid/errors/English/ERR_READ_ERROR
-#usr/lib/squid/errors/English/ERR_READ_TIMEOUT
-#usr/lib/squid/errors/English/ERR_SHUTTING_DOWN
-#usr/lib/squid/errors/English/ERR_SOCKET_FAILURE
-#usr/lib/squid/errors/English/ERR_TOO_BIG
-#usr/lib/squid/errors/English/ERR_UNSUP_REQ
-#usr/lib/squid/errors/English/ERR_URN_RESOLVE
-#usr/lib/squid/errors/English/ERR_WRITE_ERROR
-#usr/lib/squid/errors/English/ERR_ZERO_SIZE_OBJECT
-#usr/lib/squid/errors/Estonian
-#usr/lib/squid/errors/Estonian/ERR_ACCESS_DENIED
-#usr/lib/squid/errors/Estonian/ERR_CACHE_ACCESS_DENIED
-#usr/lib/squid/errors/Estonian/ERR_CACHE_MGR_ACCESS_DENIED
-#usr/lib/squid/errors/Estonian/ERR_CANNOT_FORWARD
-#usr/lib/squid/errors/Estonian/ERR_CONNECT_FAIL
-#usr/lib/squid/errors/Estonian/ERR_DNS_FAIL
-#usr/lib/squid/errors/Estonian/ERR_FORWARDING_DENIED
-#usr/lib/squid/errors/Estonian/ERR_FTP_DISABLED
-#usr/lib/squid/errors/Estonian/ERR_FTP_FAILURE
-#usr/lib/squid/errors/Estonian/ERR_FTP_FORBIDDEN
-#usr/lib/squid/errors/Estonian/ERR_FTP_NOT_FOUND
-#usr/lib/squid/errors/Estonian/ERR_FTP_PUT_CREATED
-#usr/lib/squid/errors/Estonian/ERR_FTP_PUT_ERROR
-#usr/lib/squid/errors/Estonian/ERR_FTP_PUT_MODIFIED
-#usr/lib/squid/errors/Estonian/ERR_FTP_UNAVAILABLE
-#usr/lib/squid/errors/Estonian/ERR_INVALID_REQ
-#usr/lib/squid/errors/Estonian/ERR_INVALID_RESP
-#usr/lib/squid/errors/Estonian/ERR_INVALID_URL
-#usr/lib/squid/errors/Estonian/ERR_LIFETIME_EXP
-#usr/lib/squid/errors/Estonian/ERR_NO_RELAY
-#usr/lib/squid/errors/Estonian/ERR_ONLY_IF_CACHED_MISS
-#usr/lib/squid/errors/Estonian/ERR_READ_ERROR
-#usr/lib/squid/errors/Estonian/ERR_READ_TIMEOUT
-#usr/lib/squid/errors/Estonian/ERR_SHUTTING_DOWN
-#usr/lib/squid/errors/Estonian/ERR_SOCKET_FAILURE
-#usr/lib/squid/errors/Estonian/ERR_TOO_BIG
-#usr/lib/squid/errors/Estonian/ERR_UNSUP_REQ
-#usr/lib/squid/errors/Estonian/ERR_URN_RESOLVE
-#usr/lib/squid/errors/Estonian/ERR_WRITE_ERROR
-#usr/lib/squid/errors/Estonian/ERR_ZERO_SIZE_OBJECT
-#usr/lib/squid/errors/Finnish
-#usr/lib/squid/errors/Finnish/ERR_ACCESS_DENIED
-#usr/lib/squid/errors/Finnish/ERR_CACHE_ACCESS_DENIED
-#usr/lib/squid/errors/Finnish/ERR_CACHE_MGR_ACCESS_DENIED
-#usr/lib/squid/errors/Finnish/ERR_CANNOT_FORWARD
-#usr/lib/squid/errors/Finnish/ERR_CONNECT_FAIL
-#usr/lib/squid/errors/Finnish/ERR_DNS_FAIL
-#usr/lib/squid/errors/Finnish/ERR_FORWARDING_DENIED
-#usr/lib/squid/errors/Finnish/ERR_FTP_DISABLED
-#usr/lib/squid/errors/Finnish/ERR_FTP_FAILURE
-#usr/lib/squid/errors/Finnish/ERR_FTP_FORBIDDEN
-#usr/lib/squid/errors/Finnish/ERR_FTP_NOT_FOUND
-#usr/lib/squid/errors/Finnish/ERR_FTP_PUT_CREATED
-#usr/lib/squid/errors/Finnish/ERR_FTP_PUT_ERROR
-#usr/lib/squid/errors/Finnish/ERR_FTP_PUT_MODIFIED
-#usr/lib/squid/errors/Finnish/ERR_FTP_UNAVAILABLE
-#usr/lib/squid/errors/Finnish/ERR_INVALID_REQ
-#usr/lib/squid/errors/Finnish/ERR_INVALID_RESP
-#usr/lib/squid/errors/Finnish/ERR_INVALID_URL
-#usr/lib/squid/errors/Finnish/ERR_LIFETIME_EXP
-#usr/lib/squid/errors/Finnish/ERR_NO_RELAY
-#usr/lib/squid/errors/Finnish/ERR_ONLY_IF_CACHED_MISS
-#usr/lib/squid/errors/Finnish/ERR_READ_ERROR
-#usr/lib/squid/errors/Finnish/ERR_READ_TIMEOUT
-#usr/lib/squid/errors/Finnish/ERR_SHUTTING_DOWN
-#usr/lib/squid/errors/Finnish/ERR_SOCKET_FAILURE
-#usr/lib/squid/errors/Finnish/ERR_TOO_BIG
-#usr/lib/squid/errors/Finnish/ERR_UNSUP_REQ
-#usr/lib/squid/errors/Finnish/ERR_URN_RESOLVE
-#usr/lib/squid/errors/Finnish/ERR_WRITE_ERROR
-#usr/lib/squid/errors/Finnish/ERR_ZERO_SIZE_OBJECT
-#usr/lib/squid/errors/French
-#usr/lib/squid/errors/French/ERR_ACCESS_DENIED
-#usr/lib/squid/errors/French/ERR_CACHE_ACCESS_DENIED
-#usr/lib/squid/errors/French/ERR_CACHE_MGR_ACCESS_DENIED
-#usr/lib/squid/errors/French/ERR_CANNOT_FORWARD
-#usr/lib/squid/errors/French/ERR_CONNECT_FAIL
-#usr/lib/squid/errors/French/ERR_DNS_FAIL
-#usr/lib/squid/errors/French/ERR_FORWARDING_DENIED
-#usr/lib/squid/errors/French/ERR_FTP_DISABLED
-#usr/lib/squid/errors/French/ERR_FTP_FAILURE
-#usr/lib/squid/errors/French/ERR_FTP_FORBIDDEN
-#usr/lib/squid/errors/French/ERR_FTP_NOT_FOUND
-#usr/lib/squid/errors/French/ERR_FTP_PUT_CREATED
-#usr/lib/squid/errors/French/ERR_FTP_PUT_ERROR
-#usr/lib/squid/errors/French/ERR_FTP_PUT_MODIFIED
-#usr/lib/squid/errors/French/ERR_FTP_UNAVAILABLE
-#usr/lib/squid/errors/French/ERR_INVALID_REQ
-#usr/lib/squid/errors/French/ERR_INVALID_RESP
-#usr/lib/squid/errors/French/ERR_INVALID_URL
-#usr/lib/squid/errors/French/ERR_LIFETIME_EXP
-#usr/lib/squid/errors/French/ERR_NO_RELAY
-#usr/lib/squid/errors/French/ERR_ONLY_IF_CACHED_MISS
-#usr/lib/squid/errors/French/ERR_READ_ERROR
-#usr/lib/squid/errors/French/ERR_READ_TIMEOUT
-#usr/lib/squid/errors/French/ERR_SHUTTING_DOWN
-#usr/lib/squid/errors/French/ERR_SOCKET_FAILURE
-#usr/lib/squid/errors/French/ERR_TOO_BIG
-#usr/lib/squid/errors/French/ERR_UNSUP_REQ
-#usr/lib/squid/errors/French/ERR_URN_RESOLVE
-#usr/lib/squid/errors/French/ERR_WRITE_ERROR
-#usr/lib/squid/errors/French/ERR_ZERO_SIZE_OBJECT
-usr/lib/squid/errors/German
-#usr/lib/squid/errors/German/ERR_ACCESS_DENIED
-#usr/lib/squid/errors/German/ERR_CACHE_ACCESS_DENIED
-#usr/lib/squid/errors/German/ERR_CACHE_MGR_ACCESS_DENIED
-#usr/lib/squid/errors/German/ERR_CANNOT_FORWARD
-#usr/lib/squid/errors/German/ERR_CONNECT_FAIL
-#usr/lib/squid/errors/German/ERR_DNS_FAIL
-#usr/lib/squid/errors/German/ERR_FORWARDING_DENIED
-#usr/lib/squid/errors/German/ERR_FTP_DISABLED
-#usr/lib/squid/errors/German/ERR_FTP_FAILURE
-#usr/lib/squid/errors/German/ERR_FTP_FORBIDDEN
-#usr/lib/squid/errors/German/ERR_FTP_NOT_FOUND
-#usr/lib/squid/errors/German/ERR_FTP_PUT_CREATED
-#usr/lib/squid/errors/German/ERR_FTP_PUT_ERROR
-#usr/lib/squid/errors/German/ERR_FTP_PUT_MODIFIED
-#usr/lib/squid/errors/German/ERR_FTP_UNAVAILABLE
-#usr/lib/squid/errors/German/ERR_INVALID_REQ
-#usr/lib/squid/errors/German/ERR_INVALID_RESP
-#usr/lib/squid/errors/German/ERR_INVALID_URL
-#usr/lib/squid/errors/German/ERR_LIFETIME_EXP
-#usr/lib/squid/errors/German/ERR_NO_RELAY
-#usr/lib/squid/errors/German/ERR_ONLY_IF_CACHED_MISS
-#usr/lib/squid/errors/German/ERR_READ_ERROR
-#usr/lib/squid/errors/German/ERR_READ_TIMEOUT
-#usr/lib/squid/errors/German/ERR_SHUTTING_DOWN
-#usr/lib/squid/errors/German/ERR_SOCKET_FAILURE
-#usr/lib/squid/errors/German/ERR_TOO_BIG
-#usr/lib/squid/errors/German/ERR_UNSUP_REQ
-#usr/lib/squid/errors/German/ERR_URN_RESOLVE
-#usr/lib/squid/errors/German/ERR_WRITE_ERROR
-#usr/lib/squid/errors/German/ERR_ZERO_SIZE_OBJECT
-#usr/lib/squid/errors/Greek
-#usr/lib/squid/errors/Greek/ERR_ACCESS_DENIED
-#usr/lib/squid/errors/Greek/ERR_CACHE_ACCESS_DENIED
-#usr/lib/squid/errors/Greek/ERR_CACHE_MGR_ACCESS_DENIED
-#usr/lib/squid/errors/Greek/ERR_CANNOT_FORWARD
-#usr/lib/squid/errors/Greek/ERR_CONNECT_FAIL
-#usr/lib/squid/errors/Greek/ERR_DNS_FAIL
-#usr/lib/squid/errors/Greek/ERR_FORWARDING_DENIED
-#usr/lib/squid/errors/Greek/ERR_FTP_DISABLED
-#usr/lib/squid/errors/Greek/ERR_FTP_FAILURE
-#usr/lib/squid/errors/Greek/ERR_FTP_FORBIDDEN
-#usr/lib/squid/errors/Greek/ERR_FTP_NOT_FOUND
-#usr/lib/squid/errors/Greek/ERR_FTP_PUT_CREATED
-#usr/lib/squid/errors/Greek/ERR_FTP_PUT_ERROR
-#usr/lib/squid/errors/Greek/ERR_FTP_PUT_MODIFIED
-#usr/lib/squid/errors/Greek/ERR_FTP_UNAVAILABLE
-#usr/lib/squid/errors/Greek/ERR_INVALID_REQ
-#usr/lib/squid/errors/Greek/ERR_INVALID_RESP
-#usr/lib/squid/errors/Greek/ERR_INVALID_URL
-#usr/lib/squid/errors/Greek/ERR_LIFETIME_EXP
-#usr/lib/squid/errors/Greek/ERR_NO_RELAY
-#usr/lib/squid/errors/Greek/ERR_ONLY_IF_CACHED_MISS
-#usr/lib/squid/errors/Greek/ERR_READ_ERROR
-#usr/lib/squid/errors/Greek/ERR_READ_TIMEOUT
-#usr/lib/squid/errors/Greek/ERR_SHUTTING_DOWN
-#usr/lib/squid/errors/Greek/ERR_SOCKET_FAILURE
-#usr/lib/squid/errors/Greek/ERR_TOO_BIG
-#usr/lib/squid/errors/Greek/ERR_UNSUP_REQ
-#usr/lib/squid/errors/Greek/ERR_URN_RESOLVE
-#usr/lib/squid/errors/Greek/ERR_WRITE_ERROR
-#usr/lib/squid/errors/Greek/ERR_ZERO_SIZE_OBJECT
-#usr/lib/squid/errors/Hebrew
-#usr/lib/squid/errors/Hebrew/ERR_ACCESS_DENIED
-#usr/lib/squid/errors/Hebrew/ERR_CACHE_ACCESS_DENIED
-#usr/lib/squid/errors/Hebrew/ERR_CACHE_MGR_ACCESS_DENIED
-#usr/lib/squid/errors/Hebrew/ERR_CANNOT_FORWARD
-#usr/lib/squid/errors/Hebrew/ERR_CONNECT_FAIL
-#usr/lib/squid/errors/Hebrew/ERR_DNS_FAIL
-#usr/lib/squid/errors/Hebrew/ERR_FORWARDING_DENIED
-#usr/lib/squid/errors/Hebrew/ERR_FTP_DISABLED
-#usr/lib/squid/errors/Hebrew/ERR_FTP_FAILURE
-#usr/lib/squid/errors/Hebrew/ERR_FTP_FORBIDDEN
-#usr/lib/squid/errors/Hebrew/ERR_FTP_NOT_FOUND
-#usr/lib/squid/errors/Hebrew/ERR_FTP_PUT_CREATED
-#usr/lib/squid/errors/Hebrew/ERR_FTP_PUT_ERROR
-#usr/lib/squid/errors/Hebrew/ERR_FTP_PUT_MODIFIED
-#usr/lib/squid/errors/Hebrew/ERR_FTP_UNAVAILABLE
-#usr/lib/squid/errors/Hebrew/ERR_INVALID_REQ
-#usr/lib/squid/errors/Hebrew/ERR_INVALID_RESP
-#usr/lib/squid/errors/Hebrew/ERR_INVALID_URL
-#usr/lib/squid/errors/Hebrew/ERR_LIFETIME_EXP
-#usr/lib/squid/errors/Hebrew/ERR_NO_RELAY
-#usr/lib/squid/errors/Hebrew/ERR_ONLY_IF_CACHED_MISS
-#usr/lib/squid/errors/Hebrew/ERR_READ_ERROR
-#usr/lib/squid/errors/Hebrew/ERR_READ_TIMEOUT
-#usr/lib/squid/errors/Hebrew/ERR_SHUTTING_DOWN
-#usr/lib/squid/errors/Hebrew/ERR_SOCKET_FAILURE
-#usr/lib/squid/errors/Hebrew/ERR_TOO_BIG
-#usr/lib/squid/errors/Hebrew/ERR_UNSUP_REQ
-#usr/lib/squid/errors/Hebrew/ERR_URN_RESOLVE
-#usr/lib/squid/errors/Hebrew/ERR_WRITE_ERROR
-#usr/lib/squid/errors/Hebrew/ERR_ZERO_SIZE_OBJECT
-#usr/lib/squid/errors/Hungarian
-#usr/lib/squid/errors/Hungarian/ERR_ACCESS_DENIED
-#usr/lib/squid/errors/Hungarian/ERR_CACHE_ACCESS_DENIED
-#usr/lib/squid/errors/Hungarian/ERR_CACHE_MGR_ACCESS_DENIED
-#usr/lib/squid/errors/Hungarian/ERR_CANNOT_FORWARD
-#usr/lib/squid/errors/Hungarian/ERR_CONNECT_FAIL
-#usr/lib/squid/errors/Hungarian/ERR_DNS_FAIL
-#usr/lib/squid/errors/Hungarian/ERR_FORWARDING_DENIED
-#usr/lib/squid/errors/Hungarian/ERR_FTP_DISABLED
-#usr/lib/squid/errors/Hungarian/ERR_FTP_FAILURE
-#usr/lib/squid/errors/Hungarian/ERR_FTP_FORBIDDEN
-#usr/lib/squid/errors/Hungarian/ERR_FTP_NOT_FOUND
-#usr/lib/squid/errors/Hungarian/ERR_FTP_PUT_CREATED
-#usr/lib/squid/errors/Hungarian/ERR_FTP_PUT_ERROR
-#usr/lib/squid/errors/Hungarian/ERR_FTP_PUT_MODIFIED
-#usr/lib/squid/errors/Hungarian/ERR_FTP_UNAVAILABLE
-#usr/lib/squid/errors/Hungarian/ERR_INVALID_REQ
-#usr/lib/squid/errors/Hungarian/ERR_INVALID_RESP
-#usr/lib/squid/errors/Hungarian/ERR_INVALID_URL
-#usr/lib/squid/errors/Hungarian/ERR_LIFETIME_EXP
-#usr/lib/squid/errors/Hungarian/ERR_NO_RELAY
-#usr/lib/squid/errors/Hungarian/ERR_ONLY_IF_CACHED_MISS
-#usr/lib/squid/errors/Hungarian/ERR_READ_ERROR
-#usr/lib/squid/errors/Hungarian/ERR_READ_TIMEOUT
-#usr/lib/squid/errors/Hungarian/ERR_SHUTTING_DOWN
-#usr/lib/squid/errors/Hungarian/ERR_SOCKET_FAILURE
-#usr/lib/squid/errors/Hungarian/ERR_TOO_BIG
-#usr/lib/squid/errors/Hungarian/ERR_UNSUP_REQ
-#usr/lib/squid/errors/Hungarian/ERR_URN_RESOLVE
-#usr/lib/squid/errors/Hungarian/ERR_WRITE_ERROR
-#usr/lib/squid/errors/Hungarian/ERR_ZERO_SIZE_OBJECT
-#usr/lib/squid/errors/Italian
-#usr/lib/squid/errors/Italian/ERR_ACCESS_DENIED
-#usr/lib/squid/errors/Italian/ERR_CACHE_ACCESS_DENIED
-#usr/lib/squid/errors/Italian/ERR_CACHE_MGR_ACCESS_DENIED
-#usr/lib/squid/errors/Italian/ERR_CANNOT_FORWARD
-#usr/lib/squid/errors/Italian/ERR_CONNECT_FAIL
-#usr/lib/squid/errors/Italian/ERR_DNS_FAIL
-#usr/lib/squid/errors/Italian/ERR_FORWARDING_DENIED
-#usr/lib/squid/errors/Italian/ERR_FTP_DISABLED
-#usr/lib/squid/errors/Italian/ERR_FTP_FAILURE
-#usr/lib/squid/errors/Italian/ERR_FTP_FORBIDDEN
-#usr/lib/squid/errors/Italian/ERR_FTP_NOT_FOUND
-#usr/lib/squid/errors/Italian/ERR_FTP_PUT_CREATED
-#usr/lib/squid/errors/Italian/ERR_FTP_PUT_ERROR
-#usr/lib/squid/errors/Italian/ERR_FTP_PUT_MODIFIED
-#usr/lib/squid/errors/Italian/ERR_FTP_UNAVAILABLE
-#usr/lib/squid/errors/Italian/ERR_INVALID_REQ
-#usr/lib/squid/errors/Italian/ERR_INVALID_RESP
-#usr/lib/squid/errors/Italian/ERR_INVALID_URL
-#usr/lib/squid/errors/Italian/ERR_LIFETIME_EXP
-#usr/lib/squid/errors/Italian/ERR_NO_RELAY
-#usr/lib/squid/errors/Italian/ERR_ONLY_IF_CACHED_MISS
-#usr/lib/squid/errors/Italian/ERR_READ_ERROR
-#usr/lib/squid/errors/Italian/ERR_READ_TIMEOUT
-#usr/lib/squid/errors/Italian/ERR_SHUTTING_DOWN
-#usr/lib/squid/errors/Italian/ERR_SOCKET_FAILURE
-#usr/lib/squid/errors/Italian/ERR_TOO_BIG
-#usr/lib/squid/errors/Italian/ERR_UNSUP_REQ
-#usr/lib/squid/errors/Italian/ERR_URN_RESOLVE
-#usr/lib/squid/errors/Italian/ERR_WRITE_ERROR
-#usr/lib/squid/errors/Italian/ERR_ZERO_SIZE_OBJECT
-#usr/lib/squid/errors/Japanese
-#usr/lib/squid/errors/Japanese/ERR_ACCESS_DENIED
-#usr/lib/squid/errors/Japanese/ERR_CACHE_ACCESS_DENIED
-#usr/lib/squid/errors/Japanese/ERR_CACHE_MGR_ACCESS_DENIED
-#usr/lib/squid/errors/Japanese/ERR_CANNOT_FORWARD
-#usr/lib/squid/errors/Japanese/ERR_CONNECT_FAIL
-#usr/lib/squid/errors/Japanese/ERR_DNS_FAIL
-#usr/lib/squid/errors/Japanese/ERR_FORWARDING_DENIED
-#usr/lib/squid/errors/Japanese/ERR_FTP_DISABLED
-#usr/lib/squid/errors/Japanese/ERR_FTP_FAILURE
-#usr/lib/squid/errors/Japanese/ERR_FTP_FORBIDDEN
-#usr/lib/squid/errors/Japanese/ERR_FTP_NOT_FOUND
-#usr/lib/squid/errors/Japanese/ERR_FTP_PUT_CREATED
-#usr/lib/squid/errors/Japanese/ERR_FTP_PUT_ERROR
-#usr/lib/squid/errors/Japanese/ERR_FTP_PUT_MODIFIED
-#usr/lib/squid/errors/Japanese/ERR_FTP_UNAVAILABLE
-#usr/lib/squid/errors/Japanese/ERR_INVALID_REQ
-#usr/lib/squid/errors/Japanese/ERR_INVALID_RESP
-#usr/lib/squid/errors/Japanese/ERR_INVALID_URL
-#usr/lib/squid/errors/Japanese/ERR_LIFETIME_EXP
-#usr/lib/squid/errors/Japanese/ERR_NO_RELAY
-#usr/lib/squid/errors/Japanese/ERR_ONLY_IF_CACHED_MISS
-#usr/lib/squid/errors/Japanese/ERR_READ_ERROR
-#usr/lib/squid/errors/Japanese/ERR_READ_TIMEOUT
-#usr/lib/squid/errors/Japanese/ERR_SHUTTING_DOWN
-#usr/lib/squid/errors/Japanese/ERR_SOCKET_FAILURE
-#usr/lib/squid/errors/Japanese/ERR_TOO_BIG
-#usr/lib/squid/errors/Japanese/ERR_UNSUP_REQ
-#usr/lib/squid/errors/Japanese/ERR_URN_RESOLVE
-#usr/lib/squid/errors/Japanese/ERR_WRITE_ERROR
-#usr/lib/squid/errors/Japanese/ERR_ZERO_SIZE_OBJECT
-#usr/lib/squid/errors/Korean
-#usr/lib/squid/errors/Korean/ERR_ACCESS_DENIED
-#usr/lib/squid/errors/Korean/ERR_CACHE_ACCESS_DENIED
-#usr/lib/squid/errors/Korean/ERR_CACHE_MGR_ACCESS_DENIED
-#usr/lib/squid/errors/Korean/ERR_CANNOT_FORWARD
-#usr/lib/squid/errors/Korean/ERR_CONNECT_FAIL
-#usr/lib/squid/errors/Korean/ERR_DNS_FAIL
-#usr/lib/squid/errors/Korean/ERR_FORWARDING_DENIED
-#usr/lib/squid/errors/Korean/ERR_FTP_DISABLED
-#usr/lib/squid/errors/Korean/ERR_FTP_FAILURE
-#usr/lib/squid/errors/Korean/ERR_FTP_FORBIDDEN
-#usr/lib/squid/errors/Korean/ERR_FTP_NOT_FOUND
-#usr/lib/squid/errors/Korean/ERR_FTP_PUT_CREATED
-#usr/lib/squid/errors/Korean/ERR_FTP_PUT_ERROR
-#usr/lib/squid/errors/Korean/ERR_FTP_PUT_MODIFIED
-#usr/lib/squid/errors/Korean/ERR_FTP_UNAVAILABLE
-#usr/lib/squid/errors/Korean/ERR_INVALID_REQ
-#usr/lib/squid/errors/Korean/ERR_INVALID_RESP
-#usr/lib/squid/errors/Korean/ERR_INVALID_URL
-#usr/lib/squid/errors/Korean/ERR_LIFETIME_EXP
-#usr/lib/squid/errors/Korean/ERR_NO_RELAY
-#usr/lib/squid/errors/Korean/ERR_ONLY_IF_CACHED_MISS
-#usr/lib/squid/errors/Korean/ERR_READ_ERROR
-#usr/lib/squid/errors/Korean/ERR_READ_TIMEOUT
-#usr/lib/squid/errors/Korean/ERR_SHUTTING_DOWN
-#usr/lib/squid/errors/Korean/ERR_SOCKET_FAILURE
-#usr/lib/squid/errors/Korean/ERR_TOO_BIG
-#usr/lib/squid/errors/Korean/ERR_UNSUP_REQ
-#usr/lib/squid/errors/Korean/ERR_URN_RESOLVE
-#usr/lib/squid/errors/Korean/ERR_WRITE_ERROR
-#usr/lib/squid/errors/Korean/ERR_ZERO_SIZE_OBJECT
-#usr/lib/squid/errors/Lithuanian
-#usr/lib/squid/errors/Lithuanian/ERR_ACCESS_DENIED
-#usr/lib/squid/errors/Lithuanian/ERR_CACHE_ACCESS_DENIED
-#usr/lib/squid/errors/Lithuanian/ERR_CACHE_MGR_ACCESS_DENIED
-#usr/lib/squid/errors/Lithuanian/ERR_CANNOT_FORWARD
-#usr/lib/squid/errors/Lithuanian/ERR_CONNECT_FAIL
-#usr/lib/squid/errors/Lithuanian/ERR_DNS_FAIL
-#usr/lib/squid/errors/Lithuanian/ERR_FORWARDING_DENIED
-#usr/lib/squid/errors/Lithuanian/ERR_FTP_DISABLED
-#usr/lib/squid/errors/Lithuanian/ERR_FTP_FAILURE
-#usr/lib/squid/errors/Lithuanian/ERR_FTP_FORBIDDEN
-#usr/lib/squid/errors/Lithuanian/ERR_FTP_NOT_FOUND
-#usr/lib/squid/errors/Lithuanian/ERR_FTP_PUT_CREATED
-#usr/lib/squid/errors/Lithuanian/ERR_FTP_PUT_ERROR
-#usr/lib/squid/errors/Lithuanian/ERR_FTP_PUT_MODIFIED
-#usr/lib/squid/errors/Lithuanian/ERR_FTP_UNAVAILABLE
-#usr/lib/squid/errors/Lithuanian/ERR_INVALID_REQ
-#usr/lib/squid/errors/Lithuanian/ERR_INVALID_RESP
-#usr/lib/squid/errors/Lithuanian/ERR_INVALID_URL
-#usr/lib/squid/errors/Lithuanian/ERR_LIFETIME_EXP
-#usr/lib/squid/errors/Lithuanian/ERR_NO_RELAY
-#usr/lib/squid/errors/Lithuanian/ERR_ONLY_IF_CACHED_MISS
-#usr/lib/squid/errors/Lithuanian/ERR_READ_ERROR
-#usr/lib/squid/errors/Lithuanian/ERR_READ_TIMEOUT
-#usr/lib/squid/errors/Lithuanian/ERR_SHUTTING_DOWN
-#usr/lib/squid/errors/Lithuanian/ERR_SOCKET_FAILURE
-#usr/lib/squid/errors/Lithuanian/ERR_TOO_BIG
-#usr/lib/squid/errors/Lithuanian/ERR_UNSUP_REQ
-#usr/lib/squid/errors/Lithuanian/ERR_URN_RESOLVE
-#usr/lib/squid/errors/Lithuanian/ERR_WRITE_ERROR
-#usr/lib/squid/errors/Lithuanian/ERR_ZERO_SIZE_OBJECT
-#usr/lib/squid/errors/Polish
-#usr/lib/squid/errors/Polish/ERR_ACCESS_DENIED
-#usr/lib/squid/errors/Polish/ERR_CACHE_ACCESS_DENIED
-#usr/lib/squid/errors/Polish/ERR_CACHE_MGR_ACCESS_DENIED
-#usr/lib/squid/errors/Polish/ERR_CANNOT_FORWARD
-#usr/lib/squid/errors/Polish/ERR_CONNECT_FAIL
-#usr/lib/squid/errors/Polish/ERR_DNS_FAIL
-#usr/lib/squid/errors/Polish/ERR_FORWARDING_DENIED
-#usr/lib/squid/errors/Polish/ERR_FTP_DISABLED
-#usr/lib/squid/errors/Polish/ERR_FTP_FAILURE
-#usr/lib/squid/errors/Polish/ERR_FTP_FORBIDDEN
-#usr/lib/squid/errors/Polish/ERR_FTP_NOT_FOUND
-#usr/lib/squid/errors/Polish/ERR_FTP_PUT_CREATED
-#usr/lib/squid/errors/Polish/ERR_FTP_PUT_ERROR
-#usr/lib/squid/errors/Polish/ERR_FTP_PUT_MODIFIED
-#usr/lib/squid/errors/Polish/ERR_FTP_UNAVAILABLE
-#usr/lib/squid/errors/Polish/ERR_INVALID_REQ
-#usr/lib/squid/errors/Polish/ERR_INVALID_RESP
-#usr/lib/squid/errors/Polish/ERR_INVALID_URL
-#usr/lib/squid/errors/Polish/ERR_LIFETIME_EXP
-#usr/lib/squid/errors/Polish/ERR_NO_RELAY
-#usr/lib/squid/errors/Polish/ERR_ONLY_IF_CACHED_MISS
-#usr/lib/squid/errors/Polish/ERR_READ_ERROR
-#usr/lib/squid/errors/Polish/ERR_READ_TIMEOUT
-#usr/lib/squid/errors/Polish/ERR_SHUTTING_DOWN
-#usr/lib/squid/errors/Polish/ERR_SOCKET_FAILURE
-#usr/lib/squid/errors/Polish/ERR_TOO_BIG
-#usr/lib/squid/errors/Polish/ERR_UNSUP_REQ
-#usr/lib/squid/errors/Polish/ERR_URN_RESOLVE
-#usr/lib/squid/errors/Polish/ERR_WRITE_ERROR
-#usr/lib/squid/errors/Polish/ERR_ZERO_SIZE_OBJECT
-#usr/lib/squid/errors/Portuguese
-#usr/lib/squid/errors/Portuguese/ERR_ACCESS_DENIED
-#usr/lib/squid/errors/Portuguese/ERR_CACHE_ACCESS_DENIED
-#usr/lib/squid/errors/Portuguese/ERR_CACHE_MGR_ACCESS_DENIED
-#usr/lib/squid/errors/Portuguese/ERR_CANNOT_FORWARD
-#usr/lib/squid/errors/Portuguese/ERR_CONNECT_FAIL
-#usr/lib/squid/errors/Portuguese/ERR_DNS_FAIL
-#usr/lib/squid/errors/Portuguese/ERR_FORWARDING_DENIED
-#usr/lib/squid/errors/Portuguese/ERR_FTP_DISABLED
-#usr/lib/squid/errors/Portuguese/ERR_FTP_FAILURE
-#usr/lib/squid/errors/Portuguese/ERR_FTP_FORBIDDEN
-#usr/lib/squid/errors/Portuguese/ERR_FTP_NOT_FOUND
-#usr/lib/squid/errors/Portuguese/ERR_FTP_PUT_CREATED
-#usr/lib/squid/errors/Portuguese/ERR_FTP_PUT_ERROR
-#usr/lib/squid/errors/Portuguese/ERR_FTP_PUT_MODIFIED
-#usr/lib/squid/errors/Portuguese/ERR_FTP_UNAVAILABLE
-#usr/lib/squid/errors/Portuguese/ERR_INVALID_REQ
-#usr/lib/squid/errors/Portuguese/ERR_INVALID_RESP
-#usr/lib/squid/errors/Portuguese/ERR_INVALID_URL
-#usr/lib/squid/errors/Portuguese/ERR_LIFETIME_EXP
-#usr/lib/squid/errors/Portuguese/ERR_NO_RELAY
-#usr/lib/squid/errors/Portuguese/ERR_ONLY_IF_CACHED_MISS
-#usr/lib/squid/errors/Portuguese/ERR_READ_ERROR
-#usr/lib/squid/errors/Portuguese/ERR_READ_TIMEOUT
-#usr/lib/squid/errors/Portuguese/ERR_SHUTTING_DOWN
-#usr/lib/squid/errors/Portuguese/ERR_SOCKET_FAILURE
-#usr/lib/squid/errors/Portuguese/ERR_TOO_BIG
-#usr/lib/squid/errors/Portuguese/ERR_UNSUP_REQ
-#usr/lib/squid/errors/Portuguese/ERR_URN_RESOLVE
-#usr/lib/squid/errors/Portuguese/ERR_WRITE_ERROR
-#usr/lib/squid/errors/Portuguese/ERR_ZERO_SIZE_OBJECT
-#usr/lib/squid/errors/Romanian
-#usr/lib/squid/errors/Romanian/ERR_ACCESS_DENIED
-#usr/lib/squid/errors/Romanian/ERR_CACHE_ACCESS_DENIED
-#usr/lib/squid/errors/Romanian/ERR_CACHE_MGR_ACCESS_DENIED
-#usr/lib/squid/errors/Romanian/ERR_CANNOT_FORWARD
-#usr/lib/squid/errors/Romanian/ERR_CONNECT_FAIL
-#usr/lib/squid/errors/Romanian/ERR_DNS_FAIL
-#usr/lib/squid/errors/Romanian/ERR_FORWARDING_DENIED
-#usr/lib/squid/errors/Romanian/ERR_FTP_DISABLED
-#usr/lib/squid/errors/Romanian/ERR_FTP_FAILURE
-#usr/lib/squid/errors/Romanian/ERR_FTP_FORBIDDEN
-#usr/lib/squid/errors/Romanian/ERR_FTP_NOT_FOUND
-#usr/lib/squid/errors/Romanian/ERR_FTP_PUT_CREATED
-#usr/lib/squid/errors/Romanian/ERR_FTP_PUT_ERROR
-#usr/lib/squid/errors/Romanian/ERR_FTP_PUT_MODIFIED
-#usr/lib/squid/errors/Romanian/ERR_FTP_UNAVAILABLE
-#usr/lib/squid/errors/Romanian/ERR_INVALID_REQ
-#usr/lib/squid/errors/Romanian/ERR_INVALID_RESP
-#usr/lib/squid/errors/Romanian/ERR_INVALID_URL
-#usr/lib/squid/errors/Romanian/ERR_LIFETIME_EXP
-#usr/lib/squid/errors/Romanian/ERR_NO_RELAY
-#usr/lib/squid/errors/Romanian/ERR_ONLY_IF_CACHED_MISS
-#usr/lib/squid/errors/Romanian/ERR_READ_ERROR
-#usr/lib/squid/errors/Romanian/ERR_READ_TIMEOUT
-#usr/lib/squid/errors/Romanian/ERR_SHUTTING_DOWN
-#usr/lib/squid/errors/Romanian/ERR_SOCKET_FAILURE
-#usr/lib/squid/errors/Romanian/ERR_TOO_BIG
-#usr/lib/squid/errors/Romanian/ERR_UNSUP_REQ
-#usr/lib/squid/errors/Romanian/ERR_URN_RESOLVE
-#usr/lib/squid/errors/Romanian/ERR_WRITE_ERROR
-#usr/lib/squid/errors/Romanian/ERR_ZERO_SIZE_OBJECT
-#usr/lib/squid/errors/Russian-1251
-#usr/lib/squid/errors/Russian-1251/ERR_ACCESS_DENIED
-#usr/lib/squid/errors/Russian-1251/ERR_CACHE_ACCESS_DENIED
-#usr/lib/squid/errors/Russian-1251/ERR_CACHE_MGR_ACCESS_DENIED
-#usr/lib/squid/errors/Russian-1251/ERR_CANNOT_FORWARD
-#usr/lib/squid/errors/Russian-1251/ERR_CONNECT_FAIL
-#usr/lib/squid/errors/Russian-1251/ERR_DNS_FAIL
-#usr/lib/squid/errors/Russian-1251/ERR_FORWARDING_DENIED
-#usr/lib/squid/errors/Russian-1251/ERR_FTP_DISABLED
-#usr/lib/squid/errors/Russian-1251/ERR_FTP_FAILURE
-#usr/lib/squid/errors/Russian-1251/ERR_FTP_FORBIDDEN
-#usr/lib/squid/errors/Russian-1251/ERR_FTP_NOT_FOUND
-#usr/lib/squid/errors/Russian-1251/ERR_FTP_PUT_CREATED
-#usr/lib/squid/errors/Russian-1251/ERR_FTP_PUT_ERROR
-#usr/lib/squid/errors/Russian-1251/ERR_FTP_PUT_MODIFIED
-#usr/lib/squid/errors/Russian-1251/ERR_FTP_UNAVAILABLE
-#usr/lib/squid/errors/Russian-1251/ERR_INVALID_REQ
-#usr/lib/squid/errors/Russian-1251/ERR_INVALID_RESP
-#usr/lib/squid/errors/Russian-1251/ERR_INVALID_URL
-#usr/lib/squid/errors/Russian-1251/ERR_LIFETIME_EXP
-#usr/lib/squid/errors/Russian-1251/ERR_NO_RELAY
-#usr/lib/squid/errors/Russian-1251/ERR_ONLY_IF_CACHED_MISS
-#usr/lib/squid/errors/Russian-1251/ERR_READ_ERROR
-#usr/lib/squid/errors/Russian-1251/ERR_READ_TIMEOUT
-#usr/lib/squid/errors/Russian-1251/ERR_SHUTTING_DOWN
-#usr/lib/squid/errors/Russian-1251/ERR_SOCKET_FAILURE
-#usr/lib/squid/errors/Russian-1251/ERR_TOO_BIG
-#usr/lib/squid/errors/Russian-1251/ERR_UNSUP_REQ
-#usr/lib/squid/errors/Russian-1251/ERR_URN_RESOLVE
-#usr/lib/squid/errors/Russian-1251/ERR_WRITE_ERROR
-#usr/lib/squid/errors/Russian-1251/ERR_ZERO_SIZE_OBJECT
-#usr/lib/squid/errors/Russian-koi8-r
-#usr/lib/squid/errors/Russian-koi8-r/ERR_ACCESS_DENIED
-#usr/lib/squid/errors/Russian-koi8-r/ERR_CACHE_ACCESS_DENIED
-#usr/lib/squid/errors/Russian-koi8-r/ERR_CACHE_MGR_ACCESS_DENIED
-#usr/lib/squid/errors/Russian-koi8-r/ERR_CANNOT_FORWARD
-#usr/lib/squid/errors/Russian-koi8-r/ERR_CONNECT_FAIL
-#usr/lib/squid/errors/Russian-koi8-r/ERR_DNS_FAIL
-#usr/lib/squid/errors/Russian-koi8-r/ERR_FORWARDING_DENIED
-#usr/lib/squid/errors/Russian-koi8-r/ERR_FTP_DISABLED
-#usr/lib/squid/errors/Russian-koi8-r/ERR_FTP_FAILURE
-#usr/lib/squid/errors/Russian-koi8-r/ERR_FTP_FORBIDDEN
-#usr/lib/squid/errors/Russian-koi8-r/ERR_FTP_NOT_FOUND
-#usr/lib/squid/errors/Russian-koi8-r/ERR_FTP_PUT_CREATED
-#usr/lib/squid/errors/Russian-koi8-r/ERR_FTP_PUT_ERROR
-#usr/lib/squid/errors/Russian-koi8-r/ERR_FTP_PUT_MODIFIED
-#usr/lib/squid/errors/Russian-koi8-r/ERR_FTP_UNAVAILABLE
-#usr/lib/squid/errors/Russian-koi8-r/ERR_INVALID_REQ
-#usr/lib/squid/errors/Russian-koi8-r/ERR_INVALID_RESP
-#usr/lib/squid/errors/Russian-koi8-r/ERR_INVALID_URL
-#usr/lib/squid/errors/Russian-koi8-r/ERR_LIFETIME_EXP
-#usr/lib/squid/errors/Russian-koi8-r/ERR_NO_RELAY
-#usr/lib/squid/errors/Russian-koi8-r/ERR_ONLY_IF_CACHED_MISS
-#usr/lib/squid/errors/Russian-koi8-r/ERR_READ_ERROR
-#usr/lib/squid/errors/Russian-koi8-r/ERR_READ_TIMEOUT
-#usr/lib/squid/errors/Russian-koi8-r/ERR_SHUTTING_DOWN
-#usr/lib/squid/errors/Russian-koi8-r/ERR_SOCKET_FAILURE
-#usr/lib/squid/errors/Russian-koi8-r/ERR_TOO_BIG
-#usr/lib/squid/errors/Russian-koi8-r/ERR_UNSUP_REQ
-#usr/lib/squid/errors/Russian-koi8-r/ERR_URN_RESOLVE
-#usr/lib/squid/errors/Russian-koi8-r/ERR_WRITE_ERROR
-#usr/lib/squid/errors/Russian-koi8-r/ERR_ZERO_SIZE_OBJECT
-#usr/lib/squid/errors/Serbian
-#usr/lib/squid/errors/Serbian/ERR_ACCESS_DENIED
-#usr/lib/squid/errors/Serbian/ERR_CACHE_ACCESS_DENIED
-#usr/lib/squid/errors/Serbian/ERR_CACHE_MGR_ACCESS_DENIED
-#usr/lib/squid/errors/Serbian/ERR_CANNOT_FORWARD
-#usr/lib/squid/errors/Serbian/ERR_CONNECT_FAIL
-#usr/lib/squid/errors/Serbian/ERR_DNS_FAIL
-#usr/lib/squid/errors/Serbian/ERR_FORWARDING_DENIED
-#usr/lib/squid/errors/Serbian/ERR_FTP_DISABLED
-#usr/lib/squid/errors/Serbian/ERR_FTP_FAILURE
-#usr/lib/squid/errors/Serbian/ERR_FTP_FORBIDDEN
-#usr/lib/squid/errors/Serbian/ERR_FTP_NOT_FOUND
-#usr/lib/squid/errors/Serbian/ERR_FTP_PUT_CREATED
-#usr/lib/squid/errors/Serbian/ERR_FTP_PUT_ERROR
-#usr/lib/squid/errors/Serbian/ERR_FTP_PUT_MODIFIED
-#usr/lib/squid/errors/Serbian/ERR_FTP_UNAVAILABLE
-#usr/lib/squid/errors/Serbian/ERR_INVALID_REQ
-#usr/lib/squid/errors/Serbian/ERR_INVALID_RESP
-#usr/lib/squid/errors/Serbian/ERR_INVALID_URL
-#usr/lib/squid/errors/Serbian/ERR_LIFETIME_EXP
-#usr/lib/squid/errors/Serbian/ERR_NO_RELAY
-#usr/lib/squid/errors/Serbian/ERR_ONLY_IF_CACHED_MISS
-#usr/lib/squid/errors/Serbian/ERR_READ_ERROR
-#usr/lib/squid/errors/Serbian/ERR_READ_TIMEOUT
-#usr/lib/squid/errors/Serbian/ERR_SHUTTING_DOWN
-#usr/lib/squid/errors/Serbian/ERR_SOCKET_FAILURE
-#usr/lib/squid/errors/Serbian/ERR_TOO_BIG
-#usr/lib/squid/errors/Serbian/ERR_UNSUP_REQ
-#usr/lib/squid/errors/Serbian/ERR_URN_RESOLVE
-#usr/lib/squid/errors/Serbian/ERR_WRITE_ERROR
-#usr/lib/squid/errors/Serbian/ERR_ZERO_SIZE_OBJECT
-#usr/lib/squid/errors/Simplify_Chinese
-#usr/lib/squid/errors/Simplify_Chinese/ERR_ACCESS_DENIED
-#usr/lib/squid/errors/Simplify_Chinese/ERR_CACHE_ACCESS_DENIED
-#usr/lib/squid/errors/Simplify_Chinese/ERR_CACHE_MGR_ACCESS_DENIED
-#usr/lib/squid/errors/Simplify_Chinese/ERR_CANNOT_FORWARD
-#usr/lib/squid/errors/Simplify_Chinese/ERR_CONNECT_FAIL
-#usr/lib/squid/errors/Simplify_Chinese/ERR_DNS_FAIL
-#usr/lib/squid/errors/Simplify_Chinese/ERR_FORWARDING_DENIED
-#usr/lib/squid/errors/Simplify_Chinese/ERR_FTP_DISABLED
-#usr/lib/squid/errors/Simplify_Chinese/ERR_FTP_FAILURE
-#usr/lib/squid/errors/Simplify_Chinese/ERR_FTP_FORBIDDEN
-#usr/lib/squid/errors/Simplify_Chinese/ERR_FTP_NOT_FOUND
-#usr/lib/squid/errors/Simplify_Chinese/ERR_FTP_PUT_CREATED
-#usr/lib/squid/errors/Simplify_Chinese/ERR_FTP_PUT_ERROR
-#usr/lib/squid/errors/Simplify_Chinese/ERR_FTP_PUT_MODIFIED
-#usr/lib/squid/errors/Simplify_Chinese/ERR_FTP_UNAVAILABLE
-#usr/lib/squid/errors/Simplify_Chinese/ERR_INVALID_REQ
-#usr/lib/squid/errors/Simplify_Chinese/ERR_INVALID_RESP
-#usr/lib/squid/errors/Simplify_Chinese/ERR_INVALID_URL
-#usr/lib/squid/errors/Simplify_Chinese/ERR_LIFETIME_EXP
-#usr/lib/squid/errors/Simplify_Chinese/ERR_NO_RELAY
-#usr/lib/squid/errors/Simplify_Chinese/ERR_ONLY_IF_CACHED_MISS
-#usr/lib/squid/errors/Simplify_Chinese/ERR_READ_ERROR
-#usr/lib/squid/errors/Simplify_Chinese/ERR_READ_TIMEOUT
-#usr/lib/squid/errors/Simplify_Chinese/ERR_SHUTTING_DOWN
-#usr/lib/squid/errors/Simplify_Chinese/ERR_SOCKET_FAILURE
-#usr/lib/squid/errors/Simplify_Chinese/ERR_TOO_BIG
-#usr/lib/squid/errors/Simplify_Chinese/ERR_UNSUP_REQ
-#usr/lib/squid/errors/Simplify_Chinese/ERR_URN_RESOLVE
-#usr/lib/squid/errors/Simplify_Chinese/ERR_WRITE_ERROR
-#usr/lib/squid/errors/Simplify_Chinese/ERR_ZERO_SIZE_OBJECT
-#usr/lib/squid/errors/Slovak
-#usr/lib/squid/errors/Slovak/ERR_ACCESS_DENIED
-#usr/lib/squid/errors/Slovak/ERR_CACHE_ACCESS_DENIED
-#usr/lib/squid/errors/Slovak/ERR_CACHE_MGR_ACCESS_DENIED
-#usr/lib/squid/errors/Slovak/ERR_CANNOT_FORWARD
-#usr/lib/squid/errors/Slovak/ERR_CONNECT_FAIL
-#usr/lib/squid/errors/Slovak/ERR_DNS_FAIL
-#usr/lib/squid/errors/Slovak/ERR_FORWARDING_DENIED
-#usr/lib/squid/errors/Slovak/ERR_FTP_DISABLED
-#usr/lib/squid/errors/Slovak/ERR_FTP_FAILURE
-#usr/lib/squid/errors/Slovak/ERR_FTP_FORBIDDEN
-#usr/lib/squid/errors/Slovak/ERR_FTP_NOT_FOUND
-#usr/lib/squid/errors/Slovak/ERR_FTP_PUT_CREATED
-#usr/lib/squid/errors/Slovak/ERR_FTP_PUT_ERROR
-#usr/lib/squid/errors/Slovak/ERR_FTP_PUT_MODIFIED
-#usr/lib/squid/errors/Slovak/ERR_FTP_UNAVAILABLE
-#usr/lib/squid/errors/Slovak/ERR_INVALID_REQ
-#usr/lib/squid/errors/Slovak/ERR_INVALID_RESP
-#usr/lib/squid/errors/Slovak/ERR_INVALID_URL
-#usr/lib/squid/errors/Slovak/ERR_LIFETIME_EXP
-#usr/lib/squid/errors/Slovak/ERR_NO_RELAY
-#usr/lib/squid/errors/Slovak/ERR_ONLY_IF_CACHED_MISS
-#usr/lib/squid/errors/Slovak/ERR_READ_ERROR
-#usr/lib/squid/errors/Slovak/ERR_READ_TIMEOUT
-#usr/lib/squid/errors/Slovak/ERR_SHUTTING_DOWN
-#usr/lib/squid/errors/Slovak/ERR_SOCKET_FAILURE
-#usr/lib/squid/errors/Slovak/ERR_TOO_BIG
-#usr/lib/squid/errors/Slovak/ERR_UNSUP_REQ
-#usr/lib/squid/errors/Slovak/ERR_URN_RESOLVE
-#usr/lib/squid/errors/Slovak/ERR_WRITE_ERROR
-#usr/lib/squid/errors/Slovak/ERR_ZERO_SIZE_OBJECT
-#usr/lib/squid/errors/Spanish
-#usr/lib/squid/errors/Spanish/ERR_ACCESS_DENIED
-#usr/lib/squid/errors/Spanish/ERR_CACHE_ACCESS_DENIED
-#usr/lib/squid/errors/Spanish/ERR_CACHE_MGR_ACCESS_DENIED
-#usr/lib/squid/errors/Spanish/ERR_CANNOT_FORWARD
-#usr/lib/squid/errors/Spanish/ERR_CONNECT_FAIL
-#usr/lib/squid/errors/Spanish/ERR_DNS_FAIL
-#usr/lib/squid/errors/Spanish/ERR_FORWARDING_DENIED
-#usr/lib/squid/errors/Spanish/ERR_FTP_DISABLED
-#usr/lib/squid/errors/Spanish/ERR_FTP_FAILURE
-#usr/lib/squid/errors/Spanish/ERR_FTP_FORBIDDEN
-#usr/lib/squid/errors/Spanish/ERR_FTP_NOT_FOUND
-#usr/lib/squid/errors/Spanish/ERR_FTP_PUT_CREATED
-#usr/lib/squid/errors/Spanish/ERR_FTP_PUT_ERROR
-#usr/lib/squid/errors/Spanish/ERR_FTP_PUT_MODIFIED
-#usr/lib/squid/errors/Spanish/ERR_FTP_UNAVAILABLE
-#usr/lib/squid/errors/Spanish/ERR_INVALID_REQ
-#usr/lib/squid/errors/Spanish/ERR_INVALID_RESP
-#usr/lib/squid/errors/Spanish/ERR_INVALID_URL
-#usr/lib/squid/errors/Spanish/ERR_LIFETIME_EXP
-#usr/lib/squid/errors/Spanish/ERR_NO_RELAY
-#usr/lib/squid/errors/Spanish/ERR_ONLY_IF_CACHED_MISS
-#usr/lib/squid/errors/Spanish/ERR_READ_ERROR
-#usr/lib/squid/errors/Spanish/ERR_READ_TIMEOUT
-#usr/lib/squid/errors/Spanish/ERR_SHUTTING_DOWN
-#usr/lib/squid/errors/Spanish/ERR_SOCKET_FAILURE
-#usr/lib/squid/errors/Spanish/ERR_TOO_BIG
-#usr/lib/squid/errors/Spanish/ERR_UNSUP_REQ
-#usr/lib/squid/errors/Spanish/ERR_URN_RESOLVE
-#usr/lib/squid/errors/Spanish/ERR_WRITE_ERROR
-#usr/lib/squid/errors/Spanish/ERR_ZERO_SIZE_OBJECT
-#usr/lib/squid/errors/Swedish
-#usr/lib/squid/errors/Swedish/ERR_ACCESS_DENIED
-#usr/lib/squid/errors/Swedish/ERR_CACHE_ACCESS_DENIED
-#usr/lib/squid/errors/Swedish/ERR_CACHE_MGR_ACCESS_DENIED
-#usr/lib/squid/errors/Swedish/ERR_CANNOT_FORWARD
-#usr/lib/squid/errors/Swedish/ERR_CONNECT_FAIL
-#usr/lib/squid/errors/Swedish/ERR_DNS_FAIL
-#usr/lib/squid/errors/Swedish/ERR_FORWARDING_DENIED
-#usr/lib/squid/errors/Swedish/ERR_FTP_DISABLED
-#usr/lib/squid/errors/Swedish/ERR_FTP_FAILURE
-#usr/lib/squid/errors/Swedish/ERR_FTP_FORBIDDEN
-#usr/lib/squid/errors/Swedish/ERR_FTP_NOT_FOUND
-#usr/lib/squid/errors/Swedish/ERR_FTP_PUT_CREATED
-#usr/lib/squid/errors/Swedish/ERR_FTP_PUT_ERROR
-#usr/lib/squid/errors/Swedish/ERR_FTP_PUT_MODIFIED
-#usr/lib/squid/errors/Swedish/ERR_FTP_UNAVAILABLE
-#usr/lib/squid/errors/Swedish/ERR_INVALID_REQ
-#usr/lib/squid/errors/Swedish/ERR_INVALID_RESP
-#usr/lib/squid/errors/Swedish/ERR_INVALID_URL
-#usr/lib/squid/errors/Swedish/ERR_LIFETIME_EXP
-#usr/lib/squid/errors/Swedish/ERR_NO_RELAY
-#usr/lib/squid/errors/Swedish/ERR_ONLY_IF_CACHED_MISS
-#usr/lib/squid/errors/Swedish/ERR_READ_ERROR
-#usr/lib/squid/errors/Swedish/ERR_READ_TIMEOUT
-#usr/lib/squid/errors/Swedish/ERR_SHUTTING_DOWN
-#usr/lib/squid/errors/Swedish/ERR_SOCKET_FAILURE
-#usr/lib/squid/errors/Swedish/ERR_TOO_BIG
-#usr/lib/squid/errors/Swedish/ERR_UNSUP_REQ
-#usr/lib/squid/errors/Swedish/ERR_URN_RESOLVE
-#usr/lib/squid/errors/Swedish/ERR_WRITE_ERROR
-#usr/lib/squid/errors/Swedish/ERR_ZERO_SIZE_OBJECT
-#usr/lib/squid/errors/Traditional_Chinese
-#usr/lib/squid/errors/Traditional_Chinese/ERR_ACCESS_DENIED
-#usr/lib/squid/errors/Traditional_Chinese/ERR_CACHE_ACCESS_DENIED
-#usr/lib/squid/errors/Traditional_Chinese/ERR_CACHE_MGR_ACCESS_DENIED
-#usr/lib/squid/errors/Traditional_Chinese/ERR_CANNOT_FORWARD
-#usr/lib/squid/errors/Traditional_Chinese/ERR_CONNECT_FAIL
-#usr/lib/squid/errors/Traditional_Chinese/ERR_DNS_FAIL
-#usr/lib/squid/errors/Traditional_Chinese/ERR_FORWARDING_DENIED
-#usr/lib/squid/errors/Traditional_Chinese/ERR_FTP_DISABLED
-#usr/lib/squid/errors/Traditional_Chinese/ERR_FTP_FAILURE
-#usr/lib/squid/errors/Traditional_Chinese/ERR_FTP_FORBIDDEN
-#usr/lib/squid/errors/Traditional_Chinese/ERR_FTP_NOT_FOUND
-#usr/lib/squid/errors/Traditional_Chinese/ERR_FTP_PUT_CREATED
-#usr/lib/squid/errors/Traditional_Chinese/ERR_FTP_PUT_ERROR
-#usr/lib/squid/errors/Traditional_Chinese/ERR_FTP_PUT_MODIFIED
-#usr/lib/squid/errors/Traditional_Chinese/ERR_FTP_UNAVAILABLE
-#usr/lib/squid/errors/Traditional_Chinese/ERR_INVALID_REQ
-#usr/lib/squid/errors/Traditional_Chinese/ERR_INVALID_RESP
-#usr/lib/squid/errors/Traditional_Chinese/ERR_INVALID_URL
-#usr/lib/squid/errors/Traditional_Chinese/ERR_LIFETIME_EXP
-#usr/lib/squid/errors/Traditional_Chinese/ERR_NO_RELAY
-#usr/lib/squid/errors/Traditional_Chinese/ERR_ONLY_IF_CACHED_MISS
-#usr/lib/squid/errors/Traditional_Chinese/ERR_READ_ERROR
-#usr/lib/squid/errors/Traditional_Chinese/ERR_READ_TIMEOUT
-#usr/lib/squid/errors/Traditional_Chinese/ERR_SHUTTING_DOWN
-#usr/lib/squid/errors/Traditional_Chinese/ERR_SOCKET_FAILURE
-#usr/lib/squid/errors/Traditional_Chinese/ERR_TOO_BIG
-#usr/lib/squid/errors/Traditional_Chinese/ERR_UNSUP_REQ
-#usr/lib/squid/errors/Traditional_Chinese/ERR_URN_RESOLVE
-#usr/lib/squid/errors/Traditional_Chinese/ERR_WRITE_ERROR
-#usr/lib/squid/errors/Traditional_Chinese/ERR_ZERO_SIZE_OBJECT
-#usr/lib/squid/errors/Turkish
-#usr/lib/squid/errors/Turkish/ERR_ACCESS_DENIED
-#usr/lib/squid/errors/Turkish/ERR_CACHE_ACCESS_DENIED
-#usr/lib/squid/errors/Turkish/ERR_CACHE_MGR_ACCESS_DENIED
-#usr/lib/squid/errors/Turkish/ERR_CANNOT_FORWARD
-#usr/lib/squid/errors/Turkish/ERR_CONNECT_FAIL
-#usr/lib/squid/errors/Turkish/ERR_DNS_FAIL
-#usr/lib/squid/errors/Turkish/ERR_FORWARDING_DENIED
-#usr/lib/squid/errors/Turkish/ERR_FTP_DISABLED
-#usr/lib/squid/errors/Turkish/ERR_FTP_FAILURE
-#usr/lib/squid/errors/Turkish/ERR_FTP_FORBIDDEN
-#usr/lib/squid/errors/Turkish/ERR_FTP_NOT_FOUND
-#usr/lib/squid/errors/Turkish/ERR_FTP_PUT_CREATED
-#usr/lib/squid/errors/Turkish/ERR_FTP_PUT_ERROR
-#usr/lib/squid/errors/Turkish/ERR_FTP_PUT_MODIFIED
-#usr/lib/squid/errors/Turkish/ERR_FTP_UNAVAILABLE
-#usr/lib/squid/errors/Turkish/ERR_INVALID_REQ
-#usr/lib/squid/errors/Turkish/ERR_INVALID_RESP
-#usr/lib/squid/errors/Turkish/ERR_INVALID_URL
-#usr/lib/squid/errors/Turkish/ERR_LIFETIME_EXP
-#usr/lib/squid/errors/Turkish/ERR_NO_RELAY
-#usr/lib/squid/errors/Turkish/ERR_ONLY_IF_CACHED_MISS
-#usr/lib/squid/errors/Turkish/ERR_READ_ERROR
-#usr/lib/squid/errors/Turkish/ERR_READ_TIMEOUT
-#usr/lib/squid/errors/Turkish/ERR_SHUTTING_DOWN
-#usr/lib/squid/errors/Turkish/ERR_SOCKET_FAILURE
-#usr/lib/squid/errors/Turkish/ERR_TOO_BIG
-#usr/lib/squid/errors/Turkish/ERR_UNSUP_REQ
-#usr/lib/squid/errors/Turkish/ERR_URN_RESOLVE
-#usr/lib/squid/errors/Turkish/ERR_WRITE_ERROR
-#usr/lib/squid/errors/Turkish/ERR_ZERO_SIZE_OBJECT
-#usr/lib/squid/errors/Ukrainian-1251
-#usr/lib/squid/errors/Ukrainian-1251/ERR_ACCESS_DENIED
-#usr/lib/squid/errors/Ukrainian-1251/ERR_CACHE_ACCESS_DENIED
-#usr/lib/squid/errors/Ukrainian-1251/ERR_CACHE_MGR_ACCESS_DENIED
-#usr/lib/squid/errors/Ukrainian-1251/ERR_CANNOT_FORWARD
-#usr/lib/squid/errors/Ukrainian-1251/ERR_CONNECT_FAIL
-#usr/lib/squid/errors/Ukrainian-1251/ERR_DNS_FAIL
-#usr/lib/squid/errors/Ukrainian-1251/ERR_FORWARDING_DENIED
-#usr/lib/squid/errors/Ukrainian-1251/ERR_FTP_DISABLED
-#usr/lib/squid/errors/Ukrainian-1251/ERR_FTP_FAILURE
-#usr/lib/squid/errors/Ukrainian-1251/ERR_FTP_FORBIDDEN
-#usr/lib/squid/errors/Ukrainian-1251/ERR_FTP_NOT_FOUND
-#usr/lib/squid/errors/Ukrainian-1251/ERR_FTP_PUT_CREATED
-#usr/lib/squid/errors/Ukrainian-1251/ERR_FTP_PUT_ERROR
-#usr/lib/squid/errors/Ukrainian-1251/ERR_FTP_PUT_MODIFIED
-#usr/lib/squid/errors/Ukrainian-1251/ERR_FTP_UNAVAILABLE
-#usr/lib/squid/errors/Ukrainian-1251/ERR_INVALID_REQ
-#usr/lib/squid/errors/Ukrainian-1251/ERR_INVALID_RESP
-#usr/lib/squid/errors/Ukrainian-1251/ERR_INVALID_URL
-#usr/lib/squid/errors/Ukrainian-1251/ERR_LIFETIME_EXP
-#usr/lib/squid/errors/Ukrainian-1251/ERR_NO_RELAY
-#usr/lib/squid/errors/Ukrainian-1251/ERR_ONLY_IF_CACHED_MISS
-#usr/lib/squid/errors/Ukrainian-1251/ERR_READ_ERROR
-#usr/lib/squid/errors/Ukrainian-1251/ERR_READ_TIMEOUT
-#usr/lib/squid/errors/Ukrainian-1251/ERR_SHUTTING_DOWN
-#usr/lib/squid/errors/Ukrainian-1251/ERR_SOCKET_FAILURE
-#usr/lib/squid/errors/Ukrainian-1251/ERR_TOO_BIG
-#usr/lib/squid/errors/Ukrainian-1251/ERR_UNSUP_REQ
-#usr/lib/squid/errors/Ukrainian-1251/ERR_URN_RESOLVE
-#usr/lib/squid/errors/Ukrainian-1251/ERR_WRITE_ERROR
-#usr/lib/squid/errors/Ukrainian-1251/ERR_ZERO_SIZE_OBJECT
-#usr/lib/squid/errors/Ukrainian-koi8-u
-#usr/lib/squid/errors/Ukrainian-koi8-u/ERR_ACCESS_DENIED
-#usr/lib/squid/errors/Ukrainian-koi8-u/ERR_CACHE_ACCESS_DENIED
-#usr/lib/squid/errors/Ukrainian-koi8-u/ERR_CACHE_MGR_ACCESS_DENIED
-#usr/lib/squid/errors/Ukrainian-koi8-u/ERR_CANNOT_FORWARD
-#usr/lib/squid/errors/Ukrainian-koi8-u/ERR_CONNECT_FAIL
-#usr/lib/squid/errors/Ukrainian-koi8-u/ERR_DNS_FAIL
-#usr/lib/squid/errors/Ukrainian-koi8-u/ERR_FORWARDING_DENIED
-#usr/lib/squid/errors/Ukrainian-koi8-u/ERR_FTP_DISABLED
-#usr/lib/squid/errors/Ukrainian-koi8-u/ERR_FTP_FAILURE
-#usr/lib/squid/errors/Ukrainian-koi8-u/ERR_FTP_FORBIDDEN
-#usr/lib/squid/errors/Ukrainian-koi8-u/ERR_FTP_NOT_FOUND
-#usr/lib/squid/errors/Ukrainian-koi8-u/ERR_FTP_PUT_CREATED
-#usr/lib/squid/errors/Ukrainian-koi8-u/ERR_FTP_PUT_ERROR
-#usr/lib/squid/errors/Ukrainian-koi8-u/ERR_FTP_PUT_MODIFIED
-#usr/lib/squid/errors/Ukrainian-koi8-u/ERR_FTP_UNAVAILABLE
-#usr/lib/squid/errors/Ukrainian-koi8-u/ERR_INVALID_REQ
-#usr/lib/squid/errors/Ukrainian-koi8-u/ERR_INVALID_RESP
-#usr/lib/squid/errors/Ukrainian-koi8-u/ERR_INVALID_URL
-#usr/lib/squid/errors/Ukrainian-koi8-u/ERR_LIFETIME_EXP
-#usr/lib/squid/errors/Ukrainian-koi8-u/ERR_NO_RELAY
-#usr/lib/squid/errors/Ukrainian-koi8-u/ERR_ONLY_IF_CACHED_MISS
-#usr/lib/squid/errors/Ukrainian-koi8-u/ERR_READ_ERROR
-#usr/lib/squid/errors/Ukrainian-koi8-u/ERR_READ_TIMEOUT
-#usr/lib/squid/errors/Ukrainian-koi8-u/ERR_SHUTTING_DOWN
-#usr/lib/squid/errors/Ukrainian-koi8-u/ERR_SOCKET_FAILURE
-#usr/lib/squid/errors/Ukrainian-koi8-u/ERR_TOO_BIG
-#usr/lib/squid/errors/Ukrainian-koi8-u/ERR_UNSUP_REQ
-#usr/lib/squid/errors/Ukrainian-koi8-u/ERR_URN_RESOLVE
-#usr/lib/squid/errors/Ukrainian-koi8-u/ERR_WRITE_ERROR
-#usr/lib/squid/errors/Ukrainian-koi8-u/ERR_ZERO_SIZE_OBJECT
-#usr/lib/squid/errors/Ukrainian-utf8
-#usr/lib/squid/errors/Ukrainian-utf8/ERR_ACCESS_DENIED
-#usr/lib/squid/errors/Ukrainian-utf8/ERR_CACHE_ACCESS_DENIED
-#usr/lib/squid/errors/Ukrainian-utf8/ERR_CACHE_MGR_ACCESS_DENIED
-#usr/lib/squid/errors/Ukrainian-utf8/ERR_CANNOT_FORWARD
-#usr/lib/squid/errors/Ukrainian-utf8/ERR_CONNECT_FAIL
-#usr/lib/squid/errors/Ukrainian-utf8/ERR_DNS_FAIL
-#usr/lib/squid/errors/Ukrainian-utf8/ERR_FORWARDING_DENIED
-#usr/lib/squid/errors/Ukrainian-utf8/ERR_FTP_DISABLED
-#usr/lib/squid/errors/Ukrainian-utf8/ERR_FTP_FAILURE
-#usr/lib/squid/errors/Ukrainian-utf8/ERR_FTP_FORBIDDEN
-#usr/lib/squid/errors/Ukrainian-utf8/ERR_FTP_NOT_FOUND
-#usr/lib/squid/errors/Ukrainian-utf8/ERR_FTP_PUT_CREATED
-#usr/lib/squid/errors/Ukrainian-utf8/ERR_FTP_PUT_ERROR
-#usr/lib/squid/errors/Ukrainian-utf8/ERR_FTP_PUT_MODIFIED
-#usr/lib/squid/errors/Ukrainian-utf8/ERR_FTP_UNAVAILABLE
-#usr/lib/squid/errors/Ukrainian-utf8/ERR_INVALID_REQ
-#usr/lib/squid/errors/Ukrainian-utf8/ERR_INVALID_RESP
-#usr/lib/squid/errors/Ukrainian-utf8/ERR_INVALID_URL
-#usr/lib/squid/errors/Ukrainian-utf8/ERR_LIFETIME_EXP
-#usr/lib/squid/errors/Ukrainian-utf8/ERR_NO_RELAY
-#usr/lib/squid/errors/Ukrainian-utf8/ERR_ONLY_IF_CACHED_MISS
-#usr/lib/squid/errors/Ukrainian-utf8/ERR_READ_ERROR
-#usr/lib/squid/errors/Ukrainian-utf8/ERR_READ_TIMEOUT
-#usr/lib/squid/errors/Ukrainian-utf8/ERR_SHUTTING_DOWN
-#usr/lib/squid/errors/Ukrainian-utf8/ERR_SOCKET_FAILURE
-#usr/lib/squid/errors/Ukrainian-utf8/ERR_TOO_BIG
-#usr/lib/squid/errors/Ukrainian-utf8/ERR_UNSUP_REQ
-#usr/lib/squid/errors/Ukrainian-utf8/ERR_URN_RESOLVE
-#usr/lib/squid/errors/Ukrainian-utf8/ERR_WRITE_ERROR
-#usr/lib/squid/errors/Ukrainian-utf8/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors.ipfire/de
+usr/lib/squid/errors.ipfire/de/ERR_ACCESS_DENIED
+usr/lib/squid/errors.ipfire/de/ERR_CACHE_ACCESS_DENIED
+usr/lib/squid/errors.ipfire/de/ERR_CACHE_MGR_ACCESS_DENIED
+usr/lib/squid/errors.ipfire/de/ERR_CANNOT_FORWARD
+usr/lib/squid/errors.ipfire/de/ERR_CONNECT_FAIL
+usr/lib/squid/errors.ipfire/de/ERR_DIR_LISTING
+usr/lib/squid/errors.ipfire/de/ERR_DNS_FAIL
+usr/lib/squid/errors.ipfire/de/ERR_ESI
+usr/lib/squid/errors.ipfire/de/ERR_FORWARDING_DENIED
+usr/lib/squid/errors.ipfire/de/ERR_FTP_DISABLED
+usr/lib/squid/errors.ipfire/de/ERR_FTP_FAILURE
+usr/lib/squid/errors.ipfire/de/ERR_FTP_FORBIDDEN
+usr/lib/squid/errors.ipfire/de/ERR_FTP_NOT_FOUND
+usr/lib/squid/errors.ipfire/de/ERR_FTP_PUT_CREATED
+usr/lib/squid/errors.ipfire/de/ERR_FTP_PUT_ERROR
+usr/lib/squid/errors.ipfire/de/ERR_FTP_PUT_MODIFIED
+usr/lib/squid/errors.ipfire/de/ERR_FTP_UNAVAILABLE
+usr/lib/squid/errors.ipfire/de/ERR_ICAP_FAILURE
+usr/lib/squid/errors.ipfire/de/ERR_INVALID_REQ
+usr/lib/squid/errors.ipfire/de/ERR_INVALID_RESP
+usr/lib/squid/errors.ipfire/de/ERR_INVALID_URL
+usr/lib/squid/errors.ipfire/de/ERR_LIFETIME_EXP
+usr/lib/squid/errors.ipfire/de/ERR_NO_RELAY
+usr/lib/squid/errors.ipfire/de/ERR_ONLY_IF_CACHED_MISS
+usr/lib/squid/errors.ipfire/de/ERR_READ_ERROR
+usr/lib/squid/errors.ipfire/de/ERR_READ_TIMEOUT
+usr/lib/squid/errors.ipfire/de/ERR_SECURE_CONNECT_FAIL
+usr/lib/squid/errors.ipfire/de/ERR_SHUTTING_DOWN
+usr/lib/squid/errors.ipfire/de/ERR_SOCKET_FAILURE
+usr/lib/squid/errors.ipfire/de/ERR_TOO_BIG
+usr/lib/squid/errors.ipfire/de/ERR_UNSUP_HTTPVERSION
+usr/lib/squid/errors.ipfire/de/ERR_UNSUP_REQ
+usr/lib/squid/errors.ipfire/de/ERR_URN_RESOLVE
+usr/lib/squid/errors.ipfire/de/ERR_WRITE_ERROR
+usr/lib/squid/errors.ipfire/de/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors.ipfire/en
+usr/lib/squid/errors.ipfire/en/ERR_ACCESS_DENIED
+usr/lib/squid/errors.ipfire/en/ERR_CACHE_ACCESS_DENIED
+usr/lib/squid/errors.ipfire/en/ERR_CACHE_MGR_ACCESS_DENIED
+usr/lib/squid/errors.ipfire/en/ERR_CANNOT_FORWARD
+usr/lib/squid/errors.ipfire/en/ERR_CONNECT_FAIL
+usr/lib/squid/errors.ipfire/en/ERR_DIR_LISTING
+usr/lib/squid/errors.ipfire/en/ERR_DNS_FAIL
+usr/lib/squid/errors.ipfire/en/ERR_ESI
+usr/lib/squid/errors.ipfire/en/ERR_FORWARDING_DENIED
+usr/lib/squid/errors.ipfire/en/ERR_FTP_DISABLED
+usr/lib/squid/errors.ipfire/en/ERR_FTP_FAILURE
+usr/lib/squid/errors.ipfire/en/ERR_FTP_FORBIDDEN
+usr/lib/squid/errors.ipfire/en/ERR_FTP_NOT_FOUND
+usr/lib/squid/errors.ipfire/en/ERR_FTP_PUT_CREATED
+usr/lib/squid/errors.ipfire/en/ERR_FTP_PUT_ERROR
+usr/lib/squid/errors.ipfire/en/ERR_FTP_PUT_MODIFIED
+usr/lib/squid/errors.ipfire/en/ERR_FTP_UNAVAILABLE
+usr/lib/squid/errors.ipfire/en/ERR_ICAP_FAILURE
+usr/lib/squid/errors.ipfire/en/ERR_INVALID_REQ
+usr/lib/squid/errors.ipfire/en/ERR_INVALID_RESP
+usr/lib/squid/errors.ipfire/en/ERR_INVALID_URL
+usr/lib/squid/errors.ipfire/en/ERR_LIFETIME_EXP
+usr/lib/squid/errors.ipfire/en/ERR_NO_RELAY
+usr/lib/squid/errors.ipfire/en/ERR_ONLY_IF_CACHED_MISS
+usr/lib/squid/errors.ipfire/en/ERR_READ_ERROR
+usr/lib/squid/errors.ipfire/en/ERR_READ_TIMEOUT
+usr/lib/squid/errors.ipfire/en/ERR_SECURE_CONNECT_FAIL
+usr/lib/squid/errors.ipfire/en/ERR_SHUTTING_DOWN
+usr/lib/squid/errors.ipfire/en/ERR_SOCKET_FAILURE
+usr/lib/squid/errors.ipfire/en/ERR_TOO_BIG
+usr/lib/squid/errors.ipfire/en/ERR_UNSUP_HTTPVERSION
+usr/lib/squid/errors.ipfire/en/ERR_UNSUP_REQ
+usr/lib/squid/errors.ipfire/en/ERR_URN_RESOLVE
+usr/lib/squid/errors.ipfire/en/ERR_WRITE_ERROR
+usr/lib/squid/errors.ipfire/en/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/COPYRIGHT
+#usr/lib/squid/errors/TRANSLATORS
+#usr/lib/squid/errors/af
+#usr/lib/squid/errors/af/ERR_ACCESS_DENIED
+#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
+#usr/lib/squid/errors/af/ERR_CONNECT_FAIL
+#usr/lib/squid/errors/af/ERR_DIR_LISTING
+#usr/lib/squid/errors/af/ERR_DNS_FAIL
+#usr/lib/squid/errors/af/ERR_ESI
+#usr/lib/squid/errors/af/ERR_FORWARDING_DENIED
+#usr/lib/squid/errors/af/ERR_FTP_DISABLED
+#usr/lib/squid/errors/af/ERR_FTP_FAILURE
+#usr/lib/squid/errors/af/ERR_FTP_FORBIDDEN
+#usr/lib/squid/errors/af/ERR_FTP_NOT_FOUND
+#usr/lib/squid/errors/af/ERR_FTP_PUT_CREATED
+#usr/lib/squid/errors/af/ERR_FTP_PUT_ERROR
+#usr/lib/squid/errors/af/ERR_FTP_PUT_MODIFIED
+#usr/lib/squid/errors/af/ERR_FTP_UNAVAILABLE
+#usr/lib/squid/errors/af/ERR_ICAP_FAILURE
+#usr/lib/squid/errors/af/ERR_INVALID_REQ
+#usr/lib/squid/errors/af/ERR_INVALID_RESP
+#usr/lib/squid/errors/af/ERR_INVALID_URL
+#usr/lib/squid/errors/af/ERR_LIFETIME_EXP
+#usr/lib/squid/errors/af/ERR_NO_RELAY
+#usr/lib/squid/errors/af/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/af/ERR_READ_ERROR
+#usr/lib/squid/errors/af/ERR_READ_TIMEOUT
+#usr/lib/squid/errors/af/ERR_SECURE_CONNECT_FAIL
+#usr/lib/squid/errors/af/ERR_SHUTTING_DOWN
+#usr/lib/squid/errors/af/ERR_SOCKET_FAILURE
+#usr/lib/squid/errors/af/ERR_TOO_BIG
+#usr/lib/squid/errors/af/ERR_UNSUP_HTTPVERSION
+#usr/lib/squid/errors/af/ERR_UNSUP_REQ
+#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/ar
+#usr/lib/squid/errors/ar-ae
+#usr/lib/squid/errors/ar-bh
+#usr/lib/squid/errors/ar-dz
+#usr/lib/squid/errors/ar-eg
+#usr/lib/squid/errors/ar-iq
+#usr/lib/squid/errors/ar-jo
+#usr/lib/squid/errors/ar-kw
+#usr/lib/squid/errors/ar-lb
+#usr/lib/squid/errors/ar-ly
+#usr/lib/squid/errors/ar-ma
+#usr/lib/squid/errors/ar-om
+#usr/lib/squid/errors/ar-qa
+#usr/lib/squid/errors/ar-sa
+#usr/lib/squid/errors/ar-sy
+#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_CACHE_ACCESS_DENIED
+#usr/lib/squid/errors/ar/ERR_CACHE_MGR_ACCESS_DENIED
+#usr/lib/squid/errors/ar/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/ar/ERR_CONNECT_FAIL
+#usr/lib/squid/errors/ar/ERR_DIR_LISTING
+#usr/lib/squid/errors/ar/ERR_DNS_FAIL
+#usr/lib/squid/errors/ar/ERR_ESI
+#usr/lib/squid/errors/ar/ERR_FORWARDING_DENIED
+#usr/lib/squid/errors/ar/ERR_FTP_DISABLED
+#usr/lib/squid/errors/ar/ERR_FTP_FAILURE
+#usr/lib/squid/errors/ar/ERR_FTP_FORBIDDEN
+#usr/lib/squid/errors/ar/ERR_FTP_NOT_FOUND
+#usr/lib/squid/errors/ar/ERR_FTP_PUT_CREATED
+#usr/lib/squid/errors/ar/ERR_FTP_PUT_ERROR
+#usr/lib/squid/errors/ar/ERR_FTP_PUT_MODIFIED
+#usr/lib/squid/errors/ar/ERR_FTP_UNAVAILABLE
+#usr/lib/squid/errors/ar/ERR_ICAP_FAILURE
+#usr/lib/squid/errors/ar/ERR_INVALID_REQ
+#usr/lib/squid/errors/ar/ERR_INVALID_RESP
+#usr/lib/squid/errors/ar/ERR_INVALID_URL
+#usr/lib/squid/errors/ar/ERR_LIFETIME_EXP
+#usr/lib/squid/errors/ar/ERR_NO_RELAY
+#usr/lib/squid/errors/ar/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/ar/ERR_READ_ERROR
+#usr/lib/squid/errors/ar/ERR_READ_TIMEOUT
+#usr/lib/squid/errors/ar/ERR_SECURE_CONNECT_FAIL
+#usr/lib/squid/errors/ar/ERR_SHUTTING_DOWN
+#usr/lib/squid/errors/ar/ERR_SOCKET_FAILURE
+#usr/lib/squid/errors/ar/ERR_TOO_BIG
+#usr/lib/squid/errors/ar/ERR_UNSUP_HTTPVERSION
+#usr/lib/squid/errors/ar/ERR_UNSUP_REQ
+#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/az
+#usr/lib/squid/errors/az-az
+#usr/lib/squid/errors/az/ERR_ACCESS_DENIED
+#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
+#usr/lib/squid/errors/az/ERR_CONNECT_FAIL
+#usr/lib/squid/errors/az/ERR_DIR_LISTING
+#usr/lib/squid/errors/az/ERR_DNS_FAIL
+#usr/lib/squid/errors/az/ERR_ESI
+#usr/lib/squid/errors/az/ERR_FORWARDING_DENIED
+#usr/lib/squid/errors/az/ERR_FTP_DISABLED
+#usr/lib/squid/errors/az/ERR_FTP_FAILURE
+#usr/lib/squid/errors/az/ERR_FTP_FORBIDDEN
+#usr/lib/squid/errors/az/ERR_FTP_NOT_FOUND
+#usr/lib/squid/errors/az/ERR_FTP_PUT_CREATED
+#usr/lib/squid/errors/az/ERR_FTP_PUT_ERROR
+#usr/lib/squid/errors/az/ERR_FTP_PUT_MODIFIED
+#usr/lib/squid/errors/az/ERR_FTP_UNAVAILABLE
+#usr/lib/squid/errors/az/ERR_ICAP_FAILURE
+#usr/lib/squid/errors/az/ERR_INVALID_REQ
+#usr/lib/squid/errors/az/ERR_INVALID_RESP
+#usr/lib/squid/errors/az/ERR_INVALID_URL
+#usr/lib/squid/errors/az/ERR_LIFETIME_EXP
+#usr/lib/squid/errors/az/ERR_NO_RELAY
+#usr/lib/squid/errors/az/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/az/ERR_READ_ERROR
+#usr/lib/squid/errors/az/ERR_READ_TIMEOUT
+#usr/lib/squid/errors/az/ERR_SECURE_CONNECT_FAIL
+#usr/lib/squid/errors/az/ERR_SHUTTING_DOWN
+#usr/lib/squid/errors/az/ERR_SOCKET_FAILURE
+#usr/lib/squid/errors/az/ERR_TOO_BIG
+#usr/lib/squid/errors/az/ERR_UNSUP_HTTPVERSION
+#usr/lib/squid/errors/az/ERR_UNSUP_REQ
+#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/bg
+#usr/lib/squid/errors/bg-bg
+#usr/lib/squid/errors/bg/ERR_ACCESS_DENIED
+#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
+#usr/lib/squid/errors/bg/ERR_CONNECT_FAIL
+#usr/lib/squid/errors/bg/ERR_DIR_LISTING
+#usr/lib/squid/errors/bg/ERR_DNS_FAIL
+#usr/lib/squid/errors/bg/ERR_ESI
+#usr/lib/squid/errors/bg/ERR_FORWARDING_DENIED
+#usr/lib/squid/errors/bg/ERR_FTP_DISABLED
+#usr/lib/squid/errors/bg/ERR_FTP_FAILURE
+#usr/lib/squid/errors/bg/ERR_FTP_FORBIDDEN
+#usr/lib/squid/errors/bg/ERR_FTP_NOT_FOUND
+#usr/lib/squid/errors/bg/ERR_FTP_PUT_CREATED
+#usr/lib/squid/errors/bg/ERR_FTP_PUT_ERROR
+#usr/lib/squid/errors/bg/ERR_FTP_PUT_MODIFIED
+#usr/lib/squid/errors/bg/ERR_FTP_UNAVAILABLE
+#usr/lib/squid/errors/bg/ERR_ICAP_FAILURE
+#usr/lib/squid/errors/bg/ERR_INVALID_REQ
+#usr/lib/squid/errors/bg/ERR_INVALID_RESP
+#usr/lib/squid/errors/bg/ERR_INVALID_URL
+#usr/lib/squid/errors/bg/ERR_LIFETIME_EXP
+#usr/lib/squid/errors/bg/ERR_NO_RELAY
+#usr/lib/squid/errors/bg/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/bg/ERR_READ_ERROR
+#usr/lib/squid/errors/bg/ERR_READ_TIMEOUT
+#usr/lib/squid/errors/bg/ERR_SECURE_CONNECT_FAIL
+#usr/lib/squid/errors/bg/ERR_SHUTTING_DOWN
+#usr/lib/squid/errors/bg/ERR_SOCKET_FAILURE
+#usr/lib/squid/errors/bg/ERR_TOO_BIG
+#usr/lib/squid/errors/bg/ERR_UNSUP_HTTPVERSION
+#usr/lib/squid/errors/bg/ERR_UNSUP_REQ
+#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/ca
+#usr/lib/squid/errors/ca/ERR_ACCESS_DENIED
+#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
+#usr/lib/squid/errors/ca/ERR_CONNECT_FAIL
+#usr/lib/squid/errors/ca/ERR_DIR_LISTING
+#usr/lib/squid/errors/ca/ERR_DNS_FAIL
+#usr/lib/squid/errors/ca/ERR_ESI
+#usr/lib/squid/errors/ca/ERR_FORWARDING_DENIED
+#usr/lib/squid/errors/ca/ERR_FTP_DISABLED
+#usr/lib/squid/errors/ca/ERR_FTP_FAILURE
+#usr/lib/squid/errors/ca/ERR_FTP_FORBIDDEN
+#usr/lib/squid/errors/ca/ERR_FTP_NOT_FOUND
+#usr/lib/squid/errors/ca/ERR_FTP_PUT_CREATED
+#usr/lib/squid/errors/ca/ERR_FTP_PUT_ERROR
+#usr/lib/squid/errors/ca/ERR_FTP_PUT_MODIFIED
+#usr/lib/squid/errors/ca/ERR_FTP_UNAVAILABLE
+#usr/lib/squid/errors/ca/ERR_ICAP_FAILURE
+#usr/lib/squid/errors/ca/ERR_INVALID_REQ
+#usr/lib/squid/errors/ca/ERR_INVALID_RESP
+#usr/lib/squid/errors/ca/ERR_INVALID_URL
+#usr/lib/squid/errors/ca/ERR_LIFETIME_EXP
+#usr/lib/squid/errors/ca/ERR_NO_RELAY
+#usr/lib/squid/errors/ca/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/ca/ERR_READ_ERROR
+#usr/lib/squid/errors/ca/ERR_READ_TIMEOUT
+#usr/lib/squid/errors/ca/ERR_SECURE_CONNECT_FAIL
+#usr/lib/squid/errors/ca/ERR_SHUTTING_DOWN
+#usr/lib/squid/errors/ca/ERR_SOCKET_FAILURE
+#usr/lib/squid/errors/ca/ERR_TOO_BIG
+#usr/lib/squid/errors/ca/ERR_UNSUP_HTTPVERSION
+#usr/lib/squid/errors/ca/ERR_UNSUP_REQ
+#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/cs
+#usr/lib/squid/errors/cs-cz
+#usr/lib/squid/errors/cs/ERR_ACCESS_DENIED
+#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
+#usr/lib/squid/errors/cs/ERR_CONNECT_FAIL
+#usr/lib/squid/errors/cs/ERR_DIR_LISTING
+#usr/lib/squid/errors/cs/ERR_DNS_FAIL
+#usr/lib/squid/errors/cs/ERR_ESI
+#usr/lib/squid/errors/cs/ERR_FORWARDING_DENIED
+#usr/lib/squid/errors/cs/ERR_FTP_DISABLED
+#usr/lib/squid/errors/cs/ERR_FTP_FAILURE
+#usr/lib/squid/errors/cs/ERR_FTP_FORBIDDEN
+#usr/lib/squid/errors/cs/ERR_FTP_NOT_FOUND
+#usr/lib/squid/errors/cs/ERR_FTP_PUT_CREATED
+#usr/lib/squid/errors/cs/ERR_FTP_PUT_ERROR
+#usr/lib/squid/errors/cs/ERR_FTP_PUT_MODIFIED
+#usr/lib/squid/errors/cs/ERR_FTP_UNAVAILABLE
+#usr/lib/squid/errors/cs/ERR_ICAP_FAILURE
+#usr/lib/squid/errors/cs/ERR_INVALID_REQ
+#usr/lib/squid/errors/cs/ERR_INVALID_RESP
+#usr/lib/squid/errors/cs/ERR_INVALID_URL
+#usr/lib/squid/errors/cs/ERR_LIFETIME_EXP
+#usr/lib/squid/errors/cs/ERR_NO_RELAY
+#usr/lib/squid/errors/cs/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/cs/ERR_READ_ERROR
+#usr/lib/squid/errors/cs/ERR_READ_TIMEOUT
+#usr/lib/squid/errors/cs/ERR_SECURE_CONNECT_FAIL
+#usr/lib/squid/errors/cs/ERR_SHUTTING_DOWN
+#usr/lib/squid/errors/cs/ERR_SOCKET_FAILURE
+#usr/lib/squid/errors/cs/ERR_TOO_BIG
+#usr/lib/squid/errors/cs/ERR_UNSUP_HTTPVERSION
+#usr/lib/squid/errors/cs/ERR_UNSUP_REQ
+#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/da
+#usr/lib/squid/errors/da-dk
+#usr/lib/squid/errors/da/ERR_ACCESS_DENIED
+#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
+#usr/lib/squid/errors/da/ERR_CONNECT_FAIL
+#usr/lib/squid/errors/da/ERR_DIR_LISTING
+#usr/lib/squid/errors/da/ERR_DNS_FAIL
+#usr/lib/squid/errors/da/ERR_ESI
+#usr/lib/squid/errors/da/ERR_FORWARDING_DENIED
+#usr/lib/squid/errors/da/ERR_FTP_DISABLED
+#usr/lib/squid/errors/da/ERR_FTP_FAILURE
+#usr/lib/squid/errors/da/ERR_FTP_FORBIDDEN
+#usr/lib/squid/errors/da/ERR_FTP_NOT_FOUND
+#usr/lib/squid/errors/da/ERR_FTP_PUT_CREATED
+#usr/lib/squid/errors/da/ERR_FTP_PUT_ERROR
+#usr/lib/squid/errors/da/ERR_FTP_PUT_MODIFIED
+#usr/lib/squid/errors/da/ERR_FTP_UNAVAILABLE
+#usr/lib/squid/errors/da/ERR_ICAP_FAILURE
+#usr/lib/squid/errors/da/ERR_INVALID_REQ
+#usr/lib/squid/errors/da/ERR_INVALID_RESP
+#usr/lib/squid/errors/da/ERR_INVALID_URL
+#usr/lib/squid/errors/da/ERR_LIFETIME_EXP
+#usr/lib/squid/errors/da/ERR_NO_RELAY
+#usr/lib/squid/errors/da/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/da/ERR_READ_ERROR
+#usr/lib/squid/errors/da/ERR_READ_TIMEOUT
+#usr/lib/squid/errors/da/ERR_SECURE_CONNECT_FAIL
+#usr/lib/squid/errors/da/ERR_SHUTTING_DOWN
+#usr/lib/squid/errors/da/ERR_SOCKET_FAILURE
+#usr/lib/squid/errors/da/ERR_TOO_BIG
+#usr/lib/squid/errors/da/ERR_UNSUP_HTTPVERSION
+#usr/lib/squid/errors/da/ERR_UNSUP_REQ
+#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/de
+#usr/lib/squid/errors/de-at
+#usr/lib/squid/errors/de-ch
+#usr/lib/squid/errors/de-de
+#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_CACHE_ACCESS_DENIED
+usr/lib/squid/errors/de/ERR_CACHE_MGR_ACCESS_DENIED
+usr/lib/squid/errors/de/ERR_CANNOT_FORWARD
+usr/lib/squid/errors/de/ERR_CONNECT_FAIL
+usr/lib/squid/errors/de/ERR_DIR_LISTING
+usr/lib/squid/errors/de/ERR_DNS_FAIL
+usr/lib/squid/errors/de/ERR_ESI
+usr/lib/squid/errors/de/ERR_FORWARDING_DENIED
+usr/lib/squid/errors/de/ERR_FTP_DISABLED
+usr/lib/squid/errors/de/ERR_FTP_FAILURE
+usr/lib/squid/errors/de/ERR_FTP_FORBIDDEN
+usr/lib/squid/errors/de/ERR_FTP_NOT_FOUND
+usr/lib/squid/errors/de/ERR_FTP_PUT_CREATED
+usr/lib/squid/errors/de/ERR_FTP_PUT_ERROR
+usr/lib/squid/errors/de/ERR_FTP_PUT_MODIFIED
+usr/lib/squid/errors/de/ERR_FTP_UNAVAILABLE
+usr/lib/squid/errors/de/ERR_ICAP_FAILURE
+usr/lib/squid/errors/de/ERR_INVALID_REQ
+usr/lib/squid/errors/de/ERR_INVALID_RESP
+usr/lib/squid/errors/de/ERR_INVALID_URL
+usr/lib/squid/errors/de/ERR_LIFETIME_EXP
+usr/lib/squid/errors/de/ERR_NO_RELAY
+usr/lib/squid/errors/de/ERR_ONLY_IF_CACHED_MISS
+usr/lib/squid/errors/de/ERR_READ_ERROR
+usr/lib/squid/errors/de/ERR_READ_TIMEOUT
+usr/lib/squid/errors/de/ERR_SECURE_CONNECT_FAIL
+usr/lib/squid/errors/de/ERR_SHUTTING_DOWN
+usr/lib/squid/errors/de/ERR_SOCKET_FAILURE
+usr/lib/squid/errors/de/ERR_TOO_BIG
+usr/lib/squid/errors/de/ERR_UNSUP_HTTPVERSION
+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/el
+#usr/lib/squid/errors/el-gr
+#usr/lib/squid/errors/el/ERR_ACCESS_DENIED
+#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
+#usr/lib/squid/errors/el/ERR_CONNECT_FAIL
+#usr/lib/squid/errors/el/ERR_DIR_LISTING
+#usr/lib/squid/errors/el/ERR_DNS_FAIL
+#usr/lib/squid/errors/el/ERR_ESI
+#usr/lib/squid/errors/el/ERR_FORWARDING_DENIED
+#usr/lib/squid/errors/el/ERR_FTP_DISABLED
+#usr/lib/squid/errors/el/ERR_FTP_FAILURE
+#usr/lib/squid/errors/el/ERR_FTP_FORBIDDEN
+#usr/lib/squid/errors/el/ERR_FTP_NOT_FOUND
+#usr/lib/squid/errors/el/ERR_FTP_PUT_CREATED
+#usr/lib/squid/errors/el/ERR_FTP_PUT_ERROR
+#usr/lib/squid/errors/el/ERR_FTP_PUT_MODIFIED
+#usr/lib/squid/errors/el/ERR_FTP_UNAVAILABLE
+#usr/lib/squid/errors/el/ERR_ICAP_FAILURE
+#usr/lib/squid/errors/el/ERR_INVALID_REQ
+#usr/lib/squid/errors/el/ERR_INVALID_RESP
+#usr/lib/squid/errors/el/ERR_INVALID_URL
+#usr/lib/squid/errors/el/ERR_LIFETIME_EXP
+#usr/lib/squid/errors/el/ERR_NO_RELAY
+#usr/lib/squid/errors/el/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/el/ERR_READ_ERROR
+#usr/lib/squid/errors/el/ERR_READ_TIMEOUT
+#usr/lib/squid/errors/el/ERR_SECURE_CONNECT_FAIL
+#usr/lib/squid/errors/el/ERR_SHUTTING_DOWN
+#usr/lib/squid/errors/el/ERR_SOCKET_FAILURE
+#usr/lib/squid/errors/el/ERR_TOO_BIG
+#usr/lib/squid/errors/el/ERR_UNSUP_HTTPVERSION
+#usr/lib/squid/errors/el/ERR_UNSUP_REQ
+#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/en
+#usr/lib/squid/errors/en-au
+#usr/lib/squid/errors/en-bz
+#usr/lib/squid/errors/en-ca
+#usr/lib/squid/errors/en-gb
+#usr/lib/squid/errors/en-ie
+#usr/lib/squid/errors/en-in
+#usr/lib/squid/errors/en-jm
+#usr/lib/squid/errors/en-nz
+#usr/lib/squid/errors/en-ph
+#usr/lib/squid/errors/en-sg
+#usr/lib/squid/errors/en-tt
+#usr/lib/squid/errors/en-uk
+#usr/lib/squid/errors/en-us
+#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_CACHE_ACCESS_DENIED
+usr/lib/squid/errors/en/ERR_CACHE_MGR_ACCESS_DENIED
+usr/lib/squid/errors/en/ERR_CANNOT_FORWARD
+usr/lib/squid/errors/en/ERR_CONNECT_FAIL
+usr/lib/squid/errors/en/ERR_DIR_LISTING
+usr/lib/squid/errors/en/ERR_DNS_FAIL
+usr/lib/squid/errors/en/ERR_ESI
+usr/lib/squid/errors/en/ERR_FORWARDING_DENIED
+usr/lib/squid/errors/en/ERR_FTP_DISABLED
+usr/lib/squid/errors/en/ERR_FTP_FAILURE
+usr/lib/squid/errors/en/ERR_FTP_FORBIDDEN
+usr/lib/squid/errors/en/ERR_FTP_NOT_FOUND
+usr/lib/squid/errors/en/ERR_FTP_PUT_CREATED
+usr/lib/squid/errors/en/ERR_FTP_PUT_ERROR
+usr/lib/squid/errors/en/ERR_FTP_PUT_MODIFIED
+usr/lib/squid/errors/en/ERR_FTP_UNAVAILABLE
+usr/lib/squid/errors/en/ERR_ICAP_FAILURE
+usr/lib/squid/errors/en/ERR_INVALID_REQ
+usr/lib/squid/errors/en/ERR_INVALID_RESP
+usr/lib/squid/errors/en/ERR_INVALID_URL
+usr/lib/squid/errors/en/ERR_LIFETIME_EXP
+usr/lib/squid/errors/en/ERR_NO_RELAY
+usr/lib/squid/errors/en/ERR_ONLY_IF_CACHED_MISS
+usr/lib/squid/errors/en/ERR_READ_ERROR
+usr/lib/squid/errors/en/ERR_READ_TIMEOUT
+usr/lib/squid/errors/en/ERR_SECURE_CONNECT_FAIL
+usr/lib/squid/errors/en/ERR_SHUTTING_DOWN
+usr/lib/squid/errors/en/ERR_SOCKET_FAILURE
+usr/lib/squid/errors/en/ERR_TOO_BIG
+usr/lib/squid/errors/en/ERR_UNSUP_HTTPVERSION
+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/es
+#usr/lib/squid/errors/es-ar
+#usr/lib/squid/errors/es-bo
+#usr/lib/squid/errors/es-cl
+#usr/lib/squid/errors/es-co
+#usr/lib/squid/errors/es-cr
+#usr/lib/squid/errors/es-do
+#usr/lib/squid/errors/es-ec
+#usr/lib/squid/errors/es-es
+#usr/lib/squid/errors/es-gt
+#usr/lib/squid/errors/es-hn
+#usr/lib/squid/errors/es-mx
+#usr/lib/squid/errors/es-ni
+#usr/lib/squid/errors/es-pa
+#usr/lib/squid/errors/es-pe
+#usr/lib/squid/errors/es-pr
+#usr/lib/squid/errors/es-py
+#usr/lib/squid/errors/es-sv
+#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_CACHE_ACCESS_DENIED
+#usr/lib/squid/errors/es/ERR_CACHE_MGR_ACCESS_DENIED
+#usr/lib/squid/errors/es/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/es/ERR_CONNECT_FAIL
+#usr/lib/squid/errors/es/ERR_DIR_LISTING
+#usr/lib/squid/errors/es/ERR_DNS_FAIL
+#usr/lib/squid/errors/es/ERR_ESI
+#usr/lib/squid/errors/es/ERR_FORWARDING_DENIED
+#usr/lib/squid/errors/es/ERR_FTP_DISABLED
+#usr/lib/squid/errors/es/ERR_FTP_FAILURE
+#usr/lib/squid/errors/es/ERR_FTP_FORBIDDEN
+#usr/lib/squid/errors/es/ERR_FTP_NOT_FOUND
+#usr/lib/squid/errors/es/ERR_FTP_PUT_CREATED
+#usr/lib/squid/errors/es/ERR_FTP_PUT_ERROR
+#usr/lib/squid/errors/es/ERR_FTP_PUT_MODIFIED
+#usr/lib/squid/errors/es/ERR_FTP_UNAVAILABLE
+#usr/lib/squid/errors/es/ERR_ICAP_FAILURE
+#usr/lib/squid/errors/es/ERR_INVALID_REQ
+#usr/lib/squid/errors/es/ERR_INVALID_RESP
+#usr/lib/squid/errors/es/ERR_INVALID_URL
+#usr/lib/squid/errors/es/ERR_LIFETIME_EXP
+#usr/lib/squid/errors/es/ERR_NO_RELAY
+#usr/lib/squid/errors/es/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/es/ERR_READ_ERROR
+#usr/lib/squid/errors/es/ERR_READ_TIMEOUT
+#usr/lib/squid/errors/es/ERR_SECURE_CONNECT_FAIL
+#usr/lib/squid/errors/es/ERR_SHUTTING_DOWN
+#usr/lib/squid/errors/es/ERR_SOCKET_FAILURE
+#usr/lib/squid/errors/es/ERR_TOO_BIG
+#usr/lib/squid/errors/es/ERR_UNSUP_HTTPVERSION
+#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/et
+#usr/lib/squid/errors/et-ee
+#usr/lib/squid/errors/et/ERR_ACCESS_DENIED
+#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
+#usr/lib/squid/errors/et/ERR_CONNECT_FAIL
+#usr/lib/squid/errors/et/ERR_DIR_LISTING
+#usr/lib/squid/errors/et/ERR_DNS_FAIL
+#usr/lib/squid/errors/et/ERR_ESI
+#usr/lib/squid/errors/et/ERR_FORWARDING_DENIED
+#usr/lib/squid/errors/et/ERR_FTP_DISABLED
+#usr/lib/squid/errors/et/ERR_FTP_FAILURE
+#usr/lib/squid/errors/et/ERR_FTP_FORBIDDEN
+#usr/lib/squid/errors/et/ERR_FTP_NOT_FOUND
+#usr/lib/squid/errors/et/ERR_FTP_PUT_CREATED
+#usr/lib/squid/errors/et/ERR_FTP_PUT_ERROR
+#usr/lib/squid/errors/et/ERR_FTP_PUT_MODIFIED
+#usr/lib/squid/errors/et/ERR_FTP_UNAVAILABLE
+#usr/lib/squid/errors/et/ERR_ICAP_FAILURE
+#usr/lib/squid/errors/et/ERR_INVALID_REQ
+#usr/lib/squid/errors/et/ERR_INVALID_RESP
+#usr/lib/squid/errors/et/ERR_INVALID_URL
+#usr/lib/squid/errors/et/ERR_LIFETIME_EXP
+#usr/lib/squid/errors/et/ERR_NO_RELAY
+#usr/lib/squid/errors/et/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/et/ERR_READ_ERROR
+#usr/lib/squid/errors/et/ERR_READ_TIMEOUT
+#usr/lib/squid/errors/et/ERR_SECURE_CONNECT_FAIL
+#usr/lib/squid/errors/et/ERR_SHUTTING_DOWN
+#usr/lib/squid/errors/et/ERR_SOCKET_FAILURE
+#usr/lib/squid/errors/et/ERR_TOO_BIG
+#usr/lib/squid/errors/et/ERR_UNSUP_HTTPVERSION
+#usr/lib/squid/errors/et/ERR_UNSUP_REQ
+#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/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_CACHE_ACCESS_DENIED
+#usr/lib/squid/errors/fa/ERR_CACHE_MGR_ACCESS_DENIED
+#usr/lib/squid/errors/fa/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/fa/ERR_CONNECT_FAIL
+#usr/lib/squid/errors/fa/ERR_DIR_LISTING
+#usr/lib/squid/errors/fa/ERR_DNS_FAIL
+#usr/lib/squid/errors/fa/ERR_ESI
+#usr/lib/squid/errors/fa/ERR_FORWARDING_DENIED
+#usr/lib/squid/errors/fa/ERR_FTP_DISABLED
+#usr/lib/squid/errors/fa/ERR_FTP_FAILURE
+#usr/lib/squid/errors/fa/ERR_FTP_FORBIDDEN
+#usr/lib/squid/errors/fa/ERR_FTP_NOT_FOUND
+#usr/lib/squid/errors/fa/ERR_FTP_PUT_CREATED
+#usr/lib/squid/errors/fa/ERR_FTP_PUT_ERROR
+#usr/lib/squid/errors/fa/ERR_FTP_PUT_MODIFIED
+#usr/lib/squid/errors/fa/ERR_FTP_UNAVAILABLE
+#usr/lib/squid/errors/fa/ERR_ICAP_FAILURE
+#usr/lib/squid/errors/fa/ERR_INVALID_REQ
+#usr/lib/squid/errors/fa/ERR_INVALID_RESP
+#usr/lib/squid/errors/fa/ERR_INVALID_URL
+#usr/lib/squid/errors/fa/ERR_LIFETIME_EXP
+#usr/lib/squid/errors/fa/ERR_NO_RELAY
+#usr/lib/squid/errors/fa/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/fa/ERR_READ_ERROR
+#usr/lib/squid/errors/fa/ERR_READ_TIMEOUT
+#usr/lib/squid/errors/fa/ERR_SECURE_CONNECT_FAIL
+#usr/lib/squid/errors/fa/ERR_SHUTTING_DOWN
+#usr/lib/squid/errors/fa/ERR_SOCKET_FAILURE
+#usr/lib/squid/errors/fa/ERR_TOO_BIG
+#usr/lib/squid/errors/fa/ERR_UNSUP_HTTPVERSION
+#usr/lib/squid/errors/fa/ERR_UNSUP_REQ
+#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/fi
+#usr/lib/squid/errors/fi-fi
+#usr/lib/squid/errors/fi/ERR_ACCESS_DENIED
+#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
+#usr/lib/squid/errors/fi/ERR_CONNECT_FAIL
+#usr/lib/squid/errors/fi/ERR_DIR_LISTING
+#usr/lib/squid/errors/fi/ERR_DNS_FAIL
+#usr/lib/squid/errors/fi/ERR_ESI
+#usr/lib/squid/errors/fi/ERR_FORWARDING_DENIED
+#usr/lib/squid/errors/fi/ERR_FTP_DISABLED
+#usr/lib/squid/errors/fi/ERR_FTP_FAILURE
+#usr/lib/squid/errors/fi/ERR_FTP_FORBIDDEN
+#usr/lib/squid/errors/fi/ERR_FTP_NOT_FOUND
+#usr/lib/squid/errors/fi/ERR_FTP_PUT_CREATED
+#usr/lib/squid/errors/fi/ERR_FTP_PUT_ERROR
+#usr/lib/squid/errors/fi/ERR_FTP_PUT_MODIFIED
+#usr/lib/squid/errors/fi/ERR_FTP_UNAVAILABLE
+#usr/lib/squid/errors/fi/ERR_ICAP_FAILURE
+#usr/lib/squid/errors/fi/ERR_INVALID_REQ
+#usr/lib/squid/errors/fi/ERR_INVALID_RESP
+#usr/lib/squid/errors/fi/ERR_INVALID_URL
+#usr/lib/squid/errors/fi/ERR_LIFETIME_EXP
+#usr/lib/squid/errors/fi/ERR_NO_RELAY
+#usr/lib/squid/errors/fi/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/fi/ERR_READ_ERROR
+#usr/lib/squid/errors/fi/ERR_READ_TIMEOUT
+#usr/lib/squid/errors/fi/ERR_SECURE_CONNECT_FAIL
+#usr/lib/squid/errors/fi/ERR_SHUTTING_DOWN
+#usr/lib/squid/errors/fi/ERR_SOCKET_FAILURE
+#usr/lib/squid/errors/fi/ERR_TOO_BIG
+#usr/lib/squid/errors/fi/ERR_UNSUP_HTTPVERSION
+#usr/lib/squid/errors/fi/ERR_UNSUP_REQ
+#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/fr
+#usr/lib/squid/errors/fr-be
+#usr/lib/squid/errors/fr-ca
+#usr/lib/squid/errors/fr-ch
+#usr/lib/squid/errors/fr-fr
+#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_CACHE_ACCESS_DENIED
+#usr/lib/squid/errors/fr/ERR_CACHE_MGR_ACCESS_DENIED
+#usr/lib/squid/errors/fr/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/fr/ERR_CONNECT_FAIL
+#usr/lib/squid/errors/fr/ERR_DIR_LISTING
+#usr/lib/squid/errors/fr/ERR_DNS_FAIL
+#usr/lib/squid/errors/fr/ERR_ESI
+#usr/lib/squid/errors/fr/ERR_FORWARDING_DENIED
+#usr/lib/squid/errors/fr/ERR_FTP_DISABLED
+#usr/lib/squid/errors/fr/ERR_FTP_FAILURE
+#usr/lib/squid/errors/fr/ERR_FTP_FORBIDDEN
+#usr/lib/squid/errors/fr/ERR_FTP_NOT_FOUND
+#usr/lib/squid/errors/fr/ERR_FTP_PUT_CREATED
+#usr/lib/squid/errors/fr/ERR_FTP_PUT_ERROR
+#usr/lib/squid/errors/fr/ERR_FTP_PUT_MODIFIED
+#usr/lib/squid/errors/fr/ERR_FTP_UNAVAILABLE
+#usr/lib/squid/errors/fr/ERR_ICAP_FAILURE
+#usr/lib/squid/errors/fr/ERR_INVALID_REQ
+#usr/lib/squid/errors/fr/ERR_INVALID_RESP
+#usr/lib/squid/errors/fr/ERR_INVALID_URL
+#usr/lib/squid/errors/fr/ERR_LIFETIME_EXP
+#usr/lib/squid/errors/fr/ERR_NO_RELAY
+#usr/lib/squid/errors/fr/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/fr/ERR_READ_ERROR
+#usr/lib/squid/errors/fr/ERR_READ_TIMEOUT
+#usr/lib/squid/errors/fr/ERR_SECURE_CONNECT_FAIL
+#usr/lib/squid/errors/fr/ERR_SHUTTING_DOWN
+#usr/lib/squid/errors/fr/ERR_SOCKET_FAILURE
+#usr/lib/squid/errors/fr/ERR_TOO_BIG
+#usr/lib/squid/errors/fr/ERR_UNSUP_HTTPVERSION
+#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/he
+#usr/lib/squid/errors/he-il
+#usr/lib/squid/errors/he/ERR_ACCESS_DENIED
+#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
+#usr/lib/squid/errors/he/ERR_CONNECT_FAIL
+#usr/lib/squid/errors/he/ERR_DIR_LISTING
+#usr/lib/squid/errors/he/ERR_DNS_FAIL
+#usr/lib/squid/errors/he/ERR_ESI
+#usr/lib/squid/errors/he/ERR_FORWARDING_DENIED
+#usr/lib/squid/errors/he/ERR_FTP_DISABLED
+#usr/lib/squid/errors/he/ERR_FTP_FAILURE
+#usr/lib/squid/errors/he/ERR_FTP_FORBIDDEN
+#usr/lib/squid/errors/he/ERR_FTP_NOT_FOUND
+#usr/lib/squid/errors/he/ERR_FTP_PUT_CREATED
+#usr/lib/squid/errors/he/ERR_FTP_PUT_ERROR
+#usr/lib/squid/errors/he/ERR_FTP_PUT_MODIFIED
+#usr/lib/squid/errors/he/ERR_FTP_UNAVAILABLE
+#usr/lib/squid/errors/he/ERR_ICAP_FAILURE
+#usr/lib/squid/errors/he/ERR_INVALID_REQ
+#usr/lib/squid/errors/he/ERR_INVALID_RESP
+#usr/lib/squid/errors/he/ERR_INVALID_URL
+#usr/lib/squid/errors/he/ERR_LIFETIME_EXP
+#usr/lib/squid/errors/he/ERR_NO_RELAY
+#usr/lib/squid/errors/he/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/he/ERR_READ_ERROR
+#usr/lib/squid/errors/he/ERR_READ_TIMEOUT
+#usr/lib/squid/errors/he/ERR_SECURE_CONNECT_FAIL
+#usr/lib/squid/errors/he/ERR_SHUTTING_DOWN
+#usr/lib/squid/errors/he/ERR_SOCKET_FAILURE
+#usr/lib/squid/errors/he/ERR_TOO_BIG
+#usr/lib/squid/errors/he/ERR_UNSUP_HTTPVERSION
+#usr/lib/squid/errors/he/ERR_UNSUP_REQ
+#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/hu
+#usr/lib/squid/errors/hu-hu
+#usr/lib/squid/errors/hu/ERR_ACCESS_DENIED
+#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
+#usr/lib/squid/errors/hu/ERR_CONNECT_FAIL
+#usr/lib/squid/errors/hu/ERR_DIR_LISTING
+#usr/lib/squid/errors/hu/ERR_DNS_FAIL
+#usr/lib/squid/errors/hu/ERR_ESI
+#usr/lib/squid/errors/hu/ERR_FORWARDING_DENIED
+#usr/lib/squid/errors/hu/ERR_FTP_DISABLED
+#usr/lib/squid/errors/hu/ERR_FTP_FAILURE
+#usr/lib/squid/errors/hu/ERR_FTP_FORBIDDEN
+#usr/lib/squid/errors/hu/ERR_FTP_NOT_FOUND
+#usr/lib/squid/errors/hu/ERR_FTP_PUT_CREATED
+#usr/lib/squid/errors/hu/ERR_FTP_PUT_ERROR
+#usr/lib/squid/errors/hu/ERR_FTP_PUT_MODIFIED
+#usr/lib/squid/errors/hu/ERR_FTP_UNAVAILABLE
+#usr/lib/squid/errors/hu/ERR_ICAP_FAILURE
+#usr/lib/squid/errors/hu/ERR_INVALID_REQ
+#usr/lib/squid/errors/hu/ERR_INVALID_RESP
+#usr/lib/squid/errors/hu/ERR_INVALID_URL
+#usr/lib/squid/errors/hu/ERR_LIFETIME_EXP
+#usr/lib/squid/errors/hu/ERR_NO_RELAY
+#usr/lib/squid/errors/hu/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/hu/ERR_READ_ERROR
+#usr/lib/squid/errors/hu/ERR_READ_TIMEOUT
+#usr/lib/squid/errors/hu/ERR_SECURE_CONNECT_FAIL
+#usr/lib/squid/errors/hu/ERR_SHUTTING_DOWN
+#usr/lib/squid/errors/hu/ERR_SOCKET_FAILURE
+#usr/lib/squid/errors/hu/ERR_TOO_BIG
+#usr/lib/squid/errors/hu/ERR_UNSUP_HTTPVERSION
+#usr/lib/squid/errors/hu/ERR_UNSUP_REQ
+#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/hy
+#usr/lib/squid/errors/hy-am
+#usr/lib/squid/errors/hy/ERR_ACCESS_DENIED
+#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
+#usr/lib/squid/errors/hy/ERR_CONNECT_FAIL
+#usr/lib/squid/errors/hy/ERR_DIR_LISTING
+#usr/lib/squid/errors/hy/ERR_DNS_FAIL
+#usr/lib/squid/errors/hy/ERR_ESI
+#usr/lib/squid/errors/hy/ERR_FORWARDING_DENIED
+#usr/lib/squid/errors/hy/ERR_FTP_DISABLED
+#usr/lib/squid/errors/hy/ERR_FTP_FAILURE
+#usr/lib/squid/errors/hy/ERR_FTP_FORBIDDEN
+#usr/lib/squid/errors/hy/ERR_FTP_NOT_FOUND
+#usr/lib/squid/errors/hy/ERR_FTP_PUT_CREATED
+#usr/lib/squid/errors/hy/ERR_FTP_PUT_ERROR
+#usr/lib/squid/errors/hy/ERR_FTP_PUT_MODIFIED
+#usr/lib/squid/errors/hy/ERR_FTP_UNAVAILABLE
+#usr/lib/squid/errors/hy/ERR_ICAP_FAILURE
+#usr/lib/squid/errors/hy/ERR_INVALID_REQ
+#usr/lib/squid/errors/hy/ERR_INVALID_RESP
+#usr/lib/squid/errors/hy/ERR_INVALID_URL
+#usr/lib/squid/errors/hy/ERR_LIFETIME_EXP
+#usr/lib/squid/errors/hy/ERR_NO_RELAY
+#usr/lib/squid/errors/hy/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/hy/ERR_READ_ERROR
+#usr/lib/squid/errors/hy/ERR_READ_TIMEOUT
+#usr/lib/squid/errors/hy/ERR_SECURE_CONNECT_FAIL
+#usr/lib/squid/errors/hy/ERR_SHUTTING_DOWN
+#usr/lib/squid/errors/hy/ERR_SOCKET_FAILURE
+#usr/lib/squid/errors/hy/ERR_TOO_BIG
+#usr/lib/squid/errors/hy/ERR_UNSUP_HTTPVERSION
+#usr/lib/squid/errors/hy/ERR_UNSUP_REQ
+#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/id
+#usr/lib/squid/errors/id-id
+#usr/lib/squid/errors/id/ERR_ACCESS_DENIED
+#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
+#usr/lib/squid/errors/id/ERR_CONNECT_FAIL
+#usr/lib/squid/errors/id/ERR_DIR_LISTING
+#usr/lib/squid/errors/id/ERR_DNS_FAIL
+#usr/lib/squid/errors/id/ERR_ESI
+#usr/lib/squid/errors/id/ERR_FORWARDING_DENIED
+#usr/lib/squid/errors/id/ERR_FTP_DISABLED
+#usr/lib/squid/errors/id/ERR_FTP_FAILURE
+#usr/lib/squid/errors/id/ERR_FTP_FORBIDDEN
+#usr/lib/squid/errors/id/ERR_FTP_NOT_FOUND
+#usr/lib/squid/errors/id/ERR_FTP_PUT_CREATED
+#usr/lib/squid/errors/id/ERR_FTP_PUT_ERROR
+#usr/lib/squid/errors/id/ERR_FTP_PUT_MODIFIED
+#usr/lib/squid/errors/id/ERR_FTP_UNAVAILABLE
+#usr/lib/squid/errors/id/ERR_ICAP_FAILURE
+#usr/lib/squid/errors/id/ERR_INVALID_REQ
+#usr/lib/squid/errors/id/ERR_INVALID_RESP
+#usr/lib/squid/errors/id/ERR_INVALID_URL
+#usr/lib/squid/errors/id/ERR_LIFETIME_EXP
+#usr/lib/squid/errors/id/ERR_NO_RELAY
+#usr/lib/squid/errors/id/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/id/ERR_READ_ERROR
+#usr/lib/squid/errors/id/ERR_READ_TIMEOUT
+#usr/lib/squid/errors/id/ERR_SECURE_CONNECT_FAIL
+#usr/lib/squid/errors/id/ERR_SHUTTING_DOWN
+#usr/lib/squid/errors/id/ERR_SOCKET_FAILURE
+#usr/lib/squid/errors/id/ERR_TOO_BIG
+#usr/lib/squid/errors/id/ERR_UNSUP_HTTPVERSION
+#usr/lib/squid/errors/id/ERR_UNSUP_REQ
+#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/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_CACHE_ACCESS_DENIED
+#usr/lib/squid/errors/it/ERR_CACHE_MGR_ACCESS_DENIED
+#usr/lib/squid/errors/it/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/it/ERR_CONNECT_FAIL
+#usr/lib/squid/errors/it/ERR_DIR_LISTING
+#usr/lib/squid/errors/it/ERR_DNS_FAIL
+#usr/lib/squid/errors/it/ERR_ESI
+#usr/lib/squid/errors/it/ERR_FORWARDING_DENIED
+#usr/lib/squid/errors/it/ERR_FTP_DISABLED
+#usr/lib/squid/errors/it/ERR_FTP_FAILURE
+#usr/lib/squid/errors/it/ERR_FTP_FORBIDDEN
+#usr/lib/squid/errors/it/ERR_FTP_NOT_FOUND
+#usr/lib/squid/errors/it/ERR_FTP_PUT_CREATED
+#usr/lib/squid/errors/it/ERR_FTP_PUT_ERROR
+#usr/lib/squid/errors/it/ERR_FTP_PUT_MODIFIED
+#usr/lib/squid/errors/it/ERR_FTP_UNAVAILABLE
+#usr/lib/squid/errors/it/ERR_ICAP_FAILURE
+#usr/lib/squid/errors/it/ERR_INVALID_REQ
+#usr/lib/squid/errors/it/ERR_INVALID_RESP
+#usr/lib/squid/errors/it/ERR_INVALID_URL
+#usr/lib/squid/errors/it/ERR_LIFETIME_EXP
+#usr/lib/squid/errors/it/ERR_NO_RELAY
+#usr/lib/squid/errors/it/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/it/ERR_READ_ERROR
+#usr/lib/squid/errors/it/ERR_READ_TIMEOUT
+#usr/lib/squid/errors/it/ERR_SECURE_CONNECT_FAIL
+#usr/lib/squid/errors/it/ERR_SHUTTING_DOWN
+#usr/lib/squid/errors/it/ERR_SOCKET_FAILURE
+#usr/lib/squid/errors/it/ERR_TOO_BIG
+#usr/lib/squid/errors/it/ERR_UNSUP_HTTPVERSION
+#usr/lib/squid/errors/it/ERR_UNSUP_REQ
+#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/ja
+#usr/lib/squid/errors/ja-jp
+#usr/lib/squid/errors/ja/ERR_ACCESS_DENIED
+#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
+#usr/lib/squid/errors/ja/ERR_CONNECT_FAIL
+#usr/lib/squid/errors/ja/ERR_DIR_LISTING
+#usr/lib/squid/errors/ja/ERR_DNS_FAIL
+#usr/lib/squid/errors/ja/ERR_ESI
+#usr/lib/squid/errors/ja/ERR_FORWARDING_DENIED
+#usr/lib/squid/errors/ja/ERR_FTP_DISABLED
+#usr/lib/squid/errors/ja/ERR_FTP_FAILURE
+#usr/lib/squid/errors/ja/ERR_FTP_FORBIDDEN
+#usr/lib/squid/errors/ja/ERR_FTP_NOT_FOUND
+#usr/lib/squid/errors/ja/ERR_FTP_PUT_CREATED
+#usr/lib/squid/errors/ja/ERR_FTP_PUT_ERROR
+#usr/lib/squid/errors/ja/ERR_FTP_PUT_MODIFIED
+#usr/lib/squid/errors/ja/ERR_FTP_UNAVAILABLE
+#usr/lib/squid/errors/ja/ERR_ICAP_FAILURE
+#usr/lib/squid/errors/ja/ERR_INVALID_REQ
+#usr/lib/squid/errors/ja/ERR_INVALID_RESP
+#usr/lib/squid/errors/ja/ERR_INVALID_URL
+#usr/lib/squid/errors/ja/ERR_LIFETIME_EXP
+#usr/lib/squid/errors/ja/ERR_NO_RELAY
+#usr/lib/squid/errors/ja/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/ja/ERR_READ_ERROR
+#usr/lib/squid/errors/ja/ERR_READ_TIMEOUT
+#usr/lib/squid/errors/ja/ERR_SECURE_CONNECT_FAIL
+#usr/lib/squid/errors/ja/ERR_SHUTTING_DOWN
+#usr/lib/squid/errors/ja/ERR_SOCKET_FAILURE
+#usr/lib/squid/errors/ja/ERR_TOO_BIG
+#usr/lib/squid/errors/ja/ERR_UNSUP_HTTPVERSION
+#usr/lib/squid/errors/ja/ERR_UNSUP_REQ
+#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/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_CACHE_ACCESS_DENIED
+#usr/lib/squid/errors/ko/ERR_CACHE_MGR_ACCESS_DENIED
+#usr/lib/squid/errors/ko/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/ko/ERR_CONNECT_FAIL
+#usr/lib/squid/errors/ko/ERR_DIR_LISTING
+#usr/lib/squid/errors/ko/ERR_DNS_FAIL
+#usr/lib/squid/errors/ko/ERR_ESI
+#usr/lib/squid/errors/ko/ERR_FORWARDING_DENIED
+#usr/lib/squid/errors/ko/ERR_FTP_DISABLED
+#usr/lib/squid/errors/ko/ERR_FTP_FAILURE
+#usr/lib/squid/errors/ko/ERR_FTP_FORBIDDEN
+#usr/lib/squid/errors/ko/ERR_FTP_NOT_FOUND
+#usr/lib/squid/errors/ko/ERR_FTP_PUT_CREATED
+#usr/lib/squid/errors/ko/ERR_FTP_PUT_ERROR
+#usr/lib/squid/errors/ko/ERR_FTP_PUT_MODIFIED
+#usr/lib/squid/errors/ko/ERR_FTP_UNAVAILABLE
+#usr/lib/squid/errors/ko/ERR_ICAP_FAILURE
+#usr/lib/squid/errors/ko/ERR_INVALID_REQ
+#usr/lib/squid/errors/ko/ERR_INVALID_RESP
+#usr/lib/squid/errors/ko/ERR_INVALID_URL
+#usr/lib/squid/errors/ko/ERR_LIFETIME_EXP
+#usr/lib/squid/errors/ko/ERR_NO_RELAY
+#usr/lib/squid/errors/ko/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/ko/ERR_READ_ERROR
+#usr/lib/squid/errors/ko/ERR_READ_TIMEOUT
+#usr/lib/squid/errors/ko/ERR_SECURE_CONNECT_FAIL
+#usr/lib/squid/errors/ko/ERR_SHUTTING_DOWN
+#usr/lib/squid/errors/ko/ERR_SOCKET_FAILURE
+#usr/lib/squid/errors/ko/ERR_TOO_BIG
+#usr/lib/squid/errors/ko/ERR_UNSUP_HTTPVERSION
+#usr/lib/squid/errors/ko/ERR_UNSUP_REQ
+#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/lt
+#usr/lib/squid/errors/lt-lt
+#usr/lib/squid/errors/lt/ERR_ACCESS_DENIED
+#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
+#usr/lib/squid/errors/lt/ERR_CONNECT_FAIL
+#usr/lib/squid/errors/lt/ERR_DIR_LISTING
+#usr/lib/squid/errors/lt/ERR_DNS_FAIL
+#usr/lib/squid/errors/lt/ERR_ESI
+#usr/lib/squid/errors/lt/ERR_FORWARDING_DENIED
+#usr/lib/squid/errors/lt/ERR_FTP_DISABLED
+#usr/lib/squid/errors/lt/ERR_FTP_FAILURE
+#usr/lib/squid/errors/lt/ERR_FTP_FORBIDDEN
+#usr/lib/squid/errors/lt/ERR_FTP_NOT_FOUND
+#usr/lib/squid/errors/lt/ERR_FTP_PUT_CREATED
+#usr/lib/squid/errors/lt/ERR_FTP_PUT_ERROR
+#usr/lib/squid/errors/lt/ERR_FTP_PUT_MODIFIED
+#usr/lib/squid/errors/lt/ERR_FTP_UNAVAILABLE
+#usr/lib/squid/errors/lt/ERR_ICAP_FAILURE
+#usr/lib/squid/errors/lt/ERR_INVALID_REQ
+#usr/lib/squid/errors/lt/ERR_INVALID_RESP
+#usr/lib/squid/errors/lt/ERR_INVALID_URL
+#usr/lib/squid/errors/lt/ERR_LIFETIME_EXP
+#usr/lib/squid/errors/lt/ERR_NO_RELAY
+#usr/lib/squid/errors/lt/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/lt/ERR_READ_ERROR
+#usr/lib/squid/errors/lt/ERR_READ_TIMEOUT
+#usr/lib/squid/errors/lt/ERR_SECURE_CONNECT_FAIL
+#usr/lib/squid/errors/lt/ERR_SHUTTING_DOWN
+#usr/lib/squid/errors/lt/ERR_SOCKET_FAILURE
+#usr/lib/squid/errors/lt/ERR_TOO_BIG
+#usr/lib/squid/errors/lt/ERR_UNSUP_HTTPVERSION
+#usr/lib/squid/errors/lt/ERR_UNSUP_REQ
+#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/lv
+#usr/lib/squid/errors/lv-lv
+#usr/lib/squid/errors/lv/ERR_ACCESS_DENIED
+#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
+#usr/lib/squid/errors/lv/ERR_CONNECT_FAIL
+#usr/lib/squid/errors/lv/ERR_DIR_LISTING
+#usr/lib/squid/errors/lv/ERR_DNS_FAIL
+#usr/lib/squid/errors/lv/ERR_ESI
+#usr/lib/squid/errors/lv/ERR_FORWARDING_DENIED
+#usr/lib/squid/errors/lv/ERR_FTP_DISABLED
+#usr/lib/squid/errors/lv/ERR_FTP_FAILURE
+#usr/lib/squid/errors/lv/ERR_FTP_FORBIDDEN
+#usr/lib/squid/errors/lv/ERR_FTP_NOT_FOUND
+#usr/lib/squid/errors/lv/ERR_FTP_PUT_CREATED
+#usr/lib/squid/errors/lv/ERR_FTP_PUT_ERROR
+#usr/lib/squid/errors/lv/ERR_FTP_PUT_MODIFIED
+#usr/lib/squid/errors/lv/ERR_FTP_UNAVAILABLE
+#usr/lib/squid/errors/lv/ERR_ICAP_FAILURE
+#usr/lib/squid/errors/lv/ERR_INVALID_REQ
+#usr/lib/squid/errors/lv/ERR_INVALID_RESP
+#usr/lib/squid/errors/lv/ERR_INVALID_URL
+#usr/lib/squid/errors/lv/ERR_LIFETIME_EXP
+#usr/lib/squid/errors/lv/ERR_NO_RELAY
+#usr/lib/squid/errors/lv/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/lv/ERR_READ_ERROR
+#usr/lib/squid/errors/lv/ERR_READ_TIMEOUT
+#usr/lib/squid/errors/lv/ERR_SECURE_CONNECT_FAIL
+#usr/lib/squid/errors/lv/ERR_SHUTTING_DOWN
+#usr/lib/squid/errors/lv/ERR_SOCKET_FAILURE
+#usr/lib/squid/errors/lv/ERR_TOO_BIG
+#usr/lib/squid/errors/lv/ERR_UNSUP_HTTPVERSION
+#usr/lib/squid/errors/lv/ERR_UNSUP_REQ
+#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/ms
+#usr/lib/squid/errors/ms-my
+#usr/lib/squid/errors/ms/ERR_ACCESS_DENIED
+#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
+#usr/lib/squid/errors/ms/ERR_CONNECT_FAIL
+#usr/lib/squid/errors/ms/ERR_DIR_LISTING
+#usr/lib/squid/errors/ms/ERR_DNS_FAIL
+#usr/lib/squid/errors/ms/ERR_ESI
+#usr/lib/squid/errors/ms/ERR_FORWARDING_DENIED
+#usr/lib/squid/errors/ms/ERR_FTP_DISABLED
+#usr/lib/squid/errors/ms/ERR_FTP_FAILURE
+#usr/lib/squid/errors/ms/ERR_FTP_FORBIDDEN
+#usr/lib/squid/errors/ms/ERR_FTP_NOT_FOUND
+#usr/lib/squid/errors/ms/ERR_FTP_PUT_CREATED
+#usr/lib/squid/errors/ms/ERR_FTP_PUT_ERROR
+#usr/lib/squid/errors/ms/ERR_FTP_PUT_MODIFIED
+#usr/lib/squid/errors/ms/ERR_FTP_UNAVAILABLE
+#usr/lib/squid/errors/ms/ERR_ICAP_FAILURE
+#usr/lib/squid/errors/ms/ERR_INVALID_REQ
+#usr/lib/squid/errors/ms/ERR_INVALID_RESP
+#usr/lib/squid/errors/ms/ERR_INVALID_URL
+#usr/lib/squid/errors/ms/ERR_LIFETIME_EXP
+#usr/lib/squid/errors/ms/ERR_NO_RELAY
+#usr/lib/squid/errors/ms/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/ms/ERR_READ_ERROR
+#usr/lib/squid/errors/ms/ERR_READ_TIMEOUT
+#usr/lib/squid/errors/ms/ERR_SECURE_CONNECT_FAIL
+#usr/lib/squid/errors/ms/ERR_SHUTTING_DOWN
+#usr/lib/squid/errors/ms/ERR_SOCKET_FAILURE
+#usr/lib/squid/errors/ms/ERR_TOO_BIG
+#usr/lib/squid/errors/ms/ERR_UNSUP_HTTPVERSION
+#usr/lib/squid/errors/ms/ERR_UNSUP_REQ
+#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/nl
+#usr/lib/squid/errors/nl-nl
+#usr/lib/squid/errors/nl/ERR_ACCESS_DENIED
+#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
+#usr/lib/squid/errors/nl/ERR_CONNECT_FAIL
+#usr/lib/squid/errors/nl/ERR_DIR_LISTING
+#usr/lib/squid/errors/nl/ERR_DNS_FAIL
+#usr/lib/squid/errors/nl/ERR_ESI
+#usr/lib/squid/errors/nl/ERR_FORWARDING_DENIED
+#usr/lib/squid/errors/nl/ERR_FTP_DISABLED
+#usr/lib/squid/errors/nl/ERR_FTP_FAILURE
+#usr/lib/squid/errors/nl/ERR_FTP_FORBIDDEN
+#usr/lib/squid/errors/nl/ERR_FTP_NOT_FOUND
+#usr/lib/squid/errors/nl/ERR_FTP_PUT_CREATED
+#usr/lib/squid/errors/nl/ERR_FTP_PUT_ERROR
+#usr/lib/squid/errors/nl/ERR_FTP_PUT_MODIFIED
+#usr/lib/squid/errors/nl/ERR_FTP_UNAVAILABLE
+#usr/lib/squid/errors/nl/ERR_ICAP_FAILURE
+#usr/lib/squid/errors/nl/ERR_INVALID_REQ
+#usr/lib/squid/errors/nl/ERR_INVALID_RESP
+#usr/lib/squid/errors/nl/ERR_INVALID_URL
+#usr/lib/squid/errors/nl/ERR_LIFETIME_EXP
+#usr/lib/squid/errors/nl/ERR_NO_RELAY
+#usr/lib/squid/errors/nl/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/nl/ERR_READ_ERROR
+#usr/lib/squid/errors/nl/ERR_READ_TIMEOUT
+#usr/lib/squid/errors/nl/ERR_SECURE_CONNECT_FAIL
+#usr/lib/squid/errors/nl/ERR_SHUTTING_DOWN
+#usr/lib/squid/errors/nl/ERR_SOCKET_FAILURE
+#usr/lib/squid/errors/nl/ERR_TOO_BIG
+#usr/lib/squid/errors/nl/ERR_UNSUP_HTTPVERSION
+#usr/lib/squid/errors/nl/ERR_UNSUP_REQ
+#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/pl
+#usr/lib/squid/errors/pl-pl
+#usr/lib/squid/errors/pl/ERR_ACCESS_DENIED
+#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
+#usr/lib/squid/errors/pl/ERR_CONNECT_FAIL
+#usr/lib/squid/errors/pl/ERR_DIR_LISTING
+#usr/lib/squid/errors/pl/ERR_DNS_FAIL
+#usr/lib/squid/errors/pl/ERR_ESI
+#usr/lib/squid/errors/pl/ERR_FORWARDING_DENIED
+#usr/lib/squid/errors/pl/ERR_FTP_DISABLED
+#usr/lib/squid/errors/pl/ERR_FTP_FAILURE
+#usr/lib/squid/errors/pl/ERR_FTP_FORBIDDEN
+#usr/lib/squid/errors/pl/ERR_FTP_NOT_FOUND
+#usr/lib/squid/errors/pl/ERR_FTP_PUT_CREATED
+#usr/lib/squid/errors/pl/ERR_FTP_PUT_ERROR
+#usr/lib/squid/errors/pl/ERR_FTP_PUT_MODIFIED
+#usr/lib/squid/errors/pl/ERR_FTP_UNAVAILABLE
+#usr/lib/squid/errors/pl/ERR_ICAP_FAILURE
+#usr/lib/squid/errors/pl/ERR_INVALID_REQ
+#usr/lib/squid/errors/pl/ERR_INVALID_RESP
+#usr/lib/squid/errors/pl/ERR_INVALID_URL
+#usr/lib/squid/errors/pl/ERR_LIFETIME_EXP
+#usr/lib/squid/errors/pl/ERR_NO_RELAY
+#usr/lib/squid/errors/pl/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/pl/ERR_READ_ERROR
+#usr/lib/squid/errors/pl/ERR_READ_TIMEOUT
+#usr/lib/squid/errors/pl/ERR_SECURE_CONNECT_FAIL
+#usr/lib/squid/errors/pl/ERR_SHUTTING_DOWN
+#usr/lib/squid/errors/pl/ERR_SOCKET_FAILURE
+#usr/lib/squid/errors/pl/ERR_TOO_BIG
+#usr/lib/squid/errors/pl/ERR_UNSUP_HTTPVERSION
+#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/pt
+#usr/lib/squid/errors/pt-br
+#usr/lib/squid/errors/pt-br/ERR_ACCESS_DENIED
+#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
+#usr/lib/squid/errors/pt-br/ERR_CONNECT_FAIL
+#usr/lib/squid/errors/pt-br/ERR_DIR_LISTING
+#usr/lib/squid/errors/pt-br/ERR_DNS_FAIL
+#usr/lib/squid/errors/pt-br/ERR_ESI
+#usr/lib/squid/errors/pt-br/ERR_FORWARDING_DENIED
+#usr/lib/squid/errors/pt-br/ERR_FTP_DISABLED
+#usr/lib/squid/errors/pt-br/ERR_FTP_FAILURE
+#usr/lib/squid/errors/pt-br/ERR_FTP_FORBIDDEN
+#usr/lib/squid/errors/pt-br/ERR_FTP_NOT_FOUND
+#usr/lib/squid/errors/pt-br/ERR_FTP_PUT_CREATED
+#usr/lib/squid/errors/pt-br/ERR_FTP_PUT_ERROR
+#usr/lib/squid/errors/pt-br/ERR_FTP_PUT_MODIFIED
+#usr/lib/squid/errors/pt-br/ERR_FTP_UNAVAILABLE
+#usr/lib/squid/errors/pt-br/ERR_ICAP_FAILURE
+#usr/lib/squid/errors/pt-br/ERR_INVALID_REQ
+#usr/lib/squid/errors/pt-br/ERR_INVALID_RESP
+#usr/lib/squid/errors/pt-br/ERR_INVALID_URL
+#usr/lib/squid/errors/pt-br/ERR_LIFETIME_EXP
+#usr/lib/squid/errors/pt-br/ERR_NO_RELAY
+#usr/lib/squid/errors/pt-br/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/pt-br/ERR_READ_ERROR
+#usr/lib/squid/errors/pt-br/ERR_READ_TIMEOUT
+#usr/lib/squid/errors/pt-br/ERR_SECURE_CONNECT_FAIL
+#usr/lib/squid/errors/pt-br/ERR_SHUTTING_DOWN
+#usr/lib/squid/errors/pt-br/ERR_SOCKET_FAILURE
+#usr/lib/squid/errors/pt-br/ERR_TOO_BIG
+#usr/lib/squid/errors/pt-br/ERR_UNSUP_HTTPVERSION
+#usr/lib/squid/errors/pt-br/ERR_UNSUP_REQ
+#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-pt
+#usr/lib/squid/errors/pt/ERR_ACCESS_DENIED
+#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
+#usr/lib/squid/errors/pt/ERR_CONNECT_FAIL
+#usr/lib/squid/errors/pt/ERR_DIR_LISTING
+#usr/lib/squid/errors/pt/ERR_DNS_FAIL
+#usr/lib/squid/errors/pt/ERR_ESI
+#usr/lib/squid/errors/pt/ERR_FORWARDING_DENIED
+#usr/lib/squid/errors/pt/ERR_FTP_DISABLED
+#usr/lib/squid/errors/pt/ERR_FTP_FAILURE
+#usr/lib/squid/errors/pt/ERR_FTP_FORBIDDEN
+#usr/lib/squid/errors/pt/ERR_FTP_NOT_FOUND
+#usr/lib/squid/errors/pt/ERR_FTP_PUT_CREATED
+#usr/lib/squid/errors/pt/ERR_FTP_PUT_ERROR
+#usr/lib/squid/errors/pt/ERR_FTP_PUT_MODIFIED
+#usr/lib/squid/errors/pt/ERR_FTP_UNAVAILABLE
+#usr/lib/squid/errors/pt/ERR_ICAP_FAILURE
+#usr/lib/squid/errors/pt/ERR_INVALID_REQ
+#usr/lib/squid/errors/pt/ERR_INVALID_RESP
+#usr/lib/squid/errors/pt/ERR_INVALID_URL
+#usr/lib/squid/errors/pt/ERR_LIFETIME_EXP
+#usr/lib/squid/errors/pt/ERR_NO_RELAY
+#usr/lib/squid/errors/pt/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/pt/ERR_READ_ERROR
+#usr/lib/squid/errors/pt/ERR_READ_TIMEOUT
+#usr/lib/squid/errors/pt/ERR_SECURE_CONNECT_FAIL
+#usr/lib/squid/errors/pt/ERR_SHUTTING_DOWN
+#usr/lib/squid/errors/pt/ERR_SOCKET_FAILURE
+#usr/lib/squid/errors/pt/ERR_TOO_BIG
+#usr/lib/squid/errors/pt/ERR_UNSUP_HTTPVERSION
+#usr/lib/squid/errors/pt/ERR_UNSUP_REQ
+#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/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_CACHE_ACCESS_DENIED
+#usr/lib/squid/errors/ro/ERR_CACHE_MGR_ACCESS_DENIED
+#usr/lib/squid/errors/ro/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/ro/ERR_CONNECT_FAIL
+#usr/lib/squid/errors/ro/ERR_DIR_LISTING
+#usr/lib/squid/errors/ro/ERR_DNS_FAIL
+#usr/lib/squid/errors/ro/ERR_ESI
+#usr/lib/squid/errors/ro/ERR_FORWARDING_DENIED
+#usr/lib/squid/errors/ro/ERR_FTP_DISABLED
+#usr/lib/squid/errors/ro/ERR_FTP_FAILURE
+#usr/lib/squid/errors/ro/ERR_FTP_FORBIDDEN
+#usr/lib/squid/errors/ro/ERR_FTP_NOT_FOUND
+#usr/lib/squid/errors/ro/ERR_FTP_PUT_CREATED
+#usr/lib/squid/errors/ro/ERR_FTP_PUT_ERROR
+#usr/lib/squid/errors/ro/ERR_FTP_PUT_MODIFIED
+#usr/lib/squid/errors/ro/ERR_FTP_UNAVAILABLE
+#usr/lib/squid/errors/ro/ERR_ICAP_FAILURE
+#usr/lib/squid/errors/ro/ERR_INVALID_REQ
+#usr/lib/squid/errors/ro/ERR_INVALID_RESP
+#usr/lib/squid/errors/ro/ERR_INVALID_URL
+#usr/lib/squid/errors/ro/ERR_LIFETIME_EXP
+#usr/lib/squid/errors/ro/ERR_NO_RELAY
+#usr/lib/squid/errors/ro/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/ro/ERR_READ_ERROR
+#usr/lib/squid/errors/ro/ERR_READ_TIMEOUT
+#usr/lib/squid/errors/ro/ERR_SECURE_CONNECT_FAIL
+#usr/lib/squid/errors/ro/ERR_SHUTTING_DOWN
+#usr/lib/squid/errors/ro/ERR_SOCKET_FAILURE
+#usr/lib/squid/errors/ro/ERR_TOO_BIG
+#usr/lib/squid/errors/ro/ERR_UNSUP_HTTPVERSION
+#usr/lib/squid/errors/ro/ERR_UNSUP_REQ
+#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/ru
+#usr/lib/squid/errors/ru-ru
+#usr/lib/squid/errors/ru/ERR_ACCESS_DENIED
+#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
+#usr/lib/squid/errors/ru/ERR_CONNECT_FAIL
+#usr/lib/squid/errors/ru/ERR_DIR_LISTING
+#usr/lib/squid/errors/ru/ERR_DNS_FAIL
+#usr/lib/squid/errors/ru/ERR_ESI
+#usr/lib/squid/errors/ru/ERR_FORWARDING_DENIED
+#usr/lib/squid/errors/ru/ERR_FTP_DISABLED
+#usr/lib/squid/errors/ru/ERR_FTP_FAILURE
+#usr/lib/squid/errors/ru/ERR_FTP_FORBIDDEN
+#usr/lib/squid/errors/ru/ERR_FTP_NOT_FOUND
+#usr/lib/squid/errors/ru/ERR_FTP_PUT_CREATED
+#usr/lib/squid/errors/ru/ERR_FTP_PUT_ERROR
+#usr/lib/squid/errors/ru/ERR_FTP_PUT_MODIFIED
+#usr/lib/squid/errors/ru/ERR_FTP_UNAVAILABLE
+#usr/lib/squid/errors/ru/ERR_ICAP_FAILURE
+#usr/lib/squid/errors/ru/ERR_INVALID_REQ
+#usr/lib/squid/errors/ru/ERR_INVALID_RESP
+#usr/lib/squid/errors/ru/ERR_INVALID_URL
+#usr/lib/squid/errors/ru/ERR_LIFETIME_EXP
+#usr/lib/squid/errors/ru/ERR_NO_RELAY
+#usr/lib/squid/errors/ru/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/ru/ERR_READ_ERROR
+#usr/lib/squid/errors/ru/ERR_READ_TIMEOUT
+#usr/lib/squid/errors/ru/ERR_SECURE_CONNECT_FAIL
+#usr/lib/squid/errors/ru/ERR_SHUTTING_DOWN
+#usr/lib/squid/errors/ru/ERR_SOCKET_FAILURE
+#usr/lib/squid/errors/ru/ERR_TOO_BIG
+#usr/lib/squid/errors/ru/ERR_UNSUP_HTTPVERSION
+#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/sk
+#usr/lib/squid/errors/sk-sk
+#usr/lib/squid/errors/sk/ERR_ACCESS_DENIED
+#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
+#usr/lib/squid/errors/sk/ERR_CONNECT_FAIL
+#usr/lib/squid/errors/sk/ERR_DIR_LISTING
+#usr/lib/squid/errors/sk/ERR_DNS_FAIL
+#usr/lib/squid/errors/sk/ERR_ESI
+#usr/lib/squid/errors/sk/ERR_FORWARDING_DENIED
+#usr/lib/squid/errors/sk/ERR_FTP_DISABLED
+#usr/lib/squid/errors/sk/ERR_FTP_FAILURE
+#usr/lib/squid/errors/sk/ERR_FTP_FORBIDDEN
+#usr/lib/squid/errors/sk/ERR_FTP_NOT_FOUND
+#usr/lib/squid/errors/sk/ERR_FTP_PUT_CREATED
+#usr/lib/squid/errors/sk/ERR_FTP_PUT_ERROR
+#usr/lib/squid/errors/sk/ERR_FTP_PUT_MODIFIED
+#usr/lib/squid/errors/sk/ERR_FTP_UNAVAILABLE
+#usr/lib/squid/errors/sk/ERR_ICAP_FAILURE
+#usr/lib/squid/errors/sk/ERR_INVALID_REQ
+#usr/lib/squid/errors/sk/ERR_INVALID_RESP
+#usr/lib/squid/errors/sk/ERR_INVALID_URL
+#usr/lib/squid/errors/sk/ERR_LIFETIME_EXP
+#usr/lib/squid/errors/sk/ERR_NO_RELAY
+#usr/lib/squid/errors/sk/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/sk/ERR_READ_ERROR
+#usr/lib/squid/errors/sk/ERR_READ_TIMEOUT
+#usr/lib/squid/errors/sk/ERR_SECURE_CONNECT_FAIL
+#usr/lib/squid/errors/sk/ERR_SHUTTING_DOWN
+#usr/lib/squid/errors/sk/ERR_SOCKET_FAILURE
+#usr/lib/squid/errors/sk/ERR_TOO_BIG
+#usr/lib/squid/errors/sk/ERR_UNSUP_HTTPVERSION
+#usr/lib/squid/errors/sk/ERR_UNSUP_REQ
+#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/sr
+#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_CACHE_ACCESS_DENIED
+#usr/lib/squid/errors/sr-latn/ERR_CACHE_MGR_ACCESS_DENIED
+#usr/lib/squid/errors/sr-latn/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/sr-latn/ERR_CONNECT_FAIL
+#usr/lib/squid/errors/sr-latn/ERR_DIR_LISTING
+#usr/lib/squid/errors/sr-latn/ERR_DNS_FAIL
+#usr/lib/squid/errors/sr-latn/ERR_ESI
+#usr/lib/squid/errors/sr-latn/ERR_FORWARDING_DENIED
+#usr/lib/squid/errors/sr-latn/ERR_FTP_DISABLED
+#usr/lib/squid/errors/sr-latn/ERR_FTP_FAILURE
+#usr/lib/squid/errors/sr-latn/ERR_FTP_FORBIDDEN
+#usr/lib/squid/errors/sr-latn/ERR_FTP_NOT_FOUND
+#usr/lib/squid/errors/sr-latn/ERR_FTP_PUT_CREATED
+#usr/lib/squid/errors/sr-latn/ERR_FTP_PUT_ERROR
+#usr/lib/squid/errors/sr-latn/ERR_FTP_PUT_MODIFIED
+#usr/lib/squid/errors/sr-latn/ERR_FTP_UNAVAILABLE
+#usr/lib/squid/errors/sr-latn/ERR_ICAP_FAILURE
+#usr/lib/squid/errors/sr-latn/ERR_INVALID_REQ
+#usr/lib/squid/errors/sr-latn/ERR_INVALID_RESP
+#usr/lib/squid/errors/sr-latn/ERR_INVALID_URL
+#usr/lib/squid/errors/sr-latn/ERR_LIFETIME_EXP
+#usr/lib/squid/errors/sr-latn/ERR_NO_RELAY
+#usr/lib/squid/errors/sr-latn/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/sr-latn/ERR_READ_ERROR
+#usr/lib/squid/errors/sr-latn/ERR_READ_TIMEOUT
+#usr/lib/squid/errors/sr-latn/ERR_SECURE_CONNECT_FAIL
+#usr/lib/squid/errors/sr-latn/ERR_SHUTTING_DOWN
+#usr/lib/squid/errors/sr-latn/ERR_SOCKET_FAILURE
+#usr/lib/squid/errors/sr-latn/ERR_TOO_BIG
+#usr/lib/squid/errors/sr-latn/ERR_UNSUP_HTTPVERSION
+#usr/lib/squid/errors/sr-latn/ERR_UNSUP_REQ
+#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-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_CACHE_ACCESS_DENIED
+#usr/lib/squid/errors/sv/ERR_CACHE_MGR_ACCESS_DENIED
+#usr/lib/squid/errors/sv/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/sv/ERR_CONNECT_FAIL
+#usr/lib/squid/errors/sv/ERR_DIR_LISTING
+#usr/lib/squid/errors/sv/ERR_DNS_FAIL
+#usr/lib/squid/errors/sv/ERR_ESI
+#usr/lib/squid/errors/sv/ERR_FORWARDING_DENIED
+#usr/lib/squid/errors/sv/ERR_FTP_DISABLED
+#usr/lib/squid/errors/sv/ERR_FTP_FAILURE
+#usr/lib/squid/errors/sv/ERR_FTP_FORBIDDEN
+#usr/lib/squid/errors/sv/ERR_FTP_NOT_FOUND
+#usr/lib/squid/errors/sv/ERR_FTP_PUT_CREATED
+#usr/lib/squid/errors/sv/ERR_FTP_PUT_ERROR
+#usr/lib/squid/errors/sv/ERR_FTP_PUT_MODIFIED
+#usr/lib/squid/errors/sv/ERR_FTP_UNAVAILABLE
+#usr/lib/squid/errors/sv/ERR_ICAP_FAILURE
+#usr/lib/squid/errors/sv/ERR_INVALID_REQ
+#usr/lib/squid/errors/sv/ERR_INVALID_RESP
+#usr/lib/squid/errors/sv/ERR_INVALID_URL
+#usr/lib/squid/errors/sv/ERR_LIFETIME_EXP
+#usr/lib/squid/errors/sv/ERR_NO_RELAY
+#usr/lib/squid/errors/sv/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/sv/ERR_READ_ERROR
+#usr/lib/squid/errors/sv/ERR_READ_TIMEOUT
+#usr/lib/squid/errors/sv/ERR_SECURE_CONNECT_FAIL
+#usr/lib/squid/errors/sv/ERR_SHUTTING_DOWN
+#usr/lib/squid/errors/sv/ERR_SOCKET_FAILURE
+#usr/lib/squid/errors/sv/ERR_TOO_BIG
+#usr/lib/squid/errors/sv/ERR_UNSUP_HTTPVERSION
+#usr/lib/squid/errors/sv/ERR_UNSUP_REQ
+#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/templates
+#usr/lib/squid/errors/templates/ERR_ACCESS_DENIED
+#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
+#usr/lib/squid/errors/templates/ERR_CONNECT_FAIL
+#usr/lib/squid/errors/templates/ERR_DIR_LISTING
+#usr/lib/squid/errors/templates/ERR_DNS_FAIL
+#usr/lib/squid/errors/templates/ERR_ESI
+#usr/lib/squid/errors/templates/ERR_FORWARDING_DENIED
+#usr/lib/squid/errors/templates/ERR_FTP_DISABLED
+#usr/lib/squid/errors/templates/ERR_FTP_FAILURE
+#usr/lib/squid/errors/templates/ERR_FTP_FORBIDDEN
+#usr/lib/squid/errors/templates/ERR_FTP_NOT_FOUND
+#usr/lib/squid/errors/templates/ERR_FTP_PUT_CREATED
+#usr/lib/squid/errors/templates/ERR_FTP_PUT_ERROR
+#usr/lib/squid/errors/templates/ERR_FTP_PUT_MODIFIED
+#usr/lib/squid/errors/templates/ERR_FTP_UNAVAILABLE
+#usr/lib/squid/errors/templates/ERR_ICAP_FAILURE
+#usr/lib/squid/errors/templates/ERR_INVALID_REQ
+#usr/lib/squid/errors/templates/ERR_INVALID_RESP
+#usr/lib/squid/errors/templates/ERR_INVALID_URL
+#usr/lib/squid/errors/templates/ERR_LIFETIME_EXP
+#usr/lib/squid/errors/templates/ERR_NO_RELAY
+#usr/lib/squid/errors/templates/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/templates/ERR_READ_ERROR
+#usr/lib/squid/errors/templates/ERR_READ_TIMEOUT
+#usr/lib/squid/errors/templates/ERR_SECURE_CONNECT_FAIL
+#usr/lib/squid/errors/templates/ERR_SHUTTING_DOWN
+#usr/lib/squid/errors/templates/ERR_SOCKET_FAILURE
+#usr/lib/squid/errors/templates/ERR_TOO_BIG
+#usr/lib/squid/errors/templates/ERR_UNSUP_HTTPVERSION
+#usr/lib/squid/errors/templates/ERR_UNSUP_REQ
+#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/th
+#usr/lib/squid/errors/th-th
+#usr/lib/squid/errors/th/ERR_ACCESS_DENIED
+#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
+#usr/lib/squid/errors/th/ERR_CONNECT_FAIL
+#usr/lib/squid/errors/th/ERR_DIR_LISTING
+#usr/lib/squid/errors/th/ERR_DNS_FAIL
+#usr/lib/squid/errors/th/ERR_ESI
+#usr/lib/squid/errors/th/ERR_FORWARDING_DENIED
+#usr/lib/squid/errors/th/ERR_FTP_DISABLED
+#usr/lib/squid/errors/th/ERR_FTP_FAILURE
+#usr/lib/squid/errors/th/ERR_FTP_FORBIDDEN
+#usr/lib/squid/errors/th/ERR_FTP_NOT_FOUND
+#usr/lib/squid/errors/th/ERR_FTP_PUT_CREATED
+#usr/lib/squid/errors/th/ERR_FTP_PUT_ERROR
+#usr/lib/squid/errors/th/ERR_FTP_PUT_MODIFIED
+#usr/lib/squid/errors/th/ERR_FTP_UNAVAILABLE
+#usr/lib/squid/errors/th/ERR_ICAP_FAILURE
+#usr/lib/squid/errors/th/ERR_INVALID_REQ
+#usr/lib/squid/errors/th/ERR_INVALID_RESP
+#usr/lib/squid/errors/th/ERR_INVALID_URL
+#usr/lib/squid/errors/th/ERR_LIFETIME_EXP
+#usr/lib/squid/errors/th/ERR_NO_RELAY
+#usr/lib/squid/errors/th/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/th/ERR_READ_ERROR
+#usr/lib/squid/errors/th/ERR_READ_TIMEOUT
+#usr/lib/squid/errors/th/ERR_SECURE_CONNECT_FAIL
+#usr/lib/squid/errors/th/ERR_SHUTTING_DOWN
+#usr/lib/squid/errors/th/ERR_SOCKET_FAILURE
+#usr/lib/squid/errors/th/ERR_TOO_BIG
+#usr/lib/squid/errors/th/ERR_UNSUP_HTTPVERSION
+#usr/lib/squid/errors/th/ERR_UNSUP_REQ
+#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/tr
+#usr/lib/squid/errors/tr-tr
+#usr/lib/squid/errors/tr/ERR_ACCESS_DENIED
+#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
+#usr/lib/squid/errors/tr/ERR_CONNECT_FAIL
+#usr/lib/squid/errors/tr/ERR_DIR_LISTING
+#usr/lib/squid/errors/tr/ERR_DNS_FAIL
+#usr/lib/squid/errors/tr/ERR_ESI
+#usr/lib/squid/errors/tr/ERR_FORWARDING_DENIED
+#usr/lib/squid/errors/tr/ERR_FTP_DISABLED
+#usr/lib/squid/errors/tr/ERR_FTP_FAILURE
+#usr/lib/squid/errors/tr/ERR_FTP_FORBIDDEN
+#usr/lib/squid/errors/tr/ERR_FTP_NOT_FOUND
+#usr/lib/squid/errors/tr/ERR_FTP_PUT_CREATED
+#usr/lib/squid/errors/tr/ERR_FTP_PUT_ERROR
+#usr/lib/squid/errors/tr/ERR_FTP_PUT_MODIFIED
+#usr/lib/squid/errors/tr/ERR_FTP_UNAVAILABLE
+#usr/lib/squid/errors/tr/ERR_ICAP_FAILURE
+#usr/lib/squid/errors/tr/ERR_INVALID_REQ
+#usr/lib/squid/errors/tr/ERR_INVALID_RESP
+#usr/lib/squid/errors/tr/ERR_INVALID_URL
+#usr/lib/squid/errors/tr/ERR_LIFETIME_EXP
+#usr/lib/squid/errors/tr/ERR_NO_RELAY
+#usr/lib/squid/errors/tr/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/tr/ERR_READ_ERROR
+#usr/lib/squid/errors/tr/ERR_READ_TIMEOUT
+#usr/lib/squid/errors/tr/ERR_SECURE_CONNECT_FAIL
+#usr/lib/squid/errors/tr/ERR_SHUTTING_DOWN
+#usr/lib/squid/errors/tr/ERR_SOCKET_FAILURE
+#usr/lib/squid/errors/tr/ERR_TOO_BIG
+#usr/lib/squid/errors/tr/ERR_UNSUP_HTTPVERSION
+#usr/lib/squid/errors/tr/ERR_UNSUP_REQ
+#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/uk
+#usr/lib/squid/errors/uk-ua
+#usr/lib/squid/errors/uk/ERR_ACCESS_DENIED
+#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
+#usr/lib/squid/errors/uk/ERR_CONNECT_FAIL
+#usr/lib/squid/errors/uk/ERR_DIR_LISTING
+#usr/lib/squid/errors/uk/ERR_DNS_FAIL
+#usr/lib/squid/errors/uk/ERR_ESI
+#usr/lib/squid/errors/uk/ERR_FORWARDING_DENIED
+#usr/lib/squid/errors/uk/ERR_FTP_DISABLED
+#usr/lib/squid/errors/uk/ERR_FTP_FAILURE
+#usr/lib/squid/errors/uk/ERR_FTP_FORBIDDEN
+#usr/lib/squid/errors/uk/ERR_FTP_NOT_FOUND
+#usr/lib/squid/errors/uk/ERR_FTP_PUT_CREATED
+#usr/lib/squid/errors/uk/ERR_FTP_PUT_ERROR
+#usr/lib/squid/errors/uk/ERR_FTP_PUT_MODIFIED
+#usr/lib/squid/errors/uk/ERR_FTP_UNAVAILABLE
+#usr/lib/squid/errors/uk/ERR_ICAP_FAILURE
+#usr/lib/squid/errors/uk/ERR_INVALID_REQ
+#usr/lib/squid/errors/uk/ERR_INVALID_RESP
+#usr/lib/squid/errors/uk/ERR_INVALID_URL
+#usr/lib/squid/errors/uk/ERR_LIFETIME_EXP
+#usr/lib/squid/errors/uk/ERR_NO_RELAY
+#usr/lib/squid/errors/uk/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/uk/ERR_READ_ERROR
+#usr/lib/squid/errors/uk/ERR_READ_TIMEOUT
+#usr/lib/squid/errors/uk/ERR_SECURE_CONNECT_FAIL
+#usr/lib/squid/errors/uk/ERR_SHUTTING_DOWN
+#usr/lib/squid/errors/uk/ERR_SOCKET_FAILURE
+#usr/lib/squid/errors/uk/ERR_TOO_BIG
+#usr/lib/squid/errors/uk/ERR_UNSUP_HTTPVERSION
+#usr/lib/squid/errors/uk/ERR_UNSUP_REQ
+#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/uz
+#usr/lib/squid/errors/uz/ERR_ACCESS_DENIED
+#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
+#usr/lib/squid/errors/uz/ERR_CONNECT_FAIL
+#usr/lib/squid/errors/uz/ERR_DIR_LISTING
+#usr/lib/squid/errors/uz/ERR_DNS_FAIL
+#usr/lib/squid/errors/uz/ERR_ESI
+#usr/lib/squid/errors/uz/ERR_FORWARDING_DENIED
+#usr/lib/squid/errors/uz/ERR_FTP_DISABLED
+#usr/lib/squid/errors/uz/ERR_FTP_FAILURE
+#usr/lib/squid/errors/uz/ERR_FTP_FORBIDDEN
+#usr/lib/squid/errors/uz/ERR_FTP_NOT_FOUND
+#usr/lib/squid/errors/uz/ERR_FTP_PUT_CREATED
+#usr/lib/squid/errors/uz/ERR_FTP_PUT_ERROR
+#usr/lib/squid/errors/uz/ERR_FTP_PUT_MODIFIED
+#usr/lib/squid/errors/uz/ERR_FTP_UNAVAILABLE
+#usr/lib/squid/errors/uz/ERR_ICAP_FAILURE
+#usr/lib/squid/errors/uz/ERR_INVALID_REQ
+#usr/lib/squid/errors/uz/ERR_INVALID_RESP
+#usr/lib/squid/errors/uz/ERR_INVALID_URL
+#usr/lib/squid/errors/uz/ERR_LIFETIME_EXP
+#usr/lib/squid/errors/uz/ERR_NO_RELAY
+#usr/lib/squid/errors/uz/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/uz/ERR_READ_ERROR
+#usr/lib/squid/errors/uz/ERR_READ_TIMEOUT
+#usr/lib/squid/errors/uz/ERR_SECURE_CONNECT_FAIL
+#usr/lib/squid/errors/uz/ERR_SHUTTING_DOWN
+#usr/lib/squid/errors/uz/ERR_SOCKET_FAILURE
+#usr/lib/squid/errors/uz/ERR_TOO_BIG
+#usr/lib/squid/errors/uz/ERR_UNSUP_HTTPVERSION
+#usr/lib/squid/errors/uz/ERR_UNSUP_REQ
+#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/zh-cn
+#usr/lib/squid/errors/zh-cn/ERR_ACCESS_DENIED
+#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
+#usr/lib/squid/errors/zh-cn/ERR_CONNECT_FAIL
+#usr/lib/squid/errors/zh-cn/ERR_DIR_LISTING
+#usr/lib/squid/errors/zh-cn/ERR_DNS_FAIL
+#usr/lib/squid/errors/zh-cn/ERR_ESI
+#usr/lib/squid/errors/zh-cn/ERR_FORWARDING_DENIED
+#usr/lib/squid/errors/zh-cn/ERR_FTP_DISABLED
+#usr/lib/squid/errors/zh-cn/ERR_FTP_FAILURE
+#usr/lib/squid/errors/zh-cn/ERR_FTP_FORBIDDEN
+#usr/lib/squid/errors/zh-cn/ERR_FTP_NOT_FOUND
+#usr/lib/squid/errors/zh-cn/ERR_FTP_PUT_CREATED
+#usr/lib/squid/errors/zh-cn/ERR_FTP_PUT_ERROR
+#usr/lib/squid/errors/zh-cn/ERR_FTP_PUT_MODIFIED
+#usr/lib/squid/errors/zh-cn/ERR_FTP_UNAVAILABLE
+#usr/lib/squid/errors/zh-cn/ERR_ICAP_FAILURE
+#usr/lib/squid/errors/zh-cn/ERR_INVALID_REQ
+#usr/lib/squid/errors/zh-cn/ERR_INVALID_RESP
+#usr/lib/squid/errors/zh-cn/ERR_INVALID_URL
+#usr/lib/squid/errors/zh-cn/ERR_LIFETIME_EXP
+#usr/lib/squid/errors/zh-cn/ERR_NO_RELAY
+#usr/lib/squid/errors/zh-cn/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/zh-cn/ERR_READ_ERROR
+#usr/lib/squid/errors/zh-cn/ERR_READ_TIMEOUT
+#usr/lib/squid/errors/zh-cn/ERR_SECURE_CONNECT_FAIL
+#usr/lib/squid/errors/zh-cn/ERR_SHUTTING_DOWN
+#usr/lib/squid/errors/zh-cn/ERR_SOCKET_FAILURE
+#usr/lib/squid/errors/zh-cn/ERR_TOO_BIG
+#usr/lib/squid/errors/zh-cn/ERR_UNSUP_HTTPVERSION
+#usr/lib/squid/errors/zh-cn/ERR_UNSUP_REQ
+#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-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_CACHE_ACCESS_DENIED
+#usr/lib/squid/errors/zh-tw/ERR_CACHE_MGR_ACCESS_DENIED
+#usr/lib/squid/errors/zh-tw/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/zh-tw/ERR_CONNECT_FAIL
+#usr/lib/squid/errors/zh-tw/ERR_DIR_LISTING
+#usr/lib/squid/errors/zh-tw/ERR_DNS_FAIL
+#usr/lib/squid/errors/zh-tw/ERR_ESI
+#usr/lib/squid/errors/zh-tw/ERR_FORWARDING_DENIED
+#usr/lib/squid/errors/zh-tw/ERR_FTP_DISABLED
+#usr/lib/squid/errors/zh-tw/ERR_FTP_FAILURE
+#usr/lib/squid/errors/zh-tw/ERR_FTP_FORBIDDEN
+#usr/lib/squid/errors/zh-tw/ERR_FTP_NOT_FOUND
+#usr/lib/squid/errors/zh-tw/ERR_FTP_PUT_CREATED
+#usr/lib/squid/errors/zh-tw/ERR_FTP_PUT_ERROR
+#usr/lib/squid/errors/zh-tw/ERR_FTP_PUT_MODIFIED
+#usr/lib/squid/errors/zh-tw/ERR_FTP_UNAVAILABLE
+#usr/lib/squid/errors/zh-tw/ERR_ICAP_FAILURE
+#usr/lib/squid/errors/zh-tw/ERR_INVALID_REQ
+#usr/lib/squid/errors/zh-tw/ERR_INVALID_RESP
+#usr/lib/squid/errors/zh-tw/ERR_INVALID_URL
+#usr/lib/squid/errors/zh-tw/ERR_LIFETIME_EXP
+#usr/lib/squid/errors/zh-tw/ERR_NO_RELAY
+#usr/lib/squid/errors/zh-tw/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/zh-tw/ERR_READ_ERROR
+#usr/lib/squid/errors/zh-tw/ERR_READ_TIMEOUT
+#usr/lib/squid/errors/zh-tw/ERR_SECURE_CONNECT_FAIL
+#usr/lib/squid/errors/zh-tw/ERR_SHUTTING_DOWN
+#usr/lib/squid/errors/zh-tw/ERR_SOCKET_FAILURE
+#usr/lib/squid/errors/zh-tw/ERR_TOO_BIG
+#usr/lib/squid/errors/zh-tw/ERR_UNSUP_HTTPVERSION
+#usr/lib/squid/errors/zh-tw/ERR_UNSUP_REQ
+#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/fakeauth_auth
usr/lib/squid/icons
#usr/lib/squid/icons/anthony-binhex.gif
#usr/lib/squid/icons/anthony-bomb.gif
@@ -1162,22 +1700,30 @@ usr/lib/squid/icons
#usr/lib/squid/icons/anthony-unknown.gif
#usr/lib/squid/icons/anthony-xbm.gif
#usr/lib/squid/icons/anthony-xpm.gif
-usr/lib/squid/logfile-daemon
+usr/lib/squid/ip_user_check
usr/lib/squid/mib.txt
usr/lib/squid/msnt_auth
usr/lib/squid/ncsa_auth
-usr/lib/squid/ntlm_auth
+usr/lib/squid/no_check.pl
+usr/lib/squid/ntlm_smb_lm_auth
usr/lib/squid/smb_auth
usr/lib/squid/smb_auth.pl
usr/lib/squid/smb_auth.sh
usr/lib/squid/squid_ldap_auth
+usr/lib/squid/squid_ldap_group
+usr/lib/squid/squid_session
+usr/lib/squid/squid_unix_group
usr/lib/squid/unlinkd
usr/sbin/squid
usr/sbin/updxlrator
+#usr/share/man/man1/squidclient.1
#usr/share/man/man8/cachemgr.cgi.8
#usr/share/man/man8/ncsa_auth.8
#usr/share/man/man8/squid.8
#usr/share/man/man8/squid_ldap_auth.8
+#usr/share/man/man8/squid_ldap_group.8
+#usr/share/man/man8/squid_session.8
+#usr/share/man/man8/squid_unix_group.8
var/ipfire/updatexlrator/autocheck/cron.daily
var/ipfire/updatexlrator/autocheck/cron.monthly
var/ipfire/updatexlrator/autocheck/cron.weekly
@@ -1192,4 +1738,3 @@ var/log/cache
var/log/squid/access.log
var/log/updatexlrator
#var/logs
-#usr/lib/squid/cachemgr.cgi
diff --git a/config/rootfiles/core/test/filelists/attr b/config/rootfiles/core/test/filelists/attr
new file mode 120000
index 0000000..c808017
--- /dev/null
+++ b/config/rootfiles/core/test/filelists/attr
@@ -0,0 +1 @@
+../../../common/attr
\ No newline at end of file
diff --git a/config/rootfiles/core/test/filelists/files b/config/rootfiles/core/test/filelists/files
index 2b9a2f5..d7ed8ab 100644
--- a/config/rootfiles/core/test/filelists/files
+++ b/config/rootfiles/core/test/filelists/files
@@ -1,4 +1,6 @@
etc/system-release
etc/rc.d/init.d/checkfstab
-usr/local/bin/rebuild-initrd
+etc/rc.d/init.d/squid
+srv/web/ipfire/cgi-bin/proxy.cgi
srv/web/ipfire/cgi-bin/speed.cgi
+usr/local/bin/rebuild-initrd
diff --git a/config/rootfiles/core/test/filelists/findutils b/config/rootfiles/core/test/filelists/findutils
new file mode 120000
index 0000000..545280a
--- /dev/null
+++ b/config/rootfiles/core/test/filelists/findutils
@@ -0,0 +1 @@
+../../../common/findutils
\ No newline at end of file
diff --git a/config/rootfiles/core/test/filelists/libcap b/config/rootfiles/core/test/filelists/libcap
new file mode 120000
index 0000000..ed67d95
--- /dev/null
+++ b/config/rootfiles/core/test/filelists/libcap
@@ -0,0 +1 @@
+../../../common/libcap
\ No newline at end of file
diff --git a/config/rootfiles/core/test/filelists/squid b/config/rootfiles/core/test/filelists/squid
new file mode 120000
index 0000000..2dc8372
--- /dev/null
+++ b/config/rootfiles/core/test/filelists/squid
@@ -0,0 +1 @@
+../../../common/squid
\ No newline at end of file
diff --git a/config/rootfiles/packages/linux-pae b/config/rootfiles/packages/linux-pae
new file mode 100644
index 0000000..2df45f9
--- /dev/null
+++ b/config/rootfiles/packages/linux-pae
@@ -0,0 +1,1872 @@
+boot/System.map-KVER-ipfire-pae
+boot/System.map-ipfire-pae
+boot/config-KVER-ipfire-pae
+boot/vmlinuz-KVER-ipfire-pae
+boot/vmlinuz-ipfire-pae
+lib/modules/KVER-ipfire-pae
+#lib/modules/KVER-ipfire-pae/build
+#lib/modules/KVER-ipfire-pae/kernel
+#lib/modules/KVER-ipfire-pae/kernel/arch
+#lib/modules/KVER-ipfire-pae/kernel/arch/x86
+#lib/modules/KVER-ipfire-pae/kernel/arch/x86/crypto
+#lib/modules/KVER-ipfire-pae/kernel/arch/x86/crypto/aes-i586.ko
+#lib/modules/KVER-ipfire-pae/kernel/arch/x86/crypto/crc32c-intel.ko
+#lib/modules/KVER-ipfire-pae/kernel/arch/x86/crypto/salsa20-i586.ko
+#lib/modules/KVER-ipfire-pae/kernel/arch/x86/crypto/twofish-i586.ko
+#lib/modules/KVER-ipfire-pae/kernel/arch/x86/kernel
+#lib/modules/KVER-ipfire-pae/kernel/arch/x86/kernel/apm.ko
+#lib/modules/KVER-ipfire-pae/kernel/arch/x86/kernel/cpu
+#lib/modules/KVER-ipfire-pae/kernel/arch/x86/kernel/cpu/cpufreq
+#lib/modules/KVER-ipfire-pae/kernel/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.ko
+#lib/modules/KVER-ipfire-pae/kernel/arch/x86/kernel/cpu/cpufreq/cpufreq-nforce2.ko
+#lib/modules/KVER-ipfire-pae/kernel/arch/x86/kernel/cpu/cpufreq/e_powersaver.ko
+#lib/modules/KVER-ipfire-pae/kernel/arch/x86/kernel/cpu/cpufreq/gx-suspmod.ko
+#lib/modules/KVER-ipfire-pae/kernel/arch/x86/kernel/cpu/cpufreq/longhaul.ko
+#lib/modules/KVER-ipfire-pae/kernel/arch/x86/kernel/cpu/cpufreq/longrun.ko
+#lib/modules/KVER-ipfire-pae/kernel/arch/x86/kernel/cpu/cpufreq/p4-clockmod.ko
+#lib/modules/KVER-ipfire-pae/kernel/arch/x86/kernel/cpu/cpufreq/powernow-k6.ko
+#lib/modules/KVER-ipfire-pae/kernel/arch/x86/kernel/cpu/cpufreq/powernow-k7.ko
+#lib/modules/KVER-ipfire-pae/kernel/arch/x86/kernel/cpu/cpufreq/powernow-k8.ko
+#lib/modules/KVER-ipfire-pae/kernel/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.ko
+#lib/modules/KVER-ipfire-pae/kernel/arch/x86/kernel/cpu/cpufreq/speedstep-ich.ko
+#lib/modules/KVER-ipfire-pae/kernel/arch/x86/kernel/cpu/cpufreq/speedstep-lib.ko
+#lib/modules/KVER-ipfire-pae/kernel/arch/x86/kernel/cpu/cpufreq/speedstep-smi.ko
+#lib/modules/KVER-ipfire-pae/kernel/arch/x86/kernel/cpu/mcheck
+#lib/modules/KVER-ipfire-pae/kernel/arch/x86/kernel/cpu/mcheck/mce-inject.ko
+#lib/modules/KVER-ipfire-pae/kernel/arch/x86/kernel/microcode.ko
+#lib/modules/KVER-ipfire-pae/kernel/arch/x86/kernel/msr.ko
+#lib/modules/KVER-ipfire-pae/kernel/arch/x86/kernel/scx200.ko
+#lib/modules/KVER-ipfire-pae/kernel/arch/x86/kvm
+#lib/modules/KVER-ipfire-pae/kernel/arch/x86/kvm/kvm-amd.ko
+#lib/modules/KVER-ipfire-pae/kernel/arch/x86/kvm/kvm-intel.ko
+#lib/modules/KVER-ipfire-pae/kernel/arch/x86/kvm/kvm.ko
+#lib/modules/KVER-ipfire-pae/kernel/crypto
+#lib/modules/KVER-ipfire-pae/kernel/crypto/aes_generic.ko
+#lib/modules/KVER-ipfire-pae/kernel/crypto/ansi_cprng.ko
+#lib/modules/KVER-ipfire-pae/kernel/crypto/anubis.ko
+#lib/modules/KVER-ipfire-pae/kernel/crypto/arc4.ko
+#lib/modules/KVER-ipfire-pae/kernel/crypto/async_tx
+#lib/modules/KVER-ipfire-pae/kernel/crypto/async_tx/async_memcpy.ko
+#lib/modules/KVER-ipfire-pae/kernel/crypto/async_tx/async_pq.ko
+#lib/modules/KVER-ipfire-pae/kernel/crypto/async_tx/async_raid6_recov.ko
+#lib/modules/KVER-ipfire-pae/kernel/crypto/async_tx/async_tx.ko
+#lib/modules/KVER-ipfire-pae/kernel/crypto/async_tx/async_xor.ko
+#lib/modules/KVER-ipfire-pae/kernel/crypto/async_tx/raid6test.ko
+#lib/modules/KVER-ipfire-pae/kernel/crypto/authenc.ko
+#lib/modules/KVER-ipfire-pae/kernel/crypto/blowfish.ko
+#lib/modules/KVER-ipfire-pae/kernel/crypto/camellia.ko
+#lib/modules/KVER-ipfire-pae/kernel/crypto/cast5.ko
+#lib/modules/KVER-ipfire-pae/kernel/crypto/cast6.ko
+#lib/modules/KVER-ipfire-pae/kernel/crypto/cbc.ko
+#lib/modules/KVER-ipfire-pae/kernel/crypto/ccm.ko
+#lib/modules/KVER-ipfire-pae/kernel/crypto/crc32c.ko
+#lib/modules/KVER-ipfire-pae/kernel/crypto/cryptd.ko
+#lib/modules/KVER-ipfire-pae/kernel/crypto/ctr.ko
+#lib/modules/KVER-ipfire-pae/kernel/crypto/cts.ko
+#lib/modules/KVER-ipfire-pae/kernel/crypto/des_generic.ko
+#lib/modules/KVER-ipfire-pae/kernel/crypto/ecb.ko
+#lib/modules/KVER-ipfire-pae/kernel/crypto/fcrypt.ko
+#lib/modules/KVER-ipfire-pae/kernel/crypto/gcm.ko
+#lib/modules/KVER-ipfire-pae/kernel/crypto/gf128mul.ko
+#lib/modules/KVER-ipfire-pae/kernel/crypto/ghash-generic.ko
+#lib/modules/KVER-ipfire-pae/kernel/crypto/khazad.ko
+#lib/modules/KVER-ipfire-pae/kernel/crypto/lrw.ko
+#lib/modules/KVER-ipfire-pae/kernel/crypto/lzo.ko
+#lib/modules/KVER-ipfire-pae/kernel/crypto/md5.ko
+#lib/modules/KVER-ipfire-pae/kernel/crypto/michael_mic.ko
+#lib/modules/KVER-ipfire-pae/kernel/crypto/pcbc.ko
+#lib/modules/KVER-ipfire-pae/kernel/crypto/rmd128.ko
+#lib/modules/KVER-ipfire-pae/kernel/crypto/rmd160.ko
+#lib/modules/KVER-ipfire-pae/kernel/crypto/rmd256.ko
+#lib/modules/KVER-ipfire-pae/kernel/crypto/rmd320.ko
+#lib/modules/KVER-ipfire-pae/kernel/crypto/salsa20_generic.ko
+#lib/modules/KVER-ipfire-pae/kernel/crypto/seed.ko
+#lib/modules/KVER-ipfire-pae/kernel/crypto/seqiv.ko
+#lib/modules/KVER-ipfire-pae/kernel/crypto/serpent.ko
+#lib/modules/KVER-ipfire-pae/kernel/crypto/sha1_generic.ko
+#lib/modules/KVER-ipfire-pae/kernel/crypto/sha256_generic.ko
+#lib/modules/KVER-ipfire-pae/kernel/crypto/sha512_generic.ko
+#lib/modules/KVER-ipfire-pae/kernel/crypto/tea.ko
+#lib/modules/KVER-ipfire-pae/kernel/crypto/tgr192.ko
+#lib/modules/KVER-ipfire-pae/kernel/crypto/twofish.ko
+#lib/modules/KVER-ipfire-pae/kernel/crypto/twofish_common.ko
+#lib/modules/KVER-ipfire-pae/kernel/crypto/vmac.ko
+#lib/modules/KVER-ipfire-pae/kernel/crypto/wp512.ko
+#lib/modules/KVER-ipfire-pae/kernel/crypto/xcbc.ko
+#lib/modules/KVER-ipfire-pae/kernel/crypto/xor.ko
+#lib/modules/KVER-ipfire-pae/kernel/crypto/xts.ko
+#lib/modules/KVER-ipfire-pae/kernel/crypto/zlib.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers
+#lib/modules/KVER-ipfire-pae/kernel/drivers/acpi
+#lib/modules/KVER-ipfire-pae/kernel/drivers/acpi/ac.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/acpi/acpi_pad.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/acpi/battery.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/acpi/button.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/acpi/container.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/acpi/fan.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/acpi/pci_slot.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/acpi/power_meter.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/acpi/processor.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/acpi/sbs.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/acpi/sbshc.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/acpi/thermal.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/acpi/video.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/ahci.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/ata_generic.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/ata_piix.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/libata.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/pata_acpi.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/pata_ali.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/pata_amd.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/pata_artop.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/pata_atiixp.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/pata_atp867x.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/pata_cmd640.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/pata_cmd64x.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/pata_cs5520.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/pata_cs5530.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/pata_cs5535.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/pata_cs5536.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/pata_cypress.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/pata_efar.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/pata_hpt366.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/pata_hpt37x.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/pata_hpt3x2n.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/pata_hpt3x3.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/pata_isapnp.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/pata_it8213.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/pata_it821x.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/pata_jmicron.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/pata_legacy.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/pata_marvell.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/pata_mpiix.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/pata_netcell.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/pata_ninja32.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/pata_ns87410.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/pata_ns87415.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/pata_oldpiix.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/pata_opti.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/pata_optidma.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/pata_pcmcia.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/pata_pdc2027x.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/pata_pdc202xx_old.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/pata_qdi.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/pata_radisys.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/pata_rdc.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/pata_rz1000.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/pata_sc1200.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/pata_sch.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/pata_serverworks.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/pata_sil680.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/pata_sis.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/pata_sl82c105.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/pata_triflex.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/pata_via.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/pata_winbond.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/pdc_adma.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/sata_inic162x.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/sata_mv.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/sata_nv.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/sata_promise.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/sata_qstor.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/sata_sil.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/sata_sil24.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/sata_sis.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/sata_svw.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/sata_sx4.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/sata_uli.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/sata_via.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ata/sata_vsc.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/atm
+#lib/modules/KVER-ipfire-pae/kernel/drivers/atm/ambassador.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/atm/atmtcp.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/atm/eni.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/atm/firestream.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/atm/fore_200e.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/atm/he.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/atm/horizon.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/atm/idt77105.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/atm/idt77252.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/atm/iphase.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/atm/lanai.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/atm/nicstar.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/atm/solos-pci.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/atm/suni.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/atm/uPD98402.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/atm/zatm.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/block
+#lib/modules/KVER-ipfire-pae/kernel/drivers/block/DAC960.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/block/aoe
+#lib/modules/KVER-ipfire-pae/kernel/drivers/block/aoe/aoe.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/block/cciss.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/block/cpqarray.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/block/cryptoloop.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/block/floppy.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/block/nbd.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/block/osdblk.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/block/sx8.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/block/virtio_blk.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/bluetooth
+#lib/modules/KVER-ipfire-pae/kernel/drivers/bluetooth/bcm203x.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/bluetooth/bfusb.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/bluetooth/bluecard_cs.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/bluetooth/bpa10x.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/bluetooth/bt3c_cs.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/bluetooth/btmrvl.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/bluetooth/btmrvl_sdio.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/bluetooth/btsdio.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/bluetooth/btuart_cs.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/bluetooth/btusb.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/bluetooth/dtl1_cs.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/bluetooth/hci_uart.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/bluetooth/hci_vhci.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/cdrom
+#lib/modules/KVER-ipfire-pae/kernel/drivers/cdrom/cdrom.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/char
+#lib/modules/KVER-ipfire-pae/kernel/drivers/char/agp
+#lib/modules/KVER-ipfire-pae/kernel/drivers/char/agp/agpgart.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/char/agp/ali-agp.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/char/agp/amd-k7-agp.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/char/agp/amd64-agp.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/char/agp/ati-agp.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/char/agp/efficeon-agp.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/char/agp/intel-agp.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/char/agp/nvidia-agp.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/char/agp/sis-agp.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/char/agp/sworks-agp.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/char/agp/via-agp.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/char/cs5535_gpio.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/char/hangcheck-timer.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/char/hw_random
+#lib/modules/KVER-ipfire-pae/kernel/drivers/char/hw_random/amd-rng.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/char/hw_random/geode-rng.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/char/hw_random/intel-rng.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/char/hw_random/rng-core.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/char/hw_random/timeriomem-rng.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/char/hw_random/via-rng.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/char/hw_random/virtio-rng.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/char/i8k.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/char/ipmi
+#lib/modules/KVER-ipfire-pae/kernel/drivers/char/ipmi/ipmi_devintf.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/char/ipmi/ipmi_msghandler.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/char/ipmi/ipmi_poweroff.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/char/ipmi/ipmi_si.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/char/ipmi/ipmi_watchdog.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/char/lp.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/char/mwave
+#lib/modules/KVER-ipfire-pae/kernel/drivers/char/mwave/mwave.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/char/nozomi.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/char/nsc_gpio.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/char/nvram.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/char/pc8736x_gpio.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/char/pcmcia
+#lib/modules/KVER-ipfire-pae/kernel/drivers/char/pcmcia/ipwireless
+#lib/modules/KVER-ipfire-pae/kernel/drivers/char/pcmcia/ipwireless/ipwireless.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/char/pcmcia/synclink_cs.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/char/ppdev.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/char/scx200_gpio.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/char/toshiba.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/clocksource
+#lib/modules/KVER-ipfire-pae/kernel/drivers/clocksource/scx200_hrt.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/connector
+#lib/modules/KVER-ipfire-pae/kernel/drivers/connector/cn.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq
+#lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/cpufreq_conservative.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/cpufreq_ondemand.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/cpufreq_powersave.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/cpufreq_userspace.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/crypto
+#lib/modules/KVER-ipfire-pae/kernel/drivers/crypto/geode-aes.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/crypto/hifn_795x.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/crypto/padlock-aes.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/crypto/padlock-sha.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/dca
+#lib/modules/KVER-ipfire-pae/kernel/drivers/dca/dca.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/dma
+#lib/modules/KVER-ipfire-pae/kernel/drivers/dma/dmatest.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/dma/ioat
+#lib/modules/KVER-ipfire-pae/kernel/drivers/dma/ioat/ioatdma.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/firewire
+#lib/modules/KVER-ipfire-pae/kernel/drivers/firewire/firewire-core.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/firewire/firewire-net.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/firewire/firewire-ohci.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/firewire/firewire-sbp2.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/firmware
+#lib/modules/KVER-ipfire-pae/kernel/drivers/firmware/iscsi_ibft.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/gpu
+#lib/modules/KVER-ipfire-pae/kernel/drivers/gpu/drm
+#lib/modules/KVER-ipfire-pae/kernel/drivers/gpu/drm/drm.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/gpu/drm/drm_kms_helper.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/gpu/drm/i810
+#lib/modules/KVER-ipfire-pae/kernel/drivers/gpu/drm/i810/i810.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/gpu/drm/i830
+#lib/modules/KVER-ipfire-pae/kernel/drivers/gpu/drm/i830/i830.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/gpu/drm/i915
+#lib/modules/KVER-ipfire-pae/kernel/drivers/gpu/drm/i915/i915.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/gpu/drm/mga
+#lib/modules/KVER-ipfire-pae/kernel/drivers/gpu/drm/mga/mga.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/gpu/drm/r128
+#lib/modules/KVER-ipfire-pae/kernel/drivers/gpu/drm/r128/r128.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/gpu/drm/radeon
+#lib/modules/KVER-ipfire-pae/kernel/drivers/gpu/drm/radeon/radeon.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/gpu/drm/savage
+#lib/modules/KVER-ipfire-pae/kernel/drivers/gpu/drm/savage/savage.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/gpu/drm/sis
+#lib/modules/KVER-ipfire-pae/kernel/drivers/gpu/drm/sis/sis.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/gpu/drm/tdfx
+#lib/modules/KVER-ipfire-pae/kernel/drivers/gpu/drm/tdfx/tdfx.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/gpu/drm/ttm
+#lib/modules/KVER-ipfire-pae/kernel/drivers/gpu/drm/ttm/ttm.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/gpu/drm/via
+#lib/modules/KVER-ipfire-pae/kernel/drivers/gpu/drm/via/via.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hid
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hid/hid-a4tech.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hid/hid-apple.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hid/hid-belkin.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hid/hid-cherry.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hid/hid-chicony.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hid/hid-cypress.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hid/hid-drff.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hid/hid-ezkey.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hid/hid-gaff.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hid/hid-gyration.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hid/hid-kensington.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hid/hid-kye.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hid/hid-logitech.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hid/hid-microsoft.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hid/hid-monterey.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hid/hid-ntrig.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hid/hid-petalynx.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hid/hid-pl.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hid/hid-samsung.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hid/hid-sjoy.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hid/hid-sony.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hid/hid-sunplus.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hid/hid-tmff.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hid/hid-topseed.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hid/hid-twinhan.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hid/hid-wacom.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hid/hid-zpff.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hid/usbhid
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hid/usbhid/usbhid.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/abituguru.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/abituguru3.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/ad7414.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/ad7418.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/adm1021.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/adm1025.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/adm1026.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/adm1029.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/adm1031.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/adm9240.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/ads7828.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/adt7462.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/adt7470.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/adt7473.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/adt7475.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/applesmc.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/asb100.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/asus_atk0110.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/atxp1.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/coretemp.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/dme1737.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/ds1621.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/f71805f.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/f71882fg.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/f75375s.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/fschmd.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/g760a.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/gl518sm.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/gl520sm.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/hdaps.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/hp_accel.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/hwmon-vid.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/hwmon.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/i5k_amb.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/ibmaem.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/ibmpex.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/it87.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/k8temp.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/lis3lv02d.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/lm63.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/lm75.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/lm77.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/lm78.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/lm80.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/lm83.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/lm85.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/lm87.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/lm90.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/lm92.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/lm93.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/lm95241.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/ltc4215.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/ltc4245.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/max1619.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/max6650.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/pc87360.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/pc87427.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/pcf8591.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/sis5595.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/smsc47b397.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/smsc47m1.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/smsc47m192.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/thmc50.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/tmp401.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/tmp421.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/via686a.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/vt1211.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/vt8231.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/w83627ehf.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/w83627hf.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/w83781d.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/w83791d.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/w83792d.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/w83793.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/w83l785ts.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/w83l786ng.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/wm831x-hwmon.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/hwmon/wm8350-hwmon.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/i2c
+#lib/modules/KVER-ipfire-pae/kernel/drivers/i2c/algos
+#lib/modules/KVER-ipfire-pae/kernel/drivers/i2c/algos/i2c-algo-bit.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/i2c/algos/i2c-algo-pca.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/i2c/busses
+#lib/modules/KVER-ipfire-pae/kernel/drivers/i2c/busses/i2c-ali1535.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/i2c/busses/i2c-ali1563.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/i2c/busses/i2c-ali15x3.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/i2c/busses/i2c-amd756-s4882.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/i2c/busses/i2c-amd756.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/i2c/busses/i2c-amd8111.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/i2c/busses/i2c-i801.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/i2c/busses/i2c-isch.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/i2c/busses/i2c-nforce2-s4985.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/i2c/busses/i2c-nforce2.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/i2c/busses/i2c-ocores.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/i2c/busses/i2c-parport-light.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/i2c/busses/i2c-parport.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/i2c/busses/i2c-pca-isa.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/i2c/busses/i2c-pca-platform.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/i2c/busses/i2c-piix4.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/i2c/busses/i2c-scmi.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/i2c/busses/i2c-simtec.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/i2c/busses/i2c-sis5595.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/i2c/busses/i2c-sis630.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/i2c/busses/i2c-sis96x.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/i2c/busses/i2c-stub.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/i2c/busses/i2c-tiny-usb.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/i2c/busses/i2c-via.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/i2c/busses/i2c-viapro.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/i2c/busses/i2c-voodoo3.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/i2c/busses/scx200_acb.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/i2c/chips
+#lib/modules/KVER-ipfire-pae/kernel/drivers/i2c/chips/ds1682.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/i2c/chips/tsl2550.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/i2c/i2c-core.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/i2c/i2c-dev.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ieee802154
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ieee802154/fakehard.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/input
+#lib/modules/KVER-ipfire-pae/kernel/drivers/input/ff-memless.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/input/input-polldev.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/input/keyboard
+#lib/modules/KVER-ipfire-pae/kernel/drivers/input/keyboard/adp5588-keys.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/input/keyboard/lkkbd.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/input/keyboard/lm8323.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/input/keyboard/max7359_keypad.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/input/keyboard/newtonkbd.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/input/keyboard/opencores-kbd.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/input/keyboard/stowaway.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/input/keyboard/sunkbd.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/input/keyboard/xtkbd.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/input/misc
+#lib/modules/KVER-ipfire-pae/kernel/drivers/input/misc/apanel.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/input/misc/ati_remote.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/input/misc/ati_remote2.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/input/misc/cm109.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/input/misc/keyspan_remote.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/input/misc/pcf50633-input.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/input/misc/pcspkr.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/input/misc/powermate.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/input/misc/winbond-cir.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/input/misc/wm831x-on.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/input/misc/yealink.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/input/xen-kbdfront.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn
+#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/act2000
+#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/act2000/act2000.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/capi
+#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/capi/capi.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/capi/capidrv.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/capi/capifs.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/capi/kernelcapi.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/divert
+#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/divert/dss1_divert.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/gigaset
+#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/gigaset/bas_gigaset.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/gigaset/gigaset.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/gigaset/ser_gigaset.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/gigaset/usb_gigaset.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hardware
+#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hardware/avm
+#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hardware/avm/avm_cs.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hardware/avm/b1.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hardware/avm/b1dma.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hardware/avm/b1isa.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hardware/avm/b1pci.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hardware/avm/b1pcmcia.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hardware/avm/c4.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hardware/avm/t1isa.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hardware/avm/t1pci.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hardware/eicon
+#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hardware/eicon/diva_idi.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hardware/eicon/diva_mnt.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hardware/eicon/divacapi.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hardware/eicon/divadidd.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hardware/eicon/divas.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hisax
+#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hisax/avma1_cs.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hisax/elsa_cs.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hisax/hfc4s8s_l1.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hisax/hfc_usb.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hisax/hisax.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hisax/hisax_fcpcipnp.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hisax/hisax_isac.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hisax/hisax_st5481.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hisax/sedlbauer_cs.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hisax/teles_cs.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hysdn
+#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/hysdn/hysdn.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/i4l
+#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/i4l/isdn.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/i4l/isdn_bsdcomp.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/i4l/isdnhdlc.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/icn
+#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/icn/icn.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/pcbit
+#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/pcbit/pcbit.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/sc
+#lib/modules/KVER-ipfire-pae/kernel/drivers/isdn/sc/sc.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/leds
+#lib/modules/KVER-ipfire-pae/kernel/drivers/leds/led-class.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/leds/leds-alix2.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/leds/leds-bd2802.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/leds/leds-clevo-mail.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/leds/leds-lp3944.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/leds/leds-net48xx.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/leds/leds-pca9532.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/leds/leds-pca955x.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/leds/leds-wm831x-status.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/leds/leds-wm8350.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/leds/leds-wrap.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/leds/ledtrig-backlight.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/leds/ledtrig-default-on.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/leds/ledtrig-heartbeat.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/leds/ledtrig-netdev.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/leds/ledtrig-timer.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/lguest
+#lib/modules/KVER-ipfire-pae/kernel/drivers/lguest/lg.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/md
+#lib/modules/KVER-ipfire-pae/kernel/drivers/md/dm-crypt.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/md/dm-delay.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/md/dm-log-userspace.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/md/dm-log.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/md/dm-mirror.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/md/dm-mod.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/md/dm-multipath.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/md/dm-queue-length.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/md/dm-region-hash.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/md/dm-round-robin.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/md/dm-service-time.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/md/dm-snapshot.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/md/dm-zero.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/md/linear.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/md/md-mod.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/md/multipath.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/md/raid0.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/md/raid1.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/md/raid10.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/md/raid456.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/md/raid6_pq.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/media
+#lib/modules/KVER-ipfire-pae/kernel/drivers/media/common
+#lib/modules/KVER-ipfire-pae/kernel/drivers/media/common/tuners
+#lib/modules/KVER-ipfire-pae/kernel/drivers/media/common/tuners/mc44s803.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/media/common/tuners/mt20xx.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/media/common/tuners/tda8290.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/media/common/tuners/tda9887.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/media/common/tuners/tea5761.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/media/common/tuners/tea5767.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/media/common/tuners/tuner-simple.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/media/common/tuners/tuner-types.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/media/common/tuners/tuner-xc2028.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/media/common/tuners/xc5000.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/media/dvb
+#lib/modules/KVER-ipfire-pae/kernel/drivers/media/dvb/dvb-core
+#lib/modules/KVER-ipfire-pae/kernel/drivers/media/dvb/dvb-core/dvb-core.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/media/video
+#lib/modules/KVER-ipfire-pae/kernel/drivers/media/video/v4l1-compat.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/media/video/v4l2-common.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/media/video/v4l2-int-device.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/media/video/videodev.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/memstick
+#lib/modules/KVER-ipfire-pae/kernel/drivers/memstick/core
+#lib/modules/KVER-ipfire-pae/kernel/drivers/memstick/core/memstick.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/memstick/core/mspro_block.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/memstick/host
+#lib/modules/KVER-ipfire-pae/kernel/drivers/memstick/host/jmb38x_ms.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/memstick/host/tifm_ms.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/message
+#lib/modules/KVER-ipfire-pae/kernel/drivers/message/fusion
+#lib/modules/KVER-ipfire-pae/kernel/drivers/message/fusion/mptbase.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/message/fusion/mptctl.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/message/fusion/mptfc.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/message/fusion/mptsas.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/message/fusion/mptscsih.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/message/fusion/mptspi.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/mfd
+#lib/modules/KVER-ipfire-pae/kernel/drivers/mfd/ab3100-core.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/mfd/ab3100-otp.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/mfd/htc-pasic3.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/mfd/mfd-core.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/mfd/pcf50633-adc.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/mfd/pcf50633-core.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/mfd/pcf50633-gpio.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/mfd/sm501.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/mfd/wm831x.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/mfd/wm8350-i2c.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/mfd/wm8350.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/mfd/wm8400-core.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/misc
+#lib/modules/KVER-ipfire-pae/kernel/drivers/misc/c2port
+#lib/modules/KVER-ipfire-pae/kernel/drivers/misc/c2port/c2port-duramar2150.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/misc/c2port/core.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/misc/cb710
+#lib/modules/KVER-ipfire-pae/kernel/drivers/misc/cb710/cb710.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/misc/eeprom
+#lib/modules/KVER-ipfire-pae/kernel/drivers/misc/eeprom/at24.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/misc/eeprom/eeprom.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/misc/eeprom/eeprom_93cx6.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/misc/eeprom/max6875.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/misc/enclosure.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/misc/hpilo.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/misc/ics932s401.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/misc/isl29003.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/misc/tifm_7xx1.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/misc/tifm_core.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/mmc
+#lib/modules/KVER-ipfire-pae/kernel/drivers/mmc/card
+#lib/modules/KVER-ipfire-pae/kernel/drivers/mmc/card/mmc_block.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/mmc/card/mmc_test.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/mmc/card/sdio_uart.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/mmc/core
+#lib/modules/KVER-ipfire-pae/kernel/drivers/mmc/core/mmc_core.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/mmc/host
+#lib/modules/KVER-ipfire-pae/kernel/drivers/mmc/host/cb710-mmc.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/mmc/host/ricoh_mmc.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/mmc/host/sdhci-pci.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/mmc/host/sdhci-pltfm.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/mmc/host/sdhci.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/mmc/host/sdricoh_cs.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/mmc/host/tifm_sd.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/mmc/host/via-sdmmc.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/mmc/host/wbsd.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/mtd
+#lib/modules/KVER-ipfire-pae/kernel/drivers/mtd/ar7part.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/mtd/chips
+#lib/modules/KVER-ipfire-pae/kernel/drivers/mtd/chips/chipreg.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/mtd/lpddr
+#lib/modules/KVER-ipfire-pae/kernel/drivers/mtd/lpddr/lpddr_cmds.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/mtd/lpddr/qinfo_probe.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/mtd/maps
+#lib/modules/KVER-ipfire-pae/kernel/drivers/mtd/maps/physmap.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/mtd/mtd.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/mtd/mtd_blkdevs.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/mtd/mtdblock.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/mtd/mtdchar.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/mtd/mtdconcat.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/mtd/tests
+#lib/modules/KVER-ipfire-pae/kernel/drivers/mtd/tests/mtd_oobtest.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/mtd/tests/mtd_pagetest.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/mtd/tests/mtd_readtest.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/mtd/tests/mtd_speedtest.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/mtd/tests/mtd_stresstest.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/mtd/tests/mtd_subpagetest.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/mtd/tests/mtd_torturetest.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/mtd/ubi
+#lib/modules/KVER-ipfire-pae/kernel/drivers/mtd/ubi/ubi.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/3c501.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/3c503.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/3c505.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/3c507.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/3c509.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/3c515.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/3c523.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/3c527.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/3c59x.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/8139cp.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/8139too.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/82596.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/8390.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/8390p.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/ac3200.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/acenic.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/amd8111e.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/at1700.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/atl1c
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/atl1c/atl1c.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/atl1e
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/atl1e/atl1e.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/atlx
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/atlx/atl1.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/atlx/atl2.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/atp.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/b44.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/benet
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/benet/be2net.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/bnx2.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/bnx2x.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/bonding
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/bonding/bonding.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/bsd_comp.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/cassini.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/chelsio
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/chelsio/cxgb.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/cnic.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/cs89x0.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/cxgb3
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/cxgb3/cxgb3.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/de600.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/de620.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/depca.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/dl2k.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/dnet.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/dummy.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/e100.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/e1000
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/e1000/e1000.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/e1000e
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/e1000e/e1000e.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/e2100.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/eepro.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/eexpress.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/enic
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/enic/enic.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/epic100.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/eql.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/es3210.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/eth16i.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/ethoc.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/ewrk3.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/fealnx.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/forcedeth.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/hamachi.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/hp-plus.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/hp.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/hp100.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/ibmlana.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/ifb.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/igb
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/igb/igb.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/igbvf
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/igbvf/igbvf.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/imq.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/ipg.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/irda
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/irda/ali-ircc.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/irda/donauboe.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/irda/irda-usb.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/irda/irtty-sir.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/irda/kingsun-sir.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/irda/ks959-sir.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/irda/ksdazzle-sir.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/irda/mcs7780.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/irda/nsc-ircc.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/irda/sir-dev.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/irda/smsc-ircc2.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/irda/stir4200.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/irda/via-ircc.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/irda/vlsi_ir.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/irda/w83977af_ir.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/ixgb
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/ixgb/ixgb.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/ixgbe
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/ixgbe/ixgbe.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/jme.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/ks8842.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/ks8851_mll.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/lance.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/lne390.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/lp486e.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/macvlan.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/mdio.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/mii.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/mlx4
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/mlx4/mlx4_core.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/mlx4/mlx4_en.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/myri10ge
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/myri10ge/myri10ge.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/natsemi.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/ne.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/ne2.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/ne2k-pci.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/ne3210.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/netxen
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/netxen/netxen_nic.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/ni52.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/ni65.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/niu.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/ns83820.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/pcmcia
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/pcmcia/3c574_cs.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/pcmcia/3c589_cs.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/pcmcia/axnet_cs.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/pcmcia/fmvj18x_cs.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/pcmcia/nmclan_cs.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/pcmcia/pcnet_cs.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/pcmcia/smc91c92_cs.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/pcmcia/xirc2ps_cs.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/pcnet32.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/phy
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/phy/broadcom.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/phy/cicada.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/phy/davicom.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/phy/et1011c.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/phy/icplus.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/phy/lxt.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/phy/marvell.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/phy/mdio-bitbang.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/phy/national.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/phy/qsemi.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/phy/realtek.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/phy/smsc.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/phy/ste10Xp.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/phy/vitesse.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/ppp_async.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/ppp_deflate.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/ppp_generic.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/ppp_mppe.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/ppp_synctty.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/pppoe.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/pppol2tp.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/pppox.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/qla3xxx.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/qlge
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/qlge/qlge.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/r6040.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/r8169.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/s2io.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/sb1000.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/sc92031.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/seeq8005.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/sfc
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/sfc/sfc.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/sis190.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/sis900.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/skge.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/sky2.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/slhc.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/slip.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/smc-mca.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/smc-ultra.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/smc-ultra32.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/smc9194.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/smsc9420.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/starfire.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/sundance.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/sungem.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/sungem_phy.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/sunhme.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/tehuti.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/tg3.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/tlan.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/tulip
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/tulip/de2104x.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/tulip/de4x5.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/tulip/dmfe.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/tulip/tulip.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/tulip/uli526x.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/tulip/winbond-840.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/tulip/xircom_cb.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/tun.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/typhoon.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/asix.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/catc.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/cdc-phonet.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/cdc_eem.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/cdc_ether.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/cdc_subset.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/dm9601.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/gl620a.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/hso.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/int51x1.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/kaweth.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/mcs7830.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/net1080.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/pegasus.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/plusb.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/rndis_host.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/rtl8150.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/smsc95xx.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/usbnet.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/zaurus.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/veth.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/via-rhine.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/via-velocity.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/virtio_net.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/vmxnet3
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/vmxnet3/vmxnet3.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/vxge
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/vxge/vxge.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wan
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wan/c101.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wan/cosa.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wan/dlci.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wan/dscc4.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wan/farsync.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wan/hdlc.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wan/hdlc_cisco.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wan/hdlc_fr.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wan/hdlc_ppp.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wan/hdlc_raw.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wan/hdlc_raw_eth.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wan/hostess_sv11.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wan/lmc
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wan/lmc/lmc.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wan/n2.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wan/pc300too.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wan/pci200syn.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wan/sbni.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wan/sdla.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wan/sealevel.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wan/wanxl.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wan/z85230.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wd.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wimax
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wimax/i2400m
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wimax/i2400m/i2400m-sdio.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wimax/i2400m/i2400m-usb.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wimax/i2400m/i2400m.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/adm8211.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/airo.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/airo_cs.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/at76c50x-usb.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/ath
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/ath/ar9170
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/ath/ar9170/ar9170usb.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/ath/ath.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/ath/ath5k
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/ath/ath5k/ath5k.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/ath/ath9k
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/ath/ath9k/ath9k.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/atmel.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/atmel_cs.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/atmel_pci.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/b43
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/b43/b43.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/b43legacy
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/b43legacy/b43legacy.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/hostap
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/hostap/hostap.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/hostap/hostap_cs.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/hostap/hostap_pci.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/hostap/hostap_plx.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/ipw2x00
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/ipw2x00/ipw2100.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/ipw2x00/ipw2200.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/ipw2x00/libipw.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/iwlwifi
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/iwlwifi/iwl3945.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/iwlwifi/iwlagn.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/iwlwifi/iwlcore.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/iwmc3200wifi
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/iwmc3200wifi/iwmc3200wifi.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/libertas
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/libertas/libertas.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/libertas/libertas_cs.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/libertas/libertas_sdio.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/libertas/usb8xxx.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/libertas_tf
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/libertas_tf/libertas_tf.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/libertas_tf/libertas_tf_usb.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/mwl8k.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/orinoco
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/orinoco/orinoco.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/orinoco/orinoco_cs.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/orinoco/orinoco_nortel.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/orinoco/orinoco_pci.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/orinoco/orinoco_plx.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/orinoco/orinoco_tmd.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/orinoco/spectrum_cs.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/p54
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/p54/p54common.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/p54/p54pci.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/p54/p54usb.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/prism54
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/prism54/prism54.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/ray_cs.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/rndis_wlan.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/rt2x00
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2400pci.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2500pci.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2500usb.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2800usb.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2x00lib.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2x00pci.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2x00usb.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt61pci.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt73usb.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/rtl818x
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/rtl818x/rtl8180.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/rtl818x/rtl8187.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/wl12xx
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/wl12xx/wl1251.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/wl12xx/wl1251_sdio.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/wl3501_cs.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/zd1201.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/zd1211rw
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/zd1211rw/zd1211rw.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/xen-netfront.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/yellowfin.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/net/znet.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/parport
+#lib/modules/KVER-ipfire-pae/kernel/drivers/parport/parport.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/parport/parport_ax88796.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/parport/parport_cs.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/parport/parport_pc.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/parport/parport_serial.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/pci
+#lib/modules/KVER-ipfire-pae/kernel/drivers/pci/pci-stub.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/pcmcia
+#lib/modules/KVER-ipfire-pae/kernel/drivers/pcmcia/i82092.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/pcmcia/i82365.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/pcmcia/pcmcia.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/pcmcia/pcmcia_core.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/pcmcia/pd6729.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/pcmcia/rsrc_nonstatic.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/pcmcia/tcic.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/pcmcia/yenta_socket.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/platform
+#lib/modules/KVER-ipfire-pae/kernel/drivers/platform/x86
+#lib/modules/KVER-ipfire-pae/kernel/drivers/platform/x86/acer-wmi.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/platform/x86/asus-laptop.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/platform/x86/asus_acpi.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/platform/x86/compal-laptop.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/platform/x86/dell-wmi.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/platform/x86/fujitsu-laptop.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/platform/x86/hp-wmi.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/platform/x86/intel_menlow.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/platform/x86/msi-laptop.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/platform/x86/panasonic-laptop.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/platform/x86/sony-laptop.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/platform/x86/tc1100-wmi.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/platform/x86/thinkpad_acpi.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/platform/x86/topstar-laptop.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/platform/x86/toshiba_acpi.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/platform/x86/wmi.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/power
+#lib/modules/KVER-ipfire-pae/kernel/drivers/power/bq27x00_battery.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/power/ds2782_battery.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/power/max17040_battery.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/power/pcf50633-charger.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/power/wm831x_power.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/power/wm8350_power.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/pps
+#lib/modules/KVER-ipfire-pae/kernel/drivers/pps/pps_core.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-ab3100.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-bq4802.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-cmos.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-core.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-ds1286.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-ds1307.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-ds1374.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-ds1511.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-ds1553.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-ds1672.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-ds1742.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-fm3130.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-isl1208.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-lib.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-m41t80.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-m48t35.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-m48t59.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-m48t86.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-max6900.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-pcf50633.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-pcf8563.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-pcf8583.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-rs5c372.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-rx8025.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-rx8581.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-s35390a.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-stk17ta8.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-test.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-v3020.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-wm831x.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-wm8350.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-x1205.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/3w-9xxx.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/3w-xxxx.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/53c700.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/BusLogic.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/NCR53c406a.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/NCR_D700.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/NCR_Q720_mod.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/a100u2w.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/aacraid
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/aacraid/aacraid.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/advansys.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/aha152x.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/aha1542.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/aha1740.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/aic7xxx
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/aic7xxx/aic79xx.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/aic7xxx/aic7xxx.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/aic94xx
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/aic94xx/aic94xx.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/arcmsr
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/arcmsr/arcmsr.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/atp870u.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/be2iscsi
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/be2iscsi/be2iscsi.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/bfa
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/bfa/bfa.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/bnx2i
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/bnx2i/bnx2i.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/ch.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/cxgb3i
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/cxgb3i/cxgb3i.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/dc395x.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/device_handler
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/device_handler/scsi_dh.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/device_handler/scsi_dh_alua.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/device_handler/scsi_dh_emc.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/device_handler/scsi_dh_hp_sw.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/device_handler/scsi_dh_rdac.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/dmx3191d.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/dpt_i2o.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/dtc.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/eata.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/fcoe
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/fcoe/fcoe.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/fcoe/libfcoe.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/fd_mcs.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/fdomain.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/fnic
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/fnic/fnic.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/g_NCR5380.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/g_NCR5380_mmio.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/gdth.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/hptiop.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/ibmmca.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/imm.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/in2000.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/initio.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/ipr.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/ips.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/iscsi_tcp.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/libfc
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/libfc/libfc.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/libiscsi.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/libiscsi_tcp.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/libsas
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/libsas/libsas.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/lpfc
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/lpfc/lpfc.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/megaraid
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/megaraid.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/megaraid/megaraid_mbox.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/megaraid/megaraid_mm.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/megaraid/megaraid_sas.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/mpt2sas
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/mpt2sas/mpt2sas.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/mvsas
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/mvsas/mvsas.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/nsp32.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/osd
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/osd/libosd.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/osd/osd.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/pas16.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/pcmcia
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/pcmcia/aha152x_cs.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/pcmcia/fdomain_cs.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/pcmcia/nsp_cs.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/pcmcia/qlogic_cs.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/pcmcia/sym53c500_cs.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/pmcraid.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/ppa.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/qla1280.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/qla2xxx
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/qla2xxx/qla2xxx.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/qla4xxx
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/qla4xxx/qla4xxx.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/qlogicfas.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/qlogicfas408.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/scsi_mod.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/scsi_transport_fc.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/scsi_transport_iscsi.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/scsi_transport_sas.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/scsi_transport_spi.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/scsi_transport_srp.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/scsi_wait_scan.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/sd_mod.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/ses.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/sg.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/sim710.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/sr_mod.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/stex.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/sym53c416.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/sym53c8xx_2
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/sym53c8xx_2/sym53c8xx.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/t128.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/tmscsim.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/u14-34f.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/ultrastor.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/wd7000.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/serial
+#lib/modules/KVER-ipfire-pae/kernel/drivers/serial/8250_accent.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/serial/8250_boca.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/serial/8250_exar_st16c554.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/serial/8250_fourport.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/serial/8250_hub6.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/serial/serial_cs.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ssb
+#lib/modules/KVER-ipfire-pae/kernel/drivers/ssb/ssb.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/staging
+#lib/modules/KVER-ipfire-pae/kernel/drivers/staging/et131x
+#lib/modules/KVER-ipfire-pae/kernel/drivers/staging/et131x/et131x.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/staging/hv
+#lib/modules/KVER-ipfire-pae/kernel/drivers/staging/hv/hv_blkvsc.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/staging/hv/hv_netvsc.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/staging/hv/hv_storvsc.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/staging/hv/hv_vmbus.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/staging/phison
+#lib/modules/KVER-ipfire-pae/kernel/drivers/staging/phison/phison.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/staging/slicoss
+#lib/modules/KVER-ipfire-pae/kernel/drivers/staging/slicoss/slicoss.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/uio
+#lib/modules/KVER-ipfire-pae/kernel/drivers/uio/uio.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/uio/uio_aec.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/uio/uio_cif.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/uio/uio_pci_generic.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/uio/uio_pdrv.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/uio/uio_pdrv_genirq.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/uio/uio_sercos3.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/uio/uio_smx.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/atm
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/atm/cxacru.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/atm/speedtch.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/atm/ueagle-atm.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/atm/usbatm.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/atm/xusbatm.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/class
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/class/cdc-acm.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/class/cdc-wdm.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/class/usblp.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/class/usbtmc.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/core
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/core/usbcore.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/host
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/host/ehci-hcd.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/host/hwa-hc.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/host/isp116x-hcd.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/host/isp1362-hcd.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/host/ohci-hcd.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/host/oxu210hp-hcd.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/host/r8a66597-hcd.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/host/sl811-hcd.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/host/u132-hcd.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/host/uhci-hcd.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/host/whci
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/host/whci/whci-hcd.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/host/xhci.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/misc
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/misc/berry_charge.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/misc/cypress_cy7c63.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/misc/cytherm.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/misc/emi26.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/misc/emi62.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/misc/ftdi-elan.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/misc/iowarrior.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/misc/isight_firmware.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/misc/sisusbvga
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/misc/sisusbvga/sisusbvga.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/misc/usblcd.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/misc/usbled.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/misc/usbsevseg.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/misc/uss720.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/misc/vstusb.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/otg
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/otg/nop-usb-xceiv.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/serial
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/serial/aircable.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/serial/ark3116.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/serial/belkin_sa.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/serial/ch341.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/serial/cp210x.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/serial/cypress_m8.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/serial/digi_acceleport.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/serial/empeg.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/serial/ftdi_sio.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/serial/garmin_gps.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/serial/hp4x.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/serial/io_edgeport.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/serial/ipw.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/serial/iuu_phoenix.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/serial/keyspan_pda.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/serial/mct_u232.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/serial/mos7720.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/serial/mos7840.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/serial/moto_modem.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/serial/opticon.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/serial/option.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/serial/oti6858.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/serial/pl2303.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/serial/qcserial.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/serial/safe_serial.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/serial/siemens_mpi.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/serial/sierra.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/serial/spcp8x5.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/serial/symbolserial.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/serial/ti_usb_3410_5052.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/serial/usbserial.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/serial/whiteheat.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/storage
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/storage/ums-alauda.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/storage/ums-cypress.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/storage/ums-freecom.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/storage/ums-isd200.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/storage/ums-jumpshot.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/storage/ums-karma.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/storage/ums-onetouch.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/storage/ums-sddr09.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/storage/ums-sddr55.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/storage/ums-usbat.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/storage/usb-storage.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/wusbcore
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/wusbcore/wusb-cbaf.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/wusbcore/wusb-wa.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/usb/wusbcore/wusbcore.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/uwb
+#lib/modules/KVER-ipfire-pae/kernel/drivers/uwb/hwa-rc.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/uwb/i1480
+#lib/modules/KVER-ipfire-pae/kernel/drivers/uwb/i1480/dfu
+#lib/modules/KVER-ipfire-pae/kernel/drivers/uwb/i1480/dfu/i1480-dfu-usb.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/uwb/i1480/i1480-est.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/uwb/i1480/i1480u-wlp
+#lib/modules/KVER-ipfire-pae/kernel/drivers/uwb/i1480/i1480u-wlp/i1480u-wlp.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/uwb/umc.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/uwb/uwb.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/uwb/whc-rc.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/uwb/whci.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/uwb/wlp
+#lib/modules/KVER-ipfire-pae/kernel/drivers/uwb/wlp/wlp.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/arkfb.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/aty
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/aty/aty128fb.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/aty/atyfb.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/aty/radeonfb.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/backlight
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/backlight/cr_bllcd.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/backlight/generic_bl.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/backlight/kb3886_bl.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/backlight/lcd.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/backlight/mbp_nvidia_bl.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/backlight/platform_lcd.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/backlight/progear_bl.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/backlight/wm831x_bl.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/cirrusfb.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/cyber2000fb.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/display
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/display/display.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/fb_ddc.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/fb_sys_fops.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/geode
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/geode/gx1fb.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/geode/gxfb.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/geode/lxfb.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/i810
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/i810/i810fb.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/kyro
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/kyro/kyrofb.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/macmodes.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/matrox
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/matrox/g450_pll.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/matrox/i2c-matroxfb.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/matrox/matroxfb_DAC1064.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/matrox/matroxfb_Ti3026.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/matrox/matroxfb_accel.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/matrox/matroxfb_base.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/matrox/matroxfb_crtc2.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/matrox/matroxfb_g450.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/matrox/matroxfb_maven.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/matrox/matroxfb_misc.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/metronomefb.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/neofb.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/nvidia
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/nvidia/nvidiafb.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/output.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/pm2fb.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/pm3fb.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/riva
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/riva/rivafb.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/s3fb.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/savage
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/savage/savagefb.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/sis
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/sis/sisfb.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/sm501fb.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/sstfb.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/svgalib.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/syscopyarea.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/sysfillrect.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/sysimgblt.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/tdfxfb.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/tmiofb.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/tridentfb.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/uvesafb.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/vermilion
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/vermilion/crvml.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/vermilion/vmlfb.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/vgastate.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/via
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/via/viafb.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/vt8623fb.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/video/xen-fbfront.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/virtio
+#lib/modules/KVER-ipfire-pae/kernel/drivers/virtio/virtio_balloon.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/virtio/virtio_pci.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/w1
+#lib/modules/KVER-ipfire-pae/kernel/drivers/w1/masters
+#lib/modules/KVER-ipfire-pae/kernel/drivers/w1/masters/ds2482.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/w1/masters/ds2490.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/w1/masters/matrox_w1.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/w1/slaves
+#lib/modules/KVER-ipfire-pae/kernel/drivers/w1/slaves/w1_bq27000.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/w1/slaves/w1_ds2431.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/w1/slaves/w1_ds2433.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/w1/slaves/w1_ds2760.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/w1/slaves/w1_smem.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/w1/slaves/w1_therm.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/w1/wire.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog
+#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/acquirewdt.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/advantechwdt.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/alim1535_wdt.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/alim7101_wdt.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/cpu5wdt.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/eurotechwdt.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/hpwdt.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/i6300esb.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/iTCO_wdt.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/ib700wdt.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/ibmasr.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/it8712f_wdt.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/it87_wdt.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/machzwd.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/pc87413_wdt.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/pcwd_pci.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/pcwd_usb.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/sbc60xxwdt.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/sbc7240_wdt.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/sbc8360.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/sbc_epx_c3.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/sbc_fitpc2_wdt.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/sc1200wdt.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/sc520_wdt.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/sch311x_wdt.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/scx200_wdt.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/smsc37b787_wdt.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/softdog.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/w83627hf_wdt.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/w83697hf_wdt.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/w83697ug_wdt.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/w83877f_wdt.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/w83977f_wdt.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/wafer5823wdt.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/wdt_pci.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/wm831x_wdt.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/wm8350_wdt.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/xen
+#lib/modules/KVER-ipfire-pae/kernel/drivers/xen/evtchn.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/xen/xenfs
+#lib/modules/KVER-ipfire-pae/kernel/drivers/xen/xenfs/xenfs.ko
+#lib/modules/KVER-ipfire-pae/kernel/fs
+#lib/modules/KVER-ipfire-pae/kernel/fs/autofs
+#lib/modules/KVER-ipfire-pae/kernel/fs/autofs/autofs.ko
+#lib/modules/KVER-ipfire-pae/kernel/fs/autofs4
+#lib/modules/KVER-ipfire-pae/kernel/fs/autofs4/autofs4.ko
+#lib/modules/KVER-ipfire-pae/kernel/fs/cachefiles
+#lib/modules/KVER-ipfire-pae/kernel/fs/cachefiles/cachefiles.ko
+#lib/modules/KVER-ipfire-pae/kernel/fs/cifs
+#lib/modules/KVER-ipfire-pae/kernel/fs/cifs/cifs.ko
+#lib/modules/KVER-ipfire-pae/kernel/fs/ecryptfs
+#lib/modules/KVER-ipfire-pae/kernel/fs/ecryptfs/ecryptfs.ko
+#lib/modules/KVER-ipfire-pae/kernel/fs/exportfs
+#lib/modules/KVER-ipfire-pae/kernel/fs/exportfs/exportfs.ko
+#lib/modules/KVER-ipfire-pae/kernel/fs/ext2
+#lib/modules/KVER-ipfire-pae/kernel/fs/ext2/ext2.ko
+#lib/modules/KVER-ipfire-pae/kernel/fs/ext3
+#lib/modules/KVER-ipfire-pae/kernel/fs/ext3/ext3.ko
+#lib/modules/KVER-ipfire-pae/kernel/fs/ext4
+#lib/modules/KVER-ipfire-pae/kernel/fs/ext4/ext4.ko
+#lib/modules/KVER-ipfire-pae/kernel/fs/fat
+#lib/modules/KVER-ipfire-pae/kernel/fs/fat/fat.ko
+#lib/modules/KVER-ipfire-pae/kernel/fs/fat/vfat.ko
+#lib/modules/KVER-ipfire-pae/kernel/fs/fscache
+#lib/modules/KVER-ipfire-pae/kernel/fs/fscache/fscache.ko
+#lib/modules/KVER-ipfire-pae/kernel/fs/fuse
+#lib/modules/KVER-ipfire-pae/kernel/fs/fuse/cuse.ko
+#lib/modules/KVER-ipfire-pae/kernel/fs/fuse/fuse.ko
+#lib/modules/KVER-ipfire-pae/kernel/fs/isofs
+#lib/modules/KVER-ipfire-pae/kernel/fs/isofs/isofs.ko
+#lib/modules/KVER-ipfire-pae/kernel/fs/jbd
+#lib/modules/KVER-ipfire-pae/kernel/fs/jbd/jbd.ko
+#lib/modules/KVER-ipfire-pae/kernel/fs/jbd2
+#lib/modules/KVER-ipfire-pae/kernel/fs/jbd2/jbd2.ko
+#lib/modules/KVER-ipfire-pae/kernel/fs/jffs2
+#lib/modules/KVER-ipfire-pae/kernel/fs/jffs2/jffs2.ko
+#lib/modules/KVER-ipfire-pae/kernel/fs/jfs
+#lib/modules/KVER-ipfire-pae/kernel/fs/jfs/jfs.ko
+#lib/modules/KVER-ipfire-pae/kernel/fs/lockd
+#lib/modules/KVER-ipfire-pae/kernel/fs/lockd/lockd.ko
+#lib/modules/KVER-ipfire-pae/kernel/fs/mbcache.ko
+#lib/modules/KVER-ipfire-pae/kernel/fs/nfs
+#lib/modules/KVER-ipfire-pae/kernel/fs/nfs/nfs.ko
+#lib/modules/KVER-ipfire-pae/kernel/fs/nfs_common
+#lib/modules/KVER-ipfire-pae/kernel/fs/nfs_common/nfs_acl.ko
+#lib/modules/KVER-ipfire-pae/kernel/fs/nfsd
+#lib/modules/KVER-ipfire-pae/kernel/fs/nfsd/nfsd.ko
+#lib/modules/KVER-ipfire-pae/kernel/fs/quota
+#lib/modules/KVER-ipfire-pae/kernel/fs/quota/quota_tree.ko
+#lib/modules/KVER-ipfire-pae/kernel/fs/quota/quota_v1.ko
+#lib/modules/KVER-ipfire-pae/kernel/fs/quota/quota_v2.ko
+#lib/modules/KVER-ipfire-pae/kernel/fs/reiser4
+#lib/modules/KVER-ipfire-pae/kernel/fs/reiser4/reiser4.ko
+#lib/modules/KVER-ipfire-pae/kernel/fs/reiserfs
+#lib/modules/KVER-ipfire-pae/kernel/fs/reiserfs/reiserfs.ko
+#lib/modules/KVER-ipfire-pae/kernel/fs/smbfs
+#lib/modules/KVER-ipfire-pae/kernel/fs/smbfs/smbfs.ko
+#lib/modules/KVER-ipfire-pae/kernel/fs/udf
+#lib/modules/KVER-ipfire-pae/kernel/fs/udf/udf.ko
+#lib/modules/KVER-ipfire-pae/kernel/fs/xfs
+#lib/modules/KVER-ipfire-pae/kernel/fs/xfs/xfs.ko
+#lib/modules/KVER-ipfire-pae/kernel/lib
+#lib/modules/KVER-ipfire-pae/kernel/lib/crc-ccitt.ko
+#lib/modules/KVER-ipfire-pae/kernel/lib/crc-itu-t.ko
+#lib/modules/KVER-ipfire-pae/kernel/lib/crc-t10dif.ko
+#lib/modules/KVER-ipfire-pae/kernel/lib/crc16.ko
+#lib/modules/KVER-ipfire-pae/kernel/lib/crc7.ko
+#lib/modules/KVER-ipfire-pae/kernel/lib/libcrc32c.ko
+#lib/modules/KVER-ipfire-pae/kernel/lib/lzo
+#lib/modules/KVER-ipfire-pae/kernel/lib/lzo/lzo_compress.ko
+#lib/modules/KVER-ipfire-pae/kernel/lib/lzo/lzo_decompress.ko
+#lib/modules/KVER-ipfire-pae/kernel/lib/ts_bm.ko
+#lib/modules/KVER-ipfire-pae/kernel/lib/ts_fsm.ko
+#lib/modules/KVER-ipfire-pae/kernel/lib/ts_kmp.ko
+#lib/modules/KVER-ipfire-pae/kernel/net
+#lib/modules/KVER-ipfire-pae/kernel/net/802
+#lib/modules/KVER-ipfire-pae/kernel/net/802/garp.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/802/p8022.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/802/psnap.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/802/stp.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/8021q
+#lib/modules/KVER-ipfire-pae/kernel/net/8021q/8021q.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/atm
+#lib/modules/KVER-ipfire-pae/kernel/net/atm/atm.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/atm/br2684.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/atm/clip.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/atm/pppoatm.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/bluetooth
+#lib/modules/KVER-ipfire-pae/kernel/net/bluetooth/bluetooth.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/bluetooth/bnep
+#lib/modules/KVER-ipfire-pae/kernel/net/bluetooth/bnep/bnep.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/bluetooth/cmtp
+#lib/modules/KVER-ipfire-pae/kernel/net/bluetooth/cmtp/cmtp.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/bluetooth/hidp
+#lib/modules/KVER-ipfire-pae/kernel/net/bluetooth/hidp/hidp.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/bluetooth/l2cap.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/bluetooth/rfcomm
+#lib/modules/KVER-ipfire-pae/kernel/net/bluetooth/rfcomm/rfcomm.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/bluetooth/sco.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/bridge
+#lib/modules/KVER-ipfire-pae/kernel/net/bridge/bridge.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/bridge/netfilter
+#lib/modules/KVER-ipfire-pae/kernel/net/bridge/netfilter/ebt_802_3.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/bridge/netfilter/ebt_among.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/bridge/netfilter/ebt_arp.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/bridge/netfilter/ebt_arpreply.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/bridge/netfilter/ebt_dnat.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/bridge/netfilter/ebt_ip.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/bridge/netfilter/ebt_limit.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/bridge/netfilter/ebt_log.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/bridge/netfilter/ebt_mark.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/bridge/netfilter/ebt_mark_m.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/bridge/netfilter/ebt_nflog.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/bridge/netfilter/ebt_pkttype.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/bridge/netfilter/ebt_redirect.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/bridge/netfilter/ebt_snat.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/bridge/netfilter/ebt_stp.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/bridge/netfilter/ebt_ulog.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/bridge/netfilter/ebt_vlan.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/bridge/netfilter/ebtable_broute.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/bridge/netfilter/ebtable_filter.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/bridge/netfilter/ebtable_nat.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/bridge/netfilter/ebtables.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ieee802154
+#lib/modules/KVER-ipfire-pae/kernel/net/ieee802154/af_802154.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ieee802154/nl802154.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ieee802154/wpan-class.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv4
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/ah4.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/esp4.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/inet_diag.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/ip_gre.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/ipcomp.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/ipip.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/netfilter
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/netfilter/arp_tables.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/netfilter/arpt_mangle.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/netfilter/arptable_filter.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/netfilter/ip_queue.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/netfilter/ip_tables.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/netfilter/ipt_CLUSTERIP.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/netfilter/ipt_ECN.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/netfilter/ipt_LOG.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/netfilter/ipt_MASQUERADE.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/netfilter/ipt_NETMAP.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/netfilter/ipt_REDIRECT.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/netfilter/ipt_REJECT.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/netfilter/ipt_ULOG.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/netfilter/ipt_addrtype.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/netfilter/ipt_ah.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/netfilter/ipt_ecn.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/netfilter/ipt_ipp2p.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/netfilter/iptable_filter.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/netfilter/iptable_mangle.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/netfilter/iptable_nat.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/netfilter/iptable_raw.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/netfilter/nf_conntrack_ipv4.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/netfilter/nf_defrag_ipv4.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/netfilter/nf_nat.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/netfilter/nf_nat_amanda.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/netfilter/nf_nat_ftp.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/netfilter/nf_nat_h323.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/netfilter/nf_nat_irc.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/netfilter/nf_nat_pptp.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/netfilter/nf_nat_proto_dccp.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/netfilter/nf_nat_proto_gre.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/netfilter/nf_nat_proto_sctp.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/netfilter/nf_nat_proto_udplite.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/netfilter/nf_nat_sip.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/netfilter/nf_nat_snmp_basic.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/netfilter/nf_nat_tftp.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/tcp_bic.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/tcp_cubic.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/tcp_diag.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/tcp_highspeed.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/tcp_htcp.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/tcp_hybla.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/tcp_illinois.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/tcp_lp.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/tcp_scalable.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/tcp_vegas.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/tcp_veno.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/tcp_westwood.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/tcp_yeah.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/tunnel4.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/ipv4/xfrm4_tunnel.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/irda
+#lib/modules/KVER-ipfire-pae/kernel/net/irda/ircomm
+#lib/modules/KVER-ipfire-pae/kernel/net/irda/ircomm/ircomm-tty.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/irda/ircomm/ircomm.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/irda/irda.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/irda/irlan
+#lib/modules/KVER-ipfire-pae/kernel/net/irda/irlan/irlan.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/irda/irnet
+#lib/modules/KVER-ipfire-pae/kernel/net/irda/irnet/irnet.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/key
+#lib/modules/KVER-ipfire-pae/kernel/net/key/af_key.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/llc
+#lib/modules/KVER-ipfire-pae/kernel/net/llc/llc.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/mac80211
+#lib/modules/KVER-ipfire-pae/kernel/net/mac80211/mac80211.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/nf_conntrack.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/nf_conntrack_amanda.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/nf_conntrack_ftp.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/nf_conntrack_h323.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/nf_conntrack_irc.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/nf_conntrack_netbios_ns.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/nf_conntrack_netlink.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/nf_conntrack_pptp.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/nf_conntrack_proto_dccp.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/nf_conntrack_proto_gre.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/nf_conntrack_proto_sctp.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/nf_conntrack_proto_udplite.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/nf_conntrack_sane.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/nf_conntrack_sip.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/nf_conntrack_tftp.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/nf_tproxy_core.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/nfnetlink.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/nfnetlink_log.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/nfnetlink_queue.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/x_tables.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/xt_CLASSIFY.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/xt_CONNMARK.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/xt_DSCP.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/xt_HL.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/xt_IMQ.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/xt_LED.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/xt_MARK.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/xt_NFLOG.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/xt_NFQUEUE.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/xt_NOTRACK.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/xt_RATEEST.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/xt_TCPMSS.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/xt_TCPOPTSTRIP.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/xt_TPROXY.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/xt_TRACE.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/xt_cluster.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/xt_comment.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/xt_connbytes.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/xt_connlimit.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/xt_connmark.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/xt_conntrack.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/xt_dccp.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/xt_dscp.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/xt_esp.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/xt_hashlimit.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/xt_helper.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/xt_hl.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/xt_iprange.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/xt_layer7.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/xt_length.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/xt_limit.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/xt_mac.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/xt_mark.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/xt_multiport.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/xt_osf.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/xt_owner.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/xt_physdev.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/xt_pkttype.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/xt_policy.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/xt_quota.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/xt_rateest.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/xt_realm.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/xt_recent.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/xt_sctp.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/xt_socket.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/xt_state.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/xt_statistic.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/xt_string.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/xt_tcpmss.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/xt_tcpudp.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/xt_time.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/netfilter/xt_u32.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/phonet
+#lib/modules/KVER-ipfire-pae/kernel/net/phonet/phonet.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/phonet/pn_pep.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/rds
+#lib/modules/KVER-ipfire-pae/kernel/net/rds/rds.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/rds/rds_tcp.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/rfkill
+#lib/modules/KVER-ipfire-pae/kernel/net/rfkill/rfkill.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/rxrpc
+#lib/modules/KVER-ipfire-pae/kernel/net/rxrpc/af-rxrpc.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/rxrpc/rxkad.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/sched
+#lib/modules/KVER-ipfire-pae/kernel/net/sched/act_gact.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/sched/act_ipt.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/sched/act_mirred.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/sched/act_nat.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/sched/act_pedit.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/sched/act_police.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/sched/act_skbedit.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/sched/cls_basic.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/sched/cls_flow.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/sched/cls_fw.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/sched/cls_route.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/sched/cls_rsvp.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/sched/cls_tcindex.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/sched/cls_u32.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/sched/em_cmp.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/sched/em_meta.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/sched/em_nbyte.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/sched/em_text.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/sched/em_u32.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/sched/sch_atm.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/sched/sch_cbq.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/sched/sch_drr.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/sched/sch_dsmark.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/sched/sch_gred.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/sched/sch_hfsc.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/sched/sch_htb.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/sched/sch_ingress.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/sched/sch_multiq.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/sched/sch_netem.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/sched/sch_prio.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/sched/sch_red.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/sched/sch_sfq.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/sched/sch_tbf.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/sched/sch_teql.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/sunrpc
+#lib/modules/KVER-ipfire-pae/kernel/net/sunrpc/auth_gss
+#lib/modules/KVER-ipfire-pae/kernel/net/sunrpc/auth_gss/auth_rpcgss.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/sunrpc/auth_gss/rpcsec_gss_krb5.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/sunrpc/sunrpc.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/wimax
+#lib/modules/KVER-ipfire-pae/kernel/net/wimax/wimax.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/wireless
+#lib/modules/KVER-ipfire-pae/kernel/net/wireless/cfg80211.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/wireless/lib80211.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/wireless/lib80211_crypt_ccmp.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/wireless/lib80211_crypt_tkip.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/wireless/lib80211_crypt_wep.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/xfrm
+#lib/modules/KVER-ipfire-pae/kernel/net/xfrm/xfrm_ipcomp.ko
+#lib/modules/KVER-ipfire-pae/kernel/net/xfrm/xfrm_user.ko
+#lib/modules/KVER-ipfire-pae/kernel/sound
+#lib/modules/KVER-ipfire-pae/kernel/sound/core
+#lib/modules/KVER-ipfire-pae/kernel/sound/core/oss
+#lib/modules/KVER-ipfire-pae/kernel/sound/core/oss/snd-mixer-oss.ko
+#lib/modules/KVER-ipfire-pae/kernel/sound/core/oss/snd-pcm-oss.ko
+#lib/modules/KVER-ipfire-pae/kernel/sound/core/seq
+#lib/modules/KVER-ipfire-pae/kernel/sound/core/seq/oss
+#lib/modules/KVER-ipfire-pae/kernel/sound/core/seq/oss/snd-seq-oss.ko
+#lib/modules/KVER-ipfire-pae/kernel/sound/core/seq/snd-seq-device.ko
+#lib/modules/KVER-ipfire-pae/kernel/sound/core/seq/snd-seq-dummy.ko
+#lib/modules/KVER-ipfire-pae/kernel/sound/core/seq/snd-seq-midi-event.ko
+#lib/modules/KVER-ipfire-pae/kernel/sound/core/seq/snd-seq.ko
+#lib/modules/KVER-ipfire-pae/kernel/sound/core/snd-page-alloc.ko
+#lib/modules/KVER-ipfire-pae/kernel/sound/core/snd-pcm.ko
+#lib/modules/KVER-ipfire-pae/kernel/sound/core/snd-timer.ko
+#lib/modules/KVER-ipfire-pae/kernel/sound/core/snd.ko
+#lib/modules/KVER-ipfire-pae/kernel/sound/drivers
+#lib/modules/KVER-ipfire-pae/kernel/sound/drivers/snd-dummy.ko
+#lib/modules/KVER-ipfire-pae/kernel/sound/soundcore.ko
+#lib/modules/KVER-ipfire-pae/modules.alias
+#lib/modules/KVER-ipfire-pae/modules.alias.bin
+#lib/modules/KVER-ipfire-pae/modules.ccwmap
+#lib/modules/KVER-ipfire-pae/modules.dep
+#lib/modules/KVER-ipfire-pae/modules.dep.bin
+#lib/modules/KVER-ipfire-pae/modules.ieee1394map
+#lib/modules/KVER-ipfire-pae/modules.inputmap
+#lib/modules/KVER-ipfire-pae/modules.isapnpmap
+#lib/modules/KVER-ipfire-pae/modules.ofmap
+#lib/modules/KVER-ipfire-pae/modules.order
+#lib/modules/KVER-ipfire-pae/modules.pcimap
+#lib/modules/KVER-ipfire-pae/modules.seriomap
+#lib/modules/KVER-ipfire-pae/modules.symbols
+#lib/modules/KVER-ipfire-pae/modules.symbols.bin
+#lib/modules/KVER-ipfire-pae/modules.usbmap
+#lib/modules/KVER-ipfire-pae/source
diff --git a/doc/packages-list.txt b/doc/packages-list.txt
deleted file mode 100644
index 7894e3d..0000000
--- a/doc/packages-list.txt
+++ /dev/null
@@ -1,370 +0,0 @@
-== List of softwares used to build IPFire Version: 2.8test ==
-* Archive-Tar-1.29
-* Archive-Zip-1.16
-* BerkeleyDB-0.27
-* ClientForm-0.2.9
-* Compress-Zlib-1.35
-* Convert-TNEF-0.17
-* Convert-UUlib-1.06
-* DBD-mysql-4.010
-* DBI-1.607
-* DFB++-1.0.0
-* Digest-1.08
-* Digest-HMAC-1.01
-* Digest-SHA1-2.10
-* DirectFB-1.1.1
-* GD-2.35
-* GDGraph-1.4308
-* GDTextUtil-0.86
-* Geo-IP-PurePerl-1.17
-* HTML-Parser-3.45
-* HTML-Tagset-3.04
-* IO-stringy-2.110
-* Linux-PAM-0.99.4.0
-* Locale-Codes-2.07
-* MIME-tools-5.420
-* Mail-SpamAssassin-3.1.3
-* MailTools-1.74
-* Net-DNS-0.47
-* Net-IPv4Addr-0.10
-* Net-SSLeay-1.36
-* Net-Server-0.97
-* Pound-2.5
-* Python-2.7
-* SDL-1.2.11
-* Text-Tabs+Wrap-2005.0824
-* URI-1.35
-* Unix-Syslog-0.100
-* XML-Parser-2.34
-* alsa-lib-1.0.23
-* alsa-lib-1.0.23-kmod-2.6.32.24-ipfire
-* amavisd-new-2.5.2
-* apcupsd-3.14.4
-* applejuice-0.31
-* arping-2.05
-* as86-0.16.17
-* asterisk-1.4.28
-* autoconf-2.59
-* automake-1.9.6
-* backup-ipfire
-* bash-3.1
-* bc-1.06
-* beep-1.2.2
-* bind-9.3.2
-* binutils-2.17
-* bison-2.2
-* bluez-libs-3.36
-* br2684ctl
-* bridge-utils-1.1
-* bwm-ng-0.6
-* bzip2-1.0.5
-* cacti-0.8.7e
-* calamaris-2.59
-* capi4k-utils-2005-07-18
-* ccache-3.0pre0
-* cdrtools-2.01.01
-* centerim-4.22.1
-* clamav-0.96.2
-* cmake-2.4.8
-* collectd-4.9.1
-* compat-wireless-2.6.35-1-kmod-2.6.32.24-ipfire
-* compat-wireless-2.6.35-1-kmod-2.6.32.24-ipfire-xen
-* coreutils-5.96
-* cpio-2.11
-* cpufrequtils-007
-* cryptodev-20091126-kmod-2.6.32.24-ipfire
-* cryptodev-20091126-kmod-2.6.32.24-ipfire-xen
-* cups-1.4.4
-* curl-7.19.5
-* cyrus-imapd-2.2.12
-* cyrus-sasl-2.1.21
-* dahdi-2.2.1
-* dahdi-2.2.1-kmod-2.6.32.24-ipfire
-* dahdi-2.2.1-kmod-2.6.32.24-ipfire-xen
-* db-4.4.20
-* dbus-1.0.3
-* ddrescue-1.12
-* dhcp-3.1.0
-* dhcpcd-5.1.3
-* diffutils-2.8.1
-* dnsmasq-2.45
-* dosfstools-3.0.9
-* dracut-006
-* e1000-8.0.19-kmod-2.6.32.24-ipfire
-* e1000-8.0.19-kmod-2.6.32.24-ipfire-xen
-* e1000e-1.1.19-kmod-2.6.32.24-ipfire
-* e1000e-1.1.19-kmod-2.6.32.24-ipfire-xen
-* e2fsprogs-1.41.11
-* ebtables-v2.0.8-2
-* ed-0.2
-* eject-2.1.5
-* elinks-0.11.7
-* espgs-8.15.1
-* etherwake-1.09
-* ethtool-3
-* expat-2.0.0
-* ez-ipupdate-3.0.11b8
-* faad2-2.7
-* fbset-2.1
-* fcron-3.0.4
-* feedparser-4.1
-* fetchmail-6.3.16
-* ffmpeg-export-2008-04-13
-* file-4.17
-* findutils-4.2.27
-* flex-2.5.33
-* fontconfig-2.5.91
-* foomatic-3.0-20070813
-* freefont-20060126
-* freetype-2.1.10
-* fuse-2.8.3
-* fwhits
-* gawk-3.1.5
-* gcc-4.0.4
-* gd-2.0.33
-* gdbm-1.8.3
-* gettext-0.14.5
-* git-1.6.3.1
-* glib-2.22.2
-* glibc-2.3.6
-* gmp-4.2
-* gnump3d-3.0
-* gnupg-1.4.5
-* grep-2.5.1a
-* groff-1.18.1.1
-* grub-0.97
-* guardian-ipfire
-* gutenprint-5.2.5
-* gzip-1.3.5
-* hddtemp-0.3-beta14
-* hdparm-8.9
-* hostapd-0.7.3
-* hplip-2.7.10
-* htop-0.8.3
-* httpd-2.2.15
-* hwdata
-* iana-etc-2.10
-* icecast-2.3.2
-* icecream-0.9.4.8
-* icegenerator-0.5.5-pre2
-* iftop-0.17
-* igb-2.3.4-kmod-2.6.32.24-ipfire
-* igb-2.3.4-kmod-2.6.32.24-ipfire-xen
-* igmpproxy-0.1
-* imspector-20101008
-* inetutils-1.4.2
-* ipaddr-1.2
-* iperf-2.0.4
-* ipfireseeder-1.00
-* iproute2-2.6.16-060323
-* iptables-1.4.6
-* iptstate-2.1
-* iputils-ss020927
-* iw-0.9.20
-* java-1.6.0_12-for-ipfire
-* joe-3.7
-* jpegsrc.v6b
-* kbd-1.12
-* kqemu-1.4.0pre1-kmod-2.6.32.24-ipfire
-* kqemu-1.4.0pre1-kmod-2.6.32.24-ipfire-xen
-* kudzu-1.2.64
-* kvm-kmod-2.6.34.1-kmod-2.6.32.24-ipfire
-* l7-protocols-2009-05-10
-* lame-3.97
-* lcd4linux-0.10.1-RC2
-* lcr-20100601
-* less-394
-* libaal-1.0.5
-* libart_lgpl-2.3.17
-* libcap-1.10
-* libdvbpsi5-0.1.6
-* libevent-1.4.14b-stable
-* libid3tag-0.15.1b
-* libidn-0.6.14
-* libmad-0.15.1b
-* libmpdclient-2.1
-* libnet-1.1.2.1
-* libnl-1.1
-* libogg-1.1.4
-* liboping-1.3.4
-* libpcap-1.0.0
-* libpng-1.2.44
-* libpri-1.4.10.2
-* libsafe_2.0-16
-* libshout-2.2.2
-* libsigc++-2.0.17
-* libtool-1.5.22
-* libtorrent-0.12.6
-* libupnp-1.6.6
-* libusb-0.1.12
-* libvorbis-1.2.3
-* libwww-perl-5.803
-* libxml2-2.6.26
-* libxslt-1.1.17
-* linux-2.6.32.24-ipfire
-* linux-2.6.32.24-ipfire-xen
-* linux-atm-2.4.1
-* linux-firmware-20100318
-* linux-libc-headers-2.6.12.0
-* lm_sensors-3.1.2
-* logrotate-3.7.1
-* logwatch-7.3.6
-* lsof-4.78
-* lynis-1.2.9
-* lzo-2.02
-* m4-1.4.4
-* mISDN-20100525-kmod-2.6.32.24-ipfire
-* mISDN-20100525-kmod-2.6.32.24-ipfire-xen
-* mISDNuser-20100525
-* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.24-ipfire
-* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.24-ipfire-xen
-* make-3.81
-* man-db-2.4.3
-* man-pages-2.34
-* mbr-1.1.8
-* mc-4.7.3
-* mdadm-3.1.1
-* mechanize-0.1.8
-* mediatomb-svn2020
-* memtest86+-4.10
-* miau-0.6.5
-* minicom-2.4
-* misc-progs
-* mktemp-1.5
-* mldonkey-3.0.0
-* module-init-tools-3.5
-* motion-3.2.11
-* mpc-0.19
-* mpd-0.15.12
-* mpeg2dec-0.4.0b
-* mpfire-ipfire
-* mtd-CVS-20070507
-* mtools-3.9.10
-* mysql-5.0.24a
-* nagios-3.0.6
-* nagiosql-303
-* nano-2.0.9
-* nasm-0.98.39
-* ncftp-3.2.1-src
-* ncurses-5.5
-* net-snmp-5.4.2.1
-* net-tools-1.60
-* netcat-0.7.1
-* netpbm-10.26.46
-* newt-0.51.6
-* nfs-utils-1.2.2
-* nmap-5.20
-* noip_updater_v1.6
-* ntfs-3g-2009.4.4
-* ntp-4.2.4p7
-* nut-2.4.3
-* ocaml-3.09.2
-* oinkmaster-2.0
-* open-vm-tools-8.4.2-261024
-* openldap-2.3.20
-* openmailadmin-1.0.0
-* openssh-5.4p1
-* openssl-0.9.8o
-* openvpn-2.1.2
-* p7zip_4.65
-* pam_mysql-0.7RC1
-* patch-2.5.4
-* pciutils-2.2.3
-* pcmciautils-014
-* pcre-7.7
-* perl-5.8.8
-* perl-gettext-1.05
-* php-5.2.4
-* phpSANE-0.3.3
-* pkg-config-0.20
-* popt-1.10.4
-* portmap_6.0
-* postfix-2.6.5
-* ppp-2.4.5
-* pptp-1.7.2
-* procps-3.2.6
-* psmisc-22.2
-* qemu-0.11.1-kqemu
-* qemu-0.12.3
-* r8101-1.016.00-kmod-2.6.32.24-ipfire
-* r8101-1.016.00-kmod-2.6.32.24-ipfire-xen
-* r8168-8.018.00-kmod-2.6.32.24-ipfire
-* r8168-8.018.00-kmod-2.6.32.24-ipfire-xen
-* r8169-6.013.00-kmod-2.6.32.24-ipfire
-* r8169-6.013.00-kmod-2.6.32.24-ipfire-xen
-* readline-5.1
-* reiser4progs-1.0.6
-* reiserfsprogs-3.6.21
-* rrdtool-1.2.30
-* rssdler-0.4.0a
-* rsync-3.0.7
-* rtorrent-0.8.6
-* samba-3.5.6
-* sane-1.0.19
-* screen-4.0.3
-* sdparm-1.01
-* sed-4.1.5
-* setserial-2.17
-* setuptools-0.6c11
-* shadow-4.0.15
-* slang-1.4.9
-* smartmontools-5.39.1
-* snort-2.8.6.1
-* sox-12.18.1
-* spandsp-0.0.6pre12
-* splix-2.0.0-rc2
-* sqlite-3.6.10
-* squid-2.7.STABLE9
-* squidGuard-1.4.1
-* squidclamav-5.4
-* sshfs-fuse-2.2
-* sslh-1.7a
-* streamripper-1.63.5
-* strongswan-4.4.1
-* sudo-1.6.8p12
-* sysfsutils-1.3.0
-* sysklogd-1.5
-* syslinux-3.86
-* sysstat-6.0.2
-* sysvinit-2.86
-* taglib-1.5
-* tar-1.22
-* tcl8.4.13
-* tcp_wrappers_7.6
-* tcpdump-4.0.0
-* teamspeak-2.0.24.1
-* texinfo-4.8
-* tftp-hpa-0.48
-* tiff-3.9.4
-* traceroute-2.0.12
-* tripwire-2.4.1.2
-* tunctl
-* udev-125
-* unzip552
-* urlgrabber-3.1.0
-* usb-modeswitch-1.1.3
-* usb-modeswitch-data-20100707
-* usbutils-0.72
-* util-linux-2.12r
-* v4l-dvb-990bbeaeb761-kmod-2.6.32.24-ipfire
-* v4l-dvb-990bbeaeb761-kmod-2.6.32.24-ipfire-xen
-* vdr-1.6.0
-* vdradmin-am-3.6.7
-* vim-7.0
-* vlan.1.9
-* vlc-0.8.6i
-* vnstat-1.6
-* vnstati-beta3
-* vsftpd-2.2.2
-* w_scan-20080105
-* watchdog-5.9
-* wget-1.10.2
-* whatmask-1.2
-* which-2.16
-* wireless_tools.30.pre9
-* wpa_supplicant-0.7.3
-* xfsprogs-2.9.4
-* xvidcore-1.2.1
-* xz-4.999.9beta
-* zerofree-1.0.1
-* zlib-1.2.3
diff --git a/html/cgi-bin/outgoingfw.cgi b/html/cgi-bin/outgoingfw.cgi
index 27a8927..a15b243 100644
--- a/html/cgi-bin/outgoingfw.cgi
+++ b/html/cgi-bin/outgoingfw.cgi
@@ -408,8 +408,12 @@ END
if ($outfwsettings{'STATE'} eq 'DENY'){ $outfwsettings{'DISPLAY_STATE'} = "<img src='/images/stock_stop.png' alt='DENY' />"; }
if ($outfwsettings{'STATE'} eq 'ALLOW'){ $outfwsettings{'DISPLAY_STATE'} = "<img src='/images/stock_ok.png' alt='ALLOW' />"; }
if ((($outfwsettings{'POLICY'} eq 'MODE1') && ($outfwsettings{'STATE'} eq 'ALLOW')) || (($outfwsettings{'POLICY'} eq 'MODE2') && ($outfwsettings{'STATE'} eq 'DENY'))){
- print <<END
- <tr bgcolor='$color{'color20'}'>
+ if ( $outfwsettings{'ENABLED'} eq "on" ){
+ print "<tr bgcolor='$color{'color20'}'>";
+ } else {
+ print "<tr bgcolor='$color{'color18'}'>";
+ }
+ print <<END
<td align='center'>$outfwsettings{'PROT'}
<td align='center'>$outfwsettings{'SNET'}
<td align='center'>$outfwsettings{'DISPLAY_DIP'}:$outfwsettings{'DISPLAY_DPORT'}
diff --git a/lfs/Config b/lfs/Config
index bc9375a..01b9cf1 100644
--- a/lfs/Config
+++ b/lfs/Config
@@ -75,7 +75,7 @@ KGCC = gcc
define FIND_FILES
cd $(ROOT)/ && find -mount \
-not -path './tools*' -not -path './tmp*' -not -path './usr/src*' \
- -not -path './dev*' -not -path './proc*' -not -path './install*'
+ -not -path './dev*' -not -path './proc*' -not -path './install*' | sort
endef
# This is common starting logic for builds.
@@ -88,7 +88,10 @@ define PREBUILD
# Fix installation on partial rebuild, so modules install where they should
# and not everytime on the last compiled kernel
if [ -f $(DIR_SRC)/linux-$(KVER) ]; then \
- if [ "$(XEN)" = "" ]; then \
+ if [ "$(PAE)" = "1" ]; then \
+ cd $(DIR_SRC)/linux-$(KVER) && \
+ sed -i -e 's+^EXTRAVERSION.*$$+EXTRAVERSION\ =\ $(word 4,$(subst ., .,$(KVER)))-ipfire-pae+' Makefile; \
+ elif [ "$(XEN)" = "" ]; then \
cd $(DIR_SRC)/linux-$(KVER) && \
sed -i -e 's+^EXTRAVERSION.*$$+EXTRAVERSION\ =\ $(word 4,$(subst ., .,$(KVER)))-ipfire+' Makefile; \
else \
@@ -109,7 +112,7 @@ ifeq "$(ROOT)" ""
define POSTBUILD
@echo "Install done; saving file list to $(TARGET) ..."
@$(FIND_FILES) > $(DIR_SRC)/lsalrnew
- @diff $(DIR_SRC)/lsalr $(DIR_SRC)/lsalrnew | grep '^> ' | sed 's/^> //' | sort > $(TARGET)_diff
+ @diff $(DIR_SRC)/lsalr $(DIR_SRC)/lsalrnew | grep '^> ' | sed 's/^> //' > $(TARGET)_diff
@cp -f $(DIR_SRC)/lsalrnew $(DIR_SRC)/lsalr
@rm -f $(DIR_SRC)/lsalrnew
sed -i -e 's+.\/++' $(TARGET)_diff
@@ -122,7 +125,8 @@ define POSTBUILD
# $(TARGET)_rootfile : ROOTFILE with KVER replacement
# $(TARGET) : log result with {commented|include|added} files
if [ -s "$(TARGET)_diff" ]; then \
- if [ "$(XEN)" = "1" ]; then LFS_SCRIPT=$(firstword $(MAKEFILE_LIST))-xen; \
+ if [ "$(PAE)" = "1" ]; then LFS_SCRIPT=$(firstword $(MAKEFILE_LIST))-pae; \
+ elif [ "$(XEN)" = "1" ]; then LFS_SCRIPT=$(firstword $(MAKEFILE_LIST))-xen; \
else LFS_SCRIPT=$(firstword $(MAKEFILE_LIST)); \
fi; \
echo $(LFS_SCRIPT); \
diff --git a/lfs/alsa b/lfs/alsa
index a4151c3..d2eaadb 100644
--- a/lfs/alsa
+++ b/lfs/alsa
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2010 IPFire Team <info(a)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,11 +24,15 @@
include Config
+ifeq "$(PAE)" "1"
+ VERSUFIX=ipfire-pae
+else
ifeq "$(XEN)" "1"
VERSUFIX=ipfire-xen
else
VERSUFIX=ipfire
endif
+endif
VER = 1.0.23
UVER = 1.0.23
diff --git a/lfs/attr b/lfs/attr
new file mode 100644
index 0000000..a7c0ab8
--- /dev/null
+++ b/lfs/attr
@@ -0,0 +1,83 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 2.4.43
+
+THISAPP = attr-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 91583a14bcbd637adaa9b07ea49c5d4b
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && ./configure
+ cd $(DIR_APP) && make
+ cd $(DIR_APP) && make install
+ # Install libattr
+ cp $(DIR_APP)/libattr/.libs/libattr.so* /usr/lib
+ cp $(DIR_APP)/libattr/libattr.la /usr/lib
+ # Install includes
+# -mkdir /usr/include/attr
+# cp -f $(DIR_APP)/include/*.h /usr/include/attr
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/compat-wireless b/lfs/compat-wireless
index f793098..44a2dcc 100644
--- a/lfs/compat-wireless
+++ b/lfs/compat-wireless
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2008 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2010 IPFire Team <info(a)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,11 +24,15 @@
include Config
+ifeq "$(PAE)" "1"
+ VERSUFIX=ipfire-pae
+else
ifeq "$(XEN)" "1"
VERSUFIX=ipfire-xen
else
VERSUFIX=ipfire
endif
+endif
VER = 2.6.35-1
diff --git a/lfs/cryptodev b/lfs/cryptodev
index 5c1646b..cd69034 100644
--- a/lfs/cryptodev
+++ b/lfs/cryptodev
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2010 IPFire Team <info(a)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,11 +24,15 @@
include Config
+ifeq "$(PAE)" "1"
+ VERSUFIX=ipfire-pae
+else
ifeq "$(XEN)" "1"
VERSUFIX=ipfire-xen
else
VERSUFIX=ipfire
endif
+endif
VER = 20091126
diff --git a/lfs/dahdi b/lfs/dahdi
index e406284..1e5a5c2 100644
--- a/lfs/dahdi
+++ b/lfs/dahdi
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2010 IPFire Team <info(a)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,11 +24,15 @@
include Config
+ifeq "$(PAE)" "1"
+ VERSUFIX=ipfire-pae
+else
ifeq "$(XEN)" "1"
VERSUFIX=ipfire-xen
else
VERSUFIX=ipfire
endif
+endif
VER = 2.2.1
TVER = 2.2.1
diff --git a/lfs/e1000 b/lfs/e1000
index c7c5654..1d61e5b 100644
--- a/lfs/e1000
+++ b/lfs/e1000
@@ -24,11 +24,15 @@
include Config
+ifeq "$(PAE)" "1"
+ VERSUFIX = ipfire-pae
+else
ifeq "$(XEN)" "1"
VERSUFIX = ipfire-xen
else
VERSUFIX = ipfire
endif
+endif
VER = 8.0.19
diff --git a/lfs/e1000e b/lfs/e1000e
index 5838f6a..cce5367 100644
--- a/lfs/e1000e
+++ b/lfs/e1000e
@@ -24,11 +24,15 @@
include Config
+ifeq "$(PAE)" "1"
+ VERSUFIX = ipfire-pae
+else
ifeq "$(XEN)" "1"
VERSUFIX = ipfire-xen
else
VERSUFIX = ipfire
endif
+endif
VER = 1.1.19
diff --git a/lfs/findutils b/lfs/findutils
index 07658f2..6321458 100644
--- a/lfs/findutils
+++ b/lfs/findutils
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2010 IPFire Team <info(a)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 = 4.2.27
+VER = 4.4.2
THISAPP = findutils-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -54,7 +54,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = f1e0ddf09f28f8102ff3b90f3b5bc920
+$(DL_FILE)_MD5 = 351cc4adb07d54877fa15f75fb77d39f
install : $(TARGET)
diff --git a/lfs/igb b/lfs/igb
index 522a801..8305647 100644
--- a/lfs/igb
+++ b/lfs/igb
@@ -24,11 +24,15 @@
include Config
+ifeq "$(PAE)" "1"
+ VERSUFIX = ipfire-pae
+else
ifeq "$(XEN)" "1"
VERSUFIX = ipfire-xen
else
VERSUFIX = ipfire
endif
+endif
VER = 2.3.4
diff --git a/lfs/kqemu b/lfs/kqemu
index 7fb14de..d07d9f1 100644
--- a/lfs/kqemu
+++ b/lfs/kqemu
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2010 IPFire Team <info(a)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,11 +24,15 @@
include Config
+ifeq "$(PAE)" "1"
+ VERSUFIX=ipfire-pae
+else
ifeq "$(XEN)" "1"
VERSUFIX=ipfire-xen
else
VERSUFIX=ipfire
endif
+endif
VER = 1.4.0pre1
diff --git a/lfs/kvm-kmod b/lfs/kvm-kmod
index c2eb52d..e443b70 100644
--- a/lfs/kvm-kmod
+++ b/lfs/kvm-kmod
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2010 IPFire Team <info(a)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,11 +24,15 @@
include Config
+ifeq "$(PAE)" "1"
+ VERSUFIX=ipfire-pae
+else
ifeq "$(XEN)" "1"
VERSUFIX=ipfire-xen
else
VERSUFIX=ipfire
endif
+endif
VER = 2.6.34.1
diff --git a/lfs/libcap b/lfs/libcap
index c56ae6b..78b5d34 100644
--- a/lfs/libcap
+++ b/lfs/libcap
@@ -24,10 +24,10 @@
include Config
-VER = 1.10
+VER = 2.19
THISAPP = libcap-$(VER)
-DL_FILE = $(THISAPP).tar.gz
+DL_FILE = $(THISAPP).tar.bz2
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 2c09eea823f67cfdde96177a959bc39b
+$(DL_FILE)_MD5 = eb1ff04d39bfa2342b8e78b0fd60dc2d
install : $(TARGET)
@@ -69,11 +69,11 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-syscall.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-shared.patch
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && make
cd $(DIR_APP) && make install
+ # link for old binaries
+ ln -s libcap.so.2 /lib/libcap.so.1
chmod +x /lib/libcap.so.*
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/linux b/lfs/linux
index 259f888..4e465bb 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2010 IPFire Team <info(a)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 #
@@ -41,11 +41,15 @@ DEPS = ""
# Normal build or XEN build.
#
+ifeq "$(PAE)" "1"
+ VERSUFIX=ipfire-pae
+else
ifeq "$(XEN)" "1"
VERSUFIX=ipfire-xen
else
VERSUFIX=ipfire
endif
+endif
TARGET = $(DIR_INFO)/linux-$(VER)-$(VERSUFIX)
@@ -163,16 +167,11 @@ endif
cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules_install
cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) firmware_install
-ifeq "$(XEN)" ""
- # Only do this once on the non-XEN pass
+ifneq "$(PAE)" "1"
+ifneq "$(XEN)" "1"
+ # Only do this once on the standard kernel pass
cd $(DIR_APP) && install -m 755 usr/gen_init_cpio /sbin/
-endif
-
- # Remove mISDN modules
- rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/mISDN
- rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/hardware/mISDN
-ifneq "$(XEN)" "1"
# Blacklist matroxfb_base
echo "blacklist matroxfb_base" >> /etc/modprobe.d/framebuffer
# Blacklist old framebuffer modules
@@ -191,6 +190,11 @@ ifneq "$(XEN)" "1"
done
sed -i -e "s|.ko||g" /etc/modprobe.d/isdn
endif
+endif
+
+ # Remove mISDN modules
+ rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/mISDN
+ rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/hardware/mISDN
@rm -rf $(DIR_SRC)/patch-o-matic* $(DIR_SRC)/iptables* $(DIR_SRC)/squashfs* $(DIR_SRC)/netfilter-layer7-*
@$(POSTBUILD)
diff --git a/lfs/linux-pae b/lfs/linux-pae
new file mode 100644
index 0000000..cbaeefe
--- /dev/null
+++ b/lfs/linux-pae
@@ -0,0 +1,28 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2010 IPFire Team <info(a)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 #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+include linux
+
+PROG = linux-pae
diff --git a/lfs/mISDN b/lfs/mISDN
index a6dd753..349f260 100644
--- a/lfs/mISDN
+++ b/lfs/mISDN
@@ -24,11 +24,15 @@
include Config
+ifeq "$(PAE)" "1"
+ VERSUFIX=ipfire-pae
+else
ifeq "$(XEN)" "1"
VERSUFIX=ipfire-xen
else
VERSUFIX=ipfire
endif
+endif
VER = 20100525
diff --git a/lfs/madwifi b/lfs/madwifi
index 8b8a75b..90f1a1c 100644
--- a/lfs/madwifi
+++ b/lfs/madwifi
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2008 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2010 IPFire Team <info(a)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,11 +24,16 @@
include Config
+ifeq "$(PAE)" "1"
+ VERSUFIX=ipfire-pae
+else
+
ifeq "$(XEN)" "1"
VERSUFIX=ipfire-xen
else
VERSUFIX=ipfire
endif
+endif
VER = hal-0.10.5.6-r4119-20100201
diff --git a/lfs/r8101 b/lfs/r8101
index 252b18f..d085324 100644
--- a/lfs/r8101
+++ b/lfs/r8101
@@ -24,11 +24,15 @@
include Config
+ifeq "$(PAE)" "1"
+ VERSUFIX = ipfire-pae
+else
ifeq "$(XEN)" "1"
VERSUFIX = ipfire-xen
else
VERSUFIX = ipfire
endif
+endif
VER = 1.016.00
diff --git a/lfs/r8168 b/lfs/r8168
index c9792c8..fce2d30 100644
--- a/lfs/r8168
+++ b/lfs/r8168
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 20109 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2010 IPFire Team <info(a)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,11 +24,15 @@
include Config
+ifeq "$(PAE)" "1"
+ VERSUFIX = ipfire-pae
+else
ifeq "$(XEN)" "1"
VERSUFIX = ipfire-xen
else
VERSUFIX = ipfire
endif
+endif
VER = 8.018.00
diff --git a/lfs/r8169 b/lfs/r8169
index d9cc008..745fd29 100644
--- a/lfs/r8169
+++ b/lfs/r8169
@@ -24,11 +24,15 @@
include Config
+ifeq "$(PAE)" "1"
+ VERSUFIX = ipfire-pae
+else
ifeq "$(XEN)" "1"
VERSUFIX = ipfire-xen
else
VERSUFIX = ipfire
endif
+endif
VER = 6.013.00
diff --git a/lfs/squid b/lfs/squid
index 3a5e265..d92b8b7 100644
--- a/lfs/squid
+++ b/lfs/squid
@@ -24,10 +24,10 @@
include Config
-VER = 2.7.STABLE9
+VER = 3.1.8
THISAPP = squid-$(VER)
-DL_FILE = $(THISAPP).tar.gz
+DL_FILE = $(THISAPP).tar.bz2
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 7d3b8b0bdda3ae56e438d4a95a97d3b3
+$(DL_FILE)_MD5 = a8160dfba55ab7c400c622b72d39fc13
install : $(TARGET)
@@ -69,7 +69,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls \
--datadir=/usr/lib/squid \
@@ -77,13 +77,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--localstatedir=/var --sysconfdir=/etc/squid \
--disable-poll --disable-icmp --disable-wccp \
--enable-ident-lookups \
- --enable-storeio="aufs,coss,diskd,ufs,null" --enable-ssl \
+ --enable-storeio="aufs,diskd,ufs" --enable-ssl \
--enable-underscores --enable-ntlm-fail-open --enable-arp-acl \
--enable-http-violations --enable-auth=basic,ntlm \
--enable-removal-policies="heap,lru" \
--enable-delay-pools --enable-linux-netfilter \
--enable-basic-auth-helpers="NCSA,SMB,MSNT,LDAP,multi-domain-NTLM" \
- --enable-ntlm-auth-helpers="SMB" \
--enable-useragent-log \
--enable-referer-log \
--enable-snmp \
@@ -98,7 +97,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
rm -f /etc/squid/cachemgr.conf
ln -sf /var/ipfire/proxy/cachemgr.conf /etc/squid/cachemgr.conf
rm -f /etc/squid/errors
- ln -sf /usr/lib/squid/errors/English /etc/squid/errors
+ ln -sf /usr/lib/squid/errors/en /etc/squid/errors
-mkdir -p /var/log/cache /var/log/squid /var/log/updatexlrator
touch /var/log/squid/access.log
diff --git a/lfs/v4l-dvb b/lfs/v4l-dvb
index 87f6ae8..89fe1ab 100644
--- a/lfs/v4l-dvb
+++ b/lfs/v4l-dvb
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2010 IPFire Team <info(a)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,11 +24,15 @@
include Config
+ifeq "$(PAE)" "1"
+ VERSUFIX=ipfire-pae
+else
ifeq "$(XEN)" "1"
VERSUFIX=ipfire-xen
else
VERSUFIX=ipfire
endif
+endif
VER = 990bbeaeb761
diff --git a/make.sh b/make.sh
index 7f669c9..1f986bc 100755
--- a/make.sh
+++ b/make.sh
@@ -356,6 +356,22 @@ buildipfire() {
ipfiremake e1000 XEN=1
ipfiremake e1000e XEN=1
ipfiremake igb XEN=1
+ ipfiremake linux PAE=1
+ ipfiremake kqemu PAE=1
+ ipfiremake kvm-kmod PAE=1
+ ipfiremake v4l-dvb PAE=1
+ ipfiremake madwifi PAE=1
+ ipfiremake alsa PAE=1 KMOD=1
+ ipfiremake mISDN PAE=1
+ ipfiremake dahdi PAE=1 KMOD=1
+ ipfiremake cryptodev PAE=1
+ ipfiremake compat-wireless PAE=1
+ ipfiremake r8169 PAE=1
+ ipfiremake r8168 PAE=1
+ ipfiremake r8101 PAE=1
+ ipfiremake e1000 PAE=1
+ ipfiremake e1000e PAE=1
+ ipfiremake igb PAE=1
ipfiremake linux
ipfiremake kqemu
ipfiremake kvm-kmod
@@ -399,6 +415,7 @@ buildipfire() {
ipfiremake pcre
ipfiremake slang
ipfiremake newt
+ ipfiremake attr
ipfiremake libcap
ipfiremake pciutils
ipfiremake usbutils
diff --git a/src/initscripts/init.d/squid b/src/initscripts/init.d/squid
index 35ad8a8..7944c70 100644
--- a/src/initscripts/init.d/squid
+++ b/src/initscripts/init.d/squid
@@ -57,8 +57,8 @@ case "$1" in
fi
if [ -e /var/ipfire/proxy/enable -o -e /var/ipfire/proxy/enable_blue ]; then
boot_mesg "Starting Squid Proxy Server..."
- loadproc /usr/sbin/squid -D -z >/dev/null 2>&1
- loadproc /usr/sbin/squid -D
+ loadproc /usr/sbin/squid -z >/dev/null 2>&1
+ loadproc /usr/sbin/squid
fi
eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
diff --git a/src/paks/linux-pae/install.sh b/src/paks/linux-pae/install.sh
new file mode 100644
index 0000000..c2fc3d8
--- /dev/null
+++ b/src/paks/linux-pae/install.sh
@@ -0,0 +1,65 @@
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall. #
+# #
+# IPFire is free software; you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation; either version 2 of the License, or #
+# (at your option) any later version. #
+# #
+# IPFire is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with IPFire; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Copyright (C) 2010 IPFire-Team <info(a)ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+extract_files
+#
+KVER=2.6.32.24
+ROOT=`mount | grep " / " | cut -d" " -f1`
+ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2`
+if [ ! -z $ROOTUUID ]; then
+ ROOT="UUID=$ROOTUUID"
+fi
+
+MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1`
+# Nur den letzten Parameter verwenden
+echo $MOUNT > /dev/null
+MOUNT=$_
+if [ ! $MOUNT == "rw" ]; then
+ MOUNT="ro"
+fi
+
+ENTRY=`grep "savedefault" /boot/grub/grub.conf | tail -n 1`
+# Nur den letzten Parameter verwenden
+echo $ENTRY > /dev/null
+let ENTRY=$_+1
+#
+# backup grub.conf
+#
+cp /boot/grub/grub.conf /boot/grub/grub-backup-$KVER-pae.conf
+#
+# Add new Entry to grub.conf
+#
+echo "" >> /boot/grub/grub.conf
+echo "title IPFire (PAE-Kernel)" >> /boot/grub/grub.conf
+echo " kernel /vmlinuz-$KVER-ipfire-pae root=$ROOT rootdelay=10 panic=10 $MOUNT" >> /boot/grub/grub.conf
+echo " initrd /ipfirerd-$KVER-pae.img" >> /boot/grub/grub.conf
+echo " savedefault $ENTRY" >> /boot/grub/grub.conf
+#
+# Made initramdisk
+#
+/sbin/dracut --force --verbose /boot/ipfirerd-$KVER-pae.img $KVER-ipfire-pae
+#
+# Create new module depency
+#
+depmod -a $KVER-ipfire-pae
diff --git a/src/paks/linux-pae/uninstall.sh b/src/paks/linux-pae/uninstall.sh
new file mode 100644
index 0000000..9a45300
--- /dev/null
+++ b/src/paks/linux-pae/uninstall.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall. #
+# #
+# IPFire is free software; you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation; either version 2 of the License, or #
+# (at your option) any later version. #
+# #
+# IPFire is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with IPFire; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Copyright (C) 2010 IPFire-Team <info(a)ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+remove_files
+mv -f /boot/grub/grub-backup-2.6.32.*-pae.conf /boot/grub/grub.conf
diff --git a/src/paks/linux-pae/update.sh b/src/paks/linux-pae/update.sh
new file mode 100644
index 0000000..abbaf47
--- /dev/null
+++ b/src/paks/linux-pae/update.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall. #
+# #
+# IPFire is free software; you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation; either version 2 of the License, or #
+# (at your option) any later version. #
+# #
+# IPFire is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with IPFire; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+#Don't remove old xen kernel at update
+#./uninstall.sh
+./install.sh
diff --git a/src/paks/linux-xen/install.sh b/src/paks/linux-xen/install.sh
index 4457e5e..8b46c89 100644
--- a/src/paks/linux-xen/install.sh
+++ b/src/paks/linux-xen/install.sh
@@ -25,11 +25,20 @@
extract_files
#
KVER=2.6.32.24
-ROOT=`grep "root=" /boot/grub/grub.conf | cut -d"=" -f2 | cut -d" " -f1 | tail -n 1`
+ROOT=`mount | grep " / " | cut -d" " -f1`
+ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2`
+if [ ! -z $ROOTUUID ]; then
+ ROOT="UUID=$ROOTUUID"
+fi
+
MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1`
# Nur den letzten Parameter verwenden
echo $MOUNT > /dev/null
MOUNT=$_
+if [ ! $MOUNT == "rw" ]; then
+ MOUNT="ro"
+fi
+
ENTRY=`grep "savedefault" /boot/grub/grub.conf | tail -n 1`
# Nur den letzten Parameter verwenden
echo $ENTRY > /dev/null
@@ -64,9 +73,7 @@ fi
#
# Made initramdisk
#
-cp -f /etc/mkinitcpio.conf.org /etc/mkinitcpio.conf
-sed -i -e "s| autodetect | |g" /etc/mkinitcpio.conf
-mkinitcpio -k $KVER-ipfire-xen -g /boot/ipfirerd-$KVER-xen.img
+/sbin/dracut --force --verbose /boot/ipfirerd-$KVER-xen.img $KVER-ipfire-xen
#
# Create new module depency
#
hooks/post-receive
--
IPFire 2.x development tree
1
0
[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 4c4a3475521a5a3196d180a2af626c5e2d7846b0
by git＠ipfire.org 12 Oct '10
by git＠ipfire.org 12 Oct '10
12 Oct '10
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, master has been updated
via 4c4a3475521a5a3196d180a2af626c5e2d7846b0 (commit)
from 68dd6726af4cc47056353f51ebb1c5e92eb68326 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 4c4a3475521a5a3196d180a2af626c5e2d7846b0
Author: Christian Schmidt <christian.schmidt(a)ipfire.org>
Date: Tue Oct 12 20:17:53 2010 +0200
Added the firewall init script to core41.
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/41/filelists/files | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
Difference in files:
diff --git a/config/rootfiles/core/41/filelists/files b/config/rootfiles/core/41/filelists/files
index 068f2ba..47487bd 100644
--- a/config/rootfiles/core/41/filelists/files
+++ b/config/rootfiles/core/41/filelists/files
@@ -1,4 +1,5 @@
etc/system-release
+etc/rc.d/init.d/firewall
srv/web/ipfire/cgi-bin/outgoinggrp.cgi
srv/web/ipfire/cgi-bin/outgoingfw.cgi
srv/web/ipfire/cgi-bin/urlfilter.cgi
hooks/post-receive
--
IPFire 2.x development tree
1
0
[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 68dd6726af4cc47056353f51ebb1c5e92eb68326
by git＠ipfire.org 12 Oct '10
by git＠ipfire.org 12 Oct '10
12 Oct '10
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, master has been updated
via 68dd6726af4cc47056353f51ebb1c5e92eb68326 (commit)
from dc1c56ca781324b2ef9fe895e388075df74a018a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 68dd6726af4cc47056353f51ebb1c5e92eb68326
Author: Christian Schmidt <christian.schmidt(a)ipfire.org>
Date: Tue Oct 12 17:38:40 2010 +0200
Fixed the feature for deactivating outgoingfw rules.
-----------------------------------------------------------------------
Summary of changes:
config/outgoingfw/outgoingfw.pl | 2 +-
config/rootfiles/core/41/filelists/files | 6 ++++--
html/cgi-bin/outgoingfw.cgi | 8 ++++++--
3 files changed, 11 insertions(+), 5 deletions(-)
Difference in files:
diff --git a/config/outgoingfw/outgoingfw.pl b/config/outgoingfw/outgoingfw.pl
index 8d4d27d..6709ee6 100644
--- a/config/outgoingfw/outgoingfw.pl
+++ b/config/outgoingfw/outgoingfw.pl
@@ -187,7 +187,7 @@ foreach $configentry (sort @configs)
foreach $SOURCE (@SOURCE) {
$SOURCE =~ s/\s//gi;
- if ( $SOURCE eq "" ){next;}
+ if ( $SOURCE eq "" || $configline[1] eq "" ){next;}
if ( ( $configline[6] ne "" || $configline[2] eq 'mac' ) && $configline[2] ne 'all'){
$SOURCE =~ s/[^a-zA-Z0-9]/:/gi;
diff --git a/config/rootfiles/core/41/filelists/files b/config/rootfiles/core/41/filelists/files
index 59e2f53..068f2ba 100644
--- a/config/rootfiles/core/41/filelists/files
+++ b/config/rootfiles/core/41/filelists/files
@@ -1,8 +1,10 @@
etc/system-release
srv/web/ipfire/cgi-bin/outgoinggrp.cgi
+srv/web/ipfire/cgi-bin/outgoingfw.cgi
+srv/web/ipfire/cgi-bin/urlfilter.cgi
+srv/web/ipfire/cgi-bin/vpnmain.cgi
var/ipfire/langs/en.pl
var/ipfire/langs/de.pl
var/ipfire/langs/es.pl
var/ipfire/langs/fr.pl
-srv/web/ipfire/cgi-bin/urlfilter.cgi
-srv/web/ipfire/cgi-bin/vpnmain.cgi
+var/ipfire/outgoingfw/bin/outgoingfw.pl
diff --git a/html/cgi-bin/outgoingfw.cgi b/html/cgi-bin/outgoingfw.cgi
index 27a8927..a15b243 100644
--- a/html/cgi-bin/outgoingfw.cgi
+++ b/html/cgi-bin/outgoingfw.cgi
@@ -408,8 +408,12 @@ END
if ($outfwsettings{'STATE'} eq 'DENY'){ $outfwsettings{'DISPLAY_STATE'} = "<img src='/images/stock_stop.png' alt='DENY' />"; }
if ($outfwsettings{'STATE'} eq 'ALLOW'){ $outfwsettings{'DISPLAY_STATE'} = "<img src='/images/stock_ok.png' alt='ALLOW' />"; }
if ((($outfwsettings{'POLICY'} eq 'MODE1') && ($outfwsettings{'STATE'} eq 'ALLOW')) || (($outfwsettings{'POLICY'} eq 'MODE2') && ($outfwsettings{'STATE'} eq 'DENY'))){
- print <<END
- <tr bgcolor='$color{'color20'}'>
+ if ( $outfwsettings{'ENABLED'} eq "on" ){
+ print "<tr bgcolor='$color{'color20'}'>";
+ } else {
+ print "<tr bgcolor='$color{'color18'}'>";
+ }
+ print <<END
<td align='center'>$outfwsettings{'PROT'}
<td align='center'>$outfwsettings{'SNET'}
<td align='center'>$outfwsettings{'DISPLAY_DIP'}:$outfwsettings{'DISPLAY_DPORT'}
hooks/post-receive
--
IPFire 2.x development tree
1
0