← 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.cpp

  • 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.cpp
71
71
  if (flags & SHOW_C_FUNCTION)
72
72
    APR_ARRAY_PUSH(opt, const char*) = "--show-c-function";
73
73
 
 
74
  /* TODO: Support -U (context size) */
 
75
 
 
76
  return opt;
 
77
}
 
78
 
 
79
svn_diff_file_options_t *DiffOptions::fileOptions(SVN::Pool &resultPool) const
 
80
{
 
81
  svn_diff_file_options_t *opt;
 
82
 
 
83
  opt = svn_diff_file_options_create(resultPool.getPool());
 
84
 
 
85
  if (flags & IGNORE_ALL_SPACE)
 
86
    opt->ignore_space = svn_diff_file_ignore_space_all;
 
87
  else if (flags & IGNORE_SPACE_CHANGE)
 
88
    opt->ignore_eol_style = svn_diff_file_ignore_space_change;
 
89
 
 
90
  if (flags & IGNORE_EOL_STYLE)
 
91
    opt->ignore_eol_style = TRUE;
 
92
 
 
93
  if (flags & SHOW_C_FUNCTION)
 
94
    opt->show_c_function = TRUE;
 
95
 
 
96
  /* TODO: Support context size */
 
97
 
74
98
  return opt;
75
99
}