Merge pull request #54184 from tensorflow/cherrypick-d437dec4d549fc30…

…f9b85c7567b1010c809b0a8a-on-r2.6 Bump ICU to 69.1 to handle CVE-2020-10531.
tensorflow · Jan 28, 2022 · 1e6335b · 1e6335b
2 parents 0bb4da5 + 083c3c6
commit 1e6335b
Show file tree

Hide file tree

Showing 99 changed files with 30 additions and 8 deletions.
diff --git a/third_party/icu/data/BUILD.bazel b/third_party/icu/data/BUILD.bazel
@@ -19,9 +19,28 @@ exports_files(["LICENSE"])
 #   $ ICU_DATA_FILTER_FILE=filters.json ./runConfigureICU Linux
 #   $ make clean && make
 #   $ cd data/out/tmp
-#   $ genccode icudt64l.dat
-#   $ echo 'U_CAPI const void * U_EXPORT2 uprv_getICUData_conversion() { return icudt64l_dat.bytes; }' >> icudt64l_dat.c
-# This creates icudt64l_dat.c, which you can move, rename, gzip, then split.
+#   $ genccode icudt70l.dat   # Note: this number must match version, and below too!
+#   $ echo 'U_CAPI const void * U_EXPORT2 uprv_getICUData_conversion() { return icudt70l_dat.bytes; }' >> icudt70l_dat.c
+#
+# This creates icudt70l_dat.c, which you can move, rename, gzip, then split,
+# for example (but you can change to other numbers):
+#   $ cp icudt70l_dat.c icu_conversion_data.c
+#   $ gzip icu_conversion_data.c
+#   # Note: make sure you don't forget the last . below!
+#   $ split -a 3 -b 100000 icu_conversion_data.c.gz icu_conversion_data.c.gz.
+#
+# Then, copy the generated files to this directory, removing existing ones.
+#
+# The current files have been generated by this filter (in filters.json):
+# {
+#   "localeFilter": {
+#     "filterType": "language",
+#     "includelist": [
+#       "en"
+#     ]
+#   }
+# }
+# Please make sure to keep this updated if you change the data files.
 filegroup(
     name = "conversion_files",
     srcs = glob(["icu_conversion_data.c.gz.*"]),

diff --git a/third_party/icu/data/icu_conversion_data.c.gz.aa b/third_party/icu/data/icu_conversion_data.c.gz.aa
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.aaa b/third_party/icu/data/icu_conversion_data.c.gz.aaa
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.aab b/third_party/icu/data/icu_conversion_data.c.gz.aab
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.aac b/third_party/icu/data/icu_conversion_data.c.gz.aac
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.aad b/third_party/icu/data/icu_conversion_data.c.gz.aad
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.aae b/third_party/icu/data/icu_conversion_data.c.gz.aae
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.aaf b/third_party/icu/data/icu_conversion_data.c.gz.aaf
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.aag b/third_party/icu/data/icu_conversion_data.c.gz.aag
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.aah b/third_party/icu/data/icu_conversion_data.c.gz.aah
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.aai b/third_party/icu/data/icu_conversion_data.c.gz.aai
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.aaj b/third_party/icu/data/icu_conversion_data.c.gz.aaj
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.aak b/third_party/icu/data/icu_conversion_data.c.gz.aak
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.aal b/third_party/icu/data/icu_conversion_data.c.gz.aal
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.aam b/third_party/icu/data/icu_conversion_data.c.gz.aam
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.aan b/third_party/icu/data/icu_conversion_data.c.gz.aan
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.aao b/third_party/icu/data/icu_conversion_data.c.gz.aao
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.aap b/third_party/icu/data/icu_conversion_data.c.gz.aap
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.aaq b/third_party/icu/data/icu_conversion_data.c.gz.aaq
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.aar b/third_party/icu/data/icu_conversion_data.c.gz.aar
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.aas b/third_party/icu/data/icu_conversion_data.c.gz.aas
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.aat b/third_party/icu/data/icu_conversion_data.c.gz.aat
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.aau b/third_party/icu/data/icu_conversion_data.c.gz.aau
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.aav b/third_party/icu/data/icu_conversion_data.c.gz.aav
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.aaw b/third_party/icu/data/icu_conversion_data.c.gz.aaw
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.aax b/third_party/icu/data/icu_conversion_data.c.gz.aax
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.aay b/third_party/icu/data/icu_conversion_data.c.gz.aay
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.aaz b/third_party/icu/data/icu_conversion_data.c.gz.aaz
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.ab b/third_party/icu/data/icu_conversion_data.c.gz.ab
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.aba b/third_party/icu/data/icu_conversion_data.c.gz.aba
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.abb b/third_party/icu/data/icu_conversion_data.c.gz.abb
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.abc b/third_party/icu/data/icu_conversion_data.c.gz.abc
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.abd b/third_party/icu/data/icu_conversion_data.c.gz.abd
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.abe b/third_party/icu/data/icu_conversion_data.c.gz.abe
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.abf b/third_party/icu/data/icu_conversion_data.c.gz.abf
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.abg b/third_party/icu/data/icu_conversion_data.c.gz.abg
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.abh b/third_party/icu/data/icu_conversion_data.c.gz.abh
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.abi b/third_party/icu/data/icu_conversion_data.c.gz.abi
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.abj b/third_party/icu/data/icu_conversion_data.c.gz.abj
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.abk b/third_party/icu/data/icu_conversion_data.c.gz.abk
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.abl b/third_party/icu/data/icu_conversion_data.c.gz.abl
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.abm b/third_party/icu/data/icu_conversion_data.c.gz.abm
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.abn b/third_party/icu/data/icu_conversion_data.c.gz.abn
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.abo b/third_party/icu/data/icu_conversion_data.c.gz.abo
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.abp b/third_party/icu/data/icu_conversion_data.c.gz.abp
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.abq b/third_party/icu/data/icu_conversion_data.c.gz.abq
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.abr b/third_party/icu/data/icu_conversion_data.c.gz.abr
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.abs b/third_party/icu/data/icu_conversion_data.c.gz.abs
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.abt b/third_party/icu/data/icu_conversion_data.c.gz.abt
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.abu b/third_party/icu/data/icu_conversion_data.c.gz.abu
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.abv b/third_party/icu/data/icu_conversion_data.c.gz.abv
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.abw b/third_party/icu/data/icu_conversion_data.c.gz.abw
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.abx b/third_party/icu/data/icu_conversion_data.c.gz.abx
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.aby b/third_party/icu/data/icu_conversion_data.c.gz.aby
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.abz b/third_party/icu/data/icu_conversion_data.c.gz.abz
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.ac b/third_party/icu/data/icu_conversion_data.c.gz.ac
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.aca b/third_party/icu/data/icu_conversion_data.c.gz.aca
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.acb b/third_party/icu/data/icu_conversion_data.c.gz.acb
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.acc b/third_party/icu/data/icu_conversion_data.c.gz.acc
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.acd b/third_party/icu/data/icu_conversion_data.c.gz.acd
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.ace b/third_party/icu/data/icu_conversion_data.c.gz.ace
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.acf b/third_party/icu/data/icu_conversion_data.c.gz.acf
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.acg b/third_party/icu/data/icu_conversion_data.c.gz.acg
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.ach b/third_party/icu/data/icu_conversion_data.c.gz.ach
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.aci b/third_party/icu/data/icu_conversion_data.c.gz.aci
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.acj b/third_party/icu/data/icu_conversion_data.c.gz.acj
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.ack b/third_party/icu/data/icu_conversion_data.c.gz.ack
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.acl b/third_party/icu/data/icu_conversion_data.c.gz.acl
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.acm b/third_party/icu/data/icu_conversion_data.c.gz.acm
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.acn b/third_party/icu/data/icu_conversion_data.c.gz.acn
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.aco b/third_party/icu/data/icu_conversion_data.c.gz.aco
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.acp b/third_party/icu/data/icu_conversion_data.c.gz.acp
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.acq b/third_party/icu/data/icu_conversion_data.c.gz.acq
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.acr b/third_party/icu/data/icu_conversion_data.c.gz.acr
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.acs b/third_party/icu/data/icu_conversion_data.c.gz.acs
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.act b/third_party/icu/data/icu_conversion_data.c.gz.act
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.acu b/third_party/icu/data/icu_conversion_data.c.gz.acu
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.acv b/third_party/icu/data/icu_conversion_data.c.gz.acv
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.acw b/third_party/icu/data/icu_conversion_data.c.gz.acw
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.acx b/third_party/icu/data/icu_conversion_data.c.gz.acx
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.acy b/third_party/icu/data/icu_conversion_data.c.gz.acy
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.acz b/third_party/icu/data/icu_conversion_data.c.gz.acz
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.ad b/third_party/icu/data/icu_conversion_data.c.gz.ad
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.ada b/third_party/icu/data/icu_conversion_data.c.gz.ada
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.adb b/third_party/icu/data/icu_conversion_data.c.gz.adb
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.adc b/third_party/icu/data/icu_conversion_data.c.gz.adc
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.add b/third_party/icu/data/icu_conversion_data.c.gz.add
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.ade b/third_party/icu/data/icu_conversion_data.c.gz.ade
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.adf b/third_party/icu/data/icu_conversion_data.c.gz.adf
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.adg b/third_party/icu/data/icu_conversion_data.c.gz.adg
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.adh b/third_party/icu/data/icu_conversion_data.c.gz.adh
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.ae b/third_party/icu/data/icu_conversion_data.c.gz.ae
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.af b/third_party/icu/data/icu_conversion_data.c.gz.af
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.ag b/third_party/icu/data/icu_conversion_data.c.gz.ag
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.ah b/third_party/icu/data/icu_conversion_data.c.gz.ah
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.ai b/third_party/icu/data/icu_conversion_data.c.gz.ai
diff --git a/third_party/icu/data/icu_conversion_data.c.gz.aj b/third_party/icu/data/icu_conversion_data.c.gz.aj
diff --git a/third_party/icu/udata.patch b/third_party/icu/udata.patch
@@ -41,7 +41,8 @@ diff -ru a/icu4c/source/common/udata.cpp b/icu4c/source/common/udata.cpp
          }
 -        */
 +
- #if U_PLATFORM_HAS_WINUWP_API == 0 // Windows UWP Platform does not support dll icu data at this time
+ #if !defined(ICU_DATA_DIR_WINDOWS)
+ // When using the Windows system data, we expect only a single data file.
          setCommonICUDataPointer(&U_ICUDATA_ENTRY_POINT, FALSE, pErrorCode);
          {
 diff -ru a/icu4c/source/common/unicode/uconfig.h b/icu4c/source/common/unicode/uconfig.h

diff --git a/third_party/icu/workspace.bzl b/third_party/icu/workspace.bzl
@@ -2,14 +2,16 @@
 
 load("//third_party:repo.bzl", "tf_http_archive")
 
+# NOTE: If you upgrade this, generate the data files by following the
+# instructions in third_party/icu/data/BUILD
 def repo():
     tf_http_archive(
         name = "icu",
-        strip_prefix = "icu-release-64-2",
-        sha256 = "dfc62618aa4bd3ca14a3df548cd65fe393155edd213e49c39f3a30ccd618fc27",
+        strip_prefix = "icu-release-69-1",
+        sha256 = "3144e17a612dda145aa0e4acb3caa27a5dae4e26edced64bc351c43d5004af53",
         urls = [
-            "https://storage.googleapis.com/mirror.tensorflow.org/github.com/unicode-org/icu/archive/release-64-2.zip",
-            "https://github.com/unicode-org/icu/archive/release-64-2.zip",
+            "https://storage.googleapis.com/mirror.tensorflow.org/github.com/unicode-org/icu/archive/release-69-1.zip",
+            "https://github.com/unicode-org/icu/archive/release-69-1.zip",
         ],
         build_file = "//third_party/icu:BUILD.bazel",
         system_build_file = "//third_party/icu:BUILD.system",