pool/subversion
SHA256
12
0
Fork 1
Code Issues Pull Requests Activity

subversion 1.14.4

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm:svn/subversion?expand=0&rev=370
This commit is contained in:
Dirk Mueller
2024-10-23 08:19:01 +00:00
committed by Git OBS Bridge
parent 851331c60f
commit 8d21a8a722
10 changed files with 2279 additions and 15730 deletions
Download Patch File Download Diff File Expand all files Collapse all files

125
subversion-1.14.3-gcc14-2.patch
View File

@@ -1,125 +0,0 @@
------------------------------------------------------------------------
r1915239 | futatuki | 2024-01-14 20:45:41 +0100 (Sun, 14 Jan 2024) | 15 lines
swig-rb: Add type casting for some generic function pointers
With r1915236 and this commit, we can build swig-rb by using clang 16
without masking int-conversion and incompatible-function-pointer-types
errors.
* subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
(svn_swig_rb_set_pool, svn_swig_rb_set_pool_for_no_swig_type,
svn_swig_rb_to_apr_array_row_prop, svn_swig_rb_to_apr_array_prop,
r2c_hash, invoke_callback, callback_handle_error,
invoke_callback_handle_error, svn_swig_rb_set_baton):
Add type casting for generic functions in Ruby C API functions.
(svn_swig_rb_hash_to_apr_hash_swig_type):
Add type casting for generic function on apr_hash_t
------------------------------------------------------------------------
Index: trunk/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
===================================================================
--- trunk/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c (revision 1915238)
+++ trunk/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c (revision 1915239)
@@ -788,7 +788,7 @@
struct rb_set_pool_for_hash_arg arg;
arg.set = FALSE;
arg.pool = pool;
- rb_hash_foreach(target, rb_set_pool_for_hash_callback, (VALUE)&arg);
+ rb_hash_foreach(target, (int(*)(ANYARGS))rb_set_pool_for_hash_callback, (VALUE)&arg);
return arg.set;
} else {
return rb_set_pool_if_swig_type_object(target, pool);
@@ -806,7 +806,7 @@
target = rb_ary_new3(1, target);
}
- rb_iterate(rb_each, target, rb_set_pool, pool);
+ rb_iterate((VALUE(*)())rb_each, target, (VALUE(*)())rb_set_pool, pool);
}
void
@@ -1070,7 +1070,8 @@
result = apr_array_make(pool, 0, sizeof(svn_prop_t));
arg.array = result;
arg.pool = pool;
- rb_hash_foreach(array_or_hash, svn_swig_rb_to_apr_array_row_prop_callback,
+ rb_hash_foreach(array_or_hash,
+ (int(*)(ANYARGS))svn_swig_rb_to_apr_array_row_prop_callback,
(VALUE)&arg);
return result;
} else {
@@ -1125,7 +1126,8 @@
result = apr_array_make(pool, 0, sizeof(svn_prop_t *));
arg.array = result;
arg.pool = pool;
- rb_hash_foreach(array_or_hash, svn_swig_rb_to_apr_array_prop_callback,
+ rb_hash_foreach(array_or_hash,
+ (int(*)(ANYARGS))svn_swig_rb_to_apr_array_prop_callback,
(VALUE)&arg);
return result;
} else {
@@ -1548,7 +1550,7 @@
data.func = func;
data.pool = pool;
- rb_hash_foreach(hash, r2c_hash_i, (VALUE)&data);
+ rb_hash_foreach(hash, (int(*)(ANYARGS))r2c_hash_i, (VALUE)&data);
return apr_hash;
}
@@ -1570,7 +1572,9 @@
apr_hash_t *
svn_swig_rb_hash_to_apr_hash_swig_type(VALUE hash, const char *typename, apr_pool_t *pool)
{
- return r2c_hash(hash, r2c_swig_type, (void *)typename, pool);
+ /* Note: casting to r2c_cunc for r2c_swig_type may unsafe, because
+ it contains the cast from "const void *" to "void *" */
+ return r2c_hash(hash, (r2c_func)r2c_swig_type, (void *)typename, pool);
}
apr_hash_t *
@@ -1651,7 +1655,8 @@
argv[0] = pool;
svn_swig_rb_get_pool(1, argv, Qnil, &subpool, NULL);
cbb->pool = subpool;
- return rb_ensure(callback, baton, callback_ensure, subpool);
+ return rb_ensure((VALUE(*)(ANYARGS))callback, baton,
+ (VALUE(*)(ANYARGS))callback_ensure, subpool);
}
static VALUE
@@ -1660,9 +1665,9 @@
callback_handle_error_baton_t *handle_error_baton;
handle_error_baton = (callback_handle_error_baton_t *)baton;
- return rb_rescue2(callback,
+ return rb_rescue2((VALUE(*)(ANYARGS))callback,
(VALUE)(handle_error_baton->callback_baton),
- callback_rescue,
+ (VALUE(*)(ANYARGS))callback_rescue,
(VALUE)(handle_error_baton->rescue_baton),
rb_svn_error(),
(VALUE)0);
@@ -1681,8 +1686,9 @@
handle_error_baton.callback_baton = cbb;
handle_error_baton.rescue_baton = &rescue_baton;
- return rb_ensure(callback_handle_error, (VALUE)&handle_error_baton,
- callback_ensure, pool);
+ return rb_ensure((VALUE(*)(ANYARGS))callback_handle_error,
+ (VALUE)&handle_error_baton,
+ (VALUE(*)(ANYARGS))callback_ensure, pool);
}
@@ -1735,7 +1741,8 @@
target = rb_ary_new3(1, target);
}
- rb_iterate(rb_each, target, add_baton_if_delta_editor, baton);
+ rb_iterate((VALUE(*)())rb_each, target,
+ (VALUE(*)())add_baton_if_delta_editor, baton);
}

