Update to 5.36, provided by Sergey Svishchev in PR 33958:

Date 2006-04-12
Summary: smartmontools release 5.36 (STABLE)
-----------------------------------------------------------
This is a stable smartmontools release.  The 5.34 version
described just below was never officially released because
Bruce Allen decided to wait until Linux support for
accessing SATA devices through libata was in the official
kernel.org sources.  Changes include:

- Win 2000/XP:ability to cancel drive self-tests
- Additions to the table of known drives
- FreeBSD support for 3ware char device interface and
  multiple 3ware cards
- Various cygwin improvements for running as service
- Works 'out of the box' with Linux SATA libata
- smartd option added to list test schedules
- smartctl option added to list part of drive database
- various improvements for SCSI disks and logs


Date 2005-04-19
Summary: smartmontools release 5.34 (STABLE)
-----------------------------------------------------------
This is a stable smartmontools release.  It includes:
- OS/2 and eComStation support
All Platforms:
 - Printing of drive family info
 - SCSI disks: output size of grown defect list
 - Added info about drive family to 'smartctl -i' output.
 - Added option ',q' for smartd '-n' directive to suppress
   'skipping checks' message which may spin up laptop disk.
 - Added message if smartd '-n' check power mode spins up disk.
Cygwin and Windows:
 - Added info about Windows version and service pack to banner line.
 - Added support for smartd '-n' directive for Win2000/XP.
 - Added support for READ_LOG for WinNT4 also.
 - Fixed bug that prevents display of empty logs on Win2000/XP
 - Fixed use of cached smart enabled state in 'smartctl -i' output.
Windows:
 - Fixed bug that prevents running smartd as service on WinNT4.


Date 2004-9-5
Summary: smartmontools release 5.33 (UNSTABLE/EXPERIMENTAL)
-----------------------------------------------------------
This is an unstable/experimental release of smartmontools.  It includes
 - support for Darwin/Mac OSX
 - support for OpenBSD
 - support for 3ware ATA RAID controllers under FreeBSD
 - support for 3ware 9500 series SATA RAID controllers under
   Linux.  Use /dev/twa[0-15] devices to access these.
 - support for 3ware character device interfaces /dev/twe[0-15]
   under Linux.  This allows (for example) Selective Self-tests.
 - support for Marvell chip-set based SATA controllers under Linux.
 - smartd mail now works also under Windows (using "Blat" mailer).
 - smartd can now be run as a Windows service.
Please report sucess/failure with these items to the
smartmontools-support mailing list.

7 files changed, 32 insertions, 211 deletions

diff --git a/sysutils/smartmontools/Makefile b/sysutils/smartmontools/Makefile
index 7720a5e9a24..6244939088e 100644
--- a/sysutils/smartmontools/Makefile
+++ b/sysutils/smartmontools/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2006/02/05 23:10:56 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2006/07/17 17:01:32 wiz Exp $
 
-DISTNAME=		smartmontools-5.32
-PKGREVISION=		4
+DISTNAME=		smartmontools-5.36
 CATEGORIES=		sysutils
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=smartmontools/}
 
@@ -18,6 +17,7 @@ EGDIR=			${PREFIX}/share/examples/smartmontools
 CONF_FILES=		${EGDIR}/smartd.conf ${PKG_SYSCONFDIR}/smartd.conf
 RCD_SCRIPTS=		smartd
 
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--with-docdir=${PREFIX}/share/doc/smartmontools
 INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} sysconfdir=${EGDIR}
 
diff --git a/sysutils/smartmontools/distinfo b/sysutils/smartmontools/distinfo
index d3e09ca7074..a918a80d48d 100644
--- a/sysutils/smartmontools/distinfo
+++ b/sysutils/smartmontools/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.10 2006/04/20 23:22:04 martin Exp $
+$NetBSD: distinfo,v 1.11 2006/07/17 17:01:32 wiz Exp $
 
