diff options
4 files changed, 33 insertions, 1 deletions
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 new file mode 100644 index 0000000000..a5900d8b7d --- /dev/null +++ b/meta/recipes-devtools/subversion/subversion-1.7.10/subversion-CVE-2013-4277.patch @@ -0,0 +1,15 @@ +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/subversion-CVE-2013-4277.patch b/meta/recipes-devtools/subversion/subversion/subversion-CVE-2013-4277.patch new file mode 100644 index 0000000000..21b8ef0c3b --- /dev/null +++ b/meta/recipes-devtools/subversion/subversion/subversion-CVE-2013-4277.patch @@ -0,0 +1,15 @@ +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_file(filename, 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.6.15.bb b/meta/recipes-devtools/subversion/subversion_1.6.15.bb index b86e578b32..1bc637473b 100644 --- a/meta/recipes-devtools/subversion/subversion_1.6.15.bb +++ b/meta/recipes-devtools/subversion/subversion_1.6.15.bb @@ -16,7 +16,8 @@ SRC_URI = "http://subversion.tigris.org/downloads/${BPN}-${PV}.tar.bz2 \ file://subversion-CVE-2013-1849.patch \ file://subversion-CVE-2013-4505.patch \ file://subversion-CVE-2013-1845.patch \ - file://subversion-CVE-2013-1847-CVE-2013-1846.patch" + file://subversion-CVE-2013-1847-CVE-2013-1846.patch \ + file://subversion-CVE-2013-4277.patch" SRC_URI[md5sum] = "113fca1d9e4aa389d7dc2b210010fa69" SRC_URI[sha256sum] = "b2919d603a5f3c19f42e3265c4b930e2376c43b3969b90ef9c42b2f72d5aaa45" diff --git a/meta/recipes-devtools/subversion/subversion_1.7.10.bb b/meta/recipes-devtools/subversion/subversion_1.7.10.bb index 2d06263a1e..e745ce764e 100644 --- a/meta/recipes-devtools/subversion/subversion_1.7.10.bb +++ b/meta/recipes-devtools/subversion/subversion_1.7.10.bb @@ -16,6 +16,7 @@ SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ file://neon.m4-fix-includes-and-cflags.patch \ file://subversion-CVE-2013-4505.patch \ file://subversion-CVE-2013-4131.patch \ + file://subversion-CVE-2013-4277.patch \ " SRC_URI[md5sum] = "4088a77e14232876c9b4ff1541e6e200" SRC_URI[sha256sum] = "c1df222bec83d014d17785e2ceba6bc80962f64b280967de0285836d8d77a8e7" |