diff options
author | Ross Burton <ross.burton@arm.com> | 2022-04-25 12:20:45 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-04-26 18:25:08 +0100 |
commit | 7bd13c6a0896539f4789aa835f0df6c094c221c2 (patch) | |
tree | 6775ba3684b14e0ac253c5b3f890298360af0b70 /meta/recipes-devtools | |
parent | 53dca17ec3e96fd3eaa486ec6101f7e543dcc2a8 (diff) | |
download | poky-7bd13c6a0896539f4789aa835f0df6c094c221c2.tar.gz |
subversion: upgrade to 1.14.2
This release is primarily to fix two CVEs:
- CVE-2021-28544
- CVE-2022-24070
It also rewrites the macOS autoconf macros to be cross-compile friendly,
so we don't need to delete them anymore.
(From OE-Core rev: ecfbc2ef45a76ab96d215954ca0a109545e6ff02)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/subversion/subversion/disable_macos.patch | 71 | ||||
-rw-r--r-- | meta/recipes-devtools/subversion/subversion_1.14.2.bb (renamed from meta/recipes-devtools/subversion/subversion_1.14.1.bb) | 3 |
2 files changed, 1 insertions, 73 deletions
diff --git a/meta/recipes-devtools/subversion/subversion/disable_macos.patch b/meta/recipes-devtools/subversion/subversion/disable_macos.patch deleted file mode 100644 index 8d2d635992..0000000000 --- a/meta/recipes-devtools/subversion/subversion/disable_macos.patch +++ /dev/null | |||
@@ -1,71 +0,0 @@ | |||
1 | From 9c350c037ca3489dbeece6ecc2d7e2e5dbb177e9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
3 | Date: Sat, 11 May 2019 15:21:46 +0800 | ||
4 | Subject: [PATCH] These tests don't work in cross compiling, just disable them | ||
5 | for now, we don't build subversion on OS-X at this time. | ||
6 | |||
7 | RP 1014/7/16 | ||
8 | |||
9 | Upstream-Status: Pending [needs a rewrite to support a cache value] | ||
10 | |||
11 | Rebase to 1.12.0 | ||
12 | |||
13 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
14 | --- | ||
15 | build/ac-macros/macosx.m4 | 31 +------------------------------ | ||
16 | 1 file changed, 1 insertion(+), 30 deletions(-) | ||
17 | |||
18 | diff --git a/build/ac-macros/macosx.m4 b/build/ac-macros/macosx.m4 | ||
19 | index 92fa58e..a568e1c 100644 | ||
20 | --- a/build/ac-macros/macosx.m4 | ||
21 | +++ b/build/ac-macros/macosx.m4 | ||
22 | @@ -24,21 +24,7 @@ dnl Check for _dyld_image_name and _dyld_image_header availability | ||
23 | AC_DEFUN(SVN_LIB_MACHO_ITERATE, | ||
24 | [ | ||
25 | AC_MSG_CHECKING([for Mach-O dynamic module iteration functions]) | ||
26 | - AC_RUN_IFELSE([AC_LANG_PROGRAM([[ | ||
27 | - #include <mach-o/dyld.h> | ||
28 | - #include <mach-o/loader.h> | ||
29 | - ]],[[ | ||
30 | - const struct mach_header *header = _dyld_get_image_header(0); | ||
31 | - const char *name = _dyld_get_image_name(0); | ||
32 | - if (name && header) return 0; | ||
33 | - return 1; | ||
34 | - ]])],[ | ||
35 | - AC_DEFINE([SVN_HAVE_MACHO_ITERATE], [1], | ||
36 | - [Is Mach-O low-level _dyld API available?]) | ||
37 | - AC_MSG_RESULT([yes]) | ||
38 | - ],[ | ||
39 | AC_MSG_RESULT([no]) | ||
40 | - ]) | ||
41 | ]) | ||
42 | |||
43 | dnl SVN_LIB_MACOS_PLIST | ||
44 | @@ -46,23 +32,8 @@ dnl Assign variables for Mac OS property list support | ||
45 | AC_DEFUN(SVN_LIB_MACOS_PLIST, | ||
46 | [ | ||
47 | AC_MSG_CHECKING([for Mac OS property list utilities]) | ||
48 | - | ||
49 | - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ | ||
50 | - #include <AvailabilityMacros.h> | ||
51 | - #if !defined(MAC_OS_X_VERSION_MAX_ALLOWED) \ | ||
52 | - || !defined(MAC_OS_X_VERSION_10_0) \ | ||
53 | - || (MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_0) | ||
54 | - #error ProperyList API unavailable. | ||
55 | - #endif | ||
56 | - ]],[[]])],[ | ||
57 | - SVN_MACOS_PLIST_LIBS="-framework CoreFoundation" | ||
58 | - AC_SUBST(SVN_MACOS_PLIST_LIBS) | ||
59 | - AC_DEFINE([SVN_HAVE_MACOS_PLIST], [1], | ||
60 | - [Is Mac OS property list API available?]) | ||
61 | - AC_MSG_RESULT([yes]) | ||
62 | - ],[ | ||
63 | + AC_SUBST([SVN_MACOS_PLIST_LIBS], [""]) | ||
64 | AC_MSG_RESULT([no]) | ||
65 | - ]) | ||
66 | ]) | ||
67 | |||
68 | dnl SVN_LIB_MACOS_KEYCHAIN | ||
69 | -- | ||
70 | 2.7.4 | ||
71 | |||
diff --git a/meta/recipes-devtools/subversion/subversion_1.14.1.bb b/meta/recipes-devtools/subversion/subversion_1.14.2.bb index 71183ac7ce..ba208d922f 100644 --- a/meta/recipes-devtools/subversion/subversion_1.14.1.bb +++ b/meta/recipes-devtools/subversion/subversion_1.14.2.bb | |||
@@ -9,11 +9,10 @@ DEPENDS = "apr-util serf sqlite3 file lz4" | |||
9 | DEPENDS:append:class-native = " file-replacement-native" | 9 | DEPENDS:append:class-native = " file-replacement-native" |
10 | 10 | ||
11 | SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ | 11 | SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ |
12 | file://disable_macos.patch \ | ||
13 | file://serfmacro.patch \ | 12 | file://serfmacro.patch \ |
14 | " | 13 | " |
15 | 14 | ||
16 | SRC_URI[sha256sum] = "2c5da93c255d2e5569fa91d92457fdb65396b0666fad4fd59b22e154d986e1a9" | 15 | SRC_URI[sha256sum] = "c9130e8d0b75728a66f0e7038fc77052e671830d785b5616aad53b4810d3cc28" |
17 | 16 | ||
18 | inherit autotools pkgconfig gettext python3native | 17 | inherit autotools pkgconfig gettext python3native |
19 | 18 | ||