From patchwork Wed Jul 18 04:50:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Fischer X-Patchwork-Id: 1869 Return-Path: Received: from mail01.ipfire.org (mail01.ipfire.org [IPv6:2001:470:7183:25::1]) by web02.i.ipfire.org (Postfix) with ESMTP id 38A3660B0D for ; Tue, 17 Jul 2018 20:50:50 +0200 (CEST) Received: from mail01.i.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id A4A8610BA537; Tue, 17 Jul 2018 19:50:49 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1531853449; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references:list-id: list-unsubscribe:list-subscribe:list-post; bh=Nl486F/wv0bo2/C9OcKaGYWZT3xBpe6m2LWGwTL/rfI=; b=w6glgzZD3FaUOI9dMynqjniC/CZXolIKzukfWXHDupP0jXW7jskOsCyRFyZDT+h5WSJite /iTdByrSjMNcDuI7oaRmLnKhyZyqT3mMBSuOajGFr+iBmKYqio8BXI4uyJ3pw2UDIAP1Lc 8xPINc4Ku7fH/KgLP2JXYp9f1OKdhwb7Sbv0qNeBcBtTC0b3zkx25fLMmw/wVjpi7+gx/k xJufgPDvgtiJh7IVGYJ5Gb2+sAq2VMun/itIwDtxvls8zHsfOHi1Gnsmlyg6NGgWeYQGzA zHDYbrdsqIayd4CoOcgU9jGNdVPickMhUStF0k9i2YVxI5OH/2VC22HvnXMkVg== Received: from Devel.localdomain (p5B0A3C7A.dip0.t-ipconnect.de [91.10.60.122]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 56D9A1093706 for ; Tue, 17 Jul 2018 19:50:46 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1531853446; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=Nl486F/wv0bo2/C9OcKaGYWZT3xBpe6m2LWGwTL/rfI=; b=J6zm/Kx1piz1ve6Jgvel3ME88hujw6ANtklureUalArXp6dlUn21Ax13WBoxzUvGkFgOaf yKPol31GDchGrNckCA+gxoDDMH3VPL72Kckg/j/pZkQBfZ8K2Wbo+xikCvHhg8PO/4E8ok dNrdbS0qBCJrRH+4E/BXqd/zaRmi5rZVy2d4Mov55jBBfKBLp5/POKsEC/N3Z/F2SbdzSt 1mwxOPvt84oS/s92K2kLklBkNUVPhDN0XunKZsIb7Q/hgweXW2ROQQ9O6BYUXBqF0Ahg5W 0bM+PpoukVsBKNUSd2uUWFcjLj/0H7e+iPlZoWww+x3hj02oVrFBRPJbY44a5g== From: Matthias Fischer To: development@lists.ipfire.org Subject: [PATCH] squid: Update to 3.5.28 Date: Tue, 17 Jul 2018 20:50:41 +0200 Message-Id: <20180717185041.12572-1-matthias.fischer@ipfire.org> X-Mailer: git-send-email 2.18.0 Authentication-Results: mail01.ipfire.org; auth=pass smtp.auth=mfischer smtp.mailfrom=matthias.fischer@ipfire.org X-Spamd-Result: default: False [-5.02 / 11.00]; TO_DN_NONE(0.00)[]; RCVD_COUNT_ZERO(0.00)[0]; FROM_HAS_DN(0.00)[]; MIME_GOOD(-0.10)[text/plain]; MID_CONTAINS_FROM(1.00)[]; RCVD_TLS_ALL(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; BAYES_HAM(-3.00)[100.00%]; ASN(0.00)[asn:3320, ipnet:91.0.0.0/10, country:DE]; DKIM_SIGNED(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM(-2.92)[-0.973,0]; ARC_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[] X-Spam-Status: No, score=-5.02 X-Rspamd-Server: mail01.i.ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" For details see: http://www.squid-cache.org/Versions/v3/3.5/changesets/ Best, Matthias Signed-off-by: Matthias Fischer --- lfs/squid | 8 ++---- src/patches/squid/SQUID-2018_1.patch | 28 ------------------- src/patches/squid/SQUID-2018_2.patch | 23 --------------- ...uid-3.5.28-fix-max-file-descriptors.patch} | 0 4 files changed, 3 insertions(+), 56 deletions(-) delete mode 100644 src/patches/squid/SQUID-2018_1.patch delete mode 100644 src/patches/squid/SQUID-2018_2.patch rename src/patches/squid/{squid-3.5.27-fix-max-file-descriptors.patch => squid-3.5.28-fix-max-file-descriptors.patch} (100%) diff --git a/lfs/squid b/lfs/squid index f93097019..cae56407c 100644 --- a/lfs/squid +++ b/lfs/squid @@ -24,7 +24,7 @@ include Config -VER = 3.5.27 +VER = 3.5.28 THISAPP = squid-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -42,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 39ef8199675d48a314b540f92c00c545 +$(DL_FILE)_MD5 = 9367e0375ea53ba0e99f77054d4402c5 install : $(TARGET) @@ -72,9 +72,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 -Np1 -i $(DIR_SRC)/src/patches/squid/SQUID-2018_1.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/squid/SQUID-2018_2.patch - cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5.27-fix-max-file-descriptors.patch + cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5.28-fix-max-file-descriptors.patch cd $(DIR_APP) && autoreconf -vfi cd $(DIR_APP)/libltdl && autoreconf -vfi diff --git a/src/patches/squid/SQUID-2018_1.patch b/src/patches/squid/SQUID-2018_1.patch deleted file mode 100644 index 9392219a9..000000000 --- a/src/patches/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/src/patches/squid/SQUID-2018_2.patch b/src/patches/squid/SQUID-2018_2.patch deleted file mode 100644 index 9ecd8a5b7..000000000 --- a/src/patches/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; diff --git a/src/patches/squid/squid-3.5.27-fix-max-file-descriptors.patch b/src/patches/squid/squid-3.5.28-fix-max-file-descriptors.patch similarity index 100% rename from src/patches/squid/squid-3.5.27-fix-max-file-descriptors.patch rename to src/patches/squid/squid-3.5.28-fix-max-file-descriptors.patch