diff mbox series

[1/1] package/libglib2: bump version to 2.66.3

Message ID 20201123213557.789056-1-mbrunelle@distech-controls.com
State Accepted
Headers show
Series [1/1] package/libglib2: bump version to 2.66.3 | expand

Commit Message

Maxime Brunelle Nov. 23, 2020, 9:35 p.m. UTC
Fixes https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/524
package/libglib2 reference: https://gitlab.gnome.org/GNOME/glib/-/issues/2091

Signed-off-by: Maxime Brunelle <mbrunelle@distech-controls.com>
---
 package/libglib2/0003-remove-cpp-requirement.patch | 2 +-
 package/libglib2/libglib2.hash                     | 4 ++--
 package/libglib2/libglib2.mk                       | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

Comments

Thomas Petazzoni Dec. 7, 2020, 9:57 p.m. UTC | #1
On Mon, 23 Nov 2020 16:35:57 -0500
Maxime Brunelle via buildroot <buildroot@busybox.net> wrote:

> Fixes https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/524
> package/libglib2 reference: https://gitlab.gnome.org/GNOME/glib/-/issues/2091
> 
> Signed-off-by: Maxime Brunelle <mbrunelle@distech-controls.com>
> ---
>  package/libglib2/0003-remove-cpp-requirement.patch | 2 +-
>  package/libglib2/libglib2.hash                     | 4 ++--
>  package/libglib2/libglib2.mk                       | 4 ++--
>  3 files changed, 5 insertions(+), 5 deletions(-)

Applied to master, thanks.

Thomas
Peter Korsgaard Dec. 13, 2020, 9:55 a.m. UTC | #2
>>>>> "Maxime" == Maxime Brunelle via buildroot <buildroot@busybox.net> writes:

 > Fixes https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/524
 > package/libglib2 reference: https://gitlab.gnome.org/GNOME/glib/-/issues/2091

 > Signed-off-by: Maxime Brunelle <mbrunelle@distech-controls.com>

What should we do about the stable branches (2020.02.x / 2020.08.x /
2020.11.x)? When was this issue introduced?

I see:

2020.02.x: glib 2.62.5, nm 1.20.4
2020.08.x: glib 2.64.4, nm 1.22.10
2020.11.x: glib 2.64.4, nm 1.22.10

Master had the same glib / nm versions before this patch, so 2020.08.x /
2020.11.x are presumably also affected? What about 2020.02.x?
Matthew Weber via buildroot Dec. 14, 2020, 4 p.m. UTC | #3
Hi Peter,

I can't say exactly when the issue appeared, but I noticed it in version 2020.05 which had glib 2.64.4 and nm 1.22.10, and version 2020.11.x still has it. Based on that, I would presume 2020.08.x has it too. The reference to the glib2 bug in my patch mentions the segfault started appearing in Ubuntu after updating to 2.63.x.

I don't know if you usually backport these changes that can affect other projects. However, I can tell you it was problematic for us because it caused nmcli to randomly crash ~5-10% of the time on various commands. We're now using a fork of 2020.11 with the patch applied without issue so far.

Regards,

Maxime Brunelle

From: Peter Korsgaard <jacmet@gmail.com> on behalf of Peter Korsgaard <peter@korsgaard.com>
Sent: December 13, 2020 04:55
To: Maxime Brunelle via buildroot <buildroot@busybox.net>
Cc: buildroot@buildroot.org <buildroot@buildroot.org>; Brunelle, Maxime <mbrunelle@distech-controls.com>; Fabrice Fontaine <fontaine.fabrice@gmail.com>
Subject: Re: [PATCH 1/1] package/libglib2: bump version to 2.66.3 
 
>>>>> "Maxime" == Maxime Brunelle via buildroot <buildroot@busybox.net> writes:

 > Fixes https://urldefense.com/v3/__https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/524__;!!Po4YltK3bPMkYw!lFpMjOlcoFL-PFab2EVafw_mR_74rZRSOcwidP_vJwT2Azdtq7EIpk3tj7hxbrOpE-POLj-T$ 
 > package/libglib2 reference: https://urldefense.com/v3/__https://gitlab.gnome.org/GNOME/glib/-/issues/2091__;!!Po4YltK3bPMkYw!lFpMjOlcoFL-PFab2EVafw_mR_74rZRSOcwidP_vJwT2Azdtq7EIpk3tj7hxbrOpE7dzYXgD$ 

 > Signed-off-by: Maxime Brunelle <mbrunelle@distech-controls.com>

What should we do about the stable branches (2020.02.x / 2020.08.x /
2020.11.x)? When was this issue introduced?

I see:

2020.02.x: glib 2.62.5, nm 1.20.4
2020.08.x: glib 2.64.4, nm 1.22.10
2020.11.x: glib 2.64.4, nm 1.22.10

Master had the same glib / nm versions before this patch, so 2020.08.x /
2020.11.x are presumably also affected? What about 2020.02.x?
diff mbox series

Patch

diff --git a/package/libglib2/0003-remove-cpp-requirement.patch b/package/libglib2/0003-remove-cpp-requirement.patch
index 7e447a9efc..72304fa4b1 100644
--- a/package/libglib2/0003-remove-cpp-requirement.patch
+++ b/package/libglib2/0003-remove-cpp-requirement.patch
@@ -35,7 +35,7 @@  index 4bbf4c2..ac59f4e 100644
 @@ -1,4 +1,4 @@
 -project('glib', 'c', 'cpp',
 +project('glib', 'c',
-   version : '2.64.4',
+   version : '2.66.3',
    # NOTE: We keep this pinned at 0.49 because that's what Debian 10 ships
    meson_version : '>= 0.49.2',
 @@ -10,7 +10,6 @@ project('glib', 'c', 'cpp',
diff --git a/package/libglib2/libglib2.hash b/package/libglib2/libglib2.hash
index 55f0bb1678..ac32f1b14b 100644
--- a/package/libglib2/libglib2.hash
+++ b/package/libglib2/libglib2.hash
@@ -1,4 +1,4 @@ 
-# https://download.gnome.org/sources/glib/2.64/glib-2.64.4.sha256sum
-sha256  f7e0b325b272281f0462e0f7fff25a833820cac19911ff677251daf6d87bce50  glib-2.64.4.tar.xz
+# https://download.gnome.org/sources/glib/2.66/glib-2.66.3.sha256sum
+sha256  79f31365a99cb1cc9db028625635d1438890702acde9e2802eae0acebcf7b5b1  glib-2.66.3.tar.xz
 # License files, locally calculated
 sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING
diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index 6e9dbd7b26..016bc0e118 100644
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -4,8 +4,8 @@ 
 #
 ################################################################################
 
-LIBGLIB2_VERSION_MAJOR = 2.64
-LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).4
+LIBGLIB2_VERSION_MAJOR = 2.66
+LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).3
 LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz
 LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR)
 LIBGLIB2_LICENSE = LGPL-2.1+