34
subversion-1.14.3-gcc14.patch
View File

@@ -1,34 +0,0 @@
------------------------------------------------------------------------
r1915236 | futatuki | 2024-01-14 19:29:23 +0100 (Sun, 14 Jan 2024) | 6 lines
Changed paths:
M /subversion/trunk/subversion/bindings/swig/include/svn_containers.swg
swig-rb: Fix condition to check that a apr_hash_t * type value is NULL
* subversion/bindings/swig/include/svn_containers.swg
(typemap(in) apr_hash_t *PROPHASH,
typemap(in) apr_hash_t *HASH_CSTRING_MAYBENULL): As above
------------------------------------------------------------------------
Index: trunk/subversion/bindings/swig/include/svn_containers.swg
===================================================================
--- trunk/subversion/bindings/swig/include/svn_containers.swg (revision 1915235)
+++ trunk/subversion/bindings/swig/include/svn_containers.swg (revision 1915236)
@@ -299,7 +299,7 @@
$1 = svn_swig_rb_hash_to_apr_hash_svn_string($input, _global_pool);
_global_pool = NULL;
if (!NIL_P(rb_pool)) {
- if (NIL_P($1)) {
+ if ($1 == NULL) {
svn_swig_rb_destroy_pool(rb_pool);
} else {
svn_swig_rb_set_pool_for_no_swig_type($input, rb_pool);
@@ -373,7 +373,7 @@
svn_swig_rb_hash_to_apr_hash_string($input, _global_pool);
_global_pool = NULL;
if (!NIL_P(rb_pool)) {
- if (NIL_P($1)) {
+ if ($1 == NULL) {
svn_swig_rb_destroy_pool(rb_pool);
} else {
svn_swig_rb_set_pool_for_no_swig_type($input, rb_pool);

3
subversion-1.14.3.tar.bz2
View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:949efd451a09435f7e8573574c71c7b71b194d844890fa49cd61d2262ea1a440
size 8569985

37
subversion-1.14.3.tar.bz2.asc
View File

@@ -1,37 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQJNBAABCAA3FiEEP45GfLM2bjAT4RINWD8ArfmBw58FAmV0gDsZHGhhcnRtYW5u
YXRoYW5AYXBhY2hlLm9yZwAKCRBYPwCt+YHDn1XHD/9oHnVGwB9C6Bqg1a2pBtHF
F05j+7qQi++FK1/pLDWHgUFHc4+nSJeiB/lIjwn0rC1PT1c3rMh9K9ZTpeEc4MRL
QXMvt2IqEMhrIBSE8HW1uKRBAUnJrPT1pkmqU8DdbLDDyupRFi4f7dKPEvn1Ej31
LXJvaoqZRbJ76fEYwaM9DJdo3apGckqCtchveVkw7Jg1raJ7hYux/HGTtc7BSUcc
R17nIp0UPhC5Ier3VaA4o0yr6x317C8CPQhCtKoOYDPvu5HFNDoBBQc8h7cdbYXG
veHVlsP4scc/U6kfgxzwz4weXfN3uYktWC0IeSEAf7uhfHaXu8kocJ84/kHkG1a1
tUlYeZj82ma7MKVfldUNx1/gqwQng4sUgXsaBXw+hNTETgFj+/ez+hPtBv+thbK0
yljfIfnuNdqsnTJpmXXvp3UzO/wwLVyj3VbYe8DotLqtXHC8mSGYdBpTxVE9Chgs
iCCC4MEsGdzE99f3d60uH1jm067iYtuLWZkf+E4+4Y40F3Bt1Urs80UtvtRyv3q7
H+CocK+thEJMPHodmYunJveXCZQBRJHni/M0y2080jh4AP3/ui0OGNEgcNSuX6OR
Ihe5nAFycPiVaQpQvfxo7ulqEN3m3AQXvoSC5bV6S40bbYnHJIgov8dj+Pz+agTw
BA5m839fsofxiQOhMbHk4A==
=aL2X
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
iF0EABECAB0WIQSxzxBgoek00Z6G1tbl0wJz9Z0l8AUCZXmlZwAKCRDl0wJz9Z0l
8NfyAKCNzMW+mM42nhMPKsTTGMmBalSahwCgm7pKfbUqmf8YbXT5bFdEBlkJ9I4=
=CUBD
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
iQGzBAABCgAdFiEET/y1XA0Nk0PPtGEfKNtHMpz/3GMFAmWHR2oACgkQKNtHMpz/
3GMgggwAoerQHK4Kh4TtFiIXTlqr1BGZAvLjHyPgEJ/zzxrAh7OM7W28HDrT/Si5
DZoKdW74w459AH6VUeRhTUdDEYnziZMicnGLHSck1p56tzDb/2MBlqMmCRywU9Zi
r4SEBxcJK7wWIRho0a1BjdGnuZwGpXF1pzkQwmgxsg8PMpZqxp35RtAPA87YQaNu
KqDSJjOCeJn+ioXBSWEVhNmbTaaQtniXhPyGA41KBbctFwjUTPDMb8ZmqXtIesAj
kQD2dWKAyUPXuSJ9Y2O0OflIk7OBSDCMGnkaseaXiOXTDfD5GssYRKOhF9/jStNI
t5T58sZX7vLAX1pf8hzIxn3caIk3x41uP4AzS9khEl8sF0WC4oRmAe34NhFwJwfc
W46SqqaCt3AwHTEbTkaFtCEyl7MSDhptOSOfXywz3M4+B06X1fexSkGY8jVFpazU
8zPnNmr3xPBwSzC+E6nD3grSjnGU2s0vxL2MRK9vH5VwcKmoeHA7Hm8DHi7/Bs3G
zNp9WKBv
=piyH
-----END PGP SIGNATURE-----

3
subversion-1.14.4.tar.bz2 Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:44ead116e72e480f10f123c914bb6f9f8c041711c041ed7abff1b8634a199e3c
size 8509652

27
subversion-1.14.4.tar.bz2.asc Normal file
View File

@@ -0,0 +1,27 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCAAdFiEEi8Ta4MWk1l9ARAEHT326qZpZuXMFAmb1IjcACgkQT326qZpZ
uXMqVgf/XkhwQvoJ54MzrQg9COlrKsjuqBg7MvAfvcnHcREbqu1b/pt9rVM5V+OI
9ofrhZfodWz6nAjHfMfFG0eBPM+qCwiwZ2cFQx0H20AW7sN3MOPizCOItBDkV/2h
2Mfhd+XjFcyE91z0vmeq7OWQtnI2mNjiHUVNnMdHRYW3v8Ga87Hk51O/kgpAfykF
MFyKVKrp+6NpIYIP80a/f4x+PDXw3tKNJnTuMcADKivNx0OzPr0AfF7F/OnG3dtQ
JWpRff8xJHgo9THdm6R3MyOkCmimPQldBL56ZWP7RdbQJYSyFvCHK/15BaDixJbM
Owg2OExJC3eMeeoGDeACRsmi+m5tjg==
=Ywix
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEP45GfLM2bjAT4RINWD8ArfmBw58FAmb7gEsACgkQWD8ArfmB
w5+7HBAAuJH77kxmf5sgvxt7twt5flctaAlrM1odOn2dPwLUb7urHj5uiJnrpaTS
u77Zm6gv8xsQRjyTKLiFWktkRE3u0LWOsWj+8k9DAZa7JswwJ5vm3ARbUjrL/MnN
mYD1jDnBXto6xQsRRAaBMtsgKUCnrN5SbUuRuzZrdP7iPzzzwChd/FVz6U99J2Vk
wma/kQzMEOgV9hZrvJROknQmhyb2iUhSQgEMGj0qTOUqyQcNvTAnFdo4uslY+pL2
7x4JSv8UZ94t7UdSRTdFGoZVewW9CIGdqZ9ajkpZFb9gIfjs/9EapIjFtgYfVENI
RIKV+fUIM5shuL9PuEBUs7yzmxbpAF1KpKuofLUqvr2wjXejmW56VD/uCWUHkBuw
nnaRbvkOv8/jMebZC7pr7uZARxvK/YI5036ir+Jbl0IZveV/IyO3ud2lpQnXM+E4
64AUCp3QaRuFmwS2Kb3QvvAC98RMOqiTrg2H/afHBxlvF1eBWJkRulIm3w4nVzxv
o56DX/Xo1i8pef3giqKwWYc5j3MYl9Wro/xZXpkDBAazzr0zYj4Ma0DFbi7NAXBw
G4IWkrKrr0QLVKgXe0U4c6wTqrGc3fsnnO+pFnGds4pW7n7HFg+4+x1LuoipNOYe
/C4HFIPKS7RRedNwhULy02raF4/w3AHxepuMYOT2uqbrOocK6MM=
=H4vd
-----END PGP SIGNATURE-----

32
subversion-no-build-date.patch
View File

@@ -13,10 +13,10 @@ Prevent unneccessary rebuilds of binary packages differing only by date, time an
subversion/tests/cmdline/getopt_tests_data/svn--version_stdout | 1 -
5 files changed, 6 insertions(+), 12 deletions(-)
Index: subversion-1.14.3/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
Index: subversion-1.14.4/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
===================================================================
--- subversion-1.14.3.orig/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
+++ subversion-1.14.3/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
--- subversion-1.14.4.orig/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
+++ subversion-1.14.4/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
@@ -149,10 +149,10 @@ public class BasicTests extends SVNTests
{
vx = client.getVersionExtended(false);
@@ -30,10 +30,10 @@ Index: subversion-1.14.3/subversion/bindings/javahl/tests/org/apache/subversion/
throw new Exception("Build time empty");
result = vx.getBuildHost();
if (result == null || result.trim().length() == 0)
Index: subversion-1.14.3/subversion/libsvn_subr/opt.c
Index: subversion-1.14.4/subversion/libsvn_subr/opt.c
===================================================================
--- subversion-1.14.3.orig/subversion/libsvn_subr/opt.c
+++ subversion-1.14.3/subversion/libsvn_subr/opt.c
--- subversion-1.14.4.orig/subversion/libsvn_subr/opt.c
+++ subversion-1.14.4/subversion/libsvn_subr/opt.c
@@ -1147,12 +1147,8 @@ svn_opt__print_version_info(const char *
if (quiet)
return svn_cmdline_printf(pool, "%s\n", SVN_VER_NUMBER);
@@ -49,10 +49,10 @@ Index: subversion-1.14.3/subversion/libsvn_subr/opt.c
SVN_ERR(svn_cmdline_printf(pool, "%s\n", svn_version_ext_copyright(info)));
if (footer)
Index: subversion-1.14.3/subversion/libsvn_subr/version.c
Index: subversion-1.14.4/subversion/libsvn_subr/version.c
===================================================================
--- subversion-1.14.3.orig/subversion/libsvn_subr/version.c
+++ subversion-1.14.3/subversion/libsvn_subr/version.c
--- subversion-1.14.4.orig/subversion/libsvn_subr/version.c
+++ subversion-1.14.4/subversion/libsvn_subr/version.c
@@ -139,8 +139,8 @@ svn_version_extended(svn_boolean_t verbo
{
svn_version_extended_t *info = apr_pcalloc(pool, sizeof(*info));
@@ -63,21 +63,21 @@ Index: subversion-1.14.3/subversion/libsvn_subr/version.c
+ info->build_time = "";
info->build_host = SVN_BUILD_HOST;
info->copyright = apr_pstrdup
(pool, _("Copyright (C) 2023 The Apache Software Foundation.\n"
Index: subversion-1.14.3/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout
(pool, _("Copyright (C) 2024 The Apache Software Foundation.\n"
Index: subversion-1.14.4/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout
===================================================================
--- subversion-1.14.3.orig/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout
+++ subversion-1.14.3/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout
--- subversion-1.14.4.orig/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout
+++ subversion-1.14.4/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout
@@ -1,5 +1,4 @@
svn, version 1.9.0-dev (under development)
- compiled Feb 26 2014, 15:15:42 on x86_64-unknown-openbsd5.5
Copyright (C) 2012 The Apache Software Foundation.
This software consists of contributions made by many people;
Index: subversion-1.14.3/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout
Index: subversion-1.14.4/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout
===================================================================
--- subversion-1.14.3.orig/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout
+++ subversion-1.14.3/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout
--- subversion-1.14.4.orig/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout
+++ subversion-1.14.4/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout
@@ -1,5 +1,4 @@
svn, version 1.9.0-dev (under development)
- compiled Feb 26 2014, 15:15:42 on x86_64-unknown-openbsd5.5

16
subversion.changes
View File

@@ -1,3 +1,19 @@
-------------------------------------------------------------------
Fri Oct 18 16:35:51 UTC 2024 - Andreas Stieger <andreas.stieger@gmx.de>
- Update to 1.14.4:
* Fix unbounded memory usage in propget and proplist --xml
* Fix cmdline parsing bugs in --change (-c) argument
* Improve help message for svnmucc PUT
* mailer.py: Fix inconsistency in Config.which_group() arguments
* Convert path to local style in error message from diff API
* Fix `invalid escape sequence` in .py scripts for Python 3.12
* swig-py: Fix `none_dealloc` error caused by refcount issue
* Fix a msgid in svnadmin.c which was not a valid C string
- drop patches included upstream:
* subversion-1.14.3-gcc14-2.patch
* subversion-1.14.3-gcc14.patch
-------------------------------------------------------------------
Thu Sep 26 09:32:29 UTC 2024 - Bernhard Wiedemann <bwiedemann@suse.com>

17725
subversion.keyring
View File

File diff suppressed because it is too large Load Diff

7
subversion.spec
View File

@@ -41,7 +41,7 @@
%bcond_with python_ctypes
%bcond_with all_regression_tests
Name: subversion%{psuffix}
Version: 1.14.3
Version: 1.14.4
Release: 0
Summary: Subversion version control system
License: Apache-2.0
@@ -75,8 +75,6 @@ Patch46: remove-kdelibs4support-dependency.patch
# PATCH-FIX-UPSTREAM danilo.spinella@suse.com bsc#1195486 bsc#1193778
# Fix testCrash_RequestChannel_nativeRead_AfterException test on aarch64 and ppc64le
Patch47: fix-javahl-test.patch
Patch48: subversion-1.14.3-gcc14.patch
Patch49: subversion-1.14.3-gcc14-2.patch
BuildRequires: apache-rpm-macros
BuildRequires: apache2-devel >= 2.2.0
BuildRequires: apache2-prefork
@@ -94,9 +92,9 @@ BuildRequires: python3-devel >= 2.7
BuildRequires: python3-py3c
BuildRequires: python3-xml
BuildRequires: ruby-devel >= 1.8.2
BuildRequires: strip-nondeterminism
BuildRequires: swig
BuildRequires: sysuser-tools
BuildRequires: strip-nondeterminism
BuildRequires: update-alternatives
BuildRequires: utf8proc-devel
BuildRequires: pkgconfig(apr-1) >= 1.3.0
@@ -436,6 +434,7 @@ ln -s /dev/shm/svn-test-work subversion/tests/cmdline/
%endif
%else
%pre -f subversion.pre
%service_add_pre svnserve.service