squid: Update to 3.5.17

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Matthias Fischer
2016-04-22 11:15:10 +02:00
committed by Michael Tremer
parent 3d7e6b4b61
commit 77d0467c05
7 changed files with 151 additions and 299 deletions

View File

@@ -6,8 +6,6 @@ etc/squid/errorpage.css
etc/squid/errors
etc/squid/mime.conf
#etc/squid/mime.conf.default
etc/squid/msntauth.conf
#etc/squid/msntauth.conf.default
etc/squid/squid.conf
#etc/squid/squid.conf.default
#etc/squid/squid.conf.documented
@@ -22,7 +20,6 @@ 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
@@ -32,8 +29,9 @@ 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/basic_smb_lm_auth
#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
@@ -529,6 +527,7 @@ usr/lib/squid/errors/en/error-details.txt
#usr/lib/squid/errors/es-pr
#usr/lib/squid/errors/es-py
#usr/lib/squid/errors/es-sv
#usr/lib/squid/errors/es-us
#usr/lib/squid/errors/es-uy
#usr/lib/squid/errors/es-ve
usr/lib/squid/errors/es/ERR_ACCESS_DENIED
@@ -1021,6 +1020,50 @@ usr/lib/squid/errors/fr/error-details.txt
#usr/lib/squid/errors/ja/ERR_WRITE_ERROR
#usr/lib/squid/errors/ja/ERR_ZERO_SIZE_OBJECT
#usr/lib/squid/errors/ja/error-details.txt
#usr/lib/squid/errors/ka
#usr/lib/squid/errors/ka/ERR_ACCESS_DENIED
#usr/lib/squid/errors/ka/ERR_ACL_TIME_QUOTA_EXCEEDED
#usr/lib/squid/errors/ka/ERR_AGENT_CONFIGURE
#usr/lib/squid/errors/ka/ERR_AGENT_WPAD
#usr/lib/squid/errors/ka/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/ka/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/ka/ERR_CANNOT_FORWARD
#usr/lib/squid/errors/ka/ERR_CONFLICT_HOST
#usr/lib/squid/errors/ka/ERR_CONNECT_FAIL
#usr/lib/squid/errors/ka/ERR_DIR_LISTING
#usr/lib/squid/errors/ka/ERR_DNS_FAIL
#usr/lib/squid/errors/ka/ERR_ESI
#usr/lib/squid/errors/ka/ERR_FORWARDING_DENIED
#usr/lib/squid/errors/ka/ERR_FTP_DISABLED
#usr/lib/squid/errors/ka/ERR_FTP_FAILURE
#usr/lib/squid/errors/ka/ERR_FTP_FORBIDDEN
#usr/lib/squid/errors/ka/ERR_FTP_NOT_FOUND
#usr/lib/squid/errors/ka/ERR_FTP_PUT_CREATED
#usr/lib/squid/errors/ka/ERR_FTP_PUT_ERROR
#usr/lib/squid/errors/ka/ERR_FTP_PUT_MODIFIED
#usr/lib/squid/errors/ka/ERR_FTP_UNAVAILABLE
#usr/lib/squid/errors/ka/ERR_GATEWAY_FAILURE
#usr/lib/squid/errors/ka/ERR_ICAP_FAILURE
#usr/lib/squid/errors/ka/ERR_INVALID_REQ
#usr/lib/squid/errors/ka/ERR_INVALID_RESP
#usr/lib/squid/errors/ka/ERR_INVALID_URL
#usr/lib/squid/errors/ka/ERR_LIFETIME_EXP
#usr/lib/squid/errors/ka/ERR_NO_RELAY
#usr/lib/squid/errors/ka/ERR_ONLY_IF_CACHED_MISS
#usr/lib/squid/errors/ka/ERR_PRECONDITION_FAILED
#usr/lib/squid/errors/ka/ERR_READ_ERROR
#usr/lib/squid/errors/ka/ERR_READ_TIMEOUT
#usr/lib/squid/errors/ka/ERR_SECURE_CONNECT_FAIL
#usr/lib/squid/errors/ka/ERR_SHUTTING_DOWN
#usr/lib/squid/errors/ka/ERR_SOCKET_FAILURE
#usr/lib/squid/errors/ka/ERR_TOO_BIG
#usr/lib/squid/errors/ka/ERR_UNSUP_HTTPVERSION
#usr/lib/squid/errors/ka/ERR_UNSUP_REQ
#usr/lib/squid/errors/ka/ERR_URN_RESOLVE
#usr/lib/squid/errors/ka/ERR_WRITE_ERROR
#usr/lib/squid/errors/ka/ERR_ZERO_SIZE_OBJECT
#usr/lib/squid/errors/ka/error-details.txt
#usr/lib/squid/errors/ka-ge
#usr/lib/squid/errors/ko
#usr/lib/squid/errors/ko-kp
#usr/lib/squid/errors/ko-kr
@@ -1596,6 +1639,9 @@ usr/lib/squid/errors/ru/error-details.txt
#usr/lib/squid/errors/sl/error-details.txt
#usr/lib/squid/errors/sr
#usr/lib/squid/errors/sr-cyrl
#usr/lib/squid/errors/sr-cyrl-cs
#usr/lib/squid/errors/sr-cyrl-me
#usr/lib/squid/errors/sr-cyrl-rs
#usr/lib/squid/errors/sr-cyrl/ERR_ACCESS_DENIED
#usr/lib/squid/errors/sr-cyrl/ERR_ACL_TIME_QUOTA_EXCEEDED
#usr/lib/squid/errors/sr-cyrl/ERR_AGENT_CONFIGURE
@@ -1640,6 +1686,8 @@ usr/lib/squid/errors/ru/error-details.txt
#usr/lib/squid/errors/sr-cyrl/error-details.txt
#usr/lib/squid/errors/sr-latn
#usr/lib/squid/errors/sr-latn-cs
#usr/lib/squid/errors/sr-latn-me
#usr/lib/squid/errors/sr-latn-rs
#usr/lib/squid/errors/sr-latn/ERR_ACCESS_DENIED
#usr/lib/squid/errors/sr-latn/ERR_ACL_TIME_QUOTA_EXCEEDED
#usr/lib/squid/errors/sr-latn/ERR_AGENT_CONFIGURE
@@ -1682,6 +1730,7 @@ usr/lib/squid/errors/ru/error-details.txt
#usr/lib/squid/errors/sr-latn/ERR_WRITE_ERROR
#usr/lib/squid/errors/sr-latn/ERR_ZERO_SIZE_OBJECT
#usr/lib/squid/errors/sr-latn/error-details.txt
#usr/lib/squid/errors/sr-rs
#usr/lib/squid/errors/sr-sp
#usr/lib/squid/errors/sv
#usr/lib/squid/errors/sv-fi
@@ -1991,97 +2040,104 @@ usr/lib/squid/errors/tr/error-details.txt
#usr/lib/squid/errors/vi/ERR_ZERO_SIZE_OBJECT
#usr/lib/squid/errors/vi/error-details.txt
#usr/lib/squid/errors/zh-cn
#usr/lib/squid/errors/zh-cn/ERR_ACCESS_DENIED
#usr/lib/squid/errors/zh-cn/ERR_ACL_TIME_QUOTA_EXCEEDED
#usr/lib/squid/errors/zh-cn/ERR_AGENT_CONFIGURE
#usr/lib/squid/errors/zh-cn/ERR_AGENT_WPAD
#usr/lib/squid/errors/zh-cn/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/zh-cn/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/zh-cn/ERR_CANNOT_FORWARD
#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
#usr/lib/squid/errors/zh-cn/ERR_ESI
#usr/lib/squid/errors/zh-cn/ERR_FORWARDING_DENIED
#usr/lib/squid/errors/zh-cn/ERR_FTP_DISABLED
#usr/lib/squid/errors/zh-cn/ERR_FTP_FAILURE
#usr/lib/squid/errors/zh-cn/ERR_FTP_FORBIDDEN
#usr/lib/squid/errors/zh-cn/ERR_FTP_NOT_FOUND
#usr/lib/squid/errors/zh-cn/ERR_FTP_PUT_CREATED
#usr/lib/squid/errors/zh-cn/ERR_FTP_PUT_ERROR
#usr/lib/squid/errors/zh-cn/ERR_FTP_PUT_MODIFIED
#usr/lib/squid/errors/zh-cn/ERR_FTP_UNAVAILABLE
#usr/lib/squid/errors/zh-cn/ERR_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
#usr/lib/squid/errors/zh-cn/ERR_INVALID_URL
#usr/lib/squid/errors/zh-cn/ERR_LIFETIME_EXP
#usr/lib/squid/errors/zh-cn/ERR_NO_RELAY
#usr/lib/squid/errors/zh-cn/ERR_ONLY_IF_CACHED_MISS
#usr/lib/squid/errors/zh-cn/ERR_PRECONDITION_FAILED
#usr/lib/squid/errors/zh-cn/ERR_READ_ERROR
#usr/lib/squid/errors/zh-cn/ERR_READ_TIMEOUT
#usr/lib/squid/errors/zh-cn/ERR_SECURE_CONNECT_FAIL
#usr/lib/squid/errors/zh-cn/ERR_SHUTTING_DOWN
#usr/lib/squid/errors/zh-cn/ERR_SOCKET_FAILURE
#usr/lib/squid/errors/zh-cn/ERR_TOO_BIG
#usr/lib/squid/errors/zh-cn/ERR_UNSUP_HTTPVERSION
#usr/lib/squid/errors/zh-cn/ERR_UNSUP_REQ
#usr/lib/squid/errors/zh-cn/ERR_URN_RESOLVE
#usr/lib/squid/errors/zh-cn/ERR_WRITE_ERROR
#usr/lib/squid/errors/zh-cn/ERR_ZERO_SIZE_OBJECT
#usr/lib/squid/errors/zh-cn/error-details.txt
#usr/lib/squid/errors/zh-hans
#usr/lib/squid/errors/zh-hans-cn
#usr/lib/squid/errors/zh-hans-sg
#usr/lib/squid/errors/zh-hans/ERR_ACCESS_DENIED
#usr/lib/squid/errors/zh-hans/ERR_ACL_TIME_QUOTA_EXCEEDED
#usr/lib/squid/errors/zh-hans/ERR_AGENT_CONFIGURE
#usr/lib/squid/errors/zh-hans/ERR_AGENT_WPAD
#usr/lib/squid/errors/zh-hans/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/zh-hans/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/zh-hans/ERR_CANNOT_FORWARD
#usr/lib/squid/errors/zh-hans/ERR_CONFLICT_HOST
#usr/lib/squid/errors/zh-hans/ERR_CONNECT_FAIL
#usr/lib/squid/errors/zh-hans/ERR_DIR_LISTING
#usr/lib/squid/errors/zh-hans/ERR_DNS_FAIL
#usr/lib/squid/errors/zh-hans/ERR_ESI
#usr/lib/squid/errors/zh-hans/ERR_FORWARDING_DENIED
#usr/lib/squid/errors/zh-hans/ERR_FTP_DISABLED
#usr/lib/squid/errors/zh-hans/ERR_FTP_FAILURE
#usr/lib/squid/errors/zh-hans/ERR_FTP_FORBIDDEN
#usr/lib/squid/errors/zh-hans/ERR_FTP_NOT_FOUND
#usr/lib/squid/errors/zh-hans/ERR_FTP_PUT_CREATED
#usr/lib/squid/errors/zh-hans/ERR_FTP_PUT_ERROR
#usr/lib/squid/errors/zh-hans/ERR_FTP_PUT_MODIFIED
#usr/lib/squid/errors/zh-hans/ERR_FTP_UNAVAILABLE
#usr/lib/squid/errors/zh-hans/ERR_GATEWAY_FAILURE
#usr/lib/squid/errors/zh-hans/ERR_ICAP_FAILURE
#usr/lib/squid/errors/zh-hans/ERR_INVALID_REQ
#usr/lib/squid/errors/zh-hans/ERR_INVALID_RESP
#usr/lib/squid/errors/zh-hans/ERR_INVALID_URL
#usr/lib/squid/errors/zh-hans/ERR_LIFETIME_EXP
#usr/lib/squid/errors/zh-hans/ERR_NO_RELAY
#usr/lib/squid/errors/zh-hans/ERR_ONLY_IF_CACHED_MISS
#usr/lib/squid/errors/zh-hans/ERR_PRECONDITION_FAILED
#usr/lib/squid/errors/zh-hans/ERR_READ_ERROR
#usr/lib/squid/errors/zh-hans/ERR_READ_TIMEOUT
#usr/lib/squid/errors/zh-hans/ERR_SECURE_CONNECT_FAIL
#usr/lib/squid/errors/zh-hans/ERR_SHUTTING_DOWN
#usr/lib/squid/errors/zh-hans/ERR_SOCKET_FAILURE
#usr/lib/squid/errors/zh-hans/ERR_TOO_BIG
#usr/lib/squid/errors/zh-hans/ERR_UNSUP_HTTPVERSION
#usr/lib/squid/errors/zh-hans/ERR_UNSUP_REQ
#usr/lib/squid/errors/zh-hans/ERR_URN_RESOLVE
#usr/lib/squid/errors/zh-hans/ERR_WRITE_ERROR
#usr/lib/squid/errors/zh-hans/ERR_ZERO_SIZE_OBJECT
#usr/lib/squid/errors/zh-hans/error-details.txt
#usr/lib/squid/errors/zh-hant
#usr/lib/squid/errors/zh-hant-hk
#usr/lib/squid/errors/zh-hant-mo
#usr/lib/squid/errors/zh-hant-tw
#usr/lib/squid/errors/zh-hant/ERR_ACCESS_DENIED
#usr/lib/squid/errors/zh-hant/ERR_ACL_TIME_QUOTA_EXCEEDED
#usr/lib/squid/errors/zh-hant/ERR_AGENT_CONFIGURE
#usr/lib/squid/errors/zh-hant/ERR_AGENT_WPAD
#usr/lib/squid/errors/zh-hant/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/zh-hant/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/zh-hant/ERR_CANNOT_FORWARD
#usr/lib/squid/errors/zh-hant/ERR_CONFLICT_HOST
#usr/lib/squid/errors/zh-hant/ERR_CONNECT_FAIL
#usr/lib/squid/errors/zh-hant/ERR_DIR_LISTING
#usr/lib/squid/errors/zh-hant/ERR_DNS_FAIL
#usr/lib/squid/errors/zh-hant/ERR_ESI
#usr/lib/squid/errors/zh-hant/ERR_FORWARDING_DENIED
#usr/lib/squid/errors/zh-hant/ERR_FTP_DISABLED
#usr/lib/squid/errors/zh-hant/ERR_FTP_FAILURE
#usr/lib/squid/errors/zh-hant/ERR_FTP_FORBIDDEN
#usr/lib/squid/errors/zh-hant/ERR_FTP_NOT_FOUND
#usr/lib/squid/errors/zh-hant/ERR_FTP_PUT_CREATED
#usr/lib/squid/errors/zh-hant/ERR_FTP_PUT_ERROR
#usr/lib/squid/errors/zh-hant/ERR_FTP_PUT_MODIFIED
#usr/lib/squid/errors/zh-hant/ERR_FTP_UNAVAILABLE
#usr/lib/squid/errors/zh-hant/ERR_GATEWAY_FAILURE
#usr/lib/squid/errors/zh-hant/ERR_ICAP_FAILURE
#usr/lib/squid/errors/zh-hant/ERR_INVALID_REQ
#usr/lib/squid/errors/zh-hant/ERR_INVALID_RESP
#usr/lib/squid/errors/zh-hant/ERR_INVALID_URL
#usr/lib/squid/errors/zh-hant/ERR_LIFETIME_EXP
#usr/lib/squid/errors/zh-hant/ERR_NO_RELAY
#usr/lib/squid/errors/zh-hant/ERR_ONLY_IF_CACHED_MISS
#usr/lib/squid/errors/zh-hant/ERR_PRECONDITION_FAILED
#usr/lib/squid/errors/zh-hant/ERR_READ_ERROR
#usr/lib/squid/errors/zh-hant/ERR_READ_TIMEOUT
#usr/lib/squid/errors/zh-hant/ERR_SECURE_CONNECT_FAIL
#usr/lib/squid/errors/zh-hant/ERR_SHUTTING_DOWN
#usr/lib/squid/errors/zh-hant/ERR_SOCKET_FAILURE
#usr/lib/squid/errors/zh-hant/ERR_TOO_BIG
#usr/lib/squid/errors/zh-hant/ERR_UNSUP_HTTPVERSION
#usr/lib/squid/errors/zh-hant/ERR_UNSUP_REQ
#usr/lib/squid/errors/zh-hant/ERR_URN_RESOLVE
#usr/lib/squid/errors/zh-hant/ERR_WRITE_ERROR
#usr/lib/squid/errors/zh-hant/ERR_ZERO_SIZE_OBJECT
#usr/lib/squid/errors/zh-hant/error-details.txt
#usr/lib/squid/errors/zh-hk
#usr/lib/squid/errors/zh-mo
#usr/lib/squid/errors/zh-sg
#usr/lib/squid/errors/zh-tw
#usr/lib/squid/errors/zh-tw/ERR_ACCESS_DENIED
#usr/lib/squid/errors/zh-tw/ERR_ACL_TIME_QUOTA_EXCEEDED
#usr/lib/squid/errors/zh-tw/ERR_AGENT_CONFIGURE
#usr/lib/squid/errors/zh-tw/ERR_AGENT_WPAD
#usr/lib/squid/errors/zh-tw/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/zh-tw/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/zh-tw/ERR_CANNOT_FORWARD
#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
#usr/lib/squid/errors/zh-tw/ERR_ESI
#usr/lib/squid/errors/zh-tw/ERR_FORWARDING_DENIED
#usr/lib/squid/errors/zh-tw/ERR_FTP_DISABLED
#usr/lib/squid/errors/zh-tw/ERR_FTP_FAILURE
#usr/lib/squid/errors/zh-tw/ERR_FTP_FORBIDDEN
#usr/lib/squid/errors/zh-tw/ERR_FTP_NOT_FOUND
#usr/lib/squid/errors/zh-tw/ERR_FTP_PUT_CREATED
#usr/lib/squid/errors/zh-tw/ERR_FTP_PUT_ERROR
#usr/lib/squid/errors/zh-tw/ERR_FTP_PUT_MODIFIED
#usr/lib/squid/errors/zh-tw/ERR_FTP_UNAVAILABLE
#usr/lib/squid/errors/zh-tw/ERR_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
#usr/lib/squid/errors/zh-tw/ERR_INVALID_URL
#usr/lib/squid/errors/zh-tw/ERR_LIFETIME_EXP
#usr/lib/squid/errors/zh-tw/ERR_NO_RELAY
#usr/lib/squid/errors/zh-tw/ERR_ONLY_IF_CACHED_MISS
#usr/lib/squid/errors/zh-tw/ERR_PRECONDITION_FAILED
#usr/lib/squid/errors/zh-tw/ERR_READ_ERROR
#usr/lib/squid/errors/zh-tw/ERR_READ_TIMEOUT
#usr/lib/squid/errors/zh-tw/ERR_SECURE_CONNECT_FAIL
#usr/lib/squid/errors/zh-tw/ERR_SHUTTING_DOWN
#usr/lib/squid/errors/zh-tw/ERR_SOCKET_FAILURE
#usr/lib/squid/errors/zh-tw/ERR_TOO_BIG
#usr/lib/squid/errors/zh-tw/ERR_UNSUP_HTTPVERSION
#usr/lib/squid/errors/zh-tw/ERR_UNSUP_REQ
#usr/lib/squid/errors/zh-tw/ERR_URN_RESOLVE
#usr/lib/squid/errors/zh-tw/ERR_WRITE_ERROR
#usr/lib/squid/errors/zh-tw/ERR_ZERO_SIZE_OBJECT
#usr/lib/squid/errors/zh-tw/error-details.txt
usr/lib/squid/ext_delayer_acl
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
@@ -2158,12 +2214,15 @@ usr/sbin/updxlrator
#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_msnt_multi_domain_auth.8
#usr/share/man/man8/basic_ncsa_auth.8
#usr/share/man/man8/basic_pam_auth.8
#usr/share/man/man8/basic_pop3_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/digest_file_auth.8
#usr/share/man/man8/ext_delayer_acl.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
@@ -2173,7 +2232,6 @@ usr/sbin/updxlrator
#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/negotiate_kerberos_auth.8
#usr/share/man/man8/squid.8
#usr/share/man/man8/storeid_file_rewrite.8
#var/cache/squid

