[Buildroot] [PATCH 0/2] Bump gperf and libcap

[Buildroot] [PATCH 0/2] Bump gperf and libcap

[Thomas Petazzoni]

Hello,

There was already an attempt at bumping gperf to version some time
ago, but it was reverted, because it broke the build of libcap.

It turns out that libcap upstream has fixed the build with newer
versions of gperf, so if we bump libcap, we don't have the build issue
with the new gperf.

Unfortunately, the change in libcap doesn't allow to build with the
previous version of gperf. In other words, you need to bump both at
the same time.

I thought about making a patch to libcap that detects the version of
gperf that is available, and tweak things accordingly. But this patch
would be dropped immediately after the bump of gperf, which seems a
bit useless.

So as an exception, here is a patch series that isn't bisectable.

Best regards,

Thomas Petazzoni

Christopher McCrory (1):
  package/gperf: bump to version 3.1

Thomas Petazzoni (1):
  package/libcap: bump to 2.27

 package/gperf/gperf.hash   | 4 +++-
 package/gperf/gperf.mk     | 2 +-
 package/libcap/libcap.hash | 2 +-
 package/libcap/libcap.mk   | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

-- 
2.21.0

[Buildroot] [PATCH 1/2] package/gperf: bump to version 3.1

[Thomas Petazzoni]

From: Christopher McCrory <chrismcc@gmail.com>

Signed-off-by: Christopher McCrory <chrismcc@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
 package/gperf/gperf.hash | 4 +++-
 package/gperf/gperf.mk   | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/package/gperf/gperf.hash b/package/gperf/gperf.hash
index 21c76605b5..3d8aafbdca 100644
--- a/package/gperf/gperf.hash
+++ b/package/gperf/gperf.hash
@@ -1,5 +1,7 @@
 # Locally calculated after checking pgp signature
-sha256	767112a204407e62dbc3106647cf839ed544f3cf5d0f0523aaa2508623aad63e	gperf-3.0.4.tar.gz
+# https://ftp.gnu.org/pub/gnu/gperf/gperf-3.1.tar.gz.sig
+# with key 93C08C88471097CD
+sha256	588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2	gperf-3.1.tar.gz
 
 # Locally calculated
 sha256	8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903	COPYING
diff --git a/package/gperf/gperf.mk b/package/gperf/gperf.mk
index 2a6192a48b..4b928a0ebd 100644
--- a/package/gperf/gperf.mk
+++ b/package/gperf/gperf.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GPERF_VERSION = 3.0.4
+GPERF_VERSION = 3.1
 GPERF_SITE = $(BR2_GNU_MIRROR)/gperf
 GPERF_LICENSE = GPL-3.0+
 GPERF_LICENSE_FILES = COPYING
-- 
2.21.0

[Buildroot] [PATCH 2/2] package/libcap: bump to 2.27

[Thomas Petazzoni]

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
 package/libcap/libcap.hash | 2 +-
 package/libcap/libcap.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/libcap/libcap.hash b/package/libcap/libcap.hash
index 2d3aee591d..cbef0dc86d 100644
--- a/package/libcap/libcap.hash
+++ b/package/libcap/libcap.hash
@@ -1,5 +1,5 @@
 # https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/sha256sums.asc
-sha256	693c8ac51e983ee678205571ef272439d83afe62dd8e424ea14ad9790bc35162  libcap-2.25.tar.xz
+sha256	dac1792d0118bee6aae6ba7fb93ff1602c6a9bda812fd63916eee1435b9c486a  libcap-2.27.tar.xz
 
 # Hash for license file:
 sha256	088cabde4662b4121258d298b0b2967bc1abffa134457ed9bc4a359685ab92bc  License
diff --git a/package/libcap/libcap.mk b/package/libcap/libcap.mk
index a947fa0686..4919a4adca 100644
--- a/package/libcap/libcap.mk
+++ b/package/libcap/libcap.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBCAP_VERSION = 2.25
+LIBCAP_VERSION = 2.27
 LIBCAP_SITE = https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2
 LIBCAP_SOURCE = libcap-$(LIBCAP_VERSION).tar.xz
 LIBCAP_LICENSE = GPL-2.0 or BSD-3-Clause
-- 
2.21.0

[Buildroot] [PATCH 2/2] package/libcap: bump to 2.27

[Arnout Vandecappelle]

On 12/10/2019 22:26, Thomas Petazzoni wrote:
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

 Both applied to master, thanks.

 I've added a line here saying that this fixes breakage with gperf, so if
someone would want to revert it, or cherry-pick to a stable branch, they are warned.

 Regards,
 Arnout

> ---
>  package/libcap/libcap.hash | 2 +-
>  package/libcap/libcap.mk   | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/package/libcap/libcap.hash b/package/libcap/libcap.hash
> index 2d3aee591d..cbef0dc86d 100644
> --- a/package/libcap/libcap.hash
> +++ b/package/libcap/libcap.hash
> @@ -1,5 +1,5 @@
>  # https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/sha256sums.asc
> -sha256	693c8ac51e983ee678205571ef272439d83afe62dd8e424ea14ad9790bc35162  libcap-2.25.tar.xz
> +sha256	dac1792d0118bee6aae6ba7fb93ff1602c6a9bda812fd63916eee1435b9c486a  libcap-2.27.tar.xz
>  
>  # Hash for license file:
>  sha256	088cabde4662b4121258d298b0b2967bc1abffa134457ed9bc4a359685ab92bc  License
> diff --git a/package/libcap/libcap.mk b/package/libcap/libcap.mk
> index a947fa0686..4919a4adca 100644
> --- a/package/libcap/libcap.mk
> +++ b/package/libcap/libcap.mk
> @@ -4,7 +4,7 @@
>  #
>  ################################################################################
>  
> -LIBCAP_VERSION = 2.25
> +LIBCAP_VERSION = 2.27
>  LIBCAP_SITE = https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2
>  LIBCAP_SOURCE = libcap-$(LIBCAP_VERSION).tar.xz
>  LIBCAP_LICENSE = GPL-2.0 or BSD-3-Clause
>