CVS commit: pkgsrc

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Dec 31 17:33:17 UTC 2024

Modified Files:
        pkgsrc/devel/java-subversion: Makefile
        pkgsrc/devel/p5-subversion: Makefile
        pkgsrc/devel/py-subversion: Makefile
        pkgsrc/devel/ruby-subversion: Makefile
        pkgsrc/devel/subversion: Makefile.version distinfo
        pkgsrc/devel/subversion-base: Makefile
        pkgsrc/devel/subversion/files: build-outputs.mk
        pkgsrc/www/ap2-subversion: Makefile

Log Message:
subversion: updated to 1.14.5

Apache Subversion 1.14.5. This is a stable bugfix and security release of the
Apache Subversion open source version control system. Among regular bug fixes,
this release fixes CVE-2024-46901: mod_dav_svn denial-of-service via control
characters in paths It has been discovered that the patch for CVE-2013-1968
was incomplete and unintentionally left mod_dav_svn vulnerable to control
characters in filenames. If a path or a revision-property which contains
control characters is committed to a repository then SVN operations served by
mod_dav_svn can be disrupted.


To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 pkgsrc/devel/java-subversion/Makefile
cvs rdiff -u -r1.137 -r1.138 pkgsrc/devel/p5-subversion/Makefile
cvs rdiff -u -r1.109 -r1.110 pkgsrc/devel/py-subversion/Makefile
cvs rdiff -u -r1.97 -r1.98 pkgsrc/devel/ruby-subversion/Makefile
cvs rdiff -u -r1.90 -r1.91 pkgsrc/devel/subversion/Makefile.version
cvs rdiff -u -r1.121 -r1.122 pkgsrc/devel/subversion/distinfo
cvs rdiff -u -r1.145 -r1.146 pkgsrc/devel/subversion-base/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/devel/subversion/files/build-outputs.mk
cvs rdiff -u -r1.109 -r1.110 pkgsrc/www/ap2-subversion/Makefile

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

Modified files:

Index: pkgsrc/devel/java-subversion/Makefile
diff -u pkgsrc/devel/java-subversion/Makefile:1.75 pkgsrc/devel/java-subversion/Makefile:1.76
--- pkgsrc/devel/java-subversion/Makefile:1.75  Thu Nov 14 22:19:22 2024
+++ pkgsrc/devel/java-subversion/Makefile       Tue Dec 31 17:33:16 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.75 2024/11/14 22:19:22 wiz Exp $
+# $NetBSD: Makefile,v 1.76 2024/12/31 17:33:16 adam Exp $
 
 PKGNAME=       java-subversion-${SVNVER}
-PKGREVISION=   3
 COMMENT=       Java bindings for Subversion
 
 MAKE_JOBS_SAFE=        no

Index: pkgsrc/devel/p5-subversion/Makefile
diff -u pkgsrc/devel/p5-subversion/Makefile:1.137 pkgsrc/devel/p5-subversion/Makefile:1.138
--- pkgsrc/devel/p5-subversion/Makefile:1.137   Sat Nov 16 12:05:35 2024
+++ pkgsrc/devel/p5-subversion/Makefile Tue Dec 31 17:33:16 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.137 2024/11/16 12:05:35 wiz Exp $
+# $NetBSD: Makefile,v 1.138 2024/12/31 17:33:16 adam Exp $
 
 PKGNAME=       p5-subversion-${SVNVER}
-PKGREVISION=   4
 COMMENT=       Perl bindings for Subversion
 
 .include "../../devel/subversion/Makefile.common"

Index: pkgsrc/devel/py-subversion/Makefile
diff -u pkgsrc/devel/py-subversion/Makefile:1.109 pkgsrc/devel/py-subversion/Makefile:1.110
--- pkgsrc/devel/py-subversion/Makefile:1.109   Thu Nov 14 22:19:35 2024
+++ pkgsrc/devel/py-subversion/Makefile Tue Dec 31 17:33:16 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.109 2024/11/14 22:19:35 wiz Exp $
+# $NetBSD: Makefile,v 1.110 2024/12/31 17:33:16 adam Exp $
 
 PKGNAME=       ${PYPKGPREFIX}-subversion-${SVNVER}
-PKGREVISION=   3
 COMMENT=       Python bindings and tools for Subversion
 
 .include "../../devel/subversion/Makefile.common"
@@ -18,8 +17,6 @@ PY_PATCHPLIST=                YES
 REPLACE_PYTHON=                tools/hook-scripts/mailer/mailer.py
 PYTHON_SELF_CONFLICT=  YES
 
-PYTHON_VERSIONS_INCOMPATIBLE=  27
-
 BUILD_TARGET=          swig-py
 INSTALL_TARGET=                install-swig-py
 

Index: pkgsrc/devel/ruby-subversion/Makefile
diff -u pkgsrc/devel/ruby-subversion/Makefile:1.97 pkgsrc/devel/ruby-subversion/Makefile:1.98
--- pkgsrc/devel/ruby-subversion/Makefile:1.97  Thu Nov 14 22:19:36 2024
+++ pkgsrc/devel/ruby-subversion/Makefile       Tue Dec 31 17:33:16 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.97 2024/11/14 22:19:36 wiz Exp $
+# $NetBSD: Makefile,v 1.98 2024/12/31 17:33:16 adam Exp $
 
 PKGNAME=       ${RUBY_PKGPREFIX}-subversion-${SVNVER}
-PKGREVISION=   3
 COMMENT=       Ruby bindings for Subversion
 
 .include "../../devel/subversion/Makefile.common"

Index: pkgsrc/devel/subversion/Makefile.version
diff -u pkgsrc/devel/subversion/Makefile.version:1.90 pkgsrc/devel/subversion/Makefile.version:1.91
--- pkgsrc/devel/subversion/Makefile.version:1.90       Wed Oct  9 21:15:42 2024
+++ pkgsrc/devel/subversion/Makefile.version    Tue Dec 31 17:33:16 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.version,v 1.90 2024/10/09 21:15:42 bsiegert Exp $
+# $NetBSD: Makefile.version,v 1.91 2024/12/31 17:33:16 adam Exp $
 
 # When updating subversion, all packages are updated at the same time
 # to have a consistent set of packages.  A particularly tricky aspect
@@ -7,5 +7,5 @@
 # changing the version.
 
 .if !defined(SVNVER)
-SVNVER=                1.14.4
+SVNVER=                1.14.5
 .endif

Index: pkgsrc/devel/subversion/distinfo
diff -u pkgsrc/devel/subversion/distinfo:1.121 pkgsrc/devel/subversion/distinfo:1.122
--- pkgsrc/devel/subversion/distinfo:1.121      Wed Oct  9 21:15:42 2024
+++ pkgsrc/devel/subversion/distinfo    Tue Dec 31 17:33:16 2024
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.121 2024/10/09 21:15:42 bsiegert Exp $
+$NetBSD: distinfo,v 1.122 2024/12/31 17:33:16 adam Exp $
 
-BLAKE2s (subversion-1.14.4.tar.bz2) = 731560d0576fde94b7bacbe2a1c055cecbecab9a936488f8d7b5eb335b916ebb
-SHA512 (subversion-1.14.4.tar.bz2) = f5e104ef20c96f2605965fafeb9245b03c722734031c2c8d2b6f996979624566ac0a5dadc2d37274a360f2b1dbecb9f7149d0a43c23c2616b9176d0b9367c924
-Size (subversion-1.14.4.tar.bz2) = 8509652 bytes
+BLAKE2s (subversion-1.14.5.tar.bz2) = b2c5601cb85ca6b11fe08d0f4cf5d49e9ee425a4406a7fbfef821f9420a8b7bb
+SHA512 (subversion-1.14.5.tar.bz2) = e4800564d0cc68be98f19aa58d89181de83f237f0ccff10824d9237f8c65eb0071f7176ac54e9e8f8ecbf685849bd3e94be48f678f4c23ed6a5fd7fb6edd0321
+Size (subversion-1.14.5.tar.bz2) = 8675355 bytes
 SHA1 (patch-Makefile.in) = 378336a0908c28bf70b33833d23955ce0d562b12
 SHA1 (patch-configure) = c1c73ace0b28acb921189bd97b74459823a2b104
 SHA1 (patch-subversion_bindings_swig_perl_native_Makefile.PL.in) = 3fadde312693f2a304cd7e348c66cbd373c57854

Index: pkgsrc/devel/subversion-base/Makefile
diff -u pkgsrc/devel/subversion-base/Makefile:1.145 pkgsrc/devel/subversion-base/Makefile:1.146
--- pkgsrc/devel/subversion-base/Makefile:1.145 Thu Nov 14 22:19:36 2024
+++ pkgsrc/devel/subversion-base/Makefile       Tue Dec 31 17:33:16 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.145 2024/11/14 22:19:36 wiz Exp $
+# $NetBSD: Makefile,v 1.146 2024/12/31 17:33:16 adam Exp $
 
 PKGNAME=       subversion-base-${SVNVER}
-PKGREVISION=   3
 COMMENT=       Version control system, base programs and libraries
 
 # on at least solaris, configure fails to figure out
@@ -76,8 +75,9 @@ post-install:
 #   commit the update to ../subversion/files/build-outputs.mk along with the version change
 #
 svn-build-outputs-hack:
-       cd ${WRKSRC} && ./gen-make.py --release --installed-libs libsvn_client,libsvn_delta,libsvn_diff,libsvn_fs,libsvn_ra,libsvn_repos,libsvn_subr,libsvn_wc
+       cd ${WRKSRC} && ${PYTHONBIN} ./gen-make.py --release --installed-libs libsvn_client,libsvn_delta,libsvn_diff,libsvn_fs,libsvn_ra,libsvn_repos,libsvn_subr,libsvn_wc
        ${MV} -f ${WRKSRC}/build-outputs.mk ${FILESDIR}/build-outputs.mk
 
 .include "../../devel/apr/buildlink3.mk"
+.include "../../lang/python/tool.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/subversion/files/build-outputs.mk
diff -u pkgsrc/devel/subversion/files/build-outputs.mk:1.39 pkgsrc/devel/subversion/files/build-outputs.mk:1.40
--- pkgsrc/devel/subversion/files/build-outputs.mk:1.39 Sun Feb 14 15:09:19 2021
+++ pkgsrc/devel/subversion/files/build-outputs.mk      Tue Dec 31 17:33:16 2024
@@ -3160,7 +3160,7 @@ subversion/mod_dav_svn/deadprops.lo: sub
 subversion/mod_dav_svn/liveprops.lo: subversion/mod_dav_svn/liveprops.c subversion/include/mod_authz_svn.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h 
subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_ctype.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h 
subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h 
subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h 
subversion/include/svn_types_impl.h subversion/include/svn_xml.h subversion/mod_dav_svn/dav_svn.h
        if $(INSTALL_APACHE_MODS) ; then $(COMPILE_APACHE_MOD) $(canonicalized_srcdir)subversion/mod_dav_svn/liveprops.c ; else echo "fake" > subversion/mod_dav_svn/liveprops.lo ; fi
 
-subversion/mod_dav_svn/lock.lo: subversion/mod_dav_svn/lock.c subversion/include/mod_authz_svn.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h 
subversion/include/private/svn_log.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_dav.h subversion/include/svn_delta.h 
subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h 
subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h 
subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_xml.h subversion/mod_dav_svn/dav_svn.h
+subversion/mod_dav_svn/lock.lo: subversion/mod_dav_svn/lock.c subversion/include/mod_authz_svn.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h 
subversion/include/private/svn_editor.h subversion/include/private/svn_log.h subversion/include/private/svn_mutex.h subversion/include/private/svn_object_pool.h 
subversion/include/private/svn_repos_private.h subversion/include/private/svn_skel.h subversion/include/private/svn_string_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h 
subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h 
subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h 
subversion/include/svn_repos.h subversion/include/svn_string.h subversion/incl
 ude/svn_time.h subversion/include/svn_types.h subversion/include/svn_types_impl.h subversion/include/svn_xml.h subversion/mod_dav_svn/dav_svn.h
        if $(INSTALL_APACHE_MODS) ; then $(COMPILE_APACHE_MOD) $(canonicalized_srcdir)subversion/mod_dav_svn/lock.c ; else echo "fake" > subversion/mod_dav_svn/lock.lo ; fi
 
 subversion/mod_dav_svn/merge.lo: subversion/mod_dav_svn/merge.c subversion/include/mod_authz_svn.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h 
subversion/include/private/svn_fspath.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h 
subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h 
subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h 
subversion/include/svn_types_impl.h subversion/include/svn_xml.h subversion/mod_dav_svn/dav_svn.h

Index: pkgsrc/www/ap2-subversion/Makefile
diff -u pkgsrc/www/ap2-subversion/Makefile:1.109 pkgsrc/www/ap2-subversion/Makefile:1.110
--- pkgsrc/www/ap2-subversion/Makefile:1.109    Thu Nov 14 22:22:02 2024
+++ pkgsrc/www/ap2-subversion/Makefile  Tue Dec 31 17:33:16 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.109 2024/11/14 22:22:02 wiz Exp $
+# $NetBSD: Makefile,v 1.110 2024/12/31 17:33:16 adam Exp $
 
 PKGNAME=       ${APACHE_PKG_PREFIX}-subversion-${SVNVER}
-PKGREVISION=   3
 COMMENT=       WebDAV server (Apache module) for Subversion
 
 .include "../../devel/subversion/Makefile.common"