[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 6eed299202d2f9c25abc53def2304af28e81ec21
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@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@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@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@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@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@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@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@ipfire.org Date: Tue Oct 12 13:31:26 2010 +0200
libtool: Update to 2.4.
commit ce7c94009fa4d09853089156b19ef4b0c0b3cd6a Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Oct 12 13:31:01 2010 +0200
autoconf: Update to 2.68.
commit 8bf88f872b66040a5ea7d8363574873006ff570a Author: Michael Tremer michael.tremer@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@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@ipfire.org Date: Mon Oct 11 21:24:18 2010 +0200
Merge branch 'perl' into next
commit 109746396f29c3de38864cbace0666ae2f3a5439 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Oct 11 21:22:36 2010 +0200
udev: Remove unneeded rules.
commit cc16e27cc6a0f75d19062899268ed7a16e390e83 Author: Michael Tremer michael.tremer@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@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@ipfire.org Date: Mon Oct 11 21:21:27 2010 +0200
perl: Split into lots of subpackages.
commit 90555dbbebe0fa64da5f6973bef0fef835ad0f89 Author: Michael Tremer michael.tremer@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@ipfire.org Date: Sat Oct 9 19:13:58 2010 +0200
fail2ban: Added fail2ban deamon.
commit 8a640d93bb716aa3bb44b06819c5e37c01fa0c9b Author: Christian Schmidt christian.schmidt@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@ipfire.org Date: Sat Oct 9 18:17:18 2010 +0200
squid: Updated to 3.1.8.
commit c900042febb6572521794cd450cd7943bde336d3 Author: Christian Schmidt christian.schmidt@ipfire.org Date: Sat Oct 9 14:24:24 2010 +0200
samba: Updated to 3.5.6.
commit 24f909e193bc2b62f4ca21707320b1ed6cb055b0 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Oct 3 00:52:38 2010 +0200
perl-XML-Parser: Rename package.
commit 727fbf6c4207021d2afdd327844ebd547ec783d1 Author: Michael Tremer michael.tremer@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@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@ipfire.org Date: Sun Oct 3 00:49:07 2010 +0200
naoki: Introduce THISVER.
commit f600c4272ffcec91bb5926ab111acf1d824e56d7 Author: Michael Tremer michael.tremer@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@ipfire.org Date: Fri Oct 1 18:50:20 2010 +0200
xen: Repackage libs.
commit b675033af3ebda8239d6dfa0d92243fbedf5f539 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Oct 1 18:37:18 2010 +0200
xen: Add commenting about ldconfig call.
commit 964b02ee2d050a6389e01ba7067182c9e19da192 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Oct 1 18:36:58 2010 +0200
xen: Fix typo (in dependency line).
commit 3f9164ae391b990eac7d3046fc674c195c9bad64 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Oct 1 18:36:15 2010 +0200
xen: Remove old patches.
commit 131fc8383317be89217520c579e5ec3769bd2dc1 Author: Michael Tremer michael.tremer@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@ipfire.org Date: Fri Oct 1 18:01:30 2010 +0200
libvirt: added xen support.
commit 108f274f424528c413a88aa570725e4c8da90211 Author: Ben Schweikert trikolon@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@ipfire.org Date: Fri Oct 1 17:46:42 2010 +0200
Forgot to sort deps.
commit 676b494d5fe7435a1717bd8f7582701f32df6b68 Author: Ben Schweikert trikolon@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@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@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@ipfire.org Date: Fri Oct 1 16:12:21 2010 +0200
perl: Update to 5.12.2.
commit 03eb19be0b1ef1b8caa5d3c7fa55b74a4a06ffdd Author: Michael Tremer michael.tremer@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@mail.com, sender=fail2ban@mail.com] +-logpath = /var/log/sshd.log ++ sendmail-whois[name=SSH, dest=root, sender=fail2ban@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@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@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@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@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@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@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@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@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@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@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@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@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
-
git＠ipfire.org