commit d895a24bc9dcb4b8e673df207907e032082d9814 Author: Danny Rawlins <monster.romster@gmail.com> Date: Mon Dec 2 12:48:25 2019 +1100 [notify] icu: ABI change check with revdep diff --git a/icu/.footprint b/icu/.footprint index 2297da81f..1a9bb0849 100644 --- a/icu/.footprint +++ b/icu/.footprint @@ -59,6 +59,7 @@ drwxr-xr-x root/root usr/include/unicode/ -rw-r--r-- root/root usr/include/unicode/idna.h -rw-r--r-- root/root usr/include/unicode/listformatter.h -rw-r--r-- root/root usr/include/unicode/localebuilder.h +-rw-r--r-- root/root usr/include/unicode/localematcher.h -rw-r--r-- root/root usr/include/unicode/localpointer.h -rw-r--r-- root/root usr/include/unicode/locdspnm.h -rw-r--r-- root/root usr/include/unicode/locid.h @@ -201,30 +202,30 @@ drwxr-xr-x root/root usr/include/unicode/ -rw-r--r-- root/root usr/include/unicode/vtzone.h drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/icu/ -drwxr-xr-x root/root usr/lib/icu/64.2/ --rw-r--r-- root/root usr/lib/icu/64.2/Makefile.inc --rw-r--r-- root/root usr/lib/icu/64.2/pkgdata.inc +drwxr-xr-x root/root usr/lib/icu/65.1/ +-rw-r--r-- root/root usr/lib/icu/65.1/Makefile.inc +-rw-r--r-- root/root usr/lib/icu/65.1/pkgdata.inc lrwxrwxrwx root/root usr/lib/icu/Makefile.inc -> current/Makefile.inc -lrwxrwxrwx root/root usr/lib/icu/current -> 64.2 +lrwxrwxrwx root/root usr/lib/icu/current -> 65.1 lrwxrwxrwx root/root usr/lib/icu/pkgdata.inc -> current/pkgdata.inc -lrwxrwxrwx root/root usr/lib/libicudata.so -> libicudata.so.64.2 -lrwxrwxrwx root/root usr/lib/libicudata.so.64 -> libicudata.so.64.2 --rwxr-xr-x root/root usr/lib/libicudata.so.64.2 -lrwxrwxrwx root/root usr/lib/libicui18n.so -> libicui18n.so.64.2 -lrwxrwxrwx root/root usr/lib/libicui18n.so.64 -> libicui18n.so.64.2 --rwxr-xr-x root/root usr/lib/libicui18n.so.64.2 -lrwxrwxrwx root/root usr/lib/libicuio.so -> libicuio.so.64.2 -lrwxrwxrwx root/root usr/lib/libicuio.so.64 -> libicuio.so.64.2 --rwxr-xr-x root/root usr/lib/libicuio.so.64.2 -lrwxrwxrwx root/root usr/lib/libicutest.so -> libicutest.so.64.2 -lrwxrwxrwx root/root usr/lib/libicutest.so.64 -> libicutest.so.64.2 --rwxr-xr-x root/root usr/lib/libicutest.so.64.2 -lrwxrwxrwx root/root usr/lib/libicutu.so -> libicutu.so.64.2 -lrwxrwxrwx root/root usr/lib/libicutu.so.64 -> libicutu.so.64.2 --rwxr-xr-x root/root usr/lib/libicutu.so.64.2 -lrwxrwxrwx root/root usr/lib/libicuuc.so -> libicuuc.so.64.2 -lrwxrwxrwx root/root usr/lib/libicuuc.so.64 -> libicuuc.so.64.2 --rwxr-xr-x root/root usr/lib/libicuuc.so.64.2 +lrwxrwxrwx root/root usr/lib/libicudata.so -> libicudata.so.65.1 +lrwxrwxrwx root/root usr/lib/libicudata.so.65 -> libicudata.so.65.1 +-rwxr-xr-x root/root usr/lib/libicudata.so.65.1 +lrwxrwxrwx root/root usr/lib/libicui18n.so -> libicui18n.so.65.1 +lrwxrwxrwx root/root usr/lib/libicui18n.so.65 -> libicui18n.so.65.1 +-rwxr-xr-x root/root usr/lib/libicui18n.so.65.1 +lrwxrwxrwx root/root usr/lib/libicuio.so -> libicuio.so.65.1 +lrwxrwxrwx root/root usr/lib/libicuio.so.65 -> libicuio.so.65.1 +-rwxr-xr-x root/root usr/lib/libicuio.so.65.1 +lrwxrwxrwx root/root usr/lib/libicutest.so -> libicutest.so.65.1 +lrwxrwxrwx root/root usr/lib/libicutest.so.65 -> libicutest.so.65.1 +-rwxr-xr-x root/root usr/lib/libicutest.so.65.1 +lrwxrwxrwx root/root usr/lib/libicutu.so -> libicutu.so.65.1 +lrwxrwxrwx root/root usr/lib/libicutu.so.65 -> libicutu.so.65.1 +-rwxr-xr-x root/root usr/lib/libicutu.so.65.1 +lrwxrwxrwx root/root usr/lib/libicuuc.so -> libicuuc.so.65.1 +lrwxrwxrwx root/root usr/lib/libicuuc.so.65 -> libicuuc.so.65.1 +-rwxr-xr-x root/root usr/lib/libicuuc.so.65.1 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/icu-i18n.pc -rw-r--r-- root/root usr/lib/pkgconfig/icu-io.pc @@ -238,12 +239,12 @@ drwxr-xr-x root/root usr/sbin/ -rwxr-xr-x root/root usr/sbin/icupkg drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/icu/ -drwxr-xr-x root/root usr/share/icu/64.2/ --rw-r--r-- root/root usr/share/icu/64.2/LICENSE -drwxr-xr-x root/root usr/share/icu/64.2/config/ --rw-r--r-- root/root usr/share/icu/64.2/config/mh-linux --rwxr-xr-x root/root usr/share/icu/64.2/install-sh --rwxr-xr-x root/root usr/share/icu/64.2/mkinstalldirs +drwxr-xr-x root/root usr/share/icu/65.1/ +-rw-r--r-- root/root usr/share/icu/65.1/LICENSE +drwxr-xr-x root/root usr/share/icu/65.1/config/ +-rw-r--r-- root/root usr/share/icu/65.1/config/mh-linux +-rwxr-xr-x root/root usr/share/icu/65.1/install-sh +-rwxr-xr-x root/root usr/share/icu/65.1/mkinstalldirs drwxr-xr-x root/root usr/share/man/ drwxr-xr-x root/root usr/share/man/man1/ -rw-r--r-- root/root usr/share/man/man1/derb.1.gz diff --git a/icu/.signature b/icu/.signature index 279add35e..ffbfa1f11 100644 --- a/icu/.signature +++ b/icu/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/aNXc0fmFyjCs0Dt3bXSIb2DuklOEIthLr8U5alF+qdrlUbh4O96EdOAzjRW1ykphqEvTcETPpZwalCLdy2FwgA= -SHA256 (Pkgfile) = 18f1fab20ca942cee39494ba6287e0dcad1c9888f9331e48991156e7d378b173 -SHA256 (.footprint) = cfa060b07c2ca1f5100982ef42213f35abfa963032bad330d9ee68eb3b10ce4b -SHA256 (icu4c-64_2-src.tgz) = 627d5d8478e6d96fc8c90fed4851239079a561a6a8b9e48b0892f24e82d31d6c +RWSE3ohX2g5d/eyzJOBfkekJ3KfSN3t4xjqU2o5wB/7V0AcI55boDvT2opPLYaMOTtgnVPyyHUwSoiKwsXwFwb86iyToHbLIegU= +SHA256 (Pkgfile) = f046df2ea7713981fe1e3667b15fafb767d8bd7e59862f99ad34b220ff16031d +SHA256 (.footprint) = 575e839241a9f7011af23ab46d8400cda2281acbdf7a3cd27af2e7682065015a +SHA256 (icu4c-65_1-src.tgz) = 53e37466b3d6d6d01ead029e3567d873a43a5d1c668ed2278e253b683136d948 +SHA256 (icu-65.1-initialized-buffer-uloc_getKeywordValue.patch) = 2fafe710a69e0e81f38c8a36fcc17fa494ce27af63ea41d23815b36b1ee319c3 diff --git a/icu/Pkgfile b/icu/Pkgfile index 0065e4311..6cfaed55e 100644 --- a/icu/Pkgfile +++ b/icu/Pkgfile @@ -3,13 +3,17 @@ # Maintainer: Danny Rawlins, crux at romster dot me name=icu -version=64.2 +version=65.1 release=1 -source=(https://sourceforge.net/projects/icu/files/ICU4C/$version/icu4c-${version//./_}-src.tgz) +source=(https://github.com/unicode-org/icu/releases/download/release-${version//./-}/icu4c-${version/./_}-src.tgz + icu-65.1-initialized-buffer-uloc_getKeywordValue.patch) build() { cd icu/source + # https://unicode-org.atlassian.net/browse/ICU-20884 + patch -p2 -d .. -i $SRC/icu-65.1-initialized-buffer-uloc_getKeywordValue.patch + # icu tries to use clang by default [ "$CC" ] || export CC=gcc [ "$CXX" ] || export CXX=g++ diff --git a/icu/icu-65.1-initialized-buffer-uloc_getKeywordValue.patch b/icu/icu-65.1-initialized-buffer-uloc_getKeywordValue.patch new file mode 100644 index 000000000..475921d23 --- /dev/null +++ b/icu/icu-65.1-initialized-buffer-uloc_getKeywordValue.patch @@ -0,0 +1,23 @@ +From fab4c3c719977205a3f005ddfd7fffbb9c19c587 Mon Sep 17 00:00:00 2001 +From: Frank Tang <ftang@chromium.org> +Date: Wed, 30 Oct 2019 17:45:22 -0700 +Subject: [PATCH] ICU-20884 initialized buffer uloc_getKeywordValue + +--- + icu4c/source/common/uloc.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/icu4c/source/common/uloc.cpp b/icu4c/source/common/uloc.cpp +index 6a9bfcfbff5..ea81c0ce87f 100644 +--- a/icu4c/source/common/uloc.cpp ++++ b/icu4c/source/common/uloc.cpp +@@ -766,6 +766,9 @@ uloc_getKeywordValue(const char* localeID, + char* buffer, int32_t bufferCapacity, + UErrorCode* status) + { ++ if (buffer != nullptr) { ++ buffer[0] = '\0'; ++ } + const char* startSearchHere = NULL; + const char* nextSeparator = NULL; + char keywordNameBuffer[ULOC_KEYWORD_BUFFER_LEN];