← Back to branch summary

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

« back to all changes in this revision

Viewing changes to subversion/libsvn_subr/opt.c

  • 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/libsvn_subr/opt.c
186
186
    opts = apr_psprintf(pool, "--%s", opt->name);
187
187
 
188
188
  if (opt->has_arg)
189
 
    opts = apr_pstrcat(pool, opts, _(" ARG"), (char *)NULL);
 
189
    opts = apr_pstrcat(pool, opts, _(" ARG"), SVN_VA_NULL);
190
190
 
191
191
  if (doc)
192
192
    opts = apr_psprintf(pool, "%-24s : %s", opts, _(opt->description));
783
783
          if (svn_path_is_url(path))
784
784
            {
785
785
              /* URLs are URI-encoded, so we look for dates with
786
 
                 URI-encoded delimeters.  */
 
786
                 URI-encoded delimiters.  */
787
787
              size_t rev_len = strlen(rev_str);
788
788
              if (rev_len > 6
789
789
                  && rev_str[0] == '%'
935
935
            }
936
936
        }
937
937
 
938
 
      target = apr_pstrcat(pool, true_target, peg_rev, (char *)NULL);
 
938
      target = apr_pstrcat(pool, true_target, peg_rev, SVN_VA_NULL);
939
939
 
940
940
      APR_ARRAY_PUSH(output_targets, const char *) = target;
941
941
    }
1012
1012
 
1013
1013
  if (peg_start)
1014
1014
    {
1015
 
      /* Error out if target is the empty string. */
1016
 
      if (ptr == utf8_target)
1017
 
        return svn_error_createf(SVN_ERR_BAD_FILENAME, NULL,
1018
 
                                 _("'%s' is just a peg revision. "
1019
 
                                   "Maybe try '%s@' instead?"),
1020
 
                                 utf8_target, utf8_target);
1021
 
 
1022
1015
      *true_target = apr_pstrmemdup(pool, utf8_target, ptr - utf8_target);
1023
1016
      if (peg_revision)
1024
1017
        *peg_revision = apr_pstrdup(pool, peg_start);