Update to 6.2 and reset maintainer. Selected changes:
- Support for ATA Long Logical/Physical Sectors (LLS/LPS). - smartctl option '-f brief' to select new attribute output format which includes more flags and fits in 80 columns. - smartctl options '-g, --get' and '-s, --set' to get/set various ATA settings: AAM, APM, Read look-ahead, Write cache, Security (freeze), Standby mode/timer. - smartd resends warning emails if problem reappears. - smartd warning emails include device identify info. - 'update-smart-drivedb' does no longer require GNU sed. - Linux and FreeBSD: Support for SATA/SAS disks behind Areca SAS controllers. - Many HDD, SSD and USB additions to drive database. More: http://sourceforge.net/p/smartmontools/code/HEAD/tree/trunk/smartmontools/NEWS
This commit is contained in:
shattered
parent
46d6fb9c92
commit
4d98693688
6 changed files with 42 additions and 107 deletions
|
|
@ -1,11 +1,10 @@
|
|||
# $NetBSD: Makefile,v 1.21 2012/10/23 19:51:24 asau Exp $
|
||||
# $NetBSD: Makefile,v 1.22 2013/08/20 11:07:13 shattered Exp $
|
||||
|
||||
DISTNAME= smartmontools-5.40
|
||||
PKGREVISION= 1
|
||||
DISTNAME= smartmontools-6.2
|
||||
CATEGORIES= sysutils
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=smartmontools/}
|
||||
|
||||
MAINTAINER= shattered@NetBSD.org
|
||||
MAINTAINER= pkgsrc-users@NetBSD.org
|
||||
HOMEPAGE= http://smartmontools.sourceforge.net/
|
||||
COMMENT= Control and monitor storage systems using SMART
|
||||
LICENSE= gnu-gpl-v2
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
@comment $NetBSD: PLIST,v 1.5 2010/11/13 10:10:45 tnn Exp $
|
||||
@comment $NetBSD: PLIST,v 1.6 2013/08/20 11:07:13 shattered Exp $
|
||||
man/man5/smartd.conf.5
|
||||
man/man8/smartctl.8
|
||||
man/man8/smartd.8
|
||||
|
|
@ -6,8 +6,9 @@ sbin/smartctl
|
|||
sbin/smartd
|
||||
sbin/update-smart-drivedb
|
||||
share/doc/smartmontools/AUTHORS
|
||||
share/doc/smartmontools/CHANGELOG
|
||||
share/doc/smartmontools/COPYING
|
||||
share/doc/smartmontools/ChangeLog
|
||||
share/doc/smartmontools/ChangeLog-5.0-6.0
|
||||
share/doc/smartmontools/INSTALL
|
||||
share/doc/smartmontools/NEWS
|
||||
share/doc/smartmontools/README
|
||||
|
|
@ -20,4 +21,5 @@ share/doc/smartmontools/examplescripts/Example4
|
|||
share/doc/smartmontools/examplescripts/README
|
||||
share/examples/rc.d/smartd
|
||||
share/examples/smartmontools/smartd.conf
|
||||
share/examples/smartmontools/smartd_warning.sh
|
||||
share/smartmontools/drivedb.h
|
||||
|
|
|
|||
|
|
@ -1,9 +1,8 @@
|
|||
$NetBSD: distinfo,v 1.21 2012/07/20 12:35:00 taca Exp $
|
||||
$NetBSD: distinfo,v 1.22 2013/08/20 11:07:13 shattered Exp $
|
||||
|
||||
SHA1 (smartmontools-5.40.tar.gz) = 08a86a939a2e2cd85d2c88c09188d494f06ce050
|
||||
RMD160 (smartmontools-5.40.tar.gz) = ff2ebfd130182ba721248ebfebd9d4d5cc325ff4
|
||||
Size (smartmontools-5.40.tar.gz) = 705592 bytes
|
||||
SHA1 (patch-aa) = b6f8b3bf263a46e4c88bcafa51582bb4c802165a
|
||||
SHA1 (patch-ag) = a4efc16ceb1f213979e63d7f8f50cce942c20ccf
|
||||
SHA1 (patch-ah) = c16d8cc2bea86fa0210a62fb13ba6b980ab8bf73
|
||||
SHA1 (smartmontools-6.2.tar.gz) = 37848ff5103d68b672463a30cd99e7d23d6696a5
|
||||
RMD160 (smartmontools-6.2.tar.gz) = e56a6d36a0adb64bb5c6c5f64bc0fea8ecb7b3ef
|
||||
Size (smartmontools-6.2.tar.gz) = 791427 bytes
|
||||
SHA1 (patch-aa) = 2885216ddceedfa0d924034ba76f9bebd756d358
|
||||
SHA1 (patch-ag) = 3eecc58db3f06c2be5094baee766f9a918619707
|
||||
SHA1 (patch-os__netbsd.cpp) = 289a560f480f877799c9f56c00b6a4c380e42bba
|
||||
|
|
|
|||
|
|
@ -1,32 +1,33 @@
|
|||
$NetBSD: patch-aa,v 1.6 2010/11/13 10:10:46 tnn Exp $
|
||||
$NetBSD: patch-aa,v 1.7 2013/08/20 11:07:13 shattered Exp $
|
||||
|
||||
--- Makefile.in.orig 2010-10-16 16:36:17.000000000 +0000
|
||||
--- Makefile.in.orig 2013-03-16 14:36:24.000000000 +0000
|
||||
+++ Makefile.in
|
||||
@@ -115,7 +115,7 @@ CONFIG_CLEAN_VPATH_FILES =
|
||||
am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(sbindir)" \
|
||||
@@ -155,8 +155,7 @@ am__installdirs = "$(DESTDIR)$(sbindir)"
|
||||
"$(DESTDIR)$(sbindir)" "$(DESTDIR)$(sysscriptdir)" \
|
||||
"$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)" \
|
||||
"$(DESTDIR)$(attributelogdir)" "$(DESTDIR)$(docsdir)" \
|
||||
- "$(DESTDIR)$(drivedbdir)" "$(DESTDIR)$(initddir)" \
|
||||
+ "$(DESTDIR)$(drivedbdir)" \
|
||||
"$(DESTDIR)$(savestatesdir)" "$(DESTDIR)$(sysconfdir)"
|
||||
- "$(DESTDIR)$(drivedbdir)" "$(DESTDIR)$(examplesdir)" \
|
||||
- "$(DESTDIR)$(initddir)" "$(DESTDIR)$(savestatesdir)" \
|
||||
+ "$(DESTDIR)$(drivedbdir)" "$(DESTDIR)$(savestatesdir)" \
|
||||
"$(DESTDIR)$(sysconfdir)" "$(DESTDIR)$(systemdsystemunitdir)"
|
||||
PROGRAMS = $(sbin_PROGRAMS)
|
||||
am__smartctl_SOURCES_DIST = smartctl.cpp smartctl.h atacmdnames.cpp \
|
||||
@@ -449,8 +449,7 @@ docs_DATA = AUTHORS \
|
||||
NEWS \
|
||||
README \
|
||||
TODO \
|
||||
- WARNINGS \
|
||||
- smartd.conf
|
||||
+ WARNINGS
|
||||
@@ -499,8 +498,7 @@ docs_DATA = \
|
||||
NEWS \
|
||||
README \
|
||||
TODO \
|
||||
- WARNINGS \
|
||||
- smartd.conf
|
||||
+ WARNINGS
|
||||
|
||||
sysconf_DATA = smartd.conf$(smartd_suffix)
|
||||
EXTRA_DIST = smartd.initd.in \
|
||||
@@ -1475,7 +1474,7 @@ info: info-recursive
|
||||
info-am:
|
||||
examplesdir = $(exampledir)
|
||||
examples_DATA = \
|
||||
@@ -1620,7 +1618,7 @@ info-am:
|
||||
|
||||
install-data-am: install-attributelogDATA install-docsDATA \
|
||||
- install-drivedbDATA install-initdDATA install-man \
|
||||
+ install-drivedbDATA install-man \
|
||||
install-savestatesDATA
|
||||
install-drivedbDATA install-examplesDATA \
|
||||
- install-examplesSCRIPTS install-initdDATA install-man \
|
||||
+ install-examplesSCRIPTS install-man \
|
||||
install-savestatesDATA install-sysscriptSCRIPTS \
|
||||
install-systemdsystemunitDATA
|
||||
|
||||
install-dvi: install-dvi-recursive
|
||||
|
|
|
|||
|
|
@ -1,24 +1,12 @@
|
|||
$NetBSD: patch-ag,v 1.2 2010/10/25 22:58:56 shattered Exp $
|
||||
$NetBSD: patch-ag,v 1.3 2013/08/20 11:07:13 shattered Exp $
|
||||
|
||||
Match pkgsrc's --host=i386-sun-solaris2, too.
|
||||
Avoid special man page section handling for Solaris (PR 38199).
|
||||
|
||||
--- configure.orig 2008-03-10 10:44:14.000000000 +0000
|
||||
--- configure.orig 2012-10-10 11:54:30.000000000 +0000
|
||||
+++ configure
|
||||
@@ -8067,7 +8067,7 @@ _ACEOF
|
||||
|
||||
os_libs=''
|
||||
;;
|
||||
- *-pc-solaris*)
|
||||
+ *-*-solaris*)
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define DEFAULT_MAILER "mailx"
|
||||
@@ -8141,13 +8141,8 @@ else
|
||||
@@ -6612,13 +6612,8 @@ else
|
||||
OS_DARWIN_FALSE=
|
||||
fi
|
||||
|
||||
- if echo $host_os | grep '^solaris' > /dev/null; then
|
||||
- if test "$os_solaris" = "yes"; then
|
||||
- OS_SOLARIS_TRUE=
|
||||
- OS_SOLARIS_FALSE='#'
|
||||
-else
|
||||
|
|
@ -26,5 +14,5 @@ Avoid special man page section handling for Solaris (PR 38199).
|
|||
OS_SOLARIS_FALSE=
|
||||
-fi
|
||||
|
||||
if echo $host_os | grep '^mingw' > /dev/null; then
|
||||
OS_WIN32_MINGW_TRUE=
|
||||
if test "$os_win32" = "yes"; then
|
||||
OS_WIN32_TRUE=
|
||||
|
|
|
|||
|
|
@ -1,54 +0,0 @@
|
|||
$NetBSD: patch-ah,v 1.5 2011/11/01 12:59:17 marino Exp $
|
||||
|
||||
* correct location for usb headers on DragonFly BSD
|
||||
https://sourceforge.net/apps/trac/smartmontools/ticket/141
|
||||
* pkg/40628: Override functionality conditions based on FreeBSD
|
||||
|
||||
--- os_freebsd.cpp.orig 2010-10-14 18:46:33.000000000 +0000
|
||||
+++ os_freebsd.cpp
|
||||
@@ -59,6 +59,9 @@
|
||||
#if (FREEBSDVER >= 800000)
|
||||
#include <libusb20_desc.h>
|
||||
#include <libusb20.h>
|
||||
+#elif defined(__DragonFly__)
|
||||
+#include <bus/usb/usb.h>
|
||||
+#include <bus/usb/usbhid.h>
|
||||
#else
|
||||
#include <dev/usb/usb.h>
|
||||
#include <dev/usb/usbhid.h>
|
||||
@@ -316,7 +319,7 @@ bool freebsd_ata_device::ata_pass_throug
|
||||
unsigned const char normal_lo=0x4f, normal_hi=0xc2;
|
||||
unsigned const char failed_lo=0xf4, failed_hi=0x2c;
|
||||
|
||||
-#if (FREEBSDVER < 502000)
|
||||
+#if (FREEBSDVER < 502000) && !defined(__DragonFly__)
|
||||
printwarning(NO_RETURN,NULL);
|
||||
#endif
|
||||
|
||||
@@ -1018,7 +1021,7 @@ bool freebsd_scsi_device::scsi_pass_thro
|
||||
|
||||
if (cam_send_ccb(m_camdev,ccb) < 0) {
|
||||
warn("error sending SCSI ccb");
|
||||
-#if (FREEBSDVER > 500000)
|
||||
+#if (FREEBSDVER > 500000) || defined(__DragonFly__)
|
||||
cam_error_print(m_camdev,ccb,CAM_ESF_ALL,CAM_EPF_ALL,stderr);
|
||||
#endif
|
||||
cam_freeccb(ccb);
|
||||
@@ -1026,7 +1029,7 @@ bool freebsd_scsi_device::scsi_pass_thro
|
||||
}
|
||||
|
||||
if (((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) && ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_SCSI_STATUS_ERROR)) {
|
||||
-#if (FREEBSDVER > 500000)
|
||||
+#if (FREEBSDVER > 500000) || defined(__DragonFly__)
|
||||
cam_error_print(m_camdev,ccb,CAM_ESF_ALL,CAM_EPF_ALL,stderr);
|
||||
#endif
|
||||
cam_freeccb(ccb);
|
||||
@@ -1501,7 +1504,7 @@ bool freebsd_smart_interface::scan_smart
|
||||
}
|
||||
|
||||
|
||||
-#if (FREEBSDVER < 800000) // without this build fail on FreeBSD 8
|
||||
+#if (FREEBSDVER < 800000) || defined(__DragonFly__) // without this build fail on FreeBSD 8
|
||||
static char done[USB_MAX_DEVICES];
|
||||
|
||||
static int usbdevinfo(int f, int a, int rec, int busno, unsigned short & vendor_id,
|
||||
Loading…
Reference in a new issue