From nobody Mon Jun 05 20:14:33 2023 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 4QZlFP3zy9z4b56H; Mon, 5 Jun 2023 20:14:33 +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 4QZlFP3TRDz3xw6; Mon, 5 Jun 2023 20:14:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685996073; 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=Kng/Ehjo1krsPtN/mFheBJqNG0Cs5Snq3SCLGdm07bE=; b=VvRLiQjK0Y+aM/gIhmt+MIaJxL3M5acKorSJS+HjujDoL0kOZsJ7kKnEu499P21at7KcO6 6EfhmB9xJHvULg6ygdWp9r0M6f3ChBxmHxSbd5Mnavod0A4zWlPLjyh+Adt7R9Mz+lcTsr MyMIU6WOcZmGmcfiETrLf/uah8vYNdPS8kuTn/K+3nQKHB9nBs94jcKPvEhuVGXWQmBpyl F+YPf/I87n4CSp+kY/OJoKoMLiI1cm386bRzdrNrtNmVYweFGPhwKeE+irgLGCDFmVTz6R OfmUP3DIM5m9YVaNqjG7lDD97Xr8JSXlKs6sFuCW4EUsGBd7keMEJSCCcfJfPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685996073; 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=Kng/Ehjo1krsPtN/mFheBJqNG0Cs5Snq3SCLGdm07bE=; b=sIx34nTys/WEevD3UbjNaq2Elto8tNfw3Sft1DaTmb7eWxIJ7DPJ0F+ZACtRABQAEtmC7s do+R/mV0aZmQwpj0DIWYubnHrHZct/Lbev+6KcJFUSRWK3uqG9GtSX5RjnBsmYX7nwpONb Zzr1dDqR4mF8H2cJeMFiDefjLzL3qFsq+b1lUXpuzuRCuWoV/3X9yVDYGxch+ROfd0FCdc vgqKla4AZ8OmPRiLmZejid3HSbWbZzXPM1KuUr8MeaKQbHZzqY2VEM7ht8ZzTpbvs6TAGq hChakDYMhjNgz3feYRURXLPxlwA3KPEQJUaZqGch8mMw5qpOC4FiMpM6sTtgSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685996073; a=rsa-sha256; cv=none; b=FH/88H2vSCVSd3SWx56QlUHd2D7Su6Qfiiemf/XMQ0O4y2RqEBUaafVlAtKq05vCxaiWx2 cXycuhSt9L0T8PzBl/FzcKiPWo7OVpXEWZnOF6NSjXvhpvzY/oqX1F+yq6Y78K4X9P+Nvs LxCBdukjC9nVRL8TbfQmTqTMNB9sj1B2TmJOl5N+xEhU4bin73LUAiP5OtGETLQDxJS2yF UIfKcsFjLbYbdfSLJR6uoYHRm0pMz26kNQCxvxRIsQoboJAI7FTSzeh6s/EK+svLWk+Npv xgVcRnB2RJVCYWe/QBeRdilW713NJF2S92zmlq5RpuVOuizp33DTlvKg1FWi+Q== 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 4QZlFP2Yf5z121Q; Mon, 5 Jun 2023 20:14:33 +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 355KEXTJ000713; Mon, 5 Jun 2023 20:14:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 355KEXML000712; Mon, 5 Jun 2023 20:14:33 GMT (envelope-from git) Date: Mon, 5 Jun 2023 20:14:33 GMT Message-Id: <202306052014.355KEXML000712@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Oleksii Samorukov Subject: git: bcfaccea10e8 - main - sysutils/smartmontools: fix update-drive-db and hanlde nda(4) devices 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: samm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bcfaccea10e8c273ae693a051a75b53c3a4147ee Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by samm: URL: https://cgit.FreeBSD.org/ports/commit/?id=bcfaccea10e8c273ae693a051a75b53c3a4147ee commit bcfaccea10e8c273ae693a051a75b53c3a4147ee Author: Oleksii Samorukov AuthorDate: 2023-06-05 20:12:23 +0000 Commit: Oleksii Samorukov CommitDate: 2023-06-05 20:14:24 +0000 sysutils/smartmontools: fix update-drive-db and hanlde nda(4) devices PR: 269535, 266185 --- sysutils/smartmontools/Makefile | 1 + .../files/patch-update-smart-drivedb.in | 56 ++++++++++++++++++++++ sysutils/smartmontools/files/smart.in | 2 +- 3 files changed, 58 insertions(+), 1 deletion(-) diff --git a/sysutils/smartmontools/Makefile b/sysutils/smartmontools/Makefile index 8b53ce8c25ca..b9a3b337a767 100644 --- a/sysutils/smartmontools/Makefile +++ b/sysutils/smartmontools/Makefile @@ -1,5 +1,6 @@ PORTNAME= smartmontools DISTVERSION= 7.3 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= SF diff --git a/sysutils/smartmontools/files/patch-update-smart-drivedb.in b/sysutils/smartmontools/files/patch-update-smart-drivedb.in new file mode 100644 index 000000000000..786236c5c01a --- /dev/null +++ b/sysutils/smartmontools/files/patch-update-smart-drivedb.in @@ -0,0 +1,56 @@ +--- update-smart-drivedb.in.orig 2022-02-23 21:47:28 UTC ++++ update-smart-drivedb.in +@@ -8,7 +8,7 @@ + # + # SPDX-License-Identifier: GPL-2.0-or-later + # +-# $Id: update-smart-drivedb.in 5332 2022-02-23 21:47:28Z chrfranke $ ++# $Id$ + # + + set -e +@@ -527,7 +527,7 @@ gpg_verify() + # Remove temp home dir, retry on failure + i=0 + while ! out=`rm -f -r "$gnupgtmp" 2>&1`; do +- let ++i ++ i=$((i+1)) + if [ $i -ge 10 ]; then + echo "$out" >&2; break + fi +@@ -542,12 +542,14 @@ gpg_verify() + get_db_version() + { + local r v x +- x=$(sed -n '/^[ {]*"VERSION: *[^"]*"/{s,^[ {]*"VERSION: \([1-9][./0-9]* [^"]*\)".*$,\1,p;q}' "$1") \ +- || return 1 ++ x=`sed -n '/^[ {]*"VERSION: *[^"]*"/{ ++ s,^[ {]*"VERSION: \([1-9][./0-9]* [^"]*\)".*$,\1,p ++ q ++ }' "$1"` || return 1 + v=${x%% *} + test -n "$v" || return 0 + if [ "${v%/*}" = "$v" ]; then # trunk: get rev from expanded SVN-Id +- r=$(echo "$x" | sed -n 's,^[^$]*\$''Id: drivedb\.h \([1-9][0-9]*\) .*$,\1,p') ++ r=`echo "$x" | sed -n 's,^[^$]*\$''Id: drivedb\.h \([1-9][0-9]*\) .*$,\1,p'` + test -n "$r" || r="?" + v="$v/$r" + fi +@@ -860,7 +862,7 @@ if [ -z "$no_verify" ]; then + fi + + # Get version +-newver=$(get_db_version "$drivedb.new") ++newver=`get_db_version "$drivedb.new"` + if [ -z "$newver" ]; then + if [ -z "$force" ]; then + mv_all "$drivedb" ".new" ".error" +@@ -905,7 +907,7 @@ if [ -n "$equal" ]; then + fi + + # Check branch and file version +-oldver=$(get_db_version "$drivedb") ++oldver=`get_db_version "$drivedb"` + test -n "$oldver" || oldver="?/?" + if [ "${newver##*/}" = "?" ] \ + || [ "${oldver##*/}" = "?" ] \ diff --git a/sysutils/smartmontools/files/smart.in b/sysutils/smartmontools/files/smart.in index f9ceea2bfad1..8460df0f231a 100644 --- a/sysutils/smartmontools/files/smart.in +++ b/sysutils/smartmontools/files/smart.in @@ -13,7 +13,7 @@ smartctl=%%PREFIX%%/sbin/smartctl case "${daily_status_smart_devices}" in # XXX AUTO mode selects only regular ad/da disks [Aa][Uu][Tt][Oo]) - daily_status_smart_devices="$(sysctl -n kern.disks | sed -E 's/[[:<:]](cd|ar|vtbd)[0-9]+//g; s/nvd/nvme/g')" + daily_status_smart_devices="$(sysctl -n kern.disks | sed -E 's/[[:<:]](cd|ar|vtbd)[0-9]+//g; s/n(da|vd)/nvme/g')" ;; *) ;; esac