[subversion] update to 1.7.4

[jorton]

commit 3ee8fd7773a9f61625b6e360b659885e05fe77a0
Author: Joe Orton <jorton at redhat.com>
Date:   Mon Mar 12 11:47:54 2012 +0000

    update to 1.7.4
    
    - fix build with httpd 2.4

 .gitignore                       |    1 +
 sources                          |    2 +-
 subversion-1.7.3-hashorder.patch |  958 --------------------------------------
 subversion-1.7.4-hashorder.patch |   34 ++
 subversion-1.7.4-httpd24.patch   |   36 ++
 subversion.spec                  |   12 +-
 6 files changed, 81 insertions(+), 962 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ced8619..d7122ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ subversion-1.6.12.tar.bz2
 /subversion-1.?.?
 /*.asc
 /subversion-1.?.??
+/subversion-1.7.4.tar.bz2
diff --git a/sources b/sources
index 4779bae..ed748fb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-867fb0a5db00710cf8dce0bdfa094b3b  subversion-1.7.3.tar.bz2
+99ace9433be21a4793fc1cdbf2fdea09  subversion-1.7.4.tar.bz2
diff --git a/subversion-1.7.4-hashorder.patch b/subversion-1.7.4-hashorder.patch
new file mode 100644
index 0000000..2517181
--- /dev/null
+++ b/subversion-1.7.4-hashorder.patch
@@ -0,0 +1,34 @@
+
+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/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
new file mode 100644
index 0000000..e7fe352
--- /dev/null
+++ b/subversion-1.7.4-httpd24.patch
@@ -0,0 +1,36 @@
+
+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 2d3b051..7b7073c 100644
--- a/subversion.spec
+++ b/subversion.spec
@@ -13,8 +13,8 @@
 
 Summary: A Modern Concurrent Version Control System
 Name: subversion
-Version: 1.7.3
-Release: 7%{?dist}
+Version: 1.7.4
+Release: 1%{?dist}
 License: ASL 2.0
 Group: Development/Tools
 URL: http://subversion.apache.org/
@@ -30,7 +30,8 @@ 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.3-hashorder.patch
+Patch5: subversion-1.7.4-hashorder.patch
+Patch6: subversion-1.7.4-httpd24.patch
 BuildRequires: autoconf, libtool, python, python-devel, texinfo, which
 BuildRequires: db4-devel >= 4.1.25, swig >= 1.3.24, gettext
 BuildRequires: apr-devel >= 1.3.0, apr-util-devel >= 1.3.0
@@ -168,6 +169,7 @@ This package includes supplementary tools for use with Subversion.
 %patch3 -p1 -b .kwallet
 %patch4 -p1 -b .ruby
 %patch5 -p1 -b .hashorder
+%patch6 -p1 -b .httpd24
 
 %build
 # Regenerate the buildsystem, so that:
@@ -451,6 +453,10 @@ fi
 %endif
 
 %changelog
+* Mon Mar 12 2012 Joe Orton <jorton at redhat.com> - 1.7.4-1
+- update to 1.7.4
+- fix build with httpd 2.4
+
 * Thu Mar  1 2012 Joe Orton <jorton at redhat.com> - 1.7.3-7
 - re-enable kwallet (#791031)