From nobody Fri May 23 22:17:21 2025 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b3zzk5xD7z5wfZg; Fri, 23 May 2025 22:17:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b3zzk0lkCz3SfM; Fri, 23 May 2025 22:17:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748038642; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hIhDjdzfWCHQZjmac2isi+2g0h3KJFpr5+scd8LfPLA=; b=xOEmA2WsE5o7XnjPoZS6u7kPQDAzKXkVFdLSOx16U7RO/YnYcdkFX9lA/1AW000garyw5o 9nH0Hfg3jV0Tk9m4e7pSmCpJCH3g40WW46CRfC1RlT6Z5pIrDqb8dYp0KGLAFxaIyCfek6 ZN0EVi4JFo42+M4Cc4a2oKPSPQBtTQk3Qn3PtLaK6ms8UKvJE9fGyNVuZ3ULy7OS9xuRtA O98QgKIIE7wG15tTz94ogTFESMP47xY/NIj8IP3mzxopnBJTqonSrQ46zyVIBXqQ5SVFkw eF8Y+7hR/tQaDNEF6hrkoYq5UI5mMO8T8xbSoG/Og9Iqrb1z2Z0/Kug5Ca0JGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748038642; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hIhDjdzfWCHQZjmac2isi+2g0h3KJFpr5+scd8LfPLA=; b=LonmArWs9kPfcpK21eTZgzRjRlTYNG0Xpx3JPHq7tKYHx93UeobCCaFqMlWtJGPZnU7+ga i28pd1jmoQz6MleALWBKoMj3AV15rG0aZkcsCJRjppwhe3IOZVhSUrXi+JwBQHKmcqGoyw 5lK46u/dSheSEq+QrB17gCihWswMEc0a9mW6J18F4R9h3VN9V4nVXJOpzlBayLaqVIZ4ef V9kmWaC/KLu31DZ+gDdNjibRC0JHZ3AXINFOhHg2y/zzajAynNyNYSGXt88XF+cH6coBAv 6SR898XGI4AqFAKMzqK3N+Wx38KJ7orMTp5NJJuMQI5ufpq8Ftlrrix54vMqfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748038642; a=rsa-sha256; cv=none; b=Aw8lK4I2EmGgooC4fJ3TNAjDeKsUSOt1BpJTOS2Zwc6+QBWSRh7wAp4hbUC6ROoSZxVJyg tgJ8TbGrBvDWP0H3L2bj515Iqx0KyKxgA8D/VPVDA4FaFJUYnteKosSEnvqyd/+ShAlS8G DDDKTtIGRauYjq5uDBmazm60SY2Yowg7rk3iA0zWdBs9S5Wgb+WuJzC5fZNz9AbLMK4VhJ CpSQdfgPVjOk/IGLZqN3slObLUd+fvRM576NtTfLgDQzo67r8iij5s9ywfWPV6mZVcl1bP /tWh7zEP/kREb5ZdOIScovOK6kEBnY0ngy9RWuXB6t3bCRYypgxDBsUw95HqqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b3zzj6txjz1NHS; Fri, 23 May 2025 22:17:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54NMHLEC077822; Fri, 23 May 2025 22:17:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54NMHLTd077819; Fri, 23 May 2025 22:17:21 GMT (envelope-from git) Date: Fri, 23 May 2025 22:17:21 GMT Message-Id: <202505232217.54NMHLTd077819@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Don Lewis Subject: git: d5b2d60fc769 - main - textproc/py-pylibxml2: rm patch that scans garbage List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: truckman X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d5b2d60fc76964a3e5b8f50d2992bd751f688f04 Auto-Submitted: auto-generated The branch main has been updated by truckman: URL: https://cgit.FreeBSD.org/ports/commit/?id=d5b2d60fc76964a3e5b8f50d2992bd751f688f04 commit d5b2d60fc76964a3e5b8f50d2992bd751f688f04 Author: Don Lewis AuthorDate: 2025-05-23 21:48:34 +0000 Commit: Don Lewis CommitDate: 2025-05-23 22:17:11 +0000 textproc/py-pylibxml2: rm patch that scans garbage Remove a local patch that scans stack garbage for a pattern and then uses the pointer after the array has been filled with actual data. This can cause random segfaults. The patch is under textproc/libxml2, but the patched file is only used by textproc/py-pylibxml2. The UTF-8 issue this was intended to fix was fixed upstream in a more comprehensive way in 2.11.0 with this commit: https://gitlab.gnome.org/GNOME/libxml2/-/commit/76c6da420923f2721a2e16adfcef8707a2454a1b PR: 286439 279034 Approved by: desktop (makc) Tested by: vvd MFH: 2025Q2 --- textproc/libxml2/files/patch-python_libxml.c | 35 ---------------------------- textproc/py-libxml2/Makefile | 2 +- 2 files changed, 1 insertion(+), 36 deletions(-) diff --git a/textproc/libxml2/files/patch-python_libxml.c b/textproc/libxml2/files/patch-python_libxml.c deleted file mode 100644 index 7bbc98d75033..000000000000 --- a/textproc/libxml2/files/patch-python_libxml.c +++ /dev/null @@ -1,35 +0,0 @@ ---- python/libxml.c.orig 2023-08-11 20:30:35 UTC -+++ python/libxml.c -@@ -1606,12 +1606,19 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNUSED void *ctx, - PyObject *message; - PyObject *result; - char str[1000]; -+ unsigned char *ptr = (unsigned char *)str; - - #ifdef DEBUG_ERROR - printf("libxml_xmlErrorFuncHandler(%p, %s, ...) called\n", ctx, msg); - #endif - -+#if PY_MAJOR_VERSION >= 3 -+ /* Ensure the error string doesn't start at UTF8 continuation. */ -+ while (*ptr && (*ptr & 0xc0) == 0x80) -+ ptr++; -+#endif - -+ - if (libxml_xmlPythonErrorFuncHandler == NULL) { - va_start(ap, msg); - vfprintf(stderr, msg, ap); -@@ -1625,9 +1632,11 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNUSED void *ctx, - list = PyTuple_New(2); - PyTuple_SetItem(list, 0, libxml_xmlPythonErrorFuncCtxt); - Py_XINCREF(libxml_xmlPythonErrorFuncCtxt); -- message = libxml_charPtrConstWrap(str); -+ message = libxml_charPtrConstWrap(ptr); - PyTuple_SetItem(list, 1, message); - result = PyObject_CallObject(libxml_xmlPythonErrorFuncHandler, list); -+ /* Forget any errors caused in the error handler. */ -+ PyErr_Clear(); - Py_XDECREF(list); - Py_XDECREF(result); - } diff --git a/textproc/py-libxml2/Makefile b/textproc/py-libxml2/Makefile index 84796bac21b3..7633fdebb4a1 100644 --- a/textproc/py-libxml2/Makefile +++ b/textproc/py-libxml2/Makefile @@ -1,4 +1,4 @@ -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc gnome python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}