From 8a2548890d58e53fe5070f6846490de606b552b7 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Tue, 22 May 2012 12:39:08 +0100 Subject: [PATCH] remove patches merged upstream. --- subversion-1.7.4-hashorder.patch | 72 -------------------------------- subversion-1.7.4-httpd24.patch | 36 ---------------- subversion.spec | 4 -- 3 files changed, 112 deletions(-) delete mode 100644 subversion-1.7.4-hashorder.patch delete mode 100644 subversion-1.7.4-httpd24.patch diff --git a/subversion-1.7.4-hashorder.patch b/subversion-1.7.4-hashorder.patch deleted file mode 100644 index fdc11a4..0000000 --- a/subversion-1.7.4-hashorder.patch +++ /dev/null @@ -1,72 +0,0 @@ - -Remaining fixes for APR hashorder issues. - ---- subversion-1.7.4/subversion/bindings/swig/python/tests/repository.py.hashorder -+++ subversion-1.7.4/subversion/bindings/swig/python/tests/repository.py -@@ -170,9 +170,11 @@ class SubversionRepositoryTestCase(unitt - repos.dir_delta(prev_root, '', '', this_root, '', e_ptr, e_baton, - _authz_callback, 1, 1, 0, 0) - -- # Check results -- self.assertEqual(editor.textdeltas[0].new_data, "This is a test.\n") -- self.assertEqual(editor.textdeltas[1].new_data, "A test.\n") -+ # Check results. -+ # Ignore the order in which the editor delivers the two sibling files. -+ self.assertEqual(set([editor.textdeltas[0].new_data, -+ editor.textdeltas[1].new_data]), -+ set(["This is a test.\n", "A test.\n"])) - self.assertEqual(len(editor.textdeltas), 2) - - def test_retrieve_and_change_rev_prop(self): ---- subversion-1.7.4/subversion/bindings/swig/python/tests/trac/versioncontrol/tests/svn_fs.py.hashorder -+++ subversion-1.7.4/subversion/bindings/swig/python/tests/trac/versioncontrol/tests/svn_fs.py -@@ -264,16 +264,25 @@ class SubversionRepositoryTestCase(unitt - - def test_diff_dir_different_revs(self): - diffs = self.repos.get_deltas('trunk', 4, 'trunk', 8) -- self._cmp_diff((None, ('trunk/dir1/dir2', 8), -- (Node.DIRECTORY, Changeset.ADD)), diffs.next()) -- self._cmp_diff((None, ('trunk/dir1/dir3', 8), -- (Node.DIRECTORY, Changeset.ADD)), diffs.next()) -- self._cmp_diff((None, ('trunk/README2.txt', 6), -- (Node.FILE, Changeset.ADD)), diffs.next()) -- self._cmp_diff((('trunk/dir2', 4), None, -- (Node.DIRECTORY, Changeset.DELETE)), diffs.next()) -- self._cmp_diff((('trunk/dir3', 4), None, -- (Node.DIRECTORY, Changeset.DELETE)), diffs.next()) -+ expected = [ -+ (None, ('trunk/README2.txt', 6), -+ (Node.FILE, Changeset.ADD)), -+ (None, ('trunk/dir1/dir2', 8), -+ (Node.DIRECTORY, Changeset.ADD)), -+ (None, ('trunk/dir1/dir3', 8), -+ (Node.DIRECTORY, Changeset.ADD)), -+ (('trunk/dir2', 4), None, -+ (Node.DIRECTORY, Changeset.DELETE)), -+ (('trunk/dir3', 4), None, -+ (Node.DIRECTORY, Changeset.DELETE)), -+ ] -+ actual = [diffs.next() for i in range(5)] -+ actual = sorted(actual, -+ key=lambda diff: ((diff[0] or diff[1]).path, -+ (diff[0] or diff[1]).rev)) -+ self.assertEqual(len(expected), len(actual)) -+ for e,a in zip(expected, actual): -+ self._cmp_diff(e,a) - self.assertRaises(StopIteration, diffs.next) - - def test_diff_dir_different_dirs(self): ---- subversion-1.7.4/subversion/bindings/swig/python/tests/wc.py.hashorder -+++ subversion-1.7.4/subversion/bindings/swig/python/tests/wc.py -@@ -216,8 +216,9 @@ class SubversionWorkingCopyTestCase(unit - - def test_entries_read(self): - entries = wc.entries_read(self.wc, True) -- -- self.assertEqual(['', 'tags', 'branches', 'trunk'], list(entries.keys())) -+ keys = list(entries.keys()) -+ keys.sort() -+ self.assertEqual(['', 'branches', 'tags', 'trunk'], keys) - - def test_get_ignores(self): - self.assert_(isinstance(wc.get_ignores(None, self.wc), list)) diff --git a/subversion-1.7.4-httpd24.patch b/subversion-1.7.4-httpd24.patch deleted file mode 100644 index e7fe352..0000000 --- a/subversion-1.7.4-httpd24.patch +++ /dev/null @@ -1,36 +0,0 @@ - -http://svn.apache.org/viewvc?view=revision&revision=1232267 - ---- subversion-1.7.4/subversion/mod_dav_svn/util.c.httpd24 -+++ subversion-1.7.4/subversion/mod_dav_svn/util.c -@@ -624,19 +624,20 @@ void dav_svn__log_err(request_rec *r, - /* Log the errors */ - /* ### should have a directive to log the first or all */ - for (errscan = err; errscan != NULL; errscan = errscan->prev) { -+ apr_status_t status; -+ - if (errscan->desc == NULL) - continue; - -- if (errscan->save_errno != 0) { -- errno = errscan->save_errno; -- ap_log_rerror(APLOG_MARK, level, errno, r, "%s [%d, #%d]", -- errscan->desc, errscan->status, errscan->error_id); -- } -- else { -- ap_log_rerror(APLOG_MARK, level, 0, r, -- "%s [%d, #%d]", -- errscan->desc, errscan->status, errscan->error_id); -- } -+#if AP_MODULE_MAGIC_AT_LEAST(20091119,0) -+ status = errscan->aprerr; -+#else -+ status = errscan->save_errno; -+#endif -+ -+ ap_log_rerror(APLOG_MARK, level, status, r, -+ "%s [%d, #%d]", -+ errscan->desc, errscan->status, errscan->error_id); - } - } - diff --git a/subversion.spec b/subversion.spec index 85b4ac5..890b45c 100644 --- a/subversion.spec +++ b/subversion.spec @@ -42,8 +42,6 @@ Patch1: subversion-1.7.0-rpath.patch Patch2: subversion-1.7.0-pie.patch Patch3: subversion-1.7.0-kwallet.patch Patch4: subversion-1.7.2-ruby19.patch -Patch5: subversion-1.7.4-hashorder.patch -Patch6: subversion-1.7.4-httpd24.patch Patch7: subversion-1.7.4-kwallet2.patch Patch8: subversion-1.7.4-sqlitever.patch BuildRequires: autoconf, libtool, python, python-devel, texinfo, which @@ -182,8 +180,6 @@ This package includes supplementary tools for use with Subversion. %patch2 -p1 -b .pie %patch3 -p1 -b .kwallet %patch4 -p1 -b .ruby -%patch5 -p1 -b .hashorder -%patch6 -p1 -b .httpd24 %patch7 -p1 -b .kwallet2 %patch8 -p1 -b .sqlitever