Date: Thu, 10 Oct 2024 07:01:34 GMT
From: Michael Osipov <michaelo@FreeBSD.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Subject: git: 1c33e87ee686 - 2024Q4 - */*: update devel/subversion{,-lts} to 1.14.4
Message-ID: <202410100701.49A71YUt039616@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2024Q4 has been updated by michaelo: URL: https://cgit.FreeBSD.org/ports/commit/?id=1c33e87ee6864d75a70cf5283a14d2e52566cdc7 commit 1c33e87ee6864d75a70cf5283a14d2e52566cdc7 Author: Michael Osipov <michaelo@apache.org> AuthorDate: 2024-10-09 07:09:36 +0000 Commit: Michael Osipov <michaelo@FreeBSD.org> CommitDate: 2024-10-10 07:01:08 +0000 */*: update devel/subversion{,-lts} to 1.14.4 Approved by: jrm (mentor) MFH: 2024Q4 Differential Revision: https://reviews.freebsd.org/D47022 Release Notes: https://svn.apache.org/repos/asf/subversion/tags/1.14.4/CHANGES (cherry picked from commit 33666598aa968a8be215e76023987e9af48404c4) --- devel/p5-subversion/Makefile | 4 +- devel/py-subversion/Makefile | 4 +- .../patch-eae531008b3454d2709b8aaf766b08e37160668a | 44 ---------------------- devel/ruby-subversion/Makefile | 4 +- devel/subversion-lts/Makefile | 2 +- devel/subversion-lts/Makefile.common | 2 +- devel/subversion-lts/distinfo | 6 +-- devel/subversion/Makefile | 2 +- devel/subversion/Makefile.common | 2 +- devel/subversion/distinfo | 6 +-- java/java-subversion/Makefile | 4 +- security/subversion-gnome-keyring/Makefile | 4 +- www/mod_dav_svn/Makefile | 4 +- 13 files changed, 22 insertions(+), 66 deletions(-) diff --git a/devel/p5-subversion/Makefile b/devel/p5-subversion/Makefile index dcb20dae3bc6..c3e959780220 100644 --- a/devel/p5-subversion/Makefile +++ b/devel/p5-subversion/Makefile @@ -7,8 +7,8 @@ WWW= https://subversion.apache.org/ USES= perl5 USE_PERL5= build run -PORTREVISION_LATEST= 2 -PORTREVISION_LTS= 2 +PORTREVISION_LATEST= 0 +PORTREVISION_LTS= 0 SVN_BUILD_BINDINGS= yes diff --git a/devel/py-subversion/Makefile b/devel/py-subversion/Makefile index 85b5d681eb35..3841e4229632 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= 5 -PORTREVISION_LTS= 3 +PORTREVISION_LATEST= 0 +PORTREVISION_LTS= 0 SVN_BUILD_BINDINGS= yes diff --git a/devel/py-subversion/files/patch-eae531008b3454d2709b8aaf766b08e37160668a b/devel/py-subversion/files/patch-eae531008b3454d2709b8aaf766b08e37160668a deleted file mode 100644 index e14e6545cb3b..000000000000 --- a/devel/py-subversion/files/patch-eae531008b3454d2709b8aaf766b08e37160668a +++ /dev/null @@ -1,44 +0,0 @@ ---- 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; - } diff --git a/devel/ruby-subversion/Makefile b/devel/ruby-subversion/Makefile index 151aebcf81cb..e090a0beabe5 100644 --- a/devel/ruby-subversion/Makefile +++ b/devel/ruby-subversion/Makefile @@ -6,8 +6,8 @@ WWW= https://subversion.apache.org/ USES+= compiler:c11 ruby -PORTREVISION_LATEST= 2 -PORTREVISION_LTS= 2 +PORTREVISION_LATEST= 0 +PORTREVISION_LTS= 0 SVN_BUILD_BINDINGS= yes diff --git a/devel/subversion-lts/Makefile b/devel/subversion-lts/Makefile index c791f8b81d22..c543ec20a64f 100644 --- a/devel/subversion-lts/Makefile +++ b/devel/subversion-lts/Makefile @@ -1,4 +1,4 @@ -PORTREVISION= 4 +PORTREVISION= 0 PKGNAMESUFFIX= -lts MAINTAINER= michaelo@apache.org diff --git a/devel/subversion-lts/Makefile.common b/devel/subversion-lts/Makefile.common index d2da5e555494..628d530eccdb 100644 --- a/devel/subversion-lts/Makefile.common +++ b/devel/subversion-lts/Makefile.common @@ -1,5 +1,5 @@ PORTNAME?= subversion -PORTVERSION= 1.14.3 +PORTVERSION= 1.14.4 PORTREVISION?= 0 CATEGORIES+= devel MASTER_SITES= APACHE/subversion diff --git a/devel/subversion-lts/distinfo b/devel/subversion-lts/distinfo index 93a2daa895bd..99c7e2af0e95 100644 --- a/devel/subversion-lts/distinfo +++ b/devel/subversion-lts/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1704180448 -SHA256 (subversion-1.14.3.tar.bz2) = 949efd451a09435f7e8573574c71c7b71b194d844890fa49cd61d2262ea1a440 -SIZE (subversion-1.14.3.tar.bz2) = 8569985 +TIMESTAMP = 1728460061 +SHA256 (subversion-1.14.4.tar.bz2) = 44ead116e72e480f10f123c914bb6f9f8c041711c041ed7abff1b8634a199e3c +SIZE (subversion-1.14.4.tar.bz2) = 8509652 diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile index fdb813d37a7c..275fd91caa05 100644 --- a/devel/subversion/Makefile +++ b/devel/subversion/Makefile @@ -1,4 +1,4 @@ -PORTREVISION= 8 +PORTREVISION= 0 MAINTAINER= michaelo@apache.org COMMENT= Version control system diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common index d0bbee7ad73b..45df852964ed 100644 --- a/devel/subversion/Makefile.common +++ b/devel/subversion/Makefile.common @@ -1,5 +1,5 @@ PORTNAME?= subversion -PORTVERSION= 1.14.3 +PORTVERSION= 1.14.4 PORTREVISION?= 0 CATEGORIES+= devel MASTER_SITES= APACHE/subversion diff --git a/devel/subversion/distinfo b/devel/subversion/distinfo index 93a2daa895bd..cb1597ba9acb 100644 --- a/devel/subversion/distinfo +++ b/devel/subversion/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1704180448 -SHA256 (subversion-1.14.3.tar.bz2) = 949efd451a09435f7e8573574c71c7b71b194d844890fa49cd61d2262ea1a440 -SIZE (subversion-1.14.3.tar.bz2) = 8569985 +TIMESTAMP = 1728458403 +SHA256 (subversion-1.14.4.tar.bz2) = 44ead116e72e480f10f123c914bb6f9f8c041711c041ed7abff1b8634a199e3c +SIZE (subversion-1.14.4.tar.bz2) = 8509652 diff --git a/java/java-subversion/Makefile b/java/java-subversion/Makefile index 2c1c132f4093..718139ffc631 100644 --- a/java/java-subversion/Makefile +++ b/java/java-subversion/Makefile @@ -12,8 +12,8 @@ JAVA_OS= native JAVA_BUILD= yes JAVA_RUN= yes -PORTREVISION_LATEST= 2 -PORTREVISION_LTS= 2 +PORTREVISION_LATEST= 0 +PORTREVISION_LTS= 0 SVN_BUILD_BINDINGS= yes diff --git a/security/subversion-gnome-keyring/Makefile b/security/subversion-gnome-keyring/Makefile index 8314a9a4f506..1e39600fad01 100644 --- a/security/subversion-gnome-keyring/Makefile +++ b/security/subversion-gnome-keyring/Makefile @@ -5,8 +5,8 @@ MAINTAINER= michaelo@apache.org COMMENT= Gnome Keyring integration for Version control system WWW= https://subversion.apache.org/ -PORTREVISION_LATEST= 2 -PORTREVISION_LTS= 2 +PORTREVISION_LATEST= 0 +PORTREVISION_LTS= 0 .include "${.CURDIR}/../../devel/subversion/Makefile.addons" diff --git a/www/mod_dav_svn/Makefile b/www/mod_dav_svn/Makefile index aa19c9fb223a..d4756003bb0a 100644 --- a/www/mod_dav_svn/Makefile +++ b/www/mod_dav_svn/Makefile @@ -9,8 +9,8 @@ WWW= https://subversion.apache.org/ USES= apache -PORTREVISION_LATEST= 2 -PORTREVISION_LTS= 2 +PORTREVISION_LATEST= 0 +PORTREVISION_LTS= 0 .include "${.CURDIR}/../../devel/subversion/Makefile.addons"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202410100701.49A71YUt039616>