<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/bb39c8a8788a77b435337aa74b63c32a65f168ac">https://github.com/macports/macports-ports/commit/bb39c8a8788a77b435337aa74b63c32a65f168ac</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit bb39c8a8788a77b435337aa74b63c32a65f168ac
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Tue Apr 6 18:56:45 2021 -0700
<span style='display:block; white-space:pre;color:#404040;'> icu58: pull out of icu Portfile
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> this port will remain static at this
</span><span style='display:block; white-space:pre;color:#404040;'> version/revision for as long as it
</span><span style='display:block; white-space:pre;color:#404040;'> remains useful in MacPorts.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> keep it as a separate file to avoid
</span><span style='display:block; white-space:pre;color:#404040;'> complicating the icu Portfile
</span>---
devel/icu58/Portfile | 90 ++++++++++++
.../icu58/files/CVE-2017-7867-CVE-2017-7868.patch | 156 +++++++++++++++++++++
.../files/patch-bootstrap_common-putil.cpp.diff | 17 +++
.../files/patch-bootstrap_config-mh-darwin.diff | 14 ++
4 files changed, 277 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/icu58/Portfile b/devel/icu58/Portfile
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..343b74b578d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/icu58/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,90 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup clang_dependency 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup muniversal 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name icu58
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories devel textproc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {kencu @kencu} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license Permissive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description International Components for Unicode -- Legacy Version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description {*}${description}. This port is the last version of icu that builds with\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c++03. It should be used only for bootstrapping or for software\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ that is not compatible with c++11.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage http://site.icu-project.org/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 58.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 0b1ad8ea9bccd5d0f96a89bd0cdc12b5751ed46e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2680f3c547cd26cba1d7ebd819cd336ff92cf444a270e195fd3b10bfdf22276c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 22626103
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://github.com/unicode-org/icu/releases/download/release-[string map {. -} ${version}]/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname icu4c-[string map {. _} ${version}]-src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+extract.suffix .tgz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append CVE-2017-7867-CVE-2017-7868.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-bootstrap_config-mh-darwin.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${build_arch} eq "ppc" || ${build_arch} eq "ppc64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # (#59514)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${worksrcpath}/data/out
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.python /usr/bin/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+worksrcdir icu/source
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# prevent ICU from finding installed icu when upgrading (#11981).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cppflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.ldflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.pre_args --prefix=${prefix}/libexec/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --disable-layoutex \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-samples \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-static
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.universal_args-delete --disable-dependency-tracking
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cmd ./runConfigureICU MacOSX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# ICU detects cross compiling by trying to run binaries.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+merger_must_run_binaries yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.type gnu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args VERBOSE=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_exists universal] && [variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set dirs {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach arch ${universal_archs_to_use} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend dirs ${worksrcpath}-${arch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set dirs ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach dir ${dirs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Remove architecture-specific differences to allow merging.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace {s| -DSIZEOF_VOID_P=[48]||g} ${dir}/config/Makefile.inc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${dir}/config/icu-config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E {s| -arch +[^ ]+||g} ${dir}/config/pkgdata.inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace {s|host=\".*\"|host=\"\"|g} ${dir}/config/icu-config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace {s|host_alias=\".*\"|host_alias=\"\"|g} ${dir}/config/icu-config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace {s|host_cpu=\".*\"|host_cpu=\"\"|g} ${dir}/config/icu-config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin 8 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-bootstrap_common-putil.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.run yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.target check
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.args VERBOSE=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.type none
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/icu58/files/CVE-2017-7867-CVE-2017-7868.patch b/devel/icu58/files/CVE-2017-7867-CVE-2017-7868.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..335d4a59c62
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/icu58/files/CVE-2017-7867-CVE-2017-7868.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,156 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://nvd.nist.gov/vuln/detail/CVE-2017-7867
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://nvd.nist.gov/vuln/detail/CVE-2017-7868
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+http://bugs.icu-project.org/trac/ticket/12888
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+http://bugs.icu-project.org/trac/changeset/39671
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- common/utext.cpp.orig 2016-06-15 13:58:17.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ common/utext.cpp 2017-05-25 21:51:47.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -848,9 +848,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Chunk size.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-// Must be less than 85, because of byte mapping from UChar indexes to native indexes.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-// Worst case is three native bytes to one UChar. (Supplemenaries are 4 native bytes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-// to two UChars.)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// Must be less than 42 (256/6), because of byte mapping from UChar indexes to native indexes.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// Worst case there are six UTF-8 bytes per UChar.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// obsolete 6 byte form fd + 5 trails maps to fffd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// obsolete 5 byte form fc + 4 trails maps to fffd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// non-shortest 4 byte forms maps to fffd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// normal supplementaries map to a pair of utf-16, two utf8 bytes per utf-16 unit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// mapToUChars array size must allow for the worst case, 6.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// This could be brought down to 4, by treating fd and fc as pure illegal,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// rather than obsolete lead bytes. But that is not compatible with the utf-8 access macros.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ enum { UTF8_TEXT_CHUNK_SIZE=32 };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++enum { SIZEOF_MAPTOUCHARS=UTF8_TEXT_CHUNK_SIZE*6+6 };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -890,5 +897,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // one for a supplementary starting in the last normal position,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // and one for an entry for the buffer limit position.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t mapToUChars[UTF8_TEXT_CHUNK_SIZE*3+6]; // Map native offset from bufNativeStart to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint8_t mapToUChars[SIZEOF_MAPTOUCHARS]; // Map native offset from bufNativeStart to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // correspoding offset in filled part of buf.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int32_t align;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1033,4 +1040,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ u8b = (UTF8Buf *)ut->p; // the current buffer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mapIndex = ix - u8b->toUCharsMapStart;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ U_ASSERT(mapIndex < (int32_t)SIZEOF_MAPTOUCHARS);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ut->chunkOffset = u8b->mapToUChars[mapIndex] - u8b->bufStartIdx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1299,4 +1307,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // If index is at the end, there is no character there to look at.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (ix != ut->b) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // Note: this function will only move the index back if it is on a trail byte
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // and there is a preceding lead byte and the sequence from the lead
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // through this trail could be part of a valid UTF-8 sequence
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // Otherwise the index remains unchanged.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ U8_SET_CP_START(s8, 0, ix);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1312,5 +1324,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint8_t *mapToNative = u8b->mapToNative;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint8_t *mapToUChars = u8b->mapToUChars;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int32_t toUCharsMapStart = ix - (UTF8_TEXT_CHUNK_SIZE*3 + 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int32_t toUCharsMapStart = ix - SIZEOF_MAPTOUCHARS + 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // Note that toUCharsMapStart can be negative. Happens when the remaining
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // text from current position to the beginning is less than the buffer size.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // + 1 because mapToUChars must have a slot at the end for the bufNativeLimit entry.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int32_t destIx = UTF8_TEXT_CHUNK_SIZE+2; // Start in the overflow region
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // at end of buffer to leave room
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1339,4 +1354,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Special case ASCII range for speed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ buf[destIx] = (UChar)c;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ U_ASSERT(toUCharsMapStart <= srcIx);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mapToUChars[srcIx - toUCharsMapStart] = (uint8_t)destIx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mapToNative[destIx] = (uint8_t)(srcIx - toUCharsMapStart);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1368,4 +1384,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mapToUChars[sIx-- - toUCharsMapStart] = (uint8_t)destIx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } while (sIx >= srcIx);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ U_ASSERT(toUCharsMapStart <= (srcIx+1));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Set native indexing limit to be the current position.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1542,4 +1559,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ U_ASSERT(index<=ut->chunkNativeLimit);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int32_t mapIndex = index - u8b->toUCharsMapStart;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ U_ASSERT(mapIndex < (int32_t)SIZEOF_MAPTOUCHARS);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int32_t offset = u8b->mapToUChars[mapIndex] - u8b->bufStartIdx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ U_ASSERT(offset>=0 && offset<=ut->chunkLength);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- test/intltest/utxttest.cpp (revision 39670)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ test/intltest/utxttest.cpp (revision 39671)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -68,4 +68,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case 7: name = "Ticket12130";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (exec) Ticket12130(); break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case 8: name = "Ticket12888";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (exec) Ticket12888(); break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default: name = ""; break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1584,2 +1586,62 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ utext_close(&ut);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// Ticket 12888: bad handling of illegal utf-8 containing many instances of the archaic, now illegal,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// six byte utf-8 forms. Original implementation had an assumption that
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// there would be at most three utf-8 bytes per UTF-16 code unit.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// The five and six byte sequences map to a single replacement character.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void UTextTest::Ticket12888() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const char *badString =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ UErrorCode status = U_ZERO_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LocalUTextPointer ut(utext_openUTF8(NULL, badString, -1, &status));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ TEST_SUCCESS(status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for (;;) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ UChar32 c = utext_next32(ut.getAlias());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (c == U_SENTINEL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int32_t endIdx = utext_getNativeIndex(ut.getAlias());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (endIdx != (int32_t)strlen(badString)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ errln("%s:%d expected=%d, actual=%d", __FILE__, __LINE__, strlen(badString), endIdx);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for (int32_t prevIndex = endIdx; prevIndex>0;) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ UChar32 c = utext_previous32(ut.getAlias());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int32_t currentIndex = utext_getNativeIndex(ut.getAlias());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (c != 0xfffd) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ errln("%s:%d (expected, actual, index) = (%d, %d, %d)\n",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ __FILE__, __LINE__, 0xfffd, c, currentIndex);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (currentIndex != prevIndex - 6) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ errln("%s:%d: wrong index. Expected, actual = %d, %d",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ __FILE__, __LINE__, prevIndex - 6, currentIndex);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ prevIndex = currentIndex;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- test/intltest/utxttest.h (revision 39670)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ test/intltest/utxttest.h (revision 39671)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -39,4 +39,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void Ticket10983();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void Ticket12130();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ void Ticket12888();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ private:
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/icu58/files/patch-bootstrap_common-putil.cpp.diff b/devel/icu58/files/patch-bootstrap_common-putil.cpp.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..323f7e4942f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/icu58/files/patch-bootstrap_common-putil.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+http://bugs.icu-project.org/trac/ticket/9367
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- common/putil.cpp.orig 2016-10-19 12:20:56.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ common/putil.cpp 2017-02-11 10:01:49.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -119,6 +119,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Mac OS X 10.4 doesn't use its localtime_r() declaration in <time.h> if either _ANSI_SOURCE or _POSIX_C_SOURCE is #defined.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(U_TZNAME) && U_PLATFORM_IS_DARWIN_BASED && (defined(_ANSI_SOURCE) || defined(_POSIX_C_SOURCE))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++U_CFUNC struct tm *localtime_r(const time_t *, struct tm *);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Only include langinfo.h if we have a way to get the codeset. If we later
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * depend on more feature, we can test on U_HAVE_NL_LANGINFO.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/icu58/files/patch-bootstrap_config-mh-darwin.diff b/devel/icu58/files/patch-bootstrap_config-mh-darwin.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..f25d965daea
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/icu58/files/patch-bootstrap_config-mh-darwin.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- config/mh-darwin.orig 2016-06-15 13:58:17.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ config/mh-darwin 2017-02-11 09:37:32.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -30,11 +30,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SHLIB.cc= $(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS) $(LD_SOOPTIONS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## Compiler switches to embed a library name and version information
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifeq ($(ENABLE_RPATH),YES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## Compiler switch to embed a runtime search path
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LD_RPATH=
</span></pre><pre style='margin:0'>
</pre>