View File

@@ -24,7 +24,7 @@
include Config
VER = 3.4.14
VER = 3.5.17
THISAPP = squid-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 4e7d7d062159484563ef11f69a0df50a
$(DL_FILE)_MD5 = 2dc73cc01e77b1bd16d9070780ae79b1
install : $(TARGET)
@@ -70,14 +70,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xaf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.4-13228.patch
cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.4.14-fix-max-file-descriptors.patch
cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.4-13230.patch
cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.4-13231.patch
cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.4-13232.patch
cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.4-13233.patch
cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.4-13234.patch
cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.4-13235.patch
cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.5.17-fix-max-file-descriptors.patch
cd $(DIR_APP) && autoreconf -vfi
cd $(DIR_APP)/libltdl && autoreconf -vfi

View File

@@ -1,35 +0,0 @@
------------------------------------------------------------
revno: 13228
revision-id: squid3@treenet.co.nz-20150828132334-3r7v4kh1lrqprrqg
parent: squid3@treenet.co.nz-20150801072237-5tzh2dczozz1e8sq
fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=3696
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.4
timestamp: Fri 2015-08-28 06:23:34 -0700
message:
Bug 3696: crash when client delay pools are activated
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20150828132334-3r7v4kh1lrqprrqg
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
# testament_sha1: d193928c4656282187f2a31bf66d43fd4c247177
# timestamp: 2015-08-28 13:33:44 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
# base_revision_id: squid3@treenet.co.nz-20150801072237-\
# 5tzh2dczozz1e8sq
#
# Begin patch
=== modified file 'src/client_side.cc'
--- src/client_side.cc 2014-06-21 04:24:37 +0000
+++ src/client_side.cc 2015-08-28 13:23:34 +0000
@@ -3447,7 +3447,8 @@
/* pools require explicit 'allow' to assign a client into them */
if (pools[pool].access) {
- ch.accessList = pools[pool].access;
+ cbdataReferenceDone(ch.accessList);
+ ch.accessList = cbdataReference(pools[pool].access);
allow_t answer = ch.fastCheck();
if (answer == ACCESS_ALLOWED) {

View File

@@ -1,44 +0,0 @@
------------------------------------------------------------
revno: 13230
revision-id: squid3@treenet.co.nz-20160212045316-zwx4r9we4gf27rx3
parent: squid3@treenet.co.nz-20151119051038-vwclso11p68sgvxc
fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=4431
author: Marcos Mello <marcosfrm@gmail.com>
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.4
timestamp: Fri 2016-02-12 17:53:16 +1300
message:
Bug 4431: C code is not compiled with CFLAGS
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20160212045316-zwx4r9we4gf27rx3
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
# testament_sha1: 53c8d70db04dad826815fb86995cda7e99f1d8e2
# timestamp: 2016-02-12 05:50:53 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
# base_revision_id: squid3@treenet.co.nz-20151119051038-\
# vwclso11p68sgvxc
#
# Begin patch
=== modified file 'acinclude/compiler-flags.m4'
--- acinclude/compiler-flags.m4 2015-01-09 10:30:44 +0000
+++ acinclude/compiler-flags.m4 2016-02-12 04:53:16 +0000
@@ -36,7 +36,7 @@
AC_CACHE_CHECK([whether compiler accepts $2],[$1],
[{
AC_REQUIRE([AC_PROG_CC])
- SAVED_FLAGS="$CFLAGS"
+ SAVED_CFLAGS="$CFLAGS"
SAVED_CXXFLAGS="$CXXFLAGS"
CFLAGS="$CFLAGS $2"
CXXFLAGS="$CXXFLAGS $2"
@@ -60,7 +60,7 @@
AC_CACHE_CHECK([whether compiler requires $2],[$1],
[{
AC_REQUIRE([AC_PROG_CC])
- SAVED_FLAGS="$CFLAGS"
+ SAVED_CFLAGS="$CFLAGS"
SAVED_CXXFLAGS="$CXXFLAGS"
AC_COMPILE_IFELSE([AC_LANG_PROGRAM($3,$4)],[$1=no],[],[$1=no])
if test "x$1" != "xno" ; then

View File

@@ -1,48 +0,0 @@
------------------------------------------------------------
revno: 13231
revision-id: squid3@treenet.co.nz-20160220150859-3unryicod1rcx9rm
parent: squid3@treenet.co.nz-20160212045316-zwx4r9we4gf27rx3
fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=4323
author: Francesco Chemolli <kinkie@squid-cache.org>
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.4
timestamp: Sun 2016-02-21 04:08:59 +1300
message:
Bug 4323: Netfilter broken cross-includes with Linux 4.2
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20160220150859-3unryicod1rcx9rm
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
# testament_sha1: 10fa174d2821207d0bf89ef3013e8f4c3f99f9e3
# timestamp: 2016-02-20 15:50:56 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
# base_revision_id: squid3@treenet.co.nz-20160212045316-\
# zwx4r9we4gf27rx3
#
# Begin patch
=== modified file 'compat/os/linux.h'
--- compat/os/linux.h 2012-08-28 13:00:30 +0000
+++ compat/os/linux.h 2016-02-20 15:08:59 +0000
@@ -22,6 +22,21 @@
#endif
/*
+ * Netfilter header madness. (see Bug 4323)
+ *
+ * Netfilter have a history of defining their own versions of network protocol
+ * primitives without sufficient protection against the POSIX defines which are
+ * aways present in Linux.
+ *
+ * netinet/in.h must be included before any other sys header in order to properly
+ * activate include guards in <linux/libc-compat.h> the kernel maintainers added
+ * to workaround it.
+ */
+#if HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+
+/*
* sys/capability.h is only needed in Linux apparently.
*
* HACK: LIBCAP_BROKEN Ugly glue to get around linux header madness colliding with glibc

View File

@@ -1,51 +0,0 @@
------------------------------------------------------------
revno: 13232
revision-id: squid3@treenet.co.nz-20160330141410-t6p2dhzr8ri36fap
parent: squid3@treenet.co.nz-20160220150859-3unryicod1rcx9rm
author: Yuriy M. Kaminskiy <yumkam@gmail.com>
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.4
timestamp: Thu 2016-03-31 03:14:10 +1300
message:
pinger: Fix buffer overflow in Icmp6::Recv
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20160330141410-t6p2dhzr8ri36fap
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
# testament_sha1: e404755509c03ec58c0c293552a7f2a579810fd3
# timestamp: 2016-03-30 14:51:02 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
# base_revision_id: squid3@treenet.co.nz-20160220150859-\
# 3unryicod1rcx9rm
#
# Begin patch
=== modified file 'src/icmp/Icmp6.cc'
--- src/icmp/Icmp6.cc 2014-09-15 05:06:14 +0000
+++ src/icmp/Icmp6.cc 2016-03-30 14:14:10 +0000
@@ -277,7 +277,7 @@
#define ip6_hops // HOPS!!! (can it be true??)
ip = (struct ip6_hdr *) pkt;
- pkt += sizeof(ip6_hdr);
+ NP: echo size needs to +sizeof(ip6_hdr);
debugs(42, DBG_CRITICAL, HERE << "ip6_nxt=" << ip->ip6_nxt <<
", ip6_plen=" << ip->ip6_plen <<
@@ -288,7 +288,6 @@
*/
icmp6header = (struct icmp6_hdr *) pkt;
- pkt += sizeof(icmp6_hdr);
if (icmp6header->icmp6_type != ICMP6_ECHO_REPLY) {
@@ -313,7 +312,7 @@
return;
}
- echo = (icmpEchoData *) pkt;
+ echo = (icmpEchoData *) (pkt + sizeof(icmp6_hdr));
preply.opcode = echo->opcode;

View File

@@ -1,21 +0,0 @@
--- configure.ac~ 2016-01-23 01:27:44.078013879 +0000
+++ configure.ac 2016-01-23 01:28:19.422179243 +0000
@@ -2573,6 +2573,9 @@
;;
esac
+SQUID_CHECK_DEFAULT_FD_SETSIZE
+SQUID_CHECK_MAXFD
+
dnl --with-maxfd present for compatibility with Squid-2.
dnl undocumented in ./configure --help to encourage using the Squid-3 directive
AC_ARG_WITH(maxfd,,
@@ -2603,8 +2606,6 @@
esac
])
-SQUID_CHECK_DEFAULT_FD_SETSIZE
-SQUID_CHECK_MAXFD
if test "x$squid_filedescriptors_num" != "x"; then
AC_MSG_NOTICE([Default number of fieldescriptors: $squid_filedescriptors_num])
fi