← Back to branch summary

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

« back to all changes in this revision

Viewing changes to subversion/svn/cl-conflicts.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/svn/cl-conflicts.h
63
63
  const svn_wc_conflict_description2_t *conflict,
64
64
  apr_pool_t *pool);
65
65
 
 
66
/* Like svn_cl__get_human_readable_tree_conflict_description but
 
67
   for other conflict types */
 
68
svn_error_t *
 
69
svn_cl__get_human_readable_action_description(
 
70
        const char **desc,
 
71
        svn_wc_conflict_action_t action,
 
72
        svn_wc_operation_t operation,
 
73
        svn_node_kind_t kind,
 
74
        apr_pool_t *pool);
 
75
 
66
76
/**
67
77
 * Append to @a str an XML representation of the conflict data
68
78
 * for @a conflict, in a format suitable for 'svn info --xml'.