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 3.5.20: latest patches
Date: Fri, 12 Aug 2016 21:09:08 +0200
Message-ID: <20160812190908.3156-1-matthias.fischer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8252591730949004607=="
List-Id: <development.lists.ipfire.org>

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

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
---
 lfs/squid                                          |  3 +-
 ...=3D> squid-3.5.20-fix-max-file-descriptors.patch} |  4 +-
 src/patches/squid/squid-3.5-14070.patch            | 44 ++++++++++++++++++++=
++
 3 files changed, 48 insertions(+), 3 deletions(-)
 rename src/patches/{squid-3.5.17-fix-max-file-descriptors.patch =3D> squid-3=
.5.20-fix-max-file-descriptors.patch} (92%)
 create mode 100644 src/patches/squid/squid-3.5-14070.patch

diff --git a/lfs/squid b/lfs/squid
index a88f0c5..c07afe8 100644
--- a/lfs/squid
+++ b/lfs/squid
@@ -73,7 +73,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14067=
.patch
 	cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14068=
.patch
 	cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14069=
.patch
-	cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.5.17-fix-max-=
file-descriptors.patch
+	cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14070=
.patch
+	cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.5.20-fix-max-=
file-descriptors.patch
=20
 	cd $(DIR_APP) && autoreconf -vfi
 	cd $(DIR_APP)/libltdl && autoreconf -vfi
diff --git a/src/patches/squid-3.5.17-fix-max-file-descriptors.patch b/src/pa=
tches/squid-3.5.20-fix-max-file-descriptors.patch
similarity index 92%
rename from src/patches/squid-3.5.17-fix-max-file-descriptors.patch
rename to src/patches/squid-3.5.20-fix-max-file-descriptors.patch
index b0efa76..b740b61 100644
--- a/src/patches/squid-3.5.17-fix-max-file-descriptors.patch
+++ b/src/patches/squid-3.5.20-fix-max-file-descriptors.patch
@@ -1,6 +1,6 @@
 --- configure.ac.~	Wed Apr 20 14:26:07 2016
 +++ configure.ac	Fri Apr 22 17:20:46 2016
-@@ -3131,6 +3131,9 @@
+@@ -3135,6 +3135,9 @@
      ;;
  esac
 =20
@@ -10,7 +10,7 @@
  dnl --with-maxfd present for compatibility with Squid-2.
  dnl undocumented in ./configure --help  to encourage using the Squid-3 dire=
ctive
  AC_ARG_WITH(maxfd,,
-@@ -3161,8 +3164,6 @@
+@@ -3165,8 +3168,6 @@
      esac
  ])
 =20
diff --git a/src/patches/squid/squid-3.5-14070.patch b/src/patches/squid/squi=
d-3.5-14070.patch
new file mode 100644
index 0000000..5fcc39f
--- /dev/null
+++ b/src/patches/squid/squid-3.5-14070.patch
@@ -0,0 +1,44 @@
+------------------------------------------------------------
+revno: 14070
+revision-id: squid3(a)treenet.co.nz-20160805145933-0cpyy47o8955lamx
+parent: squidadm(a)squid-cache.org-20160723121351-iuc8hwstrqd0l1dv
+author: Christos Tsantilas <chtsanti(a)users.sourceforge.net>
+committer: Amos Jeffries <squid3(a)treenet.co.nz>
+branch nick: 3.5
+timestamp: Sat 2016-08-06 02:59:33 +1200
+message:
+  Squid segfault via Ftp::Client::readControlReply().
+ =20
+  Ftp::Client::scheduleReadControlReply(), which may called from the
+  asynchronous start() or readControlReply()/handleControlReply()
+  handlers, does not check whether the control connection is still usable
+  before using it.
+ =20
+  This is a Measurement Factory project.
+------------------------------------------------------------
+# Bazaar merge directive format 2 (Bazaar 0.90)
+# revision_id: squid3(a)treenet.co.nz-20160805145933-0cpyy47o8955lamx
+# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
+# testament_sha1: 1c21ce821f9cbc22b3e8ff2b1029f7084b5f0643
+# timestamp: 2016-08-05 15:00:22 +0000
+# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
+# base_revision_id: squidadm(a)squid-cache.org-20160723121351-\
+#   iuc8hwstrqd0l1dv
+#=20
+# Begin patch
+=3D=3D=3D modified file 'src/clients/FtpClient.cc'
+--- src/clients/FtpClient.cc	2016-02-19 23:15:41 +0000
++++ src/clients/FtpClient.cc	2016-08-05 14:59:33 +0000
+@@ -314,6 +314,11 @@
+         /* We've already read some reply data */
+         handleControlReply();
+     } else {
++
++        if (!Comm::IsConnOpen(ctrl.conn)) {
++            debugs(9, 3, "cannot read without ctrl " << ctrl.conn);
++            return;
++        }
+         /*
+          * Cancel the timeout on the Data socket (if any) and
+          * establish one on the control socket.
+
--=20
2.9.2


--===============8252591730949004607==--