diff options
| author | alnsn <alnsn@pkgsrc.org> | 2019-06-13 07:58:31 +0000 |
|---|---|---|
| committer | alnsn <alnsn@pkgsrc.org> | 2019-06-13 07:58:31 +0000 |
| commit | f7cc72a0cbcc9f5384923db6ca4b0812994ff7ab (patch) | |
| tree | 40c1a56f76973a644780e98771d391beeed9ae46 | |
| parent | e11aae1db9712a74d8681fc4519200d25d1b54ff (diff) | |
| download | pkgsrc-f7cc72a0cbcc9f5384923db6ca4b0812994ff7ab.tar.gz | |
Fix memory corruption on NetBSD-current.
Bump PKGREVISION.
| -rw-r--r-- | sysutils/smartmontools/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/smartmontools/distinfo | 3 | ||||
| -rw-r--r-- | sysutils/smartmontools/patches/patch-os__netbsd.cpp | 19 |
3 files changed, 23 insertions, 3 deletions
diff --git a/sysutils/smartmontools/Makefile b/sysutils/smartmontools/Makefile index 27bb39c5dfd..f9be471e6fc 100644 --- a/sysutils/smartmontools/Makefile +++ b/sysutils/smartmontools/Makefile @@ -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/} diff --git a/sysutils/smartmontools/distinfo b/sysutils/smartmontools/distinfo index 626d34d3630..c113e46ca3e 100644 --- a/sysutils/smartmontools/distinfo +++ b/sysutils/smartmontools/distinfo @@ -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) = bd08aff267f0e9e9307ebc57858e61e35144bf16 SHA1 (patch-ag) = 01b0b35d89d6d6a11b13b3c05a141c46a0c1590b SHA1 (patch-nvmecmds.cpp) = 0fec043f00b4a7fde2974e1a4670ce42343f2d52 SHA1 (patch-os__freebsd.cpp) = 96db45ca207e3a2f0d454f7b5c8b1b0d4e8a3e9c +SHA1 (patch-os__netbsd.cpp) = abbaec99e900ca6e58b63417e4ff201d8fa071c0 diff --git a/sysutils/smartmontools/patches/patch-os__netbsd.cpp b/sysutils/smartmontools/patches/patch-os__netbsd.cpp new file mode 100644 index 00000000000..c35ce0da3c3 --- /dev/null +++ b/sysutils/smartmontools/patches/patch-os__netbsd.cpp @@ -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) { |