Date: Sunday, February 7, 2021 @ 23:02:56 Author: heftig Revision: 848491
2.66.6-2: FS#69569 Add patch for https://gitlab.gnome.org/GNOME/glib/-/issues/2323 Added: lib32-glib2/trunk/0001-giochannel-Fix-length_size-bounds-check.patch Modified: lib32-glib2/trunk/PKGBUILD ----------------------------------------------------+ 0001-giochannel-Fix-length_size-bounds-check.patch | 28 +++++++++++++++++++ PKGBUILD | 10 ++++-- 2 files changed, 35 insertions(+), 3 deletions(-) Added: 0001-giochannel-Fix-length_size-bounds-check.patch =================================================================== --- 0001-giochannel-Fix-length_size-bounds-check.patch (rev 0) +++ 0001-giochannel-Fix-length_size-bounds-check.patch 2021-02-07 23:02:56 UTC (rev 848491) @@ -0,0 +1,28 @@ +From a149bf2f9030168051942124536e303af8ba6176 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <[email protected]> +Date: Sun, 7 Feb 2021 23:32:40 +0100 +Subject: [PATCH] giochannel: Fix length_size bounds check + +The inverted condition is an obvious error introduced by ecdf91400e9a. + +Fixes https://gitlab.gnome.org/GNOME/glib/-/issues/2323 +--- + glib/giochannel.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/glib/giochannel.c b/glib/giochannel.c +index 4c5e081ed..8516c0b5e 100644 +--- a/glib/giochannel.c ++++ b/glib/giochannel.c +@@ -899,7 +899,7 @@ g_io_channel_set_line_term (GIOChannel *channel, + { + /* FIXME: We’re constrained by line_term_len being a guint here */ + gsize length_size = strlen (line_term); +- g_return_if_fail (length_size > G_MAXUINT); ++ g_return_if_fail (length_size <= G_MAXUINT); + length_unsigned = (guint) length_size; + } + +-- +2.30.0 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-02-07 23:02:07 UTC (rev 848490) +++ PKGBUILD 2021-02-07 23:02:56 UTC (rev 848491) @@ -5,7 +5,7 @@ pkgname=lib32-glib2 pkgver=2.66.6 -pkgrel=1 +pkgrel=2 pkgdesc="Low level core library (32-bit)" url="https://wiki.gnome.org/Projects/GLib"; license=(LGPL) @@ -16,9 +16,11 @@ checkdepends=(desktop-file-utils lib32-glib2) _commit=d5ec4f360fb5a2ef0df1862999f970dc67fa352c # tags/2.66.6^0 source=("git+https://gitlab.gnome.org/GNOME/glib.git#commit=$_commit"; + 0001-giochannel-Fix-length_size-bounds-check.patch multilib.diff gio-querymodules-32.{hook,script}) sha256sums=('SKIP' + 'd2dbc00679545cedb33d0179d69a9be5c12b3f00d426e227ca07687384f3407c' '2611ec4c97346c3c4eea61786ee20c801207135a9d52a771f5f340b41bf69fbc' '2fe9543c97829300c25e6b45ed01fb63d3b699649fb2924b9a41443ccec8b946' '1c96fb5f09baf59987e4b97bf3af37ea8feedcc753b48c91ffc6bff080461f21') @@ -31,6 +33,9 @@ prepare() { cd glib + # https://bugs.archlinux.org/task/69569 + git apply -3 ../0001-giochannel-Fix-length_size-bounds-check.patch + # Test suite workaround git apply -3 ../multilib.diff } @@ -48,8 +53,7 @@ } check() { - # Spurious wakeups in g_cond_wait_until, only on lib32 - meson test -C build --no-suite flaky --no-suite slow --print-errorlogs || : + meson test -C build --no-suite flaky --no-suite slow --print-errorlogs } package() {
