From nobody Mon Jul 08 14:03:49 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WHm7V0Xxzz5QHHh; Mon, 08 Jul 2024 14:03:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WHm7T5HMPz4q9t; Mon, 8 Jul 2024 14:03:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720447429; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PZD0jgDTD6QcAeLWgBQVETnfvmk8Y5WJy43p/tzVSQg=; b=f5ZOan9Z0FTUBJJ98YjvB7VNEhnQTKMrAkOmwTo08Q4FHM/PBhFOrMEixaZH7VDst/gl6V ophWwMBqaiZnP4FMK7+W50E6vKN2sXA6DR/Wy6EYIpNoLtLUx/5QHqKBc2W/2SCGMEzaaU SxdeXpOwYVZODI5IkeYEHLqeSKCQ4dUdBRfHx+iLcVM+NNsVNTVQ/nsyo5dzmxK/KeeB17 X6WKm/2h6FR/W7vjK+ypRyTbhDqhLXg2OOTHg4zXCQFoWvMvaRmBLqtADEBVCw2BEpKukj hVTXzAbLmotp07MY7AEJqJHH2V6UA0+qKcjHiKMiN2QaTXkIuPqIpmfeDMtYMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720447429; a=rsa-sha256; cv=none; b=CKC50UfwxPQGS+T5aDIBry5vTqDegsdd6yzpvlFxjrTpeb4zxjpYva3T2Tgc1k2lv6UVFW fq39/bSuJaLJBZPTfx/mGlEDUUnCElo22TUhwzAWrhH495nekrCQL1oDmo8g703vCfbE3S bw7gObo0r5ayGNDPZ+75QioRcxgZp4x1nRQQdsyvCM6O7aSRQX3hBju9VVIgOe9cFxnRcw EpLUzIuzFi9bjPkCrQeW7oYw39Xt5GF5GjNqibOpM/O45vaKYD2iahnxvBLAQj9/m5Foce TYO7O5xsfaaUNqDL89Yl6MP/t1XRwyy1h0MuXWcg2T2kYo3xfithH6KrQuk01g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720447429; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PZD0jgDTD6QcAeLWgBQVETnfvmk8Y5WJy43p/tzVSQg=; b=BZHzzDezrXsmdfe3C2thMwT9k3xwHTxOksgw1DrRoHe6f0slrKxcQ/gbkh5nqTOarg6xqf y/EhCUOwpdagcnzGkRMdu9+EmA1KoVwMa2gkMm1n2SyrBFHUZDa7rXB8bT2wNw5ha0jErp udCMIjsf4/lDwsh/1LQn4y/RWjLHDSs/lwV//qCzjxXb2QPAZSS7iJybdXVuornVdJCxVg GzsKQkr/faVHcDnYYs9mlrTLk/mc9HrRW53xMfBcvFEUxitXePR2ncIgRhlRDG43HJIc27 TA4BVov96/SV/Zb3eS3QqQ+zvXcati52lKQk28SWlMV8UQygMF/5xxk22RMqsg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WHm7T4bWgzttk; Mon, 8 Jul 2024 14:03:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 468E3nvN061946; Mon, 8 Jul 2024 14:03:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 468E3n9M061943; Mon, 8 Jul 2024 14:03:49 GMT (envelope-from git) Date: Mon, 8 Jul 2024 14:03:49 GMT Message-Id: <202407081403.468E3n9M061943@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: 26eecc68d56b - main - devel/py-libzfs: Unbreak on FreeBSD 15 by pulling a patch from upstream List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 26eecc68d56b64a3299a565569809ec387fa4b19 Auto-Submitted: auto-generated The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=26eecc68d56b64a3299a565569809ec387fa4b19 commit 26eecc68d56b64a3299a565569809ec387fa4b19 Author: Gleb Popov AuthorDate: 2024-07-08 14:03:01 +0000 Commit: Gleb Popov CommitDate: 2024-07-08 14:03:44 +0000 devel/py-libzfs: Unbreak on FreeBSD 15 by pulling a patch from upstream PR: 279450 --- devel/py-libzfs/Makefile | 4 +++ devel/py-libzfs/files/extra-zpool-add.patch | 44 +++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/devel/py-libzfs/Makefile b/devel/py-libzfs/Makefile index 0cd22c4a3932..f68d645c2054 100644 --- a/devel/py-libzfs/Makefile +++ b/devel/py-libzfs/Makefile @@ -24,6 +24,10 @@ MAKE_ENV= freebsd_src=${SRC_BASE} .include +.if ${OSVERSION} >= 1500000 +EXTRA_PATCHES+= ${FILESDIR}/extra-zpool-add.patch +.endif + .if !exists(${SRC_BASE}/sys/Makefile) IGNORE= requires kernel source files in ${SRC_BASE} .endif diff --git a/devel/py-libzfs/files/extra-zpool-add.patch b/devel/py-libzfs/files/extra-zpool-add.patch new file mode 100644 index 000000000000..7d0688ca4f13 --- /dev/null +++ b/devel/py-libzfs/files/extra-zpool-add.patch @@ -0,0 +1,44 @@ +From b5ffe1f1d6097df6e2f5cc6dd3c968872ec60804 Mon Sep 17 00:00:00 2001 +From: Ameer Hamza +Date: Tue, 2 Apr 2024 23:56:55 +0500 +Subject: [PATCH] zpool_add API changed in upstream zfs master + +--- + libzfs.pyx | 5 +++-- + pxd/libzfs.pxd | 2 +- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/libzfs.pyx b/libzfs.pyx +index a59fca8..71efa96 100644 +--- a/libzfs.pyx ++++ ./libzfs.pyx +@@ -3175,13 +3175,14 @@ cdef class ZFSPool(object): + hopts = self.root.generate_history_opts(fsopts, '-o') + self.root.write_history('zfs create', hopts, name) + +- def attach_vdevs(self, vdevs_tree): ++ def attach_vdevs(self, vdevs_tree, check_ashift=0): + cdef const char *command = 'zpool add' + cdef ZFSVdev vd = self.root.make_vdev_tree(vdevs_tree, {'ashift': self.properties['ashift'].parsed}) + cdef int ret ++ cdef boolean_t ashift = check_ashift + + with nogil: +- ret = libzfs.zpool_add(self.handle, vd.nvlist.handle) ++ ret = libzfs.zpool_add(self.handle, vd.nvlist.handle, ashift) + + if ret != 0: + raise self.root.get_error() +diff --git a/pxd/libzfs.pxd b/pxd/libzfs.pxd +index 3ab9374..6afa275 100644 +--- a/pxd/libzfs.pxd ++++ ./pxd/libzfs.pxd +@@ -228,7 +228,7 @@ cdef extern from "libzfs.h" nogil: + extern int zpool_create(libzfs_handle_t *, const char *, nvpair.nvlist_t *, + nvpair.nvlist_t *, nvpair.nvlist_t *) + extern int zpool_destroy(zpool_handle_t *, const char *) +- extern int zpool_add(zpool_handle_t *, nvpair.nvlist_t *) ++ extern int zpool_add(zpool_handle_t *, nvpair.nvlist_t *, boolean_t) + + IF HAVE_ZPOOL_SCAN == 3: + extern int zpool_scan(zpool_handle_t *, zfs.pool_scan_func_t, zfs.pool_scrub_cmd_t)