From 580204fec2424fd3d4f563cf2faeef25242229fb Mon Sep 17 00:00:00 2001 From: obache Date: Sat, 17 May 2008 13:07:54 +0000 Subject: Update smartmontools to 5.38, UNSTABLE to STABLE. Based on patch provided by Sergey Svishchev in PR 38573. This version contains DragonFly support, noted in PR 36982. patch-ag is taken from PR 38199. Date 2008-03-10 Summary: smartmontools release 5.38 (STABLE) -------------------------------------------- This is a stable release of smartmontools. In addition to changes below, it includes: - Libata/Marvell driver devices no longer need explicit '-d' switch - DEVICESCAN automatically detects libata/marvell driver SATA devices - Fixed auto-offline/autosave support in FreeBSD - SAT device type + SCSI generic devices work properly with smartd under Linux - Many additions to drive database - More portable autogen/autoconf/automake script set - Additional Windows IOCTL route to access SMART data - Some ATA-8 updates - Smoother CCISS compilation support in Linux - Dragonfly support - Fixed some ATA identity byte swap problems on big endian CPUs - Added support for the QNX operating system - No-fork option added to smartd - Improved device scanning and drive type recognition in Windows - 3ware support for controllers with more disks (32 max) - Improved Windows installer - Improved SMART Attribute list and descriptions - Fix to smartctl return codes - Fix to scheduled tests on Highpoint RAID controllers - New samsung firmware bug workaround option - Auto-offline and Auto-save fixed in Linux + libata - Solaris: better SCSI support and support for Sun compilers AND gcc - Fixed and improvements to CCISS support - More options for SCSI temperature monitoring and history - Additional command line options for selective self-tests - Compilation fixes for various platforms. See CHANGELOG for more details, or smartmontools CVS for still further details. --- sysutils/smartmontools/Makefile | 8 ++++---- sysutils/smartmontools/distinfo | 14 +++++++------- sysutils/smartmontools/patches/patch-aa | 12 ++++++------ sysutils/smartmontools/patches/patch-ae | 13 ------------- sysutils/smartmontools/patches/patch-af | 13 ------------- sysutils/smartmontools/patches/patch-ag | 20 ++++++++++++++++++++ sysutils/smartmontools/patches/patch-ah | 12 ++++++++++++ 7 files changed, 49 insertions(+), 43 deletions(-) delete mode 100644 sysutils/smartmontools/patches/patch-ae delete mode 100644 sysutils/smartmontools/patches/patch-af create mode 100644 sysutils/smartmontools/patches/patch-ag create mode 100644 sysutils/smartmontools/patches/patch-ah (limited to 'sysutils') diff --git a/sysutils/smartmontools/Makefile b/sysutils/smartmontools/Makefile index 925ed02b6cd..738a5223151 100644 --- a/sysutils/smartmontools/Makefile +++ b/sysutils/smartmontools/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.14 2008/01/04 22:15:47 heinz Exp $ +# $NetBSD: Makefile,v 1.15 2008/05/17 13:07:54 obache Exp $ -DISTNAME= smartmontools-5.37 +DISTNAME= smartmontools-5.38 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=smartmontools/} @@ -8,13 +8,13 @@ MAINTAINER= shattered@users.sourceforge.net HOMEPAGE= http://smartmontools.sourceforge.net/ COMMENT= Control and monitor storage systems using SMART -ONLY_FOR_PLATFORM= Darwin-*-* FreeBSD-*-* Linux-*-* +ONLY_FOR_PLATFORM= Darwin-*-* DragonFly-*-* FreeBSD-*-* Linux-*-* ONLY_FOR_PLATFORM+= NetBSD-*-* OpenBSD-*-* SunOS-*-* PKG_DESTDIR_SUPPORT= user-destdir PKG_INSTALLATION_TYPES= overwrite pkgviews -USE_LANGUAGES+= c++ +USE_LANGUAGES= c c++ USE_TOOLS+= gmake GNU_CONFIGURE= yes diff --git a/sysutils/smartmontools/distinfo b/sysutils/smartmontools/distinfo index be98bd271ec..2dd52e12fa4 100644 --- a/sysutils/smartmontools/distinfo +++ b/sysutils/smartmontools/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.14 2007/10/19 03:56:13 taca Exp $ +$NetBSD: distinfo,v 1.15 2008/05/17 13:07:54 obache Exp $ -SHA1 (smartmontools-5.37.tar.gz) = d6e88f576e26836b929c570290644b0580645602 -RMD160 (smartmontools-5.37.tar.gz) = e9d18c71340766dc43bf462a4c12cb0d152f2812 -Size (smartmontools-5.37.tar.gz) = 590605 bytes -SHA1 (patch-aa) = 005d69bebfdb385ca42c59aa2c90a62e22c14733 -SHA1 (patch-ae) = 35a42cfc16f6657ddbc81cbecf340a3892ba4918 -SHA1 (patch-af) = 0936c5eb5f0df75cebd186304a6ca111909a34d2 +SHA1 (smartmontools-5.38.tar.gz) = 90e36f46af7a35336c63868176aa71deef4c9e66 +RMD160 (smartmontools-5.38.tar.gz) = 6fcca6e18b14a14b579e8484c769f36b3ce238ea +Size (smartmontools-5.38.tar.gz) = 617326 bytes +SHA1 (patch-aa) = 98d7fee0a636f430756a9a57776053903d26bb7e +SHA1 (patch-ag) = c4280d734b4e1f9fa76d9c113ad42e916d8758cb +SHA1 (patch-ah) = 712cf0cc567221a92d38d8b3c4623902705b6dfa diff --git a/sysutils/smartmontools/patches/patch-aa b/sysutils/smartmontools/patches/patch-aa index 39712f67158..64a58921051 100644 --- a/sysutils/smartmontools/patches/patch-aa +++ b/sysutils/smartmontools/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.4 2007/06/03 10:40:07 jmmv Exp $ +$NetBSD: patch-aa,v 1.5 2008/05/17 13:07:54 obache Exp $ ---- Makefile.in.orig 2006-12-20 21:38:50.000000000 +0100 +--- Makefile.in.orig 2008-03-10 10:44:13.000000000 +0000 +++ Makefile.in -@@ -92,7 +92,7 @@ CONFIG_HEADER = config.h +@@ -87,7 +87,7 @@ CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man5dir)" \ "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(docsdir)" \ @@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.4 2007/06/03 10:40:07 jmmv Exp $ sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(sbin_PROGRAMS) am__smartctl_SOURCES_DIST = smartctl.cpp smartctl.h atacmdnames.cpp \ -@@ -353,8 +353,7 @@ docs_DATA = AUTHORS \ +@@ -347,8 +347,7 @@ docs_DATA = AUTHORS \ NEWS \ README \ TODO \ @@ -21,12 +21,12 @@ $NetBSD: patch-aa,v 1.4 2007/06/03 10:40:07 jmmv Exp $ sysconf_DATA = smartd.conf$(smartd_suffix) EXTRA_DIST = smartmontools.spec \ -@@ -1122,7 +1121,7 @@ info: info-recursive +@@ -1115,7 +1114,7 @@ info: info-recursive info-am: -install-data-am: install-docsDATA install-initdDATA install-man +install-data-am: install-docsDATA install-man - install-exec-am: install-sbinPROGRAMS install-sysconfDATA + install-dvi: install-dvi-recursive diff --git a/sysutils/smartmontools/patches/patch-ae b/sysutils/smartmontools/patches/patch-ae deleted file mode 100644 index 31b0876108c..00000000000 --- a/sysutils/smartmontools/patches/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2007/10/19 03:56:13 taca Exp $ - ---- smartctl.cpp.orig Mon Oct 9 20:45:12 2006 -+++ smartctl.cpp -@@ -82,7 +82,7 @@ void PrintOneCVS(const char *a_cvs_id){ - } - - void printcopy(){ -- char *configargs=strlen(SMARTMONTOOLS_CONFIGURE_ARGS)?SMARTMONTOOLS_CONFIGURE_ARGS:"[no arguments given]"; -+ const char *configargs=strlen(SMARTMONTOOLS_CONFIGURE_ARGS)?SMARTMONTOOLS_CONFIGURE_ARGS:"[no arguments given]"; - - pout("smartctl comes with ABSOLUTELY NO WARRANTY. This\n"); - pout("is free software, and you are welcome to redistribute it\n"); diff --git a/sysutils/smartmontools/patches/patch-af b/sysutils/smartmontools/patches/patch-af deleted file mode 100644 index c88f0c5e8f0..00000000000 --- a/sysutils/smartmontools/patches/patch-af +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-af,v 1.1 2007/10/19 03:56:14 taca Exp $ - ---- smartd.cpp.orig Sun Nov 12 13:49:09 2006 -+++ smartd.cpp -@@ -310,7 +310,7 @@ void PrintOneCVS(const char *a_cvs_id){ - - // prints CVS identity information for the executable - void PrintCVS(void){ -- char *configargs=strlen(SMARTMONTOOLS_CONFIGURE_ARGS)?SMARTMONTOOLS_CONFIGURE_ARGS:"[no arguments given]"; -+ const char *configargs=strlen(SMARTMONTOOLS_CONFIGURE_ARGS)?SMARTMONTOOLS_CONFIGURE_ARGS:"[no arguments given]"; - - PrintOut(LOG_INFO,(char *)copyleftstring); - PrintOut(LOG_INFO,"CVS version IDs of files used to build this code are:\n"); diff --git a/sysutils/smartmontools/patches/patch-ag b/sysutils/smartmontools/patches/patch-ag new file mode 100644 index 00000000000..0f7b8a94161 --- /dev/null +++ b/sysutils/smartmontools/patches/patch-ag @@ -0,0 +1,20 @@ +$NetBSD: patch-ag,v 1.1 2008/05/17 13:07:54 obache Exp $ + +Avoid special man page section handling for Solaris (PR 38199). + +--- configure.orig 2008-03-10 10:44:14.000000000 +0000 ++++ configure +@@ -8141,13 +8141,8 @@ else + OS_DARWIN_FALSE= + fi + +- if echo $host_os | grep '^solaris' > /dev/null; then +- OS_SOLARIS_TRUE= +- OS_SOLARIS_FALSE='#' +-else + OS_SOLARIS_TRUE='#' + OS_SOLARIS_FALSE= +-fi + + if echo $host_os | grep '^mingw' > /dev/null; then + OS_WIN32_MINGW_TRUE= diff --git a/sysutils/smartmontools/patches/patch-ah b/sysutils/smartmontools/patches/patch-ah new file mode 100644 index 00000000000..bc62ff2502a --- /dev/null +++ b/sysutils/smartmontools/patches/patch-ah @@ -0,0 +1,12 @@ +$NetBSD: patch-ah,v 1.1 2008/05/17 13:07:54 obache Exp $ + +--- os_freebsd.cpp.orig 2008-03-04 22:09:47.000000000 +0000 ++++ os_freebsd.cpp +@@ -272,7 +272,6 @@ int marvell_command_interface(__unused i + } + + int highpoint_command_interface(__unused int fd, __unused smart_command_set command, __unused int select, __unused char *data) { +-{ + return -1; + } + -- cgit v1.2.3