squid: update 3.1.4 to 3.1.6

* bug fixes, considered as safe upgrade

Signed-off-by: Roman I Khimov <khimov@altell.ru>

4 files changed, 30 insertions, 53 deletions

diff --git a/recipes/squid/squid-3.1.4/fix-ltdl-usage.patch b/recipes/squid/squid-3.1.4/fix-ltdl-usage.patch
deleted file mode 100644
index ea8536dc76..0000000000
--- a/recipes/squid/squid-3.1.4/fix-ltdl-usage.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: squid-3.1.4/configure.in
-===================================================================
---- squid-3.1.4.orig/configure.in	2010-07-07 12:20:47.000000000 +0400
-+++ squid-3.1.4/configure.in	2010-07-07 12:23:17.000000000 +0400
-@@ -79,7 +79,8 @@
-     top_build_prefix=${ac_top_build_prefix}
-     AC_SUBST(top_build_prefix)
- 
--    AC_LIBLTDL_CONVENIENCE
-+    LT_CONFIG_LTDL_DIR(libltdl)
-+    LTDL_INIT(convenience)
- fi
- AC_PROG_LIBTOOL
- AC_LTDL_DLLIB
-@@ -3965,6 +3966,6 @@
- AC_CONFIG_SUBDIRS(lib/libTrie)
- 
- # must configure libltdl subdir unconditionally for "make distcheck" to work
--AC_CONFIG_SUBDIRS(libltdl)
-+# AC_CONFIG_SUBDIRS(libltdl)
- 
- AC_OUTPUT
diff --git a/recipes/squid/squid-3.1.4/fix-runs-in-configure.patch b/recipes/squid/squid-3.1.6/fix-runs-in-configure.patch
index db4f7c0e03..3ae771f3f5 100644
--- a/recipes/squid/squid-3.1.4/fix-runs-in-configure.patch
+++ b/recipes/squid/squid-3.1.6/fix-runs-in-configure.patch
@@ -1,8 +1,8 @@
-Index: squid-3.1.4/configure.in
+Index: squid-3.1.6/configure.in
 ===================================================================
---- squid-3.1.4.orig/configure.in	2010-07-06 16:09:45.000000000 +0400
-+++ squid-3.1.4/configure.in	2010-07-06 16:09:45.000000000 +0400
-@@ -365,10 +365,6 @@
+--- squid-3.1.6.orig/configure.in	2010-08-19 23:19:52.000000000 +0400
++++ squid-3.1.6/configure.in	2010-08-19 23:22:44.000000000 +0400
+@@ -364,10 +364,6 @@
    fi
  ])
  
