diff options
| -rw-r--r-- | network/squid/patches/squid-3.4-13228.patch | 35 | ||||
| -rw-r--r-- | network/squid/patches/squid-3.4-13229.patch | 46 | ||||
| -rw-r--r-- | network/squid/patches/squid-3.4-13230.patch | 44 | ||||
| -rw-r--r-- | network/squid/patches/squid-3.4-13231.patch | 48 | ||||
| -rw-r--r-- | network/squid/patches/squid-3.4-13232.patch | 51 | ||||
| -rw-r--r-- | network/squid/squid.SlackBuild | 14 | ||||
| -rw-r--r-- | network/squid/squid.info | 6 |
7 files changed, 6 insertions, 238 deletions
diff --git a/network/squid/patches/squid-3.4-13228.patch b/network/squid/patches/squid-3.4-13228.patch deleted file mode 100644 index 7f7d16f5bda37..0000000000000 --- a/network/squid/patches/squid-3.4-13228.patch +++ /dev/null @@ -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) { - - diff --git a/network/squid/patches/squid-3.4-13229.patch b/network/squid/patches/squid-3.4-13229.patch deleted file mode 100644 index 3f7cdfd4761df..0000000000000 --- a/network/squid/patches/squid-3.4-13229.patch +++ /dev/null @@ -1,46 +0,0 @@ ------------------------------------------------------------- -revno: 13229 -revision-id: squid3@treenet.co.nz-20151119051038-vwclso11p68sgvxc -parent: squid3@treenet.co.nz-20150828132334-3r7v4kh1lrqprrqg -committer: Amos Jeffries <squid3@treenet.co.nz> -branch nick: 3.4 -timestamp: Wed 2015-11-18 21:10:38 -0800 -message: - Fix delay_parameters documentation ------------------------------------------------------------- -# Bazaar merge directive format 2 (Bazaar 0.90) -# revision_id: squid3@treenet.co.nz-20151119051038-vwclso11p68sgvxc -# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 -# testament_sha1: 2531c5b2bc5fd88d4a875d2d4fa5750f41b0414b -# timestamp: 2015-11-19 05:12:06 +0000 -# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 -# base_revision_id: squid3@treenet.co.nz-20150828132334-\ -# 3r7v4kh1lrqprrqg -# -# Begin patch -=== modified file 'src/cf.data.pre' ---- src/cf.data.pre 2015-01-24 05:13:20 +0000 -+++ src/cf.data.pre 2015-11-19 05:10:38 +0000 -@@ -6173,7 +6173,7 @@ - - delay_parameters 1 -1/-1 8000/8000 - -- Note that 8 x 8000 KByte/sec -> 64Kbit/sec. -+ Note that 8 x 8K Byte/sec -> 64K bit/sec. - - Note that the figure -1 is used to represent "unlimited". - -@@ -6188,9 +6188,9 @@ - - delay_parameters 2 32000/32000 8000/8000 600/8000 - -- Note that 8 x 32000 KByte/sec -> 256Kbit/sec. -- 8 x 8000 KByte/sec -> 64Kbit/sec. -- 8 x 600 Byte/sec -> 4800bit/sec. -+ Note that 8 x 32K Byte/sec -> 256K bit/sec. -+ 8 x 8K Byte/sec -> 64K bit/sec. -+ 8 x 600 Byte/sec -> 4800 bit/sec. - - - Finally, for a class 4 delay pool as in the example - each user will - diff --git a/network/squid/patches/squid-3.4-13230.patch b/network/squid/patches/squid-3.4-13230.patch deleted file mode 100644 index 597d135209031..0000000000000 --- a/network/squid/patches/squid-3.4-13230.patch +++ /dev/null @@ -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 - diff --git a/network/squid/patches/squid-3.4-13231.patch b/network/squid/patches/squid-3.4-13231.patch deleted file mode 100644 index 045ad7092f576..0000000000000 --- a/network/squid/patches/squid-3.4-13231.patch +++ /dev/null @@ -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 - diff --git a/network/squid/patches/squid-3.4-13232.patch b/network/squid/patches/squid-3.4-13232.patch deleted file mode 100644 index 442c34b16f6ce..0000000000000 --- a/network/squid/patches/squid-3.4-13232.patch +++ /dev/null @@ -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; - - diff --git a/network/squid/squid.SlackBuild b/network/squid/squid.SlackBuild index 9a41802cb0cfb..59dbfd96b980c 100644 --- a/network/squid/squid.SlackBuild +++ b/network/squid/squid.SlackBuild @@ -24,8 +24,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=squid -VERSION=${VERSION:-3.4.14} -BUILD=${BUILD:-2} +VERSION=${VERSION:-3.5.17} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -73,14 +73,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Include patches intended for inclusion in 3.4.next -# http://www.squid-cache.org/Versions/v3/3.4/changesets/ -patch -p0 < $CWD/patches/squid-3.4-13228.patch -patch -p0 < $CWD/patches/squid-3.4-13229.patch -patch -p0 < $CWD/patches/squid-3.4-13230.patch -patch -p0 < $CWD/patches/squid-3.4-13231.patch -patch -p0 < $CWD/patches/squid-3.4-13232.patch - # last option is needed on current CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -112,7 +104,7 @@ for i in $(find $PKG/usr/man -type l); do ln -s $(readlink $i).gz $i.gz; rm $i; mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - CONTRIBUTORS COPYING COPYRIGHT CREDITS ChangeLog INSTALL \ + CONTRIBUTORS COPYING CREDITS ChangeLog INSTALL \ QUICKSTART README RELEASENOTES.html SPONSORS $CWD/README.SBo \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/network/squid/squid.info b/network/squid/squid.info index f2acd70e0cdcf..86fc09b59d16e 100644 --- a/network/squid/squid.info +++ b/network/squid/squid.info @@ -1,8 +1,8 @@ PRGNAM="squid" -VERSION="3.4.14" +VERSION="3.5.17" HOMEPAGE="http://www.squid-cache.org/" -DOWNLOAD="http://www.squid-cache.org/Versions/v3/3.4/squid-3.4.14.tar.xz" -MD5SUM="4e7d7d062159484563ef11f69a0df50a" +DOWNLOAD="http://www.squid-cache.org/Versions/v3/3.5/squid-3.5.17.tar.xz" +MD5SUM="2dc73cc01e77b1bd16d9070780ae79b1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |