From patchwork Wed Aug 9 16:06:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Fischer X-Patchwork-Id: 7081 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4RLZgc5S0Bz3wtJ for ; Wed, 9 Aug 2023 16:06:52 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4RLZgZ5BT1z1GG; Wed, 9 Aug 2023 16:06:50 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4RLZgZ4FMcz2xpf; Wed, 9 Aug 2023 16:06:50 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4RLZgY40RGz2xKQ for ; Wed, 9 Aug 2023 16:06:49 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4RLZgW5mTbzcX for ; Wed, 9 Aug 2023 16:06:47 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1691597207; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=rWwFT//vO878b/6hAKhIzbfJvpWLLNhaCWy286momvo=; b=4dJ9PrOSwduIXCkQRD6gsn/pCjAGjY0yWsOsGV0EN6o/YS2jGJCQmrlcz+UAndYwur6j1H Dgm0G7DjwSTNM4DQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1691597207; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=rWwFT//vO878b/6hAKhIzbfJvpWLLNhaCWy286momvo=; b=g4pX8SQM3MBXJtN+MqNr/vPFAck6WsFjIFN7X4+CDeeWjwYAG8UtsYJB9W6bGM3A7zEfMl 2bQHg7vbZBRnV1ENJK1V43bb6WiV4OoB/ljQicrdEBV28Xjuiub7ZSQzHX2J91wR5hOAAS 0IRddZzQoOdjfaJW9HB9g0Czzaic9egKhBDPsorwoZX5TUX4jIAoLGLZ8TUNddJmb0SSdl 019r0RupTjmZQdg0CYkyMv7WgaFKqTLMeDE0Xdo4VQZu1Y5v4d98r4xxAliv+rTqS+HXAh lhX17teGT7ST/VaYJcz2qkR1f5fQ6xPNc+VhQ+her6UhIe4q1Zv3TQH99sQUvg== From: Matthias Fischer To: development@lists.ipfire.org Subject: [PATCH] squid: Update to 6.2 Date: Wed, 9 Aug 2023 18:06:43 +0200 Message-Id: <20230809160643.1626-1-matthias.fischer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 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: https://github.com/squid-cache/squid/commits/v6 Signed-off-by: Matthias Fischer --- lfs/squid | 4 ++-- src/patches/squid/01_squid-gcc11.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lfs/squid b/lfs/squid index 26b8249cc..50ebc4e3a 100644 --- a/lfs/squid +++ b/lfs/squid @@ -24,7 +24,7 @@ include Config -VER = 6.1 +VER = 6.2 THISAPP = squid-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -46,7 +46,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 840ea8b09f8518f6e3b92a22cc6e6d3befc08b9e9650e13a54b607b398a967f1bc2b30e5b52cae5423a49ee02d0cfc13d3488c2b9ece3b3c0d4df689de390adf +$(DL_FILE)_BLAKE2 = e934371e40093b1570c88c76f9427089087d2fa0b16629e7ca3afabd17f7bc5592b2b65354da54ebc43350ab6732081dd39a39e5db712f70a48246c22b8ae45d install : $(TARGET) diff --git a/src/patches/squid/01_squid-gcc11.patch b/src/patches/squid/01_squid-gcc11.patch index c87ade51a..019da6ff4 100644 --- a/src/patches/squid/01_squid-gcc11.patch +++ b/src/patches/squid/01_squid-gcc11.patch @@ -2,8 +2,8 @@ diff --git a/src/acl/ConnMark.cc b/src/acl/ConnMark.cc index 1fdae0c..213cf39 100644 --- a/src/acl/ConnMark.cc +++ b/src/acl/ConnMark.cc -@@ -15,6 +15,7 @@ - #include "Debug.h" +@@ -16,6 +16,7 @@ + #include "debug/Stream.h" #include "http/Stream.h" #include "sbuf/Stream.h" +#include