<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d4b94973d8dec05a6bbe9c5844820adcbc827359">https://github.com/macports/macports-ports/commit/d4b94973d8dec05a6bbe9c5844820adcbc827359</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new d4b9497 icu: various fixes
</span>d4b9497 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d4b94973d8dec05a6bbe9c5844820adcbc827359
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Oct 22 05:28:04 2019 +1100
<span style='display:block; white-space:pre;color:#404040;'> icu: various fixes
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Use recommended distfiles. This fixes icu-docs.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Don't patch files that don't exist in icu-doxygen-docs.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Update compatibility subports to 58.3.
</span>---
devel/icu/Portfile | 58 +++++++++++++++++++-----------------
devel/icu/files/CVE-2017-14952.patch | 12 --------
2 files changed, 30 insertions(+), 40 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/icu/Portfile b/devel/icu/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7deed66..a5c4b7f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/icu/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/icu/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +11,7 @@ set my_name icu4c
</span> # port file all | sort -u | xargs grep -El ':icu( |$)' | rev | cut -d / -f 2 | rev | sort -u
version 65.1
if {${subport} eq "${name}-bootstrap" || ${subport} eq "${name}58"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 58.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 58.3
</span> }
categories devel textproc
platforms darwin freebsd
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,13 +27,15 @@ long_description \
</span> support for supplementary Unicode characters (needed for GB 18030 repertoire support).
homepage http://site.icu-project.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites https://github.com/unicode-org/icu/archive/
</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:#ffe0e0;'>-distname release-[join [split ${version} .] -]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname ${my_name}-[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;'>+worksrcdir ${name}/source
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 2fbb53939b0945e908e9f85c25d47745171bcb35 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 155a01d0e3d8443bb38c7d07fa8b7e3d6f3a5cfc5be810fe1632d76b4ca83f5a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 44605077
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 4537a0ce1879b24cdee150862615a7a899d6fa05 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 53e37466b3d6d6d01ead029e3567d873a43a5d1c668ed2278e253b683136d948 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 24267934
</span>
if {${os.major} >= 11} {
configure.python /usr/bin/python
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,18 +62,14 @@ subport ${name}58 {
</span> }
if { [vercmp ${version} 59] < 0 } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append CVE-2017-7867-CVE-2017-7868.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CVE-2017-14952.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 577ee2e4da082da8126f5f16330aca551bc5eda8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 dc055c3987f2d81c512e432a446b43822ded5d25cef308a6789a5cef41dba398 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 34655619
</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;'>+ 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> } else {
compiler.cxx_standard 2011
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://trac.macports.org/ticket/59391
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append max_align_t.patch
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir icu-release-[join [split ${version} .] -]/${my_name}/source
</span> set docdir ${prefix}/share/doc/${name}
configure.args --disable-layoutex \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,10 +85,10 @@ subport ${name}-docs {
</span> long_description-append Documentation.
use_zip yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- distfiles ${distname}-docs${extract.suffix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 fccd63f077c4df66252779586ccac5ba25094090 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6794cb1bcc8c526f955b695c3ed5a5a9b149f9e292d2430b60ddb1a2de636748 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 7773804
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distname ${my_name}-[string map {. _} ${version}]-docs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 cbcd2e6ccaace975381924fec597d8ae0d2b8336 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8fcc9b3d8a1092933b38541047c46743c14c4967310f830eeba2d92056e72163 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 7868905
</span>
extract.dir ${worksrcpath}/doc/html
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -141,13 +139,15 @@ if { ${subport} ne "${name}-docs" } {
</span> if { ${supported_archs} ne "noarch" } {
PortGroup muniversal 1.0
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if { [vercmp ${version} 59] < 0 } {
patchfiles-append patch-bootstrap_config-mh-darwin.diff
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-config-mh-darwin.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-config-mh-darwin.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/59391
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append max_align_t.patch
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # ICU has three mechanisms to aid other projects in building properly
# 1) .pc files for pkg-config
# 2) shell script icu-config that can output compiler flags
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -168,6 +168,7 @@ if { ${subport} ne "${name}-docs" } {
</span> # for upstream reports and discussion, see
# http://bugs.icu-project.org/trac/ticket/10308
# http://bugs.icu-project.org/trac/ticket/6102
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${supported_archs} ne "noarch"} {
</span> post-build {
if {[variant_exists universal] && [variant_isset universal]} {
set dirs {}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -190,7 +191,8 @@ if { ${subport} ne "${name}-docs" } {
</span> ${dir}/config/pkgdata.inc
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> set platform [switch ${os.platform} {darwin {format MacOSX} freebsd {format FreeBSD}}]
configure.cmd ./runConfigureICU ${platform}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -202,32 +204,32 @@ if { ${subport} ne "${name}-docs" } {
</span> # Note that #29904 should not show up again because universal now better recognizes 32/64-bit cross compiling (r79658)
set merger_must_run_binaries "yes"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Fix bug #11981 that prevents ICU from building when upgrading.
# The default configure flags causes utilisation of outdated ICU
# headers/libs instead of the right ones.
configure.cppflags
configure.ldflags
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> build.type gnu
build.args VERBOSE=1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> test.run yes
test.target check
test.args VERBOSE=1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if { ${name} eq ${subport} } {
post-destroot {
xinstall -d ${destroot}${docdir}
xinstall -m 0644 {*}[glob ${worksrcpath}/../*.{css,html,txt}] ${destroot}${docdir}
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> platform freebsd {
build.env MAKE=/usr/local/bin/gmake
destroot.env MAKE=/usr/local/bin/gmake
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> platform darwin 8 {
if { [vercmp ${version} 59] < 0 } {
patchfiles-append patch-bootstrap_common-putil.cpp.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/icu/files/CVE-2017-14952.patch b/devel/icu/files/CVE-2017-14952.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7e6abc9..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/icu/files/CVE-2017-14952.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-14952
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-http://bugs.icu-project.org/trac/changeset/40324
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- i18n/zonemeta.cpp.orig 2016-06-15 18:58:17.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ i18n/zonemeta.cpp 2017-10-24 01:32:39.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -683,7 +683,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mzMappings = new UVector(deleteOlsonToMetaMappingEntry, NULL, status);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (U_FAILURE(status)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete mzMappings;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- deleteOlsonToMetaMappingEntry(entry);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- uprv_free(entry);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span></pre><pre style='margin:0'>
</pre>