[Buildroot] [PATCH 1/4] lvm2: bump to version 2.02.124

[Buildroot] [PATCH 1/4] lvm2: bump to version 2.02.124

[Vicente Olivert Riera]

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
---
 package/lvm2/lvm2.hash | 2 +-
 package/lvm2/lvm2.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/lvm2/lvm2.hash b/package/lvm2/lvm2.hash
index e6047bb..982cfc7 100644
--- a/package/lvm2/lvm2.hash
+++ b/package/lvm2/lvm2.hash
@@ -1,2 +1,2 @@
 # From ftp://sources.redhat.com/pub/lvm2/md5.sum
-md5  5ae469f1a021729d3db9d269077ad4fe  LVM2.2.02.123.tgz
+md5  da8d81a6a2ea235025795d9e001a6ae3  LVM2.2.02.124.tgz
diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk
index 6a3aec3..c112b97 100644
--- a/package/lvm2/lvm2.mk
+++ b/package/lvm2/lvm2.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LVM2_VERSION = 2.02.123
+LVM2_VERSION = 2.02.124
 LVM2_SOURCE = LVM2.$(LVM2_VERSION).tgz
 LVM2_SITE = ftp://sources.redhat.com/pub/lvm2/releases
 LVM2_INSTALL_STAGING = YES
-- 
2.3.6

[Buildroot] [PATCH 2/4] nano: bump to version 2.4.2

[Vicente Olivert Riera]

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
---
 package/nano/nano.hash | 2 +-
 package/nano/nano.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/nano/nano.hash b/package/nano/nano.hash
index cb5d5b8..8ad1497 100644
--- a/package/nano/nano.hash
+++ b/package/nano/nano.hash
@@ -1,2 +1,2 @@
 # Locally calculated after checking pgp signature
-sha256	6a0ceb5e1b9b9bea72d5d1f46488ace4782b1f198ea6ba558480a86d994f29d2	nano-2.4.1.tar.gz
+sha256  c8cd7f18fcf5696d9df3364ee2a840e0ab7b6bdbd22abf850bbdc951db7f65b9  nano-2.4.2.tar.gz
diff --git a/package/nano/nano.mk b/package/nano/nano.mk
index 4d47fdb..b030818 100644
--- a/package/nano/nano.mk
+++ b/package/nano/nano.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-NANO_VERSION = 2.4.1
+NANO_VERSION = 2.4.2
 NANO_SITE = $(BR2_GNU_MIRROR)/nano
 NANO_LICENSE = GPLv3+
 NANO_LICENSE_FILES = COPYING
-- 
2.3.6

[Buildroot] [PATCH 3/4] squid: bump to version 3.5.6

[Vicente Olivert Riera]

- Bump to version 3.5.6
- Update hash file
- Change configure options according to release notes

Release notes:

  http://www.squid-cache.org/Versions/v3/3.5/squid-3.5.6-RELEASENOTES.html

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
---
 package/squid/squid.hash | 6 +++---
 package/squid/squid.mk   | 7 +++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/package/squid/squid.hash b/package/squid/squid.hash
index 64d2fac..d5738c7 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.5.tar.xz.asc
-md5	9a323a97753143ddd935aed58a0193ae	squid-3.5.5.tar.xz
-sha1	2c168e8b13251ed8050d9e780127c4de016dcb61	squid-3.5.5.tar.xz
+# From http://www.squid-cache.org/Versions/v3/3.5/squid-3.5.6.tar.xz.asc
+md5  93e18bd257857e35bb634ddb8a348563  squid-3.5.6.tar.xz
+sha1  c5f3ab47e61a08fa6a8767d45befeffd7d26fd9f  squid-3.5.6.tar.xz
diff --git a/package/squid/squid.mk b/package/squid/squid.mk
index adc09e5..469fb1b 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).5
+SQUID_VERSION = $(SQUID_VERSION_MAJOR).6
 SQUID_SOURCE = squid-$(SQUID_VERSION).tar.xz
 SQUID_SITE = http://www.squid-cache.org/Versions/v3/$(SQUID_VERSION_MAJOR)
 SQUID_LICENSE = GPLv2+
@@ -29,7 +29,7 @@ SQUID_CONF_OPTS = \
 	--enable-removal-policies="lru,heap" \
 	--with-filedescriptors=1024 \
 	--disable-ident-lookups \
-	--with-krb5-config=no \
+	--without-mit-krb5 \
 	--enable-auth-basic="fake getpwnam" \
 	--enable-auth-digest="file" \
 	--enable-auth-negotiate="wrapper" \
@@ -39,7 +39,6 @@ SQUID_CONF_OPTS = \
 	--with-logdir=/var/log/squid/ \
 	--with-pidfile=/var/run/squid.pid \
 	--with-swapdir=/var/cache/squid/ \
