diff options
Diffstat (limited to 'meta/recipes-devtools/subversion/subversion-1.7.10')
7 files changed, 0 insertions, 302 deletions
diff --git a/meta/recipes-devtools/subversion/subversion-1.7.10/allow-updated-neon.patch b/meta/recipes-devtools/subversion/subversion-1.7.10/allow-updated-neon.patch deleted file mode 100644 index e8acb12a21..0000000000 --- a/meta/recipes-devtools/subversion/subversion-1.7.10/allow-updated-neon.patch +++ /dev/null @@ -1,20 +0,0 @@ - -Allow neon 0.30 to be usable also - -Upstream-Status: Pending - -Signed-off-by: Saul Wold <sgw@linux.intel.com> - -Index: subversion-1.7.10/configure.ac -=================================================================== ---- subversion-1.7.10.orig/configure.ac -+++ subversion-1.7.10/configure.ac -@@ -118,7 +118,7 @@ AC_PATH_PROG(PKG_CONFIG, pkg-config) - - # Either a space-separated list of allowable Neon versions, or "any" to - # mean allow anything. --NEON_ALLOWED_LIST="0\.25 0\.26 0\.27\.2 0\.28 0\.29" -+NEON_ALLOWED_LIST="0\.25 0\.26 0\.27\.2 0\.28 0\.29 0\.30" - NEON_RECOMMENDED_VER="0.29.6" - NEON_URL="http://www.webdav.org/neon/neon-${NEON_RECOMMENDED_VER}.tar.gz" - dnl You can skip the neon version check only if you know what you are doing diff --git a/meta/recipes-devtools/subversion/subversion-1.7.10/fix-install-depends.patch b/meta/recipes-devtools/subversion/subversion-1.7.10/fix-install-depends.patch deleted file mode 100644 index fb79b8cc51..0000000000 --- a/meta/recipes-devtools/subversion/subversion-1.7.10/fix-install-depends.patch +++ /dev/null @@ -1,48 +0,0 @@ -install-neon-lib should depend on libsvn_delta's installation - -install-neon-lib needs libsvn_delta-1.la which will be regenerated -during libsvn_delta-1.la's installation, if libsvn_delta-1.la is -in regenerating and at the same time install-neon-lib links it, the -error willl happen. - -Let install-neon-lib run after libsvn_delta-1.la is installed will fix -the problem. - -Upstream-Status: Pending - -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> ---- - build-outputs.mk | 2 +- - build.conf | 2 ++ - 2 files changed, 3 insertions(+), 1 deletion(-) - ---- subversion-1.7.6.orig/build-outputs.mk -+++ subversion-1.7.6/build-outputs.mk -@@ -983,11 +983,11 @@ install-locale: subversion/po/de.mo subv - $(MKDIR) $(DESTDIR)$(localedir)/zh_CN/LC_MESSAGES - cd subversion/po ; $(INSTALL_LOCALE) zh_CN.mo $(DESTDIR)$(localedir)/zh_CN/LC_MESSAGES/$(PACKAGE_NAME).mo - $(MKDIR) $(DESTDIR)$(localedir)/zh_TW/LC_MESSAGES - cd subversion/po ; $(INSTALL_LOCALE) zh_TW.mo $(DESTDIR)$(localedir)/zh_TW/LC_MESSAGES/$(PACKAGE_NAME).mo - --install-neon-lib: subversion/libsvn_ra_neon/libsvn_ra_neon-1.la -+install-neon-lib: subversion/libsvn_ra_neon/libsvn_ra_neon-1.la $(SVN_FS_LIB_INSTALL_DEPS) - $(MKDIR) $(DESTDIR)$(neon_libdir) - cd subversion/libsvn_ra_neon ; $(INSTALL_NEON_LIB) libsvn_ra_neon-1.la $(DESTDIR)$(neon_libdir)/libsvn_ra_neon-1.la - - install-ramod-lib: subversion/libsvn_fs/libsvn_fs-1.la subversion/libsvn_ra_svn/libsvn_ra_svn-1.la subversion/libsvn_repos/libsvn_repos-1.la subversion/libsvn_ra_local/libsvn_ra_local-1.la - $(MKDIR) $(DESTDIR)$(ramod_libdir) ---- subversion-1.7.6.orig/build.conf -+++ subversion-1.7.6/build.conf -@@ -270,10 +270,12 @@ msvc-export = svn_ra.h private\svn_ra_pr - [libsvn_ra_neon] - type = ra-module - path = subversion/libsvn_ra_neon - install = neon-lib - libs = libsvn_delta libsvn_subr aprutil apriconv apr neon -+# conditionally add more dependencies -+add-install-deps = $(SVN_FS_LIB_INSTALL_DEPS) - msvc-static = yes - - # Accessing repositories via DAV through serf - [libsvn_ra_serf] - type = ra-module diff --git a/meta/recipes-devtools/subversion/subversion-1.7.10/libtool2.patch b/meta/recipes-devtools/subversion/subversion-1.7.10/libtool2.patch deleted file mode 100644 index 5cd572bfc8..0000000000 --- a/meta/recipes-devtools/subversion/subversion-1.7.10/libtool2.patch +++ /dev/null @@ -1,15 +0,0 @@ -Upstream-Status: Inappropriate [embedded specific] - ---- a/configure.ac 2011-10-20 21:56:02.230663987 +0200 -+++ b/configure.ac 2011-08-17 15:01:30.000000000 +0200 -@@ -227,8 +227,8 @@ - LIBTOOL="$sh_libtool" - SVN_LIBTOOL="$sh_libtool" - else -- sh_libtool="$abs_builddir/libtool" -- SVN_LIBTOOL="\$(SHELL) $sh_libtool" -+ sh_libtool="$abs_builddir/$host_alias-libtool" -+ SVN_LIBTOOL="\$(SHELL) \$(abs_builddir)/$host_alias-libtool" - fi - AC_SUBST(SVN_LIBTOOL) - diff --git a/meta/recipes-devtools/subversion/subversion-1.7.10/neon.m4-fix-includes-and-cflags.patch b/meta/recipes-devtools/subversion/subversion-1.7.10/neon.m4-fix-includes-and-cflags.patch deleted file mode 100644 index 013d0c3649..0000000000 --- a/meta/recipes-devtools/subversion/subversion-1.7.10/neon.m4-fix-includes-and-cflags.patch +++ /dev/null @@ -1,32 +0,0 @@ -Fix to get correct SVN_NEON_CONFIG and CFLAGS when sysroot path contains '-D' and '-I' -characters. - -Upstream-Status: Pending - -Signed-off-by: Chen Qi <Qi.Chen@windriver.com> - -index f951039..a813145 100644 ---- a/build/ac-macros/neon.m4 -+++ b/build/ac-macros/neon.m4 -@@ -105,8 +105,8 @@ AC_DEFUN(SVN_NEON_CONFIG, - test "$svn_allowed_neon" = "any"; then - svn_allowed_neon_on_system="yes" - if test "$NEON_PKG_CONFIG" = "yes"; then -- SVN_NEON_INCLUDES=[`$PKG_CONFIG neon --cflags | $SED -e 's/-D[^ ]*//g'`] -- CFLAGS=["$CFLAGS `$PKG_CONFIG neon --cflags | $SED -e 's/-I[^ ]*//g'`"] -+ SVN_NEON_INCLUDES=["`$PKG_CONFIG neon --cflags | $SED -e 's/^-D[^ ]*//g' -e 's/ -D[^ ]*//g'`"] -+ CFLAGS=["$CFLAGS `$PKG_CONFIG neon --cflags | $SED -e 's/^-I[^ ]*//g' -e 's/ -I[^ ]*//g'`"] - old_CFLAGS="$CFLAGS" - old_LIBS="$LIBS" - NEON_LIBS=`$PKG_CONFIG neon --libs` -@@ -126,8 +126,8 @@ int main() - CFLAGS="$old_CFLAGS" - LIBS="$old_LIBS" - else -- SVN_NEON_INCLUDES=[`$neon_config --cflags | $SED -e 's/-D[^ ]*//g'`] -- CFLAGS=["$CFLAGS `$neon_config --cflags | $SED -e 's/-I[^ ]*//g'`"] -+ SVN_NEON_INCLUDES=[`$neon_config --cflags | $SED -e 's/^-D[^ ]*//g' -e 's/ -D[^ ]*//g'`] -+ CFLAGS=["$CFLAGS `$neon_config --cflags | $SED -e 's/^-I[^ ]*//g' -e 's/ -I[^ ]*//g'`"] - NEON_LIBS=`$neon_config --libs` - fi - svn_lib_neon="yes" diff --git a/meta/recipes-devtools/subversion/subversion-1.7.10/subversion-CVE-2013-4131.patch b/meta/recipes-devtools/subversion/subversion-1.7.10/subversion-CVE-2013-4131.patch deleted file mode 100644 index 88bd25e0d9..0000000000 --- a/meta/recipes-devtools/subversion/subversion-1.7.10/subversion-CVE-2013-4131.patch +++ /dev/null @@ -1,42 +0,0 @@ -Upstream-Status: Backport - -Index: subversion/mod_dav_svn/repos.c -=================================================================== ---- a/subversion/mod_dav_svn/repos.c (revision 1503527) -+++ b/subversion/mod_dav_svn/repos.c (revision 1503528) -@@ -2408,21 +2408,12 @@ - svn_boolean_t is_urlpath, - apr_pool_t *pool) - { -- apr_size_t len; -- char *tmp = apr_pstrdup(pool, path); -- -- len = strlen(tmp); -- -- if (len > 0) -+ if (*path != '\0') /* not an empty string */ - { -- /* Remove any trailing slash; else svn_path_dirname() asserts. */ -- if (tmp[len-1] == '/') -- tmp[len-1] = '\0'; -- - if (is_urlpath) -- return svn_urlpath__dirname(tmp, pool); -+ return svn_urlpath__dirname(path, pool); - else -- return svn_fspath__dirname(tmp, pool); -+ return svn_fspath__dirname(path, pool); - } - - return path; -@@ -2458,7 +2449,9 @@ - parent->versioned = 1; - parent->hooks = resource->hooks; - parent->pool = resource->pool; -- parent->uri = get_parent_path(resource->uri, TRUE, resource->pool); -+ parent->uri = get_parent_path(svn_urlpath__canonicalize(resource->uri, -+ resource->pool), -+ TRUE, resource->pool); - parent->info = parentinfo; - - parentinfo->uri_path = diff --git a/meta/recipes-devtools/subversion/subversion-1.7.10/subversion-CVE-2013-4277.patch b/meta/recipes-devtools/subversion/subversion-1.7.10/subversion-CVE-2013-4277.patch deleted file mode 100644 index a5900d8b7d..0000000000 --- a/meta/recipes-devtools/subversion/subversion-1.7.10/subversion-CVE-2013-4277.patch +++ /dev/null @@ -1,15 +0,0 @@ -Upstream-Status: Backport - ---- a/subversion/svnserve/main.c -+++ b/subversion/svnserve/main.c -@@ -403,8 +403,9 @@ static svn_error_t *write_pid_file(const - const char *contents = apr_psprintf(pool, "%" APR_PID_T_FMT "\n", - getpid()); - -+ SVN_ERR(svn_io_remove_file2(filename, TRUE, pool)); - SVN_ERR(svn_io_file_open(&file, filename, -- APR_WRITE | APR_CREATE | APR_TRUNCATE, -+ APR_WRITE | APR_CREATE | APR_EXCL, - APR_OS_DEFAULT, pool)); - SVN_ERR(svn_io_file_write_full(file, contents, strlen(contents), NULL, - pool)); diff --git a/meta/recipes-devtools/subversion/subversion-1.7.10/subversion-CVE-2013-4505.patch b/meta/recipes-devtools/subversion/subversion-1.7.10/subversion-CVE-2013-4505.patch deleted file mode 100644 index a54d6944ed..0000000000 --- a/meta/recipes-devtools/subversion/subversion-1.7.10/subversion-CVE-2013-4505.patch +++ /dev/null @@ -1,130 +0,0 @@ -Upstream-Status: Backport - -Index: tools/server-side/mod_dontdothat/mod_dontdothat.c -=================================================================== ---- a/tools/server-side/mod_dontdothat/mod_dontdothat.c (revision 1239695) -+++ b/tools/server-side/mod_dontdothat/mod_dontdothat.c (revision 1542078) -@@ -30,12 +30,15 @@ - #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 "svn_path.h" -+#include "private/svn_fspath.h" - - module AP_MODULE_DECLARE_DATA dontdothat_module; - -@@ -161,26 +164,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 +242,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,7 +276,20 @@ - } - } - } -+ 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; - } |