CVS commit: pkgsrc/sysutils/smartmontools

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Tue May 10 07:01:28 UTC 2022

Modified Files:
        pkgsrc/sysutils/smartmontools: Makefile distinfo
        pkgsrc/sysutils/smartmontools/files: smartd.sh
        pkgsrc/sysutils/smartmontools/patches: patch-aa patch-ag

Log Message:
smartmontools: Update to 7.3

pkgsrc changes:
---------------
  * Create ${VARBASE}/run directory since smartd does not start if it does not
    exist.
  * Add ${VARBASE}/run existence test in the rc.d script.

upstream changes:
-----------------
  * Date 2022-02-28
    Summary: smartmontools release 7.3
    [https://www.smartmontools.org/browser/tags/RELEASE_7_3/smartmontools/NEWS]


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 pkgsrc/sysutils/smartmontools/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/sysutils/smartmontools/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/sysutils/smartmontools/files/smartd.sh
cvs rdiff -u -r1.9 -r1.10 pkgsrc/sysutils/smartmontools/patches/patch-aa
cvs rdiff -u -r1.6 -r1.7 pkgsrc/sysutils/smartmontools/patches/patch-ag

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/smartmontools/Makefile
diff -u pkgsrc/sysutils/smartmontools/Makefile:1.44 pkgsrc/sysutils/smartmontools/Makefile:1.45
--- pkgsrc/sysutils/smartmontools/Makefile:1.44 Fri Mar 19 17:48:32 2021
+++ pkgsrc/sysutils/smartmontools/Makefile      Tue May 10 07:01:28 2022
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.44 2021/03/19 17:48:32 triaxx Exp $
+# $NetBSD: Makefile,v 1.45 2022/05/10 07:01:28 triaxx Exp $
 
-DISTNAME=              smartmontools-7.2
+DISTNAME=              smartmontools-7.3
 CATEGORIES=            sysutils
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=smartmontools/}
 
@@ -18,7 +18,10 @@ USE_LANGUAGES=               c c++
 USE_TOOLS+=            gmake
 GNU_CONFIGURE=         yes
 
+BUILD_DEFS+=           VARBASE
+
 OWN_DIRS=              ${PKG_SYSCONFDIR}/smartd_warning.d
+OWN_DIRS+=             ${VARBASE}/run
 
 EGDIR=                 ${PREFIX}/share/examples/smartmontools
 CONF_FILES=            ${EGDIR}/smartd.conf ${PKG_SYSCONFDIR}/smartd.conf

Index: pkgsrc/sysutils/smartmontools/distinfo
diff -u pkgsrc/sysutils/smartmontools/distinfo:1.39 pkgsrc/sysutils/smartmontools/distinfo:1.40
--- pkgsrc/sysutils/smartmontools/distinfo:1.39 Tue Oct 26 11:20:13 2021
+++ pkgsrc/sysutils/smartmontools/distinfo      Tue May 10 07:01:28 2022
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.39 2021/10/26 11:20:13 nia Exp $
+$NetBSD: distinfo,v 1.40 2022/05/10 07:01:28 triaxx Exp $
 
-BLAKE2s (smartmontools-7.2.tar.gz) = aec467a55c7e68a4bc916cd4cf2d84de70201f8e0de6ba8330372f51369e9a0c
-SHA512 (smartmontools-7.2.tar.gz) = d7e724295b5d53797b5e4136eea5f5cc278db81e4016ba65142438b8c68c54f85a32c582c147a1590b9bc8f74a58952bcb57b9923dd69d34582530a0985799ea
-Size (smartmontools-7.2.tar.gz) = 992256 bytes
-SHA1 (patch-aa) = bd08aff267f0e9e9307ebc57858e61e35144bf16
-SHA1 (patch-ag) = 01b0b35d89d6d6a11b13b3c05a141c46a0c1590b
+BLAKE2s (smartmontools-7.3.tar.gz) = fe02e8378d6a4b70b124df0627bef796f70f7f8000a614ad2f5b1a43549ccbe7
+SHA512 (smartmontools-7.3.tar.gz) = 08afe8b0a6a39e742160cd4e4c03fc7aff7b1ae8681b906360f0932277dc99e361b7606b2373bdf42425cf9453480a5f4344bc040ebc2fa26a03bd52f02a6ac0
+Size (smartmontools-7.3.tar.gz) = 1043932 bytes
+SHA1 (patch-aa) = c74f808d5e5d7530d7dda1871df70b46a3503ae3
+SHA1 (patch-ag) = 14f6def84df02af67b7669a8030e34e6f71b0d1c

