This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, master has been updated via d0cf29f084d7c47d61a0141e60c12e6cce78d8a8 (commit) via fc5592af4d8ccc026591535e4090f187a4d96a98 (commit) via f599cf7c4ae36a382a1baf0923ee24ce01b45fdc (commit) via 800c1607ae050be3e4334c5bdd5f29f76e005390 (commit) via 1432ca2e26cffcff0535e4e0ce5938057f003022 (commit) from 14820894ad62c06b0d7e64b67a2757ba76f4d9e2 (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 d0cf29f084d7c47d61a0141e60c12e6cce78d8a8 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Mar 15 09:14:41 2011 +0100
core: add snort update to core.
commit fc5592af4d8ccc026591535e4090f187a4d96a98 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Mar 15 09:12:34 2011 +0100
core: add squid to core48.
commit f599cf7c4ae36a382a1baf0923ee24ce01b45fdc Merge: 1482089 800c160 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Mar 15 09:09:47 2011 +0100
Merge branch 'squid'
commit 800c1607ae050be3e4334c5bdd5f29f76e005390 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Mar 15 09:02:32 2011 +0100
squid: set --enable-async-io=8
commit 1432ca2e26cffcff0535e4e0ce5938057f003022 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Mar 4 13:32:28 2011 +0100
Updated squid (3.1.11). Set some cfg switches like in IPFire 3.x (enabled radius, aio ...)
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/squid | 50 ++++++++++++++++++++++ config/rootfiles/core/48/exclude | 1 + config/rootfiles/core/{44 => 48}/filelists/snort | 0 config/rootfiles/core/{44 => 48}/filelists/squid | 0 lfs/squid | 34 +++++++++++---- 5 files changed, 77 insertions(+), 8 deletions(-) copy config/rootfiles/core/{44 => 48}/filelists/snort (100%) copy config/rootfiles/core/{44 => 48}/filelists/squid (100%)
Difference in files: diff --git a/config/rootfiles/common/squid b/config/rootfiles/common/squid index dd4122f..461a2a2 100644 --- a/config/rootfiles/common/squid +++ b/config/rootfiles/common/squid @@ -40,6 +40,7 @@ usr/lib/squid/diskd #usr/lib/squid/errors/af/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/af/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/af/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/af/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/af/ERR_ICAP_FAILURE #usr/lib/squid/errors/af/ERR_INVALID_REQ #usr/lib/squid/errors/af/ERR_INVALID_RESP @@ -93,6 +94,7 @@ usr/lib/squid/diskd #usr/lib/squid/errors/ar/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/ar/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/ar/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/ar/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/ar/ERR_ICAP_FAILURE #usr/lib/squid/errors/ar/ERR_INVALID_REQ #usr/lib/squid/errors/ar/ERR_INVALID_RESP @@ -131,6 +133,7 @@ usr/lib/squid/diskd #usr/lib/squid/errors/az/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/az/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/az/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/az/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/az/ERR_ICAP_FAILURE #usr/lib/squid/errors/az/ERR_INVALID_REQ #usr/lib/squid/errors/az/ERR_INVALID_RESP @@ -169,6 +172,7 @@ usr/lib/squid/diskd #usr/lib/squid/errors/bg/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/bg/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/bg/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/bg/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/bg/ERR_ICAP_FAILURE #usr/lib/squid/errors/bg/ERR_INVALID_REQ #usr/lib/squid/errors/bg/ERR_INVALID_RESP @@ -206,6 +210,7 @@ usr/lib/squid/diskd #usr/lib/squid/errors/ca/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/ca/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/ca/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/ca/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/ca/ERR_ICAP_FAILURE #usr/lib/squid/errors/ca/ERR_INVALID_REQ #usr/lib/squid/errors/ca/ERR_INVALID_RESP @@ -244,6 +249,7 @@ usr/lib/squid/diskd #usr/lib/squid/errors/cs/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/cs/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/cs/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/cs/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/cs/ERR_ICAP_FAILURE #usr/lib/squid/errors/cs/ERR_INVALID_REQ #usr/lib/squid/errors/cs/ERR_INVALID_RESP @@ -282,6 +288,7 @@ usr/lib/squid/diskd #usr/lib/squid/errors/da/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/da/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/da/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/da/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/da/ERR_ICAP_FAILURE #usr/lib/squid/errors/da/ERR_INVALID_REQ #usr/lib/squid/errors/da/ERR_INVALID_RESP @@ -324,6 +331,7 @@ usr/lib/squid/errors/de/ERR_FTP_PUT_CREATED usr/lib/squid/errors/de/ERR_FTP_PUT_ERROR usr/lib/squid/errors/de/ERR_FTP_PUT_MODIFIED usr/lib/squid/errors/de/ERR_FTP_UNAVAILABLE +usr/lib/squid/errors/de/ERR_GATEWAY_FAILURE usr/lib/squid/errors/de/ERR_ICAP_FAILURE usr/lib/squid/errors/de/ERR_INVALID_REQ usr/lib/squid/errors/de/ERR_INVALID_RESP @@ -362,6 +370,7 @@ usr/lib/squid/errors/de/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/el/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/el/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/el/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/el/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/el/ERR_ICAP_FAILURE #usr/lib/squid/errors/el/ERR_INVALID_REQ #usr/lib/squid/errors/el/ERR_INVALID_RESP @@ -414,6 +423,7 @@ usr/lib/squid/errors/en/ERR_FTP_PUT_CREATED usr/lib/squid/errors/en/ERR_FTP_PUT_ERROR usr/lib/squid/errors/en/ERR_FTP_PUT_MODIFIED usr/lib/squid/errors/en/ERR_FTP_UNAVAILABLE +usr/lib/squid/errors/en/ERR_GATEWAY_FAILURE usr/lib/squid/errors/en/ERR_ICAP_FAILURE usr/lib/squid/errors/en/ERR_INVALID_REQ usr/lib/squid/errors/en/ERR_INVALID_RESP @@ -470,6 +480,7 @@ usr/lib/squid/errors/es/ERR_FTP_PUT_CREATED usr/lib/squid/errors/es/ERR_FTP_PUT_ERROR usr/lib/squid/errors/es/ERR_FTP_PUT_MODIFIED usr/lib/squid/errors/es/ERR_FTP_UNAVAILABLE +usr/lib/squid/errors/es/ERR_GATEWAY_FAILURE usr/lib/squid/errors/es/ERR_ICAP_FAILURE usr/lib/squid/errors/es/ERR_INVALID_REQ usr/lib/squid/errors/es/ERR_INVALID_RESP @@ -508,6 +519,7 @@ usr/lib/squid/errors/es/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/et/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/et/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/et/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/et/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/et/ERR_ICAP_FAILURE #usr/lib/squid/errors/et/ERR_INVALID_REQ #usr/lib/squid/errors/et/ERR_INVALID_RESP @@ -547,6 +559,7 @@ usr/lib/squid/errors/es/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/fa/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/fa/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/fa/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/fa/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/fa/ERR_ICAP_FAILURE #usr/lib/squid/errors/fa/ERR_INVALID_REQ #usr/lib/squid/errors/fa/ERR_INVALID_RESP @@ -585,6 +598,7 @@ usr/lib/squid/errors/es/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/fi/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/fi/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/fi/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/fi/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/fi/ERR_ICAP_FAILURE #usr/lib/squid/errors/fi/ERR_INVALID_REQ #usr/lib/squid/errors/fi/ERR_INVALID_RESP @@ -628,6 +642,7 @@ usr/lib/squid/errors/fr/ERR_FTP_PUT_CREATED usr/lib/squid/errors/fr/ERR_FTP_PUT_ERROR usr/lib/squid/errors/fr/ERR_FTP_PUT_MODIFIED usr/lib/squid/errors/fr/ERR_FTP_UNAVAILABLE +usr/lib/squid/errors/fr/ERR_GATEWAY_FAILURE usr/lib/squid/errors/fr/ERR_ICAP_FAILURE usr/lib/squid/errors/fr/ERR_INVALID_REQ usr/lib/squid/errors/fr/ERR_INVALID_RESP @@ -666,6 +681,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/he/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/he/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/he/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/he/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/he/ERR_ICAP_FAILURE #usr/lib/squid/errors/he/ERR_INVALID_REQ #usr/lib/squid/errors/he/ERR_INVALID_RESP @@ -704,6 +720,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/hu/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/hu/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/hu/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/hu/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/hu/ERR_ICAP_FAILURE #usr/lib/squid/errors/hu/ERR_INVALID_REQ #usr/lib/squid/errors/hu/ERR_INVALID_RESP @@ -743,6 +760,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/hy/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/hy/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/hy/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/hy/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/hy/ERR_ICAP_FAILURE #usr/lib/squid/errors/hy/ERR_INVALID_REQ #usr/lib/squid/errors/hy/ERR_INVALID_RESP @@ -781,6 +799,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/id/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/id/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/id/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/id/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/id/ERR_ICAP_FAILURE #usr/lib/squid/errors/id/ERR_INVALID_REQ #usr/lib/squid/errors/id/ERR_INVALID_RESP @@ -820,6 +839,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/it/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/it/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/it/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/it/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/it/ERR_ICAP_FAILURE #usr/lib/squid/errors/it/ERR_INVALID_REQ #usr/lib/squid/errors/it/ERR_INVALID_RESP @@ -858,6 +878,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/ja/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/ja/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/ja/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/ja/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/ja/ERR_ICAP_FAILURE #usr/lib/squid/errors/ja/ERR_INVALID_REQ #usr/lib/squid/errors/ja/ERR_INVALID_RESP @@ -897,6 +918,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/ko/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/ko/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/ko/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/ko/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/ko/ERR_ICAP_FAILURE #usr/lib/squid/errors/ko/ERR_INVALID_REQ #usr/lib/squid/errors/ko/ERR_INVALID_RESP @@ -935,6 +957,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/lt/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/lt/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/lt/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/lt/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/lt/ERR_ICAP_FAILURE #usr/lib/squid/errors/lt/ERR_INVALID_REQ #usr/lib/squid/errors/lt/ERR_INVALID_RESP @@ -973,6 +996,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/lv/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/lv/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/lv/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/lv/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/lv/ERR_ICAP_FAILURE #usr/lib/squid/errors/lv/ERR_INVALID_REQ #usr/lib/squid/errors/lv/ERR_INVALID_RESP @@ -1011,6 +1035,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/ms/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/ms/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/ms/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/ms/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/ms/ERR_ICAP_FAILURE #usr/lib/squid/errors/ms/ERR_INVALID_REQ #usr/lib/squid/errors/ms/ERR_INVALID_RESP @@ -1049,6 +1074,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/nl/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/nl/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/nl/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/nl/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/nl/ERR_ICAP_FAILURE #usr/lib/squid/errors/nl/ERR_INVALID_REQ #usr/lib/squid/errors/nl/ERR_INVALID_RESP @@ -1086,6 +1112,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/oc/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/oc/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/oc/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/oc/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/oc/ERR_ICAP_FAILURE #usr/lib/squid/errors/oc/ERR_INVALID_REQ #usr/lib/squid/errors/oc/ERR_INVALID_RESP @@ -1124,6 +1151,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/pl/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/pl/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/pl/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/pl/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/pl/ERR_ICAP_FAILURE #usr/lib/squid/errors/pl/ERR_INVALID_REQ #usr/lib/squid/errors/pl/ERR_INVALID_RESP @@ -1162,6 +1190,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/pt-br/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/pt-br/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/pt-br/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/pt-br/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/pt-br/ERR_ICAP_FAILURE #usr/lib/squid/errors/pt-br/ERR_INVALID_REQ #usr/lib/squid/errors/pt-br/ERR_INVALID_RESP @@ -1199,6 +1228,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/pt/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/pt/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/pt/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/pt/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/pt/ERR_ICAP_FAILURE #usr/lib/squid/errors/pt/ERR_INVALID_REQ #usr/lib/squid/errors/pt/ERR_INVALID_RESP @@ -1238,6 +1268,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/ro/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/ro/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/ro/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/ro/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/ro/ERR_ICAP_FAILURE #usr/lib/squid/errors/ro/ERR_INVALID_REQ #usr/lib/squid/errors/ro/ERR_INVALID_RESP @@ -1276,6 +1307,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/ru/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/ru/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/ru/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/ru/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/ru/ERR_ICAP_FAILURE #usr/lib/squid/errors/ru/ERR_INVALID_REQ #usr/lib/squid/errors/ru/ERR_INVALID_RESP @@ -1314,6 +1346,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/sk/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/sk/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/sk/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/sk/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/sk/ERR_ICAP_FAILURE #usr/lib/squid/errors/sk/ERR_INVALID_REQ #usr/lib/squid/errors/sk/ERR_INVALID_RESP @@ -1352,6 +1385,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/sr-cyrl/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/sr-cyrl/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/sr-cyrl/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/sr-cyrl/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/sr-cyrl/ERR_ICAP_FAILURE #usr/lib/squid/errors/sr-cyrl/ERR_INVALID_REQ #usr/lib/squid/errors/sr-cyrl/ERR_INVALID_RESP @@ -1390,6 +1424,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/sr-latn/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/sr-latn/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/sr-latn/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/sr-latn/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/sr-latn/ERR_ICAP_FAILURE #usr/lib/squid/errors/sr-latn/ERR_INVALID_REQ #usr/lib/squid/errors/sr-latn/ERR_INVALID_RESP @@ -1430,6 +1465,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/sv/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/sv/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/sv/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/sv/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/sv/ERR_ICAP_FAILURE #usr/lib/squid/errors/sv/ERR_INVALID_REQ #usr/lib/squid/errors/sv/ERR_INVALID_RESP @@ -1467,6 +1503,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/templates/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/templates/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/templates/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/templates/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/templates/ERR_ICAP_FAILURE #usr/lib/squid/errors/templates/ERR_INVALID_REQ #usr/lib/squid/errors/templates/ERR_INVALID_RESP @@ -1505,6 +1542,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/th/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/th/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/th/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/th/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/th/ERR_ICAP_FAILURE #usr/lib/squid/errors/th/ERR_INVALID_REQ #usr/lib/squid/errors/th/ERR_INVALID_RESP @@ -1543,6 +1581,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/tr/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/tr/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/tr/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/tr/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/tr/ERR_ICAP_FAILURE #usr/lib/squid/errors/tr/ERR_INVALID_REQ #usr/lib/squid/errors/tr/ERR_INVALID_RESP @@ -1581,6 +1620,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/uk/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/uk/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/uk/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/uk/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/uk/ERR_ICAP_FAILURE #usr/lib/squid/errors/uk/ERR_INVALID_REQ #usr/lib/squid/errors/uk/ERR_INVALID_RESP @@ -1618,6 +1658,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/uz/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/uz/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/uz/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/uz/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/uz/ERR_ICAP_FAILURE #usr/lib/squid/errors/uz/ERR_INVALID_REQ #usr/lib/squid/errors/uz/ERR_INVALID_RESP @@ -1656,6 +1697,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/vi/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/vi/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/vi/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/vi/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/vi/ERR_ICAP_FAILURE #usr/lib/squid/errors/vi/ERR_INVALID_REQ #usr/lib/squid/errors/vi/ERR_INVALID_RESP @@ -1693,6 +1735,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/zh-cn/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/zh-cn/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/zh-cn/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/zh-cn/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/zh-cn/ERR_ICAP_FAILURE #usr/lib/squid/errors/zh-cn/ERR_INVALID_REQ #usr/lib/squid/errors/zh-cn/ERR_INVALID_RESP @@ -1733,6 +1776,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/zh-tw/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/zh-tw/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/zh-tw/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/zh-tw/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/zh-tw/ERR_ICAP_FAILURE #usr/lib/squid/errors/zh-tw/ERR_INVALID_REQ #usr/lib/squid/errors/zh-tw/ERR_INVALID_RESP @@ -1787,22 +1831,28 @@ usr/lib/squid/msnt_auth usr/lib/squid/ncsa_auth usr/lib/squid/no_check.pl 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/sbin/squid usr/sbin/updxlrator #usr/share/man/man1/squidclient.1 #usr/share/man/man8/cachemgr.cgi.8 #usr/share/man/man8/ncsa_auth.8 +#usr/share/man/man8/pam_auth.8 #usr/share/man/man8/squid.8 #usr/share/man/man8/squid_ldap_auth.8 #usr/share/man/man8/squid_ldap_group.8 +#usr/share/man/man8/squid_radius_auth.8 #usr/share/man/man8/squid_session.8 #usr/share/man/man8/squid_unix_group.8 var/ipfire/proxy/errorpage-ipfire.css diff --git a/config/rootfiles/core/48/exclude b/config/rootfiles/core/48/exclude index e69de29..6fe46b4 100644 --- a/config/rootfiles/core/48/exclude +++ b/config/rootfiles/core/48/exclude @@ -0,0 +1 @@ +/srv/web/ipfire/html/proxy.pac diff --git a/config/rootfiles/core/48/filelists/snort b/config/rootfiles/core/48/filelists/snort new file mode 120000 index 0000000..9406ce0 --- /dev/null +++ b/config/rootfiles/core/48/filelists/snort @@ -0,0 +1 @@ +../../../common/snort \ No newline at end of file diff --git a/config/rootfiles/core/48/filelists/squid b/config/rootfiles/core/48/filelists/squid new file mode 120000 index 0000000..2dc8372 --- /dev/null +++ b/config/rootfiles/core/48/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/lfs/squid b/lfs/squid index 16df621..bdc1646 100644 --- a/lfs/squid +++ b/lfs/squid @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2010 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2011 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,10 +24,10 @@
include Config
-VER = 3.1.10 +VER = 3.1.11
THISAPP = squid-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 0a233d8966a563a795065ccb654caa4f +$(DL_FILE)_MD5 = 4b071d2bf4959f2d081344f2f69dd2f1
install : $(TARGET)
@@ -69,26 +69,44 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xzf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xjf $(DIR_DL)/$(DL_FILE)
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 \ - --disable-poll --disable-icmp --disable-wccp \ + --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" \ + --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="16384" \ - --with-large-files + --with-filedescriptors=16384 \ + --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 \ + --disable-cache-digests \ + --enable-forw-via-db \ + --enable-htcp \ + --enable-ipf-transparent \ + --enable-kill-parent-hack \ + --disable-wccpv2 \ + --disable-icap-client \ + --disable-esi
cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install
hooks/post-receive -- IPFire 2.x development tree