From: "Peter Müller" <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. bbca73d467bace690a1418c6c6c7202db8c8fd63
Date: Tue, 15 Feb 2022 16:29:58 +0000 [thread overview]
Message-ID: <4JymlV2VYqz2xgZ@people01.haj.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 2942 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via bbca73d467bace690a1418c6c6c7202db8c8fd63 (commit)
from cae2a37e52f68972ad4f94419481241dd687f118 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit bbca73d467bace690a1418c6c6c7202db8c8fd63
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sat Feb 12 18:16:20 2022 +0100
squid: Update from 5.2 => 5.4.1
For details see:
http://www.squid-cache.org/Versions/v5/changesets/SQUID_5_4_1.html
This is 'squid 5.4.1', containing the previous patch for Bug #5055.
Prior to this patch I reverted my previous patches 'squid: Update 5.2 => 5.4" and
'squid 5.4: Latest patch - Bug #5055 - from upstream' and marked them as
'superseded' in patchwork.
For a better overview the 'squid-gcc11'-patch has been renamed again and moved
to an own squid-patch-directory.
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
lfs/squid | 7 ++++---
src/patches/{squid-gcc11.patch => squid/01_squid-gcc11.patch} | 0
2 files changed, 4 insertions(+), 3 deletions(-)
rename src/patches/{squid-gcc11.patch => squid/01_squid-gcc11.patch} (100%)
Difference in files:
diff --git a/lfs/squid b/lfs/squid
index b25f594a9..4b723a8e1 100644
--- a/lfs/squid
+++ b/lfs/squid
@@ -24,7 +24,7 @@
include Config
-VER = 5.2
+VER = 5.4.1
THISAPP = squid-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 102984f3ea382a1fa5bd917c2ee155ec
+$(DL_FILE)_MD5 = a6d55b34ee8d32052026db1db98f4d0d
install : $(TARGET)
@@ -77,7 +77,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xaf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/squid-gcc11.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/squid/01_squid-gcc11.patch
+
cd $(DIR_APP) && autoreconf -vfi
cd $(DIR_APP)/libltdl && autoreconf -vfi
diff --git a/src/patches/squid-gcc11.patch b/src/patches/squid/01_squid-gcc11.patch
similarity index 100%
rename from src/patches/squid-gcc11.patch
rename to src/patches/squid/01_squid-gcc11.patch
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2022-02-15 16:29 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=4JymlV2VYqz2xgZ@people01.haj.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@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