Accepting request 631124 from devel:tools:scm:svn

Apache Subversion 1.10.2

OBS-URL: https://build.opensuse.org/request/show/631124
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/subversion?expand=0&rev=157
This commit is contained in:
Yuchen Lin 2018-09-11 15:09:02 +00:00 committed by Git OBS Bridge
commit 40c428ddec
8 changed files with 3245 additions and 2541 deletions

View File

@ -1,53 +0,0 @@
------------------------------------------------------------------------
r1829015 | astieger | 2018-04-13 00:18:29 +0200 (Fri, 13 Apr 2018) | 6 lines
Changed paths:
M /subversion/trunk/subversion/svn/help-cmd.c
M /subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/help-cmd.c
Follow-up to r1829012, handle macro correctly
* subversion/svn/help-cmd.c (svn_cl__help): handle macro correctly
* tools/client-side/svn-mergeinfo-normalizer/help-cmd.c
(svn_min__help): same
------------------------------------------------------------------------
r1829012 | astieger | 2018-04-13 00:03:06 +0200 (Fri, 13 Apr 2018) | 8 lines
Changed paths:
M /subversion/trunk/subversion/svn/help-cmd.c
M /subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/help-cmd.c
Follow-up to r1798004, fix informative output for Gnome Keyring with
libsecret
* subversion/svn/help-cmd.c (svn_cl__help): Print Gnome Keyring when
* using libsecret
* tools/client-side/svn-mergeinfo-normalizer/help-cmd.c
(svn_min__help): same
------------------------------------------------------------------------
Index: trunk/subversion/svn/help-cmd.c
===================================================================
--- trunk/subversion/svn/help-cmd.c (revision 1829011)
+++ trunk/subversion/svn/help-cmd.c (revision 1829015)
@@ -166,7 +166,7 @@
pool);
#endif
}
-#ifdef SVN_HAVE_GNOME_KEYRING
+#if (defined(SVN_HAVE_GNOME_KEYRING) || defined(SVN_HAVE_LIBSECRET))
svn_stringbuf_appendcstr(version_footer, "* Gnome Keyring\n");
#endif
#ifdef SVN_HAVE_GPG_AGENT
Index: trunk/tools/client-side/svn-mergeinfo-normalizer/help-cmd.c
===================================================================
--- trunk/tools/client-side/svn-mergeinfo-normalizer/help-cmd.c (revision 1829011)
+++ trunk/tools/client-side/svn-mergeinfo-normalizer/help-cmd.c (revision 1829015)
@@ -163,7 +163,7 @@
pool)),
pool);
#endif
-#ifdef SVN_HAVE_GNOME_KEYRING
+#if (defined(SVN_HAVE_GNOME_KEYRING) || defined(SVN_HAVE_LIBSECRET))
svn_stringbuf_appendcstr(version_footer, "* Gnome Keyring\n");
#endif
#ifdef SVN_HAVE_GPG_AGENT

View File

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

View File

