Accepting request 870936 from devel:tools:scm:svn

OBS-URL: https://build.opensuse.org/request/show/870936
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/subversion?expand=0&rev=181

subversion-1.14.0.tar.bz2

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

subversion-1.14.0.tar.bz2.asc

@@ -1,76 +0,0 @@
------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-----

subversion-1.14.1.tar.bz2

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

subversion-1.14.1.tar.bz2.asc

@@ -0,0 +1,26 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQEcBAABAgAGBQJgG+hvAAoJEE99uqmaWblz4yUIAMCqnFGchPMrWNhrRLOb3oi+
+vzk64LJ1h2X3MzstqIzRGb3ja3VmPcx2kQ4MmmHLc7XzXL7rMVRgPJB9NzKhs+dp
+nvnTq0wS4KLjOzIiG3ump41T1qofi5ui5fbgeVEyU4py/fBDVeR0XokZ0k8HAZCj
+oM166uprcSr0RfeQqnlSNEFUgIMq1hxTOa879N4aoMsFoLaMx18gjFL1RUyaz/0R
+eH+EMkBk2wgGkzCWdOZlJeyp0YI6Lx4k/bHO8WXLci97tpw9t9UUtQAXTrKudShP
+fP9BQqUv0uHdUAF3ZiYga6VKQicynuXev4du2vVqLoQ+BgMQXPwnbgA/FtSpeOA=
+=z3Ba
+-----END PGP SIGNATURE-----
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEujwVsTN88PsiK9QaG8plhqNHlD8FAmAi0f0ACgkQG8plhqNH
+lD+H+g/9EJ2PEQyMZYCLof6DR9Lqh5dq5Uksp/w3/00TkKQEjNQzz4P7fvUoHO5x
+9eqdIWTehFpOhXHjGUEyAFj6Z2OoPRZLe9fsBLBd2vQQhW+du/k0vN2aSav/b1WZ
+yaqeJNNbUg+tZUV02SoScNOOUNhrFoaa3NQseV6gm7PdFgZIFLjtr6F/oX9eCWgY
+7kjVsJzI8ltlPA/IcvdDdwIKxUS0jSFRnk6IY9nniPRfukICr1Vm+4+xKa7RcxaO
+NFs7bGbx3RRfc9AWLiwSGjUVwd7grpVeIPxZSnii7yH+vngk59ozQGRQOZbM9Aym
+BRyIO84h0hqOpuZdDeMF2uQoXYZXtzU5GLi0Da38/4vJIAsX3bu1OzesuTFd3DCz
+npOwabjhoGLX7tqTXmMUAOCnSuBVmgQRNkGtVZDbQtJiulfA9LJGrpbcL0bS1C39
+FwiAU1xd3bj35KBLV4/YiDHn22n7BWoLcyCRnKOj6uPuFNkv3upps3S/gUrzIacS
+oxTOsT1caVLMNWTNrtaYJ9VOyGOrbevQi2zdvo/D2qQ6QtzpzvcFpdUYC01Q8fBL
+7+ztPS9OR5R8iKTtGxvPEPI7Ed0OkVuj5y+iWGxeMUtfzYcGzN62/x1BSJ3vpla7
+23nunL+LrfWm0z1L8mqCf95HCC79qaC15SxL7MZXfDiepCNs2NE=
+=QCtX
+-----END PGP SIGNATURE-----

subversion-no-build-date.patch

@@ -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.14.0/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
+Index: subversion-1.14.1/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
 ===================================================================
---- subversion-1.14.0.orig/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
+--- subversion-1.14.1.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
++++ subversion-1.14.1/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
-@@ -146,10 +146,10 @@ public class BasicTests extends SVNTests
+@@ -148,10 +148,10 @@ public class BasicTests extends SVNTests
          {
              vx = client.getVersionExtended(false);
              String result = vx.getBuildDate();
@@ -30,10 +30,10 @@ Index: subversion-1.14.0/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.0/subversion/libsvn_subr/opt.c
+Index: subversion-1.14.1/subversion/libsvn_subr/opt.c
 ===================================================================
---- subversion-1.14.0.orig/subversion/libsvn_subr/opt.c
+--- subversion-1.14.1.orig/subversion/libsvn_subr/opt.c
-+++ subversion-1.14.0/subversion/libsvn_subr/opt.c
++++ subversion-1.14.1/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.0/subversion/libsvn_subr/opt.c
    SVN_ERR(svn_cmdline_printf(pool, "%s\n", svn_version_ext_copyright(info)));
  
    if (footer)
-Index: subversion-1.14.0/subversion/libsvn_subr/version.c
+Index: subversion-1.14.1/subversion/libsvn_subr/version.c
 ===================================================================
---- subversion-1.14.0.orig/subversion/libsvn_subr/version.c
+--- subversion-1.14.1.orig/subversion/libsvn_subr/version.c
-+++ subversion-1.14.0/subversion/libsvn_subr/version.c
++++ subversion-1.14.1/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.0/subversion/libsvn_subr/version.c
 +  info->build_time = "";
    info->build_host = SVN_BUILD_HOST;
    info->copyright = apr_pstrdup
-     (pool, _("Copyright (C) 2020 The Apache Software Foundation.\n"
+     (pool, _("Copyright (C) 2021 The Apache Software Foundation.\n"
-Index: subversion-1.14.0/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout
+Index: subversion-1.14.1/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout
 ===================================================================
---- subversion-1.14.0.orig/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout
+--- subversion-1.14.1.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
++++ subversion-1.14.1/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.0/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout
+Index: subversion-1.14.1/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout
 ===================================================================
---- subversion-1.14.0.orig/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout
+--- subversion-1.14.1.orig/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout
-+++ subversion-1.14.0/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout
++++ subversion-1.14.1/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

subversion.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Feb 10 10:05:24 UTC 2021 - Markéta Machová <mmachova@suse.com>
+
+- Update to 1.14.1
+  * Fix non-deterministic generation of mergeinfo
+  * Fix invalid SQL quoting in working copy upgrade system
+  * Convert filename for editor from UTF-8 to the locale's encoding
+  * Make the hot-backup.py script work with Python 3
+  * Fix an uninitialized read in FSFS
+  * Fix a potential NULL dereference in the config file parser (bsc#1181687, CVE-2020-17525)
+- Rebase subversion-no-build-date.patch
+
 -------------------------------------------------------------------
 Tue Dec  1 14:33:34 UTC 2020 - pgajdos@suse.com
 

subversion.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package subversion
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 # Copyright (c) 2009-2010 Pascal Bleser <pascal.bleser@opensuse.org>
 #
 # All modifications and additions to the file contributed by third parties
@@ -39,7 +39,7 @@
 %bcond_with	python_ctypes
 %bcond_with	all_regression_tests
 Name:           subversion
-Version:        1.14.0
+Version:        1.14.1
 Release:        0
 Summary:        Subversion version control system
 License:        Apache-2.0