From owner-svn-ports-head@freebsd.org Wed Oct 2 17:46:42 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C0F291353D9; Wed, 2 Oct 2019 17:46:42 +0000 (UTC) (envelope-from swills@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46k3VB4jdxz3HBB; Wed, 2 Oct 2019 17:46:42 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8559F2F13B; Wed, 2 Oct 2019 17:46:42 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x92Hkg9F003395; Wed, 2 Oct 2019 17:46:42 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x92Hkf01003392; Wed, 2 Oct 2019 17:46:41 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201910021746.x92Hkf01003392@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Wed, 2 Oct 2019 17:46:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r513591 - in head/sysutils/smartmontools: . files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in head/sysutils/smartmontools: . files X-SVN-Commit-Revision: 513591 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Oct 2019 17:46:42 -0000 Author: swills Date: Wed Oct 2 17:46:41 2019 New Revision: 513591 URL: https://svnweb.freebsd.org/changeset/ports/513591 Log: sysutils/smartmontools: support areca controllers and nvme While here, ensure mail starts before smartd PR: 240519 Submitted by: VVD Approved by: samm@os2.kiev.ua (maintianer) Modified: head/sysutils/smartmontools/Makefile (contents, props changed) head/sysutils/smartmontools/files/smart.in head/sysutils/smartmontools/files/smartd.in Modified: head/sysutils/smartmontools/Makefile ============================================================================== --- head/sysutils/smartmontools/Makefile Wed Oct 2 16:20:16 2019 (r513590) +++ head/sysutils/smartmontools/Makefile Wed Oct 2 17:46:41 2019 (r513591) @@ -3,7 +3,7 @@ PORTNAME= smartmontools PORTVERSION= 7.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= SF Modified: head/sysutils/smartmontools/files/smart.in ============================================================================== --- head/sysutils/smartmontools/files/smart.in Wed Oct 2 16:20:16 2019 (r513590) +++ head/sysutils/smartmontools/files/smart.in Wed Oct 2 17:46:41 2019 (r513591) @@ -16,7 +16,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)[0-9]+//g')" + daily_status_smart_devices="$(sysctl -n kern.disks | sed -E 's/[[:<:]](cd|ar)[0-9]+//g; s/nvd/nvme/g')" ;; *) ;; esac @@ -46,6 +46,9 @@ case "${daily_status_smart_enable}" in device="/dev/${device%,[0-9]*}" ;; ciss*) devflags="-dcciss,${device##ciss[0-9]*,}" + device="/dev/${device%,[0-9]*}" + ;; + arcmsr*) devflags="-dareca,${device##arcmsr[0-9]*,}" device="/dev/${device%,[0-9]*}" ;; /*) ;; Modified: head/sysutils/smartmontools/files/smartd.in ============================================================================== --- head/sysutils/smartmontools/files/smartd.in Wed Oct 2 16:20:16 2019 (r513590) +++ head/sysutils/smartmontools/files/smartd.in Wed Oct 2 17:46:41 2019 (r513591) @@ -3,7 +3,7 @@ # $FreeBSD$ # # PROVIDE: smartd -# REQUIRE: LOGIN +# REQUIRE: root ldconfig devfs syslogd mail # KEYWORD: shutdown nojail # # Define these smartd_* variables in one of these files: