From nobody Sat Sep 28 08:43:54 2024 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 4XG18W23wjz5Y0tv; Sat, 28 Sep 2024 08:43:55 +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 4XG18W1JHqz4lny; Sat, 28 Sep 2024 08:43:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727513035; 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=QFFiVvsony3abv28vW9cv13izPK4MNMT/NJD4G9sjy4=; b=F/LR3jpXbqPWdCDCvZLNMe7IsQBaXp1Xf/kNqJyQ6baEd/Ua2LnZBlcAJc3uXrr+2pb5yw oPFxg7AhO8oceDo9unTW7y+jLcMFkjF59NZKSTqvQcbjJZgvoW3zJPzfIN+fYIRdqERIov sXxVgp9sh+SXG1xba+5i1sYvuu4LJ+iPAmfgyxLmFvuS6BNELeBhqhFzG//O3DWxod5sZX WqUh4TKttU1/Oz4Yh4sYAOOAYLbz+Tl0ciKsvYoV8gR1i1xwa90qJ+QR9N3LKnzZEW7lYT WWmWxt06TqCzb5BRIptbexZhQurkooXowyLVIGvjjSFAjQ2jWZLzGSYVd18GWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727513035; 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=QFFiVvsony3abv28vW9cv13izPK4MNMT/NJD4G9sjy4=; b=bu5WVX8LmRcla2PiFDrUc8vWMFiWzD1znPUrdyw2PYtb6/jl7JtX9Hzztpv47M4+vwbHgI p1A9pz/37ESVmuxbK84RdZdRmK223erlyYD90AmP7bVRVfldnsTECM8HB57jFN54uaMs/8 BgDq5BsOEUp9q54nHeHgbUTQVAvV7RjmJCA+gnqZa3sc5gOi5ogsCbBeihDcaCjNl5cNKt N4vyksJ97JUXmxDj7yAfYCY5ftn46Go6NqpD3BzS04UkukxQL8qQyeqNMOdXV4RJIOa89u UbakThriq/yNmRrav4Or7Y3LGXKu6TUBT0Vn0q1pTeoAFoWqDMAK1MnCUvYDTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727513035; a=rsa-sha256; cv=none; b=Hly9ykeYptU2gmGUYa6Vvpb9wfSkBqau+s62MiCURlFZ4N+/n1myTUxUBLZED+kzjoNQtv ID8/hAecQxzigdY224pOso7IQzWG4jctcyrFaipLMqyWiCMNOXL5vMWkRCjYZ7pkSFNcQA +msrO1xqLvRDUXteNy+huVDGARqijdS78XuM0YtaU7WXwjsKax+/ZSfIeItt6Mn4LP9Je7 LzXaSJ8S4FJvt3QEBs1l1HxDBRZ1r97ahJaqeufQxykXDHgWM4cDPJFVL12nNEOp4f6DBa ck/VusnuxSQDQhDCmegijvEqrwKmBoQG6mSseGP1N2JEhyV5RJtXPGkm7bXMIQ== 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 4XG18W0MgxzHqy; Sat, 28 Sep 2024 08:43:55 +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 48S8hsIu008161; Sat, 28 Sep 2024 08:43:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48S8hsL9008158; Sat, 28 Sep 2024 08:43:54 GMT (envelope-from git) Date: Sat, 28 Sep 2024 08:43:54 GMT Message-Id: <202409280843.48S8hsL9008158@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Michael Osipov Subject: git: fdad3e1b5329 - main - devel/py-subversion{,-lts}: swig-py: Fix `none_dealloc` error (one-off patch) 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: michaelo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fdad3e1b5329ce582c89c6bb71d0d83272622bc1 Auto-Submitted: auto-generated The branch main has been updated by michaelo: URL: https://cgit.FreeBSD.org/ports/commit/?id=fdad3e1b5329ce582c89c6bb71d0d83272622bc1 commit fdad3e1b5329ce582c89c6bb71d0d83272622bc1 Author: Michael Osipov AuthorDate: 2024-09-27 08:17:33 +0000 Commit: Michael Osipov CommitDate: 2024-09-28 08:43:28 +0000 devel/py-subversion{,-lts}: swig-py: Fix `none_dealloc` error (one-off patch) PR: 281709 Approved by: jrm (mentor), otis (mentor) Differential Revision: https://reviews.freebsd.org/D46807 --- devel/py-subversion/Makefile | 4 +- .../patch-eae531008b3454d2709b8aaf766b08e37160668a | 44 ++++++++++++++++++++++ 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/devel/py-subversion/Makefile b/devel/py-subversion/Makefile index 40fabe32d855..85b5d681eb35 100644 --- a/devel/py-subversion/Makefile +++ b/devel/py-subversion/Makefile @@ -12,8 +12,8 @@ USE_PYTHON= flavors py3kplist # There is bug in python bindings Makefile MAKE_JOBS_UNSAFE=yes -PORTREVISION_LATEST= 4 -PORTREVISION_LTS= 2 +PORTREVISION_LATEST= 5 +PORTREVISION_LTS= 3 SVN_BUILD_BINDINGS= yes diff --git a/devel/py-subversion/files/patch-eae531008b3454d2709b8aaf766b08e37160668a b/devel/py-subversion/files/patch-eae531008b3454d2709b8aaf766b08e37160668a new file mode 100644 index 000000000000..e14e6545cb3b --- /dev/null +++ b/devel/py-subversion/files/patch-eae531008b3454d2709b8aaf766b08e37160668a @@ -0,0 +1,44 @@ +--- subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c.orig 2023-10-20 04:00:04 UTC ++++ subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c +@@ -2321,8 +2321,6 @@ static svn_error_t *apply_textdelta(void *file_baton, + in Python. */ + if (result == Py_None) + { +- Py_DECREF(result); +- + *handler = svn_delta_noop_window_handler; + *h_baton = NULL; + } +@@ -2839,8 +2837,7 @@ parse_fn3_apply_textdelta(svn_txdelta_window_handler_t + { + PyObject *editor = NULL, *baton_item = NULL, *py_pool = NULL; + PyObject *ib = node_baton; +- apr_pool_t *pool; +- PyObject *result; ++ PyObject *result = NULL; + svn_error_t *err; + + svn_swig_py_acquire_py_lock(); +@@ -2863,13 +2860,12 @@ parse_fn3_apply_textdelta(svn_txdelta_window_handler_t + in Python. */ + if (result == Py_None) + { +- Py_DECREF(result); +- + *handler = svn_delta_noop_window_handler; + *handler_baton = NULL; + } + else + { ++ apr_pool_t *pool; + /* return the thunk for invoking the handler. the baton creates + new reference of our 'result' reference, which is the handler, + so we release it even if no error. */ +@@ -2890,6 +2886,7 @@ parse_fn3_apply_textdelta(svn_txdelta_window_handler_t + err = SVN_NO_ERROR; + + finished: ++ Py_XDECREF(result); + svn_swig_py_release_py_lock(); + return err; + }