CVS commit: pkgsrc/sysutils/open-vm-tools

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Mar  2 13:52:43 UTC 2024

Modified Files:
        pkgsrc/sysutils/open-vm-tools: Makefile distinfo
Added Files:
        pkgsrc/sysutils/open-vm-tools/patches: patch-lib_nicInfo_nicInfoPosix.c

Log Message:
open-vm-tools: add patch from PR 57983 by Jarle Fredrik Greipsland

Fixes a resource leak.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.123 -r1.124 pkgsrc/sysutils/open-vm-tools/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/sysutils/open-vm-tools/distinfo
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/sysutils/open-vm-tools/patches/patch-lib_nicInfo_nicInfoPosix.c

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

Modified files:

Index: pkgsrc/sysutils/open-vm-tools/Makefile
diff -u pkgsrc/sysutils/open-vm-tools/Makefile:1.123 pkgsrc/sysutils/open-vm-tools/Makefile:1.124
--- pkgsrc/sysutils/open-vm-tools/Makefile:1.123        Tue Nov 14 14:02:54 2023
+++ pkgsrc/sysutils/open-vm-tools/Makefile      Sat Mar  2 13:52:42 2024
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.123 2023/11/14 14:02:54 wiz Exp $
+# $NetBSD: Makefile,v 1.124 2024/03/02 13:52:42 wiz Exp $
 
 OVTVER=                12.1.5
 DISTNAME=      open-vm-tools-${OVTVER}-20735119
 PKGNAME=       open-vm-tools-${OVTVER}
-PKGREVISION=   6
+PKGREVISION=   7
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=vmware/}
 GITHUB_RELEASE=        stable-${OVTVER}

Index: pkgsrc/sysutils/open-vm-tools/distinfo
diff -u pkgsrc/sysutils/open-vm-tools/distinfo:1.39 pkgsrc/sysutils/open-vm-tools/distinfo:1.40
--- pkgsrc/sysutils/open-vm-tools/distinfo:1.39 Fri Feb 17 22:07:18 2023
+++ pkgsrc/sysutils/open-vm-tools/distinfo      Sat Mar  2 13:52:42 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.39 2023/02/17 22:07:18 khorben Exp $
+$NetBSD: distinfo,v 1.40 2024/03/02 13:52:42 wiz Exp $
 
 BLAKE2s (open-vm-tools-12.1.5-20735119.tar.gz) = 409c366cc3dfb610fd00bf2b5d1037919ed37203862c8a810c64144b2dc660af
 SHA512 (open-vm-tools-12.1.5-20735119.tar.gz) = d85fec73a58cb1c9b2956aff886825b9d47d00dc6d0d8a3d2ecdfac3fa982c27463b9cc2f42bf3dd18fe542b30f751850e8051e270c547e897f06a4e1c12d639
@@ -39,6 +39,7 @@ SHA1 (patch-lib_lock_ulSema.c) = 6908d4b
 SHA1 (patch-lib_misc_hostinfoPosix.c) = 4daea6167cee2be57cc3acc0caa710ca940d1eb7
 SHA1 (patch-lib_misc_vthreadBase.c) = 8d2a2749d7ed343d2648f74546d69baab949e5cf
 SHA1 (patch-lib_nicInfo_nicInfoInt.h) = 81d5e8625496218a679c0a87f30a08cc2e3af7a7
+SHA1 (patch-lib_nicInfo_nicInfoPosix.c) = 2fe2da8d6fbf8f8c44c110b2ed37d2decd91b6a7
 SHA1 (patch-lib_rpcChannel_rpcChannel.c) = 4133707d70844eb12c25c48d6bb0b26a370987b3
 SHA1 (patch-lib_user_utilBacktrace.c) = 741cc72d64f962fa0aa48e90b1f912f422c5dd8b
 SHA1 (patch-libguestlib_Makefile.am) = fff8e8df30c91ffb4fd2c14017633be1b3cb47ec

Added files:

Index: pkgsrc/sysutils/open-vm-tools/patches/patch-lib_nicInfo_nicInfoPosix.c
diff -u /dev/null pkgsrc/sysutils/open-vm-tools/patches/patch-lib_nicInfo_nicInfoPosix.c:1.3
--- /dev/null   Sat Mar  2 13:52:43 2024
+++ pkgsrc/sysutils/open-vm-tools/patches/patch-lib_nicInfo_nicInfoPosix.c      Sat Mar  2 13:52:42 2024
@@ -0,0 +1,30 @@
+$NetBSD: patch-lib_nicInfo_nicInfoPosix.c,v 1.3 2024/03/02 13:52:42 wiz Exp $
+
+On NetBSD, res_ndestroy() corresponds to res_ninit().
+PR 57983
+
+--- lib/nicInfo/nicInfoPosix.c.orig    2022-11-03 13:51:05.000000000 +0000
++++ lib/nicInfo/nicInfoPosix.c
+@@ -898,14 +898,22 @@ RecordResolverInfo(NicInfoV3 *nicInfo)  
+     */
+    nicInfo->dnsConfigInfo = dnsConfigInfo;
+ 
++#if defined(__NetBSD__)
++   res_ndestroy(&res);
++#else
+    res_nclose(&res);
++#endif
+ 
+    return TRUE;
+ 
+ fail:
+    VMX_XDR_FREE(xdr_DnsConfigInfo, dnsConfigInfo);
+    free(dnsConfigInfo);
++#if defined(__NetBSD__)
++   res_ndestroy(&res);
++#else
+    res_nclose(&res);
++#endif
+ 
+    return FALSE;
+ }