From patchwork Sat Mar 4 12:37:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Matthias Fischer X-Patchwork-Id: 6664 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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4PTPW0191nz3wfc for ; Sat, 4 Mar 2023 12:37:32 +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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4PTPVy5mWJzq8; Sat, 4 Mar 2023 12:37:30 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4PTPVy4cDgz302W; Sat, 4 Mar 2023 12:37:30 +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) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4PTPVx0ctVz2y9h for ; Sat, 4 Mar 2023 12:37:29 +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 (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4PTPVw12QmzcH for ; Sat, 4 Mar 2023 12:37:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1677933448; 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=tx39t7I/EWmqaP5ap/F2lFdbPcFTmVq5kcPCCnEVvWI=; b=RtMgc6s0vCM9lpkZoVMzPTh/eNDcPO53k4Ej82EGu25UjoW9gEMpO+n5XpYi5kRNaftp9t ADOvBe2GflH+TyWdpKxuuGUkuftkS2qLWa+M82ELv1OXYN/Fs8jJ2lGFuSXxfZa5zvy6cX c6HYgoE/EVTsvDAPEMuF5NdbwWzRJKsCemP/M3F1lY85+rXXCohYvhYxpW4XiUk5dsx/QW YU23mtq5nixIQ2k7pnLqRbgynsSqRFYxzdWauhhLYawJF3LyNILskWJJhb7SjqCF9T/32a z9DmhndBKOm1b1wz6V2P6XBx8OhZlXYyWUaTCPOxbdJUP1TRBPJwdQopF6fr7g== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1677933448; 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=tx39t7I/EWmqaP5ap/F2lFdbPcFTmVq5kcPCCnEVvWI=; b=Qo7iLA32lo9nrwc9n7np4Lkk1T9khug3gfKq4G4rZnGHTkLEVv8i6kyKnWeTYkbKWNNGAA 9PaE1mzM2V4FEdDQ== From: Matthias Fischer To: development@lists.ipfire.org Subject: [PATCH] squid: Update to 5.8 Date: Sat, 4 Mar 2023 13:37:23 +0100 Message-Id: <20230304123723.3435405-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/v5 Please note: Updating 'squid' to 5.8 required some lfs adjustments, as the translations are no longer included in the source code. I had to integrate the 'squid-langpack' file. Signed-off-by: Matthias Fischer Reviewed-by: Peter Müller --- lfs/squid | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/lfs/squid b/lfs/squid index 7a7b775ff..5d79bf382 100644 --- a/lfs/squid +++ b/lfs/squid @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2022 IPFire Team # +# Copyright (C) 2007-2023 IPFire Team # # # # 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,7 +24,8 @@ include Config -VER = 5.7 +VER = 5.8 +LANGPACK = 20230225 THISAPP = squid-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -42,11 +43,14 @@ endif # Top-level Rules ############################################################################### -objects = $(DL_FILE) +objects = $(DL_FILE) \ + squid-langpack-$(LANGPACK).tar.gz -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) +$(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) +squid-langpack-$(LANGPACK).tar.gz = $(URL_IPFIRE)/squid-langpack-$(LANGPACK).tar.gz -$(DL_FILE)_BLAKE2 = 4a403ca4f94034356922ea1a4feffd5f5289e2aadbe1585bd04e83ee89712227ce04c53f7e05c10f7c8ac6be67a265a32b47032e7b56e929a172772fa41d5299 +$(DL_FILE)_BLAKE2 = c9d1ae9464e68beabdf7ae1641a70d6c614bc4d4f4bae3fc5946c2bf61510634992cbd5abe63f071104edb2fa487a6c5c7fb8fbf8f06ac723a6522ec9ade8b68 +squid-langpack-$(LANGPACK).tar.gz_BLAKE2 = 169a05d16770f56e515fd633658e8bcd9464fb01ccba76256b119932c833af7bc22e3e8d3a7d5fde37638546f15822a4d1548a78af13be9f4e3b8989758250b6 install : $(TARGET) @@ -76,6 +80,7 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xaf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP)/errors && tar zxf $(DIR_DL)/squid-langpack-$(LANGPACK).tar.gz cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/squid/01_squid-gcc11.patch