squid: bump to 3.4.11

Signed-off-by: Marko Ratkaj <marko.ratkaj@sartura.hr>

diff --git a/net/squid/Makefile b/net/squid/Makefile
index 1a768c522da906f44138ffb51c2df8f35253c738..130cdc479af83b1a6807831e98525cde7044df9f 100644 (file)
--- a/net/squid/Makefile
+++ b/net/squid/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=squid
-PKG_VERSION:=3.4.10
+PKG_VERSION:=3.4.11
 PKG_RELEASE:=1
 
 PKG_LICENSE:=GPL-2.0
@@ -16,7 +16,7 @@ PKG_MAINTAINER:=Luka Perkov <luka@openwrt.org>
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=http://www.squid-cache.org/Versions/v3/3.4/
-PKG_MD5SUM:=3136edfe9bc2458e725671b0d2455702
+PKG_MD5SUM:=e79ddb108d24823da8c1dbc0fc4a31fb
 
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1

diff --git a/net/squid/patches/001-cross_compile.patch b/net/squid/patches/001-cross_compile.patch
index c30f0346fda7fbcb185903ec5fad6d177d03e51f..8b1d7725705081a6a0ebc94e96a31dfbcc7256a2 100644 (file)
--- a/net/squid/patches/001-cross_compile.patch
+++ b/net/squid/patches/001-cross_compile.patch
@@ -11,7 +11,7 @@
  squid.conf.default squid.conf.documented: cf_parser.cci
 --- a/configure
 +++ b/configure
-@@ -22223,7 +22223,7 @@ $as_echo_n "checking whether the SSL_get
+@@ -22226,7 +22226,7 @@ $as_echo_n "checking whether the SSL_get
    if test "$cross_compiling" = yes; then :
    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -20,7 +20,7 @@
  See \`config.log' for more details" "$LINENO" 5; }
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -22271,7 +22271,7 @@ $as_echo_n "checking whether the workaro
+@@ -22274,7 +22274,7 @@ $as_echo_n "checking whether the workaro
    if test "$cross_compiling" = yes; then :
    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -29,7 +29,7 @@
  See \`config.log' for more details" "$LINENO" 5; }
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -24921,7 +24921,7 @@ else
+@@ -24924,7 +24924,7 @@ else
      if test "$cross_compiling" = yes; then :
    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -38,7 +38,7 @@
  See \`config.log' for more details" "$LINENO" 5; }
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -24946,7 +24946,7 @@ else
+@@ -24949,7 +24949,7 @@ else
      if test "$cross_compiling" = yes; then :
    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

diff --git a/net/squid/patches/100-mime.patch b/net/squid/patches/100-mime.patch
index 72915ae8f46ad7f1ed76e22fd132e3e829168365..b5f3aaf8f4b766f73fb6cd289fc107fc83f7cbfd 100644 (file)
--- a/net/squid/patches/100-mime.patch
+++ b/net/squid/patches/100-mime.patch
@@ -20,7 +20,7 @@
  \.gif$                        image/gif               silk/image.png                  -       image   +download
  \.mime$                       www/mime                silk/page_white_text.png        -       ascii   +download
  ^internal-dirup$      -                       silk/arrow_up.png               -       -
-@@ -190,6 +174,4 @@
+@@ -190,6 +174,4 @@ README             text/plain                      silk/information.pn
  \.xml$                text/xml                        silk/page_world.png             -       ascii   +download
  \.xsl$                text/xml                        silk/layout.png                 -       ascii   +download
  \.xyz$                chemical/x-xyz                  silk/chart_line.png             -       image   +download