From nobody Tue Oct 26 22:34:41 2021 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 03861182BA00; Tue, 26 Oct 2021 22:34:42 +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 4Hf6822jrpz4dNf; Tue, 26 Oct 2021 22:34:42 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 F1B492477C; Tue, 26 Oct 2021 22:34:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19QMYfBc038298; Tue, 26 Oct 2021 22:34:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19QMYfMW038297; Tue, 26 Oct 2021 22:34:41 GMT (envelope-from git) Date: Tue, 26 Oct 2021 22:34:41 GMT Message-Id: <202110262234.19QMYfMW038297@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Eugene Grosbein Subject: git: bcc1dd2fa250 - main - sysutils/cciss_vol_status: update to 1.12a 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bcc1dd2fa2501aab2f2ea3dfff345e1db3a0316a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by eugen: URL: https://cgit.FreeBSD.org/ports/commit/?id=bcc1dd2fa2501aab2f2ea3dfff345e1db3a0316a commit bcc1dd2fa2501aab2f2ea3dfff345e1db3a0316a Author: Eugene Grosbein AuthorDate: 2021-10-26 22:22:27 +0000 Commit: Eugene Grosbein CommitDate: 2021-10-26 22:34:31 +0000 sysutils/cciss_vol_status: update to 1.12a Changes since 1.12 * Correct some logic, use bitwise instead of logical ands While here, fix port Makefile bug checking for SRC_BASE without including bsd.port.pre.mk, so SRC_BASE was always empty and the check works due to /sys symlink pointing to real source tree; the check failed without such /sys symlink. Also, remove the patch upstreamed. PR: 259462 Approved by: Frank Wall (maintainer, initial patch) --- sysutils/cciss_vol_status/Makefile | 12 ++++++------ sysutils/cciss_vol_status/distinfo | 6 +++--- sysutils/cciss_vol_status/files/patch-cciss_vol_status.c | 11 ----------- 3 files changed, 9 insertions(+), 20 deletions(-) diff --git a/sysutils/cciss_vol_status/Makefile b/sysutils/cciss_vol_status/Makefile index f5fbd014afb8..25768bce78a4 100644 --- a/sysutils/cciss_vol_status/Makefile +++ b/sysutils/cciss_vol_status/Makefile @@ -1,7 +1,7 @@ # Created by: mm PORTNAME= cciss_vol_status -PORTVERSION= 1.12 +PORTVERSION= 1.12a CATEGORIES= sysutils MASTER_SITES= SF/cciss/${PORTNAME} @@ -16,12 +16,12 @@ GNU_CONFIGURE= yes PLIST_FILES= bin/cciss_vol_status etc/periodic/daily/cciss_vol_status man/man8/cciss_vol_status.8.gz SUB_FILES= cciss_vol_status -.if !exists(${SRC_BASE}/sys/dev/ciss/cissio.h) -IGNORE= cciss_vol_status requires kernel sources of the ciss driver -.endif - post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily ${INSTALL_SCRIPT} ${WRKDIR}/cciss_vol_status ${STAGEDIR}${PREFIX}/etc/periodic/daily/cciss_vol_status -.include +.include +.if !exists(${SRC_BASE}/sys/dev/ciss/cissio.h) +IGNORE= cciss_vol_status requires kernel sources of the ciss driver +.endif +.include diff --git a/sysutils/cciss_vol_status/distinfo b/sysutils/cciss_vol_status/distinfo index 161c51069c90..48ee99ab3e20 100644 --- a/sysutils/cciss_vol_status/distinfo +++ b/sysutils/cciss_vol_status/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1510485982 -SHA256 (cciss_vol_status-1.12.tar.gz) = a49abbfde6369416ac3d71bca6f60f342584eb99c786c080f8722ad19a17f91f -SIZE (cciss_vol_status-1.12.tar.gz) = 120346 +TIMESTAMP = 1635285613 +SHA256 (cciss_vol_status-1.12a.tar.gz) = db5a2508e4a5c57fb35a8b6d9c841db339b7386798a6c560d92f2369cf1cca47 +SIZE (cciss_vol_status-1.12a.tar.gz) = 120748 diff --git a/sysutils/cciss_vol_status/files/patch-cciss_vol_status.c b/sysutils/cciss_vol_status/files/patch-cciss_vol_status.c deleted file mode 100644 index 5ab0ec4b21af..000000000000 --- a/sysutils/cciss_vol_status/files/patch-cciss_vol_status.c +++ /dev/null @@ -1,11 +0,0 @@ ---- cciss_vol_status.c.orig 2017-10-18 07:49:43.578445000 +0200 -+++ cciss_vol_status.c 2017-10-18 07:51:20.372056000 +0200 -@@ -1098,7 +1098,7 @@ - break; - case 1: sprintf(raid_level, "RAID 4"); - break; -- case 2: sprintf(raid_level, "RAID 1"); -+ case 2: sprintf(raid_level, "RAID 1(1+0)"); - break; - case 3: sprintf(raid_level, "RAID 5"); - break;