@ -1,70 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABCAAGBQJazbENAAoJEB+wZLhO7MST7f8P/iXfdnt6mF7/ORi1mU+mtOyT
JuPqZUmDXyBhSHa44na6AyWG6qU5gKRtuGd94kALS/bFL183RF35VUWOXGH9fZrF
5ncLgiNE0tc7hE/A79Rrh7fy0V4ycwZew7LYhNXRtozJVgsnFiPU9B/0uLzyeiSA
W7TTSXNKH2q0wsrJZkaO4Hzw92XTIwKqsf/Ip0enJhpqVR9GmI048DW9HFNWJD23
q67gZE3MiUWdjvYtU8YlQJCQB015aEHv3v1nTSztGBfGhVzSIg4Kaz+dWwIU5vhG
rmYY9lRsuAVbRD7cfkVJuMLHc7LXNlkrAIBFG37rzuZcEhqH7ohpLJ6H2eq0yz5r
QKQ8UXrnLmYHrYt9pdyEymBzKTtTp+MtJZu5zHIEdfxNJo88wWj/Ex1RsTMXIuit
RKH+aLp+NU92YmnufID+13+8xy21voi30F5NeXtcteqZmm/GmEyd2+mWalnZ8rtC
lp/o9lsPHArMAHIRb5gEoqO8jtTCTJJpRhP9TSfVdMEA8ldKG8DZN/KlWsDW0oxA
Jol9ufIlqUawG8qg55YZMoVbNxe28zR53bgtSSgEDn/iU6XvDaP5ljkvHkMBTcdO
tu10ZIa1l4I6OJAPwy62I+iSUD9f5m20JIVOYwehIFwx6hgrGCvcpLFnQ6nP/6aV
1LkjOjpjR5zczC/jXVuh
=hAWU
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
iQEcBAABAgAGBQJazbm0AAoJEE99uqmaWblzOFMIALls1/WFE22CbchrJC24PrlV
7YjTNaY/DhGMB3Pog5yo9mVtxVvG9eJkmNLI4PsgmPYWtgG7cSP7J2gwFeAzLgMd
RVRxyy1Aoh6fEP0EdpvsyCF2ViwKRqbCKC/w/6Ka+RkJidz6uh2CLNHhs28XOI9L
XVMauuTYdB5Jr7KXumsE6YyuCk3/SLgsLVIV6zSqSH6mkoI/3ySl7N0JPkRquvdY
4Mip98jrcnu7bd2cPIgS5Ab8ixAdpbNdQ+pDiz6IA1vp+QX9vEPLES15p/ZolmmM
CIU+0JMUfqj5X3ZD18F1H/hbTvQX8rgrTtfVwdpQocu8cYQOeWQmi4fIxyt12Zs=
=H6ah
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEujwVsTN88PsiK9QaG8plhqNHlD8FAlrOV9QACgkQG8plhqNH
lD+xDQ/+NqfwDQlpSD58tvNd8d3wKseVdW4bg8THQ8Q4d7DPFs9u12ic8JRcaK3g
uBNtK2k0FzZZGxB8PmsY1fMwdGnD3YBxqzXIZHUn2B26JSdzy9hSrjl+erHC1lPP
IbT5LdngLs/2Mki78raEvVTsTXWj5RYd/mDz1zvsrGn+1yY8aYPYw/sbL+h0qoCg
zhfo/yRNo6K3ltPKRvwuIIEhz/uK3nm2HdFlianbj3dHxx6Nm/QKre6fZPv/dJTR
kn3Ki/GkRKZwc61CSpHBl56PJlBvyq19EsJU8hOXEGyx3tw0LhaNNYm9WXfyCxSh
kzZ0UCiyK4iO6rEBC3FdLPOVfJQS+lQesClMgKVbnjd24cCg+JBcP7Tg1rjXR3RM
2b8983ujB2W7fi2cnpWDHKgSVS7ZN+Am9wwbqCjjJgBDx/kmEqZ5d8V7Whdgke7F
0rrIlTwpAwZzFvebsBgIF2V90vAwOT40pyrMlUCWCs6PzRDA9LW+ZSVlbGawjEaS
3cr5Von/7kiBLJWJee6kV9iQrEFxhGo0XK61n6l7fGQ84JktyaS+qkQFNAeBJCBs
vZijqxQcjn3W79jF0GRMKIWltv/soPQ0c3Ltjo/uGzapbrJt9AV8gjTnwsqjE2cY
Yr+S/TRRxMPGFhZR+SF8/vgXZLiMFluptDL2m8ckyTh6KInQa4o=
=dRwy
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEe4yn9kUa2JyK3Ad7N2o8/RELHJUFAlrOkDEACgkQN2o8/REL
HJUd8w//YZCbEINiTp2YZdHrF9AX8pTwBYWpC/kG3Scd7QhgUVb7zdEu3f74Pw46
dTG5oTT1+kop/O80SDNSDjrpcpMN2pO6tM3JboJjOQJxXx7s5CkfnwFt+d5SlyKr
VHFVYjjZgqhKYsqptK95p2Wk8W6wN1qOyJwtWK8GD9lU+bN6rxhMcWjF4iVmzgPr
zsqaz08jrtSZhjkQJ0fZsFcyMYrm2Foszr+si9plXYnAZoDVPyifDJF7edx2Bhlq
+yMqFEVQ5n55jJurSqZrMuSdpcApQ4h+rOLkhtIjCbb9sZZJf6KdLDrMvMU81jPH
gXNBbIgS7ptJ1LO6dYrU5c1cmvh936xlkRxodySqPq3IRVV5qCcp3+w+gY/Evjhb
jG9YjOlZjiZkl+7We3W3oM313TrIXgdJ/+raiekOzdE+EGWU8N9lKcijp2rkCu0L
WTfTF06THRKEX/OWioB/zMH5zLjnJp+psh8tcSeI1WKThSYRul6YAd01nf4DSBPT
F+Cxr73hbIVmBSvzpdinclbtqk+ISuc2O7pLeaBK4HKVa+a5oZWpTabpqDqwEV6l
2FLng0Hl67zD0JwKmhVU0gXVVFHIR4wnr9p0Brow+sHQVNK+tqS23l9xVEyWpciR
uo39u/oU5pc13FcPb0uLIiiU+ldI+sElMckrBYHIcicJGcaigVo=
=npig
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
iQEzBAABCAAdFiEEqER5D7V0NgbulZIHdteI4e0aWZwFAlrOm/EACgkQdteI4e0a
WZwowwgAmEzpbjuEC1jJAIaltT+4d0KxZBiz24OZcL+XkXB/9FgK4E46Aics0Qnv
iHblZVxB+46MbhT3xOvHxO9sK7EV4N48IOnxciUsSn9y/h2GqS0WB7/grJpWlyzu
SsFWzcD82WhQVnAbLdjXddJbLYDSeEhz6Nlcn8T8KsQcKn7hg6O2YNf5N1UR+6df
f/zTfKbAgRFb7TxCLicwglNrjuLAcFkWVrFxmxcEzBcEmTERighpr2fY2X21pk4c
4OyOjdOkGcNY56xGONme79PWzFyXoz9Lk7zXD5GNmceQVJU1rQxlUnDlOkGR83oR
iyeoDWCFw+rfeR32q5s0T8yDrm5Y5Q==
=7+LT
-----END PGP SIGNATURE-----

