From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 4 Feb 2014 09:38:25 +0000 (-0300)
Subject: squid: bump to version 3.4.3
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=50f0f9d63c7252d1d46e901be24caef581b1e547;p=buildroot.git

squid: bump to version 3.4.3

And exclude for avr32 since the toolchain is too old, fixes:
http://autobuild.buildroot.net/results/c6a/c6a686885a6c845b527c58c3f2075f82bcf120e2/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---

diff --git a/package/squid/Config.in b/package/squid/Config.in
index 33776ca5de..ad9fab5931 100644
--- a/package/squid/Config.in
+++ b/package/squid/Config.in
@@ -1,5 +1,6 @@
 comment "squid needs a toolchain w/ C++, IPv6"
 	depends on BR2_USE_MMU
+	depends on !BR2_avr32 # toolchain too old
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_INET_IPV6
 
 config BR2_PACKAGE_SQUID
diff --git a/package/squid/squid-02-atomic-cross.patch b/package/squid/squid-02-atomic-cross.patch
deleted file mode 100644
index c1b59dc65e..0000000000
--- a/package/squid/squid-02-atomic-cross.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-AC_RUN_IFELSE is bad for cross compiling, switch to AC_COMPILE_IFELSE
-since it's enough for this test.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
-diff -Nura squid-3.3.9.orig/configure.ac squid-3.3.9/configure.ac
---- squid-3.3.9.orig/configure.ac	2013-09-13 09:15:32.473365627 -0300
-+++ squid-3.3.9/configure.ac	2013-09-13 13:27:06.829711487 -0300
-@@ -392,7 +392,7 @@
- dnl Check for atomic operations support in the compiler
- dnl
- AC_MSG_CHECKING([for GNU atomic operations support])
--AC_RUN_IFELSE([AC_LANG_PROGRAM([[
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-     int n = 0;
- ]],[[
-     __sync_add_and_fetch(&n, 10); // n becomes 10
diff --git a/package/squid/squid-02-missing-include-time_h.patch b/package/squid/squid-02-missing-include-time_h.patch
new file mode 100644
index 0000000000..18b3ab3b55
--- /dev/null
+++ b/package/squid/squid-02-missing-include-time_h.patch
@@ -0,0 +1,28 @@
+ipc/Kid.cc: add missing include of time.h
+
+Function time() comes from <time.h>, so add the necessary include.
+This fixes compilation on some configurations, for example
+http://autobuild.buildroot.net/results/b33/b33e1f41e50b6e7ac3e30806b9a617d451bc27b4/
+
+Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
+Upstream-status: submitted (http://bugs.squid-cache.org/show_bug.cgi?id=3967)
+
+---
+ src/ipc/Kid.cc |  4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+
+diff --git a/src/ipc/Kid.cc b/src/ipc/Kid.cc
+--- a/src/ipc/Kid.cc
++++ b/src/ipc/Kid.cc
+@@ -11,6 +11,10 @@
+ #include <sys/wait.h>
+ #endif
+ 
++#if HAVE_TIME_H
++#include <time.h>
++#endif
++
+ int TheProcessKind = pkOther;
+ 
+ Kid::Kid():
diff --git a/package/squid/squid-03-missing-include-time_h.patch b/package/squid/squid-03-missing-include-time_h.patch
deleted file mode 100644
index 18b3ab3b55..0000000000
--- a/package/squid/squid-03-missing-include-time_h.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-ipc/Kid.cc: add missing include of time.h
-
-Function time() comes from <time.h>, so add the necessary include.
-This fixes compilation on some configurations, for example
-http://autobuild.buildroot.net/results/b33/b33e1f41e50b6e7ac3e30806b9a617d451bc27b4/
-
-Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
-Upstream-status: submitted (http://bugs.squid-cache.org/show_bug.cgi?id=3967)
-
----
- src/ipc/Kid.cc |  4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-
-diff --git a/src/ipc/Kid.cc b/src/ipc/Kid.cc
---- a/src/ipc/Kid.cc
-+++ b/src/ipc/Kid.cc
-@@ -11,6 +11,10 @@
- #include <sys/wait.h>
- #endif
- 
-+#if HAVE_TIME_H
-+#include <time.h>
-+#endif
-+
- int TheProcessKind = pkOther;
- 
- Kid::Kid():
diff --git a/package/squid/squid.mk b/package/squid/squid.mk
index 7f1f0f50c3..529c5df148 100644
--- a/package/squid/squid.mk
+++ b/package/squid/squid.mk
@@ -5,11 +5,12 @@
 ################################################################################
 
 SQUID_VERSION_MAJOR = 3.4
-SQUID_VERSION = $(SQUID_VERSION_MAJOR).2
+SQUID_VERSION = $(SQUID_VERSION_MAJOR).3
 SQUID_SOURCE = squid-$(SQUID_VERSION).tar.xz
 SQUID_SITE = http://www.squid-cache.org/Versions/v3/$(SQUID_VERSION_MAJOR)
 SQUID_LICENSE = GPLv2+
 SQUID_LICENSE_FILES = COPYING
+# For squid-01-assume-get-certificate-ok.patch
 SQUID_AUTORECONF = YES
 SQUID_DEPENDENCIES = libcap host-libcap host-pkgconf \
 	$(if $(BR2_PACKAGE_LIBNETFILTER_CONNTRACK),libnetfilter_conntrack)