public inbox for development@lists.ipfire.org
 help / color / mirror / Atom feed
From: Matthias Fischer <matthias.fischer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] squid: Update to 6.2
Date: Wed, 09 Aug 2023 18:06:43 +0200	[thread overview]
Message-ID: <20230809160643.1626-1-matthias.fischer@ipfire.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 1518 bytes --]

For details see:
https://github.com/squid-cache/squid/commits/v6

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
---
 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 <limits>
-- 
2.34.1


                 reply	other threads:[~2023-08-09 16:06 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230809160643.1626-1-matthias.fischer@ipfire.org \
    --to=matthias.fischer@ipfire.org \
    --cc=development@lists.ipfire.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox