From patchwork Wed May 3 19:00:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Fischer X-Patchwork-Id: 6837 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) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4QBR9T31fGz3wgd for ; Wed, 3 May 2023 19:00:45 +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) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4QBR9R4Ns6zjk; Wed, 3 May 2023 19:00:43 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4QBR9R2q6zz2y2X; Wed, 3 May 2023 19:00:43 +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 4QBR9P6nDGz2xbl for ; Wed, 3 May 2023 19:00:41 +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 4QBR9L5704zbT for ; Wed, 3 May 2023 19:00:38 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1683140441; 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=kRBl9L8FSHVOMfh7voKL2zmO2/LwVbNrk+priFKvSrI=; b=5yc0HJy2d9ib2QIA2hGt0Nfb82YStkGf1wXhvijOQj4FVl083fhEmO1BKvDc28YhKEzvx3 KMoBuSsLXaJh3XDA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1683140441; 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=kRBl9L8FSHVOMfh7voKL2zmO2/LwVbNrk+priFKvSrI=; b=gLehhscDrO4jjn3S4lwwOEyGgl4mnadoC+TuITw2T/ILgp5dOhiE00fwzXO8p73MHOZsI3 hnKwNYU8TazqU5vZ+tZbKqr4nY953IhMN4WvUO2qdGKWugNQtPtfCuBo1AdPWhrS/9FKb2 1/OfTjXci6Ph931lOKaLbIQ8Wr5PSJs5dhOZEmn8hiwd+awI0z/kkPPXKeSjI+ld2RUlOv geIwhL+UelmkPHhohsQh+5RphOmo60mqIJcXyRGdB7+rWna/exxYFJ4am29ApvOO3F+Ipw 0vh5/9jKxbmlM3VJVjNyfNTZ8UJ/LFjrtgzBU16unM+4zCxFk8CEui6G+vA8Nw== From: Matthias Fischer To: development@lists.ipfire.org Subject: [PATCH] squid: Update to 5.9 Date: Wed, 3 May 2023 21:00:34 +0200 Message-Id: <20230503190034.1656-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 The translation files are back in the source code... ;-) Signed-off-by: Matthias Fischer --- lfs/squid | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/lfs/squid b/lfs/squid index 5d79bf382..bc0682031 100644 --- a/lfs/squid +++ b/lfs/squid @@ -24,8 +24,7 @@ include Config -VER = 5.8 -LANGPACK = 20230225 +VER = 5.9 THISAPP = squid-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -43,14 +42,11 @@ endif # Top-level Rules ############################################################################### -objects = $(DL_FILE) \ - squid-langpack-$(LANGPACK).tar.gz +objects = $(DL_FILE) -$(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) -squid-langpack-$(LANGPACK).tar.gz = $(URL_IPFIRE)/squid-langpack-$(LANGPACK).tar.gz +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = c9d1ae9464e68beabdf7ae1641a70d6c614bc4d4f4bae3fc5946c2bf61510634992cbd5abe63f071104edb2fa487a6c5c7fb8fbf8f06ac723a6522ec9ade8b68 -squid-langpack-$(LANGPACK).tar.gz_BLAKE2 = 169a05d16770f56e515fd633658e8bcd9464fb01ccba76256b119932c833af7bc22e3e8d3a7d5fde37638546f15822a4d1548a78af13be9f4e3b8989758250b6 +$(DL_FILE)_BLAKE2 = 898a34357f8019291379ea37c66fa312e1a6437e8f643987dd4e54d7d52728248e16129b00195c5f6e0378c0f32c9f9ade3f98ca0ec4bb952f9f443357face82 install : $(TARGET) @@ -80,7 +76,6 @@ $(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