[packages/subversion] up to 1.10.2

[atler]

commit edc85268c50680075aa2ec5e57b3fb7bf4f77771
Author: Jan Palus <atler at pld-linux.org>
Date:   Fri Jul 20 13:41:50 2018 +0200

    up to 1.10.2
    
    - rdoc/keyring segfault patches applied upstream

 subversion-rdoc.patch            | 12 ------------
 subversion.spec                  | 10 +++-------
 with_gnome_keyring_sefault.patch | 23 -----------------------
 3 files changed, 3 insertions(+), 42 deletions(-)
---
diff --git a/subversion.spec b/subversion.spec
index 297f20b..f979a71 100644
--- a/subversion.spec
+++ b/subversion.spec
@@ -50,12 +50,12 @@ Summary:	A Concurrent Versioning system similar to but better than CVS
 Summary(pl.UTF-8):	System kontroli wersji podobny, ale lepszy, niż CVS
 Summary(pt_BR.UTF-8):	Sistema de versionamento concorrente
 Name:		subversion
-Version:	1.10.0
-Release:	7
+Version:	1.10.2
+Release:	1
 License:	Apache v2.0
 Group:		Development/Version Control
 Source0:	http://www.apache.org/dist/subversion/%{name}-%{version}.tar.bz2
-# Source0-md5:	0126847f9e8cb8ed0b90a6a18b203309
+# Source0-md5:	e05fb3b25b1599b395ecc36d5ef1a145
 Source1:	%{name}-dav_svn.conf
 Source2:	%{name}-authz_svn.conf
 Source3:	%{name}-svnserve.init
@@ -69,8 +69,6 @@ Patch1:		%{name}-DESTDIR.patch
 Patch2:		%{name}-ruby-datadir-path.patch
 Patch3:		%{name}-tests.patch
 Patch4:		x32-libdir.patch
-Patch5:		%{name}-rdoc.patch
-Patch6:		with_gnome_keyring_sefault.patch
 URL:		http://subversion.apache.org/
 %{?with_apache:BuildRequires:	apache-devel >= 2.4.14}
 BuildRequires:	apr-devel >= 1:1.3
@@ -452,8 +450,6 @@ uwierzytelniać się przy użyciu Portfela KDE.
 %patch2 -p0
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
-%patch6 -p0
 
 sed -i -e 's#serf_prefix/lib#serf_prefix/%{_lib}#g' build/ac-macros/serf.m4
 
diff --git a/subversion-rdoc.patch b/subversion-rdoc.patch
deleted file mode 100644
index f2e0c5c..0000000
--- a/subversion-rdoc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN subversion-1.10.0.orig/configure.ac subversion-1.10.0/configure.ac
---- subversion-1.10.0.orig/configure.ac	2018-04-14 17:34:49.273616506 +0200
-+++ subversion-1.10.0/configure.ac	2018-04-14 17:34:58.360223966 +0200
-@@ -1323,7 +1323,7 @@
-     if test -n "$RDOC"; then
-       AC_PATH_PROG(RDOC, "$RDOC", none)
-     else
--      AC_PATH_PROGS(RUBY, rdoc rdoc1 rdoc1.8 rdoc18 rdoc1.9 rdoc19 rdoc1.9.3 rdoc193 rdoc2 rdoc2.0 rdoc20 rdoc2.1 rdoc21 rdoc2.2 rdoc22 rdoc2.3 rdoc23 rdoc2.4 rdoc24, none)
-+      AC_PATH_PROGS(RDOC, rdoc rdoc1 rdoc1.8 rdoc18 rdoc1.9 rdoc19 rdoc1.9.3 rdoc193 rdoc2 rdoc2.0 rdoc20 rdoc2.1 rdoc21 rdoc2.2 rdoc22 rdoc2.3 rdoc23 rdoc2.4 rdoc24, none)
-     fi
-     AC_CACHE_CHECK([for Ruby major version], [svn_cv_ruby_major],[
-     svn_cv_ruby_major="`$RUBY -rrbconfig -e 'print RbConfig::CONFIG.fetch(%q(MAJOR))'`"
diff --git a/with_gnome_keyring_sefault.patch b/with_gnome_keyring_sefault.patch
deleted file mode 100644
index b21bc5f..0000000
--- a/with_gnome_keyring_sefault.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-[[[
-Fix segfault when subversion is built with gnome keyring support and keyring
-password lookup fails.
-
-* subversion/libsvn_subr/simple_providers.c
-  (svn_auth__simple_creds_cache_get): Initialize 'done' with FALSE since ie
-    password_get_gnome_keyring sets 'done' only to TRUE. In case of error
-    it leaves unintialized 'done' (usually non 0) and default_password with NULL
-    causing segfault at subsequent strcmp.
-]]]
-Index: subversion/libsvn_subr/simple_providers.c
-===================================================================
---- subversion/libsvn_subr/simple_providers.c	(revision 1835628)
-+++ subversion/libsvn_subr/simple_providers.c	(working copy)
-@@ -206,7 +206,7 @@
-         {
-           if (have_passtype)
-             {
--              svn_boolean_t done;
-+              svn_boolean_t done = FALSE;
- 
-               SVN_ERR(password_get(&done, &default_password, creds_hash,
-                                    realmstring, username, parameters,
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/subversion.git/commitdiff/edc85268c50680075aa2ec5e57b3fb7bf4f77771