CVS commit: pkgsrc/sysutils/smartmontools

["Alexander Nasonov" <alnsn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   alnsn
Date:           Thu Jun 13 07:58:31 UTC 2019

Modified Files:
        pkgsrc/sysutils/smartmontools: Makefile distinfo
Added Files:
        pkgsrc/sysutils/smartmontools/patches: patch-os__netbsd.cpp

Log Message:
Fix memory corruption on NetBSD-current.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 pkgsrc/sysutils/smartmontools/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/sysutils/smartmontools/distinfo
cvs rdiff -u -r0 -r1.5 \
    pkgsrc/sysutils/smartmontools/patches/patch-os__netbsd.cpp

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.36 pkgsrc/sysutils/smartmontools/Makefile:1.37
--- pkgsrc/sysutils/smartmontools/Makefile:1.36 Fri Feb 15 20:38:29 2019
+++ pkgsrc/sysutils/smartmontools/Makefile      Thu Jun 13 07:58:31 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2019/02/15 20:38:29 triaxx Exp $
+# $NetBSD: Makefile,v 1.37 2019/06/13 07:58:31 alnsn Exp $
 
 DISTNAME=              smartmontools-7.0
-PKGREVISION=           2
+PKGREVISION=           3
 CATEGORIES=            sysutils
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=smartmontools/}
 

Index: pkgsrc/sysutils/smartmontools/distinfo
diff -u pkgsrc/sysutils/smartmontools/distinfo:1.34 pkgsrc/sysutils/smartmontools/distinfo:1.35
--- pkgsrc/sysutils/smartmontools/distinfo:1.34 Fri Feb 15 20:38:29 2019
+++ pkgsrc/sysutils/smartmontools/distinfo      Thu Jun 13 07:58:31 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.34 2019/02/15 20:38:29 triaxx Exp $
+$NetBSD: distinfo,v 1.35 2019/06/13 07:58:31 alnsn Exp $
 
 SHA1 (smartmontools-7.0.tar.gz) = 00e6a7bb26b283695ab0deaf521be6723ba44f0a
 RMD160 (smartmontools-7.0.tar.gz) = db20533115aa05a52836dbef0006c664083fbe90
@@ -8,3 +8,4 @@ SHA1 (patch-aa) = bd08aff267f0e9e9307ebc
 SHA1 (patch-ag) = 01b0b35d89d6d6a11b13b3c05a141c46a0c1590b
 SHA1 (patch-nvmecmds.cpp) = 0fec043f00b4a7fde2974e1a4670ce42343f2d52
 SHA1 (patch-os__freebsd.cpp) = 96db45ca207e3a2f0d454f7b5c8b1b0d4e8a3e9c
+SHA1 (patch-os__netbsd.cpp) = abbaec99e900ca6e58b63417e4ff201d8fa071c0

Added files:

Index: pkgsrc/sysutils/smartmontools/patches/patch-os__netbsd.cpp
diff -u /dev/null pkgsrc/sysutils/smartmontools/patches/patch-os__netbsd.cpp:1.5
--- /dev/null   Thu Jun 13 07:58:31 2019
+++ pkgsrc/sysutils/smartmontools/patches/patch-os__netbsd.cpp  Thu Jun 13 07:58:31 2019
@@ -0,0 +1,19 @@
+$NetBSD: patch-os__netbsd.cpp,v 1.5 2019/06/13 07:58:31 alnsn Exp $
+
+Apply upstream commit r4919 to fix memory corruption.
+
+--- os_netbsd.cpp.orig 2018-09-16 15:03:22.000000000 +0000
++++ os_netbsd.cpp
+@@ -602,6 +602,12 @@ int netbsd_smart_interface::get_dev_name
+     sprintf(mp[n], "%s%s%c", net_dev_raw_prefix, p, 'a' + getrawpartition());
+     n++;
+   }
++  free(disknames);
++
++  if (n == 0) {
++    free(mp);
++    return 0;
++  }
+ 
+   char ** tmp = (char **)realloc(mp, n * (sizeof(char *)));
+   if (NULL == tmp) {