CVS commit: pkgsrc/devel/meld

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Apr 11 11:39:51 UTC 2026

Modified Files:
        pkgsrc/devel/meld: Makefile distinfo
Added Files:
        pkgsrc/devel/meld/patches: patch-meld_vc___vc.py

Log Message:
meld: fix some leaks

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.153 -r1.154 pkgsrc/devel/meld/Makefile
cvs rdiff -u -r1.72 -r1.73 pkgsrc/devel/meld/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/meld/patches/patch-meld_vc___vc.py

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

Modified files:

Index: pkgsrc/devel/meld/Makefile
diff -u pkgsrc/devel/meld/Makefile:1.153 pkgsrc/devel/meld/Makefile:1.154
--- pkgsrc/devel/meld/Makefile:1.153    Tue Jan 27 08:39:15 2026
+++ pkgsrc/devel/meld/Makefile  Sat Apr 11 11:39:51 2026
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.153 2026/01/27 08:39:15 wiz Exp $
+# $NetBSD: Makefile,v 1.154 2026/04/11 11:39:51 wiz Exp $
 
 DISTNAME=              meld-3.22.2
-PKGREVISION=           16
+PKGREVISION=           17
 CATEGORIES=            devel
 MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/meld/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=          .tar.xz

Index: pkgsrc/devel/meld/distinfo
diff -u pkgsrc/devel/meld/distinfo:1.72 pkgsrc/devel/meld/distinfo:1.73
--- pkgsrc/devel/meld/distinfo:1.72     Tue Dec 10 08:22:10 2024
+++ pkgsrc/devel/meld/distinfo  Sat Apr 11 11:39:51 2026
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.72 2024/12/10 08:22:10 wiz Exp $
+$NetBSD: distinfo,v 1.73 2026/04/11 11:39:51 wiz Exp $
 
 BLAKE2s (meld-3.22.2.tar.xz) = 1a8286945b1b97b23fc856bf170982dc48ec767261e5e307408e8693d62bdb4c
 SHA512 (meld-3.22.2.tar.xz) = fd8b12567cd8dcf77f265d831c9ac9ba33d13fb78c95b01b496b016308ff4159963b4610a68f41d04a52cc5bcc13bb4568d24bbade5bd79246111e463e413284
 Size (meld-3.22.2.tar.xz) = 676376 bytes
 SHA1 (patch-meld_melddoc.py) = 9a9e1bc3943b9699013f9b51ed630109d0ea95e6
+SHA1 (patch-meld_vc___vc.py) = 1861c9dec96c6756f4dd0dfa1b2f3bb57bdf0455

Added files:

Index: pkgsrc/devel/meld/patches/patch-meld_vc___vc.py
diff -u /dev/null pkgsrc/devel/meld/patches/patch-meld_vc___vc.py:1.1
--- /dev/null   Sat Apr 11 11:39:51 2026
+++ pkgsrc/devel/meld/patches/patch-meld_vc___vc.py     Sat Apr 11 11:39:51 2026
@@ -0,0 +1,34 @@
+$NetBSD: patch-meld_vc___vc.py,v 1.1 2026/04/11 11:39:51 wiz Exp $
+
+Fix some file descriptor/process leaks.
+https://gitlab.gnome.org/GNOME/meld/-/issues/960
+
+--- meld/vc/_vc.py.orig        2026-04-11 10:51:10.506439807 +0000
++++ meld/vc/_vc.py
+@@ -433,7 +433,7 @@ def call_temp_output(cmd, cwd, file_id='', suffix=None
+     of the temporary file's name.
+     """
+     process = subprocess.Popen(
+-        cmd, cwd=cwd, stdout=subprocess.PIPE, stderr=subprocess.PIPE,
++        cmd, cwd=cwd, stdout=subprocess.PIPE, stderr=subprocess.DEVNULL,
+         startupinfo=get_hide_window_startupinfo(),
+     )
+     vc_file = process.stdout
+@@ -445,14 +445,15 @@ def call_temp_output(cmd, cwd, file_id='', suffix=None
+     with tempfile.NamedTemporaryFile(prefix=prefix,
+                                      suffix=suffix, delete=False) as f:
+         shutil.copyfileobj(vc_file, f)
++    vc_file.close()
++    process.wait()
+     return f.name
+ 
+ 
+ # Return the return value of a given command
+ def call(cmd, cwd=None):
+-    devnull = open(os.devnull, "wb")
+     return subprocess.call(
+-        cmd, cwd=cwd, stdout=devnull, stderr=devnull,
++        cmd, cwd=cwd, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL,
+         startupinfo=get_hide_window_startupinfo(),
+     )
+