From nobody Wed Oct 8 01:36:22 2025 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 4chFw65W5nz69wLs; Wed, 08 Oct 2025 01:36:22 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4chFw64xQ3z3dMM; Wed, 08 Oct 2025 01:36:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759887382; 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=+vvC9lJ4stEM49MKKGpKUey4A1S3Fg35PhIljO18q3A=; b=R4/41ws+B5I/e40bDFYiEzF8M6ntpN3JyLC4LFmzsKhxT+DXATOGvKQfEaSToBdQ4Pw1Yj lR0QVbTX1ji6E6umOPPxALLLxCohrj80iAaCO6/+6XkA94SSAGtQLh/JC9KkCkbGQKRI0q kupYcPxUvN3DYBRmQu9JaWN2k8XyjBjlJuLp3Qx3Zi/htcZyOoBTyHSSsWTSoFbPe9TNvo 6mTBfn74UD2JnoeYg4FmNcCfKg/ILbuHaDPWHbZ2SZPRxKFsXXiDSRoccRiRIA1FgF6c3d zWGAdMHpRq1VXocj/MlxlhaFjfWDjzndHN+p9ezqX4THc1cLiq2zEOz1rqcdLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759887382; 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=+vvC9lJ4stEM49MKKGpKUey4A1S3Fg35PhIljO18q3A=; b=EDTVjAtAD4v8GcuxvhYGAE+F+j9v7ktDCS27lfNScU606p7Cn6F8UdKDOp6Ru7dm0jl3h7 19kHdhuQ8T6BzyuGA0kvWMCSwhs8tnip0tjA0QaFI/VB411Qnt/8n1CiaHM5EIQBNF/8bp OjPif7IHQFeVH3MNSEdCOxG7uvfv48vs5xPdGg7do5X+R6HlP0bcTYSR8Ose88bfCl5cB3 QtwDQNtCWl0iPgQRe53dLBww1upzYcH2qr7qeYJ76dhH9UzhUO4XYLsZCCFRe9fbFnoJbE 0VY9tFYYJMG+sxalSi2ku/tPMHf2zcSKJcr4YDDuKUap2KrgH4q2BF3hOvYwOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759887382; a=rsa-sha256; cv=none; b=yTHx5KCxH1v7uyfcf8+JA019pEJBfD+awtwNARoCfa4aYhPeFiWx0F9fAPIQULBBxZa5gI jSKnamZgppxjuyPWFvT+Fc97x6HkLqNvvMci99PWlTUtUsQv5zW0Ocs10O224MvwXaPuVG r6TCIhjqv7i3wBXX6FNquW+uSzYrzMpsP4jSICrCIx7zncQAJn79I2GBfwE3mn4dtGvAvd aQP4AED1Pmbh/rIN6GhS2wFbtW8sAeCwxcC8UEgMVmeiD9FEk8IhZjez7srbwOEJY9DRia +9bfe5Ay26KfLk5mSSXqNZyL+v9Umiyvk8lr7ZwW5rmBimJPpYVGsUDUPIbnyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4chFw64WTPz190N; Wed, 08 Oct 2025 01:36:22 +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 5981aMPI014092; Wed, 8 Oct 2025 01:36:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5981aMNZ014089; Wed, 8 Oct 2025 01:36:22 GMT (envelope-from git) Date: Wed, 8 Oct 2025 01:36:22 GMT Message-Id: <202510080136.5981aMNZ014089@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: e52a4095e3a8 - main - sysutils/smartmontools: Fix 3 issues 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e52a4095e3a891d65fbec4b8287cc5c3cb9623bf Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=e52a4095e3a891d65fbec4b8287cc5c3cb9623bf commit e52a4095e3a891d65fbec4b8287cc5c3cb9623bf Author: Vladimir Druzenko AuthorDate: 2025-10-08 01:28:13 +0000 Commit: Vladimir Druzenko CommitDate: 2025-10-08 01:35:11 +0000 sysutils/smartmontools: Fix 3 issues 1. Start "smartd" service after "DAEMON" - smartd starts too early. 2. Exclude "mfid" device from automatic detection in daily "smart". 3. Add the ability to manually specify the "pass" device with parameters in "periodic.conf" for processing in daily "smart", example: daily_status_smart_devices="pass14,-dsat pass15,-dsat" PR: 288538 Approved by: Oleksii Samorukov (3 explicit, 1 and 2 timeout > 1 month) Co-authored-by: Anton Saietskii --- sysutils/smartmontools/Makefile | 1 + sysutils/smartmontools/files/smart.in | 5 ++++- sysutils/smartmontools/files/smartd.in | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sysutils/smartmontools/Makefile b/sysutils/smartmontools/Makefile index 85d841432579..e4cc6bc5a5a5 100644 --- a/sysutils/smartmontools/Makefile +++ b/sysutils/smartmontools/Makefile @@ -1,5 +1,6 @@ PORTNAME= smartmontools DISTVERSION= 7.5 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= SF diff --git a/sysutils/smartmontools/files/smart.in b/sysutils/smartmontools/files/smart.in index 8460df0f231a..606bd02cefa3 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/n(da|vd)/nvme/g')" + daily_status_smart_devices="$(sysctl -n kern.disks | sed -E 's/[[:<:]](cd|ar|vtbd|mfid)[0-9]+//g; s/n(da|vd)/nvme/g')" ;; *) ;; esac @@ -51,6 +51,9 @@ case "${daily_status_smart_enable}" in mrsas*) devflags="-dmegaraid,${device##mrsas[0-9]*,}" device="/dev/${device%,[0-9]*}" ;; + pass*) devflags="${device#pass[0-9]*,}" + device="/dev/${device%%,[:alpha:0-9-]*}" + ;; /*) ;; *) device="/dev/${device}" ;; diff --git a/sysutils/smartmontools/files/smartd.in b/sysutils/smartmontools/files/smartd.in index 1176089041ad..832b3bb6b2c7 100644 --- a/sysutils/smartmontools/files/smartd.in +++ b/sysutils/smartmontools/files/smartd.in @@ -1,7 +1,7 @@ #!/bin/sh # PROVIDE: smartd -# REQUIRE: root ldconfig devfs syslogd mail +# REQUIRE: DAEMON mail # KEYWORD: shutdown nojail # # Define these smartd_* variables in one of these files: