diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2015-12-07 19:46:49 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-12 23:42:54 +0000 |
commit | 21e35df191a88635b6cb829ebed52f5b94d5542c (patch) | |
tree | fdde4158333460be588305835de0aff5251850e3 /meta/recipes-devtools/subversion/subversion | |
parent | 39260c39e54e7b56a45c1d98e56541d072420a83 (diff) | |
download | poky-21e35df191a88635b6cb829ebed52f5b94d5542c.tar.gz |
subversion: update to 1.9.2
Drop backported CVE fix patches
libtool2.patch has been rebased and renamed to 0001-Fix-libtool-name-in-configure.ac.patch
LICENSE checksum has been updated because more 3rd party attributions have been added to it,
it's otherwise still Apache 2.
(From OE-Core rev: b57f57ea092f93bd7e1268b04c7d3c4af2149a77)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/subversion/subversion')
3 files changed, 129 insertions, 0 deletions
diff --git a/meta/recipes-devtools/subversion/subversion/0001-Fix-libtool-name-in-configure.ac.patch b/meta/recipes-devtools/subversion/subversion/0001-Fix-libtool-name-in-configure.ac.patch new file mode 100644 index 0000000000..5a1b10b2e1 --- /dev/null +++ b/meta/recipes-devtools/subversion/subversion/0001-Fix-libtool-name-in-configure.ac.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | From cbcfe0399347989e45a8fb695f55c855d6b3da72 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Mon, 7 Dec 2015 17:11:02 +0200 | ||
4 | Subject: [PATCH] Fix libtool name in configure.ac | ||
5 | |||
6 | Upstream-Status: Inappropriate [embedded specific] | ||
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
8 | --- | ||
9 | configure.ac | 4 ++-- | ||
10 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
11 | |||
12 | diff --git a/configure.ac b/configure.ac | ||
13 | index 4ed66d4..ceb64f9 100644 | ||
14 | --- a/configure.ac | ||
15 | +++ b/configure.ac | ||
16 | @@ -221,8 +221,8 @@ if test "$experimental_libtool" = "yes"; then | ||
17 | LIBTOOL="$sh_libtool" | ||
18 | SVN_LIBTOOL="$sh_libtool" | ||
19 | else | ||
20 | - sh_libtool="$abs_builddir/libtool" | ||
21 | - SVN_LIBTOOL="\$(SHELL) \"$sh_libtool\"" | ||
22 | + sh_libtool="$abs_builddir/$host_alias-libtool" | ||
23 | + SVN_LIBTOOL="\$(SHELL) \$(abs_builddir)/$host_alias-libtool" | ||
24 | fi | ||
25 | AC_SUBST(SVN_LIBTOOL) | ||
26 | |||
27 | -- | ||
28 | 2.6.2 | ||
29 | |||
diff --git a/meta/recipes-devtools/subversion/subversion/disable_macos.patch b/meta/recipes-devtools/subversion/subversion/disable_macos.patch new file mode 100644 index 0000000000..ec3be496f3 --- /dev/null +++ b/meta/recipes-devtools/subversion/subversion/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/serf.m4-Regex-modified-to-allow-D-in-paths.patch b/meta/recipes-devtools/subversion/subversion/serf.m4-Regex-modified-to-allow-D-in-paths.patch new file mode 100644 index 0000000000..9fed3cf6c8 --- /dev/null +++ b/meta/recipes-devtools/subversion/subversion/serf.m4-Regex-modified-to-allow-D-in-paths.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From f1b6e49f12a18eabe88eb732b578a16281d09499 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jose Lamego <jose.a.lamego@linux.intel.com> | ||
3 | Date: Thu, 2 Jul 2015 11:37:43 +0000 | ||
4 | Subject: [PATCH] serf.m4: Regex modified to allow '-D' in paths | ||
5 | |||
6 | Upstream-Status: Accepted | ||
7 | |||
8 | The patch is merged by subversion upstream with replacing '[[:space:]]' with ' '. | ||
9 | |||
10 | http://svn.apache.org/viewvc/subversion/trunk/build/ac-macros/serf.m4?r1=1594156&r2=1689824 | ||
11 | |||
12 | Signed-off-by: Jose Lamego <jose.a.lamego@linux.intel.com> | ||
13 | --- | ||
14 | build/ac-macros/serf.m4 | 2 +- | ||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/build/ac-macros/serf.m4 b/build/ac-macros/serf.m4 | ||
18 | index ae11e75..ff8cbae 100644 | ||
19 | --- a/build/ac-macros/serf.m4 | ||
20 | +++ b/build/ac-macros/serf.m4 | ||
21 | @@ -168,7 +168,7 @@ | ||
22 | if $PKG_CONFIG $serf_pc_arg --atleast-version=$serf_check_version; then | ||
23 | AC_MSG_RESULT([yes]) | ||
24 | serf_found=yes | ||
25 | - SVN_SERF_INCLUDES=[`$PKG_CONFIG $serf_pc_arg --cflags | $SED -e 's/-D[^ ]*//g'`] | ||
26 | + SVN_SERF_INCLUDES=[`$PKG_CONFIG $serf_pc_arg --cflags | $SED -e 's/ -D[^ ]*//g' -e 's/^-D[^ ]*//g'`] | ||
27 | SVN_SERF_LIBS=`$PKG_CONFIG $serf_pc_arg --libs-only-l` | ||
28 | dnl don't use --libs-only-L because then we might miss some options | ||
29 | LDFLAGS=["$LDFLAGS `$PKG_CONFIG $serf_pc_arg --libs | $SED -e 's/-l[^ ]*//g'`"] | ||
30 | -- | ||
31 | 1.8.4.5 | ||
32 | |||