mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-26 02:42:58 +02:00
squid: Update to 3.5.17
Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org> Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Matthias Fischer
committed by
Michael Tremer
Michael Tremer
parent
3d7e6b4b61
commit
77d0467c05
@@ -1,35 +0,0 @@
|
||||
------------------------------------------------------------
|
||||
revno: 13228
|
||||
revision-id: squid3@treenet.co.nz-20150828132334-3r7v4kh1lrqprrqg
|
||||
parent: squid3@treenet.co.nz-20150801072237-5tzh2dczozz1e8sq
|
||||
fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=3696
|
||||
committer: Amos Jeffries <squid3@treenet.co.nz>
|
||||
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@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@treenet.co.nz-20150801072237-\
|
||||
# 5tzh2dczozz1e8sq
|
||||
#
|
||||
# Begin patch
|
||||
=== 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 @@
|
||||
|
||||
/* pools require explicit 'allow' to assign a client into them */
|
||||
if (pools[pool].access) {
|
||||
- ch.accessList = pools[pool].access;
|
||||
+ cbdataReferenceDone(ch.accessList);
|
||||
+ ch.accessList = cbdataReference(pools[pool].access);
|
||||
allow_t answer = ch.fastCheck();
|
||||
if (answer == ACCESS_ALLOWED) {
|
||||
|
||||
|
||||
@@ -1,44 +0,0 @@
|
||||
------------------------------------------------------------
|
||||
revno: 13230
|
||||
revision-id: squid3@treenet.co.nz-20160212045316-zwx4r9we4gf27rx3
|
||||
parent: squid3@treenet.co.nz-20151119051038-vwclso11p68sgvxc
|
||||
fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=4431
|
||||
author: Marcos Mello <marcosfrm@gmail.com>
|
||||
committer: Amos Jeffries <squid3@treenet.co.nz>
|
||||
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@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@treenet.co.nz-20151119051038-\
|
||||
# vwclso11p68sgvxc
|
||||
#
|
||||
# Begin patch
|
||||
=== 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="$CFLAGS"
|
||||
+ SAVED_CFLAGS="$CFLAGS"
|
||||
SAVED_CXXFLAGS="$CXXFLAGS"
|
||||
CFLAGS="$CFLAGS $2"
|
||||
CXXFLAGS="$CXXFLAGS $2"
|
||||
@@ -60,7 +60,7 @@
|
||||
AC_CACHE_CHECK([whether compiler requires $2],[$1],
|
||||
[{
|
||||
AC_REQUIRE([AC_PROG_CC])
|
||||
- SAVED_FLAGS="$CFLAGS"
|
||||
+ SAVED_CFLAGS="$CFLAGS"
|
||||
SAVED_CXXFLAGS="$CXXFLAGS"
|
||||
AC_COMPILE_IFELSE([AC_LANG_PROGRAM($3,$4)],[$1=no],[],[$1=no])
|
||||
if test "x$1" != "xno" ; then
|
||||
|
||||
@@ -1,48 +0,0 @@
|
||||
------------------------------------------------------------
|
||||
revno: 13231
|
||||
revision-id: squid3@treenet.co.nz-20160220150859-3unryicod1rcx9rm
|
||||
parent: squid3@treenet.co.nz-20160212045316-zwx4r9we4gf27rx3
|
||||
fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=4323
|
||||
author: Francesco Chemolli <kinkie@squid-cache.org>
|
||||
committer: Amos Jeffries <squid3@treenet.co.nz>
|
||||
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@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@treenet.co.nz-20160212045316-\
|
||||
# zwx4r9we4gf27rx3
|
||||
#
|
||||
# Begin patch
|
||||
=== 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
|
||||
|
||||
/*
|
||||
+ * Netfilter header madness. (see Bug 4323)
|
||||
+ *
|
||||
+ * Netfilter have a history of defining their own versions of network protocol
|
||||
+ * 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 properly
|
||||
+ * activate include guards in <linux/libc-compat.h> the kernel maintainers added
|
||||
+ * to workaround it.
|
||||
+ */
|
||||
+#if HAVE_NETINET_IN_H
|
||||
+#include <netinet/in.h>
|
||||
+#endif
|
||||
+
|
||||
+/*
|
||||
* sys/capability.h is only needed in Linux apparently.
|
||||
*
|
||||
* HACK: LIBCAP_BROKEN Ugly glue to get around linux header madness colliding with glibc
|
||||
|
||||
@@ -1,51 +0,0 @@
|
||||
------------------------------------------------------------
|
||||
revno: 13232
|
||||
revision-id: squid3@treenet.co.nz-20160330141410-t6p2dhzr8ri36fap
|
||||
parent: squid3@treenet.co.nz-20160220150859-3unryicod1rcx9rm
|
||||
author: Yuriy M. Kaminskiy <yumkam@gmail.com>
|
||||
committer: Amos Jeffries <squid3@treenet.co.nz>
|
||||
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@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@treenet.co.nz-20160220150859-\
|
||||
# 3unryicod1rcx9rm
|
||||
#
|
||||
# Begin patch
|
||||
=== 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??)
|
||||
|
||||
ip = (struct ip6_hdr *) pkt;
|
||||
- pkt += sizeof(ip6_hdr);
|
||||
+ NP: echo size needs to +sizeof(ip6_hdr);
|
||||
|
||||
debugs(42, DBG_CRITICAL, HERE << "ip6_nxt=" << ip->ip6_nxt <<
|
||||
", ip6_plen=" << ip->ip6_plen <<
|
||||
@@ -288,7 +288,6 @@
|
||||
*/
|
||||
|
||||
icmp6header = (struct icmp6_hdr *) pkt;
|
||||
- pkt += sizeof(icmp6_hdr);
|
||||
|
||||
if (icmp6header->icmp6_type != ICMP6_ECHO_REPLY) {
|
||||
|
||||
@@ -313,7 +312,7 @@
|
||||
return;
|
||||
}
|
||||
|
||||
- echo = (icmpEchoData *) pkt;
|
||||
+ echo = (icmpEchoData *) (pkt + sizeof(icmp6_hdr));
|
||||
|
||||
preply.opcode = echo->opcode;
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
+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 directive
|
||||
AC_ARG_WITH(maxfd,,
|
||||
@@ -2603,8 +2606,6 @@
|
||||
esac
|
||||
])
|
||||
|
||||
-SQUID_CHECK_DEFAULT_FD_SETSIZE
|
||||
-SQUID_CHECK_MAXFD
|
||||
if test "x$squid_filedescriptors_num" != "x"; then
|
||||
AC_MSG_NOTICE([Default number of fieldescriptors: $squid_filedescriptors_num])
|
||||
fi
|
||||
Reference in New Issue
Block a user