Patchwork squid: bump to version 3.2.3

login
register
mail settings
Submitter Gustavo Zacarias
Date Oct. 29, 2012, 8:57 p.m.
Message ID <1351544236-23479-1-git-send-email-gustavo@zacarias.com.ar>
Download mbox | patch
Permalink /patch/195139/
State Accepted
Commit 75b9e7f0997ed0229348a30429d0d5df8a82c8a3
Headers show

Comments

Gustavo Zacarias - Oct. 29, 2012, 8:57 p.m.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/squid/Config.in |    2 ++
 package/squid/squid.mk  |   24 +++++++++++++++++-------
 2 files changed, 19 insertions(+), 7 deletions(-)
Peter Korsgaard - Oct. 29, 2012, 9:37 p.m.
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:

 Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>

Committed, thanks.
Peter Korsgaard - Oct. 30, 2012, 4:16 p.m.
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:

 Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
 Gustavo> ---
 Gustavo>  package/squid/Config.in |    2 ++
 Gustavo>  package/squid/squid.mk  |   24 +++++++++++++++++-------
 Gustavo>  2 files changed, 19 insertions(+), 7 deletions(-)

This seems to have caused some build failures:

http://autobuild.buildroot.net/results/c9e590a1034c3869cb7391984ce8281ec4c3ef9c/build-end.log

http://autobuild.buildroot.net/results/7f8201ebcafd611cab95788e030b768fa84ad28b/build-end.log

The 2nd you can probably not do much about though.
Gustavo Zacarias - Oct. 30, 2012, 5:23 p.m.
On 10/30/12 13:16, Peter Korsgaard wrote:

> This seems to have caused some build failures:
> 
> http://autobuild.buildroot.net/results/c9e590a1034c3869cb7391984ce8281ec4c3ef9c/build-end.log
> 
> http://autobuild.buildroot.net/results/7f8201ebcafd611cab95788e030b768fa84ad28b/build-end.log
> 
> The 2nd you can probably not do much about though.

Give the patch i've sent a try, it should fix the first one.
Yes, not much we can do about heavy C++ code breaking some toolchain guts...
Regards.

Patch

diff --git a/package/squid/Config.in b/package/squid/Config.in
index 4ec7fa4..8a77da8 100644
--- a/package/squid/Config.in
+++ b/package/squid/Config.in
@@ -5,6 +5,8 @@  config BR2_PACKAGE_SQUID
 	bool "squid"
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_INET_IPV6
+	# needs fork()
+	depends on BR2_USE_MMU
 	select BR2_PACKAGE_LIBCAP
 	help
 	  Caching proxy for the Web supporting HTTP, HTTPS, FTP, and more.
diff --git a/package/squid/squid.mk b/package/squid/squid.mk
index 52bfde0..fc58fce 100644
--- a/package/squid/squid.mk
+++ b/package/squid/squid.mk
@@ -4,20 +4,30 @@ 
 #
 #############################################################
 
-SQUID_VERSION = 3.1.20
-SQUID_SITE = http://www.squid-cache.org/Versions/v3/3.1
-SQUID_DEPENDENCIES = libcap host-libcap
+SQUID_VERSION = 3.2.3
+SQUID_SITE = http://www.squid-cache.org/Versions/v3/3.2
+SQUID_LICENSE = GPLv2+
+SQUID_LICENSE_FILES = COPYING
+SQUID_DEPENDENCIES = libcap host-libcap host-pkgconf \
+	$(if $(BR2_PACKAGE_LIBNETFILTER_CONNTRACK),libnetfilter_conntrack)
 SQUID_CONF_ENV =	ac_cv_epoll_works=yes ac_cv_func_setresuid=yes \
 			ac_cv_func_va_copy=yes ac_cv_func___va_copy=yes \
 			ac_cv_func_strnstr=no ac_cv_have_squid=yes
-SQUID_CONF_OPT =	--enable-wccp --enable-wccpv2 --enable-async-io=8 \
-			--enable-htcp --enable-snmp --enable-linux-netfilter \
+SQUID_CONF_OPT =	--enable-async-io=8 --enable-linux-netfilter \
 			--enable-removal-policies="lru,heap" \
 			--with-filedescriptors=1024 --disable-ident-lookups \
-			--enable-auth="digest" --disable-strict-error-checking \
-			--enable-digest-auth-helpers="password" \
+			--enable-auth-basic="fake getpwnam" \
+			--enable-auth-digest="file" \
+			--enable-auth-negotiate="wrapper" \
+			--enable-auth-ntlm="fake" \
+			--disable-strict-error-checking \
 			--enable-external-acl-helpers="ip_user"
 
+# On uClibc librt needs libpthread
+ifeq ($(BR2_TOOLCHAIN_HAS_THREADS)$(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)$(BR2_TOOLCHAIN_CTNG_uClibc),yy)
+	SQUID_CONF_ENV += ac_cv_search_shm_open="-lrt -lpthread"
+endif
+
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 	SQUID_CONF_OPT += --enable-ssl
 	SQUID_DEPENDENCIES += openssl