From nobody Tue Dec 24 18:14:59 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 4YHjjH6zmnz5hcBK; Tue, 24 Dec 2024 18:14:59 +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 4YHjjH68knz4xms; Tue, 24 Dec 2024 18:14:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735064099; 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=8eIYiIHa2wRqmGhPfwD+mmpV7di1yUMuG7YtPBZ0VPE=; b=Dc4FdaCcM12CgLKjZLTFBUq/eeioictX362yQfnlf5xla/pWROQ9b0BEK1UNwhrL8EwMab A/tiurA4my1qdW4S/z6ttd26gXwzrn5Pa1a9lUh2I6DgBDaOuwHLN5uOicpOSpAz80Uu8z bhTuedn+DzV+ncagswgBOEfRcGgz4seX6+WsVt7wKCNwUcZPl53h1PQlzbrQsfCfOCuys5 svr0Oq8dEu5L6wO86bNFuPZDYmAZZx+GCqGUTlGucO1mfTomXnLKBawZH/yar2/iRD7jCP fP3vjT6c23BA4egzAUsNyTJYOkGC1/oAh+fO87qZ5J0AoMyFENXNUf0nsNfoEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735064099; 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=8eIYiIHa2wRqmGhPfwD+mmpV7di1yUMuG7YtPBZ0VPE=; b=ZcZpNvxA6cwzoBlrfBn/S+v9psMqRhhqdavROotMr2MljMX2opoFuyY1Q1I7nwtvtURoPk 6bIGFwQQTl8NO+HP1YZVm5cbrEx2d/vzdmo7XEi6GamevzBxmwU8o/DijJj2TELcdO41Vi kSWrCStkXCh/cmaZ3mS8GttKAeZjeLToBK1PpROd18F8dNw+NN0f+qDIvbe0OfUfvZst3i FFwt85Mxn0OsNaETcbx0TE8Z06ZGmxX3Oxgs4BgF9ggwmvIHPqIABbuyR0a7B6LAhQTe8a BuDpVR3K5ehlH/yElVxDYsDPxge8dQxbaAgQ87iY4d/o+R9FaLyaK7y4Tgpa/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735064099; a=rsa-sha256; cv=none; b=pCpVxbJNH21JuApDWRQUzPntdpZxm70dbDGjBnjBnGUtZ7nV9/AlVbQg0jl52jGEi4wAMC FHMnVblnTLHcJDqFB/cLsf8aaL5CnY7+M0UfpxKWOlC288QwDdY804ZhpG/ftR30fFklnT 9gfvIUQwPzCT2UsLNLcVXye3mRy1jyNYM6svEfBBO71aIphOCo4FqIYHn5g+713qD6zHun wBqAM1Oku/A5Te0dPRxFEz8UBLHjyO8dL7LJaO/BJhvSsGaHbEF+kmXMTvZ51hAsWV7Atk +yg2y9+UnH121rM9VPoqshB0FPul2xSvM8yK8Jufes3i5IOMm/xMjxvptVXa6Q== 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 4YHjjH5mKhzq4s; Tue, 24 Dec 2024 18:14:59 +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 4BOIExdI082495; Tue, 24 Dec 2024 18:14:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BOIExLF082492; Tue, 24 Dec 2024 18:14:59 GMT (envelope-from git) Date: Tue, 24 Dec 2024 18:14:59 GMT Message-Id: <202412241814.4BOIExLF082492@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alan Somers Subject: git: fff0adf0ea22 - main - filesystems/py-libzfs: Fix support for 14.0+ 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: asomers X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fff0adf0ea22271dc2fdd6125ff883629829325a Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/ports/commit/?id=fff0adf0ea22271dc2fdd6125ff883629829325a commit fff0adf0ea22271dc2fdd6125ff883629829325a Author: Goran Mekić AuthorDate: 2024-12-23 17:28:29 +0000 Commit: Alan Somers CommitDate: 2024-12-24 18:14:06 +0000 filesystems/py-libzfs: Fix support for 14.0+ The ZFS on 14.0 changed to include skipped bytes in the percentage of resilver. As old code didn't take into account that variable on 14.0+, the percentage was always wrong. Also, take maintainership. PR: 283522 Reviewed by: asomers Approved by: lwhsu (ports) Sponsored by: ConnectWise --- filesystems/py-libzfs/Makefile | 8 +++++++- filesystems/py-libzfs/distinfo | 4 +++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/filesystems/py-libzfs/Makefile b/filesystems/py-libzfs/Makefile index 5297e6074fb7..892800055c2c 100644 --- a/filesystems/py-libzfs/Makefile +++ b/filesystems/py-libzfs/Makefile @@ -1,9 +1,10 @@ PORTNAME= libzfs PORTVERSION= 1.1.2023020700 +PORTREVISION= 1 CATEGORIES= filesystems devel python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= meka@tilda.center COMMENT= Python libzfs bindings WWW= https://github.com/freenas/py-libzfs @@ -32,4 +33,9 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-zpool-add.patch IGNORE= requires kernel source files in ${SRC_BASE} .endif +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400000 +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES= 0b2ab0594997c44e80e3fdfe9d2add106d81149a.diff:-p1 # backport of https://github.com/truenas/py-libzfs/pull/251 +.endif + .include diff --git a/filesystems/py-libzfs/distinfo b/filesystems/py-libzfs/distinfo index 3ae8f5fa9a4d..96872e080854 100644 --- a/filesystems/py-libzfs/distinfo +++ b/filesystems/py-libzfs/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1675808317 +TIMESTAMP = 1734977733 SHA256 (truenas-py-libzfs-1.1.2023020700-c1bd4a0_GH0.tar.gz) = 23b2d6e1b6ed78be2d12068f9b1b0b01270afaaf0f017817a5fb109d358aa818 SIZE (truenas-py-libzfs-1.1.2023020700-c1bd4a0_GH0.tar.gz) = 99656 +SHA256 (0b2ab0594997c44e80e3fdfe9d2add106d81149a.diff) = 1fb37c3a678dbaadd47999f7d29631824a404561ca5f2237613d2b22b42fa138 +SIZE (0b2ab0594997c44e80e3fdfe9d2add106d81149a.diff) = 1453