--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/subversion/patches/002-CVE-2013-1849.patch Tue Feb 11 06:22:29 2014 -0800
@@ -0,0 +1,26 @@
+# CVE-2013-1849
+# http://subversion.apache.org/security/CVE-2013-1849-advisory.txt
+
+--- subversion/mod_dav_svn/liveprops.c 2012-02-03 12:04:00.000000000 -0800
++++ subversion/mod_dav_svn/liveprops.c 2014-01-22 09:29:53.399158026 -0800
+@@ -429,7 +429,8 @@
+ svn_filesize_t len = 0;
+
+ /* our property, but not defined on collection resources */
+- if (resource->collection || resource->baselined)
++ if (resource->type == DAV_RESOURCE_TYPE_ACTIVITY ||
++ resource->collection || resource->baselined)
+ return DAV_PROP_INSERT_NOTSUPP;
+
+ serr = svn_fs_file_length(&len, resource->info->root.root,
+@@ -453,7 +454,9 @@
+ svn_string_t *pval;
+ const char *mime_type = NULL;
+
+- if (resource->baselined && resource->type == DAV_RESOURCE_TYPE_VERSION)
++ if ((resource->type == DAV_RESOURCE_TYPE_ACTIVITY) ||
++ (resource->baselined &&
++ resource->type == DAV_RESOURCE_TYPE_VERSION))
+ return DAV_PROP_INSERT_NOTSUPP;
+
+ if (resource->type == DAV_RESOURCE_TYPE_PRIVATE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/subversion/patches/003-CVE-2013-4505.patch Tue Feb 11 06:22:29 2014 -0800
@@ -0,0 +1,127 @@
+# CVE-2013-4505
+# http://subversion.apache.org/security/CVE-2013-4505-advisory.txt
+
+--- tools/server-side/mod_dontdothat/mod_dontdothat.c 2011-11-28 12:02:41.000000000 -0800
++++ tools/server-side/mod_dontdothat/mod_dontdothat.c 2014-01-29 06:58:46.573510739 -0800
+@@ -30,12 +30,14 @@
+ #include <util_filter.h>
+ #include <ap_config.h>
+ #include <apr_strings.h>
++#include <apr_uri.h>
+
+ #include <expat.h>
+
+ #include "mod_dav_svn.h"
+ #include "svn_string.h"
+ #include "svn_config.h"
++#include "private/svn_fspath.h"
+
+ module AP_MODULE_DECLARE_DATA dontdothat_module;
+
+@@ -161,26 +163,71 @@
+ }
+ }
+
++/* duplicate of dav_svn__log_err() from mod_dav_svn/util.c */
++static void
++log_dav_err(request_rec *r,
++ dav_error *err,
++ int level)
++{
++ dav_error *errscan;
++
++ /* Log the errors */
++ /* ### should have a directive to log the first or all */
++ for (errscan = err; errscan != NULL; errscan = errscan->prev) {
++ apr_status_t status;
++
++ if (errscan->desc == NULL)
++ continue;
++
++#if AP_MODULE_MAGIC_AT_LEAST(20091119,0)
++ status = errscan->aprerr;
++#else
++ status = errscan->save_errno;
++#endif
++
++ ap_log_rerror(APLOG_MARK, level, status, r,
++ "%s [%d, #%d]",
++ errscan->desc, errscan->status, errscan->error_id);
++ }
++}
++
+ static svn_boolean_t
+ is_this_legal(dontdothat_filter_ctx *ctx, const char *uri)
+ {
+ const char *relative_path;
+ const char *cleaned_uri;
+ const char *repos_name;
++ const char *uri_path;
+ int trailing_slash;
+ dav_error *derr;
+
+- /* Ok, so we need to skip past the scheme, host, etc. */
+- uri = ap_strstr_c(uri, "://");
+- if (uri)
+- uri = ap_strchr_c(uri + 3, '/');
++ /* uri can be an absolute uri or just a path, we only want the path to match
++ * against */
++ if (uri && svn_path_is_url(uri))
++ {
++ apr_uri_t parsed_uri;
++ apr_status_t rv = apr_uri_parse(ctx->r->pool, uri, &parsed_uri);
++ if (APR_SUCCESS != rv)
++ {
++ /* Error parsing the URI, log and reject request. */
++ ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, ctx->r,
++ "mod_dontdothat: blocked request after failing "
++ "to parse uri: '%s'", uri);
++ return FALSE;
++ }
++ uri_path = parsed_uri.path;
++ }
++ else
++ {
++ uri_path = uri;
++ }
+
+- if (uri)
++ if (uri_path)
+ {
+ const char *repos_path;
+
+ derr = dav_svn_split_uri(ctx->r,
+- uri,
++ uri_path,
+ ctx->cfg->base_path,
+ &cleaned_uri,
+ &trailing_slash,
+@@ -194,7 +241,7 @@
+ if (! repos_path)
+ repos_path = "";
+
+- repos_path = apr_psprintf(ctx->r->pool, "/%s", repos_path);
++ repos_path = svn_fspath__canonicalize(repos_path, ctx->r->pool);
+
+ /* First check the special cases that are always legal... */
+ for (idx = 0; idx < ctx->allow_recursive_ops->nelts; ++idx)
+@@ -228,6 +275,18 @@
+ }
+ }
+ }
++ else
++ {
++ log_dav_err(ctx->r, derr, APLOG_ERR);
++ return FALSE;
++ }
++ }
++ else
++ {
++ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, ctx->r,
++ "mod_dontdothat: empty uri passed to is_this_legal(), "
++ "module bug?");
++ return FALSE;
+ }
+
+ return TRUE;
+