From patchwork Mon Sep 20 17:30:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 1530276 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@ozlabs.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=AxWfv9Ym; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.buildroot.org (client-ip=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@lists.buildroot.org; receiver=) Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4HCs5d1Zybz9sRN for ; Tue, 21 Sep 2021 03:30:28 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 3537F828BA; Mon, 20 Sep 2021 17:30:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ZiPmymih1xcZ; Mon, 20 Sep 2021 17:30:25 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id 6435482572; Mon, 20 Sep 2021 17:30:24 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id BF7621BF859 for ; Mon, 20 Sep 2021 17:30:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id AF801403BA for ; Mon, 20 Sep 2021 17:30:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp4.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Gq14VSK2ZOUi for ; Mon, 20 Sep 2021 17:30:21 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-pf1-x434.google.com (mail-pf1-x434.google.com [IPv6:2607:f8b0:4864:20::434]) by smtp4.osuosl.org (Postfix) with ESMTPS id D5B5140407 for ; Mon, 20 Sep 2021 17:30:21 +0000 (UTC) Received: by mail-pf1-x434.google.com with SMTP id g14so16966933pfm.1 for ; Mon, 20 Sep 2021 10:30:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Cvqhj8ybjrUkvSYS22MFcsfHC+SqhCr3tc7o5fxgbWM=; b=AxWfv9YmwE4G5H7BFijw+HBR7naq4lWiZ8rnAXbV0vVkvjTKuBQCzcRKLYVI9CP5wp g6WpQ1sI+bL+uNh8TevTWBVp5WunR/GivsLqrnCyxr737wmNIh16DcCVT4jLkBmgiKrz wQRdSdho/OXZ4FdDW+PxTumPEVgwMNRkX9V1yD7zViiBWRPXZRvfMboZhHkIUOQM4tnZ SQhTpnUSMPdH/wJCPITudAHp6JB1cIjyizWGfMB/QNnjJL6n+COWPuCUN81OWHTeHeP4 TnBBLR3XDfvX9ThjtdCoyL0RVp6spE0XoKDIBe7g7r+rR/w1e+8r0ffiqsbLHf2byz6Z 6nGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Cvqhj8ybjrUkvSYS22MFcsfHC+SqhCr3tc7o5fxgbWM=; b=7GMkuqE0E6qxIGeO+iTzIEVqlKF4dkupBVO/U+To7x5JFOK3jBY/AohRfG4EtsyJ8Q cqJBqWUQzPtwecDMp31CfUUjzO/OrNG7RlHmnYtoSRA2nhxkgZyOJcx6dw/3+DmSjd+K jWYALOY+tPG+Ty/KrdAt2JPe5h1L0xYTcf1dluWdC6AV44K4zG99Psu/nh+H1OyZgTZu HKZZiuYlhWYX84RIsxdKmd6Ct+LyFK2m3+LYjoAhwXPo1fWJ7/VFOSsSwQci1k3j0GYs U7qujv89HaSuqa7VCe+ODNnrAryKKhPmuHoAQdtzT5lu5AY3vxVLT+pB8zH47knON5Mi KvhQ== X-Gm-Message-State: AOAM533EgnmyyEq6kqp2FpEQPaB6PMuKFx+IPVVyv6hdX+UddK8OJuZs ZTVLhG4uv6FYHVLu1BGPnhrDYGr9P8cmew== X-Google-Smtp-Source: ABdhPJxYgH8eHTuXekMMX9+YIJvS8ypwx/DhsIsKNGSD6ox0WCVryJq26zLcOcayqyGF1I7QOc4UXQ== X-Received: by 2002:a63:651:: with SMTP id 78mr24506828pgg.306.1632159020878; Mon, 20 Sep 2021 10:30:20 -0700 (PDT) Received: from adam.. ([47.149.13.137]) by smtp.gmail.com with ESMTPSA id qe17sm75870pjb.39.2021.09.20.10.30.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Sep 2021 10:30:20 -0700 (PDT) From: Adam Duskett To: buildroot@buildroot.org Date: Mon, 20 Sep 2021 10:30:17 -0700 Message-Id: <20210920173017.695537-1-aduskett@gmail.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 1/1] package/libglib2: bump version to 2.68.4 X-BeenThere: buildroot@lists.buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabrice Fontaine , Adam Duskett Errors-To: buildroot-bounces@lists.buildroot.org Sender: "buildroot" Signed-off-by: Adam Duskett --- Changes V1 -> V2: - Refactor against master branch instead of next. .../0002-remove-cpp-requirement.patch | 2 +- ...tly-use-3-parameters-for-close_range.patch | 33 ------------------- package/libglib2/libglib2.hash | 4 +-- package/libglib2/libglib2.mk | 2 +- 4 files changed, 4 insertions(+), 37 deletions(-) delete mode 100644 package/libglib2/0004-correctly-use-3-parameters-for-close_range.patch diff --git a/package/libglib2/0002-remove-cpp-requirement.patch b/package/libglib2/0002-remove-cpp-requirement.patch index 9393bd258a..c402cbafa5 100644 --- a/package/libglib2/0002-remove-cpp-requirement.patch +++ b/package/libglib2/0002-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.68.2', + version : '2.68.4', # 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/0004-correctly-use-3-parameters-for-close_range.patch b/package/libglib2/0004-correctly-use-3-parameters-for-close_range.patch deleted file mode 100644 index bfca4b14ef..0000000000 --- a/package/libglib2/0004-correctly-use-3-parameters-for-close_range.patch +++ /dev/null @@ -1,33 +0,0 @@ -From b71117d89434db83d34bc1b981ca03d4be299576 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 8 Jul 2021 17:26:43 -0700 -Subject: [PATCH] correctly use 3 parameters for close_range - -libc implementation has 3 parameter e.g. -https://www.freebsd.org/cgi/man.cgi?query=close_range&sektion=2&format=html - -Signed-off-by: Khem Raj - -[Retrieved from: -https://gitlab.gnome.org/GNOME/glib/-/commit/b71117d89434db83d34bc1b981ca03d4be299576] -Signed-off-by: Fabrice Fontaine ---- - glib/gspawn.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/glib/gspawn.c b/glib/gspawn.c -index 899647c2f..3073a10a4 100644 ---- a/glib/gspawn.c -+++ b/glib/gspawn.c -@@ -1520,7 +1520,7 @@ safe_closefrom (int lowfd) - * - * Handle ENOSYS in case it’s supported in libc but not the kernel; if so, - * fall back to safe_fdwalk(). */ -- if (close_range (lowfd, G_MAXUINT) != 0 && errno == ENOSYS) -+ if (close_range (lowfd, G_MAXUINT, 0) != 0 && errno == ENOSYS) - #endif /* HAVE_CLOSE_RANGE */ - (void) safe_fdwalk (close_func, GINT_TO_POINTER (lowfd)); - #endif --- -GitLab - diff --git a/package/libglib2/libglib2.hash b/package/libglib2/libglib2.hash index 15e0085f78..d421e025ff 100644 --- a/package/libglib2/libglib2.hash +++ b/package/libglib2/libglib2.hash @@ -1,4 +1,4 @@ -# https://download.gnome.org/sources/glib/2.68/glib-2.68.2.sha256sum -sha256 ecc7798a9cc034eabdfd7f246e6dd461cdbf1175fcc2e9867cc7da7b7309e0fb glib-2.68.2.tar.xz +# https://download.gnome.org/sources/glib/2.68/glib-2.68.4.sha256sum +sha256 62fd061d08a75492617e625a73e2c05e259f831acbb8e1f8b9c81f23f7993a3b glib-2.68.4.tar.xz # License files, locally calculated sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index 4f13622e36..af73aeb3bf 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -5,7 +5,7 @@ ################################################################################ LIBGLIB2_VERSION_MAJOR = 2.68 -LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).2 +LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).4 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+