diff --git a/sources b/sources index 3b6a736..27c986f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (subversion-1.13.0.tar.bz2) = 36f390b412bf772bf894efc2aadc247f12ca30ac407e04f664c14411c3519e1bb242d1239f2f44cbcb86eafc7c413efc8eadbfe1d1e75118235a7b7adc6c85b2 +SHA512 (subversion-1.14.0-rc2.tar.bz2) = 149e961939bf12aafa8b545b3bd1713dfee95d05134b500a8e4279cd1719528f13ff4fdda7ed77ce74630dbd2390f9c7cfcd0a0595f92d95c4ba914f8bd3a76c diff --git a/subversion-1.12.2-fsfspacktest.patch b/subversion-1.12.2-fsfspacktest.patch deleted file mode 100644 index ba5e0fa..0000000 --- a/subversion-1.12.2-fsfspacktest.patch +++ /dev/null @@ -1,26 +0,0 @@ - -get_rev_contents() has signed integer overflow with "long int" rev -and behaves unpredictably. - ---- subversion-1.12.2/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c.fsfspacktest -+++ subversion-1.12.2/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c -@@ -59,7 +59,8 @@ - get_rev_contents(svn_revnum_t rev, apr_pool_t *pool) - { - /* Toss in a bunch of magic numbers for spice. */ -- apr_int64_t num = ((rev * 1234353 + 4358) * 4583 + ((rev % 4) << 1)) / 42; -+ apr_int64_t rev64 = rev; -+ apr_int64_t num = ((rev64 * 1234353 + 4358) * 4583 + ((rev64 % 4) << 1)) / 42; - return apr_psprintf(pool, "%" APR_INT64_T_FMT "\n", num); - } - -@@ -407,7 +408,8 @@ - - if (! svn_stringbuf_compare(rstring, sb)) - return svn_error_createf(SVN_ERR_FS_GENERAL, NULL, -- "Bad data in revision %ld.", i); -+ "Bad data in revision %ld - [%s] not [%s].", -+ i, rstring->data, sb->data); - } - - return SVN_NO_ERROR; diff --git a/subversion-1.12.2-py3tests.patch b/subversion-1.12.2-py3tests.patch deleted file mode 100644 index e526141..0000000 --- a/subversion-1.12.2-py3tests.patch +++ /dev/null @@ -1,44 +0,0 @@ - -Fix tests for Python 3. - ---- subversion-1.12.2/subversion/tests/cmdline/svnadmin_tests.py.py3tests -+++ subversion-1.12.2/subversion/tests/cmdline/svnadmin_tests.py -@@ -3859,7 +3859,7 @@ - sbox.repo_url) - - dump_lines = svntest.actions.run_and_verify_dump(sbox.repo_dir) -- assert propval + '\n' in dump_lines -+ assert bytes(propval, 'utf-8') + b'\n' in dump_lines - - def check_recover_prunes_rep_cache(sbox, enable_rep_sharing): - """Check 'recover' prunes the rep-cache while enable-rep-sharing is ---- subversion-1.12.2/subversion/tests/cmdline/svntest/verify.py.py3tests -+++ subversion-1.12.2/subversion/tests/cmdline/svntest/verify.py -@@ -135,11 +135,17 @@ - actual = [actual] - - if self.match_all: -+ if len(expected) and len(actual) \ -+ and type(actual[0]) is bytes and type(expected[0]) is str: -+ actual = [a.decode('utf-8') for a in actual] - return expected == actual - - i_expected = 0 - for actual_line in actual: -- if expected[i_expected] == actual_line: -+ expected_line = expected[i_expected] -+ if type(actual_line) is bytes and type(expected_line) is str: -+ actual_line == actual_line.decode('utf-8') -+ if expected_line == actual_line: - i_expected += 1 - if i_expected == len(expected): - return True -@@ -475,6 +481,8 @@ - if actual is not None: - logger.warn('ACTUAL %s:', actual_label) - for x in actual: -+ if type(x) == bytes: -+ x = x.decode("utf-8") - logger.warn('| ' + x.rstrip()) - - def compare_and_display_lines(message, label, expected, actual, diff --git a/subversion.spec b/subversion.spec index 0e4ca95..cacfa1e 100644 --- a/subversion.spec +++ b/subversion.spec @@ -44,12 +44,12 @@ Summary: A Modern Concurrent Version Control System Name: subversion -Version: 1.13.0 -Release: 4%{?dist} +Version: 1.14.0~rc2 +Release: 0%{?dist} License: ASL 2.0 URL: https://subversion.apache.org/ -Source0: https://www.apache.org/dist/subversion/subversion-%{version}.tar.bz2 +Source0: https://downloads.apache.org/dist/subversion/subversion-1.14.0-rc2.tar.bz2 Source1: subversion.conf Source3: filter-requires.sh Source4: http://www.xsteve.at/prg/emacs/psvn.el @@ -58,10 +58,8 @@ Source6: svnserve.service Source7: svnserve.tmpfiles Source8: svnserve.sysconf Patch1: subversion-1.12.0-linking.patch -Patch2: subversion-1.12.2-py3tests.patch Patch4: subversion-1.8.0-rubybind.patch Patch5: subversion-1.8.5-swigplWall.patch -Patch7: subversion-1.12.2-fsfspacktest.patch BuildRequires: autoconf, libtool, texinfo, which BuildRequires: swig >= 1.3.24, gettext %if %{with bdb} @@ -213,14 +211,10 @@ Requires: subversion%{?_isa} = %{version}-%{release} This package includes supplementary tools for use with Subversion. %prep -%setup -q +%setup -q -n subversion-1.14.0-rc2 %patch1 -p1 -b .linking -%if %{with python3} -%patch2 -p1 -b .py3tests -%endif %patch4 -p1 -b .rubybind %patch5 -p1 -b .swigplWall -%patch7 -p1 -b .fsfspacktest %build # Regenerate the buildsystem, so that: @@ -542,6 +536,9 @@ make check-javahl %endif %changelog +* Thu Apr 23 2020 Joe Orton - 1.14.0~rc2-0 +- update to 1.14.0-rc2 + * Wed Feb 12 2020 Joe Orton - 1.13.0-4 - fix FTBFS on 32-bit arches