View File

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

View File

@ -0,0 +1,49 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABCAAGBQJbSl2RAAoJEB+wZLhO7MSTN8sP/iiqzJsyX0QU80pHef2eRq6L
XRwBVWGKykGuiFKDJ4eIz3RdMKwuxbZqpUHolOALPQpFJhVo9ukHHC5NtOGo7b04
UltX69KQRr0o9VYBMhNxUo89ytZqqAoenDX8k6CNpJ2iZAlehugRwD7kVpeZX16T
6VBq9s1bnN7gsy4JxmIYw90nCvRy16aZvuRzMoj81GDx4dkmT9TTYRkGCco7TaTU
ZG5RDzcxGlOEoq2BGsC+0ZmEZA8qymXi78JNMOovZHQAD9DpN82X2AfUBTWZysQg
/rUUG/aCXdV37hEmPDZk6YvO2xV+92agcDZ7rUmjm+odH7hAYjnSEOiE17Y17Cxk
eOXpwIHuNxLkfkYYNAiYL3y2fxAP8YgRylFHW18KcsZ0Iam3dgqyA7ooYvv4yzTv
fsR5X4gVStTBbIe269ip7/CktVVuGI7osIzv5/2zsAYogKu+7UXWk3JErmmSoed8
/w27XrdHXcf3nz0550kyXrGxVu+1/+U5OaFy9RedvqxZdFqR0jbfQz+e107ZrksO
dpi233CgmxkioJhffkk4PX8/qEIb9A3dI7aZGfmI07gqmDK8XqbI5wfXljLN43IG
zC+itQcRSVX2yAAZm9jVFikBMWjoKA0utlKKfwhkeS4TJgW20lbTmI64VBZG1vrd
fzt5VGnBYI+CNjgFUSAJ
=qcbn
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEujwVsTN88PsiK9QaG8plhqNHlD8FAltMkZkACgkQG8plhqNH
lD9d2g/8CRnnmfo8ir3EGDtoCimj+z7fJvl32GpOv5d5qifC0b02j3bQiOczJOdc
A4XJtp947GPNARCYxlsKNfHU+HDQhmHZLAL8WzvFRJUQgl3yBW2wDlZwcyn8pENA
ryAqi0EeaHxJa6PGEyj+h9x8qpS+Hjlm7ceObhmcsutzArLk5EB9fnSwB+ueZh/t
ErIJdFZwk0dK16yicycL4YNO5EUst0Hiev0pW9n/pZrHYzQ3q0NKmcGWPCPNfT4F
0+C5qb941qtVl18Sajid2eMrQBrQEDHDm89lXxJ/e+Gc4fRLmUM07xuDm6wIb19F
al8KT/Xi3JS5zH/mKM9MQfkHCaoskY/s94GciJ+bTFVo3VqfrdEkE0CiiDN7bUUp
o4A28LMOj4mXrWXJFNFc+eJ/EJnPjqEJeI5aqvWeMIpkVUTR0EF2c5qtyObrTJuw
Zu8D3DrHI67D4lEQf+Gs0Dqeu9OCdxEgennJ1ZQr2y2i7ED45RhwAgi5fHnY3Hrn
QYnSQUM+/85uAqS9m1UDiokj/blVadi9eTyBX7IFEjTAOQqT30F0lAovEDT0Vl0E
yBM2lFeR+OnY1V1LO69e2rkAnRU3+EoXhLcpXamzXebW6hQLs5CPqCgRUsaPEoie
WscwNO8yK3TemjYNJd7dxOUq6A5+0d+ChZ/3QNjGr1Tdc9hSsHo=
=mhN6
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEe4yn9kUa2JyK3Ad7N2o8/RELHJUFAltWUgkACgkQN2o8/REL
HJXcqA/7BIur5emjQExqbvEFf8AgG1MvK5U9MJbTCUxAJHjJ3cQqlLwxCu/jk8vC
KvcYwHhfVNMi4hlyStQTIbFCEjhrggq09IuT3biCZFoJHvu67wFSh1kO9rBFm+5p
YsMDL36+nctOLQQvSYN3yJRAz4vd3KA4mBmQr727Xo+WJIV7nlZl4mkquQftIdm3
DeFiIaV18mH05zv2XDAV6MAArW4gAbD4cpmrwvxLC5ODIHNcKLOA0LxtqilWlv8Q
BH+TnzIhqKmOgCgMWI59jsdhO/rUvR2bvS9PWTVJ/xrJUgauvyI+sN1CMoMHb78B
6lsZsC8aNkvAh2OrZaV0EgsOO4Wg6ayB2as8jganEpcetrkOBoBxK0//6uEQ0xjj
iFQoUwFukyOfZMzk2HIKOWD8+sAl9ao1uftHV1y2hfFrUbfG8R2W/+iezO2DDF4/
iOAcJAz/6/7pYjgvlft41Nfd8DhrELXtrdRK8RCFl9W2cXpZXcIZ/Anrj0g98K42
7nZ0VqkUoeVnb38SUPq3it0buIPbNQIDIUPhlAzICqmEQAU8U77qPBycwr0XA7DG
AZQjG3t0VoH9nrSprYJ1qVKfYf9oxKEaNolpd6c1+ncNLQq8FWycHFD0qIhR5NGU
0XHWIdlnEdLjpaJLBLd1WfFjXIAs5s5sUvJ28voX3U+rY7IV6Xs=
=fnwy
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Thu Aug 23 13:48:11 UTC 2018 - astieger@suse.com
- Apache Subversion 1.10.2:
* Correctly claim to offer Gnome Keyring support with libsecret
* Fix segfault using Gnome Keyring with libsecret
* Fix JavaHL local refs capacity warning when unparsing externals
* Prune externals after 'update --set-depth=exclude'
* Fix "conflict resolver searches too far back ..."
- Dropped patches that are included in the upstream release:
* subversion-1.10.0-fix-svn-version-gnome-keyring.patch
-------------------------------------------------------------------
Wed Jul 25 12:32:43 UTC 2018 - tchvatal@suse.com

File diff suppressed because it is too large Load Diff

View File

@ -35,7 +35,7 @@
%bcond_without python_ctypes
%bcond_with all_regression_tests
Name: subversion
Version: 1.10.0
Version: 1.10.2
Release: 0
Summary: Subversion version control system
License: Apache-2.0
@ -61,7 +61,6 @@ 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
Patch41: subversion-1.10.0-fix-svn-version-gnome-keyring.patch
BuildRequires: apache-rpm-macros
BuildRequires: apache2-devel >= 2.2.0
BuildRequires: apache2-prefork
@ -249,7 +248,6 @@ parameters and keywords for the svn command and other tools.
%patch37 -p1
%patch39
%patch40 -p1
%patch41 -p1
%build
# Re-boot strap, needed for patch37