diff options
author | Roy Li <rongqing.li@windriver.com> | 2015-04-27 16:12:29 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-04-28 07:56:55 +0100 |
commit | a03039caec29a158941b67fed676d0237ac06a14 (patch) | |
tree | b5ab23532decdbb49e891e65186558f64ea6fedc /meta/recipes-devtools/subversion/subversion-1.8.13 | |
parent | 6bae518c1099f1afc0148581844eb0453bdd1d1f (diff) | |
download | poky-a03039caec29a158941b67fed676d0237ac06a14.tar.gz |
subversion: upgrade it from 1.8.11 to 1.8.13
upgrade to fix two CVE defects: CVE-2015-0248 and CVE-2015-0251
(From OE-Core rev: cb00b9e0330970b5c768aae9ddd4703a7172acbe)
Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/subversion/subversion-1.8.13')
-rw-r--r-- | meta/recipes-devtools/subversion/subversion-1.8.13/disable_macos.patch | 68 | ||||
-rw-r--r-- | meta/recipes-devtools/subversion/subversion-1.8.13/libtool2.patch | 15 |
2 files changed, 83 insertions, 0 deletions
diff --git a/meta/recipes-devtools/subversion/subversion-1.8.13/disable_macos.patch b/meta/recipes-devtools/subversion/subversion-1.8.13/disable_macos.patch new file mode 100644 index 0000000000..ec3be496f3 --- /dev/null +++ b/meta/recipes-devtools/subversion/subversion-1.8.13/disable_macos.patch | |||
@@ -0,0 +1,68 @@ | |||
1 | These tests don't work in cross compiling, just disable them for now, we don't | ||
2 | build subversion on OS-X at this time. | ||
3 | |||
4 | RP 1014/7/16 | ||
5 | |||
6 | Upstream-Status: Pending [needs a rewrite to support a cache value] | ||
7 | |||
8 | Index: subversion-1.8.9/build/ac-macros/macosx.m4 | ||
9 | =================================================================== | ||
10 | --- subversion-1.8.9.orig/build/ac-macros/macosx.m4 2012-11-26 03:04:27.000000000 +0000 | ||
11 | +++ subversion-1.8.9/build/ac-macros/macosx.m4 2014-07-16 12:28:58.357300403 +0000 | ||
12 | @@ -24,21 +24,7 @@ | ||
13 | AC_DEFUN(SVN_LIB_MACHO_ITERATE, | ||
14 | [ | ||
15 | AC_MSG_CHECKING([for Mach-O dynamic module iteration functions]) | ||
16 | - AC_RUN_IFELSE([AC_LANG_PROGRAM([[ | ||
17 | - #include <mach-o/dyld.h> | ||
18 | - #include <mach-o/loader.h> | ||
19 | - ]],[[ | ||
20 | - const struct mach_header *header = _dyld_get_image_header(0); | ||
21 | - const char *name = _dyld_get_image_name(0); | ||
22 | - if (name && header) return 0; | ||
23 | - return 1; | ||
24 | - ]])],[ | ||
25 | - AC_DEFINE([SVN_HAVE_MACHO_ITERATE], [1], | ||
26 | - [Is Mach-O low-level _dyld API available?]) | ||
27 | - AC_MSG_RESULT([yes]) | ||
28 | - ],[ | ||
29 | AC_MSG_RESULT([no]) | ||
30 | - ]) | ||
31 | ]) | ||
32 | |||
33 | dnl SVN_LIB_MACOS_PLIST | ||
34 | @@ -46,34 +32,7 @@ | ||
35 | AC_DEFUN(SVN_LIB_MACOS_PLIST, | ||
36 | [ | ||
37 | AC_MSG_CHECKING([for Mac OS property list utilities]) | ||
38 | - | ||
39 | - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ | ||
40 | - #include <AvailabilityMacros.h> | ||
41 | - #if !defined(MAC_OS_X_VERSION_MAX_ALLOWED) \ | ||
42 | - || !defined(MAC_OS_X_VERSION_10_0) \ | ||
43 | - || (MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_0) | ||
44 | - #error ProperyList API unavailable. | ||
45 | - #endif | ||
46 | - ]],[[]])],[ | ||
47 | - dnl ### Hack. We should only need to pass the -framework options when | ||
48 | - dnl linking libsvn_subr, since it is the only library that uses Keychain. | ||
49 | - dnl | ||
50 | - dnl Unfortunately, libtool 1.5.x doesn't track transitive dependencies for | ||
51 | - dnl OS X frameworks like it does for normal libraries, so we need to | ||
52 | - dnl explicitly pass the option to all the users of libsvn_subr to allow | ||
53 | - dnl static builds to link successfully. | ||
54 | - dnl | ||
55 | - dnl This does mean that all executables we link will be linked directly | ||
56 | - dnl to these frameworks - even when building shared libraries - but that | ||
57 | - dnl shouldn't cause any problems. | ||
58 | - | ||
59 | - LIBS="$LIBS -framework CoreFoundation" | ||
60 | - AC_DEFINE([SVN_HAVE_MACOS_PLIST], [1], | ||
61 | - [Is Mac OS property list API available?]) | ||
62 | - AC_MSG_RESULT([yes]) | ||
63 | - ],[ | ||
64 | AC_MSG_RESULT([no]) | ||
65 | - ]) | ||
66 | ]) | ||
67 | |||
68 | dnl SVN_LIB_MACOS_KEYCHAIN | ||
diff --git a/meta/recipes-devtools/subversion/subversion-1.8.13/libtool2.patch b/meta/recipes-devtools/subversion/subversion-1.8.13/libtool2.patch new file mode 100644 index 0000000000..5cd572bfc8 --- /dev/null +++ b/meta/recipes-devtools/subversion/subversion-1.8.13/libtool2.patch | |||
@@ -0,0 +1,15 @@ | |||
1 | Upstream-Status: Inappropriate [embedded specific] | ||
2 | |||
3 | --- a/configure.ac 2011-10-20 21:56:02.230663987 +0200 | ||
4 | +++ b/configure.ac 2011-08-17 15:01:30.000000000 +0200 | ||
5 | @@ -227,8 +227,8 @@ | ||
6 | LIBTOOL="$sh_libtool" | ||
7 | SVN_LIBTOOL="$sh_libtool" | ||
8 | else | ||
9 | - sh_libtool="$abs_builddir/libtool" | ||
10 | - SVN_LIBTOOL="\$(SHELL) $sh_libtool" | ||
11 | + sh_libtool="$abs_builddir/$host_alias-libtool" | ||
12 | + SVN_LIBTOOL="\$(SHELL) \$(abs_builddir)/$host_alias-libtool" | ||
13 | fi | ||
14 | AC_SUBST(SVN_LIBTOOL) | ||
15 | |||