← Back to branch summary

~ubuntu-branches/debian/sid/subversion/sid

« back to all changes in this revision

Viewing changes to subversion/include/private/svn_diff_private.h

  • Committer: Package Import Robot
  • Author(s): James McCoy
  • Date: 2015-08-07 21:32:47 UTC
  • mfrom: (0.2.15) (4.1.7 experimental)
  • Revision ID: package-import@ubuntu.com-20150807213247-ozyewtmgsr6tkewl
Tags: 1.9.0-1
http://bugs.debian.org/791844
* Upload to unstable
* New upstream release.
  + Security fixes
    - CVE-2015-3184: Mixed anonymous/authenticated path-based authz with
      httpd 2.4
    - CVE-2015-3187: svn_repos_trace_node_locations() reveals paths hidden
      by authz
* Add >= 2.7 requirement for python-all-dev Build-Depends, needed to run
  tests.
* Remove Build-Conflicts against ruby-test-unit.  (Closes: #791844)
* Remove patches/apache_module_dependency in favor of expressing the
  dependencies in authz_svn.load/dav_svn.load.
* Build-Depend on apache2-dev (>= 2.4.16) to ensure ap_some_authn_required()
  is available when building mod_authz_svn and Depend on apache2-bin (>=
  2.4.16) for runtime support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
subversion/include/private/svn_diff_private.h
97
97
 * merged or reverse merged; otherwise (or if the mergeinfo property values
98
98
 * don't parse correctly) display them just like any other property.
99
99
 *
 
100
 * Pass @a context_size, @a cancel_func and @a cancel_baton to the diff
 
101
 * output functions.
 
102
 *
100
103
 * Use @a scratch_pool for temporary allocations.
101
104
 */
102
105
svn_error_t *
105
108
                             const apr_array_header_t *propchanges,
106
109
                             apr_hash_t *original_props,
107
110
                             svn_boolean_t pretty_print_mergeinfo,
 
111
                             int context_size,
 
112
                             svn_cancel_func_t cancel_func,
 
113
                             void *cancel_baton,
108
114
                             apr_pool_t *scratch_pool);
109
115
 
110
116