From mboxrd@z Thu Jan  1 00:00:00 1970
From: Matthias Fischer <matthias.fischer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] squid: Update to 4.6
Date: Sat, 02 Mar 2019 21:08:06 +0100
Message-ID: <20190302200806.1366-1-matthias.fischer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2829569936912272635=="
List-Id: <development.lists.ipfire.org>

--===============2829569936912272635==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

For details see:
http://www.squid-cache.org/Versions/v4/changesets/

The 'configure'-option "--disable-ipv6" was removed, it is no longer necessar=
y.

See:
https://lists.ipfire.org/pipermail/development/2016-April/002046.html

"The --disable-ipv6 build option is now deprecated.
...
Squid-3.5.7 and later will perform IPv6 availability tests on startup in
all builds.

- Where IPv6 is unavailable Squid will continue exactly as it would
have had the build option not been used.

These Squid can have the build option removed now."

The warning message concerning a "BCP 177 violation" while
starting 'squid' can be ignored.

Best,
Matthias

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
---
 lfs/squid                                                | 9 ++++-----
 ...rs.patch =3D> squid-4.6-fix-max-file-descriptors.patch} | 0
 2 files changed, 4 insertions(+), 5 deletions(-)
 rename src/patches/squid/{squid-4.5-fix-max-file-descriptors.patch =3D> squi=
d-4.6-fix-max-file-descriptors.patch} (100%)

diff --git a/lfs/squid b/lfs/squid
index 6033ab394..0115cad82 100644
--- a/lfs/squid
+++ b/lfs/squid
@@ -1,7 +1,7 @@
 ############################################################################=
###
 #                                                                           =
  #
 # IPFire.org - A linux based firewall                                       =
  #
-# Copyright (C) 2007-2018  IPFire Team  <info(a)ipfire.org>                 =
    #
+# Copyright (C) 2007-2019  IPFire Team  <info(a)ipfire.org>                 =
    #
 #                                                                           =
  #
 # 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,7 @@
=20
 include Config
=20
-VER        =3D 4.5
+VER        =3D 4.6
=20
 THISAPP    =3D squid-$(VER)
 DL_FILE    =3D $(THISAPP).tar.xz
@@ -42,7 +42,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_MD5 =3D 8275da5846f9f2243ad2625e5aef2ee0
+$(DL_FILE)_MD5 =3D e25e7cc37754ad14d8aa368c0c210e54
=20
 install : $(TARGET)
=20
@@ -72,7 +72,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xaf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-4.5-fix-m=
ax-file-descriptors.patch
+	cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-4.6-fix-m=
ax-file-descriptors.patch
=20
 	cd $(DIR_APP) && autoreconf -vfi
 	cd $(DIR_APP)/libltdl && autoreconf -vfi
@@ -91,7 +91,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		--disable-kqueue \
 		--disable-esi \
 		--disable-arch-native \
-		--enable-ipv6 \
 		--enable-poll \
 		--enable-ident-lookups \
 		--enable-storeio=3Daufs,diskd,ufs \
diff --git a/src/patches/squid/squid-4.5-fix-max-file-descriptors.patch b/src=
/patches/squid/squid-4.6-fix-max-file-descriptors.patch
similarity index 100%
rename from src/patches/squid/squid-4.5-fix-max-file-descriptors.patch
rename to src/patches/squid/squid-4.6-fix-max-file-descriptors.patch
--=20
2.18.0


--===============2829569936912272635==--