[Buildroot] [PATCH 1/2] squid: bump to version 3.5.3

[Buildroot] [PATCH 1/2] squid: bump to version 3.5.3

[Gustavo Zacarias]

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/squid/squid.hash |  6 +++---
 package/squid/squid.mk   | 10 +++++++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/package/squid/squid.hash b/package/squid/squid.hash
index 7d3e3f6..85f467a 100644
--- a/package/squid/squid.hash
+++ b/package/squid/squid.hash
@@ -1,3 +1,3 @@
-# From http://www.squid-cache.org/Versions/v3/3.5/squid-3.5.2.tar.xz.asc
-md5	0330ec9f69e333c2a81fa4502ba96a22	squid-3.5.2.tar.xz
-sha1	9c546d72df741c9ddaa6da87baa2112503bcbb45	squid-3.5.2.tar.xz
+# From http://www.squid-cache.org/Versions/v3/3.5/squid-3.5.3.tar.xz.asc
+md5	6cd553300a2253c0913f498beb79ee51	squid-3.5.3.tar.xz
+sha1	6919305e16f59387197cf543f525e41f510b4727	squid-3.5.3.tar.xz
diff --git a/package/squid/squid.mk b/package/squid/squid.mk
index 874332f..fc82392 100644
--- a/package/squid/squid.mk
+++ b/package/squid/squid.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 SQUID_VERSION_MAJOR = 3.5
-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+
@@ -42,6 +42,14 @@ SQUID_CONF_OPTS = \
 	--enable-icap-client \
 	--with-default-user=squid
 
+# Atomics support requires __sync_add_and_fetch_8 (64-bits)
+# That's only handled in gcc's libatomic for 32-bit arches
+ifeq ($(BR2_ARCH_HAS_ATOMICS)$(BR2_ARCH_IS_64),yy)
+	SQUID_CONF_ENV += squid_cv_gnu_atomics=yes
+else
+	SQUID_CONF_ENV += squid_cv_gnu_atomics=no
+endif
+
 # On uClibc librt needs libpthread
 ifeq ($(BR2_TOOLCHAIN_HAS_THREADS)$(BR2_TOOLCHAIN_USES_UCLIBC),yy)
 	SQUID_CONF_ENV += ac_cv_search_shm_open="-lrt -lpthread"
-- 
2.0.5

[Buildroot] [PATCH 2/2] squid: adjust style

[Gustavo Zacarias]

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/squid/squid.mk | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/package/squid/squid.mk b/package/squid/squid.mk
index fc82392..ee30908 100644
--- a/package/squid/squid.mk
+++ b/package/squid/squid.mk
@@ -10,7 +10,7 @@ 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
+# For 0001-assume-get-certificate-ok.patch
 SQUID_AUTORECONF = YES
 SQUID_DEPENDENCIES = libcap host-libcap host-pkgconf \
 	$(if $(BR2_PACKAGE_LIBNETFILTER_CONNTRACK),libnetfilter_conntrack)
@@ -45,19 +45,19 @@ SQUID_CONF_OPTS = \
 # Atomics support requires __sync_add_and_fetch_8 (64-bits)
 # That's only handled in gcc's libatomic for 32-bit arches
 ifeq ($(BR2_ARCH_HAS_ATOMICS)$(BR2_ARCH_IS_64),yy)
-	SQUID_CONF_ENV += squid_cv_gnu_atomics=yes
+SQUID_CONF_ENV += squid_cv_gnu_atomics=yes
 else
-	SQUID_CONF_ENV += squid_cv_gnu_atomics=no
+SQUID_CONF_ENV += squid_cv_gnu_atomics=no
 endif
 
 # On uClibc librt needs libpthread
 ifeq ($(BR2_TOOLCHAIN_HAS_THREADS)$(BR2_TOOLCHAIN_USES_UCLIBC),yy)
-	SQUID_CONF_ENV += ac_cv_search_shm_open="-lrt -lpthread"
+SQUID_CONF_ENV += ac_cv_search_shm_open="-lrt -lpthread"
 endif
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
-	SQUID_CONF_OPTS += --enable-ssl
-	SQUID_DEPENDENCIES += openssl
+SQUID_CONF_OPTS += --enable-ssl
+SQUID_DEPENDENCIES += openssl
 endif
 
 define SQUID_CLEANUP_TARGET
-- 
2.0.5

[Buildroot] [PATCH 1/2] squid: bump to version 3.5.3

[Baruch Siach]

Hi Gustavo,

On Sun, Mar 29, 2015 at 11:33:31AM -0300, Gustavo Zacarias wrote:
> +# Atomics support requires __sync_add_and_fetch_8 (64-bits)
> +# That's only handled in gcc's libatomic for 32-bit arches

Maybe you mean "64-bit arches"? Otherwise the code does not match.

> +ifeq ($(BR2_ARCH_HAS_ATOMICS)$(BR2_ARCH_IS_64),yy)
> +	SQUID_CONF_ENV += squid_cv_gnu_atomics=yes
> +else
> +	SQUID_CONF_ENV += squid_cv_gnu_atomics=no
> +endif
> +
>  # On uClibc librt needs libpthread
>  ifeq ($(BR2_TOOLCHAIN_HAS_THREADS)$(BR2_TOOLCHAIN_USES_UCLIBC),yy)
>  	SQUID_CONF_ENV += ac_cv_search_shm_open="-lrt -lpthread"

baruch

-- 
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -

[Buildroot] [PATCH 1/2] squid: bump to version 3.5.3

[Gustavo Zacarias]

On 03/29/2015 11:52 AM, Baruch Siach wrote:

> Hi Gustavo,
> 
> On Sun, Mar 29, 2015 at 11:33:31AM -0300, Gustavo Zacarias wrote:
>> +# Atomics support requires __sync_add_and_fetch_8 (64-bits)
>> +# That's only handled in gcc's libatomic for 32-bit arches
> 
> Maybe you mean "64-bit arches"? Otherwise the code does not match.

Hi Baruch.
Actually no, that's exactly what i mean.
Native atomics don't need libatomic, atomics that aren't supported by
said arch are, for example 8-byte atomics on 32-bit (4-byte) architectures.
That's cared for in gcc's libatomic, but we don't build it, hence this.
Regards.

[Buildroot] [PATCH 1/2] squid: bump to version 3.5.3

[Thomas Petazzoni]

Dear Gustavo Zacarias,

On Sun, 29 Mar 2015 11:33:31 -0300, Gustavo Zacarias wrote:

> +# Atomics support requires __sync_add_and_fetch_8 (64-bits)
> +# That's only handled in gcc's libatomic for 32-bit arches

Following the discussion with Baruch, I've updated this comment to:

+# Atomics in Squid use __sync_add_and_fetch_8, i.e a 64 bits atomic
+# operation. This atomic intrinsic is only available natively on
+# 64-bit architectures that have atomic operations. On 32-bit
+# architectures, it would be provided by libatomic, but Buildroot
+# typically doesn't provide it.

and applied this patch, as well as PATCH 2/2.

Thanks,

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com