Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 0948385A0E for ; Mon, 30 Oct 2023 23:02:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id LriEVVWXHtJ2 for ; Mon, 30 Oct 2023 23:02:03 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 2142785A17 for ; Mon, 30 Oct 2023 23:02:03 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 1A8E6FADC; Mon, 30 Oct 2023 23:02:03 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1698706923189690" MIME-Version: 1.0 Date: Mon, 30 Oct 2023 23:02:03 +0000 From: "David H. Gutteridge" Subject: CVS commit: pkgsrc/x11/vte3 To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: gutteridge@netbsd.org X-Mailer: log_accum Message-Id: <20231030230203.1A8E6FADC@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1698706923189690 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: gutteridge Date: Mon Oct 30 23:02:03 UTC 2023 Modified Files: pkgsrc/x11/vte3: Makefile PLIST distinfo pkgsrc/x11/vte3/patches: patch-src_pty.cc Log Message: vte3: update to 0.72.3 No concise change log is available, but this release includes a fix for NetBSD that was accepted upstream. To generate a diff of this commit: cvs rdiff -u -r1.70 -r1.71 pkgsrc/x11/vte3/Makefile cvs rdiff -u -r1.9 -r1.10 pkgsrc/x11/vte3/PLIST cvs rdiff -u -r1.26 -r1.27 pkgsrc/x11/vte3/distinfo cvs rdiff -u -r1.11 -r1.12 pkgsrc/x11/vte3/patches/patch-src_pty.cc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1698706923189690 Content-Disposition: inline Content-Length: 5092 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/x11/vte3/Makefile diff -u pkgsrc/x11/vte3/Makefile:1.70 pkgsrc/x11/vte3/Makefile:1.71 --- pkgsrc/x11/vte3/Makefile:1.70 Tue Oct 24 22:11:50 2023 +++ pkgsrc/x11/vte3/Makefile Mon Oct 30 23:02:02 2023 @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.70 2023/10/24 22:11:50 wiz Exp $ +# $NetBSD: Makefile,v 1.71 2023/10/30 23:02:02 gutteridge Exp $ -DISTNAME= vte-0.72.2 +DISTNAME= vte-0.72.3 PKGNAME= ${DISTNAME:S/vte/vte3/} -PKGREVISION= 3 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_GITHUB:=GNOME/} GITHUB_PROJECT= vte Index: pkgsrc/x11/vte3/PLIST diff -u pkgsrc/x11/vte3/PLIST:1.9 pkgsrc/x11/vte3/PLIST:1.10 --- pkgsrc/x11/vte3/PLIST:1.9 Sun Jun 11 02:19:46 2023 +++ pkgsrc/x11/vte3/PLIST Mon Oct 30 23:02:02 2023 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2023/06/11 02:19:46 gutteridge Exp $ +@comment $NetBSD: PLIST,v 1.10 2023/10/30 23:02:02 gutteridge Exp $ bin/vte-2.91 include/vte-2.91/vte/vte.h include/vte-2.91/vte/vtedeprecated.h @@ -14,7 +14,7 @@ include/vte-2.91/vte/vteversion.h lib/girepository-1.0/Vte-2.91.typelib lib/libvte-2.91.so lib/libvte-2.91.so.0 -lib/libvte-2.91.so.0.7200.2 +lib/libvte-2.91.so.0.7200.3 lib/pkgconfig/vte-2.91.pc libexec/vte-urlencode-cwd share/examples/profile.d/vte.csh Index: pkgsrc/x11/vte3/distinfo diff -u pkgsrc/x11/vte3/distinfo:1.26 pkgsrc/x11/vte3/distinfo:1.27 --- pkgsrc/x11/vte3/distinfo:1.26 Sat Jun 24 00:47:48 2023 +++ pkgsrc/x11/vte3/distinfo Mon Oct 30 23:02:02 2023 @@ -1,12 +1,12 @@ -$NetBSD: distinfo,v 1.26 2023/06/24 00:47:48 gutteridge Exp $ +$NetBSD: distinfo,v 1.27 2023/10/30 23:02:02 gutteridge Exp $ -BLAKE2s (vte-0.72.2.tar.gz) = beaa70c20e8fdc33d6321f06b4284d88d29941cecebe88473d8b25e387712436 -SHA512 (vte-0.72.2.tar.gz) = eb828833f417fb81892c50c79c4aac1c76afc6f184bdeb6d80e62ba0cfa5d7c47c1c92a6a4c2c0165ec6a812a6d026810d43522a2eaa175c14fd2c452d7e84e0 -Size (vte-0.72.2.tar.gz) = 630814 bytes +BLAKE2s (vte-0.72.3.tar.gz) = 7714f62e8cb1e50addc3c9c3e90d7d4c0d34aa1155aabeb54e77d9a268648d93 +SHA512 (vte-0.72.3.tar.gz) = 618ab76cb4a72e16c9f4a8d8b9dd1dd4da7cd387398d0509adfe4ef9c648234ee5944e7183a6d387fbef38a8d287e52dea0127f4191cbd5b3d699378f094ace8 +Size (vte-0.72.3.tar.gz) = 631087 bytes SHA1 (patch-meson.build) = 95cc6aea622e7f6ae991f337667b37bf0b9864bf SHA1 (patch-src_app_app.cc) = 2548e01629aa563595387328638a52a5616ff0bd SHA1 (patch-src_dumpkeys.c) = 102f24d7404d46b13194f3431d0a864d480e5da7 SHA1 (patch-src_meson.build) = a8e159688fb36e4cfac40249e279a670c9c6cda8 SHA1 (patch-src_mev.c) = b38dc42e02a8d5fa1e579349319f0b8c8b31dbce -SHA1 (patch-src_pty.cc) = fafec9f2b60b1b1e90d56e032edcb597a13608e9 +SHA1 (patch-src_pty.cc) = 51d4146ee2ca92897a79fd28e4afbca92599fdf3 SHA1 (patch-src_widget.cc) = cbc8b715b21248996bfb7c6abe355c5f4e510539 Index: pkgsrc/x11/vte3/patches/patch-src_pty.cc diff -u pkgsrc/x11/vte3/patches/patch-src_pty.cc:1.11 pkgsrc/x11/vte3/patches/patch-src_pty.cc:1.12 --- pkgsrc/x11/vte3/patches/patch-src_pty.cc:1.11 Thu Jun 1 21:51:27 2023 +++ pkgsrc/x11/vte3/patches/patch-src_pty.cc Mon Oct 30 23:02:02 2023 @@ -1,12 +1,10 @@ -$NetBSD: patch-src_pty.cc,v 1.11 2023/06/01 21:51:27 gutteridge Exp $ +$NetBSD: patch-src_pty.cc,v 1.12 2023/10/30 23:02:02 gutteridge Exp $ Use correct includes on SunOS. -Functional fix of posix_openpt() on NetBSD. -https://gitlab.gnome.org/GNOME/vte/-/issues/2575 --- src/pty.cc.orig 2023-04-13 09:57:27.000000000 +0000 +++ src/pty.cc -@@ -57,9 +57,15 @@ +@@ -57,7 +57,9 @@ #ifdef HAVE_PTY_H #include #endif @@ -16,38 +14,4 @@ https://gitlab.gnome.org/GNOME/vte/-/iss +#include #include #endif -+#ifdef __NetBSD__ -+#include -+#include -+#endif - #include - #include - #include "debug.h" -@@ -415,11 +421,23 @@ _vte_pty_open_posix(void) - bool need_cloexec = false, need_nonblocking = false; - #ifdef __NetBSD__ -- // NetBSD is a special case: posix_openpt() will not return EINVAL -- // for unknown/unsupported flags but instead silently ignore these flags -+ // NetBSD is a special case: prior to 9.99.101, posix_openpt() will not return -+ // EINVAL for unknown/unsupported flags but instead silently ignore these flags - // and just return a valid PTY but without the NONBLOCK | CLOEXEC flags set. -- // So we always need to manually apply these flags there. See issue #2575. -- need_cloexec = need_nonblocking = true; -+ // So we need to manually apply these flags there. See issue #2575. -+ int mib[2], osrev; -+ size_t len; -+ -+ mib[0] = CTL_KERN; -+ mib[1] = KERN_OSREV; -+ len = sizeof(osrev); -+ sysctl(mib, 2, &osrev, &len, NULL, 0); -+ if (osrev < 999010100) { -+ need_cloexec = need_nonblocking = true; -+ _vte_debug_print(VTE_DEBUG_PTY, -+ "NetBSD < 9.99.101, forcing fallback " -+ "for NONBLOCK and CLOEXEC.\n"); -+ } - #else - - if (!fd && errno == EINVAL) { --_----------=_1698706923189690--