-	--enable-icap-client \
 	--with-default-user=squid
 
 # Atomics in Squid use __sync_add_and_fetch_8, i.e a 64 bits atomic
@@ -59,7 +58,7 @@ SQUID_CONF_ENV += ac_cv_search_shm_open="-lrt -lpthread"
 endif
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
-SQUID_CONF_OPTS += --enable-ssl
+SQUID_CONF_OPTS += --with-openssl
 SQUID_DEPENDENCIES += openssl
 endif
 
-- 
2.3.6

[Buildroot] [PATCH 4/4] squid: add gnutls support

[Vicente Olivert Riera]

A new --without-gnutls option has been added to configure, so let's use
it in order to enable or disable gnutls support in squid.

Related:

  http://www.squid-cache.org/Versions/v3/3.5/squid-3.5.6-RELEASENOTES.html#ss4.1

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
---
 package/squid/squid.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/package/squid/squid.mk b/package/squid/squid.mk
index 469fb1b..80235a4 100644
--- a/package/squid/squid.mk
+++ b/package/squid/squid.mk
@@ -62,6 +62,13 @@ SQUID_CONF_OPTS += --with-openssl
 SQUID_DEPENDENCIES += openssl
 endif
 
+ifeq ($(BR2_PACKAGE_GNUTLS),y)
+SQUID_CONF_OPTS += --with-gnutls
+SQUID_DEPENDENCIES += gnutls
+else
+SQUID_CONF_OPTS += --without-gnutls
+endif
+
 define SQUID_CLEANUP_TARGET
 	rm -f $(addprefix $(TARGET_DIR)/usr/bin/, \
 		RunCache RunAccel)
-- 
2.3.6

[Buildroot] [PATCH 4/4] squid: add gnutls support

[Thomas Petazzoni]

Dear Vicente Olivert Riera,

On Mon, 6 Jul 2015 10:02:05 +0200, Vicente Olivert Riera wrote:

> diff --git a/package/squid/squid.mk b/package/squid/squid.mk
> index 469fb1b..80235a4 100644
> --- a/package/squid/squid.mk
> +++ b/package/squid/squid.mk
> @@ -62,6 +62,13 @@ SQUID_CONF_OPTS += --with-openssl
>  SQUID_DEPENDENCIES += openssl
>  endif
>  
> +ifeq ($(BR2_PACKAGE_GNUTLS),y)
> +SQUID_CONF_OPTS += --with-gnutls
> +SQUID_DEPENDENCIES += gnutls
> +else
> +SQUID_CONF_OPTS += --without-gnutls
> +endif

So presumably there is also a --without-openssl option that could be
used to explicitly disable openssl support when BR2_PACKAGE_OPENSSL !=
y.

It could be handled as a separate patch since it's not related.

Thanks,

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

[Buildroot] [PATCH 4/4] squid: add gnutls support

[Vicente Olivert Riera]

Dear Thomas Petazzoni,

On 06/07/15 17:50, Thomas Petazzoni wrote:
> Dear Vicente Olivert Riera,
>
> On Mon, 6 Jul 2015 10:02:05 +0200, Vicente Olivert Riera wrote:
>
>> diff --git a/package/squid/squid.mk b/package/squid/squid.mk
>> index 469fb1b..80235a4 100644
>> --- a/package/squid/squid.mk
>> +++ b/package/squid/squid.mk
>> @@ -62,6 +62,13 @@ SQUID_CONF_OPTS += --with-openssl
>>   SQUID_DEPENDENCIES += openssl
>>   endif
>>
>> +ifeq ($(BR2_PACKAGE_GNUTLS),y)
>> +SQUID_CONF_OPTS += --with-gnutls
>> +SQUID_DEPENDENCIES += gnutls
>> +else
>> +SQUID_CONF_OPTS += --without-gnutls
>> +endif
>
> So presumably there is also a --without-openssl option that could be
> used to explicitly disable openssl support when BR2_PACKAGE_OPENSSL !=
> y.
>
> It could be handled as a separate patch since it's not related.

Done:

http://patchwork.ozlabs.org/patch/491688/

Regards,

Vincent

>
> Thanks,
>
> Thomas
>

[Buildroot] [PATCH 1/4] lvm2: bump to version 2.02.124

[Thomas Petazzoni]

Dear Vicente Olivert Riera,

On Mon, 6 Jul 2015 10:02:02 +0200, Vicente Olivert Riera wrote:
> Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
> ---
>  package/lvm2/lvm2.hash | 2 +-
>  package/lvm2/lvm2.mk   | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)

All four patches applied, thanks!

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