On Tue, Mar 01, 2022 at 09:36:52AM +0100, Martin Ziemer wrote:
> This patch updates smartmontools from 7.2 to 7.3.
> We no longer need any patch, as upstream is fixed for our needs.
> Tested on three amd64 systems.
Committed. Thanks!
--Kurt
> Index: Makefile
> ===
> RCS file: /cvs/ports/sysutils/smartmontools/Makefile,v
> retrieving revision 1.45
> diff -u -p -r1.45 Makefile
> --- Makefile 15 Jun 2021 15:02:30 - 1.45
> +++ Makefile 1 Mar 2022 07:11:48 -
> @@ -3,7 +3,7 @@
> COMMENT= control and monitor storage systems using SMART
>
> # XXX at update time check whether C++11 is actually needed
> -DISTNAME=smartmontools-7.2
> +DISTNAME=smartmontools-7.3
> CATEGORIES= sysutils
>
> HOMEPAGE=https://www.smartmontools.org/
> Index: distinfo
> ===
> RCS file: /cvs/ports/sysutils/smartmontools/distinfo,v
> retrieving revision 1.20
> diff -u -p -r1.20 distinfo
> --- distinfo 15 Jun 2021 15:02:30 - 1.20
> +++ distinfo 1 Mar 2022 07:11:48 -
> @@ -1,2 +1,2 @@
> -SHA256 (smartmontools-7.2.tar.gz) =
> XNmKJ+Y5MWi8aq6gcNnhzVUbD4mMUvZrL/Ll0nQRjNY=
> -SIZE (smartmontools-7.2.tar.gz) = 992256
> +SHA256 (smartmontools-7.3.tar.gz) =
> pUT4gI0MWM+w50JMoYQcuFipdJIrA11QXU5MJIvjois=
> +SIZE (smartmontools-7.3.tar.gz) = 1043932
> Index: patches/patch-os-openbsd_cpp
> ===
> RCS file: patches/patch-os-openbsd_cpp
> diff -N patches/patch-os-openbsd_cpp
> --- patches/patch-os-openbsd_cpp 15 Jun 2021 15:02:30 - 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,38 +0,0 @@
> -$OpenBSD $
> -
> -Upstream r5213: Use correct devicename for autodetection
> -Upstream r5214: Apply conversion to seconds for timeouts in scsi_pass_through
> -Upstream r5215: fix SAT autodetection for the sd* devices
> -
> os_openbsd.cpp Tue Oct 6 17:31:47 2020
> -+++ os_openbsd.cpp.patched Wed Apr 7 09:39:24 2021
> -@@ -266,7 +266,7 @@ bool openbsd_scsi_device::scsi_pass_through(scsi_cmnd_
> - sc.databuf = (char *)iop->dxferp;
> - sc.datalen = iop->dxfer_len;
> - sc.senselen = iop->max_sense_len;
> -- sc.timeout = iop->timeout == 0 ? 6 : iop->timeout;/* XXX */
> -+ sc.timeout = (iop->timeout == 0 ? 60 : iop->timeout) * 1000;
> - sc.flags =
> - (iop->dxfer_dir == DXFER_NONE ? SCCMD_READ :
> - (iop->dxfer_dir == DXFER_FROM_DEVICE ? SCCMD_READ : SCCMD_WRITE));
> -@@ -582,17 +582,17 @@ smart_device * openbsd_smart_interface::autodetect_sma
> - if (str_starts_with(test_name, net_dev_prefix)) {
> - test_name += strlen(net_dev_prefix);
> - if (!strncmp(net_dev_ata_disk, test_name, strlen(net_dev_ata_disk)))
> -- return get_ata_device(test_name, "ata");
> -+ return get_ata_device(name, "ata");
> - if (!strncmp(net_dev_scsi_disk, test_name, strlen(net_dev_scsi_disk))) {
> - // XXX Try to detect possible USB->(S)ATA bridge
> - // XXX get USB vendor ID, product ID and version from sd(4)/umass(4).
> - // XXX check sat device via get_usb_dev_type_by_id().
> -
> - // No USB bridge found, assume regular SCSI device
> -- return get_scsi_device(test_name, "scsi");
> -+ return get_scsi_device(name, "");
> - }
> - if (!strncmp(net_dev_scsi_tape, test_name, strlen(net_dev_scsi_tape)))
> -- return get_scsi_device(test_name, "scsi");
> -+ return get_scsi_device(name, "scsi");
> - }
> - // device type unknown
> - return 0;
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/sysutils/smartmontools/pkg/PLIST,v
> retrieving revision 1.8
> diff -u -p -r1.8 PLIST
> --- pkg/PLIST 1 Mar 2019 19:35:34 - 1.8
> +++ pkg/PLIST 1 Mar 2022 07:11:48 -
> @@ -1,4 +1,3 @@
> -@comment $OpenBSD: PLIST,v 1.8 2019/03/01 19:35:34 cwen Exp $
> @rcscript ${RCDIR}/smartd
> @man man/man5/smartd.conf.5
> @man man/man8/smartctl.8
> @@ -6,6 +5,14 @@
> @bin sbin/smartctl
> @bin sbin/smartd
> share/doc/smartmontools/
> +share/doc/smartmontools/AUTHORS
> +share/doc/smartmontools/COPYING
> +share/doc/smartmontools/ChangeLog
> +share/doc/smartmontools/ChangeLog-6.0-7.0
> +share/doc/smartmontools/INSTALL
> +share/doc/smartmontools/NEWS
> +share/doc/smartmontools/README
> +share/doc/smartmontools/TODO
> share/doc/smartmontools/smartd.conf
> @sample ${SYSCONFDIR}/smartd.conf
> share/examples/smartmontools/
> @@ -15,5 +22,7 @@ share/examples/smartmontools/Example3
> share/examples/smartmontools/Example4
> share/examples/smartmontools/Example5
> share/examples/smartmontools/Example6
> +share/examples/smartmontools/Example7
> +share/examples/smartmontools/Example8
> share/examples/smartmontools/README
> share/examples/smartmontools/smartd_warning.sh
>
