pool/subversion
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Update to 1.14.0:

Browse Source 
* Support for Python 3.x
  * Support for Python 2.7 is being phased out
  * New Build-Time Dependency: py3c
  * Many enhancements and bug fixes
- Drop patches:
  * subversion-1.12.0-swig-4.patch
  * ruby27-warnings.patch
  * ruby-includes.patch
- Refresh patch subversion-no-build-date.patch

OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm:svn/subversion?expand=0&rev=325
This commit is contained in:
Tomáš Chvátal 2020-06-11 08:57:15 +00:00 committed by Git OBS Bridge
parent 4e3b86b223
commit cdb71f3d56
11 changed files with 24967 additions and 38538 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ruby-includes.patch
View File

@ -1,32 +0,0 @@
From 9d3f457d0059b426d3483d0a733f45a2ea8f6dcd Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@apache.org>
Date: Tue, 24 Mar 2020 23:30:21 +0000
Subject: [PATCH] Remove incorrect include paths from svn_cv_ruby_includes.
Files under ruby/ and ruby/backward/ should be included using "#include
<ruby/...>", if needed, instead of adding those directories to the include
path.
* build/ac-macros/swig.m4
(SVN_FIND_SWIG): Remove "-I$rbconfig_rubyhdrdir/ruby
-I$rbconfig_rubyhdrdir/ruby/backward"
git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1875602 13f79535-47bb-0310-9956-ffa450edef68
---
build/ac-macros/swig.m4 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build/ac-macros/swig.m4 b/build/ac-macros/swig.m4
index bc2599038f22..c707a8c28253 100644
--- a/build/ac-macros/swig.m4
+++ b/build/ac-macros/swig.m4
@@ -230,7 +230,7 @@ AC_DEFUN(SVN_FIND_SWIG,
AC_CACHE_CHECK([for Ruby include path], [svn_cv_ruby_includes],[
if test -d "$rbconfig_rubyhdrdir"; then
dnl Ruby >=1.9
- svn_cv_ruby_includes="-I. -I$rbconfig_rubyhdrdir -I$rbconfig_rubyhdrdir/ruby -I$rbconfig_rubyhdrdir/ruby/backward"
+ svn_cv_ruby_includes="-I. -I$rbconfig_rubyhdrdir"
if test -d "$rbconfig_rubyarchhdrdir"; then
dnl Ruby >=2.0
svn_cv_ruby_includes="$svn_cv_ruby_includes -I$rbconfig_rubyarchhdrdir"

121
ruby27-warnings.patch
View File

@ -1,121 +0,0 @@
From 4c75471f13559ad336a7dc9bc129a50f174c4991 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@apache.org>
Date: Thu, 2 Apr 2020 03:01:43 +0000
Subject: [PATCH] Fix Proc.new warnings in Ruby bindings with Ruby >= 2.7
Per Ruby 2.7's release notes[1], use the block-capturing syntax instead of
explicit Proc.new to resolve warnings like these in the Ruby SWIG APIs:
subversion/bindings/swig/ruby/svn/client.rb:640: warning: Capturing the given block using Proc.new is deprecated; use `&block` instead
subversion/bindings/swig/ruby/svn/core.rb:258: warning: Capturing the given block using Proc.new is deprecated; use `&block` instead
[1]: https://github.com/ruby/ruby/blob/v2_7_0/NEWS#proclambda-without-block-is-deprecated-
* subversion/bindings/swig/ruby/svn/client.rb:
(set_log_msg_func, set_log_msg_func2, set_notify_func, set_cancel_func):
Replace callback=Proc.new parameter with &callback
(def_init_callbacks): Remove explicit nil parameters to above functions,
leveraging deafaults
* subversion/bindings/swig/ruby/svn/core.rb:
(add_simple_prompt_provider, add_username_prompt_provider,
add_ssl_server_trust_prompt_provider, add_ssl_client_cert_prompt_provider,
add_ssl_client_cert_pw_prompt_provider): Replace prompt=Proc.new parameter
with &prompt
git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1876020 13f79535-47bb-0310-9956-ffa450edef68
---
subversion/bindings/swig/ruby/svn/client.rb | 16 ++++++++--------
subversion/bindings/swig/ruby/svn/core.rb | 10 +++++-----
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/subversion/bindings/swig/ruby/svn/client.rb b/subversion/bindings/swig/ruby/svn/client.rb
index 50a0385592eb..30d328bcd895 100644
--- a/subversion/bindings/swig/ruby/svn/client.rb
+++ b/subversion/bindings/swig/ruby/svn/client.rb
@@ -637,25 +637,25 @@ def switch(path, uri, peg_rev=nil, rev=nil, depth=nil,
ignore_externals, allow_unver_obstruction, self)
end
- def set_log_msg_func(callback=Proc.new)
+ def set_log_msg_func(&callback)
callback_wrapper = Proc.new do |items|
items = items.collect do |item|
item_wrapper = CommitItemWrapper.new(item)
end
callback.call(items)
end
- set_log_msg_func2(callback_wrapper)
+ set_log_msg_func2(&callback_wrapper)
end
- def set_log_msg_func2(callback=Proc.new)
+ def set_log_msg_func2(&callback)
@log_msg_baton = Client.set_log_msg_func3(self, callback)
end
- def set_notify_func(callback=Proc.new)
+ def set_notify_func(&callback)
@notify_baton = Client.set_notify_func2(self, callback)
end
- def set_cancel_func(callback=Proc.new)
+ def set_cancel_func(&callback)
@cancel_baton = Client.set_cancel_func(self, callback)
end
@@ -707,9 +707,9 @@ def remove_from_changelists(changelists_names, paths, depth=nil)
private
def init_callbacks
- set_log_msg_func(nil)
- set_notify_func(nil)
- set_cancel_func(nil)
+ set_log_msg_func
+ set_notify_func
+ set_cancel_func
end
%w(log_msg notify cancel).each do |type|
private "#{type}_func", "#{type}_baton"
diff --git a/subversion/bindings/swig/ruby/svn/core.rb b/subversion/bindings/swig/ruby/svn/core.rb
index 15ebe139b6a2..26e5e84d4fba 100644
--- a/subversion/bindings/swig/ruby/svn/core.rb
+++ b/subversion/bindings/swig/ruby/svn/core.rb
@@ -249,31 +249,31 @@ def add_windows_ssl_server_trust_provider
end
end
- def add_simple_prompt_provider(retry_limit, prompt=Proc.new)
+ def add_simple_prompt_provider(retry_limit, &prompt)
args = [retry_limit]
klass = AuthCredSimple
add_prompt_provider("simple", args, prompt, klass)
end
- def add_username_prompt_provider(retry_limit, prompt=Proc.new)
+ def add_username_prompt_provider(retry_limit, &prompt)
args = [retry_limit]
klass = AuthCredUsername
add_prompt_provider("username", args, prompt, klass)
end
- def add_ssl_server_trust_prompt_provider(prompt=Proc.new)
+ def add_ssl_server_trust_prompt_provider(&prompt)
args = []
klass = AuthCredSSLServerTrust
add_prompt_provider("ssl_server_trust", args, prompt, klass)
end
- def add_ssl_client_cert_prompt_provider(retry_limit, prompt=Proc.new)
+ def add_ssl_client_cert_prompt_provider(retry_limit, &prompt)
args = [retry_limit]
klass = AuthCredSSLClientCert
add_prompt_provider("ssl_client_cert", args, prompt, klass)
end
- def add_ssl_client_cert_pw_prompt_provider(retry_limit, prompt=Proc.new)
+ def add_ssl_client_cert_pw_prompt_provider(retry_limit, &prompt)
args = [retry_limit]
klass = AuthCredSSLClientCertPw
add_prompt_provider("ssl_client_cert_pw", args, prompt, klass)

23
subversion-1.12.0-swig-4.patch
View File

@ -1,23 +0,0 @@
Fix build with Swig 4
Two changes in python swig build options:
* Remove -classic (not supported anymore, was for python 2.2).
* Add -nofastunpack as default is set to fastunpack now/.
See also https://issues.apache.org/jira/browse/SVN-4818.
---
build.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.conf b/build.conf
--- a/build.conf
+++ b/build.conf
@@ -101,7 +101,7 @@ test-scripts =
bdb-test-scripts =
-swig-python-opts = $(SWIG_FEATURES) -python $(SWIG_PY_FEATURES) -classic
+swig-python-opts = $(SWIG_FEATURES) -python $(SWIG_PY_FEATURES) -nofastunpack
swig-perl-opts = $(SWIG_FEATURES) -perl $(SWIG_PL_FEATURES) -nopm -noproxy
swig-ruby-opts = $(SWIG_FEATURES) -ruby $(SWIG_RB_FEATURES)
swig-languages = python perl ruby

3
subversion-1.13.0.tar.bz2
View File

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

58
subversion-1.13.0.tar.bz2.asc
View File

@ -1,58 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEYBFjz51Jn9cYz1gtH7BkuE7sxJMFAl2ywOYACgkQH7BkuE7s
xJPOLA//aP8lfDEf5aCHe8GupUb5WzakK5f6BJtK5qc7Zr0w2ZeUsPvH2U4Yeuvi
kvYB7hUl+YLHa/XxwfHpM7O/6uHWM0MOBCqsKiOgm6jBgbAVqhuc3J44DoOqDUk1
ke8msLozUW7zuEr3bTksYGNjGmmN9skPRn9w4n3VxdZ0OlGDXP3hd+OUC/duez7P
I+GPGEwWuqhXZu2fYadCqVbuModJtnPVsZZlgThUqRTagPavyO3bRk8ZsaPTrdpf
xRMEvuKjbb8/erDCWe5101tgue5lxDKLd/7gzmRsbTJEiIagBdPVwkDeKt8GZEJ2
MHb52HPtjcanuzrRQLS2UD+xRI6u7KhOS/clV1G+UiRKcNbXVmi4nmUGsTqHwkeh
NoBrs2+M5brPVdO7W9F1x7xroWkCcuVrV/jlWDjMZUVcUeQdVrcp9IGy8u4y+07U
I5xqSPGIB/RjC1ctIw3O4r51ymwYMLpQ+oBMCR1ueKdHa5zSyGJXv0cX9teId65I
x0FCSy9+tS0e1s72625c74XzwQpwqFsAC2vT1tb1pj/ON87qhRfOr0ueCw00HfsY
58IJFFpVqmVoaDny9et1D4kiSzcNVRy3A3N6xoli0ciNhEdoSgZlY5/15WyGhxJc
58eYNtss3lQzUZzR+TAn9/CBbNeIkRRa3XWVekbjhcnKOOKafBQ=
=cm39
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
iQEcBAABAgAGBQJdsyLpAAoJEE99uqmaWblzAjsH/iMeXNPszI4DskyZMcn2k0Ls
WtV2bRzy1V3O1AIK8zUrOCT65HDMrAUj1gEjvjg5Nl/Agb2GagbQkg8kMK8RiC/Y
jTQRC4xc/iVJ4uk5FO2lJ/Fa3PtwcC1SDvbsx170B+a/gF/hZxWXVe/pOPVczG5a
ZuQCZYN7R6P+PxwxfVrL+0xF3aDVDOi1qII9Feg8wvRSLBMBJekzxQL9cYEloYie
p2cpLTcs3/gGzpwmXPDyro2xODNqQlHazH6Z7PI45BVPr1rgnRLgz9OJ0F26p2KX
LZEM1wcS3Zfn5H3bNXcBUOHzwYzOZGQHMVcXC4r0z+CmyyWPdFABtWLpaXM8U0c=
=6vmB
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEujwVsTN88PsiK9QaG8plhqNHlD8FAl200GAACgkQG8plhqNH
lD9RQw/+O/Jw3cdZS7xSXFkZlyY57gejXocqiONYDLbNCR2EyA+/aMl3gLLRTwEM
CiWQz/NGFegUwyEJ70vSAjVTczyapYVwzBBZeNXhXIoeXHksS1n5fGKro62J6lmY
OVyAuo6zC3jej2t6hP1W2KFDDGacwRnAvpOSDcX5XnB07GeoqRjmvn0XbLupk0+m
/zxuMzv1CxfYpM9rLDH7ubMHa62+zfwn0Ol3x3Q6swcrCdgsrUP0fAOruDq45IrZ
xb3t0u0QThnRh4JQORar60VwVp20DUHsTXAjtgBmZDr8VChf1wLDqCqMgWaA/9ct
Plj8J2V2xKcwt6TN3y8BNKBU9BsK5FoBFxOGJSM2d1zt918mDb3R2j3c9EAgThPZ
nc4uFWkn4v2sIFag2CroDUzs66gZw7uyJn9MS1Ieef7baTeE0IMVzrmutVWN1vUW
mgnvKcRIMbzN2Xabam7s69/a1Gk0hZd0Tmwb7Rp4SiP6StDURTq/m56LChANeyi2
OIwnGGzCk19mwswuJOc/GEgLTW23O8z2AYPKH4OAvtDLpCxXOZ2+IGP6aZiNXp0c
PfJo2LWMK1aM1KaUKrBYOZ9i6868H3xWUkUEHNo8+ZqZjDW0Hh1dDHi1QG63Zwcg
3WL6LM01gLNS5hUqwAq5nImX0m5z5wKWWVKkskmy9nW+srZ3uow=
=mJtI
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEP45GfLM2bjAT4RINWD8ArfmBw58FAl208h0ACgkQWD8ArfmB
w5/pYxAAi3dc8X0K8tJwX+4xlB9lRY9VXAKDOM4DVeVEd3DwySCt0THkgo0w1ogV
tZMvnHM/Sq/DY6Ma2ddkTMRrMHVxUAa2t7Twe5m8BFCZ6w5s8DdEoWjZo9oSlp1o
2WHDBgX4Siu08DAXT80/cbtU3j4+CXEjRNIoEQJq4t7rSkmQysX5fkxzlRUNMthY
oJplaJ3WpS8fvQtKEayJH+4gzCY6nO8hEoPFRrh6i+NSuGP7EJpXIXu/lqztTdG/
IViGod4Nz5kUpeXKml1Iv8Hg6On/4xZSlv5Y1nHsi0cFYx9tSDnQ0cZ9ykBHTlI5
lGq8EYLstaOqukz2ojAtP/edntBxihdN9c1sMUXqlRhENw4llktdqReZJXqHQFuR
p35MCRmr0hi1kDqiB4/BHz/GOkIwbcZnsq3bR4YYE0jLof3AddjIOggVlHDj9tEk
CjqU8hMgbXw4bmWOAqsd4/ddscYPh4g6fL8YHjaSjONbz1GA+Npp5jVLse0skwJ1
2yeLj9NijlB+ZxRdL4xPcqGVz+uiuzye77HKXIVsdQ4LRvwM2KpDlsySOy+VUjJy
Ezlnb+SmR9F0ADZ5z2QliKdMGI7l2GDAvYKWK7/x2r0fmK02XfcLI+Ui+YWXdWCm
x2ua8csnanKPIvDv5vZe8mHqiI966IAYJKODuLba0nUkx9TpyiU=
=inSe
-----END PGP SIGNATURE-----

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

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6ba8e218f9f97a83a799e58a3c6da1221d034b18d9d8cbbcb6ec52ab11722102
size 8497531

76
subversion-1.14.0.tar.bz2.asc Normal file
View File

@ -0,0 +1,76 @@
-----BEGIN PGP SIGNATURE-----
iQEcBAABAgAGBQJexSGoAAoJEE99uqmaWblzRAoH/1Kt3qcysh8YCutIZt8YhZCT
1s3uPHzD2g3DzCceCSzFJeH3offU+JWKxnpzScQl85ANhzfIHwxtjU4yDlQr0jxN
FddnB4b+9pBNijkWAX0An6BcYa1Uk05dDBgwt6B/QUdeRGNsG7dhyHztANWBS+ik
v65F3qRYjs0iZTiIO20XZ5AQwDbwWa0qYHvOWo8r7OB4JvErRwQ938+lmsRIVhuI
Cw5SozcufvCCOSAaGy25j3kABUTnC1z0TR2M8PTxJuiotr7qqmY1L7VMqIjb2BDF
CZw0oK1XBbuSKRtDM+Ge5aeH/Crntv9pMtdFtZ8hIKMUsvqh+L9OBokJegvymGk=
=iSoN
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEYBFjz51Jn9cYz1gtH7BkuE7sxJMFAl7FWF4ACgkQH7BkuE7s
xJORVQ/8DJv5gNeQPloJ2Zy3UPn8AyqLCxqCPUhK9V1A38UrCgXp+VQL2gy0BuTz
EJQgSqkunU784C49V75s43W0sr9CqsiNa5bK94XnG+NhGuVb+kU2ZEjKCRIch7HG
VUtezYt+gOnySsrrwOrrYsY3WCxVu9IWpcsEo8A68JRRzX1GyVO2mBKyaGc7bFTm
LMiH85Zu9n7WcEqiyDJSBw3wgIRiA0WiOM23wNH/RuEftHVg8+GtpKQLNfKQcL6l
YlPK3nzZW6NEB0Ef+o63k+d4WURspbqCV6RWyxxEvni2o7M7rivEF97HxnfGODsz
tRi8ZeaGydzX2+F8y/KJVXVE7a24IFiSiOrKOOb5DHXtltS0/CrCLfgK8PZknS1T
EUgePpbEvKvgNdrhZm6WtEd6oKbMhAQAsKRr+ACjkdfE6uIfz4vcWfHgGXyXKVmf
PnqQAzndHUaPN0BjDPjhLvDvIyWs34GbEi0zp3OqA2CFcNM9+TrOjvv/UQlMYvWk
orM0/YG8TeWFznNIJTXU7PuP/Dn7WPfffWd4rFnh1oCk+OoWI/5Un/RP1+zjGovK
qOzoWFXaQ5UY8bAGY5NbjBb7qmXcHap3TPN0AressnOyLNrv/2tk1+MCzreRgSNf
2F7UjTG0BdzuLnqmZQ2glyz1wVO4xb44OUAcrrC40fJUSYD4Vbo=
=J6Pm
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEP45GfLM2bjAT4RINWD8ArfmBw58FAl7Gz/0ACgkQWD8ArfmB
w5/Wnw/+LfYn2xtWm2bVj31xBplaffGmqkVozOQsPeUq646TXonbbGjtgPoXgc6+
IxGf9f0Tuob9KhmCStcTMYOMAnStZI/pC19mMZ4ei6S9qcnbJFXB+Ph+5JUWpmuk
UrgNsn/V+icFOkL1v50J0m+WrJIm+36wJe2CLw4VEdPGO+8GIUycGUuDEnJUz9vt
srGRWoj2FQbVLPqIzuGcgFquU3ct0zpVgoAYSpNMk7dUcwY15EszU2l1V43FJPG0
praRulvy5SZFltLqNdNH8xEWpOraDoZmKdatrObCfsTO6xMvOdKpNba7W7PRZei1
Q9CdaSigQlEEjXAUX/Vn4ZjEGwMND564NJ5IXfMQ/c4MNLCZNtE6aWR80xALCGmQ
i7bJSlIPbKsVkJpN5nkiBma3cypUreyegxGnxuUUnDRbZkAGs+LQh2JiRtNOBu2t
q3ZN+N6pdLn984IdsGpDLvt4O0L54wpRtobeDtWLmc6o9E+kZmqQBcj0pGV0bmxc
+z/qH3oPYOuN9Ehiyll9eS7pZHGGtzbL7V/hxuwJ2PTh5W1Rcg+mhg9lpFCfr9+H
2teIUbfxRlyTiIZ4/0CvuM/PIVvdQdIh1fQWpYtYHEXSjc7Q9QzHrCGF1O2UceAj
5oU4lT90mJ0a6sOA+h17cTz90RvqsCVQG2d7Y0iE4ENMGIAoiRQ=
=I97x
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEujwVsTN88PsiK9QaG8plhqNHlD8FAl7M7osACgkQG8plhqNH
lD9MJw//ZaJpw0hcDnvAk3HBkmsdF7wjEhYONgpnowW39DkDYIApgnbiD07fHMvo
A6UdCegXZD9+jOMGRaB7lm/A5u2DP/ZgjeiRIslwJi6Y0kmbt0z+KZk+sBfH8LYM
3oXZRA31AwfRNfr/VkFFu+KKrqqv/zFyVwRaUwG26iSAGtMYKbYllQHM9rQrAKnZ
wpSVRMaVNZPgdzogwngYpNQNRBYWgSJVrBqwyftM8Ux08XjN0ALJQ6Cx/lMdPSJj
1BzmKGdLsiwHBeuFzZtFhfr0e50wHV2j6jPnVH1lr2ZL3VgRtf8hUETFJLVfcq9E
vKG1BmhW7oq5zllV9sylrNWlcZFVkY6XbZrV/sdq7B/a/gGwox9vYn2wzZVZMxbB
VLetz69cQnA/vSwsIluMf92csYGEgMaVL4tiEwHm44EKWquJmJrvVyCOUxI+CUst
L2cSU3MT8mV0Q5hfdkmRHNGYKZlDnhy+4QwWCTkQOefmNCOcRhmSC7Wx+e1pc/8w
CT5EAwkbsA/pBwh+Xf5M3Q+JjGrP56lZaMBdiK4PqdSuEErz5C2+VM9+1mYWBLHl
OfaJ33xSJed3UuUsayQkL9ejxu9TaqRnbHEc7iwqtX/WPz9SlEW0tStWFt6lmOgT
rLtQ/BL2SBTyCiPb9ovC7Zbom3/99Wge5j22S82SJEou5xlL6Eo=
=4Pw3
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
iQKTBAABCgB9FiEEkb+/TWlWvV33ty0j3+aRrjMbo9sFAl7NwHtfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDkx
QkZCRjRENjk1NkJENURGN0I3MkQyM0RGRTY5MUFFMzMxQkEzREIACgkQ3+aRrjMb
o9twGg/+NtsaVN5xEukRMCv5zYmcLzdmW5ZTWZCeP39wT4sR5Y7VQaAb1QHQS2OV
Li3LNl1k3NPJRNcW8ANNz0bjhsARoLft9H5fqHaz1g1XwgJJFOpDdsT//FrDVA2g
beM4iHyPpMQjx/9c5E4OFumbwHnc/vbegMI7moRHDkS+Vlu2g2gJAFCtIJ9eblYT
5l/llzgupZYDvQig30gi29wcBypu7EbsMaCVXnqDzq7RBuAlaJYccGjmkE5h/KuN
/yWxYoluh8AExzhB7Mp7g87CuY4tIwohX0LGifoCUqb1hA9S30XLWQ4Kfx67ryIf
Kge5svOQkjCFylUSv79t9Y3HlMa3CrB6R2miYYMnAAzSbf/2eYFdNhVjjQaTi18h
k3rl+VwYwlg+S0iAK+TwSNNUuf5XbcHmaZ7LuGXIyFXLklAWzi0MvnKeNMA5TmvT
xx1riUd1bIF+nGGNeZUoG6kJ+6cx/V2WNLGuFVNdzDFZECD4k1xiVSNxHLpD2vk2
FYHp89VmUpvjB396yPWc8eW2TrfFuEufKPXVymfNWxZWWUrckd6Va2csuACtx8mZ
W1d+Cvr5yh0F667ucyLzKSdw80jM0MDfs164RvzIPp/LdU/juQxFFxI7LLG8avKc
E8CYpFHe5rEAAyWW0IMIjVoYGPzOfuaE+SgRFGPGqszMNKt9vZM=
=ZjJu
-----END PGP SIGNATURE-----

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

@ -13,11 +13,11 @@ 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.11.1/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
Index: subversion-1.14.0/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
===================================================================
--- subversion-1.11.1.orig/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java 2018-04-16 15:51:21.000000000 +0200
+++ subversion-1.11.1/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java 2019-01-18 15:03:10.407588129 +0100
@@ -144,10 +144,10 @@ public class BasicTests extends SVNTests
--- subversion-1.14.0.orig/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
+++ subversion-1.14.0/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
@@ -146,10 +146,10 @@ public class BasicTests extends SVNTests
{
vx = client.getVersionExtended(false);
String result = vx.getBuildDate();
@ -30,11 +30,11 @@ Index: subversion-1.11.1/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.11.1/subversion/libsvn_subr/opt.c
Index: subversion-1.14.0/subversion/libsvn_subr/opt.c
===================================================================
--- subversion-1.11.1.orig/subversion/libsvn_subr/opt.c 2018-03-15 12:54:29.000000000 +0100
+++ subversion-1.11.1/subversion/libsvn_subr/opt.c 2019-01-18 15:03:10.407588129 +0100
@@ -1085,12 +1085,8 @@ svn_opt__print_version_info(const char *
--- subversion-1.14.0.orig/subversion/libsvn_subr/opt.c
+++ subversion-1.14.0/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.11.1/subversion/libsvn_subr/opt.c
SVN_ERR(svn_cmdline_printf(pool, "%s\n", svn_version_ext_copyright(info)));
if (footer)
Index: subversion-1.11.1/subversion/libsvn_subr/version.c
Index: subversion-1.14.0/subversion/libsvn_subr/version.c
===================================================================
--- subversion-1.11.1.orig/subversion/libsvn_subr/version.c 2019-01-04 12:38:50.000000000 +0100
+++ subversion-1.11.1/subversion/libsvn_subr/version.c 2019-01-18 15:03:10.407588129 +0100
--- subversion-1.14.0.orig/subversion/libsvn_subr/version.c
+++ subversion-1.14.0/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.11.1/subversion/libsvn_subr/version.c
+ info->build_time = "";
info->build_host = SVN_BUILD_HOST;
info->copyright = apr_pstrdup
(pool, _("Copyright (C) 2019 The Apache Software Foundation.\n"
Index: subversion-1.11.1/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout
(pool, _("Copyright (C) 2020 The Apache Software Foundation.\n"
Index: subversion-1.14.0/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout
===================================================================
--- subversion-1.11.1.orig/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout 2015-05-11 14:35:49.000000000 +0200
+++ subversion-1.11.1/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout 2019-01-18 15:03:10.407588129 +0100
--- subversion-1.14.0.orig/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout
+++ subversion-1.14.0/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.11.1/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout
Index: subversion-1.14.0/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout
===================================================================
--- subversion-1.11.1.orig/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout 2015-05-11 14:35:49.000000000 +0200
+++ subversion-1.11.1/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout 2019-01-18 15:03:10.407588129 +0100
--- subversion-1.14.0.orig/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout
+++ subversion-1.14.0/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

14
subversion.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Thu Jun 11 07:40:28 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>
- Update to 1.14.0:
* Support for Python 3.x
* Support for Python 2.7 is being phased out
* New Build-Time Dependency: py3c
* Many enhancements and bug fixes
- Drop patches:
* subversion-1.12.0-swig-4.patch
* ruby27-warnings.patch
* ruby-includes.patch
- Refresh patch subversion-no-build-date.patch
-------------------------------------------------------------------
Tue May 5 09:24:22 UTC 2020 - Martin Liška <mliska@suse.cz>

63091
subversion.keyring
View File

File diff suppressed because it is too large Load Diff

48
subversion.spec
View File

@ -34,7 +34,7 @@
%bcond_with python_ctypes
%bcond_with all_regression_tests
Name: subversion
Version: 1.13.0
Version: 1.14.0
Release: 0
Summary: Subversion version control system
License: Apache-2.0
@ -60,11 +60,7 @@ Patch30: subversion-1.8.0-rpath.patch
Patch37: subversion-no-build-date.patch
Patch39: subversion-fix-parallel-build-support-for-perl-bindings.patch
Patch40: subversion-perl-underlinking.patch
# PATCH-FIX-UPSTREAM subversion-1.12.0-swig-4.patch -- Support Swig 4
Patch41: subversion-1.12.0-swig-4.patch
Patch42: gcc10-do-not-optimize-get_externals_to_pin.patch
Patch43: ruby27-warnings.patch
Patch44: ruby-includes.patch
Patch45: disable-fs-fs-pack-test.patch
BuildRequires: apache-rpm-macros
BuildRequires: apache2-devel >= 2.2.0
@ -78,9 +74,10 @@ BuildRequires: junit
BuildRequires: libstdc++-devel
BuildRequires: libtool
BuildRequires: pkgconfig
# Python 2 is required to run autogen.sh ; swig is also hardcoded to py2
BuildRequires: python2-devel >= 2.7
BuildRequires: python2-xml
BuildRequires: py3c-devel
BuildRequires: python3-devel >= 2.7
BuildRequires: python3-py3c
BuildRequires: python3-xml
BuildRequires: ruby-devel >= 1.8.2
BuildRequires: swig
BuildRequires: update-alternatives
@ -243,12 +240,7 @@ parameters and keywords for the svn command and other tools.
%patch37 -p1
%patch39
%patch40 -p1
%if 0%{?suse_version} > 1500
%patch41 -p1
%endif
%patch42 -p1
%patch43 -p1
%patch44 -p1
%patch45 -p1
%build
@ -314,17 +306,17 @@ export LDFLAGS="-pie"
--with-libmagic \
--disable-static \
--enable-broken-httpd-auth
make %{?_smp_mflags}
make doc-api %{?_smp_mflags}
%make_build
%make_build doc-api
# Bindings
make extraclean-bindings %{?_smp_mflags}
make %{?_smp_mflags} swig-py swig-rb swig-pl
%make_build extraclean-bindings
%make_build swig-py swig-rb swig-pl
%if %{with python_ctypes}
make %{?_smp_mflags} ctypes-python
%make_build ctypes-python
%endif
# Java is not thread safe
make -j1 JAVAC_FLAGS=" -encoding iso8859-1" javahl doc-javahl
%make_build -j1 JAVAC_FLAGS=" -encoding iso8859-1" javahl doc-javahl
%install
%make_install
@ -407,19 +399,19 @@ rm -rf doc/doxygen/html/installdox
%check
export LANG=C LC_ALL=C
make %{?_smp_mflags} check CLEANUP=true || (cat fails.log; exit 1)
make %{?_smp_mflags} check-javahl || (cat fails.log; exit 1)
make %{?_smp_mflags} check-swig-pl || (cat fails.log; exit 1)
%make_build check CLEANUP=true || (cat fails.log; exit 1)
%make_build check-javahl || (cat fails.log; exit 1)
%make_build check-swig-pl || (cat fails.log; exit 1)
%if 0%{?suse_version} <= 1500
# swig bindings check failing from swig 4.0.0 and later
make %{?_smp_mflags} check-swig-py || (cat fails.log; exit 1)
%make_build check-swig-py || (cat fails.log; exit 1)
%endif
make %{?_smp_mflags} check-swig-rb || (cat fails.log; exit 1)
%make_build check-swig-rb || (cat fails.log; exit 1)
%if %{with all_regression_tests}
make %{?_smp_mflags} svnserveautocheck CLEANUP=true FS_TYPE=fsfs || (cat fails.log; exit 1)
make %{?_smp_mflags} svnserveautocheck CLEANUP=true FS_TYPE=bdb || (cat fails.log; exit 1)
make %{?_smp_mflags} davautocheck CLEANUP=true FS_TYPE=fsfs || (cat fails.log; exit 1)
make %{?_smp_mflags} davautocheck CLEANUP=true FS_TYPE=bdb || (cat fails.log; exit 1)
%make_build svnserveautocheck CLEANUP=true FS_TYPE=fsfs || (cat fails.log; exit 1)
%make_build svnserveautocheck CLEANUP=true FS_TYPE=bdb || (cat fails.log; exit 1)
%make_build davautocheck CLEANUP=true FS_TYPE=fsfs || (cat fails.log; exit 1)
%make_build davautocheck CLEANUP=true FS_TYPE=bdb || (cat fails.log; exit 1)
%endif
%pre