From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] squid: Update to 4.7
Date: Sun, 26 May 2019 12:01:13 +0100
Message-ID: <520641A1-6F08-4310-AAD6-05ED3A1C32B3@ipfire.org>
In-Reply-To: <20190524184659.2209-1-matthias.fischer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8049102629690224115=="
List-Id: <development.lists.ipfire.org>

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

Merged :)

> On 24 May 2019, at 19:46, Matthias Fischer <matthias.fischer(a)ipfire.org> =
wrote:
>=20
> For details see:
>=20
> http://www.squid-cache.org/Versions/v4/changesets/
>=20
> Fixes among other things the old 'filedescriptors' problem, so this patch w=
as deleted.
>=20
> Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
> ---
> lfs/squid                                     |  5 ++---
> .../squid-4.6-fix-max-file-descriptors.patch  | 21 -------------------
> 2 files changed, 2 insertions(+), 24 deletions(-)
> delete mode 100644 src/patches/squid/squid-4.6-fix-max-file-descriptors.pat=
ch
>=20
> diff --git a/lfs/squid b/lfs/squid
> index 780f16548..92392ea21 100644
> --- a/lfs/squid
> +++ b/lfs/squid
> @@ -24,7 +24,7 @@
>=20
> include Config
>=20
> -VER        =3D 4.6
> +VER        =3D 4.7
>=20
> THISAPP    =3D squid-$(VER)
> DL_FILE    =3D $(THISAPP).tar.xz
> @@ -46,7 +46,7 @@ objects =3D $(DL_FILE)
>=20
> $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
>=20
> -$(DL_FILE)_MD5 =3D e25e7cc37754ad14d8aa368c0c210e54
> +$(DL_FILE)_MD5 =3D ec7be696032b962eac9ba5726940a3aa
>=20
> install : $(TARGET)
>=20
> @@ -76,7 +76,6 @@ $(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.6-fix=
-max-file-descriptors.patch
>=20
> 	cd $(DIR_APP) && autoreconf -vfi
> 	cd $(DIR_APP)/libltdl && autoreconf -vfi
> diff --git a/src/patches/squid/squid-4.6-fix-max-file-descriptors.patch b/s=
rc/patches/squid/squid-4.6-fix-max-file-descriptors.patch
> deleted file mode 100644
> index 57fd0a6a6..000000000
> --- a/src/patches/squid/squid-4.6-fix-max-file-descriptors.patch
> +++ /dev/null
> @@ -1,21 +0,0 @@
> ---- configure.ac.~	Wed Apr 20 14:26:07 2016
> -+++ configure.ac	Fri Apr 22 17:20:46 2016
> -@@ -3160,6 +3160,9 @@
> -     ;;
> - esac
> -=20
> -+SQUID_CHECK_DEFAULT_FD_SETSIZE
> -+SQUID_CHECK_MAXFD
> -+
> - dnl --with-maxfd present for compatibility with Squid-2.
> - dnl undocumented in ./configure --help  to encourage using the Squid-3 di=
rective
> - AC_ARG_WITH(maxfd,,
> -@@ -3190,8 +3193,6 @@
> -     esac
> - ])
> -=20
> --SQUID_CHECK_DEFAULT_FD_SETSIZE
> --SQUID_CHECK_MAXFD
> - if test "x$squid_filedescriptors_num" !=3D "x"; then
> -   AC_MSG_NOTICE([Default number of fieldescriptors: $squid_filedescriptor=
s_num])
> - fi
> --=20
> 2.18.0
>=20


--===============8049102629690224115==--