From: Ross Burton <ross.bur...@arm.com> 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. Signed-off-by: Ross Burton <ross.bur...@arm.com> Signed-off-by: Luca Ceresoli <luca.ceres...@bootlin.com> Signed-off-by: Richard Purdie <richard.pur...@linuxfoundation.org> (cherry picked from commit ecfbc2ef45a76ab96d215954ca0a109545e6ff02) Signed-off-by: Steve Sakoman <st...@sakoman.com> --- .../subversion/subversion/disable_macos.patch | 71 ------------------- ...version_1.14.1.bb => subversion_1.14.2.bb} | 3 +- 2 files changed, 1 insertion(+), 73 deletions(-) delete mode 100644 meta/recipes-devtools/subversion/subversion/disable_macos.patch rename meta/recipes-devtools/subversion/{subversion_1.14.1.bb => subversion_1.14.2.bb} (96%) 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 @@ -From 9c350c037ca3489dbeece6ecc2d7e2e5dbb177e9 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu....@windriver.com> -Date: Sat, 11 May 2019 15:21:46 +0800 -Subject: [PATCH] These tests don't work in cross compiling, just disable them - for now, we don't build subversion on OS-X at this time. - -RP 1014/7/16 - -Upstream-Status: Pending [needs a rewrite to support a cache value] - -Rebase to 1.12.0 - -Signed-off-by: Hongxu Jia <hongxu....@windriver.com> ---- - build/ac-macros/macosx.m4 | 31 +------------------------------ - 1 file changed, 1 insertion(+), 30 deletions(-) - -diff --git a/build/ac-macros/macosx.m4 b/build/ac-macros/macosx.m4 -index 92fa58e..a568e1c 100644 ---- a/build/ac-macros/macosx.m4 -+++ b/build/ac-macros/macosx.m4 -@@ -24,21 +24,7 @@ dnl Check for _dyld_image_name and _dyld_image_header availability - AC_DEFUN(SVN_LIB_MACHO_ITERATE, - [ - AC_MSG_CHECKING([for Mach-O dynamic module iteration functions]) -- AC_RUN_IFELSE([AC_LANG_PROGRAM([[ -- #include <mach-o/dyld.h> -- #include <mach-o/loader.h> -- ]],[[ -- const struct mach_header *header = _dyld_get_image_header(0); -- const char *name = _dyld_get_image_name(0); -- if (name && header) return 0; -- return 1; -- ]])],[ -- AC_DEFINE([SVN_HAVE_MACHO_ITERATE], [1], -- [Is Mach-O low-level _dyld API available?]) -- AC_MSG_RESULT([yes]) -- ],[ - AC_MSG_RESULT([no]) -- ]) - ]) - - dnl SVN_LIB_MACOS_PLIST -@@ -46,23 +32,8 @@ dnl Assign variables for Mac OS property list support - AC_DEFUN(SVN_LIB_MACOS_PLIST, - [ - AC_MSG_CHECKING([for Mac OS property list utilities]) -- -- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -- #include <AvailabilityMacros.h> -- #if !defined(MAC_OS_X_VERSION_MAX_ALLOWED) \ -- || !defined(MAC_OS_X_VERSION_10_0) \ -- || (MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_0) -- #error ProperyList API unavailable. -- #endif -- ]],[[]])],[ -- SVN_MACOS_PLIST_LIBS="-framework CoreFoundation" -- AC_SUBST(SVN_MACOS_PLIST_LIBS) -- AC_DEFINE([SVN_HAVE_MACOS_PLIST], [1], -- [Is Mac OS property list API available?]) -- AC_MSG_RESULT([yes]) -- ],[ -+ AC_SUBST([SVN_MACOS_PLIST_LIBS], [""]) - AC_MSG_RESULT([no]) -- ]) - ]) - - dnl SVN_LIB_MACOS_KEYCHAIN --- -2.7.4 - diff --git a/meta/recipes-devtools/subversion/subversion_1.14.1.bb b/meta/recipes-devtools/subversion/subversion_1.14.2.bb similarity index 96% rename from meta/recipes-devtools/subversion/subversion_1.14.1.bb rename to 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" DEPENDS:append:class-native = " file-replacement-native" SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ - file://disable_macos.patch \ file://serfmacro.patch \ " -SRC_URI[sha256sum] = "2c5da93c255d2e5569fa91d92457fdb65396b0666fad4fd59b22e154d986e1a9" +SRC_URI[sha256sum] = "c9130e8d0b75728a66f0e7038fc77052e671830d785b5616aad53b4810d3cc28" inherit autotools pkgconfig gettext python3native -- 2.25.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#165024): https://lists.openembedded.org/g/openembedded-core/message/165024 Mute This Topic: https://lists.openembedded.org/mt/90779135/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-