@@ -13,25 +13,25 @@ Index: squid-3.1.4/configure.in
  dnl This is a developer only option.. developers know how to set defines
  dnl
  dnl AC_ARG_ENABLE(xmalloc-debug,
-@@ -2680,7 +2676,7 @@
-       ;;
-   esac
-   AC_CACHE_CHECK([if PF_INET6 is available], squid_cv_pf_inet6,
--    AC_RUN_IFELSE([AC_LANG_SOURCE([[ /* PF_INET6 available check */
-+    AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ /* PF_INET6 available check */
- #       include <sys/types.h>
- #       include <sys/socket.h>
-         int main(int argc, char **argv) {
-@@ -2720,7 +2716,7 @@
- dnl But only usable if it actually works...
-   if test "$use_v4mapped" = "yes" ; then
-     AC_MSG_CHECKING([for IPv6 v4-mapping ability])
--    AC_RUN_IFELSE([AC_LANG_SOURCE([[ /* IPPROTO_V4MAPPED is usable check */
-+    AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ /* IPPROTO_V4MAPPED is usable check */
- #       include <sys/types.h>
- #       include <sys/socket.h>
- #	include <netinet/in.h>
-@@ -3165,7 +3161,7 @@
+@@ -1318,7 +1314,7 @@
+   dnl Verify that epoll really works
+   if test $ac_cv_func_epoll_ctl = yes; then
+     AC_CACHE_CHECK(if epoll works, ac_cv_epoll_works,
+-      AC_RUN_IFELSE([AC_LANG_SOURCE([[
++      AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
+ #include <sys/epoll.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+@@ -3070,7 +3066,7 @@
+ dnl setresuid() but doesn't implement it.
+ dnl
+ AC_CACHE_CHECK(if setresuid is implemented, ac_cv_func_setresuid,
+-  AC_RUN_IFELSE([AC_LANG_SOURCE([[
++  AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
+ #include <stdlib.h>
+   int main(int argc, char **argv) {
+     if(setresuid(-1,-1,-1)) {
+@@ -3090,7 +3086,7 @@
  dnl copy that crashes with a buffer over-run!
  dnl
  AC_CACHE_CHECK(if strnstr is well implemented, ac_cv_func_strnstr,
@@ -40,7 +40,7 @@ Index: squid-3.1.4/configure.in
  #include <stdlib.h>
  #include <stdio.h>
  #include <string.h>
-@@ -3191,7 +3187,7 @@
+@@ -3116,7 +3112,7 @@
  dnl Test for va_copy
  dnl
  AC_CACHE_CHECK(if va_copy is implemented, ac_cv_func_va_copy,
@@ -49,7 +49,7 @@ Index: squid-3.1.4/configure.in
        #include <stdarg.h>
        #include <stdlib.h>
        int f (int i, ...) {
-@@ -3214,7 +3210,7 @@
+@@ -3139,7 +3135,7 @@
  dnl Some systems support __va_copy
  dnl
  AC_CACHE_CHECK(if __va_copy is implemented, ac_cv_func___va_copy,
@@ -58,10 +58,10 @@ Index: squid-3.1.4/configure.in
        #include <stdarg.h>
        #include <stdlib.h>
        int f (int i, ...) {
-Index: squid-3.1.4/helpers/negotiate_auth/squid_kerb_auth/configure.in
+Index: squid-3.1.6/helpers/negotiate_auth/squid_kerb_auth/configure.in
 ===================================================================
---- squid-3.1.4.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in	2010-07-06 16:11:59.000000000 +0400
-+++ squid-3.1.4/helpers/negotiate_auth/squid_kerb_auth/configure.in	2010-07-06 16:12:55.000000000 +0400
+--- squid-3.1.6.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in	2010-08-01 18:01:38.000000000 +0400
++++ squid-3.1.6/helpers/negotiate_auth/squid_kerb_auth/configure.in	2010-08-19 23:20:34.000000000 +0400
 @@ -367,13 +367,13 @@
  
  CPPFLAGS="$CPPFLAGS -I../../../ -I../../../include/ -I$squid_dir/include -I$squid_dir/src -I$squid_dir"
diff --git a/recipes/squid/squid-3.1.4/squidv3-build-cf_gen.patch b/recipes/squid/squid-3.1.6/squidv3-build-cf_gen.patch
index 955acf8007..955acf8007 100644
--- a/recipes/squid/squid-3.1.4/squidv3-build-cf_gen.patch
+++ b/recipes/squid/squid-3.1.6/squidv3-build-cf_gen.patch
diff --git a/recipes/squid/squid_3.1.4.bb b/recipes/squid/squid_3.1.6.bb
index 1d746a1cb1..1949f7751f 100644
--- a/recipes/squid/squid_3.1.4.bb
+++ b/recipes/squid/squid_3.1.6.bb
@@ -12,11 +12,10 @@ EXTRA_OEMAKE += "DEFAULT_STYLESHEET=${sysconfdir}/squid/errorpage.css DEFAULT_CO
 SRC_URI += " \
 	file://squidv3-build-cf_gen.patch \
 	file://fix-runs-in-configure.patch \
-	file://fix-ltdl-usage.patch \
 	"
 
-SRC_URI[squid-3.1.4.md5sum] = "3fb544ae02fadc2b4085f62bb927e861"
-SRC_URI[squid-3.1.4.sha256sum] = "13ea33907c64f417afaf596b04550cd950f57dc43357d309ffa92cfac2de58f6"
+SRC_URI[squid-3.1.6.md5sum] = "e9e2e9a9b5a305ba717be93ebb85f245"
+SRC_URI[squid-3.1.6.sha256sum] = "e1de72d85a1b607e7dd477e29c4582b34f844af675211cb273421c920073f4fa"
 
 do_configure_prepend() {
 	export ac_cv_epoll_ctl=yes