From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthias Fischer To: development@lists.ipfire.org Subject: [PATCH] squid 3.5.17: updated and deleted obsolete patches Date: Fri, 22 Apr 2016 17:37:50 +0200 Message-ID: <1461339470-4484-1-git-send-email-matthias.fischer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2706584920308700992==" List-Id: --===============2706584920308700992== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Updated filedescriptor patch Deleted obsolete patches for 3.4.14 Signed-off-by: Matthias Fischer --- lfs/squid | 2 + src/patches/squid-3.4-13228.patch | 35 --------------- src/patches/squid-3.4-13230.patch | 44 ------------------- src/patches/squid-3.4-13231.patch | 48 -------------------- src/patches/squid-3.4-13232.patch | 51 --------------------= -- .../squid-3.4.14-fix-max-file-descriptors.patch | 21 --------- .../squid-3.5.17-fix-max-file-descriptors.patch | 21 +++++++++ 7 files changed, 23 insertions(+), 199 deletions(-) delete mode 100644 src/patches/squid-3.4-13228.patch delete mode 100644 src/patches/squid-3.4-13230.patch delete mode 100644 src/patches/squid-3.4-13231.patch delete mode 100644 src/patches/squid-3.4-13232.patch delete mode 100644 src/patches/squid-3.4.14-fix-max-file-descriptors.patch create mode 100644 src/patches/squid-3.5.17-fix-max-file-descriptors.patch diff --git a/lfs/squid b/lfs/squid index 0edebb2..156d4d9 100644 --- a/lfs/squid +++ b/lfs/squid @@ -71,6 +71,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xaf $(DIR_DL)/$(DL_FILE) =20 + cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.5.17-fix-max-= file-descriptors.patch + cd $(DIR_APP) && autoreconf -vfi cd $(DIR_APP)/libltdl && autoreconf -vfi =20 diff --git a/src/patches/squid-3.4-13228.patch b/src/patches/squid-3.4-13228.= patch deleted file mode 100644 index 7f7d16f..0000000 --- a/src/patches/squid-3.4-13228.patch +++ /dev/null @@ -1,35 +0,0 @@ ------------------------------------------------------------- -revno: 13228 -revision-id: squid3(a)treenet.co.nz-20150828132334-3r7v4kh1lrqprrqg -parent: squid3(a)treenet.co.nz-20150801072237-5tzh2dczozz1e8sq -fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=3D3696 -committer: Amos Jeffries -branch nick: 3.4 -timestamp: Fri 2015-08-28 06:23:34 -0700 -message: - Bug 3696: crash when client delay pools are activated ------------------------------------------------------------- -# Bazaar merge directive format 2 (Bazaar 0.90) -# revision_id: squid3(a)treenet.co.nz-20150828132334-3r7v4kh1lrqprrqg -# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 -# testament_sha1: d193928c4656282187f2a31bf66d43fd4c247177 -# timestamp: 2015-08-28 13:33:44 +0000 -# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 -# base_revision_id: squid3(a)treenet.co.nz-20150801072237-\ -# 5tzh2dczozz1e8sq -#=20 -# Begin patch -=3D=3D=3D modified file 'src/client_side.cc' ---- src/client_side.cc 2014-06-21 04:24:37 +0000 -+++ src/client_side.cc 2015-08-28 13:23:34 +0000 -@@ -3447,7 +3447,8 @@ -=20 - /* pools require explicit 'allow' to assign a client into them = */ - if (pools[pool].access) { -- ch.accessList =3D pools[pool].access; -+ cbdataReferenceDone(ch.accessList); -+ ch.accessList =3D cbdataReference(pools[pool].access); - allow_t answer =3D ch.fastCheck(); - if (answer =3D=3D ACCESS_ALLOWED) { -=20 - diff --git a/src/patches/squid-3.4-13230.patch b/src/patches/squid-3.4-13230.= patch deleted file mode 100644 index 597d135..0000000 --- a/src/patches/squid-3.4-13230.patch +++ /dev/null @@ -1,44 +0,0 @@ ------------------------------------------------------------- -revno: 13230 -revision-id: squid3(a)treenet.co.nz-20160212045316-zwx4r9we4gf27rx3 -parent: squid3(a)treenet.co.nz-20151119051038-vwclso11p68sgvxc -fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=3D4431 -author: Marcos Mello -committer: Amos Jeffries -branch nick: 3.4 -timestamp: Fri 2016-02-12 17:53:16 +1300 -message: - Bug 4431: C code is not compiled with CFLAGS ------------------------------------------------------------- -# Bazaar merge directive format 2 (Bazaar 0.90) -# revision_id: squid3(a)treenet.co.nz-20160212045316-zwx4r9we4gf27rx3 -# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 -# testament_sha1: 53c8d70db04dad826815fb86995cda7e99f1d8e2 -# timestamp: 2016-02-12 05:50:53 +0000 -# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 -# base_revision_id: squid3(a)treenet.co.nz-20151119051038-\ -# vwclso11p68sgvxc -#=20 -# Begin patch -=3D=3D=3D modified file 'acinclude/compiler-flags.m4' ---- acinclude/compiler-flags.m4 2015-01-09 10:30:44 +0000 -+++ acinclude/compiler-flags.m4 2016-02-12 04:53:16 +0000 -@@ -36,7 +36,7 @@ - AC_CACHE_CHECK([whether compiler accepts $2],[$1], - [{ - AC_REQUIRE([AC_PROG_CC]) -- SAVED_FLAGS=3D"$CFLAGS" -+ SAVED_CFLAGS=3D"$CFLAGS" - SAVED_CXXFLAGS=3D"$CXXFLAGS" - CFLAGS=3D"$CFLAGS $2" - CXXFLAGS=3D"$CXXFLAGS $2" -@@ -60,7 +60,7 @@ - AC_CACHE_CHECK([whether compiler requires $2],[$1], - [{ - AC_REQUIRE([AC_PROG_CC]) -- SAVED_FLAGS=3D"$CFLAGS" -+ SAVED_CFLAGS=3D"$CFLAGS" - SAVED_CXXFLAGS=3D"$CXXFLAGS" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM($3,$4)],[$1=3Dno],[],[$1=3Dno]) - if test "x$1" !=3D "xno" ; then - diff --git a/src/patches/squid-3.4-13231.patch b/src/patches/squid-3.4-13231.= patch deleted file mode 100644 index 045ad70..0000000 --- a/src/patches/squid-3.4-13231.patch +++ /dev/null @@ -1,48 +0,0 @@ ------------------------------------------------------------- -revno: 13231 -revision-id: squid3(a)treenet.co.nz-20160220150859-3unryicod1rcx9rm -parent: squid3(a)treenet.co.nz-20160212045316-zwx4r9we4gf27rx3 -fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=3D4323 -author: Francesco Chemolli -committer: Amos Jeffries -branch nick: 3.4 -timestamp: Sun 2016-02-21 04:08:59 +1300 -message: - Bug 4323: Netfilter broken cross-includes with Linux 4.2 ------------------------------------------------------------- -# Bazaar merge directive format 2 (Bazaar 0.90) -# revision_id: squid3(a)treenet.co.nz-20160220150859-3unryicod1rcx9rm -# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 -# testament_sha1: 10fa174d2821207d0bf89ef3013e8f4c3f99f9e3 -# timestamp: 2016-02-20 15:50:56 +0000 -# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 -# base_revision_id: squid3(a)treenet.co.nz-20160212045316-\ -# zwx4r9we4gf27rx3 -#=20 -# Begin patch -=3D=3D=3D modified file 'compat/os/linux.h' ---- compat/os/linux.h 2012-08-28 13:00:30 +0000 -+++ compat/os/linux.h 2016-02-20 15:08:59 +0000 -@@ -22,6 +22,21 @@ - #endif -=20 - /* -+ * Netfilter header madness. (see Bug 4323) -+ * -+ * Netfilter have a history of defining their own versions of network proto= col -+ * primitives without sufficient protection against the POSIX defines which= are -+ * aways present in Linux. -+ * -+ * netinet/in.h must be included before any other sys header in order to pr= operly -+ * activate include guards in the kernel maintainers = added -+ * to workaround it. -+ */ -+#if HAVE_NETINET_IN_H -+#include -+#endif -+ -+/* - * sys/capability.h is only needed in Linux apparently. - * - * HACK: LIBCAP_BROKEN Ugly glue to get around linux header madness collidi= ng with glibc - diff --git a/src/patches/squid-3.4-13232.patch b/src/patches/squid-3.4-13232.= patch deleted file mode 100644 index 442c34b..0000000 --- a/src/patches/squid-3.4-13232.patch +++ /dev/null @@ -1,51 +0,0 @@ ------------------------------------------------------------- -revno: 13232 -revision-id: squid3(a)treenet.co.nz-20160330141410-t6p2dhzr8ri36fap -parent: squid3(a)treenet.co.nz-20160220150859-3unryicod1rcx9rm -author: Yuriy M. Kaminskiy -committer: Amos Jeffries -branch nick: 3.4 -timestamp: Thu 2016-03-31 03:14:10 +1300 -message: - pinger: Fix buffer overflow in Icmp6::Recv ------------------------------------------------------------- -# Bazaar merge directive format 2 (Bazaar 0.90) -# revision_id: squid3(a)treenet.co.nz-20160330141410-t6p2dhzr8ri36fap -# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 -# testament_sha1: e404755509c03ec58c0c293552a7f2a579810fd3 -# timestamp: 2016-03-30 14:51:02 +0000 -# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 -# base_revision_id: squid3(a)treenet.co.nz-20160220150859-\ -# 3unryicod1rcx9rm -#=20 -# Begin patch -=3D=3D=3D modified file 'src/icmp/Icmp6.cc' ---- src/icmp/Icmp6.cc 2014-09-15 05:06:14 +0000 -+++ src/icmp/Icmp6.cc 2016-03-30 14:14:10 +0000 -@@ -277,7 +277,7 @@ - #define ip6_hops // HOPS!!! (can it be true??) -=20 - ip =3D (struct ip6_hdr *) pkt; -- pkt +=3D sizeof(ip6_hdr); -+ NP: echo size needs to +sizeof(ip6_hdr); -=20 - debugs(42, DBG_CRITICAL, HERE << "ip6_nxt=3D" << ip->ip6_nxt << - ", ip6_plen=3D" << ip->ip6_plen << -@@ -288,7 +288,6 @@ - */ -=20 - icmp6header =3D (struct icmp6_hdr *) pkt; -- pkt +=3D sizeof(icmp6_hdr); -=20 - if (icmp6header->icmp6_type !=3D ICMP6_ECHO_REPLY) { -=20 -@@ -313,7 +312,7 @@ - return; - } -=20 -- echo =3D (icmpEchoData *) pkt; -+ echo =3D (icmpEchoData *) (pkt + sizeof(icmp6_hdr)); -=20 - preply.opcode =3D echo->opcode; -=20 - diff --git a/src/patches/squid-3.4.14-fix-max-file-descriptors.patch b/src/pa= tches/squid-3.4.14-fix-max-file-descriptors.patch deleted file mode 100644 index 54275b8..0000000 --- a/src/patches/squid-3.4.14-fix-max-file-descriptors.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- configure.ac~ 2016-01-23 01:27:44.078013879 +0000 -+++ configure.ac 2016-01-23 01:28:19.422179243 +0000 -@@ -2573,6 +2573,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 dire= ctive - AC_ARG_WITH(maxfd,, -@@ -2603,8 +2606,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_filedescriptors_= num]) - fi diff --git a/src/patches/squid-3.5.17-fix-max-file-descriptors.patch b/src/pa= tches/squid-3.5.17-fix-max-file-descriptors.patch new file mode 100644 index 0000000..b0efa76 --- /dev/null +++ b/src/patches/squid-3.5.17-fix-max-file-descriptors.patch @@ -0,0 +1,21 @@ +--- configure.ac.~ Wed Apr 20 14:26:07 2016 ++++ configure.ac Fri Apr 22 17:20:46 2016 +@@ -3131,6 +3131,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 dire= ctive + AC_ARG_WITH(maxfd,, +@@ -3161,8 +3164,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_filedescriptors_= num]) + fi --=20 2.8.1 --===============2706584920308700992==--