From nobody Fri Dec 15 13:30:33 2023 X-Original-To: dev-commits-ports-main@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 4Ss98B0pGvz52pSp; Fri, 15 Dec 2023 13:30:34 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ss9893zsJz4Fg5; Fri, 15 Dec 2023 13:30:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702647033; 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=mDpNJEXJe/Ystf+Bfq2FD8QwwSOiNLuYICu65FYn20Y=; b=Q76ZDxzhrqzk6104Gf6DPYoQk83JROToy0A58Cn013EJ5/2GjpHlRl4sDSoZlAirlJQj3W eVJbjLoumqBY68GlfPxJjlshmE8JS9MJ7jfwUzt8vCBHmA/u+oVoTEjnVX2zGLpNZMHtmo aoSTbIwX7n2NJr7eG+OcKCQPYNk6PYLdKAUgFaLvUNMPhorRMIi6rlcxxi2RoFCwipuBj1 57IR2K5c119oKVnwEgLseERr+HZeEqw110Ah6N1bLBiEmVYLbc52U5P3az2MK6pQY45MoD GyRHOgMnDcaOx03eVTidu9uikLDF1W8SPMG18yl2CKx40V19Ckg6aCfA978Cvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702647033; a=rsa-sha256; cv=none; b=GDZNjlFLcIdnN1CKvx/7k5bDN5PYpb0wdmFNnXRwL6Z9Sp2QOjsmsRC1eQM7lkUB4Musua sFmr/FiYKt8TLb8Km3mQg2P8YxzB1OVIp1RSz3PaSMl/hdhn4MvTApfBZoTQxUDp4EqMiU 6xwRp3sSx4AAs7D7qGQjzyjxK/UHJ62JKvdvD7tWsaPwSFErgpXfNayVWRvX5/8RbkI6BG 8AvMSQg0Exj3NAhtD8DNY3u/KHnI8f4TtCUZr/g+lO0X1Evq4u6KZN94mhtIlMfqd3oTUg vyc+N3FpNxGgJ+txRzJNChdMTpG3HOb6ijB1fTvu5EXqkdo6zKuRF26UcBGkeA== 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=1702647033; 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=mDpNJEXJe/Ystf+Bfq2FD8QwwSOiNLuYICu65FYn20Y=; b=vlqeq4v2jwk+QJFHvNxdk9FM/AvXtndjSSk/xnzE/wJifPzrJ8q10rjPQp9ioirgvTfNTN ojrOUq0Pl/6dyH7GQjMEPE1mjCC9bmnoa3gLENXHIu7+YlQtlXd7FfilGc/el5GzsYEZcU 7pNy43QAefIz84qfN+0miwWAu+4G4M7MFz9VI9Bn4mIfwIZ1uI9HRPN2xOUPDYZpz/0MuO tHg+Z7/X5uQhV8yL4KFXXaMCno/f86jXlkcnjnugc0gUP0UUM6w5pMh3kTuiHxYDCq8k1Y D4edwYhx7CUmUWtbwHb0prCdRNAeBnipETnuZaJSmifnHMqhM+g9nETGFU7C8Q== 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 4Ss9892lRHz1BYq; Fri, 15 Dec 2023 13:30:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BFDUXNP074165; Fri, 15 Dec 2023 13:30:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BFDUXER074162; Fri, 15 Dec 2023 13:30:33 GMT (envelope-from git) Date: Fri, 15 Dec 2023 13:30:33 GMT Message-Id: <202312151330.3BFDUXER074162@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Joseph Mingrone Subject: git: 99767f704b5d - main - sysutils/arc_summary: Match script to FreeBSD version List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 99767f704b5d493ce2d04365a42f70bdadb31bf7 Auto-Submitted: auto-generated The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/ports/commit/?id=99767f704b5d493ce2d04365a42f70bdadb31bf7 commit 99767f704b5d493ce2d04365a42f70bdadb31bf7 Author: Joseph Mingrone AuthorDate: 2023-12-15 00:55:29 +0000 Commit: Joseph Mingrone CommitDate: 2023-12-15 12:59:06 +0000 sysutils/arc_summary: Match script to FreeBSD version The latest arc_summary from the OpenZFS repository fails to run on FreeBSD 13.2. Resolve this by installing arc_summary from a branch of our src repository that matches the major version of the target system. PR: 274605 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D43070 --- sysutils/arc_summary/Makefile | 21 +++++++++++++++------ sysutils/arc_summary/distinfo | 10 +++++++--- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/sysutils/arc_summary/Makefile b/sysutils/arc_summary/Makefile index b41161f58d1b..47782014e038 100644 --- a/sysutils/arc_summary/Makefile +++ b/sysutils/arc_summary/Makefile @@ -1,8 +1,11 @@ PORTNAME= arc_summary -PORTVERSION= 20231023 +PORTVERSION= 20231114 CATEGORIES= sysutils -MASTER_SITES= https://raw.githubusercontent.com/openzfs/zfs/${_REV}/cmd/ -DISTFILES= ${PORTNAME}?${PORTVERSION} +MASTER_SITES= https://cgit.freebsd.org/src/plain/sys/contrib/openzfs/cmd/ \ + https://cgit.freebsd.org/src/plain/sys/contrib/openzfs/cmd/arc_summary/:13 +DISTFILES= ${PORTNAME}3?h=releng/13.2:13 \ + ${PORTNAME}?h=releng/14.0 \ + ${PORTNAME} MAINTAINER= jrm@FreeBSD.org COMMENT= Print ZFS ARC cache statistics and other information @@ -21,12 +24,18 @@ NO_BUILD= yes NO_WRKSUBDIR= yes PLIST_FILES= bin/arc_summary -_REV= e57909265b4352832d69f5107bac7e56d6a8fbd2 +.include do-extract: - ${CP} ${DISTDIR}/${DISTFILES} ${WRKSRC}/${PORTNAME} +.if ${OSVERSION} < 1400000 + ${CP} ${DISTDIR}/${PORTNAME}3?h=releng/13.2 ${WRKSRC}/${PORTNAME} +.elif ${OSVERSION} >= 1400000 && ${OSVERSION} < 1500000 + ${CP} ${DISTDIR}/${PORTNAME}?h=releng/14.0 ${WRKSRC}/${PORTNAME} +.else + ${CP} ${DISTDIR}/${PORTNAME} ${WRKSRC}/${PORTNAME} +.endif do-install: ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ -.include +.include diff --git a/sysutils/arc_summary/distinfo b/sysutils/arc_summary/distinfo index 3532084a5e8a..be2951e8d7a5 100644 --- a/sysutils/arc_summary/distinfo +++ b/sysutils/arc_summary/distinfo @@ -1,3 +1,7 @@ -TIMESTAMP = 1700833863 -SHA256 (arc_summary?20231023) = 44e8d4aec6614aacfece3a12a6953e0f68b4358fa9621415f25200b346020132 -SIZE (arc_summary?20231023) = 37268 +TIMESTAMP = 1702600566 +SHA256 (arc_summary3?h=releng/13.2) = 978d3743bc99a936c05418e3f08d6041535214196d081a6c87938c01a7936da2 +SIZE (arc_summary3?h=releng/13.2) = 34365 +SHA256 (arc_summary?h=releng/14.0) = 81fc104da57777f45c931c9c2f425f1fe219d12dc61a9d2928a1b03561f9aecb +SIZE (arc_summary?h=releng/14.0) = 37272 +SHA256 (arc_summary) = 44e8d4aec6614aacfece3a12a6953e0f68b4358fa9621415f25200b346020132 +SIZE (arc_summary) = 37268