From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. e65fe151a5b7bf7df9525fcae1cb920667818c2a
Date: Thu, 22 Aug 2013 13:08:24 +0200 [thread overview]
Message-ID: <20130822110824.E0CD720287@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 35749 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via e65fe151a5b7bf7df9525fcae1cb920667818c2a (commit)
via 754f508b5bf7ff3f89de369f2148f03bc7ee66c3 (commit)
from 82c0cd6ae0ebefb3503c7bc2c8bf2e47b08f5698 (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 e65fe151a5b7bf7df9525fcae1cb920667818c2a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Aug 22 13:03:51 2013 +0200
core73: Add squid update to 3.3.
commit 754f508b5bf7ff3f89de369f2148f03bc7ee66c3
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Mar 7 18:23:29 2013 +0100
squid: Update to 3.3.8.
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/squid | 200 +++++++++++++++++------
config/rootfiles/core/73/filelists/files | 2 +
config/rootfiles/core/{71 => 73}/filelists/squid | 0
config/rootfiles/core/73/update.sh | 6 +-
html/cgi-bin/proxy.cgi | 18 +-
lfs/squid | 97 ++++++-----
src/initscripts/init.d/squid | 16 +-
7 files changed, 230 insertions(+), 109 deletions(-)
copy config/rootfiles/core/{71 => 73}/filelists/squid (100%)
Difference in files:
diff --git a/config/rootfiles/common/squid b/config/rootfiles/common/squid
index 671f217..15c921f 100644
--- a/config/rootfiles/common/squid
+++ b/config/rootfiles/common/squid
@@ -14,10 +14,29 @@ etc/squid/squid.conf
srv/web/ipfire/cgi-bin/cachemgr.cgi
srv/web/ipfire/html/proxy.pac
srv/web/ipfire/html/wpad.dat
+usr/bin/purge
usr/bin/squidclient
#usr/lib/squid
usr/lib/squid/auth
+usr/lib/squid/basic_db_auth
+usr/lib/squid/basic_fake_auth
+usr/lib/squid/basic_getpwnam_auth
+usr/lib/squid/basic_ldap_auth
+usr/lib/squid/basic_msnt_auth
+usr/lib/squid/basic_msnt_multi_domain_auth
+usr/lib/squid/basic_ncsa_auth
+usr/lib/squid/basic_nis_auth
+usr/lib/squid/basic_pam_auth
+usr/lib/squid/basic_pop3_auth
+usr/lib/squid/basic_radius_auth
+usr/lib/squid/basic_sasl_auth
+usr/lib/squid/basic_smb_auth
+usr/lib/squid/basic_smb_auth.sh
#usr/lib/squid/cachemgr.cgi
+usr/lib/squid/cert_tool
+usr/lib/squid/digest_edirectory_auth
+usr/lib/squid/digest_file_auth
+usr/lib/squid/digest_ldap_auth
usr/lib/squid/diskd
#usr/lib/squid/errors
#usr/lib/squid/errors/COPYRIGHT
@@ -30,6 +49,7 @@ usr/lib/squid/diskd
#usr/lib/squid/errors/af/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/af/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/af/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/af/ERR_CONFLICT_HOST
#usr/lib/squid/errors/af/ERR_CONNECT_FAIL
#usr/lib/squid/errors/af/ERR_DIR_LISTING
#usr/lib/squid/errors/af/ERR_DNS_FAIL
@@ -88,6 +108,7 @@ usr/lib/squid/diskd
#usr/lib/squid/errors/ar/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/ar/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/ar/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/ar/ERR_CONFLICT_HOST
#usr/lib/squid/errors/ar/ERR_CONNECT_FAIL
#usr/lib/squid/errors/ar/ERR_DIR_LISTING
#usr/lib/squid/errors/ar/ERR_DNS_FAIL
@@ -131,6 +152,7 @@ usr/lib/squid/diskd
#usr/lib/squid/errors/az/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/az/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/az/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/az/ERR_CONFLICT_HOST
#usr/lib/squid/errors/az/ERR_CONNECT_FAIL
#usr/lib/squid/errors/az/ERR_DIR_LISTING
#usr/lib/squid/errors/az/ERR_DNS_FAIL
@@ -174,6 +196,7 @@ usr/lib/squid/diskd
#usr/lib/squid/errors/bg/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/bg/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/bg/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/bg/ERR_CONFLICT_HOST
#usr/lib/squid/errors/bg/ERR_CONNECT_FAIL
#usr/lib/squid/errors/bg/ERR_DIR_LISTING
#usr/lib/squid/errors/bg/ERR_DNS_FAIL
@@ -216,6 +239,7 @@ usr/lib/squid/diskd
#usr/lib/squid/errors/ca/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/ca/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/ca/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/ca/ERR_CONFLICT_HOST
#usr/lib/squid/errors/ca/ERR_CONNECT_FAIL
#usr/lib/squid/errors/ca/ERR_DIR_LISTING
#usr/lib/squid/errors/ca/ERR_DNS_FAIL
@@ -259,6 +283,7 @@ usr/lib/squid/diskd
#usr/lib/squid/errors/cs/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/cs/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/cs/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/cs/ERR_CONFLICT_HOST
#usr/lib/squid/errors/cs/ERR_CONNECT_FAIL
#usr/lib/squid/errors/cs/ERR_DIR_LISTING
#usr/lib/squid/errors/cs/ERR_DNS_FAIL
@@ -302,6 +327,7 @@ usr/lib/squid/diskd
#usr/lib/squid/errors/da/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/da/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/da/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/da/ERR_CONFLICT_HOST
#usr/lib/squid/errors/da/ERR_CONNECT_FAIL
#usr/lib/squid/errors/da/ERR_DIR_LISTING
#usr/lib/squid/errors/da/ERR_DNS_FAIL
@@ -349,6 +375,7 @@ usr/lib/squid/errors/de/ERR_AGENT_WPAD
usr/lib/squid/errors/de/ERR_CACHE_ACCESS_DENIED
usr/lib/squid/errors/de/ERR_CACHE_MGR_ACCESS_DENIED
usr/lib/squid/errors/de/ERR_CANNOT_FORWARD
+usr/lib/squid/errors/de/ERR_CONFLICT_HOST
usr/lib/squid/errors/de/ERR_CONNECT_FAIL
usr/lib/squid/errors/de/ERR_DIR_LISTING
usr/lib/squid/errors/de/ERR_DNS_FAIL
@@ -392,6 +419,7 @@ usr/lib/squid/errors/de/error-details.txt
#usr/lib/squid/errors/el/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/el/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/el/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/el/ERR_CONFLICT_HOST
#usr/lib/squid/errors/el/ERR_CONNECT_FAIL
#usr/lib/squid/errors/el/ERR_DIR_LISTING
#usr/lib/squid/errors/el/ERR_DNS_FAIL
@@ -449,6 +477,7 @@ usr/lib/squid/errors/en/ERR_AGENT_WPAD
usr/lib/squid/errors/en/ERR_CACHE_ACCESS_DENIED
usr/lib/squid/errors/en/ERR_CACHE_MGR_ACCESS_DENIED
usr/lib/squid/errors/en/ERR_CANNOT_FORWARD
+usr/lib/squid/errors/en/ERR_CONFLICT_HOST
usr/lib/squid/errors/en/ERR_CONNECT_FAIL
usr/lib/squid/errors/en/ERR_DIR_LISTING
usr/lib/squid/errors/en/ERR_DNS_FAIL
@@ -510,6 +539,7 @@ usr/lib/squid/errors/es/ERR_AGENT_WPAD
usr/lib/squid/errors/es/ERR_CACHE_ACCESS_DENIED
usr/lib/squid/errors/es/ERR_CACHE_MGR_ACCESS_DENIED
usr/lib/squid/errors/es/ERR_CANNOT_FORWARD
+usr/lib/squid/errors/es/ERR_CONFLICT_HOST
usr/lib/squid/errors/es/ERR_CONNECT_FAIL
usr/lib/squid/errors/es/ERR_DIR_LISTING
usr/lib/squid/errors/es/ERR_DNS_FAIL
@@ -553,6 +583,7 @@ usr/lib/squid/errors/es/error-details.txt
#usr/lib/squid/errors/et/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/et/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/et/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/et/ERR_CONFLICT_HOST
#usr/lib/squid/errors/et/ERR_CONNECT_FAIL
#usr/lib/squid/errors/et/ERR_DIR_LISTING
#usr/lib/squid/errors/et/ERR_DNS_FAIL
@@ -597,6 +628,7 @@ usr/lib/squid/errors/es/error-details.txt
#usr/lib/squid/errors/fa/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/fa/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/fa/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/fa/ERR_CONFLICT_HOST
#usr/lib/squid/errors/fa/ERR_CONNECT_FAIL
#usr/lib/squid/errors/fa/ERR_DIR_LISTING
#usr/lib/squid/errors/fa/ERR_DNS_FAIL
@@ -640,6 +672,7 @@ usr/lib/squid/errors/es/error-details.txt
#usr/lib/squid/errors/fi/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/fi/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/fi/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/fi/ERR_CONFLICT_HOST
#usr/lib/squid/errors/fi/ERR_CONNECT_FAIL
#usr/lib/squid/errors/fi/ERR_DIR_LISTING
#usr/lib/squid/errors/fi/ERR_DNS_FAIL
@@ -688,6 +721,7 @@ usr/lib/squid/errors/fr/ERR_AGENT_WPAD
usr/lib/squid/errors/fr/ERR_CACHE_ACCESS_DENIED
usr/lib/squid/errors/fr/ERR_CACHE_MGR_ACCESS_DENIED
usr/lib/squid/errors/fr/ERR_CANNOT_FORWARD
+usr/lib/squid/errors/fr/ERR_CONFLICT_HOST
usr/lib/squid/errors/fr/ERR_CONNECT_FAIL
usr/lib/squid/errors/fr/ERR_DIR_LISTING
usr/lib/squid/errors/fr/ERR_DNS_FAIL
@@ -731,6 +765,7 @@ usr/lib/squid/errors/fr/error-details.txt
#usr/lib/squid/errors/he/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/he/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/he/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/he/ERR_CONFLICT_HOST
#usr/lib/squid/errors/he/ERR_CONNECT_FAIL
#usr/lib/squid/errors/he/ERR_DIR_LISTING
#usr/lib/squid/errors/he/ERR_DNS_FAIL
@@ -774,6 +809,7 @@ usr/lib/squid/errors/fr/error-details.txt
#usr/lib/squid/errors/hu/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/hu/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/hu/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/hu/ERR_CONFLICT_HOST
#usr/lib/squid/errors/hu/ERR_CONNECT_FAIL
#usr/lib/squid/errors/hu/ERR_DIR_LISTING
#usr/lib/squid/errors/hu/ERR_DNS_FAIL
@@ -818,6 +854,7 @@ usr/lib/squid/errors/fr/error-details.txt
#usr/lib/squid/errors/hy/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/hy/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/hy/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/hy/ERR_CONFLICT_HOST
#usr/lib/squid/errors/hy/ERR_CONNECT_FAIL
#usr/lib/squid/errors/hy/ERR_DIR_LISTING
#usr/lib/squid/errors/hy/ERR_DNS_FAIL
@@ -861,6 +898,7 @@ usr/lib/squid/errors/fr/error-details.txt
#usr/lib/squid/errors/id/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/id/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/id/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/id/ERR_CONFLICT_HOST
#usr/lib/squid/errors/id/ERR_CONNECT_FAIL
#usr/lib/squid/errors/id/ERR_DIR_LISTING
#usr/lib/squid/errors/id/ERR_DNS_FAIL
@@ -905,6 +943,7 @@ usr/lib/squid/errors/fr/error-details.txt
#usr/lib/squid/errors/it/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/it/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/it/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/it/ERR_CONFLICT_HOST
#usr/lib/squid/errors/it/ERR_CONNECT_FAIL
#usr/lib/squid/errors/it/ERR_DIR_LISTING
#usr/lib/squid/errors/it/ERR_DNS_FAIL
@@ -948,6 +987,7 @@ usr/lib/squid/errors/fr/error-details.txt
#usr/lib/squid/errors/ja/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/ja/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/ja/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/ja/ERR_CONFLICT_HOST
#usr/lib/squid/errors/ja/ERR_CONNECT_FAIL
#usr/lib/squid/errors/ja/ERR_DIR_LISTING
#usr/lib/squid/errors/ja/ERR_DNS_FAIL
@@ -992,6 +1032,7 @@ usr/lib/squid/errors/fr/error-details.txt
#usr/lib/squid/errors/ko/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/ko/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/ko/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/ko/ERR_CONFLICT_HOST
#usr/lib/squid/errors/ko/ERR_CONNECT_FAIL
#usr/lib/squid/errors/ko/ERR_DIR_LISTING
#usr/lib/squid/errors/ko/ERR_DNS_FAIL
@@ -1035,6 +1076,7 @@ usr/lib/squid/errors/fr/error-details.txt
#usr/lib/squid/errors/lt/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/lt/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/lt/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/lt/ERR_CONFLICT_HOST
#usr/lib/squid/errors/lt/ERR_CONNECT_FAIL
#usr/lib/squid/errors/lt/ERR_DIR_LISTING
#usr/lib/squid/errors/lt/ERR_DNS_FAIL
@@ -1078,6 +1120,7 @@ usr/lib/squid/errors/fr/error-details.txt
#usr/lib/squid/errors/lv/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/lv/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/lv/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/lv/ERR_CONFLICT_HOST
#usr/lib/squid/errors/lv/ERR_CONNECT_FAIL
#usr/lib/squid/errors/lv/ERR_DIR_LISTING
#usr/lib/squid/errors/lv/ERR_DNS_FAIL
@@ -1121,6 +1164,7 @@ usr/lib/squid/errors/fr/error-details.txt
#usr/lib/squid/errors/ms/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/ms/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/ms/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/ms/ERR_CONFLICT_HOST
#usr/lib/squid/errors/ms/ERR_CONNECT_FAIL
#usr/lib/squid/errors/ms/ERR_DIR_LISTING
#usr/lib/squid/errors/ms/ERR_DNS_FAIL
@@ -1164,6 +1208,7 @@ usr/lib/squid/errors/nl/ERR_AGENT_WPAD
usr/lib/squid/errors/nl/ERR_CACHE_ACCESS_DENIED
usr/lib/squid/errors/nl/ERR_CACHE_MGR_ACCESS_DENIED
usr/lib/squid/errors/nl/ERR_CANNOT_FORWARD
+usr/lib/squid/errors/nl/ERR_CONFLICT_HOST
usr/lib/squid/errors/nl/ERR_CONNECT_FAIL
usr/lib/squid/errors/nl/ERR_DIR_LISTING
usr/lib/squid/errors/nl/ERR_DNS_FAIL
@@ -1206,6 +1251,7 @@ usr/lib/squid/errors/nl/error-details.txt
#usr/lib/squid/errors/oc/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/oc/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/oc/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/oc/ERR_CONFLICT_HOST
#usr/lib/squid/errors/oc/ERR_CONNECT_FAIL
#usr/lib/squid/errors/oc/ERR_DIR_LISTING
#usr/lib/squid/errors/oc/ERR_DNS_FAIL
@@ -1249,6 +1295,7 @@ usr/lib/squid/errors/pl/ERR_AGENT_WPAD
usr/lib/squid/errors/pl/ERR_CACHE_ACCESS_DENIED
usr/lib/squid/errors/pl/ERR_CACHE_MGR_ACCESS_DENIED
usr/lib/squid/errors/pl/ERR_CANNOT_FORWARD
+usr/lib/squid/errors/pl/ERR_CONFLICT_HOST
usr/lib/squid/errors/pl/ERR_CONNECT_FAIL
usr/lib/squid/errors/pl/ERR_DIR_LISTING
usr/lib/squid/errors/pl/ERR_DNS_FAIL
@@ -1292,6 +1339,7 @@ usr/lib/squid/errors/pl/error-details.txt
#usr/lib/squid/errors/pt-br/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/pt-br/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/pt-br/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/pt-br/ERR_CONFLICT_HOST
#usr/lib/squid/errors/pt-br/ERR_CONNECT_FAIL
#usr/lib/squid/errors/pt-br/ERR_DIR_LISTING
#usr/lib/squid/errors/pt-br/ERR_DNS_FAIL
@@ -1334,6 +1382,7 @@ usr/lib/squid/errors/pl/error-details.txt
#usr/lib/squid/errors/pt/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/pt/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/pt/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/pt/ERR_CONFLICT_HOST
#usr/lib/squid/errors/pt/ERR_CONNECT_FAIL
#usr/lib/squid/errors/pt/ERR_DIR_LISTING
#usr/lib/squid/errors/pt/ERR_DNS_FAIL
@@ -1378,6 +1427,7 @@ usr/lib/squid/errors/pl/error-details.txt
#usr/lib/squid/errors/ro/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/ro/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/ro/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/ro/ERR_CONFLICT_HOST
#usr/lib/squid/errors/ro/ERR_CONNECT_FAIL
#usr/lib/squid/errors/ro/ERR_DIR_LISTING
#usr/lib/squid/errors/ro/ERR_DNS_FAIL
@@ -1421,6 +1471,7 @@ usr/lib/squid/errors/ru/ERR_AGENT_WPAD
usr/lib/squid/errors/ru/ERR_CACHE_ACCESS_DENIED
usr/lib/squid/errors/ru/ERR_CACHE_MGR_ACCESS_DENIED
usr/lib/squid/errors/ru/ERR_CANNOT_FORWARD
+usr/lib/squid/errors/ru/ERR_CONFLICT_HOST
usr/lib/squid/errors/ru/ERR_CONNECT_FAIL
usr/lib/squid/errors/ru/ERR_DIR_LISTING
usr/lib/squid/errors/ru/ERR_DNS_FAIL
@@ -1464,6 +1515,7 @@ usr/lib/squid/errors/ru/error-details.txt
#usr/lib/squid/errors/sk/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/sk/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/sk/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/sk/ERR_CONFLICT_HOST
#usr/lib/squid/errors/sk/ERR_CONNECT_FAIL
#usr/lib/squid/errors/sk/ERR_DIR_LISTING
#usr/lib/squid/errors/sk/ERR_DNS_FAIL
@@ -1507,6 +1559,7 @@ usr/lib/squid/errors/ru/error-details.txt
#usr/lib/squid/errors/sl/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/sl/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/sl/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/sl/ERR_CONFLICT_HOST
#usr/lib/squid/errors/sl/ERR_CONNECT_FAIL
#usr/lib/squid/errors/sl/ERR_DIR_LISTING
#usr/lib/squid/errors/sl/ERR_DNS_FAIL
@@ -1550,6 +1603,7 @@ usr/lib/squid/errors/ru/error-details.txt
#usr/lib/squid/errors/sr-cyrl/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/sr-cyrl/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/sr-cyrl/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/sr-cyrl/ERR_CONFLICT_HOST
#usr/lib/squid/errors/sr-cyrl/ERR_CONNECT_FAIL
#usr/lib/squid/errors/sr-cyrl/ERR_DIR_LISTING
#usr/lib/squid/errors/sr-cyrl/ERR_DNS_FAIL
@@ -1593,6 +1647,7 @@ usr/lib/squid/errors/ru/error-details.txt
#usr/lib/squid/errors/sr-latn/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/sr-latn/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/sr-latn/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/sr-latn/ERR_CONFLICT_HOST
#usr/lib/squid/errors/sr-latn/ERR_CONNECT_FAIL
#usr/lib/squid/errors/sr-latn/ERR_DIR_LISTING
#usr/lib/squid/errors/sr-latn/ERR_DNS_FAIL
@@ -1638,6 +1693,7 @@ usr/lib/squid/errors/ru/error-details.txt
#usr/lib/squid/errors/sv/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/sv/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/sv/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/sv/ERR_CONFLICT_HOST
#usr/lib/squid/errors/sv/ERR_CONNECT_FAIL
#usr/lib/squid/errors/sv/ERR_DIR_LISTING
#usr/lib/squid/errors/sv/ERR_DNS_FAIL
@@ -1680,6 +1736,7 @@ usr/lib/squid/errors/ru/error-details.txt
#usr/lib/squid/errors/templates/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/templates/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/templates/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/templates/ERR_CONFLICT_HOST
#usr/lib/squid/errors/templates/ERR_CONNECT_FAIL
#usr/lib/squid/errors/templates/ERR_DIR_LISTING
#usr/lib/squid/errors/templates/ERR_DNS_FAIL
@@ -1723,6 +1780,7 @@ usr/lib/squid/errors/ru/error-details.txt
#usr/lib/squid/errors/th/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/th/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/th/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/th/ERR_CONFLICT_HOST
#usr/lib/squid/errors/th/ERR_CONNECT_FAIL
#usr/lib/squid/errors/th/ERR_DIR_LISTING
#usr/lib/squid/errors/th/ERR_DNS_FAIL
@@ -1809,6 +1867,7 @@ usr/lib/squid/errors/tr/error-details.txt
#usr/lib/squid/errors/uk/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/uk/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/uk/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/uk/ERR_CONFLICT_HOST
#usr/lib/squid/errors/uk/ERR_CONNECT_FAIL
#usr/lib/squid/errors/uk/ERR_DIR_LISTING
#usr/lib/squid/errors/uk/ERR_DNS_FAIL
@@ -1851,6 +1910,7 @@ usr/lib/squid/errors/tr/error-details.txt
#usr/lib/squid/errors/uz/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/uz/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/uz/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/uz/ERR_CONFLICT_HOST
#usr/lib/squid/errors/uz/ERR_CONNECT_FAIL
#usr/lib/squid/errors/uz/ERR_DIR_LISTING
#usr/lib/squid/errors/uz/ERR_DNS_FAIL
@@ -1894,6 +1954,7 @@ usr/lib/squid/errors/tr/error-details.txt
#usr/lib/squid/errors/vi/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/vi/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/vi/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/vi/ERR_CONFLICT_HOST
#usr/lib/squid/errors/vi/ERR_CONNECT_FAIL
#usr/lib/squid/errors/vi/ERR_DIR_LISTING
#usr/lib/squid/errors/vi/ERR_DNS_FAIL
@@ -1936,6 +1997,7 @@ usr/lib/squid/errors/tr/error-details.txt
#usr/lib/squid/errors/zh-cn/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/zh-cn/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/zh-cn/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/zh-cn/ERR_CONFLICT_HOST
#usr/lib/squid/errors/zh-cn/ERR_CONNECT_FAIL
#usr/lib/squid/errors/zh-cn/ERR_DIR_LISTING
#usr/lib/squid/errors/zh-cn/ERR_DNS_FAIL
@@ -1981,6 +2043,7 @@ usr/lib/squid/errors/tr/error-details.txt
#usr/lib/squid/errors/zh-tw/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/zh-tw/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/zh-tw/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/zh-tw/ERR_CONFLICT_HOST
#usr/lib/squid/errors/zh-tw/ERR_CONNECT_FAIL
#usr/lib/squid/errors/zh-tw/ERR_DIR_LISTING
#usr/lib/squid/errors/zh-tw/ERR_DNS_FAIL
@@ -2015,65 +2078,101 @@ usr/lib/squid/errors/tr/error-details.txt
#usr/lib/squid/errors/zh-tw/ERR_WRITE_ERROR
#usr/lib/squid/errors/zh-tw/ERR_ZERO_SIZE_OBJECT
#usr/lib/squid/errors/zh-tw/error-details.txt
-usr/lib/squid/fakeauth_auth
+usr/lib/squid/ext_edirectory_userip_acl
+usr/lib/squid/ext_file_userip_acl
+usr/lib/squid/ext_kerberos_ldap_group_acl
+usr/lib/squid/ext_ldap_group_acl
+usr/lib/squid/ext_session_acl
+usr/lib/squid/ext_sql_session_acl
+usr/lib/squid/ext_time_quota_acl
+usr/lib/squid/ext_unix_group_acl
+usr/lib/squid/ext_wbinfo_group_acl
+usr/lib/squid/helper-mux.pl
usr/lib/squid/icons
-#usr/lib/squid/icons/anthony-binhex.gif
-#usr/lib/squid/icons/anthony-bomb.gif
-#usr/lib/squid/icons/anthony-box.gif
-#usr/lib/squid/icons/anthony-box2.gif
-#usr/lib/squid/icons/anthony-c.gif
-#usr/lib/squid/icons/anthony-compressed.gif
-#usr/lib/squid/icons/anthony-dir.gif
-#usr/lib/squid/icons/anthony-dirup.gif
-#usr/lib/squid/icons/anthony-dvi.gif
-#usr/lib/squid/icons/anthony-f.gif
-#usr/lib/squid/icons/anthony-image.gif
-#usr/lib/squid/icons/anthony-image2.gif
-#usr/lib/squid/icons/anthony-layout.gif
-#usr/lib/squid/icons/anthony-link.gif
-#usr/lib/squid/icons/anthony-movie.gif
-#usr/lib/squid/icons/anthony-pdf.gif
-#usr/lib/squid/icons/anthony-portal.gif
-#usr/lib/squid/icons/anthony-ps.gif
-#usr/lib/squid/icons/anthony-quill.gif
-#usr/lib/squid/icons/anthony-script.gif
-#usr/lib/squid/icons/anthony-sound.gif
-#usr/lib/squid/icons/anthony-tar.gif
-#usr/lib/squid/icons/anthony-tex.gif
-#usr/lib/squid/icons/anthony-text.gif
-#usr/lib/squid/icons/anthony-unknown.gif
-#usr/lib/squid/icons/anthony-xbm.gif
-#usr/lib/squid/icons/anthony-xpm.gif
-usr/lib/squid/ip_user_check
+usr/lib/squid/icons/SN.png
+usr/lib/squid/icons/silk
+usr/lib/squid/icons/silk/application.png
+usr/lib/squid/icons/silk/arrow_up.png
+usr/lib/squid/icons/silk/bomb.png
+usr/lib/squid/icons/silk/box.png
+usr/lib/squid/icons/silk/bricks.png
+usr/lib/squid/icons/silk/bullet_red.png
+usr/lib/squid/icons/silk/cd.png
+usr/lib/squid/icons/silk/chart_line.png
+usr/lib/squid/icons/silk/compress.png
+usr/lib/squid/icons/silk/computer_link.png
+usr/lib/squid/icons/silk/css.png
+usr/lib/squid/icons/silk/cup.png
+usr/lib/squid/icons/silk/database.png
+usr/lib/squid/icons/silk/database_table.png
+usr/lib/squid/icons/silk/drive_disk.png
+usr/lib/squid/icons/silk/film.png
+usr/lib/squid/icons/silk/film_key.png
+usr/lib/squid/icons/silk/folder.png
+usr/lib/squid/icons/silk/folder_table.png
+usr/lib/squid/icons/silk/image.png
+usr/lib/squid/icons/silk/information.png
+usr/lib/squid/icons/silk/layers.png
+usr/lib/squid/icons/silk/layout.png
+usr/lib/squid/icons/silk/link.png
+usr/lib/squid/icons/silk/music.png
+usr/lib/squid/icons/silk/package.png
+usr/lib/squid/icons/silk/package_go.png
+usr/lib/squid/icons/silk/page_code.png
+usr/lib/squid/icons/silk/page_excel.png
+usr/lib/squid/icons/silk/page_green.png
+usr/lib/squid/icons/silk/page_white.png
+usr/lib/squid/icons/silk/page_white_acrobat.png
+usr/lib/squid/icons/silk/page_white_c.png
+usr/lib/squid/icons/silk/page_white_cplusplus.png
+usr/lib/squid/icons/silk/page_white_flash.png
+usr/lib/squid/icons/silk/page_white_magnify.png
+usr/lib/squid/icons/silk/page_white_picture.png
+usr/lib/squid/icons/silk/page_white_powerpoint.png
+usr/lib/squid/icons/silk/page_white_stack.png
+usr/lib/squid/icons/silk/page_white_text.png
+usr/lib/squid/icons/silk/page_white_word.png
+usr/lib/squid/icons/silk/page_white_zip.png
+usr/lib/squid/icons/silk/page_world.png
+usr/lib/squid/icons/silk/photo.png
+usr/lib/squid/icons/silk/picture.png
+usr/lib/squid/icons/silk/plugin.png
+usr/lib/squid/icons/silk/plugin_add.png
+usr/lib/squid/icons/silk/script.png
+usr/lib/squid/icons/silk/script_gear.png
+usr/lib/squid/icons/silk/script_palette.png
+usr/lib/squid/log_db_daemon
+usr/lib/squid/log_file_daemon
usr/lib/squid/mib.txt
-usr/lib/squid/msnt_auth
-usr/lib/squid/ncsa_auth
-usr/lib/squid/no_check.pl
+usr/lib/squid/negotiate_wrapper_auth
+usr/lib/squid/ntlm_fake_auth
usr/lib/squid/ntlm_smb_lm_auth
-usr/lib/squid/pam_auth
-usr/lib/squid/pinger
-usr/lib/squid/smb_auth
-usr/lib/squid/smb_auth.pl
-usr/lib/squid/smb_auth.sh
-usr/lib/squid/squid_ldap_auth
-usr/lib/squid/squid_ldap_group
-usr/lib/squid/squid_radius_auth
-usr/lib/squid/squid_session
-usr/lib/squid/squid_unix_group
usr/lib/squid/unlinkd
-usr/lib/squid/wbinfo_group.pl
+usr/lib/squid/url_fake_rewrite
+usr/lib/squid/url_fake_rewrite.sh
usr/sbin/squid
usr/sbin/updxlrator
#usr/share/man/man1/squidclient.1
+#usr/share/man/man8/basic_db_auth.8
+#usr/share/man/man8/basic_getpwnam_auth.8
+#usr/share/man/man8/basic_ldap_auth.8
+#usr/share/man/man8/basic_ncsa_auth.8
+#usr/share/man/man8/basic_pam_auth.8
+#usr/share/man/man8/basic_radius_auth.8
+#usr/share/man/man8/basic_sasl_auth.8
#usr/share/man/man8/cachemgr.cgi.8
-#usr/share/man/man8/ncsa_auth.8
-#usr/share/man/man8/pam_auth.8
+#usr/share/man/man8/digest_file_auth.8
+#usr/share/man/man8/ext_edirectory_userip_acl.8
+#usr/share/man/man8/ext_file_userip_acl.8
+#usr/share/man/man8/ext_ldap_group_acl.8
+#usr/share/man/man8/ext_session_acl.8
+#usr/share/man/man8/ext_sql_session_acl.8
+#usr/share/man/man8/ext_time_quota_acl.8
+#usr/share/man/man8/ext_unix_group_acl.8
+#usr/share/man/man8/ext_wbinfo_group_acl.8
+#usr/share/man/man8/log_db_daemon.8
#usr/share/man/man8/squid.8
-#usr/share/man/man8/squid_ldap_auth.8
-#usr/share/man/man8/squid_ldap_group.8
-#usr/share/man/man8/squid_radius_auth.8
-#usr/share/man/man8/squid_session.8
-#usr/share/man/man8/squid_unix_group.8
+#var/cache/squid
var/ipfire/proxy/errorpage-ipfire.css
var/ipfire/proxy/errorpage-squid.css
var/ipfire/updatexlrator/autocheck/cron.daily
@@ -2090,3 +2189,4 @@ var/log/cache
var/log/squid/access.log
var/log/updatexlrator
#var/logs
+#var/run/squid
diff --git a/config/rootfiles/core/73/filelists/files b/config/rootfiles/core/73/filelists/files
index 42bb310..a1ef1bf 100644
--- a/config/rootfiles/core/73/filelists/files
+++ b/config/rootfiles/core/73/filelists/files
@@ -1,6 +1,8 @@
etc/system-release
etc/issue
+etc/rc.d/init.d/squid
srv/web/ipfire/cgi-bin/logs.cgi/proxylog.dat
+srv/web/ipfire/cgi-bin/proxy.cgi
srv/web/ipfire/html/redirect.cgi
srv/web/ipfire/html/redirect-templates/
var/ipfire/header.pl
diff --git a/config/rootfiles/core/73/filelists/squid b/config/rootfiles/core/73/filelists/squid
new file mode 120000
index 0000000..2dc8372
--- /dev/null
+++ b/config/rootfiles/core/73/filelists/squid
@@ -0,0 +1 @@
+../../../common/squid
\ No newline at end of file
diff --git a/config/rootfiles/core/73/update.sh b/config/rootfiles/core/73/update.sh
index 446e8a0..6afca9f 100644
--- a/config/rootfiles/core/73/update.sh
+++ b/config/rootfiles/core/73/update.sh
@@ -35,19 +35,23 @@ done
#
#Stop services
+/etc/init.d/squid stop
#
#Extract files
extract_files
+# Regenerate squid configuration files.
+/srv/web/ipfire/cgi-bin/proxy.cgi
#
#Start services
+/etc/init.d/squid start
#
#Update Language cache
-#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
sync
diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index 870042a..bcdc202 100644
--- a/html/cgi-bin/proxy.cgi
+++ b/html/cgi-bin/proxy.cgi
@@ -3144,12 +3144,12 @@ END
if ($proxysettings{'LOGGING'} eq 'on')
{
print FILE <<END
-access_log /var/log/squid/access.log
+access_log stdio:/var/log/squid/access.log
cache_log /var/log/squid/cache.log
cache_store_log none
END
;
- if ($proxysettings{'LOGUSERAGENT'} eq 'on') { print FILE "useragent_log \/var\/log\/squid\/user_agent.log\n"; }
+ if ($proxysettings{'LOGUSERAGENT'} eq 'on') { print FILE "access_log stdio:\/var\/log\/squid\/user_agent.log useragent\n"; }
if ($proxysettings{'LOGQUERY'} eq 'on') { print FILE "\nstrip_query_terms off\n"; }
} else {
print FILE <<END
@@ -3182,7 +3182,7 @@ END
{
if ($proxysettings{'AUTH_METHOD'} eq 'ncsa')
{
- print FILE "auth_param basic program $authdir/ncsa_auth $userdb\n";
+ print FILE "auth_param basic program $authdir/basic_ncsa_auth $userdb\n";
print FILE "auth_param basic children $proxysettings{'AUTH_CHILDREN'}\n";
print FILE "auth_param basic realm $authrealm\n";
print FILE "auth_param basic credentialsttl $proxysettings{'AUTH_CACHE_TTL'} minutes\n";
@@ -3192,7 +3192,7 @@ END
if ($proxysettings{'AUTH_METHOD'} eq 'ldap')
{
print FILE "auth_param basic utf8 on\n";
- print FILE "auth_param basic program $authdir/squid_ldap_auth -b \"$proxysettings{'LDAP_BASEDN'}\"";
+ print FILE "auth_param basic program $authdir/basic_ldap_auth -b \"$proxysettings{'LDAP_BASEDN'}\"";
if (!($proxysettings{'LDAP_BINDDN_USER'} eq '')) { print FILE " -D \"$proxysettings{'LDAP_BINDDN_USER'}\""; }
if (!($proxysettings{'LDAP_BINDDN_PASS'} eq '')) { print FILE " -w $proxysettings{'LDAP_BINDDN_PASS'}"; }
if ($proxysettings{'LDAP_TYPE'} eq 'ADS')
@@ -3243,7 +3243,7 @@ END
print FILE "auth_param ntlm children $proxysettings{'AUTH_CHILDREN'}\n";
if (!($proxysettings{'AUTH_IPCACHE_TTL'} eq '0')) { print FILE "\nauthenticate_ip_ttl $proxysettings{'AUTH_IPCACHE_TTL'} minutes\n"; }
} else {
- print FILE "auth_param basic program $authdir/msnt_auth\n";
+ print FILE "auth_param basic program $authdir/basic_msnt_auth\n";
print FILE "auth_param basic children $proxysettings{'AUTH_CHILDREN'}\n";
print FILE "auth_param basic realm $authrealm\n";
print FILE "auth_param basic credentialsttl $proxysettings{'AUTH_CACHE_TTL'} minutes\n";
@@ -3269,7 +3269,7 @@ END
if ($proxysettings{'AUTH_METHOD'} eq 'radius')
{
- print FILE "auth_param basic program $authdir/squid_radius_auth -h $proxysettings{'RADIUS_SERVER'} -p $proxysettings{'RADIUS_PORT'} ";
+ print FILE "auth_param basic program $authdir/basic_radius_auth -h $proxysettings{'RADIUS_SERVER'} -p $proxysettings{'RADIUS_PORT'} ";
if (!($proxysettings{'RADIUS_IDENTIFIER'} eq '')) { print FILE "-i $proxysettings{'RADIUS_IDENTIFIER'} "; }
print FILE "-w $proxysettings{'RADIUS_SECRET'}\n";
print FILE "auth_param basic children $proxysettings{'AUTH_CHILDREN'}\n";
@@ -3362,11 +3362,6 @@ END
print FILE "acl blocked_mimetypes rep_mime_type \"$mimetypes\"\n\n";
}
- print FILE <<END
-#acl all src all
-acl localhost src 127.0.0.1/32
-END
-;
open (PORTS,"$acl_ports_ssl");
@temp = <PORTS>;
close PORTS;
@@ -3463,7 +3458,6 @@ END
if ($proxysettings{'ENABLE_CLAMAV'} eq 'on') {
print FILE "\n#Settings for squidclamav:\n";
print FILE "http_port 127.0.0.1:$proxysettings{'PROXY_PORT'} transparent\n";
- print FILE "acl to_localhost dst 127.0.0.0/8\n";
print FILE "acl purge method PURGE\n";
print FILE "http_access deny to_localhost\n";
print FILE "http_access allow localhost\n";
diff --git a/lfs/squid b/lfs/squid
index 81118c2..4a71b4d 100644
--- a/lfs/squid
+++ b/lfs/squid
@@ -24,10 +24,10 @@
include Config
-VER = 3.1.23
+VER = 3.3.8
THISAPP = squid-$(VER)
-DL_FILE = $(THISAPP).tar.bz2
+DL_FILE = $(THISAPP).tar.xz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = e15fdb8c615cf1f9525be0a2b75c60a7
+$(DL_FILE)_MD5 = 6a8fa0075f2fbdd899ac4c9d95fe67cb
install : $(TARGET)
@@ -69,47 +69,56 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xjf $(DIR_DL)/$(DL_FILE)
-
- cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.1-10486.patch
- cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.1-10487.patch
-
- cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls \
- --datadir=/usr/lib/squid \
- --mandir=/usr/share/man --libexecdir=/usr/lib/squid \
- --localstatedir=/var --sysconfdir=/etc/squid \
- --enable-poll --enable-icmp --disable-wccp \
- --enable-ident-lookups \
- --enable-storeio="aufs,diskd,ufs" --enable-ssl \
- --enable-underscores --enable-ntlm-fail-open --enable-arp-acl \
- --enable-http-violations --enable-auth=basic,ntlm \
- --enable-removal-policies="heap,lru" \
- --enable-delay-pools --enable-linux-netfilter \
- --enable-basic-auth-helpers="NCSA,SMB,MSNT,LDAP,multi-domain-NTLM,PAM,squid_radius_auth" \
- --enable-useragent-log \
- --enable-referer-log \
- --enable-snmp \
- --with-pthreads --with-dl \
- --with-maxfd="65536" \
- --with-filedescriptors=65536 \
- --with-large-files \
- --with-aio \
- --enable-async-io=8 \
- --enable-unlinkd \
- --enable-ntln-fail-open \
- --enable-ntlm-auth-helpers="smb_lm,no_check,fakeauth" \
- --enable-internal-dns \
- --enable-epoll \
- --disable-kqueue \
- --enable-select \
- --enable-cache-digests \
- --enable-forw-via-db \
- --enable-htcp \
- --enable-ipf-transparent \
- --enable-kill-parent-hack \
- --disable-wccpv2 \
- --enable-icap-client \
- --disable-esi
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xaf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc/squid \
+ --datadir=/usr/lib/squid \
+ --mandir=/usr/share/man \
+ --libexecdir=/usr/lib/squid \
+ --localstatedir=/var \
+ --disable-ipv6 \
+ --enable-poll \
+ --disable-icmp \
+ --disable-wccp \
+ --enable-ident-lookups \
+ --enable-storeio="aufs,diskd,ufs" \
+ --enable-ssl \
+ --enable-underscores \
+ --enable-http-violations \
+ --enable-removal-policies="heap,lru" \
+ --enable-delay-pools \
+ --enable-linux-netfilter \
+ --enable-snmp \
+ --enable-auth \
+ --enable-auth-basic \
+ --enable-auth-digest \
+ --enable-auth-negotiate \
+ --enable-auth-ntlm \
+ --enable-log-daemon-helpers \
+ --enable-url-rewrite-helpers \
+ --enable-build-info \
+ --enable-eui \
+ --with-pthreads \
+ --with-dl \
+ --with-maxfd="65536" \
+ --with-filedescriptors=65536 \
+ --with-large-files \
+ --with-aio \
+ --enable-async-io=8 \
+ --enable-unlinkd \
+ --enable-internal-dns \
+ --enable-epoll \
+ --disable-kqueue \
+ --enable-select \
+ --enable-cache-digests \
+ --enable-forw-via-db \
+ --enable-htcp \
+ --enable-ipf-transparent \
+ --enable-kill-parent-hack \
+ --disable-wccpv2 \
+ --enable-icap-client \
+ --disable-esi
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
diff --git a/src/initscripts/init.d/squid b/src/initscripts/init.d/squid
index 08a3029..62d5bea 100644
--- a/src/initscripts/init.d/squid
+++ b/src/initscripts/init.d/squid
@@ -62,13 +62,25 @@ case "$1" in
eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
if [ -e /var/ipfire/proxy/enable -o -e /var/ipfire/proxy/enable_blue ]; then
-
# Add Address to errorpage stylesheet
sed "s|XXXhostXXX|$GREEN_ADDRESS|g" /var/ipfire/proxy/errorpage-$ERR_DESIGN.css > \
/etc/squid/errorpage.css
+ boot_mesg "Creating Squid swap directories..."
+ /usr/sbin/squid -z >/dev/null 2>&1
+ evaluate_retval
+
+ # Make sure, that the process above has finished.
+ counter=5
+ while [ ${counter} -gt 0 ]; do
+ if pidofproc -s /usr/sbin/squid; then
+ sleep 1
+ else
+ break
+ fi
+ done
+
boot_mesg "Starting Squid Proxy Server..."
- loadproc /usr/sbin/squid -z >/dev/null 2>&1
loadproc /usr/sbin/squid
fi
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2013-08-22 11:08 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130822110824.E0CD720287@argus.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox