From d4a76a51762d094d6f4fc016c52a6817c7f92637 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 14 Nov 2017 16:57:49 +0200 Subject: icu: update to 60.1 Rebase a couple of patches. LICENSE checksum change due to typo fix. Signed-off-by: Alexander Kanavin Signed-off-by: Ross Burton --- .../icu/icu/0001-i18n-Drop-include-xlocale.h.patch | 28 ++++++++++---------- meta/recipes-support/icu/icu/CVE-2017-14952.patch | 28 -------------------- .../recipes-support/icu/icu/fix-install-manx.patch | 25 ++++++++++++------ meta/recipes-support/icu/icu_59.1.bb | 30 ---------------------- meta/recipes-support/icu/icu_60.1.bb | 29 +++++++++++++++++++++ 5 files changed, 61 insertions(+), 79 deletions(-) delete mode 100644 meta/recipes-support/icu/icu/CVE-2017-14952.patch delete mode 100644 meta/recipes-support/icu/icu_59.1.bb create mode 100644 meta/recipes-support/icu/icu_60.1.bb (limited to 'meta') diff --git a/meta/recipes-support/icu/icu/0001-i18n-Drop-include-xlocale.h.patch b/meta/recipes-support/icu/icu/0001-i18n-Drop-include-xlocale.h.patch index add0d765b7..0c61893d7c 100644 --- a/meta/recipes-support/icu/icu/0001-i18n-Drop-include-xlocale.h.patch +++ b/meta/recipes-support/icu/icu/0001-i18n-Drop-include-xlocale.h.patch @@ -1,31 +1,33 @@ -From c4254fd8ff1888ca285e3242b812010357ce2b3e Mon Sep 17 00:00:00 2001 +From d6b57c1b4eb9a24d9d95342a961c93946539c93b Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 24 Jun 2017 22:52:40 -0700 -Subject: [PATCH] i18n: Drop include +Subject: [PATCH 3/4] i18n: Drop include glibc 2.26 drops this header Signed-off-by: Khem Raj ---- -Upstream-Status: Pending - i18n/digitlst.cpp | 6 +----- +--- + source/i18n/digitlst.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) -Index: source/i18n/digitlst.cpp -=================================================================== ---- source.orig/i18n/digitlst.cpp -+++ source/i18n/digitlst.cpp -@@ -61,11 +61,7 @@ +diff --git a/source/i18n/digitlst.cpp b/source/i18n/digitlst.cpp +index 8e86fa7..0bdbb2c 100644 +--- a/i18n/digitlst.cpp ++++ b/i18n/digitlst.cpp +@@ -62,11 +62,7 @@ #endif #if U_USE_STRTOD_L --# if U_PLATFORM_USES_ONLY_WIN32_API || U_PLATFORM == U_PF_CYGWIN --# include --# else +-# if U_HAVE_XLOCALE_H -# include +-# else +-# include -# endif +# include #endif // *************************************************************************** +-- +2.14.2 + diff --git a/meta/recipes-support/icu/icu/CVE-2017-14952.patch b/meta/recipes-support/icu/icu/CVE-2017-14952.patch deleted file mode 100644 index f759efc435..0000000000 --- a/meta/recipes-support/icu/icu/CVE-2017-14952.patch +++ /dev/null @@ -1,28 +0,0 @@ -From fc83cd832725d3968011f118637b9f5d212e8717 Mon Sep 17 00:00:00 2001 -From: Ovidiu Panait -Date: Fri, 10 Nov 2017 16:51:25 +0200 -Subject: [PATCH] Removed redundant UVector entry clean up function call. - -Upstream-Status: Backport -CVE: CVE-2017-14952 - -Signed-off-by: Ovidiu Panait ---- - i18n/zonemeta.cpp | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/i18n/zonemeta.cpp b/i18n/zonemeta.cpp -index 84a9657..e163b00 100644 ---- a/i18n/zonemeta.cpp -+++ b/i18n/zonemeta.cpp -@@ -690,7 +690,6 @@ ZoneMeta::createMetazoneMappings(const UnicodeString &tzid) { - mzMappings = new UVector(deleteOlsonToMetaMappingEntry, NULL, status); - if (U_FAILURE(status)) { - delete mzMappings; -- deleteOlsonToMetaMappingEntry(entry); - uprv_free(entry); - break; - } --- -2.10.2 - diff --git a/meta/recipes-support/icu/icu/fix-install-manx.patch b/meta/recipes-support/icu/icu/fix-install-manx.patch index ec63f50c46..8186fb4122 100644 --- a/meta/recipes-support/icu/icu/fix-install-manx.patch +++ b/meta/recipes-support/icu/icu/fix-install-manx.patch @@ -1,3 +1,8 @@ +From 3063a9211669bee673840ee81f81d30699b9b702 Mon Sep 17 00:00:00 2001 +From: Ross Burton +Date: Fri, 9 Oct 2015 17:50:41 +0100 +Subject: [PATCH 2/4] icu: fix install race + The generic recursive target calls target-local so also adding it to the dependency list results in races due to install-local being executed twice in parallel. For example, install-manx can fail if the two install processes race @@ -9,12 +14,15 @@ in the install command. Upstream-Status: Pending Signed-off-by: Ross Burton +--- + source/Makefile.in | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) -diff --git a/Makefile.in b/Makefile.in -index 9db6c52..3441afa 100644 +diff --git a/source/Makefile.in b/source/Makefile.in +index c1db15b..4948deb 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -71,7 +71,7 @@ EXTRA_DATA = +@@ -73,7 +73,7 @@ EXTRA_DATA = ## List of phony targets .PHONY : all all-local all-recursive install install-local install-udata install-udata-files install-udata-dlls \ @@ -23,7 +31,7 @@ index 9db6c52..3441afa 100644 distclean-local distclean-recursive doc dist dist-local dist-recursive \ check check-local check-recursive clean-recursive-with-twist install-icu \ doc install-doc tests icu4j-data icu4j-data-install update-windows-makefiles xcheck-local xcheck-recursive xperf xcheck xperf-recursive \ -@@ -82,10 +82,10 @@ check-exhaustive check-exhaustive-local check-exhaustive-recursive releaseDist +@@ -84,9 +84,9 @@ check-exhaustive check-exhaustive-local check-exhaustive-recursive releaseDist ## List of standard targets all: all-local all-recursive @@ -31,13 +39,11 @@ index 9db6c52..3441afa 100644 +install: install-recursive clean: clean-recursive-with-twist clean-local -distclean : distclean-recursive distclean-local --dist: dist-recursive dist-local +distclean : distclean-recursive -+dist: dist-recursive + dist: dist-recursive check: all check-recursive check-recursive: all - xcheck: all xcheck-recursive -@@ -352,7 +352,7 @@ config.status: $(srcdir)/configure $(srcdir)/common/unicode/uvernum.h +@@ -350,7 +350,7 @@ config.status: $(srcdir)/configure $(srcdir)/common/unicode/uvernum.h install-manx: $(MANX_FILES) $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION) @@ -46,3 +52,6 @@ index 9db6c52..3441afa 100644 config/%.$(SECTION): $(srcdir)/config/%.$(SECTION).in cd $(top_builddir) \ +-- +2.14.2 + diff --git a/meta/recipes-support/icu/icu_59.1.bb b/meta/recipes-support/icu/icu_59.1.bb deleted file mode 100644 index 9fb1be81cc..0000000000 --- a/meta/recipes-support/icu/icu_59.1.bb +++ /dev/null @@ -1,30 +0,0 @@ -require icu.inc - -LIC_FILES_CHKSUM = "file://../LICENSE;md5=fe9e1f2c500466d8f18df2cd068e4b74" - -def icu_download_version(d): - pvsplit = d.getVar('PV').split('.') - return pvsplit[0] + "_" + pvsplit[1] - -ICU_PV = "${@icu_download_version(d)}" - -# http://errors.yoctoproject.org/Errors/Details/20486/ -ARM_INSTRUCTION_SET_armv4 = "arm" -ARM_INSTRUCTION_SET_armv5 = "arm" - -BASE_SRC_URI = "http://download.icu-project.org/files/icu4c/${PV}/icu4c-${ICU_PV}-src.tgz" -SRC_URI = "${BASE_SRC_URI} \ - file://icu-pkgdata-large-cmd.patch \ - file://fix-install-manx.patch \ - file://0001-i18n-Drop-include-xlocale.h.patch \ - file://CVE-2017-14952.patch \ - " - -SRC_URI_append_class-target = "\ - file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ - " -SRC_URI[md5sum] = "54923fa9fab5b2b83f235fb72523de37" -SRC_URI[sha256sum] = "7132fdaf9379429d004005217f10e00b7d2319d0fea22bdfddef8991c45b75fe" - -UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)/" -UPSTREAM_CHECK_URI = "http://download.icu-project.org/files/icu4c/" diff --git a/meta/recipes-support/icu/icu_60.1.bb b/meta/recipes-support/icu/icu_60.1.bb new file mode 100644 index 0000000000..d9d6b37ce9 --- /dev/null +++ b/meta/recipes-support/icu/icu_60.1.bb @@ -0,0 +1,29 @@ +require icu.inc + +LIC_FILES_CHKSUM = "file://../LICENSE;md5=675f2d069434d8a1e4e6b0dcf4379226" + +def icu_download_version(d): + pvsplit = d.getVar('PV').split('.') + return pvsplit[0] + "_" + pvsplit[1] + +ICU_PV = "${@icu_download_version(d)}" + +# http://errors.yoctoproject.org/Errors/Details/20486/ +ARM_INSTRUCTION_SET_armv4 = "arm" +ARM_INSTRUCTION_SET_armv5 = "arm" + +BASE_SRC_URI = "http://download.icu-project.org/files/icu4c/${PV}/icu4c-${ICU_PV}-src.tgz" +SRC_URI = "${BASE_SRC_URI} \ + file://icu-pkgdata-large-cmd.patch \ + file://fix-install-manx.patch \ + file://0001-i18n-Drop-include-xlocale.h.patch \ + " + +SRC_URI_append_class-target = "\ + file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ + " +SRC_URI[md5sum] = "3d164a2d1bcebd1464c6160ebb8315ef" +SRC_URI[sha256sum] = "f8f5a6c8fbf32c015a467972bdb1477dc5f5d5dfea908b6ed218715eeb5ee225" + +UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)/" +UPSTREAM_CHECK_URI = "http://download.icu-project.org/files/icu4c/" -- cgit 1.2.3-korg