From patchwork Thu Jun 8 17:53:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Jos=C3=A9_Luis_Salvador_Rufo?= X-Patchwork-Id: 1792428 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QcWzR6rMtz20Wn for ; Fri, 9 Jun 2023 03:53:39 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id EDA8C60B79; Thu, 8 Jun 2023 17:53:37 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org EDA8C60B79 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5SVKazIbJhIp; Thu, 8 Jun 2023 17:53:37 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 0063760A9B; Thu, 8 Jun 2023 17:53:35 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 0063760A9B X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id DB6881BF39C for ; Thu, 8 Jun 2023 17:53:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id B04428138A for ; Thu, 8 Jun 2023 17:53:33 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org B04428138A 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 Q9sl8pRVND19 for ; Thu, 8 Jun 2023 17:53:32 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 67E9981388 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by smtp1.osuosl.org (Postfix) with ESMTPS id 67E9981388 for ; Thu, 8 Jun 2023 17:53:32 +0000 (UTC) Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-30e5289105cso717184f8f.1 for ; Thu, 08 Jun 2023 10:53:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686246810; x=1688838810; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ztKkvIDo5iPVcvYrIKbBaT03VRU37CEq7clqBodoVlE=; b=RTEwwnIDG0baNg/+8fstxM8/AzN1GkRqDYNAJOJ/e5s/l6odSPfwz7KAWVhMpT83XX z1FiHk6M3UtiHoIreSHQpsc31ewEQFeO5kdTdnGeSL4RaSYHxKHC+g34uCn4RlCXVOjA 6SAtVwUkVPBcnTWZ4iycjp7pZMF5Ekz7BFB8IHe5emWkO+C/adPf/kfLzV6JudlPANMe ZlKoYtwbzW07z0VVznkwaoPbf8qXmWH/xyuImG3WF7kYnFjC7BbcUYVBnqiNjNwS45J9 fmF/pNndU+w5qHNT5yWvqBSBjcDepFYWkujAYTcdx81eAz3i88gR5qYw9TlzXZhzjiyH enMw== X-Gm-Message-State: AC+VfDzFi2Gj3yqOJJ8gnHXKF73ubu7h+9a2OaBY7zTLIa3FYHtVUGq9 Ox/RqmJngPCFHGVsbgy8CaEkYGrfgUYjTw== X-Google-Smtp-Source: ACHHUZ7hzo7cow6qpxELl2N+YT//fPEoYVvHE6yU/VvT73bUDVtWK60dG0P+eEscQOxnug3AS1s3NQ== X-Received: by 2002:adf:e68e:0:b0:30a:a93c:c9df with SMTP id r14-20020adfe68e000000b0030aa93cc9dfmr2495766wrm.13.1686246810344; Thu, 08 Jun 2023 10:53:30 -0700 (PDT) Received: from cuervo.lan ([78.30.22.52]) by smtp.gmail.com with ESMTPSA id e13-20020adfef0d000000b0030aeb3731d0sm2192285wro.98.2023.06.08.10.53.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jun 2023 10:53:30 -0700 (PDT) From: =?utf-8?q?Jos=C3=A9_Luis_Salvador_Rufo?= To: buildroot@buildroot.org Date: Thu, 8 Jun 2023 19:53:23 +0200 Message-ID: <20230608175323.1344936-1-salvador.joseluis@gmail.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686246810; x=1688838810; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=ztKkvIDo5iPVcvYrIKbBaT03VRU37CEq7clqBodoVlE=; b=oulbZMXMNxl1L/jET3od+LpsGejb8NLW6qWASc6i7tGI9DWcowsBnC90oNfuRYDGRU N5Je6a6u+4JvBznmGAOgojk4E/0eMwcqUP5wL3sRwojh+/f5v0rdNUYRuoaKEWFz2noD v4BFZHsjnTkq9MKhUI+MAMu29CSYDOItJftgkurgPqIwy4m85Fj66DDdb1V+hs3d7cHm aTVLjbSOmHOnF3qW2PLZYWdHxIbYgQdipzLrVAeNCdyP2zx2TEoAv9OPBwmmD+4KY4lq iIGp96RvTUf75/fKUicf1S29dSW583lsMIXWC/Brnm3aYGmHdQHIfq8mJOMqq0e1aTzd q8JA== X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=oulbZMXM Subject: [Buildroot] [PATCH] package/zfs: bump version to 2.1.12 X-BeenThere: buildroot@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: Romain Naour , =?utf-8?q?Jos=C3=A9_Luis_Salvador?= =?utf-8?q?_Rufo?= Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Removed backported patch: - 0001-removal-of-LegacyVersion-broke-ax_python_dev.m4.patch Signed-off-by: José Luis Salvador Rufo --- ...LegacyVersion-broke-ax_python_dev.m4.patch | 134 ------------------ package/zfs/zfs.hash | 4 +- package/zfs/zfs.mk | 2 +- 3 files changed, 3 insertions(+), 137 deletions(-) delete mode 100644 package/zfs/0001-removal-of-LegacyVersion-broke-ax_python_dev.m4.patch diff --git a/package/zfs/0001-removal-of-LegacyVersion-broke-ax_python_dev.m4.patch b/package/zfs/0001-removal-of-LegacyVersion-broke-ax_python_dev.m4.patch deleted file mode 100644 index c7c4dc7d10..0000000000 --- a/package/zfs/0001-removal-of-LegacyVersion-broke-ax_python_dev.m4.patch +++ /dev/null @@ -1,134 +0,0 @@ -From ad2c8e13e42bc2f396cce117d17a227dadedd476 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Thu, 5 Jan 2023 11:04:24 -0800 -Subject: [PATCH] removal of LegacyVersion broke ax_python_dev.m4 - -The 22.0 release of the python `packaging` package removed the -`LegacyVersion` trait, causing ZFS to no longer compile. - -This commit replaces the sections of `ax_python_dev.m4` that rely on -`LegacyVersion` with updated implementations from the upstream -`autoconf-archive`. - -Reviewed-by: Brian Behlendorf -Signed-off-by: Matthew Ahrens -Closes #14297 -Upstream: https://github.com/openzfs/zfs/commit/b72efb751147ab57afd1588a15910f547cb22600 -[Romain: backport to 2.1.7] -Signed-off-by: Romain Naour ---- - config/ax_python_devel.m4 | 71 +++++++++++++++++++-------------------- - 1 file changed, 35 insertions(+), 36 deletions(-) - -diff --git a/config/ax_python_devel.m4 b/config/ax_python_devel.m4 -index 7adcf01a0..9eef45065 100644 ---- a/config/ax_python_devel.m4 -+++ b/config/ax_python_devel.m4 -@@ -97,23 +97,13 @@ AC_DEFUN([AX_PYTHON_DEVEL],[ - # Check for a version of Python >= 2.1.0 - # - AC_MSG_CHECKING([for a version of Python >= '2.1.0']) -- ac_supports_python_ver=`cat<= '2.1.0')"` - if test "$ac_supports_python_ver" != "True"; then - if test -z "$PYTHON_NOVERSIONCHECK"; then - AC_MSG_RESULT([no]) -- m4_ifvaln([$2],[$2],[ -- AC_MSG_FAILURE([ -+ AC_MSG_FAILURE([ - This version of the AC@&t@_PYTHON_DEVEL macro - doesn't work properly with versions of Python before - 2.1.0. You may need to re-run configure, setting the -@@ -122,7 +112,6 @@ PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand. - Moreover, to disable this check, set PYTHON_NOVERSIONCHECK - to something else than an empty string. - ]) -- ]) - else - AC_MSG_RESULT([skip at user request]) - fi -@@ -131,37 +120,47 @@ to something else than an empty string. - fi - - # -- # if the macro parameter ``version'' is set, honour it -+ # If the macro parameter ``version'' is set, honour it. -+ # A Python shim class, VPy, is used to implement correct version comparisons via -+ # string expressions, since e.g. a naive textual ">= 2.7.3" won't work for -+ # Python 2.7.10 (the ".1" being evaluated as less than ".3"). - # - if test -n "$1"; then - AC_MSG_CHECKING([for a version of Python $1]) -- # Why the strip ()? Because if we don't, version.parse -- # will, for example, report 3.10.0 >= '3.11.0' -- ac_supports_python_ver=`cat< ax_python_devel_vpy.py -+class VPy: -+ def vtup(self, s): -+ return tuple(map(int, s.strip().replace("rc", ".").split("."))) -+ def __init__(self): -+ import sys -+ self.vpy = tuple(sys.version_info) -+ def __eq__(self, s): -+ return self.vpy == self.vtup(s) -+ def __ne__(self, s): -+ return self.vpy != self.vtup(s) -+ def __lt__(self, s): -+ return self.vpy < self.vtup(s) -+ def __gt__(self, s): -+ return self.vpy > self.vtup(s) -+ def __le__(self, s): -+ return self.vpy <= self.vtup(s) -+ def __ge__(self, s): -+ return self.vpy >= self.vtup(s) -+EOF -+ ac_supports_python_ver=`$PYTHON -c "import ax_python_devel_vpy; \ -+ ver = ax_python_devel_vpy.VPy(); \ -+ print (ver $1)"` -+ rm -rf ax_python_devel_vpy*.py* __pycache__/ax_python_devel_vpy*.py* - if test "$ac_supports_python_ver" = "True"; then -- AC_MSG_RESULT([yes]) -+ AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) -- m4_ifvaln([$2],[$2],[ -- AC_MSG_ERROR([this package requires Python $1. -+ AC_MSG_ERROR([this package requires Python $1. - If you have it installed, but it isn't the default Python - interpreter in your system path, please pass the PYTHON_VERSION - variable to configure. See ``configure --help'' for reference. - ]) -- PYTHON_VERSION="" -- ]) -+ PYTHON_VERSION="" - fi - fi - --- -2.34.3 - diff --git a/package/zfs/zfs.hash b/package/zfs/zfs.hash index 0bce3817fe..3a73e5e94f 100644 --- a/package/zfs/zfs.hash +++ b/package/zfs/zfs.hash @@ -1,5 +1,5 @@ -# From https://github.com/openzfs/zfs/releases/download/zfs-2.1.7/zfs-2.1.7.sha256.asc -sha256 6462e63e185de6ff10c64ffa6ed773201a082f9dd13e603d7e8136fcb4aca71b zfs-2.1.7.tar.gz +# From https://github.com/openzfs/zfs/releases/download/zfs-2.1.12/zfs-2.1.12.sha256.asc +sha256 64daa26aed3e12c931f6f4413d7527c4ebdb8da35416b356152b5f9fdd4c6e6d zfs-2.1.12.tar.gz sha256 96a27353fe717ff2c8b95deb8b009c4eb750303c6400e2d8a2582ab1ec12b25a bc3f12bfac152a0c28951cec92340ba14f9ccee9.patch # Hash for license files: diff --git a/package/zfs/zfs.mk b/package/zfs/zfs.mk index 50c1866045..2fda1adbe6 100644 --- a/package/zfs/zfs.mk +++ b/package/zfs/zfs.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZFS_VERSION = 2.1.7 +ZFS_VERSION = 2.1.12 ZFS_SITE = https://github.com/openzfs/zfs/releases/download/zfs-$(ZFS_VERSION) ZFS_PATCH = https://github.com/openzfs/zfs/commit/bc3f12bfac152a0c28951cec92340ba14f9ccee9.patch ZFS_LICENSE = CDDL