-SHA1 (smartmontools-5.32.tar.gz) = 2af09136578ea59565ad00b3638afe9700ed26a2
-RMD160 (smartmontools-5.32.tar.gz) = 6692df8996bc3f6a1b52b10286d92b116874e1cd
-Size (smartmontools-5.32.tar.gz) = 408224 bytes
-SHA1 (patch-aa) = 2f22d9bd911ce825c1ca888cceb4535bba606671
-SHA1 (patch-ab) = 8934b29e17bc0826c7e1bb5cf27025ef574c914b
-SHA1 (patch-ac) = 477db70947e5cab73264ff8603bbfce8496d2616
-SHA1 (patch-ad) = 61d730fc8f435edd2473c33d37d3e02cd9184b13
+SHA1 (smartmontools-5.36.tar.gz) = aafc42287c694e4206d80b7886401acdb0eff230
+RMD160 (smartmontools-5.36.tar.gz) = 38efdc3b8dd78ded3f09890683c84973ccc036e7
+Size (smartmontools-5.36.tar.gz) = 540786 bytes
+SHA1 (patch-aa) = 676ab97ffa01d023fb1792b0590538af9a6c2fa2
diff --git a/sysutils/smartmontools/files/smartd.sh b/sysutils/smartmontools/files/smartd.sh
index 528afb0c1f6..ba9d0cc66d5 100644
--- a/sysutils/smartmontools/files/smartd.sh
+++ b/sysutils/smartmontools/files/smartd.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: smartd.sh,v 1.3 2004/10/20 07:25:39 xtraeme Exp $
+# $NetBSD: smartd.sh,v 1.4 2006/07/17 17:01:32 wiz Exp $
 #
 # PROVIDE: smartd
 # REQUIRE: DAEMON
@@ -11,8 +11,11 @@ name="smartd"
 rcvar=$name
 command="@PREFIX@/sbin/${name}"
 pidfile="@VARBASE@/run/${name}.pid"
-smartd_flags="-p $pidfile"
-extra_commands="reload"
+required_files="@PKG_SYSCONFDIR@/${name}.conf"
+command_args="-p $pidfile"
+extra_commands="reload check"
+check_precmd='[ "$rc_pid" ]'
+check_cmd='kill -USR1 $rc_pid'
 
 load_rc_config $name
 run_rc_command "$1"
diff --git a/sysutils/smartmontools/patches/patch-aa b/sysutils/smartmontools/patches/patch-aa
index 0dd38fe3348..c5d9914951e 100644
--- a/sysutils/smartmontools/patches/patch-aa
+++ b/sysutils/smartmontools/patches/patch-aa
@@ -1,27 +1,27 @@
-$NetBSD: patch-aa,v 1.2 2005/01/02 20:29:16 jlam Exp $
+$NetBSD: patch-aa,v 1.3 2006/07/17 17:01:32 wiz Exp $
 
---- Makefile.in.orig	2004-07-05 04:10:33.000000000 -0400
+--- Makefile.in.orig	2006-04-12 17:39:15.000000000 +0000
 +++ Makefile.in
-@@ -251,8 +251,7 @@ docs_DATA = AUTHORS   \
-             NEWS      \
-             README    \
-             TODO      \
--            WARNINGS  \
+@@ -93,7 +93,7 @@ CONFIG_HEADER = config.h
+ CONFIG_CLEAN_FILES =
+ am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man5dir)" \
+ 	"$(DESTDIR)$(man8dir)" "$(DESTDIR)$(docsdir)" \
+-	"$(DESTDIR)$(initddir)" "$(DESTDIR)$(sysconfdir)"
++	"$(DESTDIR)$(sysconfdir)"
+ sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ PROGRAMS = $(sbin_PROGRAMS)
+ am__smartctl_SOURCES_DIST = smartctl.c smartctl.h atacmdnames.c \
+@@ -330,8 +330,7 @@ docs_DATA = AUTHORS     \
+             NEWS        \
+             README      \
+             TODO        \
+-            WARNINGS    \
 -            smartd.conf
 +            WARNINGS
  
- 
  sysconf_DATA = smartd.conf$(smartd_suffix)
-@@ -916,7 +915,7 @@ check: check-recursive
- all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) config.h
- installdirs: installdirs-recursive
- installdirs-am:
--	$(mkinstalldirs) $(DESTDIR)$(sbindir) $(DESTDIR)$(man5dir) $(DESTDIR)$(man8dir) $(DESTDIR)$(docsdir) $(DESTDIR)$(initddir) $(DESTDIR)$(sysconfdir)
-+	$(mkinstalldirs) $(DESTDIR)$(sbindir) $(DESTDIR)$(man5dir) $(DESTDIR)$(man8dir) $(DESTDIR)$(docsdir) $(DESTDIR)$(sysconfdir)
- 
- install: install-recursive
- install-exec: install-exec-recursive
-@@ -962,7 +961,7 @@ info: info-recursive
+ EXTRA_DIST = smartmontools.spec                    \
+@@ -1068,7 +1067,7 @@ info: info-recursive
  
  info-am:
  