Index: pkgsrc/sysutils/smartmontools/files/smartd.sh
diff -u pkgsrc/sysutils/smartmontools/files/smartd.sh:1.4 pkgsrc/sysutils/smartmontools/files/smartd.sh:1.5
--- pkgsrc/sysutils/smartmontools/files/smartd.sh:1.4   Mon Jul 17 17:01:32 2006
+++ pkgsrc/sysutils/smartmontools/files/smartd.sh       Tue May 10 07:01:28 2022
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: smartd.sh,v 1.4 2006/07/17 17:01:32 wiz Exp $
+# $NetBSD: smartd.sh,v 1.5 2022/05/10 07:01:28 triaxx Exp $
 #
 # PROVIDE: smartd
 # REQUIRE: DAEMON
@@ -11,6 +11,7 @@ name="smartd"
 rcvar=$name
 command="@PREFIX@/sbin/${name}"
 pidfile="@VARBASE@/run/${name}.pid"
+required_dirs="@VARBASE@/run"
 required_files="@PKG_SYSCONFDIR@/${name}.conf"
 command_args="-p $pidfile"
 extra_commands="reload check"

Index: pkgsrc/sysutils/smartmontools/patches/patch-aa
diff -u pkgsrc/sysutils/smartmontools/patches/patch-aa:1.9 pkgsrc/sysutils/smartmontools/patches/patch-aa:1.10
--- pkgsrc/sysutils/smartmontools/patches/patch-aa:1.9  Thu Sep 24 22:30:29 2015
+++ pkgsrc/sysutils/smartmontools/patches/patch-aa      Tue May 10 07:01:28 2022
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.9 2015/09/24 22:30:29 tnn Exp $
+$NetBSD: patch-aa,v 1.10 2022/05/10 07:01:28 triaxx Exp $
 
 Don't install Linux init.d files nor CONF_FILES.
 
---- Makefile.in.orig   2015-06-04 16:30:22.000000000 +0000
+--- Makefile.in.orig   2022-02-28 16:34:38.000000000 +0000
 +++ Makefile.in
-@@ -189,11 +189,10 @@ mkinstalldirs = $(install_sh) -d
+@@ -206,11 +206,10 @@ mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
@@ -12,12 +12,12 @@ Don't install Linux init.d files nor CON
 +am__installdirs = "$(DESTDIR)$(sbindir)" \
        "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(smartdscriptdir)" \
        "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)" \
-       "$(DESTDIR)$(docsdir)" "$(DESTDIR)$(drivedbdir)" \
+       "$(DESTDIR)$(docsdir)" "$(DESTDIR)$(drivedbinstdir)" \
 -      "$(DESTDIR)$(examplesdir)" "$(DESTDIR)$(initddir)" \
        "$(DESTDIR)$(sysconfdir)" "$(DESTDIR)$(systemdsystemunitdir)"
  PROGRAMS = $(sbin_PROGRAMS)
  am__smartctl_SOURCES_DIST = smartctl.cpp smartctl.h atacmdnames.cpp \
-@@ -595,8 +594,7 @@ docs_DATA = \
+@@ -669,8 +668,7 @@ docs_DATA = \
          INSTALL \
          NEWS \
          README \
@@ -27,10 +27,10 @@ Don't install Linux init.d files nor CON
  
  examplesdir = $(exampledir)
  examples_DATA = \
-@@ -1686,7 +1684,7 @@ info-am:
+@@ -1896,7 +1894,7 @@ info-am:
  
  install-data-am: install-data-local install-docsDATA \
-       install-drivedbDATA install-examplesDATA \
+       install-drivedbinstDATA install-examplesDATA \
 -      install-examplesSCRIPTS install-initdDATA install-man \
 +      install-examplesSCRIPTS install-man \
        install-smartdscriptSCRIPTS install-systemdsystemunitDATA

Index: pkgsrc/sysutils/smartmontools/patches/patch-ag
diff -u pkgsrc/sysutils/smartmontools/patches/patch-ag:1.6 pkgsrc/sysutils/smartmontools/patches/patch-ag:1.7
--- pkgsrc/sysutils/smartmontools/patches/patch-ag:1.6  Sun May  8 11:23:15 2016
+++ pkgsrc/sysutils/smartmontools/patches/patch-ag      Tue May 10 07:01:28 2022
@@ -1,11 +1,11 @@
-$NetBSD: patch-ag,v 1.6 2016/05/08 11:23:15 nonaka Exp $
+$NetBSD: patch-ag,v 1.7 2022/05/10 07:01:28 triaxx Exp $
 
 Match x86 SunOS platforms correctly.
 Remove os_solaris=yes to avoid special man page section handling (PR 38199).
 
 --- configure.orig     2016-05-07 11:18:29.000000000 +0000
 +++ configure  2016-05-08 06:41:03.000000000 +0000
-@@ -6659,13 +6659,11 @@ fi
+@@ -7707,13 +7707,11 @@ fi
      test "$with_solaris_sparc_ata" = "yes" \
        && os_deps="$os_deps os_solaris_ata.o"
      os_mailer='mailx'