← Back to branch summary

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

« back to all changes in this revision

Viewing changes to subversion/bindings/javahl/native/DiffOptions.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/bindings/javahl/native/DiffOptions.h
29
29
 
30
30
#include <apr_tables.h>
31
31
#include "svn_types.h"
 
32
#include "svn_diff.h"
32
33
#include "Pool.h"
33
34
#include "JNIUtil.h"
34
35
 
38
39
  DiffOptions(jobject joptions);
39
40
 
40
41
  apr_array_header_t *optionsArray(SVN::Pool &resultPool) const;
 
42
  svn_diff_file_options_t *fileOptions(SVN::Pool &resultPool) const;
41
43
 
42
44
  svn_boolean_t useGitDiffFormat() const
43
45
  {