diff --git a/sysutils/smartmontools/patches/patch-ab b/sysutils/smartmontools/patches/patch-ab
deleted file mode 100644
index 81107939de6..00000000000
--- a/sysutils/smartmontools/patches/patch-ab
+++ /dev/null
@@ -1,138 +0,0 @@
-$NetBSD: patch-ab,v 1.6 2005/10/27 21:36:13 kristerw Exp $
-
---- os_netbsd.c.orig	2004-04-20 06:53:26.000000000 +0200
-+++ os_netbsd.c	2005-09-06 23:02:45.000000000 +0200
-@@ -23,2 +23,3 @@
- #include "os_netbsd.h"
-+#include <unistd.h>
- 
-@@ -180,9 +181,9 @@ ata_command_interface(int fd, smart_comm
-     req.flags = ATACMD_READ;
-     req.features = WDSM_RD_DATA;
-     req.command = WDCC_SMART;
--    req.databuf = (caddr_t) inbuf;
-+    req.databuf = inbuf;
-     req.datalen = sizeof(inbuf);
--    req.cylinder = htole16(WDSMART_CYL);
-+    req.cylinder = WDSMART_CYL;
-     req.timeout = 1000;
-     copydata = 1;
-     break;
-@@ -190,9 +191,9 @@ ata_command_interface(int fd, smart_comm
-     req.flags = ATACMD_READ;
-     req.features = WDSM_RD_THRESHOLDS;
-     req.command = WDCC_SMART;
--    req.databuf = (caddr_t) inbuf;
-+    req.databuf = inbuf;
-     req.datalen = sizeof(inbuf);
--    req.cylinder = htole16(WDSMART_CYL);
-+    req.cylinder = WDSMART_CYL;
-     req.timeout = 1000;
-     copydata = 1;
-     break;
-@@ -200,9 +201,9 @@ ata_command_interface(int fd, smart_comm
-     req.flags = ATACMD_READ;
-     req.features = ATA_SMART_READ_LOG_SECTOR;	/* XXX missing from wdcreg.h */
-     req.command = WDCC_SMART;
--    req.databuf = (caddr_t) inbuf;
-+    req.databuf = inbuf;
-     req.datalen = sizeof(inbuf);
--    req.cylinder = htole16(WDSMART_CYL);
-+    req.cylinder = WDSMART_CYL;
-     req.sec_num = select;
-     req.sec_count = 1;
-     req.timeout = 1000;
-@@ -213,9 +214,9 @@ ata_command_interface(int fd, smart_comm
-     req.flags = ATACMD_WRITE;
-     req.features = ATA_SMART_WRITE_LOG_SECTOR;	/* XXX missing from wdcreg.h */
-     req.command = WDCC_SMART;
--    req.databuf = (caddr_t) inbuf;
-+    req.databuf = inbuf;
-     req.datalen = sizeof(inbuf);
--    req.cylinder = htole16(WDSMART_CYL);
-+    req.cylinder = WDSMART_CYL;
-     req.sec_num = select;
-     req.sec_count = 1;
-     req.timeout = 1000;
-@@ -240,14 +241,14 @@ ata_command_interface(int fd, smart_comm
-     req.flags = ATACMD_READ;
-     req.features = WDSM_ENABLE_OPS;
-     req.command = WDCC_SMART;
--    req.cylinder = htole16(WDSMART_CYL);
-+    req.cylinder = WDSMART_CYL;
-     req.timeout = 1000;
-     break;
-   case DISABLE:
-     req.flags = ATACMD_READ;
-     req.features = WDSM_DISABLE_OPS;
-     req.command = WDCC_SMART;
--    req.cylinder = htole16(WDSMART_CYL);
-+    req.cylinder = WDSMART_CYL;
-     req.timeout = 1000;
-     break;
-   case AUTO_OFFLINE:
-@@ -255,9 +256,9 @@ ata_command_interface(int fd, smart_comm
-     req.flags = ATACMD_READ;
-     req.features = ATA_SMART_AUTO_OFFLINE;	/* XXX missing from wdcreg.h */
-     req.command = WDCC_SMART;
--    req.databuf = (caddr_t) inbuf;
-+    req.databuf = inbuf;
-     req.datalen = sizeof(inbuf);
--    req.cylinder = htole16(WDSMART_CYL);
-+    req.cylinder = WDSMART_CYL;
-     req.sec_num = select;
-     req.sec_count = 1;
-     req.timeout = 1000;
-@@ -266,7 +267,7 @@ ata_command_interface(int fd, smart_comm
-     req.flags = ATACMD_READ;
-     req.features = ATA_SMART_AUTOSAVE;	/* XXX missing from wdcreg.h */
-     req.command = WDCC_SMART;
--    req.cylinder = htole16(WDSMART_CYL);
-+    req.cylinder = WDSMART_CYL;
-     req.sec_count = 0xf1;
-     /* to enable autosave */
-     req.timeout = 1000;
-@@ -276,9 +277,9 @@ ata_command_interface(int fd, smart_comm
-     req.flags = ATACMD_READ;
-     req.features = ATA_SMART_IMMEDIATE_OFFLINE;	/* XXX missing from wdcreg.h */
-     req.command = WDCC_SMART;
--    req.databuf = (caddr_t) inbuf;
-+    req.databuf = inbuf;
-     req.datalen = sizeof(inbuf);
--    req.cylinder = htole16(WDSMART_CYL);
-+    req.cylinder = WDSMART_CYL;
-     req.sec_num = select;
-     req.sec_count = 1;
-     req.timeout = 1000;
-@@ -289,7 +290,7 @@ ata_command_interface(int fd, smart_comm
-     req.flags = ATACMD_READ;
-     req.features = WDSM_STATUS;
-     req.command = WDCC_SMART;
--    req.cylinder = htole16(WDSMART_CYL);
-+    req.cylinder = WDSMART_CYL;
-     req.timeout = 1000;
-     break;
-   case CHECK_POWER_MODE:
-@@ -313,11 +314,11 @@ ata_command_interface(int fd, smart_comm
-       return -1;
-     }
-     /* Cyl low and Cyl high unchanged means "Good SMART status" */
--    if (le16toh(req.cylinder) == normal)
-+    if (req.cylinder == normal)
-       return 0;
- 
-     /* These values mean "Bad SMART status" */
--    if (le16toh(req.cylinder) == failed)
-+    if (req.cylinder == failed)
-       return 1;
- 
-     /* We haven't gotten output that makes sense; 
-@@ -381,7 +382,7 @@ do_scsi_cmnd_io(int fd, struct scsi_cmnd
-   sc.databuf = iop->dxferp;
-   sc.datalen = iop->dxfer_len;
-   sc.senselen = iop->max_sense_len;
--  sc.timeout = iop->timeout == 0 ? 60000 : iop->timeout;	/* XXX */
-+  sc.timeout = iop->timeout == 0 ? 60000 : (iop->timeout * 1000);	/* XXX */
-   sc.flags =
-     (iop->dxfer_dir == DXFER_NONE ? SCCMD_READ :	/* XXX */
-     (iop->dxfer_dir == DXFER_FROM_DEVICE ? SCCMD_READ : SCCMD_WRITE));
diff --git a/sysutils/smartmontools/patches/patch-ac b/sysutils/smartmontools/patches/patch-ac
deleted file mode 100644
index f2d7966fcf0..00000000000
--- a/sysutils/smartmontools/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2005/09/07 07:32:10 martin Exp $
-
---- atacmds.c.orig	2004-06-03 05:47:06.000000000 +0200
-+++ atacmds.c	2005-08-10 22:18:14.000000000 +0200
-@@ -673,7 +673,9 @@ int ataReadHDIdentity (int device, struc
-     }
-   }
- 
-+#ifndef __NetBSD__
-   // if machine is big-endian, swap byte order as needed
-+  // (the NetBSD kernel does deliver the results in host byte order)
-   if (isbigendian()){
-     int i;
-     
-@@ -682,6 +684,7 @@ int ataReadHDIdentity (int device, struc
-     for (i=80; i<=87; i++)
-       swap2((char *)(rawshort+i));
-   }
-+#endif
-   
-   // If there is a checksum there, validate it
-   if ((rawshort[255] & 0x00ff) == 0x00a5 && checksum(rawbyte))
diff --git a/sysutils/smartmontools/patches/patch-ad b/sysutils/smartmontools/patches/patch-ad
deleted file mode 100644
index 5ac6baea287..00000000000
--- a/sysutils/smartmontools/patches/patch-ad
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2006/04/20 23:22:04 martin Exp $
-
---- ataprint.c.orig	2004-06-04 22:59:16.000000000 +0200
-+++ ataprint.c	2006-04-21 01:10:45.000000000 +0200
-@@ -90,7 +90,14 @@
-   char tmp[65];
- 
-   n = n > 64 ? 64 : n;
-+#ifndef __NetBSD__
-   swapbytes(tmp, in, n);
-+#else
-+  if (isbigendian())
-+    strncpy(tmp, in, n);
-+  else
-+    swapbytes(tmp, in, n);
-+#endif
-   tmp[n] = '\0';
-   trim(out, tmp);
- }