[arch-commits] Commit in lib32-glib2/trunk (2 files)

[Jan Steffens]

    Date: Thursday, February 11, 2021 @ 14:34:00
  Author: heftig
Revision: 856168

2.66.7-1

Modified:
  lib32-glib2/trunk/PKGBUILD
Deleted:
  lib32-glib2/trunk/0001-giochannel-Fix-length_size-bounds-check.patch

----------------------------------------------------+
 0001-giochannel-Fix-length_size-bounds-check.patch |   28 -------------------
 PKGBUILD                                           |   11 ++-----
 2 files changed, 3 insertions(+), 36 deletions(-)

Deleted: 0001-giochannel-Fix-length_size-bounds-check.patch
===================================================================
--- 0001-giochannel-Fix-length_size-bounds-check.patch	2021-02-11 14:33:59 UTC (rev 856167)
+++ 0001-giochannel-Fix-length_size-bounds-check.patch	2021-02-11 14:34:00 UTC (rev 856168)
@@ -1,28 +0,0 @@
-From a149bf2f9030168051942124536e303af8ba6176 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-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-11 14:33:59 UTC (rev 856167)
+++ PKGBUILD	2021-02-11 14:34:00 UTC (rev 856168)
@@ -4,8 +4,8 @@
 # Contributor: Mikko Seppälä <t-r-a-y at mbnet.fi>
 
 pkgname=lib32-glib2
-pkgver=2.66.6
-pkgrel=2
+pkgver=2.66.7
+pkgrel=1
 pkgdesc="Low level core library (32-bit)"
 url="https://wiki.gnome.org/Projects/GLib"
 license=(LGPL)
@@ -14,13 +14,11 @@
 makedepends=(gettext gtk-doc shared-mime-info python lib32-libelf git util-linux
              meson lib32-dbus)
 checkdepends=(desktop-file-utils lib32-glib2)
-_commit=d5ec4f360fb5a2ef0df1862999f970dc67fa352c  # tags/2.66.6^0
+_commit=95115f029d9c170c2e966cd7d3547b6394c92a4a  # tags/2.66.7^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')
@@ -33,9 +31,6 @@
 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
 }