From 98bf48680ca967319befee7bf8c5b462bdd2cc84 Mon Sep 17 00:00:00 2001 From: Juergen Daubert Date: Mon, 19 Mar 2018 13:00:18 +0100 Subject: [PATCH] squid: update to 4.0.24 --- squid/.footprint | 13 ++++++++----- squid/.md5sum | 4 +--- squid/.signature | 10 ++++------ squid/Pkgfile | 11 ++++------- squid/SQUID-2018_1.patch | 28 ---------------------------- squid/SQUID-2018_2.patch | 23 ----------------------- 6 files changed, 17 insertions(+), 72 deletions(-) delete mode 100644 squid/SQUID-2018_1.patch delete mode 100644 squid/SQUID-2018_2.patch diff --git a/squid/.footprint b/squid/.footprint index 241e80671..27757472b 100644 --- a/squid/.footprint +++ b/squid/.footprint @@ -20,14 +20,12 @@ drwxr-xr-x root/root usr/lib/squid/ -rwxr-xr-x root/root usr/lib/squid/basic_db_auth -rwxr-xr-x root/root usr/lib/squid/basic_fake_auth -rwxr-xr-x root/root usr/lib/squid/basic_getpwnam_auth --rwxr-xr-x root/root usr/lib/squid/basic_msnt_multi_domain_auth -rwxr-xr-x root/root usr/lib/squid/basic_ncsa_auth -rwxr-xr-x root/root usr/lib/squid/basic_nis_auth -rwxr-xr-x root/root usr/lib/squid/basic_pop3_auth -rwxr-xr-x root/root usr/lib/squid/basic_radius_auth -rwxr-xr-x root/root usr/lib/squid/basic_smb_auth -rwxr-xr-x root/root usr/lib/squid/basic_smb_auth.sh --rwxr-xr-x root/root usr/lib/squid/basic_smb_lm_auth -rwxr-xr-x root/root usr/lib/squid/cachemgr.cgi -rwxr-xr-x root/root usr/lib/squid/digest_file_auth -rwxr-xr-x root/root usr/lib/squid/diskd @@ -38,26 +36,27 @@ drwxr-xr-x root/root usr/lib/squid/ -rwxr-xr-x root/root usr/lib/squid/ext_time_quota_acl -rwxr-xr-x root/root usr/lib/squid/ext_unix_group_acl -rwxr-xr-x root/root usr/lib/squid/ext_wbinfo_group_acl --rwxr-xr-x root/root usr/lib/squid/helper-mux.pl +-rwxr-xr-x root/root usr/lib/squid/helper-mux -rwxr-xr-x root/root usr/lib/squid/log_db_daemon -rwxr-xr-x root/root usr/lib/squid/log_file_daemon -rwxr-xr-x root/root usr/lib/squid/negotiate_wrapper_auth -rwxr-xr-x root/root usr/lib/squid/ntlm_fake_auth --rwxr-xr-x root/root usr/lib/squid/ntlm_smb_lm_auth +-rwxr-xr-x root/root usr/lib/squid/security_fake_certverify -rwxr-xr-x root/root usr/lib/squid/storeid_file_rewrite -rwxr-xr-x root/root usr/lib/squid/unlinkd -rwxr-xr-x root/root usr/lib/squid/url_fake_rewrite -rwxr-xr-x root/root usr/lib/squid/url_fake_rewrite.sh +-rwxr-xr-x root/root usr/lib/squid/url_lfs_rewrite drwxr-xr-x root/root usr/sbin/ -rwxr-xr-x root/root usr/sbin/squid drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/man/ drwxr-xr-x root/root usr/share/man/man1/ +-rw-r--r-- root/root usr/share/man/man1/purge.1.gz -rw-r--r-- root/root usr/share/man/man1/squidclient.1.gz drwxr-xr-x root/root usr/share/man/man8/ -rw-r--r-- root/root usr/share/man/man8/basic_db_auth.8.gz -rw-r--r-- root/root usr/share/man/man8/basic_getpwnam_auth.8.gz --rw-r--r-- root/root usr/share/man/man8/basic_msnt_multi_domain_auth.8.gz -rw-r--r-- root/root usr/share/man/man8/basic_ncsa_auth.8.gz -rw-r--r-- root/root usr/share/man/man8/basic_pop3_auth.8.gz -rw-r--r-- root/root usr/share/man/man8/basic_radius_auth.8.gz @@ -70,9 +69,12 @@ drwxr-xr-x root/root usr/share/man/man8/ -rw-r--r-- root/root usr/share/man/man8/ext_time_quota_acl.8.gz -rw-r--r-- root/root usr/share/man/man8/ext_unix_group_acl.8.gz -rw-r--r-- root/root usr/share/man/man8/ext_wbinfo_group_acl.8.gz +-rw-r--r-- root/root usr/share/man/man8/helper-mux.8.gz -rw-r--r-- root/root usr/share/man/man8/log_db_daemon.8.gz +-rw-r--r-- root/root usr/share/man/man8/security_fake_certverify.8.gz -rw-r--r-- root/root usr/share/man/man8/squid.8.gz -rw-r--r-- root/root usr/share/man/man8/storeid_file_rewrite.8.gz +-rw-r--r-- root/root usr/share/man/man8/url_lfs_rewrite.8.gz drwxr-xr-x root/root usr/share/squid/ drwxr-xr-x root/root usr/share/squid/errors/ drwxr-xr-x root/root usr/share/squid/errors/templates/ @@ -106,6 +108,7 @@ drwxr-xr-x root/root usr/share/squid/errors/templates/ -rw-r--r-- root/root usr/share/squid/errors/templates/ERR_NO_RELAY -rw-r--r-- root/root usr/share/squid/errors/templates/ERR_ONLY_IF_CACHED_MISS -rw-r--r-- root/root usr/share/squid/errors/templates/ERR_PRECONDITION_FAILED +-rw-r--r-- root/root usr/share/squid/errors/templates/ERR_PROTOCOL_UNKNOWN -rw-r--r-- root/root usr/share/squid/errors/templates/ERR_READ_ERROR -rw-r--r-- root/root usr/share/squid/errors/templates/ERR_READ_TIMEOUT -rw-r--r-- root/root usr/share/squid/errors/templates/ERR_SECURE_CONNECT_FAIL diff --git a/squid/.md5sum b/squid/.md5sum index e4f6bb8f8..4ce5c635d 100644 --- a/squid/.md5sum +++ b/squid/.md5sum @@ -1,4 +1,2 @@ -b969921543380b268b1604d2d5c10f70 SQUID-2018_1.patch -2d6ea612cb5035ff846ac7cee781649e SQUID-2018_2.patch be8031c772fc51aaa1a9fb22ecac6585 squid -39ef8199675d48a314b540f92c00c545 squid-3.5.27.tar.xz +dcb167d7677ff469c1c59b0baad8a5be squid-4.0.24.tar.xz diff --git a/squid/.signature b/squid/.signature index 3770fec7e..50bc38e44 100644 --- a/squid/.signature +++ b/squid/.signature @@ -1,8 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/XBSSGTiSDM0sTRcj8avSWpdJdT+0s9YWDFH9OHpk3WUcc6Sd0Y9QHxXN9HQ1qulKOGUUxth41DdOjVB6R4irwg= -SHA256 (Pkgfile) = 2435660c65d45ec2cbae6afe455dfa032de45625b494d7516fe4b4e388e556fc -SHA256 (.footprint) = 5c5505b0fed5776588a490a9ac02b1dd2ce859adcce704d8df54da39a9afc77d -SHA256 (squid-3.5.27.tar.xz) = 5ddb4367f2dc635921f9ca7a59d8b87edb0412fa203d1543393ac3c7f9fef0ec -SHA256 (SQUID-2018_1.patch) = b83fb203a7f42868603205419d9a28c64af8eaf7be92a6a7b9b95210cb4f6b2f -SHA256 (SQUID-2018_2.patch) = 676d3f3b5bc0ca09760aba6af3f8fb837dfc52b82f7765317be30b33e350fad2 +RWSE3ohX2g5d/VETSvltuFPY4HuXBk/5s4NK3sIvmhSa6so/y9AtorsgPySsIh6hihFTtt+sLUYEn86pobL2HLOfvMiyb/2ReQg= +SHA256 (Pkgfile) = d0e1ae7cc82365940174ce26dd14ad20b7827baaead8c5048b923f97ee9202ca +SHA256 (.footprint) = 76511bf090c17bdffda7869230f5a22bacd12d3ed2ecee6b5b5849b6e9fcc9f5 +SHA256 (squid-4.0.24.tar.xz) = 091da0d763307dcc0f5c784ab07ea0c5a093f6dfac60f17ff26e2a6d50f76a07 SHA256 (squid) = d4ff0ac128250907e7cce4a01d6d92d9ca7dde7d59e1c72fe89de72fa5488ec4 diff --git a/squid/Pkgfile b/squid/Pkgfile index 694f4f862..5d2b75256 100644 --- a/squid/Pkgfile +++ b/squid/Pkgfile @@ -4,17 +4,14 @@ # Depends on: db libcap libtool name=squid -version=3.5.27 -release=2 -source=(http://www.squid-cache.org/Versions/v3/3.5/$name-$version.tar.xz - SQUID-2018_1.patch SQUID-2018_2.patch squid) +version=4.0.24 +release=1 +source=(http://www.squid-cache.org/Versions/v4/$name-$version.tar.xz + squid) build () { cd $name-$version - patch -p1 -i $SRC/SQUID-2018_1.patch - patch -p1 -i $SRC/SQUID-2018_2.patch - ./configure --prefix=/usr \ --sysconfdir=/etc/squid \ --libexecdir=/usr/lib/squid \ diff --git a/squid/SQUID-2018_1.patch b/squid/SQUID-2018_1.patch deleted file mode 100644 index 9392219a9..000000000 --- a/squid/SQUID-2018_1.patch +++ /dev/null @@ -1,28 +0,0 @@ -commit eb2db98a676321b814fc4a51c4fb7928a8bb45d9 (refs/remotes/origin/v3.5) -Author: Amos Jeffries -Date: 2018-01-19 13:54:14 +1300 - - ESI: make sure endofName never exceeds tagEnd (#130) - -diff --git a/src/esi/CustomParser.cc b/src/esi/CustomParser.cc -index d86d2d3..db634d9 100644 ---- a/src/esi/CustomParser.cc -+++ b/src/esi/CustomParser.cc -@@ -121,7 +121,7 @@ ESICustomParser::parse(char const *dataToParse, size_t const lengthOfData, bool - - char * endofName = strpbrk(const_cast(tag), w_space); - -- if (endofName > tagEnd) -+ if (!endofName || endofName > tagEnd) - endofName = const_cast(tagEnd); - - *endofName = '\0'; -@@ -214,7 +214,7 @@ ESICustomParser::parse(char const *dataToParse, size_t const lengthOfData, bool - - char * endofName = strpbrk(const_cast(tag), w_space); - -- if (endofName > tagEnd) -+ if (!endofName || endofName > tagEnd) - endofName = const_cast(tagEnd); - - *endofName = '\0'; diff --git a/squid/SQUID-2018_2.patch b/squid/SQUID-2018_2.patch deleted file mode 100644 index 9ecd8a5b7..000000000 --- a/squid/SQUID-2018_2.patch +++ /dev/null @@ -1,23 +0,0 @@ -commit 8232b83d3fa47a1399f155cb829db829369fbae9 (refs/remotes/origin/v3.5) -Author: squidadm -Date: 2018-01-21 08:07:08 +1300 - - Fix indirect IP logging for transactions without a client connection (#129) (#136) - -diff --git a/src/client_side_request.cc b/src/client_side_request.cc -index be124f3..203f89d 100644 ---- a/src/client_side_request.cc -+++ b/src/client_side_request.cc -@@ -488,9 +488,9 @@ clientFollowXForwardedForCheck(allow_t answer, void *data) - * Ensure that the access log shows the indirect client - * instead of the direct client. - */ -- ConnStateData *conn = http->getConn(); -- conn->log_addr = request->indirect_client_addr; -- http->al->cache.caddr = conn->log_addr; -+ http->al->cache.caddr = request->indirect_client_addr; -+ if (ConnStateData *conn = http->getConn()) -+ conn->log_addr = request->indirect_client_addr; - } - request->x_forwarded_for_iterator.clean(); - request->flags.done_follow_x_forwarded_for = true;