← Back to branch summary

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

« back to all changes in this revision

Viewing changes to subversion/libsvn_wc/workqueue.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/libsvn_wc/workqueue.h
73
73
   These will be combined as appropriate, and returned in one of the
74
74
   above three styles.
75
75
 
76
 
   The resulting list will be ordered: WORK_ITEM1 first, then WORK_ITEM2  */
 
76
   The resulting list will be ordered: WORK_ITEM1 first, then WORK_ITEM2.
 
77
 
 
78
   The result contains a shallow copy of the inputs.  Allocate any
 
79
   additional storage needed in RESULT_POOL.
 
80
 */
77
81
svn_skel_t *
78
82
svn_wc__wq_merge(svn_skel_t *work_item1,
79
83
                 svn_skel_t *work_item2,
177
181
 
178
182
 
179
183
/* Set *WORK_ITEM to a new work item that will install a property reject
180
 
   file for LOCAL_ABSPATH into the working copy. The property conflicts will
181
 
   be taken from CONFLICT_SKEL.
182
 
 
183
 
   ### Caution: Links CONFLICT_SKEL into the *WORK_ITEM, which involves
184
 
       modifying *CONFLICT_SKEL.
185
 
 
186
 
   ### TODO: Make CONFLICT_SKEL 'const' and dup it into RESULT_POOL.
187
 
 
188
 
   ### TODO: If CONFLICT_SKEL is NULL, take property conflicts from wc_db
189
 
       for the given DB/LOCAL_ABSPATH.
 
184
   file for LOCAL_ABSPATH into the working copy.
190
185
 */
191
186
svn_error_t *
192
187
svn_wc__wq_build_prej_install(svn_skel_t **work_item,
193
188
                              svn_wc__db_t *db,
194
189
                              const char *local_abspath,
195
 
                              svn_skel_t *conflict_skel,
196
190
                              apr_pool_t *result_pool,
197
191
                              apr_pool_t *scratch_pool);
198
192
 
221
215
svn_wc__wq_build_dir_install(svn_skel_t **work_item,
222
216
                             svn_wc__db_t *db,
223
217
                             const char *local_abspath,
224
 
                             apr_pool_t *scratch_pool,
225
 
                             apr_pool_t *result_pool);
 
218
                             apr_pool_t *result_pool,
 
219
                             apr_pool_t *scratch_pool);
226
220
 
227
221
svn_error_t *
228
222
svn_wc__wq_build_postupgrade(svn_skel_t **work_item,