From e45be81ae88c4e21b9bced90db91c8255891d239 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Mon, 21 May 2018 11:07:38 +0200 Subject: [PATCH] */*: sync with upstream Taken from: HardenedBSD --- archivers/zopfli/Makefile | 4 +- archivers/zopfli/distinfo | 5 +- archivers/zopfli/pkg-plist | 5 +- biology/clustalw/Makefile | 7 +- .../patch-src-general-VectorOutOfRange.h | 4 +- biology/molden/Makefile | 4 +- biology/molden/distinfo | 6 +- databases/mongodb32/Makefile | 10 +- databases/mongodb32/files/mongod.in | 21 +- devel/flang-clang/Makefile | 4 +- devel/flang-clang/distinfo | 6 +- devel/flang-clang/pkg-plist | 192 ++-- devel/py-pymarc/Makefile | 2 +- devel/py-pymarc/distinfo | 6 +- devel/py-python-gitlab/Makefile | 4 +- devel/py-python-gitlab/distinfo | 6 +- dns/bind912/Makefile | 2 +- dns/bind912/distinfo | 6 +- dns/getdns/Makefile | 2 +- dns/getdns/distinfo | 6 +- dns/mDNSResponder_nss/Makefile | 1 + dns/mDNSResponder_nss/pkg-message | 4 +- emulators/wine/Makefile | 3 +- emulators/wine/distinfo | 6 +- german/mythes/Makefile | 2 +- german/mythes/distinfo | 6 +- java/openjdk8/Makefile | 8 +- java/openjdk8/distinfo | 2 + java/openjdk8/files/patch-bsd | 924 +++++++++--------- java/openjdk8/files/patch-bsd-test | 492 +++++----- ...are_vm_interpreter_bytecodeInterpreter.cpp | 50 - ...h-jdk-make-lib-ServiceabilityLibraries.gmk | 22 +- lang/Makefile | 1 + lang/gcc-ecj45/Makefile | 7 +- lang/gcc6-devel/Makefile | 3 +- lang/gcc6-devel/distinfo | 6 +- lang/gcc6/Makefile | 2 +- lang/gcc7-devel/Makefile | 3 +- lang/gcc7-devel/distinfo | 6 +- lang/gcc8-devel/Makefile | 3 +- lang/gcc8-devel/distinfo | 6 +- lang/gcc9-devel/Makefile | 3 +- lang/gcc9-devel/distinfo | 6 +- lang/pure/Makefile | 17 +- lang/spidermonkey52/Makefile | 91 ++ lang/spidermonkey52/distinfo | 3 + lang/spidermonkey52/files/patch-1426865 | 23 + .../files/patch-disable-mozglue | 62 ++ lang/spidermonkey52/pkg-descr | 3 + lang/spidermonkey52/pkg-plist | 161 +++ mail/alpine/Makefile | 7 +- mail/alpine/distinfo | 4 +- math/blis/Makefile | 6 +- math/blis/distinfo | 6 +- math/blis/pkg-plist | 426 +------- math/octave-forge-database/Makefile | 6 +- math/octave-forge-database/distinfo | 6 +- math/octave-forge-octclip/Makefile | 4 +- math/octave-forge-octproj/Makefile | 4 +- math/octave-forge-sparsersb/Makefile | 2 + math/octave-forge-video/Makefile | 2 +- math/octave-forge/Makefile | 4 +- multimedia/plexmediaserver/Makefile | 4 +- multimedia/plexmediaserver/distinfo | 6 +- multimedia/py-soco/Makefile | 2 +- multimedia/py-soco/distinfo | 6 +- net-im/Makefile | 1 + net-im/purple-slack/Makefile | 35 + net-im/purple-slack/distinfo | 3 + net-im/purple-slack/pkg-descr | 3 + net-mgmt/py-pysmi/Makefile | 12 +- net-mgmt/py-pysmi/distinfo | 6 +- net-mgmt/py-pysmi/files/patch-setup.py | 13 - net-mgmt/py-pysmi/files/tests__init__.py | 20 - net-mgmt/py-pysmi/pkg-descr | 2 +- net-p2p/torrentcheck/Makefile | 5 +- net/lft/Makefile | 5 +- net/lft/distinfo | 6 +- ...rk_ssl_qsslsocket__openssl11__symbols__p.h | 18 + ...work_ssl_qsslsocket__openssl__symbols__p.h | 9 - polish/hunspell/Makefile | 2 +- polish/hunspell/distinfo | 6 +- ports-mgmt/portmaster/Makefile | 2 +- ports-mgmt/portmaster/files/patch-portmaster | 70 +- .../files/patch-libs_gcu_spacegroup.cc | 20 + science/pnetcdf/Makefile | 13 +- security/Makefile | 1 + security/py-flask-saml/Makefile | 24 + security/py-flask-saml/distinfo | 3 + security/py-flask-saml/files/patch-setup.py | 10 + security/py-flask-saml/pkg-descr | 4 + sysutils/bareos16-server/Makefile.common | 2 + sysutils/wiimms/Makefile | 3 +- sysutils/wiimms/pkg-descr | 2 +- textproc/highlight/Makefile | 3 +- textproc/highlight/distinfo | 6 +- textproc/highlight/pkg-plist | 9 + textproc/rubygem-diffy/Makefile | 2 +- textproc/rubygem-diffy/distinfo | 6 +- textproc/sk-mythes/Makefile | 2 +- textproc/sk-mythes/distinfo | 6 +- www/Makefile | 3 +- www/miniflux/Makefile | 3 +- www/miniflux/distinfo | 6 +- www/mod_auth_openidc/Makefile | 2 +- www/mod_auth_openidc/distinfo | 6 +- www/{p5-CGI_Lite => p5-CGI-Lite}/Makefile | 2 +- www/p5-CGI-Lite/distinfo | 3 + www/{p5-CGI_Lite => p5-CGI-Lite}/pkg-descr | 0 www/{p5-CGI_Lite => p5-CGI-Lite}/pkg-plist | 0 www/p5-CGI_Lite/distinfo | 2 - www/py-arxiv/Makefile | 22 + www/py-arxiv/distinfo | 3 + www/py-arxiv/pkg-descr | 16 + www/rubygem-jekyll/Makefile | 2 +- www/rubygem-jekyll/distinfo | 6 +- x11-servers/xorg-server/Makefile | 4 +- .../xorg-server/files/patch-CVE-2017-10971 | 163 +++ .../xorg-server/files/patch-CVE-2017-10972 | 38 + x11-wm/xcompmgr/Makefile | 3 +- x11-wm/xcompmgr/files/patch-xcompmgr.c | 28 + x11/Makefile | 1 + x11/libwacom/Makefile | 4 + x11/libwacom/pkg-plist | 117 +++ x11/xscope/Makefile | 18 + x11/xscope/distinfo | 3 + x11/xscope/pkg-descr | 8 + 127 files changed, 1987 insertions(+), 1533 deletions(-) delete mode 100644 java/openjdk8/files/patch-hotspot_src_share_vm_interpreter_bytecodeInterpreter.cpp create mode 100644 lang/spidermonkey52/Makefile create mode 100644 lang/spidermonkey52/distinfo create mode 100644 lang/spidermonkey52/files/patch-1426865 create mode 100644 lang/spidermonkey52/files/patch-disable-mozglue create mode 100644 lang/spidermonkey52/pkg-descr create mode 100644 lang/spidermonkey52/pkg-plist create mode 100644 net-im/purple-slack/Makefile create mode 100644 net-im/purple-slack/distinfo create mode 100644 net-im/purple-slack/pkg-descr delete mode 100644 net-mgmt/py-pysmi/files/patch-setup.py delete mode 100644 net-mgmt/py-pysmi/files/tests__init__.py create mode 100644 net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl11__symbols__p.h create mode 100644 science/gchemutils/files/patch-libs_gcu_spacegroup.cc create mode 100644 security/py-flask-saml/Makefile create mode 100644 security/py-flask-saml/distinfo create mode 100644 security/py-flask-saml/files/patch-setup.py create mode 100644 security/py-flask-saml/pkg-descr rename www/{p5-CGI_Lite => p5-CGI-Lite}/Makefile (97%) create mode 100644 www/p5-CGI-Lite/distinfo rename www/{p5-CGI_Lite => p5-CGI-Lite}/pkg-descr (100%) rename www/{p5-CGI_Lite => p5-CGI-Lite}/pkg-plist (100%) delete mode 100644 www/p5-CGI_Lite/distinfo create mode 100644 www/py-arxiv/Makefile create mode 100644 www/py-arxiv/distinfo create mode 100644 www/py-arxiv/pkg-descr create mode 100644 x11-servers/xorg-server/files/patch-CVE-2017-10971 create mode 100644 x11-servers/xorg-server/files/patch-CVE-2017-10972 create mode 100644 x11-wm/xcompmgr/files/patch-xcompmgr.c create mode 100644 x11/xscope/Makefile create mode 100644 x11/xscope/distinfo create mode 100644 x11/xscope/pkg-descr diff --git a/archivers/zopfli/Makefile b/archivers/zopfli/Makefile index 149f12337062..cd9dddb9c6c1 100644 --- a/archivers/zopfli/Makefile +++ b/archivers/zopfli/Makefile @@ -3,7 +3,7 @@ PORTNAME= zopfli DISTVERSIONPREFIX= ${PORTNAME}- -DISTVERSION= 1.0.1 +DISTVERSION= 1.0.2 CATEGORIES= archivers MAINTAINER= ports@FreeBSD.org @@ -31,7 +31,7 @@ do-install: .for f in ${PORTNAME} ${PORTNAME}png ${INSTALL_PROGRAM} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin .endfor -.for f in lib${PORTNAME}.so.1.0.1 lib${PORTNAME}png.so.1.0.0 +.for f in lib${PORTNAME}.so.1.0.2 lib${PORTNAME}png.so.1.0.2 ${INSTALL_LIB} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/lib ${LN} -fs ${f} ${STAGEDIR}${PREFIX}/lib/${f:R:R} ${LN} -fs ${f:R:R} ${STAGEDIR}${PREFIX}/lib/${f:R:R:R} diff --git a/archivers/zopfli/distinfo b/archivers/zopfli/distinfo index 6b80376a948e..85a711a682cd 100644 --- a/archivers/zopfli/distinfo +++ b/archivers/zopfli/distinfo @@ -1,2 +1,3 @@ -SHA256 (google-zopfli-zopfli-1.0.1_GH0.tar.gz) = 29743d727a4e0ecd1b93e0bf89476ceeb662e809ab2e6ab007a0b0344800e9b4 -SIZE (google-zopfli-zopfli-1.0.1_GH0.tar.gz) = 128178 +TIMESTAMP = 1526822287 +SHA256 (google-zopfli-zopfli-1.0.2_GH0.tar.gz) = 4a570307c37172d894ec4ef93b6e8e3aacc401e78cbcc51cf85b212dbc379a55 +SIZE (google-zopfli-zopfli-1.0.2_GH0.tar.gz) = 136035 diff --git a/archivers/zopfli/pkg-plist b/archivers/zopfli/pkg-plist index 29c191deb8cc..f5e5a5109e45 100644 --- a/archivers/zopfli/pkg-plist +++ b/archivers/zopfli/pkg-plist @@ -8,6 +8,7 @@ include/zopfli/hash.h include/zopfli/katajainen.h include/zopfli/lz77.h include/zopfli/squeeze.h +include/zopfli/symbols.h include/zopfli/tree.h include/zopfli/util.h include/zopfli/zlib_container.h @@ -17,7 +18,7 @@ include/zopflipng/lodepng/lodepng_util.h include/zopflipng/zopflipng_lib.h lib/libzopfli.so lib/libzopfli.so.1 -lib/libzopfli.so.1.0.1 +lib/libzopfli.so.1.0.2 lib/libzopflipng.so lib/libzopflipng.so.1 -lib/libzopflipng.so.1.0.0 +lib/libzopflipng.so.1.0.2 diff --git a/biology/clustalw/Makefile b/biology/clustalw/Makefile index a5ed160d7aa2..ca993dce685f 100644 --- a/biology/clustalw/Makefile +++ b/biology/clustalw/Makefile @@ -3,15 +3,16 @@ PORTNAME= clustalw PORTVERSION= 2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= biology MASTER_SITES= ftp://ftp.ebi.ac.uk/pub/software/clustalw2/${PORTVERSION}/ \ http://www.clustal.org/download/${PORTVERSION}/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= jwb@FreeBSD.org COMMENT= Multiple alignment program for DNA or proteins -RESTRICTED= No commercial use. +LICENSE= LGPL3 +LICENSE_FILE= ${WRKSRC}/COPYING GNU_CONFIGURE= yes diff --git a/biology/clustalw/files/patch-src-general-VectorOutOfRange.h b/biology/clustalw/files/patch-src-general-VectorOutOfRange.h index ffc535d7d5d8..b7d3f90df766 100644 --- a/biology/clustalw/files/patch-src-general-VectorOutOfRange.h +++ b/biology/clustalw/files/patch-src-general-VectorOutOfRange.h @@ -1,5 +1,5 @@ ---- src/general/VectorOutOfRange.h.orig 2013-12-20 23:16:13.000000000 +0800 -+++ src/general/VectorOutOfRange.h 2013-12-20 23:16:37.000000000 +0800 +--- src/general/VectorOutOfRange.h.orig 2010-09-09 14:26:01 UTC ++++ src/general/VectorOutOfRange.h @@ -5,6 +5,7 @@ */ #include diff --git a/biology/molden/Makefile b/biology/molden/Makefile index d7123c414e5c..923e62fe73ea 100644 --- a/biology/molden/Makefile +++ b/biology/molden/Makefile @@ -3,7 +3,7 @@ PORTNAME= molden PORTVERSION= 5.7 -PORTREVISION= 14 +PORTREVISION= 15 PORTEPOCH= 1 CATEGORIES= biology MASTER_SITES= ftp://ftp.cmbi.ru.nl/pub/molgraph/molden/ @@ -17,8 +17,6 @@ LICENSE_NAME= Molden LICENSE_FILE= ${WRKSRC}/CopyRight LICENSE_PERMS= auto-accept -BROKEN= checksum and size mismatch - RESTRICTED= free for academic, non profit usage; do not re-distribute source and executable. WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION} diff --git a/biology/molden/distinfo b/biology/molden/distinfo index 40e588571faf..c2df757b8bf0 100644 --- a/biology/molden/distinfo +++ b/biology/molden/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1509238230 -SHA256 (molden5.7.tar.gz) = 1ab88d4c6bfb617da6b9ce84a02f3427eeded2ee3bbbb769115d25505f08583d -SIZE (molden5.7.tar.gz) = 5346266 +TIMESTAMP = 1526851227 +SHA256 (molden5.7.tar.gz) = 10e3c02b63e6aa277922488f48be1bbd231e5bb111fb86fa162293a6fbc9718a +SIZE (molden5.7.tar.gz) = 5346379 diff --git a/databases/mongodb32/Makefile b/databases/mongodb32/Makefile index 1e567b867b87..f31d54af40eb 100644 --- a/databases/mongodb32/Makefile +++ b/databases/mongodb32/Makefile @@ -3,7 +3,7 @@ PORTNAME= mongodb32 PORTVERSION= 3.2.11 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONPREFIX= r CATEGORIES= databases net MASTER_SITES= https://fastdl.mongodb.org/src/ \ @@ -51,6 +51,14 @@ GROUPS= mongodb USE_RC_SUBR= mongod +.include + +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 +SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" +.else +SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " +.endif + ALL_TARGET= core TEST_TARGET= unittests diff --git a/databases/mongodb32/files/mongod.in b/databases/mongodb32/files/mongod.in index ace3936e0b51..94a538b46668 100644 --- a/databases/mongodb32/files/mongod.in +++ b/databases/mongodb32/files/mongod.in @@ -7,11 +7,11 @@ # Add the following lines to /etc/rc.conf.local or /etc/rc.conf # to enable this service: # -# mongod_enable (bool): Set to "NO" by default. +# mongod_enable (bool): Set to "NO" by default. # Set it to "YES" to enable mongod. -# mongod_limits (bool): Set to "NO" by default. -# Set it to yes to run `limits -e -U mongodb` -# just before mongod starts. +%%LEGACY_LIMITS%%# mongod_limits (bool): Set to "NO" by default. +%%LEGACY_LIMITS%%# Set it to yes to run `limits -e -U mongodb` +%%LEGACY_LIMITS%%# just before mongod starts. # mongod_dbpath (str): Default to "/var/db/mongodb" # Base database directory. # mongod_flags (str): Custom additional arguments to be passed to mongod. @@ -28,7 +28,7 @@ rcvar=mongod_enable load_rc_config $name : ${mongod_enable="NO"} -: ${mongod_limits="NO"} +%%LEGACY_LIMITS%%: ${mongod_limits="NO"} : ${mongod_dbpath="/var/db/mongodb"} : ${mongod_flags="--logpath ${mongod_dbpath}/mongod.log --logappend"} : ${mongod_user="mongodb"} @@ -52,11 +52,12 @@ mongod_prestart() if [ ! -d ${mongod_dbpath} ]; then mongod_create_dbpath || return 1 fi - if checkyesno mongod_limits; then - eval `/usr/bin/limits -e -U ${mongod_user}` 2>/dev/null - else - return 0 - fi +%%LEGACY_LIMITS%% if checkyesno mongod_limits; then +%%LEGACY_LIMITS%% eval `/usr/bin/limits -e -U ${mongod_user}` 2>/dev/null +%%LEGACY_LIMITS%% else +%%LEGACY_LIMITS%% return 0 +%%LEGACY_LIMITS%% fi +%%MODERN_LIMITS%% return 0 } run_rc_command "$1" diff --git a/devel/flang-clang/Makefile b/devel/flang-clang/Makefile index b39f035ef75f..4de4b70b9b70 100644 --- a/devel/flang-clang/Makefile +++ b/devel/flang-clang/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= flang-clang -DISTVERSION= 5.0-20180112 +DISTVERSION= 5.0-20180506 PORTREVISION= 0 CATEGORIES= devel lang @@ -14,8 +14,6 @@ LICENSE_NAME= LLVM Release License LICENSE_FILE= ${WRKSRC}/LICENSE.TXT LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -BROKEN= fails to package - BUILD_DEPENDS= llvm50>=0:devel/llvm50 RUN_DEPENDS= llvm50>=0:devel/llvm50 diff --git a/devel/flang-clang/distinfo b/devel/flang-clang/distinfo index 74e40c54f9dd..90b3d09d7c8a 100644 --- a/devel/flang-clang/distinfo +++ b/devel/flang-clang/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1515770420 -SHA256 (flang-compiler-clang-5.0-20180112-64043d5_GH0.tar.gz) = 63f3b010bb90131099fe5f57e09e50e39aff37a1ac76fb0d1bb8d0ed7bf9e295 -SIZE (flang-compiler-clang-5.0-20180112-64043d5_GH0.tar.gz) = 16002999 +TIMESTAMP = 1525637486 +SHA256 (flang-compiler-clang-5.0-20180506-64043d5_GH0.tar.gz) = 63f3b010bb90131099fe5f57e09e50e39aff37a1ac76fb0d1bb8d0ed7bf9e295 +SIZE (flang-compiler-clang-5.0-20180506-64043d5_GH0.tar.gz) = 16002999 diff --git a/devel/flang-clang/pkg-plist b/devel/flang-clang/pkg-plist index cc9ad48cd1c1..4a9fca6d82dd 100644 --- a/devel/flang-clang/pkg-plist +++ b/devel/flang-clang/pkg-plist @@ -502,102 +502,102 @@ flang/include/clang/Tooling/Refactoring/Rename/USRLocFinder.h flang/include/clang/Tooling/RefactoringCallbacks.h flang/include/clang/Tooling/ReplacementsYaml.h flang/include/clang/Tooling/Tooling.h -flang/lib/clang/5.0.1/include/__clang_cuda_builtin_vars.h -flang/lib/clang/5.0.1/include/__clang_cuda_cmath.h -flang/lib/clang/5.0.1/include/__clang_cuda_complex_builtins.h -flang/lib/clang/5.0.1/include/__clang_cuda_intrinsics.h -flang/lib/clang/5.0.1/include/__clang_cuda_math_forward_declares.h -flang/lib/clang/5.0.1/include/__clang_cuda_runtime_wrapper.h -flang/lib/clang/5.0.1/include/__stddef_max_align_t.h -flang/lib/clang/5.0.1/include/__wmmintrin_aes.h -flang/lib/clang/5.0.1/include/__wmmintrin_pclmul.h -flang/lib/clang/5.0.1/include/adxintrin.h -flang/lib/clang/5.0.1/include/altivec.h -flang/lib/clang/5.0.1/include/ammintrin.h -flang/lib/clang/5.0.1/include/arm_acle.h -flang/lib/clang/5.0.1/include/arm_neon.h -flang/lib/clang/5.0.1/include/armintr.h -flang/lib/clang/5.0.1/include/avx2intrin.h -flang/lib/clang/5.0.1/include/avx512bwintrin.h -flang/lib/clang/5.0.1/include/avx512cdintrin.h -flang/lib/clang/5.0.1/include/avx512dqintrin.h -flang/lib/clang/5.0.1/include/avx512erintrin.h -flang/lib/clang/5.0.1/include/avx512fintrin.h -flang/lib/clang/5.0.1/include/avx512ifmaintrin.h -flang/lib/clang/5.0.1/include/avx512ifmavlintrin.h -flang/lib/clang/5.0.1/include/avx512pfintrin.h -flang/lib/clang/5.0.1/include/avx512vbmiintrin.h -flang/lib/clang/5.0.1/include/avx512vbmivlintrin.h -flang/lib/clang/5.0.1/include/avx512vlbwintrin.h -flang/lib/clang/5.0.1/include/avx512vlcdintrin.h -flang/lib/clang/5.0.1/include/avx512vldqintrin.h -flang/lib/clang/5.0.1/include/avx512vlintrin.h -flang/lib/clang/5.0.1/include/avx512vpopcntdqintrin.h -flang/lib/clang/5.0.1/include/avxintrin.h -flang/lib/clang/5.0.1/include/bmi2intrin.h -flang/lib/clang/5.0.1/include/bmiintrin.h -flang/lib/clang/5.0.1/include/clflushoptintrin.h -flang/lib/clang/5.0.1/include/clzerointrin.h -flang/lib/clang/5.0.1/include/cpuid.h -flang/lib/clang/5.0.1/include/cuda_wrappers/algorithm -flang/lib/clang/5.0.1/include/cuda_wrappers/complex -flang/lib/clang/5.0.1/include/cuda_wrappers/new -flang/lib/clang/5.0.1/include/emmintrin.h -flang/lib/clang/5.0.1/include/f16cintrin.h -flang/lib/clang/5.0.1/include/float.h -flang/lib/clang/5.0.1/include/fma4intrin.h -flang/lib/clang/5.0.1/include/fmaintrin.h -flang/lib/clang/5.0.1/include/fxsrintrin.h -flang/lib/clang/5.0.1/include/htmintrin.h -flang/lib/clang/5.0.1/include/htmxlintrin.h -flang/lib/clang/5.0.1/include/ia32intrin.h -flang/lib/clang/5.0.1/include/immintrin.h -flang/lib/clang/5.0.1/include/intrin.h -flang/lib/clang/5.0.1/include/inttypes.h -flang/lib/clang/5.0.1/include/iso646.h -flang/lib/clang/5.0.1/include/limits.h -flang/lib/clang/5.0.1/include/lwpintrin.h -flang/lib/clang/5.0.1/include/lzcntintrin.h -flang/lib/clang/5.0.1/include/mm3dnow.h -flang/lib/clang/5.0.1/include/mm_malloc.h -flang/lib/clang/5.0.1/include/mmintrin.h -flang/lib/clang/5.0.1/include/module.modulemap -flang/lib/clang/5.0.1/include/msa.h -flang/lib/clang/5.0.1/include/mwaitxintrin.h -flang/lib/clang/5.0.1/include/nmmintrin.h -flang/lib/clang/5.0.1/include/opencl-c.h -flang/lib/clang/5.0.1/include/pkuintrin.h -flang/lib/clang/5.0.1/include/pmmintrin.h -flang/lib/clang/5.0.1/include/popcntintrin.h -flang/lib/clang/5.0.1/include/prfchwintrin.h -flang/lib/clang/5.0.1/include/rdseedintrin.h -flang/lib/clang/5.0.1/include/rtmintrin.h -flang/lib/clang/5.0.1/include/s390intrin.h -flang/lib/clang/5.0.1/include/shaintrin.h -flang/lib/clang/5.0.1/include/smmintrin.h -flang/lib/clang/5.0.1/include/stdalign.h -flang/lib/clang/5.0.1/include/stdarg.h -flang/lib/clang/5.0.1/include/stdatomic.h -flang/lib/clang/5.0.1/include/stdbool.h -flang/lib/clang/5.0.1/include/stddef.h -flang/lib/clang/5.0.1/include/stdint.h -flang/lib/clang/5.0.1/include/stdnoreturn.h -flang/lib/clang/5.0.1/include/tbmintrin.h -flang/lib/clang/5.0.1/include/tgmath.h -flang/lib/clang/5.0.1/include/tmmintrin.h -flang/lib/clang/5.0.1/include/unwind.h -flang/lib/clang/5.0.1/include/vadefs.h -flang/lib/clang/5.0.1/include/varargs.h -flang/lib/clang/5.0.1/include/vecintrin.h -flang/lib/clang/5.0.1/include/wmmintrin.h -flang/lib/clang/5.0.1/include/x86intrin.h -flang/lib/clang/5.0.1/include/xmmintrin.h -flang/lib/clang/5.0.1/include/xopintrin.h -flang/lib/clang/5.0.1/include/xsavecintrin.h -flang/lib/clang/5.0.1/include/xsaveintrin.h -flang/lib/clang/5.0.1/include/xsaveoptintrin.h -flang/lib/clang/5.0.1/include/xsavesintrin.h -flang/lib/clang/5.0.1/include/xtestintrin.h +flang/lib/clang/5.0.2/include/__clang_cuda_builtin_vars.h +flang/lib/clang/5.0.2/include/__clang_cuda_cmath.h +flang/lib/clang/5.0.2/include/__clang_cuda_complex_builtins.h +flang/lib/clang/5.0.2/include/__clang_cuda_intrinsics.h +flang/lib/clang/5.0.2/include/__clang_cuda_math_forward_declares.h +flang/lib/clang/5.0.2/include/__clang_cuda_runtime_wrapper.h +flang/lib/clang/5.0.2/include/__stddef_max_align_t.h +flang/lib/clang/5.0.2/include/__wmmintrin_aes.h +flang/lib/clang/5.0.2/include/__wmmintrin_pclmul.h +flang/lib/clang/5.0.2/include/adxintrin.h +flang/lib/clang/5.0.2/include/altivec.h +flang/lib/clang/5.0.2/include/ammintrin.h +flang/lib/clang/5.0.2/include/arm_acle.h +flang/lib/clang/5.0.2/include/arm_neon.h +flang/lib/clang/5.0.2/include/armintr.h +flang/lib/clang/5.0.2/include/avx2intrin.h +flang/lib/clang/5.0.2/include/avx512bwintrin.h +flang/lib/clang/5.0.2/include/avx512cdintrin.h +flang/lib/clang/5.0.2/include/avx512dqintrin.h +flang/lib/clang/5.0.2/include/avx512erintrin.h +flang/lib/clang/5.0.2/include/avx512fintrin.h +flang/lib/clang/5.0.2/include/avx512ifmaintrin.h +flang/lib/clang/5.0.2/include/avx512ifmavlintrin.h +flang/lib/clang/5.0.2/include/avx512pfintrin.h +flang/lib/clang/5.0.2/include/avx512vbmiintrin.h +flang/lib/clang/5.0.2/include/avx512vbmivlintrin.h +flang/lib/clang/5.0.2/include/avx512vlbwintrin.h +flang/lib/clang/5.0.2/include/avx512vlcdintrin.h +flang/lib/clang/5.0.2/include/avx512vldqintrin.h +flang/lib/clang/5.0.2/include/avx512vlintrin.h +flang/lib/clang/5.0.2/include/avx512vpopcntdqintrin.h +flang/lib/clang/5.0.2/include/avxintrin.h +flang/lib/clang/5.0.2/include/bmi2intrin.h +flang/lib/clang/5.0.2/include/bmiintrin.h +flang/lib/clang/5.0.2/include/clflushoptintrin.h +flang/lib/clang/5.0.2/include/clzerointrin.h +flang/lib/clang/5.0.2/include/cpuid.h +flang/lib/clang/5.0.2/include/cuda_wrappers/algorithm +flang/lib/clang/5.0.2/include/cuda_wrappers/complex +flang/lib/clang/5.0.2/include/cuda_wrappers/new +flang/lib/clang/5.0.2/include/emmintrin.h +flang/lib/clang/5.0.2/include/f16cintrin.h +flang/lib/clang/5.0.2/include/float.h +flang/lib/clang/5.0.2/include/fma4intrin.h +flang/lib/clang/5.0.2/include/fmaintrin.h +flang/lib/clang/5.0.2/include/fxsrintrin.h +flang/lib/clang/5.0.2/include/htmintrin.h +flang/lib/clang/5.0.2/include/htmxlintrin.h +flang/lib/clang/5.0.2/include/ia32intrin.h +flang/lib/clang/5.0.2/include/immintrin.h +flang/lib/clang/5.0.2/include/intrin.h +flang/lib/clang/5.0.2/include/inttypes.h +flang/lib/clang/5.0.2/include/iso646.h +flang/lib/clang/5.0.2/include/limits.h +flang/lib/clang/5.0.2/include/lwpintrin.h +flang/lib/clang/5.0.2/include/lzcntintrin.h +flang/lib/clang/5.0.2/include/mm3dnow.h +flang/lib/clang/5.0.2/include/mm_malloc.h +flang/lib/clang/5.0.2/include/mmintrin.h +flang/lib/clang/5.0.2/include/module.modulemap +flang/lib/clang/5.0.2/include/msa.h +flang/lib/clang/5.0.2/include/mwaitxintrin.h +flang/lib/clang/5.0.2/include/nmmintrin.h +flang/lib/clang/5.0.2/include/opencl-c.h +flang/lib/clang/5.0.2/include/pkuintrin.h +flang/lib/clang/5.0.2/include/pmmintrin.h +flang/lib/clang/5.0.2/include/popcntintrin.h +flang/lib/clang/5.0.2/include/prfchwintrin.h +flang/lib/clang/5.0.2/include/rdseedintrin.h +flang/lib/clang/5.0.2/include/rtmintrin.h +flang/lib/clang/5.0.2/include/s390intrin.h +flang/lib/clang/5.0.2/include/shaintrin.h +flang/lib/clang/5.0.2/include/smmintrin.h +flang/lib/clang/5.0.2/include/stdalign.h +flang/lib/clang/5.0.2/include/stdarg.h +flang/lib/clang/5.0.2/include/stdatomic.h +flang/lib/clang/5.0.2/include/stdbool.h +flang/lib/clang/5.0.2/include/stddef.h +flang/lib/clang/5.0.2/include/stdint.h +flang/lib/clang/5.0.2/include/stdnoreturn.h +flang/lib/clang/5.0.2/include/tbmintrin.h +flang/lib/clang/5.0.2/include/tgmath.h +flang/lib/clang/5.0.2/include/tmmintrin.h +flang/lib/clang/5.0.2/include/unwind.h +flang/lib/clang/5.0.2/include/vadefs.h +flang/lib/clang/5.0.2/include/varargs.h +flang/lib/clang/5.0.2/include/vecintrin.h +flang/lib/clang/5.0.2/include/wmmintrin.h +flang/lib/clang/5.0.2/include/x86intrin.h +flang/lib/clang/5.0.2/include/xmmintrin.h +flang/lib/clang/5.0.2/include/xopintrin.h +flang/lib/clang/5.0.2/include/xsavecintrin.h +flang/lib/clang/5.0.2/include/xsaveintrin.h +flang/lib/clang/5.0.2/include/xsaveoptintrin.h +flang/lib/clang/5.0.2/include/xsavesintrin.h +flang/lib/clang/5.0.2/include/xtestintrin.h flang/lib/cmake/clang/ClangConfig.cmake flang/lib/cmake/clang/ClangTargets-%%CMAKE_BUILD_TYPE%%.cmake flang/lib/cmake/clang/ClangTargets.cmake diff --git a/devel/py-pymarc/Makefile b/devel/py-pymarc/Makefile index ece7841db8a2..393a1bcbc420 100644 --- a/devel/py-pymarc/Makefile +++ b/devel/py-pymarc/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= pymarc -PORTVERSION= 3.1.9 +PORTVERSION= 3.1.10 PORTEPOCH= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP diff --git a/devel/py-pymarc/distinfo b/devel/py-pymarc/distinfo index 47161603c126..07a5baecf258 100644 --- a/devel/py-pymarc/distinfo +++ b/devel/py-pymarc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1526716303 -SHA256 (pymarc-3.1.9.tar.gz) = 392a7239ff6522b1ea3140a13de491106d2286397ac14eda0621c70fd9426494 -SIZE (pymarc-3.1.9.tar.gz) = 231638 +TIMESTAMP = 1526839476 +SHA256 (pymarc-3.1.10.tar.gz) = 8e1d0271477daab89a373251180f4f1927d5147f35ce52a8a46f95a9d90c6979 +SIZE (pymarc-3.1.10.tar.gz) = 231635 diff --git a/devel/py-python-gitlab/Makefile b/devel/py-python-gitlab/Makefile index 6b0288311b73..cc34209358cf 100644 --- a/devel/py-python-gitlab/Makefile +++ b/devel/py-python-gitlab/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= python-gitlab -PORTVERSION= 1.3.0 +PORTVERSION= 1.4.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -30,8 +30,6 @@ USE_PYTHON= distutils autoplist concurrent SUB_FILES= pkg-message -do-test: - post-patch: @${REINPLACE_CMD} -e 's|/etc|${LOCALBASE}/etc|g' ${WRKSRC}/gitlab/config.py diff --git a/devel/py-python-gitlab/distinfo b/devel/py-python-gitlab/distinfo index 71c744029f7b..1715eebb0535 100644 --- a/devel/py-python-gitlab/distinfo +++ b/devel/py-python-gitlab/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1519965217 -SHA256 (python-gitlab-1.3.0.tar.gz) = 74ef4e98383043403d786d1719579b9a638666809b47d93a9fa8f0bd9f12ab84 -SIZE (python-gitlab-1.3.0.tar.gz) = 123955 +TIMESTAMP = 1526841645 +SHA256 (python-gitlab-1.4.0.tar.gz) = 34a5eb1704e68a23bafb9b122c456ff72b3e1a2d3bdcd44346bbde6a5d7af511 +SIZE (python-gitlab-1.4.0.tar.gz) = 127574 diff --git a/dns/bind912/Makefile b/dns/bind912/Makefile index ec614486f4ba..e7b76df51b36 100644 --- a/dns/bind912/Makefile +++ b/dns/bind912/Makefile @@ -32,7 +32,7 @@ LICENSE_FILE= ${WRKSRC}/COPYRIGHT USE_HARDENING= safestack # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.12.1 +ISCVERSION= 9.12.1-P2 USES= cpe libedit diff --git a/dns/bind912/distinfo b/dns/bind912/distinfo index 3a70d5bc5eb2..a5bb613eb2ab 100644 --- a/dns/bind912/distinfo +++ b/dns/bind912/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1521456447 -SHA256 (bind-9.12.1.tar.gz) = 16e446425c35e48b651ddf1171d2115ebf32b07670b652e1030a174038937510 -SIZE (bind-9.12.1.tar.gz) = 9302783 +TIMESTAMP = 1526711298 +SHA256 (bind-9.12.1-P2.tar.gz) = 0de7c3453461e2f0505ac634b984f8e7afa1952cf7fc972cbefbcc169edf2d29 +SIZE (bind-9.12.1-P2.tar.gz) = 9305005 diff --git a/dns/getdns/Makefile b/dns/getdns/Makefile index 81e2fe6a32c3..6e7d938d9720 100644 --- a/dns/getdns/Makefile +++ b/dns/getdns/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= getdns -PORTVERSION= 1.4.1 +PORTVERSION= 1.4.2 CATEGORIES= dns ipv6 MASTER_SITES= https://getdnsapi.net/dist/ \ ZI \ diff --git a/dns/getdns/distinfo b/dns/getdns/distinfo index 31996e4aacb1..333a0c4591b5 100644 --- a/dns/getdns/distinfo +++ b/dns/getdns/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1520865825 -SHA256 (getdns-1.4.1.tar.gz) = 245233dc780f615b6ab1472f2b9cdcd957a451a736f3036717d0da466ab1c51e -SIZE (getdns-1.4.1.tar.gz) = 1055348 +TIMESTAMP = 1526866602 +SHA256 (getdns-1.4.2.tar.gz) = 1685b82dfe297cffc4bae08a773cdc88a3edf9a4e5a1ea27d8764bb5affc0e80 +SIZE (getdns-1.4.2.tar.gz) = 1059122 diff --git a/dns/mDNSResponder_nss/Makefile b/dns/mDNSResponder_nss/Makefile index 39a357be1ef5..80bc747f60ce 100644 --- a/dns/mDNSResponder_nss/Makefile +++ b/dns/mDNSResponder_nss/Makefile @@ -2,6 +2,7 @@ PORTNAME= mDNSResponder PORTVERSION= 878.1.1 +PORTREVISION= 1 CATEGORIES= dns net MASTER_SITES= http://opensource.apple.com/tarballs/mDNSResponder/ PKGNAMESUFFIX= _nss diff --git a/dns/mDNSResponder_nss/pkg-message b/dns/mDNSResponder_nss/pkg-message index c331d5f57183..a232498a8961 100644 --- a/dns/mDNSResponder_nss/pkg-message +++ b/dns/mDNSResponder_nss/pkg-message @@ -1,6 +1,6 @@ ================================================================================ To enable the mDNSResponder NSS module, update the hosts entry in -/etc/nsswitch.conf by adding mdns, preferably between file and dns: +/etc/nsswitch.conf by adding mdns, preferably between files and dns: -hosts: file mdns dns +hosts: files mdns dns ================================================================================ diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index 84136ea8eaa8..00c4dff68f8f 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= wine -DISTVERSION= 3.0 -PORTREVISION= 1 +DISTVERSION= 3.0.1 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}/Source \ diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo index 2098dc375aa0..e2c5fdb449f8 100644 --- a/emulators/wine/distinfo +++ b/emulators/wine/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1516560805 -SHA256 (wine-3.0.tar.xz) = 346a050aca5cd0d9978a655af11c30e68c201a58aea0c70d5e4c4f1b63c2fbec -SIZE (wine-3.0.tar.xz) = 19712932 +TIMESTAMP = 1526811064 +SHA256 (wine-3.0.1.tar.xz) = bad00d7ddac6652795a2ed52ce02a544ff4e891499b29ac71d28d20b8e1d26f3 +SIZE (wine-3.0.1.tar.xz) = 19722444 diff --git a/german/mythes/Makefile b/german/mythes/Makefile index 4d4e1c471261..752a4ba55cf4 100644 --- a/german/mythes/Makefile +++ b/german/mythes/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= mythes -PORTVERSION= 2018.05.13 +PORTVERSION= 2018.05.20 CATEGORIES= german textproc MASTER_SITES= LOCAL/sunpoet/${PORTNAME}/ DISTNAME= Deutscher-Thesaurus-${PORTVERSION:C/\.//g} diff --git a/german/mythes/distinfo b/german/mythes/distinfo index de5e5c84f51f..b1d322ce519b 100644 --- a/german/mythes/distinfo +++ b/german/mythes/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1526309177 -SHA256 (mythes/Deutscher-Thesaurus-20180513.oxt) = 4a67d98cfe45ac4aab296a6d4af9c5bc40a8ddfab816fcd3ce1dff1260718136 -SIZE (mythes/Deutscher-Thesaurus-20180513.oxt) = 8888937 +TIMESTAMP = 1526866363 +SHA256 (mythes/Deutscher-Thesaurus-20180520.oxt) = 46947236c88b273fb29275c6e42e0ae16e1e1bcc45853f045ddc979648b06a9e +SIZE (mythes/Deutscher-Thesaurus-20180520.oxt) = 8919974 diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile index 35c1bd87b29c..b5326b94ed94 100644 --- a/java/openjdk8/Makefile +++ b/java/openjdk8/Makefile @@ -2,7 +2,6 @@ PORTNAME= openjdk PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER:S/^0//} -PORTREVISION= 2 CATEGORIES= java devel MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}/promoted/b${DIST_BUILD_NUMBER}/:jdk \ https://adopt-openjdk.ci.cloudbees.com/job/jtreg/${JTREG_JENKINS_BUILD}/artifact/:jtreg \ @@ -32,7 +31,8 @@ PATCHFILES= patch-8u05-b13.xz \ patch-8u131-b11.xz \ patch-8u144-b01.xz \ patch-8u152-b16.xz \ - patch-8u162-b12.xz + patch-8u162-b12.xz \ + patch-8u172-b11.xz MAINTAINER= java@FreeBSD.org COMMENT?= Java Development Kit ${JDK_MAJOR_VERSION} @@ -207,8 +207,8 @@ NO_CCACHE= yes NOPRECIOUSMAKEVARS= yes JDK_MAJOR_VERSION= 8 -JDK_UPDATE_VERSION= 162 -JDK_BUILD_NUMBER= 12 +JDK_UPDATE_VERSION= 172 +JDK_BUILD_NUMBER= 11 DIST_BUILD_NUMBER= 132 JTREG_VERSION= 4.1 JTREG_BUILD_NUMBER= b08 diff --git a/java/openjdk8/distinfo b/java/openjdk8/distinfo index af4ba657cc2c..f882f000f46a 100644 --- a/java/openjdk8/distinfo +++ b/java/openjdk8/distinfo @@ -45,3 +45,5 @@ SHA256 (patch-8u152-b16.xz) = 51c57b8d60b8f71758fe03c45c70ab60d0423bf4699e71b21b SIZE (patch-8u152-b16.xz) = 454236 SHA256 (patch-8u162-b12.xz) = 9f083cde406ead14e38f5423a6dcc0f0b0a3f7ef69fdc4c83a32b8fea4c3ddcb SIZE (patch-8u162-b12.xz) = 337248 +SHA256 (patch-8u172-b11.xz) = e338a1dc63cc08f9227d685e350e60609e43612f18773213b882d78c7c559934 +SIZE (patch-8u172-b11.xz) = 146716 diff --git a/java/openjdk8/files/patch-bsd b/java/openjdk8/files/patch-bsd index 5fb3730c84ba..5f403e335da9 100644 --- a/java/openjdk8/files/patch-bsd +++ b/java/openjdk8/files/patch-bsd @@ -1,5 +1,5 @@ ---- ./common/autoconf/build-performance.m4 Fri Dec 15 08:56:46 2017 -0800 -+++ ./common/autoconf/build-performance.m4 Thu Jan 25 22:36:11 2018 -0800 +--- ./common/autoconf/build-performance.m4 Mon Mar 19 11:56:10 2018 -0700 ++++ ./common/autoconf/build-performance.m4 Sat May 19 22:20:07 2018 -0700 @@ -41,6 +41,10 @@ # Looks like a MacOSX system NUM_CORES=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Cores' | awk '{print [$]5}'` @@ -38,8 +38,8 @@ AC_MSG_RESULT([no, disabling ccache]) CCACHE= else ---- ./common/autoconf/generated-configure.sh Fri Dec 15 08:56:46 2017 -0800 -+++ ./common/autoconf/generated-configure.sh Thu Jan 25 22:36:11 2018 -0800 +--- ./common/autoconf/generated-configure.sh Mon Mar 19 11:56:10 2018 -0700 ++++ ./common/autoconf/generated-configure.sh Sat May 19 22:20:07 2018 -0700 @@ -646,6 +646,8 @@ LIBM LIBZIP_CAN_USE_MMAP @@ -675,8 +675,8 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, disabling ccache" >&5 $as_echo "no, disabling ccache" >&6; } CCACHE= ---- ./common/autoconf/jdk-options.m4 Fri Dec 15 08:56:46 2017 -0800 -+++ ./common/autoconf/jdk-options.m4 Thu Jan 25 22:36:11 2018 -0800 +--- ./common/autoconf/jdk-options.m4 Mon Mar 19 11:56:10 2018 -0700 ++++ ./common/autoconf/jdk-options.m4 Sat May 19 22:20:07 2018 -0700 @@ -159,7 +159,7 @@ INCLUDE_SA=false fi @@ -707,8 +707,8 @@ # Enable or disable the elliptic curve crypto implementation # AC_DEFUN_ONCE([JDKOPT_DETECT_INTREE_EC], ---- ./common/autoconf/libraries.m4 Fri Dec 15 08:56:46 2017 -0800 -+++ ./common/autoconf/libraries.m4 Thu Jan 25 22:36:11 2018 -0800 +--- ./common/autoconf/libraries.m4 Mon Mar 19 11:56:10 2018 -0700 ++++ ./common/autoconf/libraries.m4 Sat May 19 22:20:07 2018 -0700 @@ -69,9 +69,15 @@ fi @@ -846,8 +846,8 @@ + AC_SUBST(LIBCXX) ]) ---- ./common/autoconf/platform.m4 Fri Dec 15 08:56:46 2017 -0800 -+++ ./common/autoconf/platform.m4 Thu Jan 25 22:36:11 2018 -0800 +--- ./common/autoconf/platform.m4 Mon Mar 19 11:56:10 2018 -0700 ++++ ./common/autoconf/platform.m4 Sat May 19 22:20:07 2018 -0700 @@ -30,7 +30,7 @@ [ # First argument is the cpu name from the trip/quad @@ -907,8 +907,8 @@ OPENJDK_TARGET_CPU_OSARCH="i386" elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then # On all platforms except macosx, we replace x86_64 with amd64. ---- ./common/autoconf/spec.gmk.in Fri Dec 15 08:56:46 2017 -0800 -+++ ./common/autoconf/spec.gmk.in Thu Jan 25 22:36:11 2018 -0800 +--- ./common/autoconf/spec.gmk.in Mon Mar 19 11:56:10 2018 -0700 ++++ ./common/autoconf/spec.gmk.in Sat May 19 22:20:07 2018 -0700 @@ -76,6 +76,7 @@ OPENJDK_TARGET_OS:=@OPENJDK_TARGET_OS@ OPENJDK_TARGET_OS_API:=@OPENJDK_TARGET_OS_API@ @@ -945,8 +945,8 @@ USE_EXTERNAL_LIBZ:=@USE_EXTERNAL_LIBZ@ LIBZIP_CAN_USE_MMAP:=@LIBZIP_CAN_USE_MMAP@ MSVCR_DLL:=@MSVCR_DLL@ ---- ./common/autoconf/toolchain.m4 Fri Dec 15 08:56:46 2017 -0800 -+++ ./common/autoconf/toolchain.m4 Thu Jan 25 22:36:11 2018 -0800 +--- ./common/autoconf/toolchain.m4 Mon Mar 19 11:56:10 2018 -0700 ++++ ./common/autoconf/toolchain.m4 Sat May 19 22:20:07 2018 -0700 @@ -122,7 +122,7 @@ else COMPILER_VERSION_TEST=`$COMPILER --version 2>&1 | $HEAD -n 1` @@ -1064,16 +1064,16 @@ fi if test "x$DEBUG_LEVEL" = xrelease; then COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DNDEBUG" ---- ./configure Fri Dec 15 08:56:46 2017 -0800 -+++ ./configure Thu Jan 25 22:36:11 2018 -0800 +--- ./configure Mon Mar 19 11:56:10 2018 -0700 ++++ ./configure Sat May 19 22:20:07 2018 -0700 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # # Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ---- ./make/Javadoc.gmk Fri Dec 15 08:56:46 2017 -0800 -+++ ./make/Javadoc.gmk Thu Jan 25 22:36:11 2018 -0800 +--- ./make/Javadoc.gmk Mon Mar 19 11:56:10 2018 -0700 ++++ ./make/Javadoc.gmk Sat May 19 22:20:07 2018 -0700 @@ -46,8 +46,18 @@ BUILD_NUMBER=$(JDK_BUILD_NUMBER) @@ -1094,8 +1094,8 @@ -Djava.awt.headless=true \ $(NEW_JAVADOC) \ -bootclasspath $(JDK_OUTPUTDIR)/classes ---- ./make/Main.gmk Fri Dec 15 08:56:46 2017 -0800 -+++ ./make/Main.gmk Thu Jan 25 22:36:11 2018 -0800 +--- ./make/Main.gmk Mon Mar 19 11:56:10 2018 -0700 ++++ ./make/Main.gmk Sat May 19 22:20:07 2018 -0700 @@ -58,7 +58,11 @@ # Setup number of jobs to use. -jN is unfortunately not available for us to parse from the command line, @@ -1108,8 +1108,8 @@ ### Main targets ---- ./make/common/MakeBase.gmk Fri Dec 15 08:56:46 2017 -0800 -+++ ./make/common/MakeBase.gmk Thu Jan 25 22:36:11 2018 -0800 +--- ./make/common/MakeBase.gmk Mon Mar 19 11:56:10 2018 -0700 ++++ ./make/common/MakeBase.gmk Sat May 19 22:20:07 2018 -0700 @@ -338,7 +338,7 @@ # (and causing a crash on Cygwin). # Default shell seems to always be /bin/sh. Must override with bash to get this to work on Solaris. @@ -1130,8 +1130,8 @@ endef # Make directory without forking mkdir if not needed ---- ./make/common/NativeCompilation.gmk Fri Dec 15 08:56:46 2017 -0800 -+++ ./make/common/NativeCompilation.gmk Thu Jan 25 22:36:11 2018 -0800 +--- ./make/common/NativeCompilation.gmk Mon Mar 19 11:56:10 2018 -0700 ++++ ./make/common/NativeCompilation.gmk Sat May 19 22:20:07 2018 -0700 @@ -151,9 +151,9 @@ # CC the compiler to use, default is $(CC) # LDEXE the linker to use for linking executables, default is $(LDEXE) @@ -1145,8 +1145,8 @@ ifneq (,$$($1_BIN)) $$(error BIN has been replaced with OBJECT_DIR) ---- ./hotspot/agent/make/Makefile Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/agent/make/Makefile Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/agent/make/Makefile Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/agent/make/Makefile Sat May 19 23:14:15 2018 -0700 @@ -50,6 +50,7 @@ sun.jvm.hotspot.debugger.amd64 \ sun.jvm.hotspot.debugger.bsd \ @@ -1225,8 +1225,8 @@ sun/jvm/hotspot/runtime/solaris_amd64/*.java \ sun/jvm/hotspot/runtime/solaris_sparc/*.java \ sun/jvm/hotspot/runtime/solaris_x86/*.java \ ---- ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c Sat May 19 23:14:15 2018 -0700 @@ -42,6 +42,10 @@ #include "sun_jvm_hotspot_debugger_sparc_SPARCThreadContext.h" #endif @@ -1295,8 +1295,8 @@ (*env)->ReleaseLongArrayElements(env, array, regs, JNI_COMMIT); return array; ---- ./hotspot/agent/src/os/bsd/elfmacros.h Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/agent/src/os/bsd/elfmacros.h Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/agent/src/os/bsd/elfmacros.h Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/agent/src/os/bsd/elfmacros.h Sat May 19 23:14:15 2018 -0700 @@ -34,6 +34,7 @@ #define ELF_SYM Elf64_Sym #define ELF_DYN Elf64_Dyn @@ -1313,8 +1313,8 @@ #ifndef ELF_ST_TYPE #define ELF_ST_TYPE ELF32_ST_TYPE ---- ./hotspot/agent/src/os/bsd/ps_core.c Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/agent/src/os/bsd/ps_core.c Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/agent/src/os/bsd/ps_core.c Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/agent/src/os/bsd/ps_core.c Sat May 19 23:14:15 2018 -0700 @@ -1091,6 +1091,18 @@ if (core_handle_prstatus(ph, descdata, notep->n_descsz) != true) { return false; @@ -1361,8 +1361,8 @@ goto err; } ---- ./hotspot/agent/src/os/bsd/symtab.c Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/agent/src/os/bsd/symtab.c Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/agent/src/os/bsd/symtab.c Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/agent/src/os/bsd/symtab.c Sat May 19 23:14:15 2018 -0700 @@ -211,6 +211,10 @@ // Reading of elf header @@ -1403,8 +1403,8 @@ key.data = sym_name; key.size = strlen(sym_name) + 1; ---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java Sat May 19 23:14:15 2018 -0700 @@ -33,6 +33,7 @@ import sun.jvm.hotspot.debugger.JVMDebugger; import sun.jvm.hotspot.debugger.MachineDescription; @@ -1423,7 +1423,7 @@ if (LinuxDebuggerLocal.getAddressSize()==8) { machDesc = new MachineDescriptionSPARC64Bit(); --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionPPC64.java Thu Jan 25 22:36:25 2018 -0800 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionPPC64.java Sat May 19 23:14:15 2018 -0700 @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -1468,8 +1468,8 @@ + return false; + } +} ---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java Sat May 19 23:14:15 2018 -0700 @@ -30,8 +30,10 @@ import sun.jvm.hotspot.debugger.cdbg.*; import sun.jvm.hotspot.debugger.x86.*; @@ -1495,8 +1495,8 @@ } else { throw new DebuggerException(cpu + " is not yet supported"); } ---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java Sat May 19 23:14:15 2018 -0700 @@ -27,6 +27,7 @@ import sun.jvm.hotspot.debugger.*; import sun.jvm.hotspot.debugger.bsd.amd64.*; @@ -1515,7 +1515,7 @@ throw new RuntimeException("cpu " + cpu + " is not yet supported"); } --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ppc64/BsdPPC64CFrame.java Thu Jan 25 22:36:25 2018 -0800 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ppc64/BsdPPC64CFrame.java Sat May 19 23:14:15 2018 -0700 @@ -0,0 +1,79 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -1597,7 +1597,7 @@ + private BsdDebugger dbg; +} --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ppc64/BsdPPC64ThreadContext.java Thu Jan 25 22:36:25 2018 -0800 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ppc64/BsdPPC64ThreadContext.java Sat May 19 23:14:15 2018 -0700 @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -1646,7 +1646,7 @@ + } +} --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/ppc64/PPC64ThreadContext.java Thu Jan 25 22:36:25 2018 -0800 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/ppc64/PPC64ThreadContext.java Sat May 19 23:14:15 2018 -0700 @@ -0,0 +1,123 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -1771,8 +1771,8 @@ + public abstract Address getRegisterAsAddress(int index); + +} ---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcDebuggerLocal.java Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcDebuggerLocal.java Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcDebuggerLocal.java Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcDebuggerLocal.java Sat May 19 23:14:15 2018 -0700 @@ -32,7 +32,9 @@ import sun.jvm.hotspot.debugger.cdbg.*; import sun.jvm.hotspot.debugger.proc.amd64.*; @@ -1795,7 +1795,7 @@ try { Class tfc = Class.forName("sun.jvm.hotspot.debugger.proc." + --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64Thread.java Thu Jan 25 22:36:25 2018 -0800 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64Thread.java Sat May 19 23:14:15 2018 -0700 @@ -0,0 +1,86 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -1884,7 +1884,7 @@ + } +} --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64ThreadContext.java Thu Jan 25 22:36:25 2018 -0800 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64ThreadContext.java Sat May 19 23:14:15 2018 -0700 @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -1933,7 +1933,7 @@ + } +} --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64ThreadFactory.java Thu Jan 25 22:36:25 2018 -0800 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64ThreadFactory.java Sat May 19 23:14:15 2018 -0700 @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -1979,8 +1979,8 @@ + return new ProcPPC64Thread(debugger, id); + } +} ---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java Sat May 19 23:14:15 2018 -0700 @@ -33,6 +33,7 @@ import sun.jvm.hotspot.debugger.remote.sparc.*; import sun.jvm.hotspot.debugger.remote.x86.*; @@ -2002,7 +2002,7 @@ try { Class tf = Class.forName("sun.jvm.hotspot.debugger.remote." + --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/ppc64/RemotePPC64Thread.java Thu Jan 25 22:36:25 2018 -0800 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/ppc64/RemotePPC64Thread.java Sat May 19 23:14:15 2018 -0700 @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -2058,7 +2058,7 @@ + } +} --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/ppc64/RemotePPC64ThreadContext.java Thu Jan 25 22:36:25 2018 -0800 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/ppc64/RemotePPC64ThreadContext.java Sat May 19 23:14:15 2018 -0700 @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -2111,7 +2111,7 @@ + } +} --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/ppc64/RemotePPC64ThreadFactory.java Thu Jan 25 22:36:25 2018 -0800 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/ppc64/RemotePPC64ThreadFactory.java Sat May 19 23:14:15 2018 -0700 @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -2157,8 +2157,8 @@ + return new RemotePPC64Thread(debugger, id); + } +} ---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java Sat May 19 23:14:15 2018 -0700 @@ -37,6 +37,7 @@ import sun.jvm.hotspot.runtime.linux_sparc.LinuxSPARCJavaThreadPDAccess; import sun.jvm.hotspot.runtime.bsd_x86.BsdX86JavaThreadPDAccess; @@ -2177,7 +2177,7 @@ } else if (os.equals("darwin")) { if (cpu.equals("amd64") || cpu.equals("x86_64")) { --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_ppc64/BsdPPC64JavaThreadPDAccess.java Thu Jan 25 22:36:25 2018 -0800 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_ppc64/BsdPPC64JavaThreadPDAccess.java Sat May 19 23:14:15 2018 -0700 @@ -0,0 +1,132 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -2312,7 +2312,7 @@ + } +} --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64CurrentFrameGuess.java Thu Jan 25 22:36:25 2018 -0800 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64CurrentFrameGuess.java Sat May 19 23:14:15 2018 -0700 @@ -0,0 +1,176 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -2491,7 +2491,7 @@ + } +} --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64Frame.java Thu Jan 25 22:36:25 2018 -0800 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64Frame.java Sat May 19 23:14:15 2018 -0700 @@ -0,0 +1,508 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -3002,7 +3002,7 @@ + } +} --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64JavaCallWrapper.java Thu Jan 25 22:36:25 2018 -0800 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64JavaCallWrapper.java Sat May 19 23:14:15 2018 -0700 @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -3048,7 +3048,7 @@ + +} --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64RegisterMap.java Thu Jan 25 22:36:25 2018 -0800 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64RegisterMap.java Sat May 19 23:14:15 2018 -0700 @@ -0,0 +1,51 @@ +/* + * Copyright (c) 20014, Oracle and/or its affiliates. All rights reserved. @@ -3101,8 +3101,8 @@ + protected void initializeFromPD(RegisterMap map) {} + protected Address getLocationPD(VMReg reg) { return null; } +} ---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java Sat May 19 23:14:15 2018 -0700 @@ -61,7 +61,7 @@ return "x86"; } else if (cpu.equals("sparc") || cpu.equals("sparcv9")) { @@ -3112,8 +3112,8 @@ return cpu; } else { try { ---- ./hotspot/make/bsd/Makefile Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/make/bsd/Makefile Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/make/bsd/Makefile Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/make/bsd/Makefile Sat May 19 23:14:15 2018 -0700 @@ -66,6 +66,10 @@ FORCE_TIERED=1 endif @@ -3125,8 +3125,8 @@ ifdef LP64 ifeq ("$(filter $(LP64_ARCH),$(BUILDARCH))","") ---- ./hotspot/make/bsd/makefiles/build_vm_def.sh Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/make/bsd/makefiles/build_vm_def.sh Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/make/bsd/makefiles/build_vm_def.sh Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/make/bsd/makefiles/build_vm_def.sh Sat May 19 23:14:15 2018 -0700 @@ -1,12 +1,28 @@ #!/bin/sh @@ -3162,8 +3162,8 @@ + if ($3 ~ /^_ZN9Arguments17SharedArchivePathE$/) print "\t" $3 ";" + }' | sort -u ;; +esac ---- ./hotspot/make/bsd/makefiles/debug.make Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/make/bsd/makefiles/debug.make Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/make/bsd/makefiles/debug.make Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/make/bsd/makefiles/debug.make Sat May 19 23:14:15 2018 -0700 @@ -35,7 +35,10 @@ # to inhibit the effect of the previous line on CFLAGS. @@ -3176,8 +3176,8 @@ VERSION = debug SYSDEFS += -DASSERT ---- ./hotspot/make/bsd/makefiles/defs.make Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/make/bsd/makefiles/defs.make Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/make/bsd/makefiles/defs.make Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/make/bsd/makefiles/defs.make Sat May 19 23:14:15 2018 -0700 @@ -29,7 +29,15 @@ SLASH_JAVA ?= /java @@ -3276,8 +3276,8 @@ ADD_SA_BINARIES/ia64 = ADD_SA_BINARIES/arm = ADD_SA_BINARIES/zero = ---- ./hotspot/make/bsd/makefiles/fastdebug.make Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/make/bsd/makefiles/fastdebug.make Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/make/bsd/makefiles/fastdebug.make Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/make/bsd/makefiles/fastdebug.make Sat May 19 23:14:15 2018 -0700 @@ -56,7 +56,10 @@ # to inhibit the effect of the previous line on CFLAGS. @@ -3290,8 +3290,8 @@ VERSION = fastdebug SYSDEFS += -DASSERT -DCHECK_UNHANDLED_OOPS ---- ./hotspot/make/bsd/makefiles/gcc.make Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/make/bsd/makefiles/gcc.make Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/make/bsd/makefiles/gcc.make Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/make/bsd/makefiles/gcc.make Sat May 19 23:14:15 2018 -0700 @@ -168,6 +168,9 @@ CFLAGS += -DDONT_USE_PRECOMPILED_HEADER endif @@ -3324,7 +3324,18 @@ endif endif -@@ -265,7 +271,7 @@ +@@ -258,6 +264,10 @@ + # WARNINGS_ARE_ERRORS += -Wno-tautological-constant-out-of-range-compare + WARNINGS_ARE_ERRORS += -Wno-delete-non-virtual-dtor -Wno-deprecated -Wno-format -Wno-dynamic-class-memaccess + WARNINGS_ARE_ERRORS += -Wno-empty-body ++ ifneq "$(shell expr \( $(CC_VER_MAJOR) \>= 6 \))" "0" ++ WARNINGS_ARE_ERRORS += -Wno-undefined-bool-conversion -Wno-expansion-to-defined ++ WARNINGS_ARE_ERRORS += -Wno-undefined-var-template ++ endif + endif + + WARNING_FLAGS = -Wpointer-arith -Wsign-compare -Wundef +@@ -265,7 +275,7 @@ ifeq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 3 \) \))" "0" # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit # conversions which might affect the values. Only enable it in earlier versions. @@ -3333,7 +3344,7 @@ ifeq ($(USE_CLANG),) WARNING_FLAGS += -Wconversion endif -@@ -421,53 +427,44 @@ +@@ -421,53 +431,44 @@ CFLAGS += -flimit-debug-info endif @@ -3419,7 +3430,7 @@ endif --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/make/bsd/makefiles/launcher.make Thu Jan 25 22:36:25 2018 -0800 ++++ ./hotspot/make/bsd/makefiles/launcher.make Sat May 19 23:14:15 2018 -0700 @@ -0,0 +1,117 @@ +# +# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. @@ -3538,8 +3549,8 @@ + $(QUIETLY) sed -e 's/@@LIBARCH@@/$(LIBARCH)/g' $< > $@ + $(QUIETLY) chmod +x $@ + ---- ./hotspot/make/bsd/makefiles/mapfile-vers-debug Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/make/bsd/makefiles/mapfile-vers-debug Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/make/bsd/makefiles/mapfile-vers-debug Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/make/bsd/makefiles/mapfile-vers-debug Sat May 19 23:14:15 2018 -0700 @@ -21,246 +21,254 @@ # questions. # @@ -4027,7 +4038,7 @@ + *; +}; --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/make/bsd/makefiles/mapfile-vers-debug.macosx Thu Jan 25 22:36:25 2018 -0800 ++++ ./hotspot/make/bsd/makefiles/mapfile-vers-debug.macosx Sat May 19 23:14:15 2018 -0700 @@ -0,0 +1,266 @@ +# +# Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved. @@ -4295,8 +4306,8 @@ + + # INSERT VTABLE SYMBOLS HERE + ---- ./hotspot/make/bsd/makefiles/mapfile-vers-product Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/make/bsd/makefiles/mapfile-vers-product Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/make/bsd/makefiles/mapfile-vers-product Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/make/bsd/makefiles/mapfile-vers-product Sat May 19 23:14:15 2018 -0700 @@ -21,241 +21,249 @@ # questions. # @@ -4775,7 +4786,7 @@ + *; +}; --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/make/bsd/makefiles/mapfile-vers-product.macosx Thu Jan 25 22:36:25 2018 -0800 ++++ ./hotspot/make/bsd/makefiles/mapfile-vers-product.macosx Sat May 19 23:14:15 2018 -0700 @@ -0,0 +1,261 @@ +# +# Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved. @@ -5038,8 +5049,8 @@ + + # INSERT VTABLE SYMBOLS HERE + ---- ./hotspot/make/bsd/makefiles/optimized.make Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/make/bsd/makefiles/optimized.make Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/make/bsd/makefiles/optimized.make Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/make/bsd/makefiles/optimized.make Sat May 19 23:14:15 2018 -0700 @@ -38,6 +38,9 @@ # to inhibit the effect of the previous line on CFLAGS. @@ -5052,7 +5063,7 @@ VERSION = optimized --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/make/bsd/makefiles/ppc64.make Thu Jan 25 22:36:25 2018 -0800 ++++ ./hotspot/make/bsd/makefiles/ppc64.make Sat May 19 23:14:15 2018 -0700 @@ -0,0 +1,51 @@ +# +# Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. @@ -5105,8 +5116,8 @@ + # Use Power8, this is the first CPU to support PPC64 LE with ELFv2 ABI. + CFLAGS += -mcpu=power7 -mtune=power8 -minsert-sched-nops=regroup_exact -mno-multiple -mno-string +endif ---- ./hotspot/make/bsd/makefiles/product.make Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/make/bsd/makefiles/product.make Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/make/bsd/makefiles/product.make Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/make/bsd/makefiles/product.make Sat May 19 23:14:15 2018 -0700 @@ -38,7 +38,10 @@ # to inhibit the effect of the previous line on CFLAGS. @@ -5119,8 +5130,8 @@ SYSDEFS += -DPRODUCT VERSION = optimized ---- ./hotspot/make/bsd/makefiles/rules.make Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/make/bsd/makefiles/rules.make Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/make/bsd/makefiles/rules.make Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/make/bsd/makefiles/rules.make Sat May 19 23:14:15 2018 -0700 @@ -34,7 +34,7 @@ CC_COMPILE = $(CC) $(CXXFLAGS) $(CFLAGS) CXX_COMPILE = $(CXX) $(CXXFLAGS) $(CFLAGS) @@ -5130,8 +5141,8 @@ COMPILE.CC = $(CC_COMPILE) -c GENASM.CC = $(CC_COMPILE) -S ---- ./hotspot/make/bsd/makefiles/sa.make Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/make/bsd/makefiles/sa.make Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/make/bsd/makefiles/sa.make Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/make/bsd/makefiles/sa.make Sat May 19 23:14:15 2018 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. @@ -5246,8 +5257,8 @@ rm -rf $(AGENT_FILES_LIST) + +-include $(HS_ALT_MAKE)/bsd/makefiles/sa-rules.make ---- ./hotspot/make/bsd/makefiles/saproc.make Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/make/bsd/makefiles/saproc.make Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/make/bsd/makefiles/saproc.make Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/make/bsd/makefiles/saproc.make Sat May 19 23:14:15 2018 -0700 @@ -99,10 +99,10 @@ endif @@ -5287,8 +5298,8 @@ + cp -f $(LIBSAPROC) $(DEST_SAPROC) && echo "Done" .PHONY: install_saproc ---- ./hotspot/make/bsd/makefiles/vm.make Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/make/bsd/makefiles/vm.make Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/make/bsd/makefiles/vm.make Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/make/bsd/makefiles/vm.make Sat May 19 23:14:15 2018 -0700 @@ -107,7 +107,7 @@ # File specific flags CXXFLAGS += $(CXXFLAGS/BYFILE) @@ -5299,7 +5310,7 @@ endif --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/make/bsd/platform_ppc64 Thu Jan 25 22:36:25 2018 -0800 ++++ ./hotspot/make/bsd/platform_ppc64 Sat May 19 23:14:15 2018 -0700 @@ -0,0 +1,17 @@ +os_family = bsd + @@ -5318,8 +5329,8 @@ +gnu_dis_arch = ppc64 + +sysdefs = -DBSD -D_ALLBSD_SOURCE -D_GNU_SOURCE -DPPC64 ---- ./hotspot/make/sa.files Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/make/sa.files Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/make/sa.files Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/make/sa.files Sat May 19 23:14:15 2018 -0700 @@ -45,6 +45,7 @@ $(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/amd64/*.java \ $(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/bsd/*.java \ @@ -5360,8 +5371,8 @@ $(AGENT_SRC_DIR)/sun/jvm/hotspot/tools/*.java \ $(AGENT_SRC_DIR)/sun/jvm/hotspot/tools/jcore/*.java \ $(AGENT_SRC_DIR)/sun/jvm/hotspot/tools/soql/*.java \ ---- ./hotspot/src/cpu/ppc/vm/bytes_ppc.hpp Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/src/cpu/ppc/vm/bytes_ppc.hpp Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/src/cpu/ppc/vm/bytes_ppc.hpp Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/src/cpu/ppc/vm/bytes_ppc.hpp Sat May 19 23:14:15 2018 -0700 @@ -277,5 +277,9 @@ #if defined(TARGET_OS_ARCH_linux_ppc) #include "bytes_linux_ppc.inline.hpp" @@ -5372,8 +5383,8 @@ + #endif // CPU_PPC_VM_BYTES_PPC_HPP ---- ./hotspot/src/cpu/ppc/vm/interpreter_ppc.cpp Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/src/cpu/ppc/vm/interpreter_ppc.cpp Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/src/cpu/ppc/vm/interpreter_ppc.cpp Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/src/cpu/ppc/vm/interpreter_ppc.cpp Sat May 19 23:14:15 2018 -0700 @@ -307,6 +307,8 @@ // Although AIX runs on big endian CPU, float is in most significant // word of an argument slot. @@ -5383,8 +5394,8 @@ #else #error "unknown OS" #endif ---- ./hotspot/src/cpu/ppc/vm/sharedRuntime_ppc.cpp Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/src/cpu/ppc/vm/sharedRuntime_ppc.cpp Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/src/cpu/ppc/vm/sharedRuntime_ppc.cpp Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/src/cpu/ppc/vm/sharedRuntime_ppc.cpp Sat May 19 23:14:15 2018 -0700 @@ -780,6 +780,8 @@ // Although AIX runs on big endian CPU, float is in the most // significant word of an argument slot. @@ -5394,8 +5405,8 @@ #else #error "unknown OS" #endif ---- ./hotspot/src/cpu/x86/vm/jni_x86.h Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/src/cpu/x86/vm/jni_x86.h Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/src/cpu/x86/vm/jni_x86.h Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/src/cpu/x86/vm/jni_x86.h Sat May 19 23:14:15 2018 -0700 @@ -34,7 +34,7 @@ #ifndef __has_attribute #define __has_attribute(x) 0 @@ -5405,8 +5416,8 @@ #define JNIEXPORT __attribute__((visibility("default"))) #define JNIIMPORT __attribute__((visibility("default"))) #else ---- ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp Sat May 19 23:14:15 2018 -0700 @@ -2266,7 +2266,7 @@ if (!is_critical_native) { // reset handle block @@ -5416,8 +5427,8 @@ // Any exception pending? __ cmpptr(Address(thread, in_bytes(Thread::pending_exception_offset())), (int32_t)NULL_WORD); ---- ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp Sat May 19 23:14:15 2018 -0700 @@ -23,9 +23,12 @@ */ @@ -5432,8 +5443,8 @@ #include "asm/macroAssembler.hpp" #include "asm/macroAssembler.inline.hpp" #include "code/debugInfoRec.hpp" ---- ./hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp Sat May 19 23:14:15 2018 -0700 @@ -1293,7 +1293,7 @@ // reset handle block @@ -5443,8 +5454,8 @@ // If result was an oop then unbox and save it in the frame { Label L; ---- ./hotspot/src/cpu/x86/vm/x86_32.ad Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/src/cpu/x86/vm/x86_32.ad Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/src/cpu/x86/vm/x86_32.ad Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/src/cpu/x86/vm/x86_32.ad Sat May 19 23:14:15 2018 -0700 @@ -1250,6 +1250,7 @@ @@ -5453,8 +5464,8 @@ } #ifndef PRODUCT ---- ./hotspot/src/os/aix/vm/os_aix.cpp Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/src/os/aix/vm/os_aix.cpp Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/src/os/aix/vm/os_aix.cpp Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/src/os/aix/vm/os_aix.cpp Sat May 19 23:14:15 2018 -0700 @@ -5236,6 +5236,10 @@ return 0; } @@ -5467,7 +5478,7 @@ } --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/src/os/bsd/vm/decoder_bsd.cpp Thu Jan 25 22:36:25 2018 -0800 ++++ ./hotspot/src/os/bsd/vm/decoder_bsd.cpp Sat May 19 23:14:15 2018 -0700 @@ -0,0 +1,53 @@ +/* + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. @@ -5522,8 +5533,8 @@ + return false; +} +#endif ---- ./hotspot/src/os/bsd/vm/jsig.c Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/src/os/bsd/vm/jsig.c Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/src/os/bsd/vm/jsig.c Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/src/os/bsd/vm/jsig.c Sat May 19 23:14:15 2018 -0700 @@ -165,9 +165,8 @@ } @@ -5536,8 +5547,8 @@ static int call_os_sigaction(int sig, const struct sigaction *act, struct sigaction *oact) { ---- ./hotspot/src/os/bsd/vm/jvm_bsd.cpp Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/src/os/bsd/vm/jvm_bsd.cpp Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/src/os/bsd/vm/jvm_bsd.cpp Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/src/os/bsd/vm/jvm_bsd.cpp Sat May 19 23:14:15 2018 -0700 @@ -50,6 +50,7 @@ case INTERRUPT_SIGNAL: case SIGFPE: @@ -5647,8 +5658,8 @@ + jio_snprintf(buf, len, "SIG%s", signame); + return true; } ---- ./hotspot/src/os/bsd/vm/jvm_bsd.h Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/src/os/bsd/vm/jvm_bsd.h Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/src/os/bsd/vm/jvm_bsd.h Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/src/os/bsd/vm/jvm_bsd.h Sat May 19 23:14:15 2018 -0700 @@ -112,20 +112,6 @@ #define SHUTDOWN2_SIGNAL SIGINT #define SHUTDOWN3_SIGNAL SIGTERM @@ -5670,8 +5681,8 @@ #endif /* JVM_MD_H */ #endif // OS_BSD_VM_JVM_BSD_H ---- ./hotspot/src/os/bsd/vm/osThread_bsd.cpp Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/src/os/bsd/vm/osThread_bsd.cpp Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/src/os/bsd/vm/osThread_bsd.cpp Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/src/os/bsd/vm/osThread_bsd.cpp Sat May 19 23:14:15 2018 -0700 @@ -30,7 +30,7 @@ void OSThread::pd_initialize() { @@ -5681,8 +5692,8 @@ _thread_id = 0; #else _thread_id = NULL; ---- ./hotspot/src/os/bsd/vm/os_bsd.cpp Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/src/os/bsd/vm/os_bsd.cpp Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/src/os/bsd/vm/os_bsd.cpp Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/src/os/bsd/vm/os_bsd.cpp Sat May 19 23:14:15 2018 -0700 @@ -97,16 +97,31 @@ # include #ifndef __APPLE__ @@ -5904,7 +5915,7 @@ #else return (intx)::pthread_self(); #endif -@@ -1696,14 +1764,14 @@ +@@ -1691,14 +1759,14 @@ } void os::print_os_info_brief(outputStream* st) { @@ -5921,7 +5932,7 @@ os::Posix::print_uname_info(st); -@@ -1716,6 +1784,29 @@ +@@ -1711,6 +1779,29 @@ // Nothing to do for now. } @@ -5951,7 +5962,7 @@ void os::print_memory_info(outputStream* st) { st->print("Memory:"); -@@ -1725,11 +1816,14 @@ +@@ -1720,11 +1811,14 @@ os::physical_memory() >> 10); st->print("(" UINT64_FORMAT "k free)", os::available_memory() >> 10); @@ -5971,7 +5982,7 @@ st->cr(); } -@@ -1768,6 +1862,9 @@ +@@ -1763,6 +1857,9 @@ print_signal_handler(st, SHUTDOWN2_SIGNAL , buf, buflen); print_signal_handler(st, SHUTDOWN3_SIGNAL , buf, buflen); print_signal_handler(st, BREAK_SIGNAL, buf, buflen); @@ -5981,7 +5992,7 @@ } static char saved_jvm_path[MAXPATHLEN] = {0}; -@@ -1965,7 +2062,7 @@ +@@ -1960,7 +2057,7 @@ os_semaphore_t _semaphore; }; @@ -5990,7 +6001,7 @@ SEM_INIT(_semaphore, 0); } -@@ -2153,7 +2250,7 @@ +@@ -2148,7 +2245,7 @@ if (::write(fd, "", 1) == 1) { mmap(base, size, PROT_READ|PROT_WRITE|PROT_EXEC, @@ -5999,7 +6010,7 @@ } } ::close(fd); -@@ -2263,7 +2360,7 @@ +@@ -2258,7 +2355,7 @@ return ::mprotect(addr, size, PROT_NONE) == 0; #else uintptr_t res = (uintptr_t) ::mmap(addr, size, PROT_NONE, @@ -6008,7 +6019,7 @@ return res != (uintptr_t) MAP_FAILED; #endif } -@@ -2290,7 +2387,7 @@ +@@ -2285,7 +2382,7 @@ char * addr; int flags; @@ -6017,7 +6028,7 @@ if (fixed) { assert((uintptr_t)requested_addr % os::Bsd::page_size() == 0, "unaligned address"); flags |= MAP_FIXED; -@@ -2779,6 +2876,7 @@ +@@ -2774,6 +2871,7 @@ return OS_OK; #elif defined(__FreeBSD__) int ret = pthread_setprio(thread->osthread()->pthread_id(), newpri); @@ -6025,7 +6036,7 @@ #elif defined(__APPLE__) || defined(__NetBSD__) struct sched_param sp; int policy; -@@ -3325,6 +3423,9 @@ +@@ -3320,6 +3418,9 @@ set_signal_handler(SIGBUS, true); set_signal_handler(SIGILL, true); set_signal_handler(SIGFPE, true); @@ -6035,7 +6046,7 @@ set_signal_handler(SIGXFSZ, true); #if defined(__APPLE__) -@@ -3373,18 +3474,6 @@ +@@ -3368,18 +3469,6 @@ } } @@ -6054,7 +6065,7 @@ static const char* get_signal_handler_name(address handler, char* buf, int buflen) { int offset; -@@ -3408,9 +3497,6 @@ +@@ -3403,9 +3492,6 @@ sigaction(sig, NULL, &sa); @@ -6064,7 +6075,7 @@ st->print("%s: ", os::exception_name(sig, buf, buflen)); address handler = (sa.sa_flags & SA_SIGINFO) -@@ -3432,7 +3518,7 @@ +@@ -3427,7 +3513,7 @@ // May be, handler was resetted by VMError? if(rh != NULL) { handler = rh; @@ -6073,7 +6084,7 @@ } st->print(", sa_flags="); -@@ -3474,6 +3560,9 @@ +@@ -3469,6 +3555,9 @@ DO_SIGNAL_CHECK(SIGBUS); DO_SIGNAL_CHECK(SIGPIPE); DO_SIGNAL_CHECK(SIGXFSZ); @@ -6083,7 +6094,7 @@ // ReduceSignalUsage allows the user to override these handlers -@@ -3508,8 +3597,6 @@ +@@ -3503,8 +3592,6 @@ os_sigaction(sig, (struct sigaction*)NULL, &act); @@ -6092,7 +6103,7 @@ address thisHandler = (act.sa_flags & SA_SIGINFO) ? CAST_FROM_FN_PTR(address, act.sa_sigaction) : CAST_FROM_FN_PTR(address, act.sa_handler) ; -@@ -3574,6 +3661,14 @@ +@@ -3569,6 +3656,14 @@ extern bool signal_name(int signo, char* buf, size_t len); @@ -6107,7 +6118,7 @@ const char* os::exception_name(int exception_code, char* buf, size_t size) { if (0 < exception_code && exception_code <= SIGRTMAX) { // signal -@@ -3622,6 +3717,25 @@ +@@ -3617,6 +3712,25 @@ Bsd::clock_init(); initial_time_count = javaTimeNanos(); @@ -6133,7 +6144,7 @@ #ifdef __APPLE__ // XXXDARWIN // Work around the unaligned VM callbacks in hotspot's -@@ -3770,6 +3884,19 @@ +@@ -3765,6 +3879,19 @@ }; int os::active_processor_count() { @@ -6153,7 +6164,7 @@ return _processor_count; } -@@ -3981,7 +4108,10 @@ +@@ -3976,7 +4103,10 @@ } int fd; int o_delete = (oflag & O_DELETE); @@ -6165,7 +6176,7 @@ fd = ::open(path, oflag, mode); if (fd == -1) return -1; -@@ -4026,7 +4156,7 @@ +@@ -4021,7 +4151,7 @@ * 4843136: (process) pipe file descriptor from Runtime.exec not being closed * 6339493: (process) Runtime.exec does not close all file descriptors on Solaris 9 */ @@ -6174,7 +6185,7 @@ { int flags = ::fcntl(fd, F_GETFD); if (flags != -1) -@@ -4166,8 +4296,9 @@ +@@ -4161,8 +4291,9 @@ #ifdef __APPLE__ return os::thread_cpu_time(Thread::current(), true /* user + sys */); #else @@ -6186,7 +6197,7 @@ #endif } -@@ -4175,8 +4306,9 @@ +@@ -4170,8 +4301,9 @@ #ifdef __APPLE__ return os::thread_cpu_time(thread, true /* user + sys */); #else @@ -6198,7 +6209,7 @@ #endif } -@@ -4184,8 +4316,9 @@ +@@ -4179,8 +4311,9 @@ #ifdef __APPLE__ return os::thread_cpu_time(Thread::current(), user_sys_cpu_time); #else @@ -6210,7 +6221,7 @@ #endif } -@@ -4210,8 +4343,41 @@ +@@ -4205,8 +4338,41 @@ return ((jlong)tinfo.user_time.seconds * 1000000000) + ((jlong)tinfo.user_time.microseconds * (jlong)1000); } #else @@ -6254,7 +6265,7 @@ #endif } -@@ -4234,7 +4400,7 @@ +@@ -4229,7 +4395,7 @@ #ifdef __APPLE__ return true; #else @@ -6263,7 +6274,7 @@ #endif } -@@ -4332,21 +4498,36 @@ +@@ -4327,21 +4493,36 @@ static struct timespec* compute_abstime(struct timespec* abstime, jlong millis) { if (millis < 0) millis = 0; @@ -6309,7 +6320,7 @@ return abstime; } -@@ -4438,7 +4619,7 @@ +@@ -4433,7 +4614,7 @@ status = os::Bsd::safe_cond_timedwait(_cond, _mutex, &abst); if (status != 0 && WorkAroundNPTLTimedWaitHang) { pthread_cond_destroy (_cond); @@ -6318,7 +6329,7 @@ } assert_status(status == 0 || status == EINTR || status == ETIMEDOUT, -@@ -4539,32 +4720,50 @@ +@@ -4534,32 +4715,50 @@ static void unpackTime(struct timespec* absTime, bool isAbsolute, jlong time) { assert (time > 0, "convertTime"); @@ -6389,7 +6400,7 @@ if (absTime->tv_nsec >= NANOSECS_PER_SEC) { absTime->tv_nsec -= NANOSECS_PER_SEC; ++absTime->tv_sec; // note: this must be <= max_secs -@@ -4644,15 +4843,19 @@ +@@ -4639,15 +4838,19 @@ jt->set_suspend_equivalent(); // cleared by handle_special_suspend_equivalent_condition() or java_suspend_self() @@ -6413,7 +6424,7 @@ assert_status(status == 0 || status == EINTR || status == ETIMEDOUT, status, "cond_timedwait"); -@@ -4681,17 +4884,26 @@ +@@ -4676,17 +4879,26 @@ s = _counter; _counter = 1; if (s < 1) { @@ -6449,7 +6460,7 @@ } else { pthread_mutex_unlock(_mutex); assert (status == 0, "invariant") ; -@@ -4822,13 +5034,29 @@ +@@ -4817,13 +5029,29 @@ // Get the default path to the core file // Returns the length of the string @@ -6486,8 +6497,8 @@ } #ifndef PRODUCT ---- ./hotspot/src/os/bsd/vm/os_bsd.hpp Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/src/os/bsd/vm/os_bsd.hpp Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/src/os/bsd/vm/os_bsd.hpp Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/src/os/bsd/vm/os_bsd.hpp Sat May 19 23:14:15 2018 -0700 @@ -58,12 +58,16 @@ // For signal flags diagnostics static int sigflags[MAXSIGNUM]; @@ -6576,8 +6587,8 @@ } }; ---- ./hotspot/src/os/bsd/vm/vmError_bsd.cpp Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/src/os/bsd/vm/vmError_bsd.cpp Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/src/os/bsd/vm/vmError_bsd.cpp Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/src/os/bsd/vm/vmError_bsd.cpp Sat May 19 23:14:15 2018 -0700 @@ -33,30 +33,50 @@ #include #include @@ -6639,8 +6650,8 @@ os::fork_and_exec(buf); yes = false; } ---- ./hotspot/src/os/linux/vm/os_linux.cpp Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/src/os/linux/vm/os_linux.cpp Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/src/os/linux/vm/os_linux.cpp Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/src/os/linux/vm/os_linux.cpp Sat May 19 23:14:15 2018 -0700 @@ -6285,6 +6285,10 @@ return 0; } @@ -6652,8 +6663,8 @@ return strlen(buffer); } ---- ./hotspot/src/os/posix/vm/os_posix.cpp Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/src/os/posix/vm/os_posix.cpp Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/src/os/posix/vm/os_posix.cpp Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/src/os/posix/vm/os_posix.cpp Sat May 19 23:14:15 2018 -0700 @@ -53,12 +53,11 @@ n = get_core_path(buffer, bufferSize); @@ -6716,8 +6727,8 @@ // Linux specific #ifdef SI_TKILL { SI_TKILL, "SI_TKILL", "Signal sent by tkill (pthread_kill)" }, ---- ./hotspot/src/os/solaris/vm/os_solaris.cpp Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/src/os/solaris/vm/os_solaris.cpp Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/src/os/solaris/vm/os_solaris.cpp Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/src/os/solaris/vm/os_solaris.cpp Sat May 19 23:14:15 2018 -0700 @@ -6375,6 +6375,10 @@ return 0; } @@ -6730,7 +6741,7 @@ } --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/src/os_cpu/bsd_ppc/vm/atomic_bsd_ppc.inline.hpp Thu Jan 25 22:36:25 2018 -0800 ++++ ./hotspot/src/os_cpu/bsd_ppc/vm/atomic_bsd_ppc.inline.hpp Sat May 19 23:14:15 2018 -0700 @@ -0,0 +1,400 @@ +/* + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. @@ -7133,7 +7144,7 @@ + +#endif // OS_CPU_BSD_PPC_VM_ATOMIC_BSD_PPC_INLINE_HPP --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/src/os_cpu/bsd_ppc/vm/bytes_bsd_ppc.inline.hpp Thu Jan 25 22:36:25 2018 -0800 ++++ ./hotspot/src/os_cpu/bsd_ppc/vm/bytes_bsd_ppc.inline.hpp Sat May 19 23:14:15 2018 -0700 @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. @@ -7175,7 +7186,7 @@ + +#endif // OS_CPU_BSD_PPC_VM_BYTES_BSD_PPC_INLINE_HPP --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/src/os_cpu/bsd_ppc/vm/globals_bsd_ppc.hpp Thu Jan 25 22:36:25 2018 -0800 ++++ ./hotspot/src/os_cpu/bsd_ppc/vm/globals_bsd_ppc.hpp Sat May 19 23:14:15 2018 -0700 @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. @@ -7232,7 +7243,7 @@ + +#endif // OS_CPU_BSD_PPC_VM_GLOBALS_BSD_PPC_HPP --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/src/os_cpu/bsd_ppc/vm/orderAccess_bsd_ppc.inline.hpp Thu Jan 25 22:36:25 2018 -0800 ++++ ./hotspot/src/os_cpu/bsd_ppc/vm/orderAccess_bsd_ppc.inline.hpp Sat May 19 23:14:15 2018 -0700 @@ -0,0 +1,149 @@ +/* + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. @@ -7384,7 +7395,7 @@ + +#endif // OS_CPU_BSD_PPC_VM_ORDERACCESS_BSD_PPC_INLINE_HPP --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/src/os_cpu/bsd_ppc/vm/os_bsd_ppc.cpp Thu Jan 25 22:36:25 2018 -0800 ++++ ./hotspot/src/os_cpu/bsd_ppc/vm/os_bsd_ppc.cpp Sat May 19 23:14:15 2018 -0700 @@ -0,0 +1,666 @@ +/* + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. @@ -8053,7 +8064,7 @@ +} +#endif --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/src/os_cpu/bsd_ppc/vm/os_bsd_ppc.hpp Thu Jan 25 22:36:25 2018 -0800 ++++ ./hotspot/src/os_cpu/bsd_ppc/vm/os_bsd_ppc.hpp Sat May 19 23:14:15 2018 -0700 @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. @@ -8091,7 +8102,7 @@ + +#endif // OS_CPU_BSD_PPC_VM_OS_BSD_PPC_HPP --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/src/os_cpu/bsd_ppc/vm/prefetch_bsd_ppc.inline.hpp Thu Jan 25 22:36:25 2018 -0800 ++++ ./hotspot/src/os_cpu/bsd_ppc/vm/prefetch_bsd_ppc.inline.hpp Sat May 19 23:14:15 2018 -0700 @@ -0,0 +1,50 @@ +/* + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. @@ -8144,7 +8155,7 @@ + +#endif // OS_CPU_BSD_PPC_VM_PREFETCH_BSD_PPC_INLINE_HPP --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/src/os_cpu/bsd_ppc/vm/threadLS_bsd_ppc.cpp Thu Jan 25 22:36:25 2018 -0800 ++++ ./hotspot/src/os_cpu/bsd_ppc/vm/threadLS_bsd_ppc.cpp Sat May 19 23:14:15 2018 -0700 @@ -0,0 +1,39 @@ +/* + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. @@ -8186,7 +8197,7 @@ + os::thread_local_storage_at_put(ThreadLocalStorage::thread_index(), thread); +} --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/src/os_cpu/bsd_ppc/vm/threadLS_bsd_ppc.hpp Thu Jan 25 22:36:25 2018 -0800 ++++ ./hotspot/src/os_cpu/bsd_ppc/vm/threadLS_bsd_ppc.hpp Sat May 19 23:14:15 2018 -0700 @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. @@ -8225,7 +8236,7 @@ + +#endif // OS_CPU_BSD_PPC_VM_THREADLS_BSD_PPC_HPP --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/src/os_cpu/bsd_ppc/vm/thread_bsd_ppc.cpp Thu Jan 25 22:36:25 2018 -0800 ++++ ./hotspot/src/os_cpu/bsd_ppc/vm/thread_bsd_ppc.cpp Sat May 19 23:14:15 2018 -0700 @@ -0,0 +1,36 @@ +/* + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. @@ -8264,7 +8275,7 @@ + +void JavaThread::cache_global_variables() { } --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/src/os_cpu/bsd_ppc/vm/thread_bsd_ppc.hpp Thu Jan 25 22:36:25 2018 -0800 ++++ ./hotspot/src/os_cpu/bsd_ppc/vm/thread_bsd_ppc.hpp Sat May 19 23:14:15 2018 -0700 @@ -0,0 +1,83 @@ +/* + * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. @@ -8350,7 +8361,7 @@ + +#endif // OS_CPU_BSD_PPC_VM_THREAD_BSD_PPC_HPP --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/src/os_cpu/bsd_ppc/vm/vmStructs_bsd_ppc.hpp Thu Jan 25 22:36:25 2018 -0800 ++++ ./hotspot/src/os_cpu/bsd_ppc/vm/vmStructs_bsd_ppc.hpp Sat May 19 23:14:15 2018 -0700 @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. @@ -8407,8 +8418,8 @@ +#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) + +#endif // OS_CPU_BSD_PPC_VM_VMSTRUCTS_BSD_PPC_HPP ---- ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp Sat May 19 23:14:15 2018 -0700 @@ -594,7 +594,11 @@ stub = SharedRuntime::continuation_for_implicit_exception(thread, pc, SharedRuntime::IMPLICIT_NULL); } @@ -8421,8 +8432,8 @@ thread->doing_unsafe_access()) { stub = StubRoutines::handler_for_unsafe_access(); } ---- ./hotspot/src/share/vm/opto/lcm.cpp Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/src/share/vm/opto/lcm.cpp Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/src/share/vm/opto/lcm.cpp Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/src/share/vm/opto/lcm.cpp Sat May 19 23:14:15 2018 -0700 @@ -49,7 +49,7 @@ // Check whether val is not-null-decoded compressed oop, // i.e. will grab into the base of the heap if it represents NULL. @@ -8432,8 +8443,8 @@ if (val && val->is_Mach()) { if (val->as_Mach()->ideal_Opcode() == Op_DecodeN) { // This assumes all Decodes with TypePtr::NotNull are matched to nodes that ---- ./hotspot/src/share/vm/opto/loopPredicate.cpp Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/src/share/vm/opto/loopPredicate.cpp Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/src/share/vm/opto/loopPredicate.cpp Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/src/share/vm/opto/loopPredicate.cpp Sat May 19 23:14:15 2018 -0700 @@ -869,7 +869,7 @@ Node* idx = cmp->in(1); assert(!invar.is_invariant(idx), "index is variant"); @@ -8443,8 +8454,8 @@ assert(invar.is_invariant(rng), "range must be invariant"); int scale = 1; Node* offset = zero; ---- ./hotspot/src/share/vm/opto/node.cpp Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/src/share/vm/opto/node.cpp Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/src/share/vm/opto/node.cpp Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/src/share/vm/opto/node.cpp Sat May 19 23:14:15 2018 -0700 @@ -286,6 +286,10 @@ #ifdef _MSC_VER // the IDX_INIT hack falls foul of warning C4355 #pragma warning( disable:4355 ) // 'this' : used in base member initializer list @@ -8467,8 +8478,8 @@ //------------------------------clone------------------------------------------ // Clone a Node. ---- ./hotspot/src/share/vm/runtime/atomic.inline.hpp Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/src/share/vm/runtime/atomic.inline.hpp Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/src/share/vm/runtime/atomic.inline.hpp Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/src/share/vm/runtime/atomic.inline.hpp Sat May 19 23:14:15 2018 -0700 @@ -63,6 +63,9 @@ #endif @@ -8479,8 +8490,8 @@ #ifdef TARGET_OS_ARCH_bsd_x86 # include "atomic_bsd_x86.inline.hpp" #endif ---- ./hotspot/src/share/vm/runtime/globals.hpp Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/src/share/vm/runtime/globals.hpp Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/src/share/vm/runtime/globals.hpp Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/src/share/vm/runtime/globals.hpp Sat May 19 23:14:15 2018 -0700 @@ -94,6 +94,9 @@ #ifdef TARGET_OS_ARCH_aix_ppc # include "globals_aix_ppc.hpp" @@ -8491,8 +8502,8 @@ #ifdef TARGET_OS_ARCH_bsd_x86 # include "globals_bsd_x86.hpp" #endif ---- ./hotspot/src/share/vm/runtime/orderAccess.inline.hpp Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/src/share/vm/runtime/orderAccess.inline.hpp Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/src/share/vm/runtime/orderAccess.inline.hpp Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/src/share/vm/runtime/orderAccess.inline.hpp Sat May 19 23:14:15 2018 -0700 @@ -64,6 +64,9 @@ #endif @@ -8503,8 +8514,8 @@ #ifdef TARGET_OS_ARCH_bsd_x86 # include "orderAccess_bsd_x86.inline.hpp" #endif ---- ./hotspot/src/share/vm/runtime/os.cpp Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/src/share/vm/runtime/os.cpp Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/src/share/vm/runtime/os.cpp Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/src/share/vm/runtime/os.cpp Sat May 19 23:14:15 2018 -0700 @@ -426,15 +426,6 @@ if (_native_java_library == NULL) { vm_exit_during_initialization("Unable to load native library", ebuf); @@ -8521,8 +8532,8 @@ } static jboolean onLoaded = JNI_FALSE; if (onLoaded) { ---- ./hotspot/src/share/vm/runtime/os.hpp Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/src/share/vm/runtime/os.hpp Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/src/share/vm/runtime/os.hpp Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/src/share/vm/runtime/os.hpp Sat May 19 23:14:15 2018 -0700 @@ -843,6 +843,9 @@ #ifdef TARGET_OS_ARCH_aix_ppc # include "os_aix_ppc.hpp" @@ -8533,8 +8544,8 @@ #ifdef TARGET_OS_ARCH_bsd_x86 # include "os_bsd_x86.hpp" #endif ---- ./hotspot/src/share/vm/runtime/prefetch.inline.hpp Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/src/share/vm/runtime/prefetch.inline.hpp Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/src/share/vm/runtime/prefetch.inline.hpp Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/src/share/vm/runtime/prefetch.inline.hpp Sat May 19 23:14:15 2018 -0700 @@ -63,6 +63,9 @@ #endif @@ -8545,8 +8556,8 @@ #ifdef TARGET_OS_ARCH_bsd_x86 # include "prefetch_bsd_x86.inline.hpp" #endif ---- ./hotspot/src/share/vm/runtime/thread.hpp Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/src/share/vm/runtime/thread.hpp Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/src/share/vm/runtime/thread.hpp Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/src/share/vm/runtime/thread.hpp Sat May 19 23:14:15 2018 -0700 @@ -1732,6 +1732,9 @@ #ifdef TARGET_OS_ARCH_aix_ppc # include "thread_aix_ppc.hpp" @@ -8557,8 +8568,8 @@ #ifdef TARGET_OS_ARCH_bsd_x86 # include "thread_bsd_x86.hpp" #endif ---- ./hotspot/src/share/vm/runtime/threadLocalStorage.hpp Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/src/share/vm/runtime/threadLocalStorage.hpp Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/src/share/vm/runtime/threadLocalStorage.hpp Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/src/share/vm/runtime/threadLocalStorage.hpp Sat May 19 23:14:15 2018 -0700 @@ -75,6 +75,9 @@ #ifdef TARGET_OS_ARCH_aix_ppc # include "threadLS_aix_ppc.hpp" @@ -8569,8 +8580,8 @@ #ifdef TARGET_OS_ARCH_bsd_x86 # include "threadLS_bsd_x86.hpp" #endif ---- ./hotspot/src/share/vm/runtime/virtualspace.cpp Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/src/share/vm/runtime/virtualspace.cpp Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/src/share/vm/runtime/virtualspace.cpp Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/src/share/vm/runtime/virtualspace.cpp Sat May 19 23:14:15 2018 -0700 @@ -342,7 +342,7 @@ (UseCompressedOops && (Universe::narrow_oop_base() != NULL) && Universe::narrow_oop_use_implicit_null_checks()) ? @@ -8580,8 +8591,8 @@ MemTracker::record_virtual_memory_type((address)base(), mtJavaHeap); } ---- ./hotspot/src/share/vm/runtime/vmStructs.cpp Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/src/share/vm/runtime/vmStructs.cpp Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/src/share/vm/runtime/vmStructs.cpp Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/src/share/vm/runtime/vmStructs.cpp Sat May 19 23:14:15 2018 -0700 @@ -146,6 +146,9 @@ #ifdef TARGET_OS_ARCH_aix_ppc # include "vmStructs_aix_ppc.hpp" @@ -8601,8 +8612,8 @@ \ NOT_ZERO(X86_ONLY(declare_constant(frame::entry_frame_call_wrapper_offset))) \ declare_constant(frame::pc_return_offset) \ ---- ./hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp Sat May 19 23:14:15 2018 -0700 @@ -30,6 +30,11 @@ // This file holds compiler-dependent includes, // globally used constants & types, class (forward) @@ -8634,8 +8645,8 @@ #define CAN_USE_NAN_DEFINE 1 #endif ---- ./hotspot/src/share/vm/utilities/vmError.cpp Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/src/share/vm/utilities/vmError.cpp Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/src/share/vm/utilities/vmError.cpp Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/src/share/vm/utilities/vmError.cpp Sat May 19 23:14:15 2018 -0700 @@ -22,7 +22,6 @@ * */ @@ -8644,8 +8655,8 @@ #include "precompiled.hpp" #include "compiler/compileBroker.hpp" #include "gc_interface/collectedHeap.hpp" ---- ./jdk/make/CompileDemos.gmk Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/make/CompileDemos.gmk Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/make/CompileDemos.gmk Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/make/CompileDemos.gmk Sat May 19 23:14:35 2018 -0700 @@ -323,7 +323,7 @@ $(eval $(call SetupJVMTIDemo,hprof, java_crw_demo, \ -I$(JDK_TOPDIR)/src/share/npt -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt \ @@ -8655,8 +8666,8 @@ $(eval $(call SetupJVMTIDemo,minst, agent_util java_crw_demo)) $(eval $(call SetupJVMTIDemo,mtrace, agent_util java_crw_demo)) ---- ./jdk/make/CompileJavaClasses.gmk Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/make/CompileJavaClasses.gmk Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/make/CompileJavaClasses.gmk Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/make/CompileJavaClasses.gmk Sat May 19 23:14:35 2018 -0700 @@ -128,23 +128,32 @@ sun/nio/fs/LinuxFileStore.java \ sun/nio/fs/LinuxFileSystem.java \ @@ -8758,8 +8769,8 @@ $(CLOSED_SRC_DIRS), \ INCLUDES := $(SECURITY_PKGS), \ EXCLUDES := $(EXCLUDES), \ ---- ./jdk/make/CompileLaunchers.gmk Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/make/CompileLaunchers.gmk Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/make/CompileLaunchers.gmk Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/make/CompileLaunchers.gmk Sat May 19 23:14:35 2018 -0700 @@ -49,7 +49,7 @@ ORIGIN_ROOT := /.. endif @@ -8864,8 +8875,8 @@ BUILD_JSPAWNHELPER := 1 endif ---- ./jdk/make/CopyFiles.gmk Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/make/CopyFiles.gmk Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/make/CopyFiles.gmk Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/make/CopyFiles.gmk Sat May 19 23:14:35 2018 -0700 @@ -29,6 +29,8 @@ ifeq ($(OPENJDK_TARGET_OS), windows) @@ -8908,8 +8919,8 @@ endif endif endif ---- ./jdk/make/Images.gmk Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/make/Images.gmk Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/make/Images.gmk Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/make/Images.gmk Sat May 19 23:14:35 2018 -0700 @@ -236,11 +236,11 @@ endif @@ -8980,7 +8991,7 @@ ################################################################################ --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./jdk/make/data/classlist/classlist.bsd Fri Feb 02 18:25:39 2018 -0800 ++++ ./jdk/make/data/classlist/classlist.bsd Sat May 19 23:14:35 2018 -0700 @@ -0,0 +1,2559 @@ +java/lang/Object +java/lang/String @@ -11541,8 +11552,8 @@ +java/awt/MenuBar +sun/awt/X11/XErrorEvent +# eea35d9d56e0006e ---- ./jdk/make/gendata/GendataFontConfig.gmk Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/make/gendata/GendataFontConfig.gmk Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/make/gendata/GendataFontConfig.gmk Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/make/gendata/GendataFontConfig.gmk Sat May 19 23:14:35 2018 -0700 @@ -73,6 +73,13 @@ GENDATA_FONT_CONFIG_SRC_PREFIX := aix. endif @@ -11557,8 +11568,8 @@ ### $(GENDATA_FONT_CONFIG_DST)/%.src: \ ---- ./jdk/make/lib/Awt2dLibraries.gmk Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/make/lib/Awt2dLibraries.gmk Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/make/lib/Awt2dLibraries.gmk Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/make/lib/Awt2dLibraries.gmk Sat May 19 23:14:35 2018 -0700 @@ -309,7 +309,7 @@ debug_trace.c \ debug_util.c @@ -11683,8 +11694,8 @@ else # .. all other Unixes can use X_LIBS LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread endif ---- ./jdk/make/lib/CoreLibraries.gmk Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/make/lib/CoreLibraries.gmk Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/make/lib/CoreLibraries.gmk Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/make/lib/CoreLibraries.gmk Sat May 19 23:14:35 2018 -0700 @@ -100,7 +100,7 @@ endif @@ -11771,8 +11782,8 @@ LDFLAGS_macosx := -liconv, \ LDFLAGS_SUFFIX_windows := -export:nptInitialize -export:nptTerminate, \ LDFLAGS_SUFFIX_solaris := -lc, \ ---- ./jdk/make/lib/NetworkingLibraries.gmk Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/make/lib/NetworkingLibraries.gmk Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/make/lib/NetworkingLibraries.gmk Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/make/lib/NetworkingLibraries.gmk Sat May 19 23:14:35 2018 -0700 @@ -42,7 +42,7 @@ LIBNET_EXCLUDE_FILES += linux_close.c endif @@ -11801,8 +11812,8 @@ LDFLAGS_SUFFIX_windows := ws2_32.lib jvm.lib secur32.lib iphlpapi.lib \ delayimp.lib $(WIN_JAVA_LIB) advapi32.lib \ -DELAYLOAD:secur32.dll -DELAYLOAD:iphlpapi.dll, \ ---- ./jdk/make/lib/NioLibraries.gmk Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/make/lib/NioLibraries.gmk Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/make/lib/NioLibraries.gmk Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/make/lib/NioLibraries.gmk Sat May 19 23:14:35 2018 -0700 @@ -77,9 +77,28 @@ UnixNativeDispatcher.c endif @@ -11863,8 +11874,8 @@ endif + endif endif ---- ./jdk/make/lib/ServiceabilityLibraries.gmk Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/make/lib/ServiceabilityLibraries.gmk Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/make/lib/ServiceabilityLibraries.gmk Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/make/lib/ServiceabilityLibraries.gmk Sat May 19 23:14:35 2018 -0700 @@ -34,7 +34,7 @@ ifneq ($(OPENJDK_TARGET_OS), linux) LIBATTACH_EXCLUDE_FILES += LinuxVirtualMachine.c @@ -11882,16 +11893,18 @@ LDFLAGS_SUFFIX_windows := $(LDFLAGS_JDKLIB_SUFFIX) -export:jdwpTransport_OnLoad ws2_32.lib, \ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ RC_FLAGS := $(RC_FLAGS) \ -@@ -245,6 +246,19 @@ +@@ -245,6 +246,21 @@ LIBINSTRUMENT_CFLAGS += -Dstrcasecmp=stricmp endif +ifeq ($(OPENJDK_TARGET_OS), bsd) ++ LIBINSTRUMENT_LDFLAGS_SUFFIX += -L$(PACKAGE_PATH)/lib -liconv $(LIBZ) + ifeq ($(BSD_STATIC_LIBJLI), bsd) + LIBINSTRUMENT_LDFLAGS += -Xlinker --whole-archive $(JDK_OUTPUTDIR)/objs/libjli_static.a \ -+ -Xlinker --no-whole-archive ++ -Xlinker --no-whole-archive + else + LIBINSTRUMENT_LDFLAGS += $(call SET_SHARED_LIBRARY_ORIGIN,/jli) ++ LIBINSTRUMENT_LDFLAGS_SUFFIX += -L$(INSTALL_LIBRARIES_HERE)/jli -ljli + endif + BSD_ICONV_CFLAGS:= -I$(PACKAGE_PATH)/include + ifneq ($(OPENJDK_TARGET_OS_VENDOR), openbsd) @@ -11902,7 +11915,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBINSTRUMENT, \ LIBRARY := instrument, \ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ -@@ -255,6 +269,7 @@ +@@ -255,6 +271,7 @@ CFLAGS := $(LIBINSTRUMENT_CFLAGS), \ CFLAGS_debug := -DJPLIS_LOGGING, \ CFLAGS_release := -DNO_JPLIS_LOGGING, \ @@ -11910,15 +11923,7 @@ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libinstrument/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN) \ -@@ -268,6 +283,7 @@ - LDFLAGS_SUFFIX_solaris := $(LIBZ) -L $(INSTALL_LIBRARIES_HERE)/jli -ljli $(LIBDL) -lc, \ - LDFLAGS_SUFFIX_linux := $(LIBZ) -L $(INSTALL_LIBRARIES_HERE)/jli -ljli $(LIBDL), \ - LDFLAGS_SUFFIX_aix := $(LIBZ) -L$(JDK_OUTPUTDIR)/objs -ljli_static $(LIBDL),\ -+ LDFLAGS_SUFFIX_bsd := -L$(PACKAGE_PATH)/lib -liconv $(LIBZ), \ - VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ - RC_FLAGS := $(RC_FLAGS) \ - -D "JDK_FNAME=instrument.dll" \ -@@ -276,7 +292,7 @@ +@@ -276,7 +293,7 @@ OBJECT_DIR := $(LIBINSTRUMENT_DIR), \ DEBUG_SYMBOLS := true)) @@ -11927,7 +11932,7 @@ $(BUILD_LIBINSTRUMENT): $(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)jli_static$(STATIC_LIBRARY_SUFFIX) else $(BUILD_LIBINSTRUMENT): $(INSTALL_LIBRARIES_HERE)/jli/$(LIBRARY_PREFIX)jli$(SHARED_LIBRARY_SUFFIX) -@@ -302,12 +318,16 @@ +@@ -306,12 +323,16 @@ BUILD_LIBMANAGEMENT_EXCLUDES += LinuxOperatingSystem.c endif @@ -11945,7 +11950,7 @@ ifeq ($(ENABLE_DEBUG_SYMBOLS), true) LIBMANAGEMENT_OPTIMIZATION := LOW endif -@@ -359,7 +379,7 @@ +@@ -363,7 +384,7 @@ BUILD_LIBHPROF_LDFLAGS := LIBHPROF_OPTIMIZATION := HIGHEST @@ -11954,8 +11959,8 @@ ifeq ($(ENABLE_DEBUG_SYMBOLS), true) LIBHPROF_OPTIMIZATION := LOW endif ---- ./jdk/make/lib/SoundLibraries.gmk Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/make/lib/SoundLibraries.gmk Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/make/lib/SoundLibraries.gmk Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/make/lib/SoundLibraries.gmk Sat May 19 23:14:35 2018 -0700 @@ -75,6 +75,13 @@ LIBJSOUND_CFLAGS += -DX_PLATFORM=X_AIX endif # OPENJDK_TARGET_OS aix @@ -11987,8 +11992,8 @@ LDFLAGS_SUFFIX := $(ALSA_LIBS) -ljava -ljvm, \ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjsoundalsa, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) ---- ./jdk/make/mapfiles/launchers/mapfile-ppc64 Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/make/mapfiles/launchers/mapfile-ppc64 Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/make/mapfiles/launchers/mapfile-ppc64 Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/make/mapfiles/launchers/mapfile-ppc64 Sat May 19 23:14:35 2018 -0700 @@ -33,6 +33,7 @@ environ; # Public symbols and required by Java run time _environ; @@ -11997,8 +12002,8 @@ local: *; ---- ./jdk/make/mapfiles/launchers/mapfile-x86 Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/make/mapfiles/launchers/mapfile-x86 Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/make/mapfiles/launchers/mapfile-x86 Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/make/mapfiles/launchers/mapfile-x86 Sat May 19 23:14:35 2018 -0700 @@ -33,6 +33,7 @@ environ; # Public symbols and required by Java run time _environ; @@ -12007,8 +12012,8 @@ ___Argv; # The following are private, but as they are _start; # exported from ctr1/crtn, the clever hacker _init; # might know about them. However note, that ---- ./jdk/make/mapfiles/launchers/mapfile-x86_64 Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/make/mapfiles/launchers/mapfile-x86_64 Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/make/mapfiles/launchers/mapfile-x86_64 Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/make/mapfiles/launchers/mapfile-x86_64 Sat May 19 23:14:35 2018 -0700 @@ -33,6 +33,7 @@ environ; # Public symbols and required by Java run time _environ; @@ -12018,7 +12023,7 @@ local: *; --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./jdk/make/mapfiles/libattach/mapfile-bsd Fri Feb 02 18:25:39 2018 -0800 ++++ ./jdk/make/mapfiles/libattach/mapfile-bsd Sat May 19 23:14:35 2018 -0700 @@ -0,0 +1,42 @@ +# +# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. @@ -12063,7 +12068,7 @@ + *; +}; --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./jdk/make/mapfiles/libnio/mapfile-bsd Fri Feb 02 18:25:39 2018 -0800 ++++ ./jdk/make/mapfiles/libnio/mapfile-bsd Sat May 19 23:14:35 2018 -0700 @@ -0,0 +1,195 @@ +# +# Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved. @@ -12260,8 +12265,8 @@ + local: + *; +}; ---- ./jdk/make/mapfiles/libunpack/mapfile-vers-unpack200 Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/make/mapfiles/libunpack/mapfile-vers-unpack200 Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/make/mapfiles/libunpack/mapfile-vers-unpack200 Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/make/mapfiles/libunpack/mapfile-vers-unpack200 Sat May 19 23:14:35 2018 -0700 @@ -26,6 +26,9 @@ # Define library interface. @@ -12273,7 +12278,7 @@ *; }; --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./jdk/make/netbeans/common/bsd-sources.ent Fri Feb 02 18:25:39 2018 -0800 ++++ ./jdk/make/netbeans/common/bsd-sources.ent Sat May 19 23:14:35 2018 -0700 @@ -0,0 +1,45 @@ + + @@ -12321,7 +12326,7 @@ + ${root}/src/bsd/classes + --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./jdk/make/netbeans/common/bsd-view.ent Fri Feb 02 18:25:39 2018 -0800 ++++ ./jdk/make/netbeans/common/bsd-view.ent Sat May 19 23:14:35 2018 -0700 @@ -0,0 +1,39 @@ + + @@ -12362,8 +12367,8 @@ + ${includes} + ${excludes} + ---- ./jdk/make/netbeans/common/java-data-native.ent Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/make/netbeans/common/java-data-native.ent Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/make/netbeans/common/java-data-native.ent Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/make/netbeans/common/java-data-native.ent Sat May 19 23:14:35 2018 -0700 @@ -34,6 +34,7 @@ @@ -12372,8 +12377,8 @@ ${root}/src/macosx/classes ${root}/src/solaris/classes ${root}/src/windows/classes ---- ./jdk/make/netbeans/common/make.xml Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/make/netbeans/common/make.xml Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/make/netbeans/common/make.xml Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/make/netbeans/common/make.xml Sat May 19 23:14:35 2018 -0700 @@ -32,16 +32,21 @@ --> @@ -12408,8 +12413,8 @@ ---- ./jdk/make/netbeans/j2se/nbproject/project.xml Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/make/netbeans/j2se/nbproject/project.xml Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/make/netbeans/j2se/nbproject/project.xml Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/make/netbeans/j2se/nbproject/project.xml Sat May 19 23:14:35 2018 -0700 @@ -34,6 +34,7 @@ @@ -12442,8 +12447,8 @@ &macosx-view; &unix-view; &windows-view; ---- ./jdk/make/netbeans/world/nbproject/project.xml Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/make/netbeans/world/nbproject/project.xml Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/make/netbeans/world/nbproject/project.xml Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/make/netbeans/world/nbproject/project.xml Sat May 19 23:14:35 2018 -0700 @@ -34,12 +34,14 @@ @@ -12476,7 +12481,7 @@ &unix-view; &windows-view; --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./jdk/src/bsd/classes/java/net/DefaultInterface.java Fri Feb 02 18:25:39 2018 -0800 ++++ ./jdk/src/bsd/classes/java/net/DefaultInterface.java Sat May 19 23:14:35 2018 -0700 @@ -0,0 +1,97 @@ +/* + * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. @@ -12576,7 +12581,7 @@ + } +} --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./jdk/src/bsd/classes/sun/nio/ch/DefaultSelectorProvider.java Fri Feb 02 18:25:39 2018 -0800 ++++ ./jdk/src/bsd/classes/sun/nio/ch/DefaultSelectorProvider.java Sat May 19 23:14:35 2018 -0700 @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. @@ -12627,7 +12632,7 @@ + +} --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./jdk/src/bsd/classes/sun/nio/ch/KQueueArrayWrapper.java Fri Feb 02 18:25:39 2018 -0800 ++++ ./jdk/src/bsd/classes/sun/nio/ch/KQueueArrayWrapper.java Sat May 19 23:14:35 2018 -0700 @@ -0,0 +1,213 @@ +/* + * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. @@ -12843,7 +12848,7 @@ + private static native void interrupt(int fd); +} --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./jdk/src/bsd/classes/sun/nio/ch/KQueueSelectorImpl.java Fri Feb 02 18:25:39 2018 -0800 ++++ ./jdk/src/bsd/classes/sun/nio/ch/KQueueSelectorImpl.java Sat May 19 23:14:35 2018 -0700 @@ -0,0 +1,263 @@ +/* + * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. @@ -13109,7 +13114,7 @@ + } +} --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./jdk/src/bsd/classes/sun/nio/ch/KQueueSelectorProvider.java Fri Feb 02 18:25:39 2018 -0800 ++++ ./jdk/src/bsd/classes/sun/nio/ch/KQueueSelectorProvider.java Sat May 19 23:14:35 2018 -0700 @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. @@ -13155,8 +13160,8 @@ + return new KQueueSelectorImpl(this); + } +} ---- ./jdk/src/bsd/doc/man/javah.1 Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/bsd/doc/man/javah.1 Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/bsd/doc/man/javah.1 Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/bsd/doc/man/javah.1 Sat May 19 23:14:35 2018 -0700 @@ -8,7 +8,7 @@ .\" .\" This code is distributed in the hope that it will be useful, but WITHOUT @@ -13175,8 +13180,8 @@ \fIWindows\fR: ---- ./jdk/src/bsd/doc/man/rmic.1 Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/bsd/doc/man/rmic.1 Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/bsd/doc/man/rmic.1 Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/bsd/doc/man/rmic.1 Sat May 19 23:14:35 2018 -0700 @@ -8,7 +8,7 @@ .\" .\" This code is distributed in the hope that it will be useful, but WITHOUT @@ -13204,8 +13209,8 @@ .SH SEE\ ALSO .TP 0.2i \(bu ---- ./jdk/src/bsd/doc/man/rmid.1 Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/bsd/doc/man/rmid.1 Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/bsd/doc/man/rmid.1 Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/bsd/doc/man/rmid.1 Sat May 19 23:14:35 2018 -0700 @@ -8,7 +8,7 @@ .\" .\" This code is distributed in the hope that it will be useful, but WITHOUT @@ -13225,7 +13230,7 @@ .TP 0.2i \(bu --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./jdk/src/bsd/native/sun/nio/ch/KQueueArrayWrapper.c Fri Feb 02 18:25:39 2018 -0800 ++++ ./jdk/src/bsd/native/sun/nio/ch/KQueueArrayWrapper.c Sat May 19 23:14:35 2018 -0700 @@ -0,0 +1,171 @@ +/* + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. @@ -13398,7 +13403,7 @@ + } +} + ---- ./jdk/src/macosx/classes/java/net/DefaultInterface.java Fri Dec 15 09:05:18 2017 -0800 +--- ./jdk/src/macosx/classes/java/net/DefaultInterface.java Mon Mar 19 12:06:18 2018 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,97 +0,0 @@ -/* @@ -13498,7 +13503,7 @@ - return (ppp != null) ? ppp : loopback; - } -} ---- ./jdk/src/macosx/classes/sun/nio/ch/DefaultSelectorProvider.java Fri Dec 15 09:05:18 2017 -0800 +--- ./jdk/src/macosx/classes/sun/nio/ch/DefaultSelectorProvider.java Mon Mar 19 12:06:18 2018 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,48 +0,0 @@ -/* @@ -13549,7 +13554,7 @@ - } - -} ---- ./jdk/src/macosx/classes/sun/nio/ch/KQueueArrayWrapper.java Fri Dec 15 09:05:18 2017 -0800 +--- ./jdk/src/macosx/classes/sun/nio/ch/KQueueArrayWrapper.java Mon Mar 19 12:06:18 2018 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,213 +0,0 @@ -/* @@ -13765,7 +13770,7 @@ - long timeout); - private static native void interrupt(int fd); -} ---- ./jdk/src/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java Fri Dec 15 09:05:18 2017 -0800 +--- ./jdk/src/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java Mon Mar 19 12:06:18 2018 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,263 +0,0 @@ -/* @@ -14031,7 +14036,7 @@ - return this; - } -} ---- ./jdk/src/macosx/classes/sun/nio/ch/KQueueSelectorProvider.java Fri Dec 15 09:05:18 2017 -0800 +--- ./jdk/src/macosx/classes/sun/nio/ch/KQueueSelectorProvider.java Mon Mar 19 12:06:18 2018 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,44 +0,0 @@ -/* @@ -14078,7 +14083,7 @@ - return new KQueueSelectorImpl(this); - } -} ---- ./jdk/src/macosx/native/sun/nio/ch/KQueueArrayWrapper.c Fri Dec 15 09:05:18 2017 -0800 +--- ./jdk/src/macosx/native/sun/nio/ch/KQueueArrayWrapper.c Mon Mar 19 12:06:18 2018 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,171 +0,0 @@ -/* @@ -14252,8 +14257,8 @@ - } -} - ---- ./jdk/src/share/bin/jli_util.h Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/share/bin/jli_util.h Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/share/bin/jli_util.h Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/share/bin/jli_util.h Sat May 19 23:14:35 2018 -0700 @@ -87,7 +87,7 @@ #define _LARGFILE64_SOURCE #define JLI_Lseek lseek64 @@ -14263,8 +14268,8 @@ #define JLI_Lseek lseek #endif #ifdef _AIX ---- ./jdk/src/share/classes/sun/awt/FontConfiguration.java Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/share/classes/sun/awt/FontConfiguration.java Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/share/classes/sun/awt/FontConfiguration.java Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/share/classes/sun/awt/FontConfiguration.java Sat May 19 23:14:35 2018 -0700 @@ -1146,7 +1146,7 @@ */ HashMap existsMap; @@ -14274,8 +14279,8 @@ return false; } else if (existsMap == null) { existsMap = new HashMap(); ---- ./jdk/src/share/classes/sun/awt/OSInfo.java Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/share/classes/sun/awt/OSInfo.java Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/share/classes/sun/awt/OSInfo.java Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/share/classes/sun/awt/OSInfo.java Sat May 19 23:14:35 2018 -0700 @@ -39,6 +39,7 @@ WINDOWS, LINUX, @@ -14295,8 +14300,8 @@ if (osName.contains("OS X")) { return MACOSX; } ---- ./jdk/src/share/classes/sun/font/FontUtilities.java Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/share/classes/sun/font/FontUtilities.java Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/share/classes/sun/font/FontUtilities.java Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/share/classes/sun/font/FontUtilities.java Sat May 19 23:14:35 2018 -0700 @@ -48,6 +48,8 @@ public static boolean isLinux; @@ -14315,8 +14320,8 @@ isMacOSX = osName.contains("OS X"); // TODO: MacOSX String t2kStr = System.getProperty("sun.java2d.font.scaler"); ---- ./jdk/src/share/classes/sun/font/SunFontManager.java Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/share/classes/sun/font/SunFontManager.java Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/share/classes/sun/font/SunFontManager.java Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/share/classes/sun/font/SunFontManager.java Sat May 19 23:14:35 2018 -0700 @@ -418,7 +418,7 @@ * registerFonts method as on-screen these JRE fonts * always go through the T2K rasteriser. @@ -14326,8 +14331,8 @@ /* Linux font configuration uses these fonts */ registerFontDir(jreFontDirName); } ---- ./jdk/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java Sat May 19 23:14:35 2018 -0700 @@ -1306,7 +1306,7 @@ String osName = AccessController.doPrivileged( new GetPropertyAction("os.name")); @@ -14337,8 +14342,8 @@ charset("x-COMPOUND_TEXT", "COMPOUND_TEXT", new String[] { "COMPOUND_TEXT", // JDK historical ---- ./jdk/src/share/classes/sun/print/PSPrinterJob.java Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/share/classes/sun/print/PSPrinterJob.java Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/share/classes/sun/print/PSPrinterJob.java Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/share/classes/sun/print/PSPrinterJob.java Sat May 19 23:14:35 2018 -0700 @@ -1587,9 +1587,31 @@ } @@ -14373,8 +14378,8 @@ if ((pFlags & PRINTER) != 0) { execCmd[n++] = "-P" + printer; } ---- ./jdk/src/share/classes/sun/security/jgss/GSSManagerImpl.java Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/share/classes/sun/security/jgss/GSSManagerImpl.java Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/share/classes/sun/security/jgss/GSSManagerImpl.java Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/share/classes/sun/security/jgss/GSSManagerImpl.java Sat May 19 23:14:35 2018 -0700 @@ -48,6 +48,7 @@ public Boolean run() { String osname = System.getProperty("os.name"); @@ -14383,8 +14388,8 @@ osname.contains("OS X") || osname.startsWith("Linux")) { return new Boolean(System.getProperty ---- ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java Sat May 19 23:14:35 2018 -0700 @@ -90,6 +90,12 @@ "libgssapi_krb5.so", "libgssapi_krb5.so.2", @@ -14398,8 +14403,8 @@ } else if (osname.contains("OS X")) { gssLibs = new String[]{ "libgssapi_krb5.dylib", ---- ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider Sat May 19 23:14:35 2018 -0700 @@ -31,4 +31,5 @@ #[windows]sun.tools.attach.WindowsAttachProvider #[linux]sun.tools.attach.LinuxAttachProvider @@ -14407,8 +14412,8 @@ +#[bsd]sun.tools.attach.BsdAttachProvider #[aix]sun.tools.attach.AixAttachProvider --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./jdk/src/share/lib/security/java.security-bsd Fri Feb 02 18:25:39 2018 -0800 -@@ -0,0 +1,962 @@ ++++ ./jdk/src/share/lib/security/java.security-bsd Sat May 19 23:14:35 2018 -0700 +@@ -0,0 +1,983 @@ +# +# This is the "master security properties file". +# @@ -15031,7 +15036,7 @@ +# Example: +# jdk.tls.disabledAlgorithms=MD5, SSLv3, DSA, RSA keySize < 2048 +jdk.tls.disabledAlgorithms=SSLv3, RC4, MD5withRSA, DH keySize < 1024, \ -+ EC keySize < 224, DES40_CBC, RC4_40 ++ EC keySize < 224, DES40_CBC, RC4_40, 3DES_EDE_CBC + +# Legacy algorithms for Secure Socket Layer/Transport Layer Security (SSL/TLS) +# processing in JSSE implementation. @@ -15258,6 +15263,7 @@ + disallowReferenceUriSchemes file http https,\ + minKeySize RSA 1024,\ + minKeySize DSA 1024,\ ++ minKeySize EC 224,\ + noDuplicateIds,\ + noRetrievalMethodLoops + @@ -15271,6 +15277,9 @@ +# Patterns are separated by ";" (semicolon). +# Whitespace is significant and is considered part of the pattern. +# ++# If the system property jdk.serialFilter is also specified, it supersedes ++# the security property value defined here. ++# +# If a pattern includes a "=", it sets a limit. +# If a limit appears more than once the last value is used. +# Limits are checked before classes regardless of the order in the sequence of patterns. @@ -15371,8 +15380,25 @@ +# It is not guaranteed to be examined and used by other implementations. +# +#com.sun.CORBA.ORBIorTypeCheckRegistryFilter=binary_class_name;binary_class_name ---- ./jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp Fri Feb 02 18:25:39 2018 -0800 ++ ++# ++# JCEKS Encrypted Key Serial Filter ++# ++# This filter, if configured, is used by the JCEKS KeyStore during the ++# deserialization of the encrypted Key object stored inside a key entry. ++# If not configured or the filter result is UNDECIDED (i.e. none of the patterns ++# matches), the filter configured by jdk.serialFilter will be consulted. ++# ++# If the system property jceks.key.serialFilter is also specified, it supersedes ++# the security property value defined here. ++# ++# The filter pattern uses the same format as jdk.serialFilter. The default ++# pattern allows java.lang.Enum, java.security.KeyRep, java.security.KeyRep$Type, ++# and javax.crypto.spec.SecretKeySpec and rejects all the others. ++jceks.key.serialFilter = java.lang.Enum;java.security.KeyRep;\ ++ java.security.KeyRep$Type;javax.crypto.spec.SecretKeySpec;!* +--- ./jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp Sat May 19 23:14:35 2018 -0700 @@ -62,7 +62,7 @@ #endif // End of ZLIB @@ -15382,8 +15408,8 @@ #define SWAP_BYTES(a) \ ((((a) << 8) & 0xff00) | 0x00ff) & (((a) >> 8) | 0xff00) #else ---- ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c Sat May 19 23:14:35 2018 -0700 @@ -121,7 +121,7 @@ } @@ -15411,8 +15437,8 @@ #define MAP_NATIVE2LE16(a) (a) #define MAP_NATIVE2BE16(a) MAP_SWAP16_impl(a) #define MAP_NATIVE2LE32(a) (a) ---- ./jdk/src/share/native/com/sun/media/sound/Utilities.c Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/share/native/com/sun/media/sound/Utilities.c Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/share/native/com/sun/media/sound/Utilities.c Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/share/native/com/sun/media/sound/Utilities.c Sat May 19 23:14:35 2018 -0700 @@ -28,7 +28,7 @@ @@ -15422,8 +15448,8 @@ return 0; #else return 1; ---- ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h Sat May 19 23:14:35 2018 -0700 @@ -40,7 +40,7 @@ #endif #endif @@ -15433,8 +15459,8 @@ #define __HI(x) *(1+(int*)&x) #define __LO(x) *(int*)&x #define __HIp(x) *(1+(int*)x) ---- ./jdk/src/share/native/sun/awt/image/awt_parseImage.c Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/share/native/sun/awt/image/awt_parseImage.c Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/share/native/sun/awt/image/awt_parseImage.c Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/share/native/sun/awt/image/awt_parseImage.c Sat May 19 23:14:35 2018 -0700 @@ -624,7 +624,7 @@ switch(type) { case java_awt_image_BufferedImage_TYPE_INT_ARGB: @@ -15462,8 +15488,8 @@ colorOrder[0] = 2; colorOrder[1] = 1; colorOrder[2] = 0; ---- ./jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c Sat May 19 23:14:35 2018 -0700 @@ -1198,7 +1198,7 @@ #define NLUT 8 @@ -15473,8 +15499,8 @@ #define INDEXES { 3, 2, 1, 0, 7, 6, 5, 4 } #else #define INDEXES { 0, 1, 2, 3, 4, 5, 6, 7 } ---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c Sat May 19 23:14:35 2018 -0700 @@ -86,7 +86,7 @@ #endif /* MLIB_USE_FTOI_CLAMPING */ @@ -15514,8 +15540,8 @@ #endif /* _NO_LONGLONG */ ---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c Sat May 19 23:14:35 2018 -0700 @@ -126,7 +126,7 @@ #define D2I(x) CLAMP_S32((x) SAT_OFF) @@ -15555,8 +15581,8 @@ #endif /* _NO_LONGLONG */ /***************************************************************/ ---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c Sat May 19 23:14:35 2018 -0700 @@ -94,7 +94,7 @@ #define D2I(x) CLAMP_S32((x) SAT_OFF) @@ -15596,8 +15622,8 @@ #endif /* _NO_LONGLONG */ /***************************************************************/ ---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c Sat May 19 23:14:35 2018 -0700 @@ -126,7 +126,7 @@ #define D2I(x) CLAMP_S32((x) SAT_OFF) @@ -15637,8 +15663,8 @@ #endif /* _NO_LONGLONG */ /***************************************************************/ ---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c Sat May 19 23:14:35 2018 -0700 @@ -95,7 +95,7 @@ #define D2I(x) CLAMP_S32((x) SAT_OFF) @@ -15678,8 +15704,8 @@ #endif /* _NO_LONGLONG */ /***************************************************************/ ---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c Sat May 19 23:14:35 2018 -0700 @@ -126,7 +126,7 @@ #define D2I(x) CLAMP_S32((x) SAT_OFF) @@ -15719,8 +15745,8 @@ #endif /* _NO_LONGLONG */ /***************************************************************/ ---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c Sat May 19 23:14:35 2018 -0700 @@ -94,7 +94,7 @@ #define D2I(x) CLAMP_S32((x) SAT_OFF) @@ -15760,8 +15786,8 @@ #endif /* _NO_LONGLONG */ /***************************************************************/ ---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c Sat May 19 23:14:35 2018 -0700 @@ -95,7 +95,7 @@ dst = dp[0]; if (ld_offset + size < 32) { @@ -15981,8 +16007,8 @@ } #else /* _LONGLONG */ ---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c Sat May 19 23:14:35 2018 -0700 @@ -168,7 +168,7 @@ } @@ -16263,8 +16289,8 @@ dp[12] = t0; dp[13] = t1; dp[14] = t2; ---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c Sat May 19 23:14:35 2018 -0700 @@ -88,7 +88,7 @@ } d64_2_f32; @@ -16416,8 +16442,8 @@ ((mlib_u32*)lh)[0] = l; ((mlib_u32*)lh)[1] = l; ((mlib_u32*)lh)[2] = l; ((mlib_u32*)lh)[3] = h; ---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c Sat May 19 23:14:35 2018 -0700 @@ -30,7 +30,7 @@ typedef union { mlib_d64 db; @@ -16427,8 +16453,8 @@ mlib_s32 int1, int0; #else mlib_s32 int0, int1; ---- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c Sat May 19 23:14:35 2018 -0700 @@ -275,11 +275,11 @@ for (i = 0; j <= (b_size - 4); j += 4, i++) { src0 = src1; @@ -16527,8 +16553,8 @@ s0 = s1; dp += SIZE; sp += SIZE; ---- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c Sat May 19 23:14:35 2018 -0700 @@ -120,7 +120,7 @@ } \ } @@ -17761,8 +17787,8 @@ dp[12] = t0; dp[13] = t1; dp[14] = t2; ---- ./jdk/src/share/native/sun/awt/medialib/mlib_image.h Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_image.h Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_image.h Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_image.h Sat May 19 23:14:35 2018 -0700 @@ -27,9 +27,6 @@ #ifndef MLIB_IMAGE_H #define MLIB_IMAGE_H @@ -17773,8 +17799,8 @@ #include #include #include ---- ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c Sat May 19 23:14:35 2018 -0700 @@ -29,7 +29,7 @@ #ifdef MACOSX #include @@ -17794,8 +17820,8 @@ #else return (void *) memalign(8, size); #endif /* _MSC_VER */ ---- ./jdk/src/share/native/sun/font/layout/LEStandalone.h Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/share/native/sun/font/layout/LEStandalone.h Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/share/native/sun/font/layout/LEStandalone.h Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/share/native/sun/font/layout/LEStandalone.h Sat May 19 23:14:35 2018 -0700 @@ -136,7 +136,7 @@ #define U_CAPI extern "C" @@ -17805,8 +17831,8 @@ #define U_IS_BIG_ENDIAN 0 #endif #endif ---- ./jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c Sat May 19 23:14:35 2018 -0700 @@ -182,7 +182,7 @@ return 0L; } @@ -17816,8 +17842,8 @@ /* Reversing data packed into int for LE archs */ if (isInIntPacked) { inFormatter ^= DOSWAP_SH(1); ---- ./jdk/src/share/native/sun/management/DiagnosticCommandImpl.c Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/share/native/sun/management/DiagnosticCommandImpl.c Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/share/native/sun/management/DiagnosticCommandImpl.c Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/share/native/sun/management/DiagnosticCommandImpl.c Sat May 19 23:14:35 2018 -0700 @@ -27,6 +27,7 @@ #include #include "management.h" @@ -17826,8 +17852,8 @@ JNIEXPORT void JNICALL Java_sun_management_DiagnosticCommandImpl_setNotificationEnabled (JNIEnv *env, jobject dummy, jboolean enabled) { ---- ./jdk/src/solaris/back/util_md.h Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/solaris/back/util_md.h Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/solaris/back/util_md.h Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/solaris/back/util_md.h Sat May 19 23:14:35 2018 -0700 @@ -51,7 +51,7 @@ /* On little endian machines, convert java big endian numbers. */ @@ -17837,8 +17863,8 @@ #define HOST_TO_JAVA_CHAR(x) (((x & 0xff) << 8) | ((x >> 8) & (0xff))) #define HOST_TO_JAVA_SHORT(x) (((x & 0xff) << 8) | ((x >> 8) & (0xff))) ---- ./jdk/src/solaris/bin/ergo_i586.c Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/solaris/bin/ergo_i586.c Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/solaris/bin/ergo_i586.c Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/solaris/bin/ergo_i586.c Sat May 19 23:14:35 2018 -0700 @@ -106,7 +106,7 @@ #endif /* __solaris__ */ @@ -17857,8 +17883,8 @@ /* * Routines shared by solaris-i586 and linux-i586. ---- ./jdk/src/solaris/bin/java_md_solinux.c Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/solaris/bin/java_md_solinux.c Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/solaris/bin/java_md_solinux.c Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/solaris/bin/java_md_solinux.c Sat May 19 23:14:35 2018 -0700 @@ -35,6 +35,9 @@ #include #include @@ -17950,8 +17976,8 @@ } int ---- ./jdk/src/solaris/bin/java_md_solinux.h Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/solaris/bin/java_md_solinux.h Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/solaris/bin/java_md_solinux.h Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/solaris/bin/java_md_solinux.h Sat May 19 23:14:35 2018 -0700 @@ -26,17 +26,26 @@ #ifndef JAVA_MD_SOLINUX_H #define JAVA_MD_SOLINUX_H @@ -17992,8 +18018,8 @@ #else /* !__solaris__, i.e. Linux, AIX,.. */ static const char *system_dir = "/usr/java"; static const char *user_dir = "/java"; ---- ./jdk/src/solaris/classes/java/lang/UNIXProcess.java Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/solaris/classes/java/lang/UNIXProcess.java Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/solaris/classes/java/lang/UNIXProcess.java Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/solaris/classes/java/lang/UNIXProcess.java Sat May 19 23:14:35 2018 -0700 @@ -82,6 +82,8 @@ LINUX(LaunchMechanism.VFORK, LaunchMechanism.FORK), @@ -18041,8 +18067,8 @@ case BSD: case AIX: // There is a risk that pid will be recycled, causing us to ---- ./jdk/src/solaris/classes/sun/awt/X11FontManager.java Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/solaris/classes/sun/awt/X11FontManager.java Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/solaris/classes/sun/awt/X11FontManager.java Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/solaris/classes/sun/awt/X11FontManager.java Sat May 19 23:14:35 2018 -0700 @@ -234,7 +234,7 @@ if (fontID != null) { fileName = (String)fontNameMap.get(fontID); @@ -18070,8 +18096,8 @@ (!mFontConfig.foundOsSpecificFile() || !mFontConfig.fontFilesArePresent()) || (FontUtilities.isSolaris && !mFontConfig.fontFilesArePresent()))) { ---- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties Sat May 19 23:14:35 2018 -0700 @@ -26,134 +26,134 @@ # Version @@ -18334,8 +18360,8 @@ +filename.NanumGothic_Bold=/usr/local/lib/X11/fonts/nanum-ttf/NanumGothicBold.ttf +filename.NanumMyeongjo=/usr/local/lib/X11/fonts/nanum-ttf/NanumMyeongjo.ttf +filename.NanumMyeongjo_Bold=/usr/local/lib/X11/fonts/nanum-ttf/NanumMyeongjoBold.ttf ---- ./jdk/src/solaris/classes/sun/net/PortConfig.java Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/solaris/classes/sun/net/PortConfig.java Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/solaris/classes/sun/net/PortConfig.java Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/solaris/classes/sun/net/PortConfig.java Sat May 19 23:14:35 2018 -0700 @@ -52,7 +52,7 @@ } else if (os.startsWith("SunOS")) { defaultLower = 32768; @@ -18345,8 +18371,8 @@ defaultLower = 49152; defaultUpper = 65535; } else if (os.startsWith("AIX")) { ---- ./jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java Sat May 19 23:14:35 2018 -0700 @@ -66,7 +66,7 @@ return createProvider("sun.nio.ch.SolarisAsynchronousChannelProvider"); if (osname.equals("Linux")) @@ -18356,8 +18382,8 @@ return createProvider("sun.nio.ch.BsdAsynchronousChannelProvider"); if (osname.equals("AIX")) return createProvider("sun.nio.ch.AixAsynchronousChannelProvider"); ---- ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystemProvider.java Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystemProvider.java Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystemProvider.java Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystemProvider.java Sat May 19 23:14:35 2018 -0700 @@ -25,10 +25,14 @@ package sun.nio.fs; @@ -18391,8 +18417,8 @@ + new MagicFileTypeDetector()); + } } ---- ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java Sat May 19 23:14:35 2018 -0700 @@ -61,6 +61,8 @@ return createProvider("sun.nio.fs.SolarisFileSystemProvider"); if (osname.equals("Linux")) @@ -18402,8 +18428,8 @@ if (osname.contains("OS X")) return createProvider("sun.nio.fs.MacOSXFileSystemProvider"); if (osname.equals("AIX")) ---- ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java Sat May 19 23:14:35 2018 -0700 @@ -161,6 +161,7 @@ static boolean isBSD() { @@ -18427,8 +18453,8 @@ "/usr/sbin/lpc status all | grep -E '^[ 0-9a-zA-Z_-]*@' | awk -F'@' '{print $1}' | sort" }; ---- ./jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java Sat May 19 23:14:35 2018 -0700 @@ -273,7 +273,7 @@ try { b = s.getBytes("UTF-8"); @@ -18438,8 +18464,8 @@ } BsdVirtualMachine.write(fd, b, 0, b.length); } ---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCM.c Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCM.c Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCM.c Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCM.c Sat May 19 23:14:35 2018 -0700 @@ -675,6 +675,7 @@ return -1; } @@ -18456,8 +18482,8 @@ } else if (err == -EAGAIN) { TRACE0("xrun_recovery: EAGAIN try again flag.\n"); return 0; ---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_SolarisOS_PCM.c Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_SolarisOS_PCM.c Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_SolarisOS_PCM.c Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_SolarisOS_PCM.c Sat May 19 23:14:35 2018 -0700 @@ -140,7 +140,7 @@ (float) ((int) sr->samp_rates[s]), DAUDIO_PCM, /* encoding - let's only do PCM */ @@ -18467,8 +18493,8 @@ FALSE /* little endian */ #else (bits[b] > 8)?TRUE:FALSE /* big endian */ ---- ./jdk/src/solaris/native/common/jni_util_md.c Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/solaris/native/common/jni_util_md.c Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/solaris/native/common/jni_util_md.c Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/solaris/native/common/jni_util_md.c Sat May 19 23:14:35 2018 -0700 @@ -28,6 +28,7 @@ #include "jni.h" #include "jni_util.h" @@ -18477,8 +18503,8 @@ jstring nativeNewStringPlatform(JNIEnv *env, const char *str) { return NULL; ---- ./jdk/src/solaris/native/java/lang/java_props_md.c Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/solaris/native/java/lang/java_props_md.c Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/solaris/native/java/lang/java_props_md.c Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/solaris/native/java/lang/java_props_md.c Sat May 19 23:14:35 2018 -0700 @@ -111,7 +111,7 @@ lc = setlocale(cat, NULL); #endif @@ -18513,8 +18539,8 @@ /* user properties */ { ---- ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c Sat May 19 23:14:35 2018 -0700 @@ -36,20 +36,13 @@ #include #include @@ -18555,8 +18581,8 @@ error = getaddrinfo(hostname, NULL, &hints, &res); if (error) { ---- ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c Sat May 19 23:14:35 2018 -0700 @@ -33,7 +33,7 @@ #include #include @@ -18598,8 +18624,8 @@ #ifdef AF_INET6 /* Try once, with our static buffer. */ memset(&hints, 0, sizeof(hints)); ---- ./jdk/src/solaris/native/java/net/NetworkInterface.c Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/solaris/native/java/net/NetworkInterface.c Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/solaris/native/java/net/NetworkInterface.c Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/solaris/native/java/net/NetworkInterface.c Sat May 19 23:14:35 2018 -0700 @@ -58,14 +58,19 @@ #include #include @@ -18622,8 +18648,8 @@ #include "jvm.h" #include "jni_util.h" ---- ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c Sat May 19 23:14:35 2018 -0700 @@ -2221,7 +2221,7 @@ } } @@ -18633,8 +18659,8 @@ if (family == AF_INET6 && index == 0) { index = getDefaultScopeID(env); } ---- ./jdk/src/solaris/native/java/net/PlainSocketImpl.c Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/solaris/native/java/net/PlainSocketImpl.c Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/solaris/native/java/net/PlainSocketImpl.c Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/solaris/native/java/net/PlainSocketImpl.c Sat May 19 23:14:35 2018 -0700 @@ -215,6 +215,7 @@ } @@ -18651,8 +18677,8 @@ #endif /* AF_INET6 */ /* ---- ./jdk/src/solaris/native/java/net/bsd_close.c Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/solaris/native/java/net/bsd_close.c Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/solaris/native/java/net/bsd_close.c Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/solaris/native/java/net/bsd_close.c Sat May 19 23:14:35 2018 -0700 @@ -320,11 +320,8 @@ } @@ -18742,8 +18768,8 @@ } +#endif } ---- ./jdk/src/solaris/native/java/net/net_util_md.c Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/solaris/native/java/net/net_util_md.c Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/solaris/native/java/net/net_util_md.c Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/solaris/native/java/net/net_util_md.c Sat May 19 23:14:35 2018 -0700 @@ -46,6 +46,10 @@ #endif #endif @@ -18764,8 +18790,8 @@ static jclass ni_class = NULL; static jfieldID ni_defaultIndexID; if (ni_class == NULL) { ---- ./jdk/src/solaris/native/java/util/TimeZone_md.c Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/solaris/native/java/util/TimeZone_md.c Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/solaris/native/java/util/TimeZone_md.c Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/solaris/native/java/util/TimeZone_md.c Sat May 19 23:14:35 2018 -0700 @@ -56,7 +56,11 @@ #endif @@ -18829,8 +18855,8 @@ } -#endif /* MACOSX */ +#endif /* _ALLBSD_SOURCE */ ---- ./jdk/src/solaris/native/sun/awt/awt_Font.c Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/solaris/native/sun/awt/awt_Font.c Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/solaris/native/sun/awt/awt_Font.c Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/solaris/native/sun/awt/awt_Font.c Sat May 19 23:14:35 2018 -0700 @@ -255,7 +255,7 @@ if (strcmp(style, "regular") == 0) { altstyle = "roman"; @@ -18840,8 +18866,8 @@ if (!strcmp(family, "lucidasans")) { family = "lucida"; } ---- ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c Sat May 19 23:14:35 2018 -0700 @@ -121,7 +121,7 @@ */ @@ -18926,8 +18952,8 @@ #endif /* HEADLESS */ return point; } ---- ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c Sat May 19 23:14:35 2018 -0700 @@ -52,7 +52,7 @@ XIMPreeditDrawCallbackStruct *); static void PreeditCaretCallback(XIC, XPointer, @@ -19147,8 +19173,8 @@ AWT_LOCK(); adjustStatusWindow(window); AWT_UNLOCK(); ---- ./jdk/src/solaris/native/sun/awt/awt_Robot.c Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/solaris/native/sun/awt/awt_Robot.c Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/solaris/native/sun/awt/awt_Robot.c Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/solaris/native/sun/awt/awt_Robot.c Sat May 19 23:14:35 2018 -0700 @@ -45,7 +45,7 @@ #include "wsutils.h" #include "list.h" @@ -19158,8 +19184,8 @@ #include #endif ---- ./jdk/src/solaris/native/sun/awt/extutil.h Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/solaris/native/sun/awt/extutil.h Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/solaris/native/sun/awt/extutil.h Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/solaris/native/sun/awt/extutil.h Sat May 19 23:14:35 2018 -0700 @@ -58,7 +58,7 @@ */ /* $XFree86: xc/include/extensions/extutil.h,v 1.5 2001/01/17 17:53:20 dawes Exp $ */ @@ -19175,8 +19201,8 @@ -#endif /* __linux__ || MACOSX */ +#endif /* __linux__ || _ALLBSD_SOURCE */ ---- ./jdk/src/solaris/native/sun/awt/fontpath.c Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/solaris/native/sun/awt/fontpath.c Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/solaris/native/sun/awt/fontpath.c Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/solaris/native/sun/awt/fontpath.c Sat May 19 23:14:35 2018 -0700 @@ -23,9 +23,9 @@ * questions. */ @@ -19265,8 +19291,8 @@ && (strcmp((char*)fontformat, "Type 1") != 0) #endif ) { ---- ./jdk/src/solaris/native/sun/java2d/j2d_md.h Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/solaris/native/sun/java2d/j2d_md.h Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/solaris/native/sun/java2d/j2d_md.h Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/solaris/native/sun/java2d/j2d_md.h Sat May 19 23:14:35 2018 -0700 @@ -28,11 +28,11 @@ #include @@ -19282,8 +19308,8 @@ typedef unsigned char jubyte; typedef unsigned short jushort; ---- ./jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c Sat May 19 23:14:35 2018 -0700 @@ -63,9 +63,6 @@ * MLIB_EDGE_SRC_PADDED */ @@ -19388,8 +19414,8 @@ LOGIC(da[0], dtmp, dtmp1, |); } else { /* aligned */ ---- ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c Sat May 19 23:14:35 2018 -0700 @@ -804,7 +804,7 @@ static int initialized; static int usevis = JNI_TRUE; @@ -19400,7 +19426,7 @@ #else # define ULTRA_CHIP "sun4u" --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./jdk/src/solaris/native/sun/management/BsdOperatingSystem.c Fri Feb 02 18:25:39 2018 -0800 ++++ ./jdk/src/solaris/native/sun/management/BsdOperatingSystem.c Sat May 19 23:14:35 2018 -0700 @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. @@ -19444,8 +19470,8 @@ +{ + return (jdouble) -1; +} ---- ./jdk/src/solaris/native/sun/management/OperatingSystemImpl.c Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/solaris/native/sun/management/OperatingSystemImpl.c Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/solaris/native/sun/management/OperatingSystemImpl.c Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/solaris/native/sun/management/OperatingSystemImpl.c Sat May 19 23:14:35 2018 -0700 @@ -56,6 +56,9 @@ #include #include @@ -19610,8 +19636,8 @@ return -1; } ---- ./jdk/src/solaris/native/sun/net/portconfig.c Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/solaris/native/sun/net/portconfig.c Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/solaris/native/sun/net/portconfig.c Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/solaris/native/sun/net/portconfig.c Sat May 19 23:14:35 2018 -0700 @@ -67,6 +67,24 @@ range->lower = net_getParam("/dev/tcp", "tcp_smallest_anon_port"); return 0; @@ -19637,8 +19663,8 @@ #elif defined(_ALLBSD_SOURCE) { int ret; ---- ./jdk/src/solaris/native/sun/nio/ch/sctp/Sctp.h Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/solaris/native/sun/nio/ch/sctp/Sctp.h Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/solaris/native/sun/nio/ch/sctp/Sctp.h Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/solaris/native/sun/nio/ch/sctp/Sctp.h Sat May 19 23:14:35 2018 -0700 @@ -67,7 +67,7 @@ @@ -19687,8 +19713,8 @@ jboolean loadSocketExtensionFuncs(JNIEnv* env); #endif /* !SUN_NIO_CH_SCTP_H */ ---- ./jdk/src/solaris/native/sun/nio/ch/sctp/SctpNet.c Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/solaris/native/sun/nio/ch/sctp/SctpNet.c Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/solaris/native/sun/nio/ch/sctp/SctpNet.c Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/solaris/native/sun/nio/ch/sctp/SctpNet.c Sat May 19 23:14:35 2018 -0700 @@ -58,6 +58,7 @@ */ jboolean loadSocketExtensionFuncs @@ -19705,8 +19731,8 @@ funcsLoaded = JNI_TRUE; return JNI_TRUE; ---- ./jdk/src/solaris/native/sun/nio/fs/MagicFileTypeDetector.c Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/solaris/native/sun/nio/fs/MagicFileTypeDetector.c Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/solaris/native/sun/nio/fs/MagicFileTypeDetector.c Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/solaris/native/sun/nio/fs/MagicFileTypeDetector.c Sat May 19 23:14:35 2018 -0700 @@ -31,6 +31,12 @@ #include #include @@ -19729,8 +19755,8 @@ if (magic_handle == NULL) { return JNI_FALSE; } ---- ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c Sat May 19 23:14:35 2018 -0700 @@ -54,7 +54,7 @@ } @@ -19740,8 +19766,8 @@ void *hModule = dlopen(libName, RTLD_LAZY); #else void *hModule = dlopen(libName, RTLD_NOLOAD); ---- ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c Sat May 19 23:14:35 2018 -0700 @@ -38,7 +38,9 @@ #include #include @@ -19752,8 +19778,8 @@ #include #include ---- ./jdk/src/solaris/native/sun/xawt/XWindow.c Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/solaris/native/sun/xawt/XWindow.c Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/solaris/native/sun/xawt/XWindow.c Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/solaris/native/sun/xawt/XWindow.c Sat May 19 23:14:35 2018 -0700 @@ -886,7 +886,7 @@ { KeySym originalKeysym = *keysym; @@ -19763,8 +19789,8 @@ /* The following code on Linux will cause the keypad keys * not to echo on JTextField when the NumLock is on. The * keysyms will be 0, because the last parameter 2 is not defined. ---- ./jdk/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_DirectSound.cpp Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_DirectSound.cpp Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_DirectSound.cpp Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_DirectSound.cpp Sat May 19 23:14:35 2018 -0700 @@ -308,7 +308,7 @@ DAUDIO_PCM, (bitsArray[bitIndex]==8)?FALSE:TRUE, /* signed */ diff --git a/java/openjdk8/files/patch-bsd-test b/java/openjdk8/files/patch-bsd-test index 2aae46487050..fb90c771d755 100644 --- a/java/openjdk8/files/patch-bsd-test +++ b/java/openjdk8/files/patch-bsd-test @@ -1,5 +1,5 @@ ---- ./hotspot/test/compiler/5091921/Test7005594.sh Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/test/compiler/5091921/Test7005594.sh Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/test/compiler/5091921/Test7005594.sh Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/test/compiler/5091921/Test7005594.sh Sat May 19 23:14:15 2018 -0700 @@ -60,6 +60,15 @@ # Windows/MKS MEM=`"$ROOTDIR/mksnt/sysinf" memory -v | grep "Total Physical Memory: " | sed 's/Total Physical Memory: *//g'` @@ -16,8 +16,8 @@ else echo "Unable to determine amount of physical memory on the machine" fi ---- ./hotspot/test/compiler/6894807/Test6894807.sh Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/test/compiler/6894807/Test6894807.sh Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/test/compiler/6894807/Test6894807.sh Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/test/compiler/6894807/Test6894807.sh Sat May 19 23:14:15 2018 -0700 @@ -21,7 +21,7 @@ # set platform-dependent variables OS=`uname -s` @@ -27,8 +27,8 @@ NULL=/dev/null PS=":" FS="/" ---- ./hotspot/test/runtime/7110720/Test7110720.sh Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/test/runtime/7110720/Test7110720.sh Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/test/runtime/7110720/Test7110720.sh Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/test/runtime/7110720/Test7110720.sh Sat May 19 23:14:15 2018 -0700 @@ -28,7 +28,7 @@ # set platform-dependent variables OS=`uname -s` @@ -38,8 +38,8 @@ FS="/" RM=/bin/rm CP=/bin/cp ---- ./hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java Sat May 19 23:14:15 2018 -0700 @@ -37,8 +37,8 @@ public static void main(String args[]) throws Throwable { @@ -51,8 +51,19 @@ return; } ---- ./hotspot/test/test_env.sh Fri Dec 15 08:58:26 2017 -0800 -+++ ./hotspot/test/test_env.sh Thu Jan 25 22:36:25 2018 -0800 +--- ./hotspot/test/serviceability/dcmd/DynLibDcmdTest.java Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/test/serviceability/dcmd/DynLibDcmdTest.java Sat May 19 23:14:15 2018 -0700 +@@ -47,6 +47,8 @@ + osDependentBaseString = "lib%s.dylib"; + } else if (Platform.isLinux()) { + osDependentBaseString = "lib%s.so"; ++ } else if (Platform.isBSD()) { ++ osDependentBaseString = "lib%s.so"; + } + + if (osDependentBaseString == null) { +--- ./hotspot/test/test_env.sh Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/test/test_env.sh Sat May 19 23:14:15 2018 -0700 @@ -53,7 +53,7 @@ # set platform-dependent variables OS=`uname -s` @@ -62,8 +73,21 @@ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/com/sun/corba/5036554/TestCorbaBug.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/com/sun/corba/5036554/TestCorbaBug.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./hotspot/test/testlibrary/com/oracle/java/testlibrary/Platform.java Mon Mar 19 11:59:32 2018 -0700 ++++ ./hotspot/test/testlibrary/com/oracle/java/testlibrary/Platform.java Sat May 19 23:14:15 2018 -0700 +@@ -67,6 +67,10 @@ + return isOs("aix"); + } + ++ public static boolean isBSD() { ++ return osName.toLowerCase().endsWith("bsd"); ++ } ++ + public static boolean isLinux() { + return isOs("linux"); + } +--- ./jdk/test/com/sun/corba/5036554/TestCorbaBug.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/com/sun/corba/5036554/TestCorbaBug.sh Sat May 19 23:14:35 2018 -0700 @@ -48,7 +48,7 @@ # set platform-dependent variables OS=`uname -s` @@ -73,8 +97,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/com/sun/corba/cachedSocket/7056731.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/com/sun/corba/cachedSocket/7056731.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/com/sun/corba/cachedSocket/7056731.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/com/sun/corba/cachedSocket/7056731.sh Sat May 19 23:14:35 2018 -0700 @@ -31,7 +31,7 @@ OS=`uname -s` @@ -84,8 +108,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh Sat May 19 23:14:35 2018 -0700 @@ -56,7 +56,7 @@ OS=`uname -s` @@ -95,8 +119,8 @@ PATHSEP=":" ;; ---- ./jdk/test/com/sun/jdi/JITDebug.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/com/sun/jdi/JITDebug.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/com/sun/jdi/JITDebug.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/com/sun/jdi/JITDebug.sh Sat May 19 23:14:35 2018 -0700 @@ -63,7 +63,7 @@ OS=`uname -s` export TRANSPORT_METHOD @@ -106,8 +130,8 @@ PATHSEP=":" TRANSPORT_METHOD=dt_socket ;; ---- ./jdk/test/com/sun/jdi/PrivateTransportTest.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/com/sun/jdi/PrivateTransportTest.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/com/sun/jdi/PrivateTransportTest.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/com/sun/jdi/PrivateTransportTest.sh Sat May 19 23:14:35 2018 -0700 @@ -106,7 +106,7 @@ xx=`find ${jreloc}/lib -name libdt_socket.so` libloc=`dirname ${xx}` @@ -117,8 +141,8 @@ libloc=${jreloc}/lib ;; Windows*) ---- ./jdk/test/com/sun/jdi/ShellScaffold.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/com/sun/jdi/ShellScaffold.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/com/sun/jdi/ShellScaffold.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/com/sun/jdi/ShellScaffold.sh Sat May 19 23:14:35 2018 -0700 @@ -284,7 +284,7 @@ psCmd=ps jstack=jstack.exe @@ -128,8 +152,8 @@ transport=dt_socket address= devnull=/dev/null ---- ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh Sat May 19 23:14:35 2018 -0700 @@ -45,7 +45,7 @@ OS=`uname -s` @@ -139,8 +163,8 @@ PS=":" ;; Windows* | CYGWIN*) ---- ./jdk/test/java/awt/JAWT/JAWT.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/java/awt/JAWT/JAWT.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/java/awt/JAWT/JAWT.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/java/awt/JAWT/JAWT.sh Sat May 19 23:14:35 2018 -0700 @@ -62,6 +62,23 @@ MAKE="make" LD_LIBRARY_PATH="." @@ -174,8 +198,8 @@ exit 0; ;; * ) ---- ./jdk/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh Sat May 19 23:14:35 2018 -0700 @@ -86,6 +86,14 @@ TMP="/tmp" ;; @@ -191,8 +215,8 @@ Windows* ) VAR="A different value for Win32" DEFAULT_JDK="C:/Program Files/Java/jdk1.8.0" ---- ./jdk/test/java/awt/Toolkit/Headless/WrappedToolkitTest/WrappedToolkitTest.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/java/awt/Toolkit/Headless/WrappedToolkitTest/WrappedToolkitTest.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/java/awt/Toolkit/Headless/WrappedToolkitTest/WrappedToolkitTest.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/java/awt/Toolkit/Headless/WrappedToolkitTest/WrappedToolkitTest.sh Sat May 19 23:14:35 2018 -0700 @@ -59,7 +59,7 @@ # Checking for proper OS OS=`uname -s` @@ -202,8 +226,8 @@ FILESEP="/" ;; ---- ./jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh Sat May 19 23:14:35 2018 -0700 @@ -119,6 +119,14 @@ TMP="/tmp" ;; @@ -219,8 +243,8 @@ Windows* ) VAR="A different value for Win32" DEFAULT_JDK="C:/Program Files/Java/jdk1.8.0" ---- ./jdk/test/java/io/File/GetXSpace.java Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/java/io/File/GetXSpace.java Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/java/io/File/GetXSpace.java Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/java/io/File/GetXSpace.java Sat May 19 23:14:35 2018 -0700 @@ -51,7 +51,7 @@ private static final String dfFormat; static { @@ -230,8 +254,8 @@ // FileSystem Total Used Available Use% MountedOn dfFormat = "([^\\s]+)\\s+(\\d+)\\s+\\d+\\s+(\\d+)\\s+\\d+%\\s+([^\\s]+)"; } else if (name.startsWith("Windows")) { ---- ./jdk/test/java/io/File/GetXSpace.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/java/io/File/GetXSpace.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/java/io/File/GetXSpace.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/java/io/File/GetXSpace.sh Sat May 19 23:14:35 2018 -0700 @@ -26,7 +26,7 @@ # set platform-dependent variable OS=`uname -s` @@ -241,8 +265,8 @@ Windows_98 ) return ;; Windows* ) SID=`sid`; TMP="c:/temp" ;; * ) ---- ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh Sat May 19 23:14:35 2018 -0700 @@ -45,7 +45,7 @@ # Need to determine the classpath separator and filepath separator based on the # operating system. @@ -252,8 +276,8 @@ PS=":" ;; Windows* | CYGWIN* ) PS=";" ;; ---- ./jdk/test/java/io/Serializable/serialver/classpath/run.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/java/io/Serializable/serialver/classpath/run.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/java/io/Serializable/serialver/classpath/run.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/java/io/Serializable/serialver/classpath/run.sh Sat May 19 23:14:35 2018 -0700 @@ -47,7 +47,7 @@ # set platform-dependent variables OS=`uname -s` @@ -263,8 +287,8 @@ PS=":" ;; Windows* | CYGWIN* ) PS=";" ;; ---- ./jdk/test/java/io/Serializable/serialver/nested/run.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/java/io/Serializable/serialver/nested/run.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/java/io/Serializable/serialver/nested/run.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/java/io/Serializable/serialver/nested/run.sh Sat May 19 23:14:35 2018 -0700 @@ -47,7 +47,7 @@ # set platform-dependent variables OS=`uname -s` @@ -274,8 +298,8 @@ PS=":" ;; Windows* | CYGWIN* ) PS=";" ;; ---- ./jdk/test/java/lang/ClassLoader/Assert.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/java/lang/ClassLoader/Assert.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/java/lang/ClassLoader/Assert.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/java/lang/ClassLoader/Assert.sh Sat May 19 23:14:35 2018 -0700 @@ -25,7 +25,7 @@ OS=`uname -s` @@ -285,8 +309,8 @@ FS="/" CHMOD="${FS}bin${FS}chmod" ;; ---- ./jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh Sat May 19 23:14:35 2018 -0700 @@ -55,7 +55,7 @@ Linux ) FS="/" @@ -296,8 +320,8 @@ FS="/" ;; AIX ) ---- ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh Sat May 19 23:14:35 2018 -0700 @@ -60,7 +60,7 @@ Linux ) FS="/" @@ -307,8 +331,8 @@ FS="/" ;; AIX ) ---- ./jdk/test/java/lang/ProcessBuilder/DestroyTest.java Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/java/lang/ProcessBuilder/DestroyTest.java Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/java/lang/ProcessBuilder/DestroyTest.java Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/java/lang/ProcessBuilder/DestroyTest.java Sat May 19 23:14:35 2018 -0700 @@ -148,6 +148,9 @@ } else if (osName.startsWith("Linux") == true) { return new UnixTest( @@ -319,8 +343,8 @@ } else if (osName.startsWith("Mac OS")) { return new MacTest( File.createTempFile("ProcessTrap-", ".sh",null)); ---- ./jdk/test/java/lang/ProcessBuilder/Zombies.java Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/java/lang/ProcessBuilder/Zombies.java Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/java/lang/ProcessBuilder/Zombies.java Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/java/lang/ProcessBuilder/Zombies.java Sat May 19 23:14:35 2018 -0700 @@ -34,7 +34,7 @@ static final String os = System.getProperty("os.name"); @@ -330,8 +354,8 @@ "/usr/bin/true" : "/bin/true"; public static void main(String[] args) throws Throwable { ---- ./jdk/test/java/lang/StringCoding/CheckEncodings.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/java/lang/StringCoding/CheckEncodings.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/java/lang/StringCoding/CheckEncodings.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/java/lang/StringCoding/CheckEncodings.sh Sat May 19 23:14:35 2018 -0700 @@ -30,7 +30,7 @@ # set platform-dependent variables OS=`uname -s` @@ -341,8 +365,8 @@ Windows* | CYGWIN* ) echo "Passed"; exit 0 ;; * ) echo "Unrecognized system!" ; exit 1 ;; ---- ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh Sat May 19 23:14:35 2018 -0700 @@ -48,7 +48,7 @@ # set platform-dependent variables OS=`uname -s` @@ -352,8 +376,8 @@ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/java/lang/instrument/MakeJAR2.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/java/lang/instrument/MakeJAR2.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/java/lang/instrument/MakeJAR2.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/java/lang/instrument/MakeJAR2.sh Sat May 19 23:14:35 2018 -0700 @@ -55,7 +55,7 @@ OS=`uname -s` @@ -363,8 +387,8 @@ PATHSEP=":" ;; ---- ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh Sat May 19 23:14:35 2018 -0700 @@ -43,7 +43,7 @@ PS=":" FS="/" @@ -374,8 +398,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/java/lang/management/OperatingSystemMXBean/GetSystemLoadAverage.java Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/java/lang/management/OperatingSystemMXBean/GetSystemLoadAverage.java Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/java/lang/management/OperatingSystemMXBean/GetSystemLoadAverage.java Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/java/lang/management/OperatingSystemMXBean/GetSystemLoadAverage.java Sat May 19 23:14:35 2018 -0700 @@ -79,8 +79,10 @@ System.out.println("Test passed."); } @@ -397,8 +421,8 @@ ? output.split(" ") : output.split(","); double expected = Double.parseDouble(lavg[0]); ---- ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh Sat May 19 23:14:35 2018 -0700 @@ -61,7 +61,7 @@ while true; do echo "Run $i: TestSystemLoadAvg" @@ -408,8 +432,8 @@ runOne GetSystemLoadAverage ;; * ) ---- ./jdk/test/java/net/Authenticator/B4933582.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/java/net/Authenticator/B4933582.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/java/net/Authenticator/B4933582.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/java/net/Authenticator/B4933582.sh Sat May 19 23:14:35 2018 -0700 @@ -26,7 +26,7 @@ OS=`uname -s` @@ -419,8 +443,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/java/net/DatagramSocket/Send12k.java Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/java/net/DatagramSocket/Send12k.java Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/java/net/DatagramSocket/Send12k.java Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/java/net/DatagramSocket/Send12k.java Sat May 19 23:14:35 2018 -0700 @@ -36,9 +36,10 @@ public static void main(String args[]) throws Exception { @@ -434,8 +458,8 @@ SEND_SIZE = 16 * 576; } else { SEND_SIZE = 16 * 1024; ---- ./jdk/test/java/net/DatagramSocket/SendDatagramToBadAddress.java Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/java/net/DatagramSocket/SendDatagramToBadAddress.java Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/java/net/DatagramSocket/SendDatagramToBadAddress.java Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/java/net/DatagramSocket/SendDatagramToBadAddress.java Sat May 19 23:14:35 2018 -0700 @@ -45,6 +45,8 @@ return (true); if (p.getProperty ("os.name").equals ("Linux")) @@ -445,8 +469,8 @@ if (p.getProperty ("os.name").startsWith ("Mac OS")) return (true); // Check for specific Solaris version from here ---- ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh Sat May 19 23:14:35 2018 -0700 @@ -27,11 +27,7 @@ # set platform-dependent variables OS=`uname -s` @@ -460,8 +484,8 @@ PATHSEP=":" FILESEP="/" ;; ---- ./jdk/test/java/net/Socket/OldSocketImpl.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/java/net/Socket/OldSocketImpl.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/java/net/Socket/OldSocketImpl.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/java/net/Socket/OldSocketImpl.sh Sat May 19 23:14:35 2018 -0700 @@ -28,7 +28,7 @@ OS=`uname -s` @@ -471,8 +495,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/java/net/URL/B5086147.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/java/net/URL/B5086147.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/java/net/URL/B5086147.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/java/net/URL/B5086147.sh Sat May 19 23:14:35 2018 -0700 @@ -26,7 +26,7 @@ OS=`uname -s` @@ -482,8 +506,8 @@ exit 0 ;; CYGWIN* ) ---- ./jdk/test/java/net/URLClassLoader/B5077773.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/java/net/URLClassLoader/B5077773.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/java/net/URLClassLoader/B5077773.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/java/net/URLClassLoader/B5077773.sh Sat May 19 23:14:35 2018 -0700 @@ -34,11 +34,7 @@ OS=`uname -s` @@ -497,8 +521,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh Sat May 19 23:14:35 2018 -0700 @@ -27,11 +27,7 @@ OS=`uname -s` @@ -512,8 +536,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/java/net/URLConnection/6212146/test.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/java/net/URLConnection/6212146/test.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/java/net/URLConnection/6212146/test.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/java/net/URLConnection/6212146/test.sh Sat May 19 23:14:35 2018 -0700 @@ -33,11 +33,7 @@ OS=`uname -s` @@ -527,8 +551,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/java/nio/channels/FileChannel/Transfer.java Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/java/nio/channels/FileChannel/Transfer.java Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/java/nio/channels/FileChannel/Transfer.java Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/java/nio/channels/FileChannel/Transfer.java Sat May 19 23:14:35 2018 -0700 @@ -228,7 +228,7 @@ // Windows and Linux can't handle the really large file sizes for a // truncate or a positional write required by the test for 4563125 @@ -538,8 +562,8 @@ return; File source = File.createTempFile("blah", null); source.deleteOnExit(); ---- ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.c Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.c Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.c Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.c Sat May 19 23:14:35 2018 -0700 @@ -17,6 +17,12 @@ #include "Launcher.h" @@ -562,8 +586,8 @@ _exit(-1); } ---- ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh Sat May 19 23:14:35 2018 -0700 @@ -34,7 +34,7 @@ OS=`uname -s` @@ -573,8 +597,8 @@ # Skip locale test for Windows Windows* | CYGWIN* ) echo "Passed"; exit 0 ;; ---- ./jdk/test/java/nio/charset/spi/basic.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/java/nio/charset/spi/basic.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/java/nio/charset/spi/basic.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/java/nio/charset/spi/basic.sh Sat May 19 23:14:35 2018 -0700 @@ -48,7 +48,7 @@ DIR=`pwd` @@ -584,8 +608,8 @@ Windows* ) CPS=';' ;; CYGWIN* ) DIR=`/usr/bin/cygpath -a -s -m $DIR` ---- ./jdk/test/java/nio/file/FileSystem/Basic.java Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/java/nio/file/FileSystem/Basic.java Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/java/nio/file/FileSystem/Basic.java Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/java/nio/file/FileSystem/Basic.java Sat May 19 23:14:35 2018 -0700 @@ -76,7 +76,7 @@ checkSupported(fs, "posix", "unix", "owner", "acl", "user"); if (os.equals("Linux")) @@ -595,8 +619,8 @@ checkSupported(fs, "posix", "unix", "owner"); if (os.equals("Windows")) checkSupported(fs, "owner", "dos", "acl", "user"); ---- ./jdk/test/java/nio/file/Files/CopyAndMove.java Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/java/nio/file/Files/CopyAndMove.java Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/java/nio/file/Files/CopyAndMove.java Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/java/nio/file/Files/CopyAndMove.java Sat May 19 23:14:35 2018 -0700 @@ -651,7 +651,7 @@ // check POSIX attributes are copied @@ -615,8 +639,8 @@ boolean isDirectory = isDirectory(file, NOFOLLOW_LINKS); if (isUnix) { ---- ./jdk/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh Sat May 19 23:14:35 2018 -0700 @@ -33,7 +33,7 @@ OS=`uname -s` @@ -626,8 +650,8 @@ PS=":" ;; Windows* | CYGWIN* ) ---- ./jdk/test/java/rmi/registry/readTest/readTest.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/java/rmi/registry/readTest/readTest.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/java/rmi/registry/readTest/readTest.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/java/rmi/registry/readTest/readTest.sh Sat May 19 23:14:35 2018 -0700 @@ -34,7 +34,7 @@ REGARGS="" @@ -637,8 +661,8 @@ PS=":" FS="/" CHMOD="${FS}bin${FS}chmod" ---- ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh Sat May 19 23:14:35 2018 -0700 @@ -58,7 +58,7 @@ PATHSEP=":" FILESEP="/" @@ -648,8 +672,8 @@ PATHSEP=":" FILESEP="/" ;; ---- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh Sat May 19 23:14:35 2018 -0700 @@ -42,7 +42,7 @@ PATHSEP=":" FILESEP="/" @@ -659,8 +683,8 @@ PATHSEP=":" FILESEP="/" ;; ---- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh Sat May 19 23:14:35 2018 -0700 @@ -66,7 +66,7 @@ PATHSEP=";" FILESEP="/" @@ -670,8 +694,8 @@ PATHSEP=":" FILESEP="/" ;; ---- ./jdk/test/java/security/Security/signedfirst/Dyn.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/java/security/Security/signedfirst/Dyn.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/java/security/Security/signedfirst/Dyn.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/java/security/Security/signedfirst/Dyn.sh Sat May 19 23:14:35 2018 -0700 @@ -58,7 +58,7 @@ PATHSEP=":" FILESEP="/" @@ -681,8 +705,8 @@ PATHSEP=":" FILESEP="/" ;; ---- ./jdk/test/java/security/Security/signedfirst/Static.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/java/security/Security/signedfirst/Static.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/java/security/Security/signedfirst/Static.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/java/security/Security/signedfirst/Static.sh Sat May 19 23:14:35 2018 -0700 @@ -58,7 +58,7 @@ PATHSEP=":" FILESEP="/" @@ -692,8 +716,8 @@ PATHSEP=":" FILESEP="/" ;; ---- ./jdk/test/java/util/Currency/PropertiesTest.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/java/util/Currency/PropertiesTest.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/java/util/Currency/PropertiesTest.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/java/util/Currency/PropertiesTest.sh Sat May 19 23:14:35 2018 -0700 @@ -52,7 +52,7 @@ # set platform-dependent variables OS=`uname -s` @@ -703,8 +727,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/java/util/PluggableLocale/ExecTest.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/java/util/PluggableLocale/ExecTest.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/java/util/PluggableLocale/ExecTest.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/java/util/PluggableLocale/ExecTest.sh Sat May 19 23:14:35 2018 -0700 @@ -62,7 +62,7 @@ # set platform-dependent variables OS=`uname -s` @@ -714,8 +738,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh Sat May 19 23:14:35 2018 -0700 @@ -31,7 +31,7 @@ # set platform-dependent variables OS=`uname -s` @@ -725,8 +749,8 @@ PATHSEP=":" FILESEP="/" ;; ---- ./jdk/test/java/util/ServiceLoader/basic.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/java/util/ServiceLoader/basic.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/java/util/ServiceLoader/basic.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/java/util/ServiceLoader/basic.sh Sat May 19 23:14:35 2018 -0700 @@ -43,9 +43,7 @@ OS=`uname -s` @@ -738,8 +762,8 @@ SEP=':' ;; * ) SEP='\;' ;; ---- ./jdk/test/java/util/prefs/CheckUserPrefsStorage.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/java/util/prefs/CheckUserPrefsStorage.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/java/util/prefs/CheckUserPrefsStorage.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/java/util/prefs/CheckUserPrefsStorage.sh Sat May 19 23:14:35 2018 -0700 @@ -31,7 +31,7 @@ OS=`uname -s` @@ -749,8 +773,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh Sat May 19 23:14:35 2018 -0700 @@ -56,7 +56,7 @@ # set platform-dependent variables OS=`uname -s` @@ -760,8 +784,8 @@ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatTest.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatTest.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatTest.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatTest.sh Sat May 19 23:14:35 2018 -0700 @@ -89,7 +89,7 @@ FILESEP="/" ;; @@ -771,8 +795,8 @@ VAR="A different value for Linux" DEFAULT_JDK=/none #DEFAULT_JDK=/usr/local/java/jdk1.4/linux-i386 ---- ./jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatThreadTest.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatThreadTest.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatThreadTest.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatThreadTest.sh Sat May 19 23:14:35 2018 -0700 @@ -90,7 +90,7 @@ FILESEP="/" ;; @@ -782,8 +806,8 @@ VAR="A different value for Linux" DEFAULT_JDK=/none #DEFAULT_JDK=/usr/local/java/jdk1.4/linux-i386 ---- ./jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh Sat May 19 23:14:35 2018 -0700 @@ -108,6 +108,14 @@ TMP="/tmp" ;; @@ -799,8 +823,8 @@ Windows* ) VAR="A different value for Win32" DEFAULT_JDK="C:/Program Files/Java/jdk1.8.0" ---- ./jdk/test/javax/script/CommonSetup.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/javax/script/CommonSetup.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/javax/script/CommonSetup.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/javax/script/CommonSetup.sh Sat May 19 23:14:35 2018 -0700 @@ -36,7 +36,7 @@ OS=`uname -s` @@ -810,8 +834,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/javax/security/auth/Subject/doAs/Test.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/javax/security/auth/Subject/doAs/Test.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/javax/security/auth/Subject/doAs/Test.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/javax/security/auth/Subject/doAs/Test.sh Sat May 19 23:14:35 2018 -0700 @@ -43,7 +43,7 @@ FS="/" RM="/bin/rm -f" @@ -821,8 +845,8 @@ PS=":" FS="/" RM="/bin/rm -f" ---- ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh Sat May 19 23:14:35 2018 -0700 @@ -53,7 +53,7 @@ # set platform-dependent variables OS=`uname -s` @@ -832,8 +856,8 @@ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/lib/testlibrary/jdk/testlibrary/Platform.java Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/lib/testlibrary/jdk/testlibrary/Platform.java Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/lib/testlibrary/jdk/testlibrary/Platform.java Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/lib/testlibrary/jdk/testlibrary/Platform.java Sat May 19 23:14:35 2018 -0700 @@ -53,8 +53,13 @@ return isOs("linux"); } @@ -849,8 +873,8 @@ } public static String getOsName() { ---- ./jdk/test/sun/awt/dnd/8024061/bug8024061.java Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/sun/awt/dnd/8024061/bug8024061.java Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/sun/awt/dnd/8024061/bug8024061.java Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/sun/awt/dnd/8024061/bug8024061.java Sat May 19 23:14:35 2018 -0700 @@ -107,8 +107,8 @@ public static void main(String[] args) throws AWTException, InvocationTargetException, InterruptedException { @@ -862,8 +886,8 @@ "skipping!"); return; } ---- ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh Sat May 19 23:14:35 2018 -0700 @@ -42,7 +42,7 @@ fi @@ -873,8 +897,8 @@ PATHSEP=":" FILESEP="/" DFILESEP=$FILESEP ---- ./jdk/test/sun/net/ftp/MarkResetTest.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/sun/net/ftp/MarkResetTest.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/sun/net/ftp/MarkResetTest.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/sun/net/ftp/MarkResetTest.sh Sat May 19 23:14:35 2018 -0700 @@ -28,7 +28,7 @@ OS=`uname -s` @@ -884,8 +908,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh Sat May 19 23:14:35 2018 -0700 @@ -28,7 +28,7 @@ OS=`uname -s` @@ -895,8 +919,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/sun/net/www/protocol/jar/B5105410.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/sun/net/www/protocol/jar/B5105410.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/sun/net/www/protocol/jar/B5105410.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/sun/net/www/protocol/jar/B5105410.sh Sat May 19 23:14:35 2018 -0700 @@ -31,7 +31,7 @@ OS=`uname -s` @@ -906,8 +930,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh Sat May 19 23:14:35 2018 -0700 @@ -31,7 +31,7 @@ OS=`uname -s` @@ -917,8 +941,8 @@ PS=":" FS="/" CHMOD="${FS}bin${FS}chmod" ---- ./jdk/test/sun/nio/ch/SelProvider.java Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/sun/nio/ch/SelProvider.java Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/sun/nio/ch/SelProvider.java Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/sun/nio/ch/SelProvider.java Sat May 19 23:14:35 2018 -0700 @@ -39,7 +39,7 @@ expected = "sun.nio.ch.DevPollSelectorProvider"; } else if ("Linux".equals(osname)) { @@ -928,8 +952,8 @@ expected = "sun.nio.ch.KQueueSelectorProvider"; } else { return; ---- ./jdk/test/sun/security/krb5/runNameEquals.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/sun/security/krb5/runNameEquals.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/sun/security/krb5/runNameEquals.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/sun/security/krb5/runNameEquals.sh Sat May 19 23:14:35 2018 -0700 @@ -52,7 +52,7 @@ # set platform-dependent variables OS=`uname -s` @@ -939,8 +963,8 @@ PATHSEP=":" FILESEP="/" NATIVE=true ---- ./jdk/test/sun/security/mscapi/ShortRSAKey1024.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/sun/security/mscapi/ShortRSAKey1024.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/sun/security/mscapi/ShortRSAKey1024.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/sun/security/mscapi/ShortRSAKey1024.sh Sat May 19 23:14:35 2018 -0700 @@ -50,7 +50,7 @@ OS=`uname -s` @@ -950,8 +974,8 @@ FS="/" ;; Windows_* ) ---- ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh Sat May 19 23:14:35 2018 -0700 @@ -66,7 +66,7 @@ CP="${FS}bin${FS}cp" CHMOD="${FS}bin${FS}chmod" @@ -961,8 +985,8 @@ FS="/" PS=":" CP="${FS}bin${FS}cp" ---- ./jdk/test/sun/security/pkcs11/Provider/Login.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/sun/security/pkcs11/Provider/Login.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/sun/security/pkcs11/Provider/Login.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/sun/security/pkcs11/Provider/Login.sh Sat May 19 23:14:35 2018 -0700 @@ -67,7 +67,7 @@ CP="${FS}bin${FS}cp" CHMOD="${FS}bin${FS}chmod" @@ -972,8 +996,8 @@ FS="/" PS=":" CP="${FS}bin${FS}cp" ---- ./jdk/test/sun/security/provider/KeyStore/DKSTest.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/sun/security/provider/KeyStore/DKSTest.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/sun/security/provider/KeyStore/DKSTest.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/sun/security/provider/KeyStore/DKSTest.sh Sat May 19 23:14:35 2018 -0700 @@ -50,7 +50,7 @@ # set platform-dependent variables OS=`uname -s` @@ -983,8 +1007,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh Sat May 19 23:14:35 2018 -0700 @@ -52,7 +52,7 @@ PATHSEP=":" FILESEP="/" @@ -994,8 +1018,8 @@ PATHSEP=":" FILESEP="/" ;; ---- ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh Sat May 19 23:14:35 2018 -0700 @@ -59,7 +59,7 @@ PS=":" FS="/" @@ -1005,8 +1029,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh Sat May 19 23:14:35 2018 -0700 @@ -33,7 +33,7 @@ OS=`uname -s` @@ -1016,8 +1040,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh Sat May 19 23:14:35 2018 -0700 @@ -46,7 +46,7 @@ OS=`uname -s` @@ -1027,8 +1051,8 @@ FILESEP="/" PATHSEP=":" ;; ---- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh Sat May 19 23:14:35 2018 -0700 @@ -32,7 +32,7 @@ HOSTNAME=`uname -n` OS=`uname -s` @@ -1038,8 +1062,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh Sat May 19 23:14:35 2018 -0700 @@ -32,7 +32,7 @@ HOSTNAME=`uname -n` OS=`uname -s` @@ -1049,8 +1073,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh Sat May 19 23:14:35 2018 -0700 @@ -46,7 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1060,8 +1084,8 @@ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh Sat May 19 23:14:35 2018 -0700 @@ -46,7 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1071,8 +1095,8 @@ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/jarsigner/diffend.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/sun/security/tools/jarsigner/diffend.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/sun/security/tools/jarsigner/diffend.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/sun/security/tools/jarsigner/diffend.sh Sat May 19 23:14:35 2018 -0700 @@ -47,6 +47,13 @@ FS="/" CP="${FS}bin${FS}cp -f" @@ -1087,8 +1111,8 @@ CYGWIN* ) NULL=/dev/null PS=";" ---- ./jdk/test/sun/security/tools/jarsigner/emptymanifest.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/sun/security/tools/jarsigner/emptymanifest.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/sun/security/tools/jarsigner/emptymanifest.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/sun/security/tools/jarsigner/emptymanifest.sh Sat May 19 23:14:35 2018 -0700 @@ -39,6 +39,11 @@ Windows_* ) FS="\\" @@ -1101,8 +1125,8 @@ * ) FS="/" ;; ---- ./jdk/test/sun/security/tools/jarsigner/oldsig.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/sun/security/tools/jarsigner/oldsig.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/sun/security/tools/jarsigner/oldsig.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/sun/security/tools/jarsigner/oldsig.sh Sat May 19 23:14:35 2018 -0700 @@ -42,7 +42,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1112,8 +1136,8 @@ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh Sat May 19 23:14:35 2018 -0700 @@ -46,7 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1123,8 +1147,8 @@ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh Sat May 19 23:14:35 2018 -0700 @@ -55,7 +55,7 @@ PATHSEP=":" FILESEP="/" @@ -1134,8 +1158,8 @@ PATHSEP=":" FILESEP="/" ;; ---- ./jdk/test/sun/security/tools/keytool/NoExtNPE.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/sun/security/tools/keytool/NoExtNPE.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/sun/security/tools/keytool/NoExtNPE.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/sun/security/tools/keytool/NoExtNPE.sh Sat May 19 23:14:35 2018 -0700 @@ -48,7 +48,7 @@ Linux ) FILESEP="/" @@ -1145,8 +1169,8 @@ FILESEP="/" ;; AIX ) ---- ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh Sat May 19 23:14:35 2018 -0700 @@ -45,7 +45,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1156,8 +1180,8 @@ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh Sat May 19 23:14:35 2018 -0700 @@ -46,7 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1167,8 +1191,8 @@ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/keytool/StorePasswordsByShell.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/sun/security/tools/keytool/StorePasswordsByShell.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/sun/security/tools/keytool/StorePasswordsByShell.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/sun/security/tools/keytool/StorePasswordsByShell.sh Sat May 19 23:14:35 2018 -0700 @@ -46,7 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1178,8 +1202,8 @@ PATHSEP=":" FILESEP="/" ;; ---- ./jdk/test/sun/security/tools/keytool/i18n.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/sun/security/tools/keytool/i18n.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/sun/security/tools/keytool/i18n.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/sun/security/tools/keytool/i18n.sh Sat May 19 23:14:35 2018 -0700 @@ -46,7 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1189,8 +1213,8 @@ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/keytool/printssl.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/sun/security/tools/keytool/printssl.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/sun/security/tools/keytool/printssl.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/sun/security/tools/keytool/printssl.sh Sat May 19 23:14:35 2018 -0700 @@ -40,7 +40,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1200,8 +1224,8 @@ FS="/" ;; CYGWIN* ) ---- ./jdk/test/sun/security/tools/keytool/resource.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/sun/security/tools/keytool/resource.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/sun/security/tools/keytool/resource.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/sun/security/tools/keytool/resource.sh Sat May 19 23:14:35 2018 -0700 @@ -43,7 +43,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1211,8 +1235,8 @@ NULL=/dev/null FS="/" ;; ---- ./jdk/test/sun/security/tools/keytool/standard.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/sun/security/tools/keytool/standard.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/sun/security/tools/keytool/standard.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/sun/security/tools/keytool/standard.sh Sat May 19 23:14:35 2018 -0700 @@ -45,7 +45,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1222,8 +1246,8 @@ FS="/" ;; Windows_* ) ---- ./jdk/test/sun/security/tools/policytool/Alias.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/sun/security/tools/policytool/Alias.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/sun/security/tools/policytool/Alias.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/sun/security/tools/policytool/Alias.sh Sat May 19 23:14:35 2018 -0700 @@ -47,7 +47,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1233,8 +1257,8 @@ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/policytool/ChangeUI.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/sun/security/tools/policytool/ChangeUI.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/sun/security/tools/policytool/ChangeUI.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/sun/security/tools/policytool/ChangeUI.sh Sat May 19 23:14:35 2018 -0700 @@ -46,7 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1244,8 +1268,8 @@ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh Sat May 19 23:14:35 2018 -0700 @@ -46,7 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1255,8 +1279,8 @@ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/policytool/SaveAs.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/sun/security/tools/policytool/SaveAs.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/sun/security/tools/policytool/SaveAs.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/sun/security/tools/policytool/SaveAs.sh Sat May 19 23:14:35 2018 -0700 @@ -47,7 +47,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1266,8 +1290,8 @@ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh Sat May 19 23:14:35 2018 -0700 @@ -47,7 +47,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1277,8 +1301,8 @@ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/policytool/UsePolicy.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/sun/security/tools/policytool/UsePolicy.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/sun/security/tools/policytool/UsePolicy.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/sun/security/tools/policytool/UsePolicy.sh Sat May 19 23:14:35 2018 -0700 @@ -46,7 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1288,8 +1312,8 @@ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/policytool/i18n.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/sun/security/tools/policytool/i18n.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/sun/security/tools/policytool/i18n.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/sun/security/tools/policytool/i18n.sh Sat May 19 23:14:35 2018 -0700 @@ -49,7 +49,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1299,8 +1323,8 @@ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/tools/common/CommonSetup.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/sun/tools/common/CommonSetup.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/sun/tools/common/CommonSetup.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/sun/tools/common/CommonSetup.sh Sat May 19 23:14:35 2018 -0700 @@ -47,6 +47,7 @@ # isLinux - true if OS is Linux # isSolaris - true if OS is Solaris @@ -1328,8 +1352,8 @@ Darwin ) OS="Mac OS X" isMacos=true ---- ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh Sat May 19 23:14:35 2018 -0700 @@ -54,7 +54,7 @@ OS=`uname -s` @@ -1339,8 +1363,8 @@ PATHSEP=":" ;; ---- ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh Sat May 19 23:14:35 2018 -0700 @@ -56,7 +56,7 @@ OS=`uname -s` @@ -1350,8 +1374,8 @@ PATHSEP=":" ;; ---- ./jdk/test/tools/launcher/ExecutionEnvironment.java Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/tools/launcher/ExecutionEnvironment.java Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/tools/launcher/ExecutionEnvironment.java Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/tools/launcher/ExecutionEnvironment.java Sat May 19 23:14:35 2018 -0700 @@ -194,7 +194,7 @@ Map env = new HashMap<>(); @@ -1361,8 +1385,8 @@ for (String x : LD_PATH_STRINGS) { String pairs[] = x.split("="); env.put(pairs[0], pairs[1]); ---- ./jdk/test/tools/launcher/RunpathTest.java Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/tools/launcher/RunpathTest.java Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/tools/launcher/RunpathTest.java Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/tools/launcher/RunpathTest.java Sat May 19 23:14:35 2018 -0700 @@ -69,7 +69,7 @@ } @@ -1372,8 +1396,8 @@ RunpathTest rp = new RunpathTest(); rp.testRpath(); } ---- ./jdk/test/tools/launcher/Test7029048.java Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/tools/launcher/Test7029048.java Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/tools/launcher/Test7029048.java Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/tools/launcher/Test7029048.java Sat May 19 23:14:35 2018 -0700 @@ -223,7 +223,7 @@ } else if (isSolaris && passes < 9) { throw new Exception("Test7029048: FAIL: " + @@ -1383,8 +1407,8 @@ throw new Exception("Test7029048: FAIL: " + "all tests did not run, expected " + 6 + " got " + passes); } else { ---- ./jdk/test/tools/launcher/TestHelper.java Fri Dec 15 09:05:18 2017 -0800 -+++ ./jdk/test/tools/launcher/TestHelper.java Fri Feb 02 18:25:39 2018 -0800 +--- ./jdk/test/tools/launcher/TestHelper.java Mon Mar 19 12:06:18 2018 -0700 ++++ ./jdk/test/tools/launcher/TestHelper.java Sat May 19 23:14:35 2018 -0700 @@ -94,6 +94,8 @@ System.getProperty("os.name", "unknown").startsWith("Linux"); static final boolean isAIX = @@ -1394,8 +1418,8 @@ static final String LIBJVM = isWindows ? "jvm.dll" : "libjvm" + (isMacOSX ? ".dylib" : ".so"); ---- ./langtools/test/Makefile Fri Dec 15 09:20:16 2017 -0800 -+++ ./langtools/test/Makefile Thu Jan 25 22:36:17 2018 -0800 +--- ./langtools/test/Makefile Mon Mar 19 12:09:33 2018 -0700 ++++ ./langtools/test/Makefile Sat May 19 22:20:16 2018 -0700 @@ -34,6 +34,14 @@ ARCH=i586 endif @@ -1411,8 +1435,8 @@ ifeq ($(OSNAME), Darwin) PLATFORM = bsd ARCH = $(shell uname -m) ---- ./langtools/test/tools/javah/ReadOldClass.sh Fri Dec 15 09:20:16 2017 -0800 -+++ ./langtools/test/tools/javah/ReadOldClass.sh Thu Jan 25 22:36:17 2018 -0800 +--- ./langtools/test/tools/javah/ReadOldClass.sh Mon Mar 19 12:09:33 2018 -0700 ++++ ./langtools/test/tools/javah/ReadOldClass.sh Sat May 19 22:20:16 2018 -0700 @@ -43,7 +43,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1422,8 +1446,8 @@ PS=":" FS="/" ;; ---- ./nashorn/test/script/jfx.js Fri Dec 15 09:23:48 2017 -0800 -+++ ./nashorn/test/script/jfx.js Thu Jan 25 22:36:19 2018 -0800 +--- ./nashorn/test/script/jfx.js Mon Mar 19 12:10:22 2018 -0700 ++++ ./nashorn/test/script/jfx.js Sat May 19 22:20:19 2018 -0700 @@ -93,6 +93,8 @@ f2 = new File(sb.append(fsep + "linux.png").toString()); } else if (OSInfo.getOSType() == OSType.MACOSX) { diff --git a/java/openjdk8/files/patch-hotspot_src_share_vm_interpreter_bytecodeInterpreter.cpp b/java/openjdk8/files/patch-hotspot_src_share_vm_interpreter_bytecodeInterpreter.cpp deleted file mode 100644 index a6bfa31d5dd0..000000000000 --- a/java/openjdk8/files/patch-hotspot_src_share_vm_interpreter_bytecodeInterpreter.cpp +++ /dev/null @@ -1,50 +0,0 @@ ---- hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp.orig -+++ hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp -@@ -2569,13 +2569,35 @@ run: - - // this could definitely be cleaned up QQQ - Method* callee; -- Klass* iclass = cache->f1_as_klass(); -- // InstanceKlass* interface = (InstanceKlass*) iclass; -+ Method *interface_method = cache->f2_as_interface_method(); -+ InstanceKlass* iclass = interface_method->method_holder(); -+ - // get receiver - int parms = cache->parameter_size(); - oop rcvr = STACK_OBJECT(-parms); - CHECK_NULL(rcvr); - InstanceKlass* int2 = (InstanceKlass*) rcvr->klass(); -+ -+ // Receiver subtype check against resolved interface klass (REFC). -+ { -+ Klass* refc = cache->f1_as_klass(); -+ itableOffsetEntry* scan; -+ for (scan = (itableOffsetEntry*) int2->start_of_itable(); -+ scan->interface_klass() != NULL; -+ scan++) { -+ if (scan->interface_klass() == refc) { -+ break; -+ } -+ } -+ // Check that the entry is non-null. A null entry means -+ // that the receiver class doesn't implement the -+ // interface, and wasn't the same as when the caller was -+ // compiled. -+ if (scan->interface_klass() == NULL) { -+ VM_JAVA_ERROR(vmSymbols::java_lang_IncompatibleClassChangeError(), "", note_no_trap); -+ } -+ } -+ - itableOffsetEntry* ki = (itableOffsetEntry*) int2->start_of_itable(); - int i; - for ( i = 0 ; i < int2->itable_length() ; i++, ki++ ) { -@@ -2587,7 +2609,8 @@ run: - if (i == int2->itable_length()) { - VM_JAVA_ERROR(vmSymbols::java_lang_IncompatibleClassChangeError(), "", note_no_trap); - } -- int mindex = cache->f2_as_index(); -+ int mindex = interface_method->itable_index(); -+ - itableMethodEntry* im = ki->first_method_entry(rcvr->klass()); - callee = im[mindex].method(); - if (callee == NULL) { diff --git a/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk b/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk index b62ab2248051..e7d8afbd424f 100644 --- a/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk +++ b/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk @@ -1,17 +1,15 @@ ---- jdk/make/lib/ServiceabilityLibraries.gmk.orig 2015-07-18 14:43:00.000000000 -0700 -+++ jdk/make/lib/ServiceabilityLibraries.gmk 2015-07-18 14:44:25.000000000 -0700 -@@ -247,15 +247,17 @@ +--- jdk/make/lib/ServiceabilityLibraries.gmk.orig 2018-05-20 12:20:24.536007000 -0700 ++++ jdk/make/lib/ServiceabilityLibraries.gmk 2018-05-20 12:22:29.309856000 -0700 +@@ -247,7 +247,7 @@ endif ifeq ($(OPENJDK_TARGET_OS), bsd) +- LIBINSTRUMENT_LDFLAGS_SUFFIX += -L$(PACKAGE_PATH)/lib -liconv $(LIBZ) + LIBINSTRUMENT_LDFLAGS_SUFFIX += %%ICONV_LDFLAGS%% $(LIBZ) ifeq ($(BSD_STATIC_LIBJLI), bsd) LIBINSTRUMENT_LDFLAGS += -Xlinker --whole-archive $(JDK_OUTPUTDIR)/objs/libjli_static.a \ -- -Xlinker --no-whole-archive -+ -Xlinker --no-whole-archive - else - LIBINSTRUMENT_LDFLAGS += $(call SET_SHARED_LIBRARY_ORIGIN,/jli) -+ LIBINSTRUMENT_LDFLAGS_SUFFIX += -L$(INSTALL_LIBRARIES_HERE)/jli -ljli + -Xlinker --no-whole-archive +@@ -257,7 +257,7 @@ endif BSD_ICONV_CFLAGS:= -I$(PACKAGE_PATH)/include ifneq ($(OPENJDK_TARGET_OS_VENDOR), openbsd) @@ -20,11 +18,3 @@ endif endif -@@ -283,7 +284,6 @@ - LDFLAGS_SUFFIX_solaris := $(LIBZ) -L $(INSTALL_LIBRARIES_HERE)/jli -ljli $(LIBDL) -lc, \ - LDFLAGS_SUFFIX_linux := $(LIBZ) -L $(INSTALL_LIBRARIES_HERE)/jli -ljli $(LIBDL), \ - LDFLAGS_SUFFIX_aix := $(LIBZ) -L$(JDK_OUTPUTDIR)/objs -ljli_static $(LIBDL),\ -- LDFLAGS_SUFFIX_bsd := -L$(PACKAGE_PATH)/lib -liconv $(LIBZ), \ - VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ - RC_FLAGS := $(RC_FLAGS) \ - -D "JDK_FNAME=instrument.dll" \ diff --git a/lang/Makefile b/lang/Makefile index 2a8eca36cb31..81144022febf 100644 --- a/lang/Makefile +++ b/lang/Makefile @@ -344,6 +344,7 @@ SUBDIR += spidermonkey185 SUBDIR += spidermonkey24 SUBDIR += spidermonkey38 + SUBDIR += spidermonkey52 SUBDIR += spl SUBDIR += squeak SUBDIR += squirrel diff --git a/lang/gcc-ecj45/Makefile b/lang/gcc-ecj45/Makefile index b4f594d7303e..21b0a1cbde1c 100644 --- a/lang/gcc-ecj45/Makefile +++ b/lang/gcc-ecj45/Makefile @@ -6,13 +6,16 @@ PORTVERSION= 4.5 CATEGORIES= lang java MASTER_SITES= SOURCEWARE/java/ DISTNAME= ecj-${PORTVERSION}.jar -EXTRACT_SUFX= -EXTRACT_ONLY= +EXTRACT_SUFX= # empty +EXTRACT_ONLY= # empty MAINTAINER= gerald@FreeBSD.org COMMENT= Eclipse Java Compiler used to build GCC Java +LICENSE= EPL + NO_BUILD= yes +NO_ARCH= yes PLIST_FILES= share/java/${DISTNAME} do-install: diff --git a/lang/gcc6-devel/Makefile b/lang/gcc6-devel/Makefile index 4967d92ca1b2..4cf3a351b979 100644 --- a/lang/gcc6-devel/Makefile +++ b/lang/gcc6-devel/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= gcc -PORTVERSION= 6.4.1.s20180509 -PORTREVISION= 1 +PORTVERSION= 6.4.1.s20180516 CATEGORIES= lang java MASTER_SITES= GCC/snapshots/${DIST_VERSION} PKGNAMESUFFIX= ${SUFFIX}-devel diff --git a/lang/gcc6-devel/distinfo b/lang/gcc6-devel/distinfo index 350cd18a2b2c..f49542f13f2e 100644 --- a/lang/gcc6-devel/distinfo +++ b/lang/gcc6-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1525929000 -SHA256 (gcc-6-20180509.tar.xz) = 9bce0a94d7eeb0922ff4201ad51e45d30dd012b380f608822862f22fc48f289d -SIZE (gcc-6-20180509.tar.xz) = 72653172 +TIMESTAMP = 1526809852 +SHA256 (gcc-6-20180516.tar.xz) = fd5ca24c672554ab0d8dafd2b9319099d170509e432121992290232c079f8244 +SIZE (gcc-6-20180516.tar.xz) = 72660356 diff --git a/lang/gcc6/Makefile b/lang/gcc6/Makefile index a6e09342d329..629613c994bb 100644 --- a/lang/gcc6/Makefile +++ b/lang/gcc6/Makefile @@ -5,7 +5,7 @@ PORTNAME= gcc PORTVERSION= 6.4.0 PORTREVISION= 7 CATEGORIES= lang java -MASTER_SITES= GCC/releases/gcc-${DISTVERSION} +MASTER_SITES= GCC PKGNAMESUFFIX= ${SUFFIX} MAINTAINER= gerald@FreeBSD.org diff --git a/lang/gcc7-devel/Makefile b/lang/gcc7-devel/Makefile index 193188e1d289..d5113c590d9a 100644 --- a/lang/gcc7-devel/Makefile +++ b/lang/gcc7-devel/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= gcc -PORTVERSION= 7.3.1.s20180503 -PORTREVISION= 1 +PORTVERSION= 7.3.1.s20180517 CATEGORIES= lang MASTER_SITES= GCC/snapshots/${DIST_VERSION} PKGNAMESUFFIX= ${SUFFIX}-devel diff --git a/lang/gcc7-devel/distinfo b/lang/gcc7-devel/distinfo index 7440a2e92f87..26e9ee707b2a 100644 --- a/lang/gcc7-devel/distinfo +++ b/lang/gcc7-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1526126594 -SHA256 (gcc-7-20180503.tar.xz) = 2c7c10ee96986e919c29ffa5475b305945d80ee8ee39b3ddf9232de06607ffd1 -SIZE (gcc-7-20180503.tar.xz) = 59247136 +TIMESTAMP = 1526811906 +SHA256 (gcc-7-20180517.tar.xz) = 78acc1dbad063ca5b42887b993de25bda208f1ebde20c1475d6c008de14bb067 +SIZE (gcc-7-20180517.tar.xz) = 59251804 diff --git a/lang/gcc8-devel/Makefile b/lang/gcc8-devel/Makefile index d9f558974f2a..26588e2004d7 100644 --- a/lang/gcc8-devel/Makefile +++ b/lang/gcc8-devel/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= gcc -PORTVERSION= 8.1.1.s20180511 -PORTREVISION= 1 +PORTVERSION= 8.1.1.s20180518 CATEGORIES= lang MASTER_SITES= GCC/snapshots/${DIST_VERSION} PKGNAMESUFFIX= ${SUFFIX}-devel diff --git a/lang/gcc8-devel/distinfo b/lang/gcc8-devel/distinfo index 0d9c3c1ad647..c830e9551435 100644 --- a/lang/gcc8-devel/distinfo +++ b/lang/gcc8-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1526149298 -SHA256 (gcc-8-20180511.tar.xz) = a6bbccb257d46460ed93ba9fb350a5ba92a0fd888578aa52e8956f08a8d8e274 -SIZE (gcc-8-20180511.tar.xz) = 61609564 +TIMESTAMP = 1526811922 +SHA256 (gcc-8-20180518.tar.xz) = f02e8f919de390afef0afffd5ea573b42e21175c5a9bd36727f3298f8e7ce430 +SIZE (gcc-8-20180518.tar.xz) = 61619528 diff --git a/lang/gcc9-devel/Makefile b/lang/gcc9-devel/Makefile index 9875aa5b2f7b..c2633bfede3e 100644 --- a/lang/gcc9-devel/Makefile +++ b/lang/gcc9-devel/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= gcc -PORTVERSION= 9.0.0.s20180506 -PORTREVISION= 1 +PORTVERSION= 9.0.0.s20180513 CATEGORIES= lang MASTER_SITES= GCC/snapshots/${DIST_VERSION} PKGNAMESUFFIX= ${SUFFIX}-devel diff --git a/lang/gcc9-devel/distinfo b/lang/gcc9-devel/distinfo index 2092b5089a65..9c0fb65023d5 100644 --- a/lang/gcc9-devel/distinfo +++ b/lang/gcc9-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1525929605 -SHA256 (gcc-9-20180506.tar.xz) = dde70aaeb5569e422245051e4d3975e8dcc5a5ea8d0ee6f742dad4021908a7b6 -SIZE (gcc-9-20180506.tar.xz) = 61633092 +TIMESTAMP = 1526355837 +SHA256 (gcc-9-20180513.tar.xz) = 3b297fd353637ce8af796f5ff00e504dda01cb8971062c2d33c599a3fe8c9c45 +SIZE (gcc-9-20180513.tar.xz) = 61689192 diff --git a/lang/pure/Makefile b/lang/pure/Makefile index 24e98bdea3fa..1a3f526862f7 100644 --- a/lang/pure/Makefile +++ b/lang/pure/Makefile @@ -21,12 +21,13 @@ LIB_DEPENDS= libgmp.so:math/gmp \ SUB_FILES= pkg-message -USES= gmake iconv pathfix pkgconfig +USES= gmake iconv libedit pathfix pkgconfig GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-libgmp-prefix=${LOCALBASE} --enable-release \ --with-pcre \ --with-tool-prefix=${LOCALBASE}/llvm${LLVM_VERSION}/bin EXTRACT_AFTER_ARGS=--no-same-owner --no-same-permissions --exclude texmacs +TEST_TARGET= check # XXX: some tests fail USE_LDCONFIG= yes PORTDOCS= * @@ -65,9 +66,6 @@ post-patch: -e 's,"+interp.libdir+"docs,${DOCSDIR},g' \ ${WRKSRC}/lexer.cc -test check regression-test: build - ${GMAKE} -C ${WRKSRC} check - .include .if ${PORT_OPTIONS:MDOCS} @@ -93,23 +91,22 @@ CONFIGURE_ARGS+=ac_cv_lib_iconv_libiconv=no ac_cv_lib_iconv_iconv=no post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/pure \ ${STAGEDIR}${PREFIX}/lib/libpure.so.*.* -.if ${PORT_OPTIONS:METC} + +post-install-ETC-on: @${MKDIR} ${STAGEDIR}${DATADIR}/etc/ @(cd ${WRKSRC} && ${RM} etc/*.in && ${COPYTREE_SHARE} etc/ ${STAGEDIR}${DATADIR}) -.endif -.if ${PORT_OPTIONS:MDOCS} + +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${TAR} -C ${STAGEDIR}${DOCSDIR} --strip-components 1 \ --exclude Makefile --exclude '*.tm' \ ${EXTRACT_AFTER_ARGS} \ -xpf ${_DISTDIR}${_DISTFILES:M*-docs*} ${FIND} ${STAGEDIR}${DOCSDIR} -type f | ${XARGS} ${CHMOD} ${SHAREMODE} -.endif -.if ${PORT_OPTIONS:MEXAMPLES} +post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} @(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) -.endif .include diff --git a/lang/spidermonkey52/Makefile b/lang/spidermonkey52/Makefile new file mode 100644 index 000000000000..3c54d780e2ce --- /dev/null +++ b/lang/spidermonkey52/Makefile @@ -0,0 +1,91 @@ +# Created by: Kubilay Kocak +# $FreeBSD$ + +PORTNAME= spidermonkey +PORTVERSION= 52.8.0 +PORTREVISION= 0 +CATEGORIES= lang +MASTER_SITES= MOZILLA/firefox/releases/${PORTVERSION}esr/source +DISTNAME= firefox-${PORTVERSION}esr.source +PKGNAMESUFFIX= ${SP_VER} + +MAINTAINER= kwm@FreeBSD.org +COMMENT= Standalone JavaScript based from Mozilla 52-esr + +BUILD_DEPENDS= autoconf-2.13:devel/autoconf213 +LIB_DEPENDS= libnspr4.so:devel/nspr \ + libffi.so:devel/libffi \ + libicudata.so:devel/icu + +HAS_CONFIGURE= yes +USES= compiler:c++14-lang gmake localbase pathfix pkgconfig \ + python:2.7,build tar:xz +# python:2.7,build readline tar:xz +USE_LDCONFIG= yes +SP_VER= 52 + +WRKSRC= ${WRKDIR}/firefox-${PORTVERSION}esr/js/src +PATCH_WRKSRC= ${WRKDIR}/firefox-${PORTVERSION}esr/ + +CONFIGURE_ARGS= --with-pthreads \ + --target=${CONFIGURE_TARGET} \ + --with-intl-api \ + --with-system-zlib \ + --disable-gold \ + --with-system-icu \ + --with-system-nspr + +OPTIONS_DEFINE= DEBUG GCZEAL JEMALLOC OPTIMIZE READLINE UTF8 DTRACE +OPTIONS_DEFAULT=METHODJIT OPTIMIZE READLINE +OPTIONS_SUB= yes + +DEBUG_CONFIGURE_ENABLE= debug debug-symbols +DEBUG_CONFIGURE_DISABLE=debug + +DTRACE_CONFIGURE_ENABLE=dtrace profiling +DTRACE_LIBS= -lelf + +GCZEAL_DESC= Enable Zealous garbage collecting +GCZEAL_CONFIGURE_ENABLE=gczeal + +JEMALLOC_DESC= Use jemalloc as memory allocator +JEMALLOC_CONFIGURE_ENABLE= jemalloc + +OPTIMIZE_DESC= Enable compiler optimizations +OPTIMIZE_CONFIGURE_ENABLE= optimize + +READLINE_DESC= Link js shell to the readline library +READLINE_USES= readline +READLINE_CONFIGURE_ENABLE= readline + +UTF8_DESC= Treat strings as UTF8 instead of ISO-8859-1 +UTF8_CFLAGS= -DJS_C_STRINGS_ARE_UTF8 + +.include + +.if ${ARCH} == amd64 +CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL} +.endif + +post-patch: +# Skip some tests because bundled icu differs from system + @${RM} ${WRKSRC}/tests/test262/intl402/ch10/10.2/10.2.3_b.js \ + ${WRKSRC}/tests/Intl/DateTimeFormat/format.js \ + ${WRKSRC}/tests/ecma_6/String/normalize-generateddata-part1-not-listed.js +pre-configure: + cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf-2.13 + +regression-test: build + @${ECHO_MSG} -n "===> Running jstests.py: " + @cd ${WRKSRC} && ${SETENV} TZ=PST8PDT ${PYTHON_CMD} tests/jstests.py \ + -d -s --no-progress ./js/src/shell/js + +post-install: + ${RM} ${STAGEDIR}${PREFIX}/lib/libjs_static.ajs + ${LN} -fs libmozjs-${SP_VER}.so ${STAGEDIR}${PREFIX}/lib/libmozjs-${SP_VER}.so.1 +.if ! ${PORT_OPTIONS:MDTRACE} + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/js${SP_VER} + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libmozjs-${SP_VER}.* +.endif + +.include diff --git a/lang/spidermonkey52/distinfo b/lang/spidermonkey52/distinfo new file mode 100644 index 000000000000..f142a960ed93 --- /dev/null +++ b/lang/spidermonkey52/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1525963979 +SHA256 (firefox-52.8.0esr.source.tar.xz) = babed4fe0ae95783e39358aedf7111b20fd9442f73b3b41b025fa4951fe76287 +SIZE (firefox-52.8.0esr.source.tar.xz) = 214054520 diff --git a/lang/spidermonkey52/files/patch-1426865 b/lang/spidermonkey52/files/patch-1426865 new file mode 100644 index 000000000000..7b922ff70fca --- /dev/null +++ b/lang/spidermonkey52/files/patch-1426865 @@ -0,0 +1,23 @@ +Proposed workaround/fix for: +https://bugzilla.mozilla.org/show_bug.cgi?id=1426865 + +diff --git a/js/public/TypeDecls.h b/js/public/TypeDecls.h +index acb93f9..cbd4b04 100644 +--- js/public/TypeDecls.h ++++ js/public/TypeDecls.h +@@ -22,6 +22,8 @@ + + #include "js-config.h" + ++#pragma GCC visibility push(default) ++ + struct JSContext; + class JSFunction; + class JSObject; +@@ -76,4 +78,6 @@ typedef PersistentRooted PersistentRootedValue; + + } // namespace JS + ++#pragma GCC visibility pop ++ + #endif /* js_TypeDecls_h */ diff --git a/lang/spidermonkey52/files/patch-disable-mozglue b/lang/spidermonkey52/files/patch-disable-mozglue new file mode 100644 index 000000000000..66a1d3fd8df6 --- /dev/null +++ b/lang/spidermonkey52/files/patch-disable-mozglue @@ -0,0 +1,62 @@ +From 1dd00ba521afd812ba42d94be8772603d3590b43 Mon Sep 17 00:00:00 2001 +From: Till Schneidereit +Date: Thu, 1 Oct 2015 12:59:09 +0200 +Subject: [PATCH] Disable MOZ_GLUE_IN_PROGRAM in stand-alone builds on all + platforms + +Otherwise, build fails not being able to find HashBytes. + +Patch ported forward to mozjs52 by Philip Chimento +. + +https://bugzilla.mozilla.org/show_bug.cgi?id=1176787 +--- + +diff --git a/js/src/old-configure.in b/js/src/old-configure.in +index 1c5c9e214..ff0617e31 100644 +--- js/src/old-configure.in ++++ js/src/old-configure.in +@@ -1623,16 +1623,21 @@ dnl ======================================================== + dnl = Enable jemalloc + dnl ======================================================== + +-case "${OS_TARGET}" in +-Android|WINNT|Darwin) ++dnl In stand-alone builds we always only want to link executables against mozglue. ++if test "$JS_STANDALONE"; then + MOZ_GLUE_IN_PROGRAM= +- ;; +-*) +- dnl On !Android !Windows !OSX, we only want to link executables against mozglue +- MOZ_GLUE_IN_PROGRAM=1 +- AC_DEFINE(MOZ_GLUE_IN_PROGRAM) +- ;; +-esac ++else ++ case "${OS_TARGET}" in ++ Android|WINNT|Darwin) ++ MOZ_GLUE_IN_PROGRAM= ++ ;; ++ *) ++ dnl On !Android !Windows !OSX, we only want to link executables against mozglue ++ MOZ_GLUE_IN_PROGRAM=1 ++ AC_DEFINE(MOZ_GLUE_IN_PROGRAM) ++ ;; ++ esac ++fi + + if test "$MOZ_MEMORY"; then + if test "x$MOZ_DEBUG" = "x1"; then +diff --git a/mozglue/build/moz.build b/mozglue/build/moz.build +index d28974778..e3be5a2b9 100644 +--- mozglue/build/moz.build ++++ mozglue/build/moz.build +@@ -6,7 +6,7 @@ + + # Build mozglue as a shared lib on Windows, OSX and Android. + # If this is ever changed, update MOZ_SHARED_MOZGLUE in browser/installer/Makefile.in +-if CONFIG['OS_TARGET'] in ('WINNT', 'Darwin', 'Android'): ++if CONFIG['OS_TARGET'] in ('WINNT', 'Darwin', 'Android') and not CONFIG['JS_STANDALONE']: + SharedLibrary('mozglue') + else: + Library('mozglue') diff --git a/lang/spidermonkey52/pkg-descr b/lang/spidermonkey52/pkg-descr new file mode 100644 index 000000000000..2db0b2ca559f --- /dev/null +++ b/lang/spidermonkey52/pkg-descr @@ -0,0 +1,3 @@ +Spidermonkey is the JavaScript interpreter from the Mozilla project. + +WWW: https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey diff --git a/lang/spidermonkey52/pkg-plist b/lang/spidermonkey52/pkg-plist new file mode 100644 index 000000000000..322a6215686f --- /dev/null +++ b/lang/spidermonkey52/pkg-plist @@ -0,0 +1,161 @@ +bin/js52 +bin/js52-config +include/mozjs-52/fdlibm.h +%%JEMALLOC%%include/mozjs-52/jemalloc_types.h +include/mozjs-52/js-config.h +include/mozjs-52/js.msg +include/mozjs-52/js/CallArgs.h +include/mozjs-52/js/CallNonGenericMethod.h +include/mozjs-52/js/CharacterEncoding.h +include/mozjs-52/js/Class.h +include/mozjs-52/js/Conversions.h +include/mozjs-52/js/Date.h +include/mozjs-52/js/Debug.h +include/mozjs-52/js/GCAPI.h +include/mozjs-52/js/GCAnnotations.h +include/mozjs-52/js/GCHashTable.h +include/mozjs-52/js/GCPolicyAPI.h +include/mozjs-52/js/GCVariant.h +include/mozjs-52/js/GCVector.h +include/mozjs-52/js/HashTable.h +include/mozjs-52/js/HeapAPI.h +include/mozjs-52/js/Id.h +include/mozjs-52/js/Initialization.h +include/mozjs-52/js/LegacyIntTypes.h +include/mozjs-52/js/MemoryMetrics.h +include/mozjs-52/js/Principals.h +include/mozjs-52/js/ProfilingFrameIterator.h +include/mozjs-52/js/ProfilingStack.h +include/mozjs-52/js/Proxy.h +include/mozjs-52/js/Realm.h +include/mozjs-52/js/RequiredDefines.h +include/mozjs-52/js/RootingAPI.h +include/mozjs-52/js/SliceBudget.h +include/mozjs-52/js/StructuredClone.h +include/mozjs-52/js/SweepingAPI.h +include/mozjs-52/js/TraceKind.h +include/mozjs-52/js/TracingAPI.h +include/mozjs-52/js/TrackedOptimizationInfo.h +include/mozjs-52/js/TypeDecls.h +include/mozjs-52/js/UbiNode.h +include/mozjs-52/js/UbiNodeBreadthFirst.h +include/mozjs-52/js/UbiNodeCensus.h +include/mozjs-52/js/UbiNodeDominatorTree.h +include/mozjs-52/js/UbiNodePostOrder.h +include/mozjs-52/js/UbiNodeShortestPaths.h +include/mozjs-52/js/UniquePtr.h +include/mozjs-52/js/Utility.h +include/mozjs-52/js/Value.h +include/mozjs-52/js/Vector.h +include/mozjs-52/js/WeakMapPtr.h +include/mozjs-52/jsalloc.h +include/mozjs-52/jsapi.h +include/mozjs-52/jsbytecode.h +include/mozjs-52/jsclist.h +include/mozjs-52/jscpucfg.h +include/mozjs-52/jsfriendapi.h +include/mozjs-52/jsperf.h +include/mozjs-52/jsprf.h +include/mozjs-52/jsprototypes.h +include/mozjs-52/jspubtd.h +include/mozjs-52/jstypes.h +include/mozjs-52/jsversion.h +include/mozjs-52/jswrapper.h +include/mozjs-52/mozilla/Alignment.h +include/mozjs-52/mozilla/AllocPolicy.h +include/mozjs-52/mozilla/AlreadyAddRefed.h +include/mozjs-52/mozilla/Array.h +include/mozjs-52/mozilla/ArrayUtils.h +include/mozjs-52/mozilla/Assertions.h +include/mozjs-52/mozilla/Atomics.h +include/mozjs-52/mozilla/Attributes.h +include/mozjs-52/mozilla/BinarySearch.h +include/mozjs-52/mozilla/BloomFilter.h +include/mozjs-52/mozilla/BufferList.h +include/mozjs-52/mozilla/Casting.h +include/mozjs-52/mozilla/ChaosMode.h +include/mozjs-52/mozilla/Char16.h +include/mozjs-52/mozilla/CheckedInt.h +include/mozjs-52/mozilla/Compiler.h +include/mozjs-52/mozilla/Compression.h +include/mozjs-52/mozilla/DebugOnly.h +include/mozjs-52/mozilla/Decimal.h +include/mozjs-52/mozilla/EndianUtils.h +include/mozjs-52/mozilla/EnumSet.h +include/mozjs-52/mozilla/EnumTypeTraits.h +include/mozjs-52/mozilla/EnumeratedArray.h +include/mozjs-52/mozilla/EnumeratedRange.h +include/mozjs-52/mozilla/FastBernoulliTrial.h +include/mozjs-52/mozilla/FloatingPoint.h +include/mozjs-52/mozilla/Function.h +include/mozjs-52/mozilla/GuardObjects.h +include/mozjs-52/mozilla/HashFunctions.h +include/mozjs-52/mozilla/IndexSequence.h +include/mozjs-52/mozilla/IntegerPrintfMacros.h +include/mozjs-52/mozilla/IntegerRange.h +include/mozjs-52/mozilla/IntegerTypeTraits.h +include/mozjs-52/mozilla/JSONWriter.h +include/mozjs-52/mozilla/Likely.h +include/mozjs-52/mozilla/LinkedList.h +include/mozjs-52/mozilla/MacroArgs.h +include/mozjs-52/mozilla/MacroForEach.h +include/mozjs-52/mozilla/MathAlgorithms.h +include/mozjs-52/mozilla/Maybe.h +include/mozjs-52/mozilla/MaybeOneOf.h +include/mozjs-52/mozilla/MemoryChecking.h +include/mozjs-52/mozilla/MemoryReporting.h +include/mozjs-52/mozilla/Move.h +include/mozjs-52/mozilla/NotNull.h +include/mozjs-52/mozilla/NullPtr.h +include/mozjs-52/mozilla/Opaque.h +include/mozjs-52/mozilla/OperatorNewExtensions.h +include/mozjs-52/mozilla/Pair.h +include/mozjs-52/mozilla/PodOperations.h +include/mozjs-52/mozilla/Poison.h +include/mozjs-52/mozilla/Range.h +include/mozjs-52/mozilla/RangedArray.h +include/mozjs-52/mozilla/RangedPtr.h +include/mozjs-52/mozilla/ReentrancyGuard.h +include/mozjs-52/mozilla/RefCountType.h +include/mozjs-52/mozilla/RefCounted.h +include/mozjs-52/mozilla/RefPtr.h +include/mozjs-52/mozilla/ReverseIterator.h +include/mozjs-52/mozilla/RollingMean.h +include/mozjs-52/mozilla/SHA1.h +include/mozjs-52/mozilla/Saturate.h +include/mozjs-52/mozilla/ScopeExit.h +include/mozjs-52/mozilla/Scoped.h +include/mozjs-52/mozilla/SegmentedVector.h +include/mozjs-52/mozilla/SizePrintfMacros.h +include/mozjs-52/mozilla/SplayTree.h +include/mozjs-52/mozilla/Sprintf.h +include/mozjs-52/mozilla/StackWalk.h +include/mozjs-52/mozilla/StaticAnalysisFunctions.h +include/mozjs-52/mozilla/TaggedAnonymousMemory.h +include/mozjs-52/mozilla/TemplateLib.h +include/mozjs-52/mozilla/TextUtils.h +include/mozjs-52/mozilla/ThreadLocal.h +include/mozjs-52/mozilla/TimeStamp.h +include/mozjs-52/mozilla/ToString.h +include/mozjs-52/mozilla/Tuple.h +include/mozjs-52/mozilla/TypeTraits.h +include/mozjs-52/mozilla/TypedEnumBits.h +include/mozjs-52/mozilla/Types.h +include/mozjs-52/mozilla/UniquePtr.h +include/mozjs-52/mozilla/UniquePtrExtensions.h +include/mozjs-52/mozilla/Unused.h +include/mozjs-52/mozilla/Variant.h +include/mozjs-52/mozilla/Vector.h +include/mozjs-52/mozilla/WeakPtr.h +include/mozjs-52/mozilla/XorShift128PlusRNG.h +include/mozjs-52/mozilla/double-conversion.h +include/mozjs-52/mozilla/fallible.h +include/mozjs-52/mozilla/mozalloc.h +include/mozjs-52/mozilla/mozalloc_abort.h +include/mozjs-52/mozilla/mozalloc_oom.h +include/mozjs-52/mozilla/utils.h +%%JEMALLOC%%include/mozjs-52/mozmemory.h +%%JEMALLOC%%include/mozjs-52/mozmemory_wrap.h +lib/libmozjs-52.so +lib/libmozjs-52.so.1 +libdata/pkgconfig/mozjs-52.pc diff --git a/mail/alpine/Makefile b/mail/alpine/Makefile index 93b60d9a23d1..5f7860e285fc 100644 --- a/mail/alpine/Makefile +++ b/mail/alpine/Makefile @@ -2,6 +2,7 @@ PORTNAME?= alpine DISTVERSION= 2.21.999 +PORTREVISION?= 1 CATEGORIES?= mail news ipv6 MASTER_SITES= http://repo.or.cz/alpine.git/snapshot/${GIT_COMMIT}${EXTRACT_SUFX}?dummy=/ @@ -33,7 +34,7 @@ GIT_COMMIT= 349642a84039a4b026513c32a3b4f8594acd50df GIT_COMMIT_SHORT= 349642a WRKSRC= ${WRKDIR}/alpine-${GIT_COMMIT_SHORT} -OPTIONS_DEFINE= ASPELL CONS25 DOCS IPV6 LDAP MOUSE NLS NTLM PASSFILE THREADS +OPTIONS_DEFINE= ASPELL CONS25 DOCS IPV6 LDAP MAILDIR MOUSE NLS NTLM PASSFILE THREADS OPTIONS_DEFAULT= ASPELL MOUSE THREADS .if defined(PICO_ALPINE_SLAVE) OPTIONS_EXCLUDE= CONS25 IPV6 LDAP PASSFILE @@ -60,6 +61,10 @@ LDAP_USE= openldap=yes LDAP_CONFIGURE_WITH= ldap LDAP_CONFIGURE_ON= --with-ldap-dir=${LOCALBASE} +# Option MAILDIR +MAILDIR_PATCH_SITES= http://alpine.x10host.com/alpine/patches/alpine-2.21/ +MAILDIR_PATCHFILES+= maildir.patch.gz:-p1 + # Option MOUSE MOUSE_CONFIGURE_ENABLE= mouse diff --git a/mail/alpine/distinfo b/mail/alpine/distinfo index f86b9e715290..c5f0a2df67fa 100644 --- a/mail/alpine/distinfo +++ b/mail/alpine/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1522166213 +TIMESTAMP = 1526818536 SHA256 (alpine-2.21.999.tar.gz) = d782b448fa3f08ae2430000c89c622781d04e8993724a93693091e3ca6a37be6 SIZE (alpine-2.21.999.tar.gz) = 14983514 +SHA256 (maildir.patch.gz) = 1229ea9ec4e150dda1d2da866730a777148874e4667c54cd2c488101b5db8099 +SIZE (maildir.patch.gz) = 33789 diff --git a/math/blis/Makefile b/math/blis/Makefile index 982d73c88695..ee599166e0dd 100644 --- a/math/blis/Makefile +++ b/math/blis/Makefile @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= blis -LIBVERSION= 0.2.2 -PORTVERSION= ${LIBVERSION}g20171127 +LIBVERSION= 0.3.2 +PORTVERSION= ${LIBVERSION}g20180501 CATEGORIES= math MAINTAINER= jmd@FreeBSD.org @@ -25,7 +25,7 @@ OPTIONS_SUB= yes USE_GITHUB= yes GH_ACCOUNT= flame -GH_TAGNAME= 1f30b13 +GH_TAGNAME= 8adb2f9 USES= gmake USE_LDCONFIG= yes diff --git a/math/blis/distinfo b/math/blis/distinfo index 585b1e01f96b..3622b7f6ead7 100644 --- a/math/blis/distinfo +++ b/math/blis/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1511836356 -SHA256 (flame-blis-0.2.2g20171127-1f30b13_GH0.tar.gz) = 20b861ad130a20a80dedd1418e8f3420026586218389b7195ccd8516835265a3 -SIZE (flame-blis-0.2.2g20171127-1f30b13_GH0.tar.gz) = 1314083 +TIMESTAMP = 1525659747 +SHA256 (flame-blis-0.3.2g20180501-8adb2f9_GH0.tar.gz) = 5d52094e1335f4e86c35ebc100b473d81fae0ac4d86b7f88385e8c7abaf4f7bb +SIZE (flame-blis-0.3.2g20180501-8adb2f9_GH0.tar.gz) = 1734699 diff --git a/math/blis/pkg-plist b/math/blis/pkg-plist index 73ae642c2be1..c2e5aee24dab 100644 --- a/math/blis/pkg-plist +++ b/math/blis/pkg-plist @@ -1,426 +1,4 @@ -include/blis/bla_amax.h -include/blis/bla_asum.h -include/blis/bla_axpy.h -include/blis/bla_c_abs.h -include/blis/bla_c_div.h -include/blis/bla_cabs1.h -include/blis/bla_copy.h -include/blis/bla_d_abs.h -include/blis/bla_d_cnjg.h -include/blis/bla_d_imag.h -include/blis/bla_d_sign.h -include/blis/bla_dot.h -include/blis/bla_f__cabs.h -include/blis/bla_gbmv.h -include/blis/bla_gemm.h -include/blis/bla_gemm_check.h -include/blis/bla_gemv.h -include/blis/bla_gemv_check.h -include/blis/bla_ger.h -include/blis/bla_ger_check.h -include/blis/bla_hbmv.h -include/blis/bla_hemm.h -include/blis/bla_hemm_check.h -include/blis/bla_hemv.h -include/blis/bla_hemv_check.h -include/blis/bla_her.h -include/blis/bla_her2.h -include/blis/bla_her2_check.h -include/blis/bla_her2k.h -include/blis/bla_her2k_check.h -include/blis/bla_her_check.h -include/blis/bla_herk.h -include/blis/bla_herk_check.h -include/blis/bla_hpmv.h -include/blis/bla_hpr.h -include/blis/bla_hpr2.h -include/blis/bla_lsame.h -include/blis/bla_nrm2.h -include/blis/bla_r_abs.h -include/blis/bla_r_cnjg.h -include/blis/bla_r_imag.h -include/blis/bla_r_sign.h -include/blis/bla_rot.h -include/blis/bla_rotg.h -include/blis/bla_rotm.h -include/blis/bla_rotmg.h -include/blis/bla_sbmv.h -include/blis/bla_scal.h -include/blis/bla_spmv.h -include/blis/bla_spr.h -include/blis/bla_spr2.h -include/blis/bla_swap.h -include/blis/bla_symm.h -include/blis/bla_symm_check.h -include/blis/bla_symv.h -include/blis/bla_symv_check.h -include/blis/bla_syr.h -include/blis/bla_syr2.h -include/blis/bla_syr2_check.h -include/blis/bla_syr2k.h -include/blis/bla_syr2k_check.h -include/blis/bla_syr_check.h -include/blis/bla_syrk.h -include/blis/bla_syrk_check.h -include/blis/bla_tbmv.h -include/blis/bla_tbsv.h -include/blis/bla_tpmv.h -include/blis/bla_tpsv.h -include/blis/bla_trmm.h -include/blis/bla_trmm_check.h -include/blis/bla_trmv.h -include/blis/bla_trmv_check.h -include/blis/bla_trsm.h -include/blis/bla_trsm_check.h -include/blis/bla_trsv.h -include/blis/bla_trsv_check.h -include/blis/bla_xerbla.h -include/blis/bla_z_abs.h -include/blis/bla_z_div.h -include/blis/bli_absq2ris.h -include/blis/bli_absq2s.h -include/blis/bli_abval2ris.h -include/blis/bli_abval2s.h -include/blis/bli_add3ris.h -include/blis/bli_add3s.h -include/blis/bli_addjris.h -include/blis/bli_addjs.h -include/blis/bli_addris.h -include/blis/bli_adds.h -include/blis/bli_adds_mxn.h -include/blis/bli_adds_mxn_uplo.h -include/blis/bli_arch.h -include/blis/bli_arch_config.h -include/blis/bli_arch_config_pre.h -include/blis/bli_auxinfo.h -include/blis/bli_axmyris.h -include/blis/bli_axmys.h -include/blis/bli_axpbyjris.h -include/blis/bli_axpbyjs.h -include/blis/bli_axpbyris.h -include/blis/bli_axpbys.h -include/blis/bli_axpyjris.h -include/blis/bli_axpyjs.h -include/blis/bli_axpyris.h -include/blis/bli_axpys.h -include/blis/bli_blas.h -include/blis/bli_blas_macro_defs.h -include/blis/bli_blksz.h -include/blis/bli_cast.h -include/blis/bli_cblas.h -include/blis/bli_check.h -include/blis/bli_clock.h -include/blis/bli_cntl.h -include/blis/bli_cntx.h -include/blis/bli_cntx_ind_stage.h -include/blis/bli_complex_macro_defs.h -include/blis/bli_config.h -include/blis/bli_config_macro_defs.h -include/blis/bli_conjris.h -include/blis/bli_conjs.h -include/blis/bli_const.h -include/blis/bli_constants.h -include/blis/bli_copy1es.h -include/blis/bli_copy1rs.h -include/blis/bli_copycjris.h -include/blis/bli_copycjs.h -include/blis/bli_copyj1es.h -include/blis/bli_copyj1rs.h -include/blis/bli_copyjri3s.h -include/blis/bli_copyjris.h -include/blis/bli_copyjs.h -include/blis/bli_copyri3s.h -include/blis/bli_copyris.h -include/blis/bli_copys.h -include/blis/bli_copys_mxn.h -include/blis/bli_copysc.h -include/blis/bli_cpuid.h -include/blis/bli_dlamch.h -include/blis/bli_dotjs.h -include/blis/bli_dots.h -include/blis/bli_eq.h -include/blis/bli_eqris.h -include/blis/bli_error.h -include/blis/bli_error_macro_defs.h -include/blis/bli_extern_defs.h -include/blis/bli_f2c.h -%%X8664%%include/blis/bli_family_bulldozer.h -%%X8664%%include/blis/bli_family_excavator.h -include/blis/bli_family_generic.h -%%X8664%%include/blis/bli_family_haswell.h -%%X8664%%include/blis/bli_family_penryn.h -%%X8664%%include/blis/bli_family_piledriver.h -%%X8664%%include/blis/bli_family_sandybridge.h -%%X8664%%include/blis/bli_family_steamroller.h -%%X8664%%include/blis/bli_family_x86_64.h -%%X8664%%include/blis/bli_family_zen.h -include/blis/bli_fprints.h -include/blis/bli_func.h -include/blis/bli_gemm.h -include/blis/bli_gemm_cntl.h -include/blis/bli_gemm_front.h -include/blis/bli_gemm_int.h -include/blis/bli_gemm_var.h -include/blis/bli_gemv.h -include/blis/bli_gemv_var.h -include/blis/bli_genarray_macro_defs.h -include/blis/bli_gentdef_macro_defs.h -include/blis/bli_gentfunc_macro_defs.h -include/blis/bli_gentprot_macro_defs.h -include/blis/bli_ger.h -include/blis/bli_ger_var.h -include/blis/bli_getopt.h -include/blis/bli_gets.h -include/blis/bli_gks.h -include/blis/bli_hemm.h -include/blis/bli_hemm_front.h -include/blis/bli_hemv.h -include/blis/bli_hemv_var.h -include/blis/bli_her.h -include/blis/bli_her2.h -include/blis/bli_her2_var.h -include/blis/bli_her2k.h -include/blis/bli_her2k_front.h -include/blis/bli_her_var.h -include/blis/bli_herk.h -include/blis/bli_herk_front.h -include/blis/bli_herk_var.h -include/blis/bli_ind.h -include/blis/bli_info.h -include/blis/bli_init.h -include/blis/bli_invert1es.h -include/blis/bli_invert1ms_mxn_diag.h -include/blis/bli_invert1rs.h -include/blis/bli_invertris.h -include/blis/bli_inverts.h -include/blis/bli_invscaljris.h -include/blis/bli_invscaljs.h -include/blis/bli_invscalris.h -include/blis/bli_invscals.h -include/blis/bli_kernel_macro_defs.h -%%X8664%%include/blis/bli_kernels_bulldozer.h -%%X8664%%include/blis/bli_kernels_haswell.h -%%X8664%%include/blis/bli_kernels_penryn.h -%%X8664%%include/blis/bli_kernels_piledriver.h -%%X8664%%include/blis/bli_kernels_sandybridge.h -include/blis/bli_l0.h -include/blis/bli_l0_check.h -include/blis/bli_l0_oapi.h -include/blis/bli_l0_tapi.h -include/blis/bli_l1d.h -include/blis/bli_l1d_check.h -include/blis/bli_l1d_oapi.h -include/blis/bli_l1d_tapi.h -include/blis/bli_l1f.h -include/blis/bli_l1f_check.h -include/blis/bli_l1f_ft.h -include/blis/bli_l1f_ker.h -include/blis/bli_l1f_ker_prot.h -include/blis/bli_l1f_oapi.h -include/blis/bli_l1f_tapi.h -include/blis/bli_l1m.h -include/blis/bli_l1m_check.h -include/blis/bli_l1m_ft.h -include/blis/bli_l1m_ker.h -include/blis/bli_l1m_ker_prot.h -include/blis/bli_l1m_oapi.h -include/blis/bli_l1m_tapi.h -include/blis/bli_l1m_unb_var1.h -include/blis/bli_l1m_voft.h -include/blis/bli_l1v.h -include/blis/bli_l1v_check.h -include/blis/bli_l1v_ft.h -include/blis/bli_l1v_ker.h -include/blis/bli_l1v_ker_prot.h -include/blis/bli_l1v_oapi.h -include/blis/bli_l1v_tapi.h -include/blis/bli_l2.h -include/blis/bli_l2_check.h -include/blis/bli_l2_ft.h -include/blis/bli_l2_oapi.h -include/blis/bli_l2_tapi.h -include/blis/bli_l3.h -include/blis/bli_l3_blocksize.h -include/blis/bli_l3_check.h -include/blis/bli_l3_cntl.h -include/blis/bli_l3_direct.h -include/blis/bli_l3_ft.h -include/blis/bli_l3_ind.h -include/blis/bli_l3_ind_oapi.h -include/blis/bli_l3_ind_opt.h -include/blis/bli_l3_ind_tapi.h -include/blis/bli_l3_ind_ukr.h -include/blis/bli_l3_oapi.h -include/blis/bli_l3_oft.h -include/blis/bli_l3_packm.h -include/blis/bli_l3_prune.h -include/blis/bli_l3_tapi.h -include/blis/bli_l3_thrinfo.h -include/blis/bli_l3_ukr.h -include/blis/bli_l3_ukr_oapi.h -include/blis/bli_l3_ukr_prot.h -include/blis/bli_l3_ukr_tapi.h -include/blis/bli_l3_var_oft.h -include/blis/bli_l3_voft.h -include/blis/bli_lsame.h -include/blis/bli_machval.h -include/blis/bli_macro_defs.h -include/blis/bli_malloc.h -include/blis/bli_mbool.h -include/blis/bli_mem.h -include/blis/bli_membrk.h -include/blis/bli_memsys.h -include/blis/bli_mutex.h -include/blis/bli_mutex_openmp.h -include/blis/bli_mutex_pthreads.h -include/blis/bli_mutex_single.h -include/blis/bli_neg2ris.h -include/blis/bli_neg2s.h -include/blis/bli_oapi_w_cntx.h -include/blis/bli_oapi_wo_cntx.h -include/blis/bli_obj.h -include/blis/bli_obj_check.h -include/blis/bli_obj_macro_defs.h -include/blis/bli_obj_scalar.h -include/blis/bli_opid.h -include/blis/bli_packm.h -include/blis/bli_packm_blk_var1.h -include/blis/bli_packm_check.h -include/blis/bli_packm_cntl.h -include/blis/bli_packm_cxk.h -include/blis/bli_packm_cxk_1er.h -include/blis/bli_packm_cxk_3mis.h -include/blis/bli_packm_cxk_4mi.h -include/blis/bli_packm_cxk_rih.h -include/blis/bli_packm_init.h -include/blis/bli_packm_int.h -include/blis/bli_packm_part.h -include/blis/bli_packm_struc_cxk.h -include/blis/bli_packm_struc_cxk_1er.h -include/blis/bli_packm_struc_cxk_3mis.h -include/blis/bli_packm_struc_cxk_4mi.h -include/blis/bli_packm_struc_cxk_rih.h -include/blis/bli_packm_thrinfo.h -include/blis/bli_packm_unb_var1.h -include/blis/bli_param_macro_defs.h -include/blis/bli_param_map.h -include/blis/bli_part.h -include/blis/bli_part_check.h -include/blis/bli_pool.h -include/blis/bli_prune.h -include/blis/bli_query.h -include/blis/bli_randnp2s.h -include/blis/bli_rands.h -include/blis/bli_scal1es.h -include/blis/bli_scal1ms_mxn.h -include/blis/bli_scal1rs.h -include/blis/bli_scal21es.h -include/blis/bli_scal21ms_mxn_diag.h -include/blis/bli_scal21ms_mxn_uplo.h -include/blis/bli_scal21rs.h -include/blis/bli_scal2ios.h -include/blis/bli_scal2j1es.h -include/blis/bli_scal2j1rs.h -include/blis/bli_scal2jios.h -include/blis/bli_scal2jri3s.h -include/blis/bli_scal2jris.h -include/blis/bli_scal2jros.h -include/blis/bli_scal2jrpis.h -include/blis/bli_scal2js.h -include/blis/bli_scal2ri3s.h -include/blis/bli_scal2rihs_mxn_diag.h -include/blis/bli_scal2rihs_mxn_uplo.h -include/blis/bli_scal2ris.h -include/blis/bli_scal2ros.h -include/blis/bli_scal2rpis.h -include/blis/bli_scal2s.h -include/blis/bli_scalar_macro_defs.h -include/blis/bli_scalcjris.h -include/blis/bli_scalcjs.h -include/blis/bli_scaljris.h -include/blis/bli_scaljs.h -include/blis/bli_scalm.h -include/blis/bli_scalm_cntl.h -include/blis/bli_scalris.h -include/blis/bli_scalris_mxn_uplo.h -include/blis/bli_scals.h -include/blis/bli_set0ris.h -include/blis/bli_set0s.h -include/blis/bli_set0s_mxn.h -include/blis/bli_set1ms_mxn.h -include/blis/bli_set1ms_mxn_diag.h -include/blis/bli_set1ms_mxn_uplo.h -include/blis/bli_set1s.h -include/blis/bli_seti01ms_mxn_diag.h -include/blis/bli_seti0s.h -include/blis/bli_setis.h -include/blis/bli_setrihs_mxn_diag.h -include/blis/bli_setrs.h -include/blis/bli_sets.h -include/blis/bli_slamch.h -include/blis/bli_sqrt2ris.h -include/blis/bli_sqrt2s.h -include/blis/bli_subjris.h -include/blis/bli_subjs.h -include/blis/bli_subris.h -include/blis/bli_subs.h -include/blis/bli_swapris.h -include/blis/bli_swaps.h -include/blis/bli_symm.h -include/blis/bli_symm_front.h -include/blis/bli_symv.h -include/blis/bli_syr.h -include/blis/bli_syr2.h -include/blis/bli_syr2k.h -include/blis/bli_syr2k_front.h -include/blis/bli_syrk.h -include/blis/bli_syrk_front.h -include/blis/bli_system.h -include/blis/bli_thrcomm.h -include/blis/bli_thrcomm_openmp.h -include/blis/bli_thrcomm_pthreads.h -include/blis/bli_thrcomm_single.h -include/blis/bli_thread.h -include/blis/bli_thrinfo.h -include/blis/bli_trmm.h -include/blis/bli_trmm3.h -include/blis/bli_trmm3_front.h -include/blis/bli_trmm_front.h -include/blis/bli_trmm_var.h -include/blis/bli_trmv.h -include/blis/bli_trmv_var.h -include/blis/bli_trsm.h -include/blis/bli_trsm_cntl.h -include/blis/bli_trsm_front.h -include/blis/bli_trsm_int.h -include/blis/bli_trsm_var.h -include/blis/bli_trsv.h -include/blis/bli_trsv_var.h -include/blis/bli_type_defs.h -include/blis/bli_unpackm.h -include/blis/bli_unpackm_blk_var1.h -include/blis/bli_unpackm_check.h -include/blis/bli_unpackm_cntl.h -include/blis/bli_unpackm_cxk.h -include/blis/bli_unpackm_int.h -include/blis/bli_unpackm_unb_var1.h -include/blis/bli_util.h -include/blis/bli_util_check.h -include/blis/bli_util_oapi.h -include/blis/bli_util_tapi.h -include/blis/bli_util_unb_var1.h -include/blis/bli_xpbyjris.h -include/blis/bli_xpbyjs.h -include/blis/bli_xpbyris.h -include/blis/bli_xpbys.h -include/blis/bli_xpbys_mxn.h -include/blis/bli_xpbys_mxn_uplo.h -%%CBLAS%%include/blis/blis.h -%%CBLAS%%include/blis/cblas.h -include/blis/cblas_f77.h -include/blis/f77_amax_sub.h -include/blis/f77_asum_sub.h -include/blis/f77_dot_sub.h -include/blis/f77_nrm2_sub.h +include/blis/blis.h +include/blis/cblas.h lib/libblis.a lib/libblis.so diff --git a/math/octave-forge-database/Makefile b/math/octave-forge-database/Makefile index 0fc0abef2557..330f901441da 100644 --- a/math/octave-forge-database/Makefile +++ b/math/octave-forge-database/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= octave-forge-database -PORTVERSION= 2.4.2 -PORTREVISION= 5 +PORTVERSION= 2.4.3 CATEGORIES= math MAINTAINER= stephen@FreeBSD.org @@ -14,8 +13,6 @@ LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING RUN_DEPENDS+= ${TARBALLS_DIR}/struct.tar.gz:math/octave-forge-struct -BROKEN= does not build with octave version 4.4.0 - # OCTSRC is the name of the directory of the package. # It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. OCTSRC= ${DISTNAME} @@ -32,7 +29,6 @@ post-build: cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} post-patch: - ${REINPLACE_CMD} 's#postgresql/##' ${WRKSRC}/* ${REINPLACE_CMD} 's#endian.h#sys/endian.h#' ${WRKSRC}/wrap_endian.h .include diff --git a/math/octave-forge-database/distinfo b/math/octave-forge-database/distinfo index bc2a34a51865..7b4964392cfd 100644 --- a/math/octave-forge-database/distinfo +++ b/math/octave-forge-database/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1475429748 -SHA256 (octave-forge/database-2.4.2.tar.gz) = 7e2ded9cd8e99acbb4772cc6e1f1010dd51ebe81af016aa8e34e1bff9bd90809 -SIZE (octave-forge/database-2.4.2.tar.gz) = 102538 +TIMESTAMP = 1526839926 +SHA256 (octave-forge/database-2.4.3.tar.gz) = db3f9a8142e3f28dcfcd9c537ec2e0562a6821499051f4c9be914850568c9c3c +SIZE (octave-forge/database-2.4.3.tar.gz) = 154995 diff --git a/math/octave-forge-octclip/Makefile b/math/octave-forge-octclip/Makefile index 4f7036a95009..5207909d5b9e 100644 --- a/math/octave-forge-octclip/Makefile +++ b/math/octave-forge-octclip/Makefile @@ -3,7 +3,7 @@ PORTNAME= octave-forge-octclip PORTVERSION= 1.0.8 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= math MAINTAINER= stephen@FreeBSD.org @@ -12,8 +12,6 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME} LICENSE= GPLv3 LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING -BROKEN= does not build with octave version >= 4.2.1 - # OCTSRC is the name of the directory of the package. # It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. OCTSRC= ${DISTNAME} diff --git a/math/octave-forge-octproj/Makefile b/math/octave-forge-octproj/Makefile index fb1c36a9851a..0c4d6ca9912c 100644 --- a/math/octave-forge-octproj/Makefile +++ b/math/octave-forge-octproj/Makefile @@ -3,7 +3,7 @@ PORTNAME= octave-forge-octproj PORTVERSION= 1.1.5 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= math MAINTAINER= stephen@FreeBSD.org @@ -12,8 +12,6 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME} LICENSE= GPLv3 LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING -BROKEN= does not build with octave version >= 4.2.1 - # OCTSRC is the name of the directory of the package. # It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. OCTSRC= ${DISTNAME} diff --git a/math/octave-forge-sparsersb/Makefile b/math/octave-forge-sparsersb/Makefile index 9e9b7dd0cd97..1dc2db0ef20b 100644 --- a/math/octave-forge-sparsersb/Makefile +++ b/math/octave-forge-sparsersb/Makefile @@ -12,6 +12,8 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME} LICENSE= GPLv3 LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING +BROKEN= does not build with octave version >= 4.4.0 + LIB_DEPENDS= librsb.so:math/librsb # OCTSRC is the name of the directory of the package. diff --git a/math/octave-forge-video/Makefile b/math/octave-forge-video/Makefile index 6a51f9bae6da..31f277d7e141 100644 --- a/math/octave-forge-video/Makefile +++ b/math/octave-forge-video/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING USES= pkgconfig GNU_CONFIGURE= yes CONFIGURE_ENV+= HOME=${WRKSRC} -CPPFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib # OCTSRC is the name of the directory of the package. diff --git a/math/octave-forge/Makefile b/math/octave-forge/Makefile index 442e73524f99..a296f4d07bf6 100644 --- a/math/octave-forge/Makefile +++ b/math/octave-forge/Makefile @@ -3,7 +3,7 @@ PORTNAME= octave-forge PORTVERSION= 20180409 -PORTREVISION= 8 +PORTREVISION= 10 CATEGORIES= math MAINTAINER= stephen@FreeBSD.org @@ -28,7 +28,7 @@ OPTIONS_DEFINE= ACTUARIAL AUDIO BENCHMARK BIM BIOINFO BSLTL CGI \ STRUCT SYMBAND SYMBOLIC TCL_OCTAVE TISEAN TSA VIDEO \ ZENITY ZEROMQ -OPTIONS_DEFAULT= ${OPTIONS_DEFINE:NOCTCLIP:NOCTPROJ:NAUDIO:NDATABASE:NENGINE:NFL_CORE:NIMAGE:NPDB} +OPTIONS_DEFAULT= ${OPTIONS_DEFINE:NAUDIO:NENGINE:NFL_CORE:NIMAGE:NPDB} TARBALLS_DIR= ${LOCALBASE}/share/octave/tarballs diff --git a/multimedia/plexmediaserver/Makefile b/multimedia/plexmediaserver/Makefile index a9f09ead6269..85df35f59210 100644 --- a/multimedia/plexmediaserver/Makefile +++ b/multimedia/plexmediaserver/Makefile @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= plexmediaserver -PORTVERSION?= 1.12.3.4973 -DISTVERSIONSUFFIX?=215c28d86 +PORTVERSION?= 1.13.0.5023 +DISTVERSIONSUFFIX?=31d3c0c65 PORTREVISION?= 0 CATEGORIES= multimedia MASTER_SITES= https://downloads.plex.tv/plex-media-server/${DISTVERSION}-${DISTVERSIONSUFFIX}/ diff --git a/multimedia/plexmediaserver/distinfo b/multimedia/plexmediaserver/distinfo index 87b2c33ffb69..094c7cf8375d 100644 --- a/multimedia/plexmediaserver/distinfo +++ b/multimedia/plexmediaserver/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1524142297 -SHA256 (PlexMediaServer-1.12.3.4973-215c28d86-freebsd-amd64.tar.bz2) = 283220b86abfb45732fad6c321b6f7badd0eb38019f91d5d8c0f5829e6819864 -SIZE (PlexMediaServer-1.12.3.4973-215c28d86-freebsd-amd64.tar.bz2) = 85999973 +TIMESTAMP = 1526832928 +SHA256 (PlexMediaServer-1.13.0.5023-31d3c0c65-freebsd-amd64.tar.bz2) = ddb7a0b9230d781b4d2a86df64f70d3918a67f0f48b93b55ce0f5d8736a5b888 +SIZE (PlexMediaServer-1.13.0.5023-31d3c0c65-freebsd-amd64.tar.bz2) = 86637515 diff --git a/multimedia/py-soco/Makefile b/multimedia/py-soco/Makefile index 09eccce4968d..3f56767d504e 100644 --- a/multimedia/py-soco/Makefile +++ b/multimedia/py-soco/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= soco -PORTVERSION= 0.14 +PORTVERSION= 0.15 DISTVERSIONPREFIX= v CATEGORIES= multimedia python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/multimedia/py-soco/distinfo b/multimedia/py-soco/distinfo index 0420ea2d24b9..be28cadc073f 100644 --- a/multimedia/py-soco/distinfo +++ b/multimedia/py-soco/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1519999312 -SHA256 (SoCo-SoCo-v0.14_GH0.tar.gz) = 970c480747f4152ab33cecbec6a167a28a750c0c1db0e2df96e5e7dfd52e53dd -SIZE (SoCo-SoCo-v0.14_GH0.tar.gz) = 657662 +TIMESTAMP = 1526867235 +SHA256 (SoCo-SoCo-v0.15_GH0.tar.gz) = ce08ece97ab09bca19ac9f8cb625fbe480a62b0f21b8ede50ae196070dd183e1 +SIZE (SoCo-SoCo-v0.15_GH0.tar.gz) = 660340 diff --git a/net-im/Makefile b/net-im/Makefile index 4430f184c45a..34b1b30bca51 100644 --- a/net-im/Makefile +++ b/net-im/Makefile @@ -144,6 +144,7 @@ SUBDIR += purple-discord SUBDIR += purple-facebook SUBDIR += purple-hangouts + SUBDIR += purple-slack SUBDIR += py-fbmq SUBDIR += py-jabber SUBDIR += py-jabberbot diff --git a/net-im/purple-slack/Makefile b/net-im/purple-slack/Makefile new file mode 100644 index 000000000000..54cd2ed779be --- /dev/null +++ b/net-im/purple-slack/Makefile @@ -0,0 +1,35 @@ +# $FreeBSD$ + +PORTNAME= purple-slack +PORTVERSION= 20180508 +CATEGORIES= net-im + +MAINTAINER= aou@eecs.berkeley.edu +COMMENT= Slack plugin for libpurple + +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING + +LIB_DEPENDS= libpurple.so:net-im/libpurple +BUILD_DEPENDS= bash:shells/bash + +USES= gmake pkgconfig +USE_GNOME= glib20 +USE_LDCONFIG= yes + +USE_GITHUB= yes +GH_ACCOUNT= dylex +GH_PROJECT= slack-libpurple +GH_TAGNAME= 0179b2c + +PLIST_FILES= lib/purple-2/libslack.so \ + share/pixmaps/pidgin/protocols/16/slack.png \ + share/pixmaps/pidgin/protocols/22/slack.png \ + share/pixmaps/pidgin/protocols/48/slack.png + +MAKE_ARGS= CC="${CC}" SHELL="${LOCALBASE}/bin/bash" + +post-install: + ${STRIP_CMD} ${STAGEDIR}${LOCALBASE}/lib/purple-2/libslack.so + +.include diff --git a/net-im/purple-slack/distinfo b/net-im/purple-slack/distinfo new file mode 100644 index 000000000000..3209f5cb7d17 --- /dev/null +++ b/net-im/purple-slack/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1526319813 +SHA256 (dylex-slack-libpurple-20180508-0179b2c_GH0.tar.gz) = 7bcd47a8ac817bb8230764ff7a8048768ebd3a00dab48b322f7ec67204f51697 +SIZE (dylex-slack-libpurple-20180508-0179b2c_GH0.tar.gz) = 49883 diff --git a/net-im/purple-slack/pkg-descr b/net-im/purple-slack/pkg-descr new file mode 100644 index 000000000000..c9fd55e96e9d --- /dev/null +++ b/net-im/purple-slack/pkg-descr @@ -0,0 +1,3 @@ +A libpurple plugin for the Slack protocol. + +WWW: https://github.com/dylex/slack-libpurple diff --git a/net-mgmt/py-pysmi/Makefile b/net-mgmt/py-pysmi/Makefile index 5136fab20084..2dfdb0b43f19 100644 --- a/net-mgmt/py-pysmi/Makefile +++ b/net-mgmt/py-pysmi/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= pysmi -PORTVERSION= 0.2.2 +PORTVERSION= 0.3.0 CATEGORIES= net-mgmt python MASTER_SITES= CHEESESHOP \ SF/pysmi/pysmi/${PORTVERSION} @@ -13,12 +13,13 @@ COMMENT= SNMP/SMI MIB parsing in Python LICENSE= BSD2CLAUSE +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}snmp4>=0:net-mgmt/py-snmp4@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply@${FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply@${FLAVOR} NO_ARCH= yes -USES= python shebangfix +USES= python USE_PYTHON= autoplist concurrent distutils -SHEBANG_FILES= scripts/mibdump.py OPTIONS_DEFINE= DOCS EXAMPLES @@ -27,9 +28,8 @@ PORTEXAMPLES= * BASEDOCS= CHANGES.rst README.md THANKS.txt TODO.txt -post-patch: - ${CP} ${FILESDIR}/tests__init__.py ${WRKSRC}/tests/__init__.py - ${MV} ${WRKSRC}/tests ${WRKSRC}/${PORTNAME} +post-build: + @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test) post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/net-mgmt/py-pysmi/distinfo b/net-mgmt/py-pysmi/distinfo index 46ef2d03a3e5..02dd14382b43 100644 --- a/net-mgmt/py-pysmi/distinfo +++ b/net-mgmt/py-pysmi/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1514129467 -SHA256 (pysmi-0.2.2.tar.gz) = 2a315cc3e556b3428372b69da663a24d2f0df9e9ab075b022cb133855f25aef7 -SIZE (pysmi-0.2.2.tar.gz) = 90568 +TIMESTAMP = 1526841426 +SHA256 (pysmi-0.3.0.tar.gz) = 87b464df6e68dedc28959f3d16b57d5138c8959c0af5cdea9747df26e20858fc +SIZE (pysmi-0.3.0.tar.gz) = 92850 diff --git a/net-mgmt/py-pysmi/files/patch-setup.py b/net-mgmt/py-pysmi/files/patch-setup.py deleted file mode 100644 index d370dcf1c3ed..000000000000 --- a/net-mgmt/py-pysmi/files/patch-setup.py +++ /dev/null @@ -1,13 +0,0 @@ ---- setup.py.orig 2017-12-24 15:32:10 UTC -+++ setup.py -@@ -112,7 +112,9 @@ params.update({ - 'pysmi.parser', - 'pysmi.codegen', - 'pysmi.borrower', -- 'pysmi.writer'], -+ 'pysmi.writer', -+ 'pysmi.tests', -+ ], - 'scripts': [os.path.join('scripts', 'mibdump.py')] - }) - diff --git a/net-mgmt/py-pysmi/files/tests__init__.py b/net-mgmt/py-pysmi/files/tests__init__.py deleted file mode 100644 index 598f43930ba6..000000000000 --- a/net-mgmt/py-pysmi/files/tests__init__.py +++ /dev/null @@ -1,20 +0,0 @@ -from unittest import SkipTest, TestSuite - - -def load_tests(*args, **kwargs): - import suite - return suite.suite - - -try: - from pysnmp.smi.builder import MibBuilder -except ImportError: - - # python -m unittest pysmi.tests - def load_tests(*args, **kwars): - print("Skipping test suite: pysnmp is not installed") - return TestSuite() - - # nosetests pysmi - def setup(): - raise SkipTest("pysnmp is not installed") diff --git a/net-mgmt/py-pysmi/pkg-descr b/net-mgmt/py-pysmi/pkg-descr index cf87382da5b9..1c2c9bf4dbc2 100644 --- a/net-mgmt/py-pysmi/pkg-descr +++ b/net-mgmt/py-pysmi/pkg-descr @@ -1,3 +1,3 @@ Pure-Python implementation of SNMP/SMI MIB parsing and conversion library -WWW: http://pysmi.sourceforge.net/ +WWW: http://snmplabs.com/pysmi/ diff --git a/net-p2p/torrentcheck/Makefile b/net-p2p/torrentcheck/Makefile index a53ba333e443..9624572c4fda 100644 --- a/net-p2p/torrentcheck/Makefile +++ b/net-p2p/torrentcheck/Makefile @@ -3,6 +3,7 @@ PORTNAME= torrentcheck PORTVERSION= 1.00 +PORTREVISION= 1 CATEGORIES= net-p2p MASTER_SITES= SF/${PORTNAME} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} readme.txt @@ -26,8 +27,8 @@ post-patch: @${REINPLACE_CMD} -e '/malloc\.h/d' ${WRKSRC}/torrentcheck.c do-build: - cd ${WRKSRC} && ${CC} ${CFLAGS} ${CPPFLAGS} -o ${PORTNAME} \ - sha1.c torrentcheck.c + cd ${WRKSRC} && ${CC} ${CFLAGS} ${CPPFLAGS} -DUSE_FTELLO \ + -o ${PORTNAME} sha1.c torrentcheck.c do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin diff --git a/net/lft/Makefile b/net/lft/Makefile index cacf196ab807..18c9c1707582 100644 --- a/net/lft/Makefile +++ b/net/lft/Makefile @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= lft -PORTVERSION= 3.79 -PORTREVISION= 1 -PORTEPOCH= 1 +PORTVERSION= 3.8 +PORTEPOCH= 2 CATEGORIES= net MASTER_SITES= http://pwhois.org/get/ diff --git a/net/lft/distinfo b/net/lft/distinfo index dc7b9096fb89..55325cbac710 100644 --- a/net/lft/distinfo +++ b/net/lft/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1491732346 -SHA256 (lft-3.79.tar.gz) = 08e5c7973551b529c850bffbc7152c4e5f0bcb1f07ebbb39151a7dc9a3bf9de0 -SIZE (lft-3.79.tar.gz) = 376655 +TIMESTAMP = 1526848273 +SHA256 (lft-3.8.tar.gz) = 10f427e77b0f8207817329bd8ef0310078434612620073369264d15e6f97e990 +SIZE (lft-3.8.tar.gz) = 376731 diff --git a/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl11__symbols__p.h b/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl11__symbols__p.h new file mode 100644 index 000000000000..8b1c5d85c16c --- /dev/null +++ b/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl11__symbols__p.h @@ -0,0 +1,18 @@ +--- src/network/ssl/qsslsocket_openssl11_symbols_p.h.orig 2018-02-08 18:24:48 UTC ++++ src/network/ssl/qsslsocket_openssl11_symbols_p.h +@@ -75,6 +75,15 @@ + #error "You are not supposed to use this header file, include qsslsocket_openssl_symbols_p.h instead" + #endif + ++#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20700000L ++// LibreSSL 2.7 has stack_st but not OPENSSL_STACK ++typedef struct stack_st OPENSSL_STACK; /* Use STACK_OF(...) instead */ ++// From the signature in LibreSSL ++#define OPENSSL_INIT_SETTINGS void ++// https://github.com/openssl/openssl/blob/master/include/openssl/x509_vfy.h#L63 ++typedef int (*X509_STORE_CTX_verify_cb)(int, X509_STORE_CTX *); ++#endif ++ + const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x); + + Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a); diff --git a/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h b/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h index 23dc38628ee4..31b9b15f0cf2 100644 --- a/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h +++ b/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h @@ -1,15 +1,6 @@ Boilerplate for SSL_CTX_set1_groups() used in qsslcontext_openssl.cpp. --- src/network/ssl/qsslsocket_openssl_symbols_p.h.orig 2017-11-30 13:49:46 UTC +++ src/network/ssl/qsslsocket_openssl_symbols_p.h -@@ -232,7 +232,7 @@ BIO *q_BIO_new_mem_buf(void *a, int b); - int q_BIO_read(BIO *a, void *b, int c); - Q_AUTOTEST_EXPORT int q_BIO_write(BIO *a, const void *b, int c); - int q_BN_num_bits(const BIGNUM *a); --#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if !defined(BN_is_word) - int q_BN_is_word(BIGNUM *a, BN_ULONG w); - #else - // BN_is_word is implemented purely as a @@ -454,6 +454,9 @@ void q_EC_KEY_free(EC_KEY *ecdh); size_t q_EC_get_builtin_curves(EC_builtin_curve *r, size_t nitems); #if OPENSSL_VERSION_NUMBER >= 0x10002000L diff --git a/polish/hunspell/Makefile b/polish/hunspell/Makefile index d76f3fa95f04..268a190e66fe 100644 --- a/polish/hunspell/Makefile +++ b/polish/hunspell/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= hunspell -PORTVERSION= 20180509 +PORTVERSION= 20180516 CATEGORIES= polish textproc MASTER_SITES= https://sjp.pl/slownik/ort/ \ LOCAL/sunpoet/${PORTNAME} diff --git a/polish/hunspell/distinfo b/polish/hunspell/distinfo index d24d395adae5..07f2b7b9f428 100644 --- a/polish/hunspell/distinfo +++ b/polish/hunspell/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1526309224 -SHA256 (hunspell/sjp-myspell-pl-20180509.zip) = a3e1c55ba92dd895da7b04c25cd4ba0288160b0b365da0072fb1f33780bd69c5 -SIZE (hunspell/sjp-myspell-pl-20180509.zip) = 1207291 +TIMESTAMP = 1526866425 +SHA256 (hunspell/sjp-myspell-pl-20180516.zip) = 01361cc4a1eb034519fe0452409dfb1ca86393cefcbb5a8b7d9636812e618312 +SIZE (hunspell/sjp-myspell-pl-20180516.zip) = 1207346 diff --git a/ports-mgmt/portmaster/Makefile b/ports-mgmt/portmaster/Makefile index 74298a98c995..392f736431fa 100644 --- a/ports-mgmt/portmaster/Makefile +++ b/ports-mgmt/portmaster/Makefile @@ -2,7 +2,7 @@ PORTNAME= portmaster PORTVERSION= 3.19 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= ports-mgmt MAINTAINER= se@FreeBSD.org diff --git a/ports-mgmt/portmaster/files/patch-portmaster b/ports-mgmt/portmaster/files/patch-portmaster index 7433a7fb6968..017b55826ff0 100644 --- a/ports-mgmt/portmaster/files/patch-portmaster +++ b/ports-mgmt/portmaster/files/patch-portmaster @@ -77,9 +77,31 @@ # Superuser versions for commands that need root privileges -@@ -563,11 +562,15 @@ find_glob_dirs () { +@@ -562,12 +561,37 @@ find_glob_dirs () { + return 1 } ++match_flavor () { ++ local origin=$(dir_part $1) ++ local flavor # =$(flavor_part $1) ++ local iport="$2" ++ local dir="$pd/$origin" ++ ++ if [ -d "$dir" ]; then ++ local IFS=' ' ++ local pkgname=${iport%-*} ++ local flavors=$(pm_make -C "$dir" -V FLAVORS) ++ for flavor in $flavors; do ++ local p=$(pm_make -C "$dir" FLAVOR=$flavor -V PKGNAME) ++ if [ -n "$p" -a "${p%-*}" = "$pkgname" ]; then ++ echo "$origin@$flavor" ++ return ++ fi ++ done ++ fi ++ echo "$1" # should not be reached! ++} ++ origin_from_pdb () { - local flavor pkgname + local flavor pkgname origin_flavor @@ -95,7 +117,7 @@ case "$pkgname" in bsdpan-*) return 3 ;; esac -@@ -789,6 +792,7 @@ if [ -n "$ALWAYS_SCRUB_DISTFILES" -a -n "$DONT_SCRUB_D +@@ -789,6 +813,7 @@ if [ -n "$ALWAYS_SCRUB_DISTFILES" -a -n "$DONT_SCRUB_D fail "The -d and -D options are mutually exclusive" fi @@ -103,7 +125,7 @@ [ -n "$PM_NO_MAKE_CONFIG" -a -n "$PM_FORCE_CONFIG" ] && unset PM_NO_MAKE_CONFIG if [ -n "$LIST" -o -n "$LIST_PLUS" ]; then -@@ -927,6 +931,9 @@ if [ "$$" -eq "$PM_PARENT_PID" ]; then +@@ -927,6 +952,9 @@ if [ "$$" -eq "$PM_PARENT_PID" ]; then fi fi # [ "$$" -eq "$PM_PARENT_PID" ] @@ -113,34 +135,32 @@ #=============== Begin functions relevant to --features and main =============== # find installed port for given origin (with optional @flavor) in the pkg DB -@@ -1004,21 +1011,23 @@ get_answer_yn () { +@@ -1002,25 +1030,6 @@ get_answer_yn () { + fi + } - match_flavor () { - local origin=$(dir_part $1) +-match_flavor () { +- local origin=$(dir_part $1) - local flavor=$(flavor_part $1) -+ local flavor # =$(flavor_part $1) - local iport="$2" - local dir="$pd/$origin" - +- local iport="$2" +- local dir="$pd/$origin" +- - [ -n "$flavor" -a -d "$dir" ] || return -+ if [ -d "$dir" ]; then - local IFS=' ' - local pkgname=${iport%-*} - local flavors=$(pm_make -C "$dir" -V FLAVORS) - for flavor in $flavors; do - local p=$(pm_make -C "$dir" FLAVOR=$flavor -V PKGNAME) - if [ -n "$p" -a "${p%-*}" = "$pkgname" ]; then +- local IFS=' ' +- local pkgname=${iport%-*} +- local flavors=$(pm_make -C "$dir" -V FLAVORS) +- for flavor in $flavors; do +- local p=$(pm_make -C "$dir" FLAVOR=$flavor -V PKGNAME) +- if [ -n "$p" -a "${p%-*}" = "$pkgname" ]; then - moved_npd="$origin@$flavor" - break -+ echo "$origin@$flavor" -+ return - fi - done -+ fi -+ echo "$1" # should not be reached! - } - +- fi +- done +-} +- # Find the new origin for moved ports + # Set global variable moved_npd on success + # Return values: @@ -1056,7 +1065,8 @@ find_moved_port () { fi ;; ${sf}\|*) moved_npd=${moved#*\|} # New port directory diff --git a/science/gchemutils/files/patch-libs_gcu_spacegroup.cc b/science/gchemutils/files/patch-libs_gcu_spacegroup.cc new file mode 100644 index 000000000000..6bd3a6d1d989 --- /dev/null +++ b/science/gchemutils/files/patch-libs_gcu_spacegroup.cc @@ -0,0 +1,20 @@ +--- libs/gcu/spacegroup.cc.orig 2018-05-20 17:09:17.854019000 +0200 ++++ libs/gcu/spacegroup.cc 2018-05-20 17:22:26.142391000 +0200 +@@ -340,7 +340,7 @@ + Transform3d const * SpaceGroup::GetFirstTransform (list ::const_iterator &i) const + { + i = m_Transforms.begin (); +- return (i == m_Transforms.end())? reinterpret_cast (NULL): *i; ++ return (i == m_Transforms.end())? static_cast (NULL): *i; + } + + /*! +@@ -348,7 +348,7 @@ + Transform3d const * SpaceGroup::GetNextTransform (list ::const_iterator &i) const + { + i++; +- return (i == m_Transforms.end ())? reinterpret_cast (NULL): *i; ++ return (i == m_Transforms.end ())? static_cast (NULL): *i; + } + + /*! diff --git a/science/pnetcdf/Makefile b/science/pnetcdf/Makefile index b6401e2f34dc..64e16d246a74 100644 --- a/science/pnetcdf/Makefile +++ b/science/pnetcdf/Makefile @@ -3,7 +3,7 @@ PORTNAME= pnetcdf PORTVERSION= 1.8.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= science parallel MASTER_SITES= http://cucis.ece.northwestern.edu/projects/PnetCDF/Release/ \ LOCAL/sunpoet @@ -14,10 +14,11 @@ COMMENT= Library providing high-performance I/O OPTIONS_DEFINE= DOCS OPTIONS_SINGLE= MPI -OPTIONS_SINGLE_MPI= OPENMPI OPENMPI2 MPICH2 -OPTIONS_DEFAULT=OPENMPI -OPENMPI_DESC= Parallel processing support via Open MPI 1.x -OPENMPI2_DESC= Parallel processing support via Open MPI 2.x +OPTIONS_SINGLE_MPI= OPENMPI OPENMPI2 OPENMPI3 MPICH2 +OPTIONS_DEFAULT=OPENMPI3 +OPENMPI_DESC= Parallel processing support via Open MPI 1.x +OPENMPI2_DESC= Parallel processing support via Open MPI 2.x +OPENMPI3_DESC= Parallel processing support via Open MPI 3.x CONFLICTS_INSTALL= hdf-4.* @@ -36,6 +37,8 @@ OPENMPI_CONFIGURE_ON= --with-mpi=${LOCALBASE}/mpi/openmpi OPENMPI_LIB_DEPENDS= libmpi.so:net/openmpi OPENMPI2_CONFIGURE_ON= --with-mpi=${LOCALBASE}/mpi/openmpi2 OPENMPI2_LIB_DEPENDS= libmpi.so:net/openmpi2 +OPENMPI3_CONFIGURE_ON= --with-mpi=${LOCALBASE}/mpi/openmpi3 +OPENMPI3_LIB_DEPENDS= libmpi.so:net/openmpi3 post-patch: @${REINPLACE_CMD} -e '/$$(INSTALL.*$$(PREFIX)/ s|$$(PREFIX)|$$(DESTDIR)&|' ${WRKSRC}/Makefile.in diff --git a/security/Makefile b/security/Makefile index 7e88ffd79d87..8dacddb2d0d5 100644 --- a/security/Makefile +++ b/security/Makefile @@ -936,6 +936,7 @@ SUBDIR += py-first-server SUBDIR += py-flask-httpauth SUBDIR += py-flask-kerberos + SUBDIR += py-flask-saml SUBDIR += py-gixy SUBDIR += py-gnupg SUBDIR += py-gnutls diff --git a/security/py-flask-saml/Makefile b/security/py-flask-saml/Makefile new file mode 100644 index 000000000000..0e4ddb37cd4f --- /dev/null +++ b/security/py-flask-saml/Makefile @@ -0,0 +1,24 @@ +# Created by: John W. O'Brien +# $FreeBSD$ + +PORTNAME= Flask-SAML +PORTVERSION= 0.4.3 +CATEGORIES= security www python +MASTER_SITES= CHEESESHOP +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} + +MAINTAINER= john@saltant.com +COMMENT= SAML authentication for Flask web apps + +LICENSE= APACHE20 + +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>0.8.0:www/py-flask@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}blinker>=1.1:devel/py-blinker@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pysaml2>4.0.0:security/py-pysaml2@${FLAVOR} + +USES= python +USE_PYTHON= autoplist distutils + +NO_ARCH= yes + +.include diff --git a/security/py-flask-saml/distinfo b/security/py-flask-saml/distinfo new file mode 100644 index 000000000000..367573e99495 --- /dev/null +++ b/security/py-flask-saml/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1516061025 +SHA256 (Flask-SAML-0.4.3.tar.gz) = f03dea7bee6746de22042a2f73637d39666e54ab15e3d844de134603f92861c1 +SIZE (Flask-SAML-0.4.3.tar.gz) = 4572 diff --git a/security/py-flask-saml/files/patch-setup.py b/security/py-flask-saml/files/patch-setup.py new file mode 100644 index 000000000000..20ea55a0d425 --- /dev/null +++ b/security/py-flask-saml/files/patch-setup.py @@ -0,0 +1,10 @@ +--- setup.py.orig 2018-05-21 01:06:59 UTC ++++ setup.py +@@ -25,7 +25,6 @@ setuptools.setup( + author='Florian Ruechel', + tests_require=['pytest >= 2.5.2', 'mock', 'sphinx', 'pytest-mock'], + install_requires=install_requires, +- setup_requires=['pytest-runner'], + author_email='fruechel@atlassian.com', + description='Flask SAML integration', + long_description=long_description, diff --git a/security/py-flask-saml/pkg-descr b/security/py-flask-saml/pkg-descr new file mode 100644 index 000000000000..e14b18b0cf6c --- /dev/null +++ b/security/py-flask-saml/pkg-descr @@ -0,0 +1,4 @@ +Flask-SAML is an extension for the Flask web application micro framework +that implements Security Association Markup Language (SAML) authentication. + +WWW: https://bitbucket.org/asecurityteam/flask_saml diff --git a/sysutils/bareos16-server/Makefile.common b/sysutils/bareos16-server/Makefile.common index 553b71317d36..4025c122962b 100644 --- a/sysutils/bareos16-server/Makefile.common +++ b/sysutils/bareos16-server/Makefile.common @@ -4,6 +4,7 @@ post-patch: @${REINPLACE_CMD} -e 's|_NONSHARED||g' ${WRKSRC}/src/filed/Makefile.in @${REINPLACE_CMD} -e 's|-lbareoscfg|@JANSSON_LIBS@ @LIBINTL@ -lbareoscfg|g' ${WRKSRC}/src/qt-tray-monitor/tray-monitor.pro.in + @${REINPLACE_CMD} -e 's|@bindir@/bat|@bindir@/${PORTNAME:S/16//}-bat|g' ${WRKSRC}/src/qt-console/bat.desktop.in post-build: .if ${PKGNAMEPREFIX} == "nagios-check_" @@ -19,6 +20,7 @@ pre-install: .endif .if ${PKGNAMESUFFIX} == "-bat" @${MV} ${WRKSRC}/manpages/bat.1 ${WRKSRC}/manpages/${PORTNAME:S/16//}-bat.1 + @${MV} ${WRKSRC}/src/qt-console/bat.desktop ${WRKSRC}/src/qt-console/${PORTNAME:S/16//}-bat.desktop .endif do-install: diff --git a/sysutils/wiimms/Makefile b/sysutils/wiimms/Makefile index 7282d36ebc6a..446504c155c2 100644 --- a/sysutils/wiimms/Makefile +++ b/sysutils/wiimms/Makefile @@ -12,7 +12,8 @@ DISTNAME= wit-${DISTVERSION} MAINTAINER= olivier@FreeBSD.org COMMENT= Wiimms ISO Tools -LICENSE= GPLv2 +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/gpl-2.0.txt BUILD_DEPENDS= bash:shells/bash RUN_DEPENDS= bash:shells/bash diff --git a/sysutils/wiimms/pkg-descr b/sysutils/wiimms/pkg-descr index 49c00690a78f..7116e1f920e4 100644 --- a/sysutils/wiimms/pkg-descr +++ b/sysutils/wiimms/pkg-descr @@ -1,4 +1,4 @@ Wiimms ISO Tools is a set of command line tools to manipulate Wii and GameCube ISO images and WBFS containers. -WWW: http://wit.wiimm.de +WWW: https://wit.wiimm.de/ diff --git a/textproc/highlight/Makefile b/textproc/highlight/Makefile index 3ce225731235..69e77a5b39ab 100644 --- a/textproc/highlight/Makefile +++ b/textproc/highlight/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= highlight -PORTVERSION= 3.36 -PORTREVISION= 5 +PORTVERSION= 3.43 PORTEPOCH= 3 CATEGORIES= textproc MASTER_SITES= http://www.andre-simon.de/zip/ diff --git a/textproc/highlight/distinfo b/textproc/highlight/distinfo index 38f14f43d208..4a3674df1630 100644 --- a/textproc/highlight/distinfo +++ b/textproc/highlight/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1495523172 -SHA256 (highlight-3.36.tar.bz2) = 34cd5bcf52714f83364460c0c3551320564c56ff4e117353034e532275792171 -SIZE (highlight-3.36.tar.bz2) = 1221219 +TIMESTAMP = 1526852095 +SHA256 (highlight-3.43.tar.bz2) = db957ebd73048dcb46347f44a1fe8a949fda40b5ecb360bf0df2da0d8d92e902 +SIZE (highlight-3.43.tar.bz2) = 1311318 diff --git a/textproc/highlight/pkg-plist b/textproc/highlight/pkg-plist index 6579941dc69e..060cef4ec528 100644 --- a/textproc/highlight/pkg-plist +++ b/textproc/highlight/pkg-plist @@ -43,6 +43,7 @@ man/man1/highlight.1.gz %%DATADIR%%/langDefs/clipper.lang %%DATADIR%%/langDefs/clojure.lang %%DATADIR%%/langDefs/clp.lang +%%DATADIR%%/langDefs/cmake.lang %%DATADIR%%/langDefs/cobol.lang %%DATADIR%%/langDefs/coffee.lang %%DATADIR%%/langDefs/coldfusion.lang @@ -54,12 +55,17 @@ man/man1/highlight.1.gz %%DATADIR%%/langDefs/d.lang %%DATADIR%%/langDefs/dart.lang %%DATADIR%%/langDefs/diff.lang +%%DATADIR%%/langDefs/docker.lang %%DATADIR%%/langDefs/dts.lang %%DATADIR%%/langDefs/dylan.lang %%DATADIR%%/langDefs/ebnf.lang +%%DATADIR%%/langDefs/ebnf2.lang %%DATADIR%%/langDefs/eiffel.lang +%%DATADIR%%/langDefs/elixir.lang +%%DATADIR%%/langDefs/email.lang %%DATADIR%%/langDefs/erlang.lang %%DATADIR%%/langDefs/euphoria.lang +%%DATADIR%%/langDefs/excel.lang %%DATADIR%%/langDefs/express.lang %%DATADIR%%/langDefs/fame.lang %%DATADIR%%/langDefs/fasm.lang @@ -68,6 +74,7 @@ man/man1/highlight.1.gz %%DATADIR%%/langDefs/fortran90.lang %%DATADIR%%/langDefs/frink.lang %%DATADIR%%/langDefs/fsharp.lang +%%DATADIR%%/langDefs/fstab.lang %%DATADIR%%/langDefs/fx.lang %%DATADIR%%/langDefs/gambas.lang %%DATADIR%%/langDefs/gdb.lang @@ -152,6 +159,7 @@ man/man1/highlight.1.gz %%DATADIR%%/langDefs/plpython.lang %%DATADIR%%/langDefs/pltcl.lang %%DATADIR%%/langDefs/po.lang +%%DATADIR%%/langDefs/polygen.lang %%DATADIR%%/langDefs/pony.lang %%DATADIR%%/langDefs/pov.lang %%DATADIR%%/langDefs/pro.lang @@ -216,6 +224,7 @@ man/man1/highlight.1.gz %%DATADIR%%/langDefs/znn.lang %%DATADIR%%/plugins/asciidoc_html_add_links.lua %%DATADIR%%/plugins/bash_functions.lua +%%DATADIR%%/plugins/bash_ref_man7_org.lua %%DATADIR%%/plugins/comment_links.lua %%DATADIR%%/plugins/cpp_qt.lua %%DATADIR%%/plugins/cpp_ref_cplusplus_com.lua diff --git a/textproc/rubygem-diffy/Makefile b/textproc/rubygem-diffy/Makefile index 2cb894e43e2f..296516c3e6fc 100644 --- a/textproc/rubygem-diffy/Makefile +++ b/textproc/rubygem-diffy/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= diffy -PORTVERSION= 3.2.0 +PORTVERSION= 3.2.1 CATEGORIES= textproc rubygems MASTER_SITES= RG diff --git a/textproc/rubygem-diffy/distinfo b/textproc/rubygem-diffy/distinfo index 716554c61b9a..cd30457ca910 100644 --- a/textproc/rubygem-diffy/distinfo +++ b/textproc/rubygem-diffy/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1489333726 -SHA256 (rubygem/diffy-3.2.0.gem) = 8124e5b1d9c0086994b6484d26f37476b79253309ccaebea201247a67eb2b604 -SIZE (rubygem/diffy-3.2.0.gem) = 17408 +TIMESTAMP = 1526839439 +SHA256 (rubygem/diffy-3.2.1.gem) = 4ffe1a7b01c958053407f9a8e6492c3e8c11b59db0ab5c3ae44f056067ae3185 +SIZE (rubygem/diffy-3.2.1.gem) = 17408 diff --git a/textproc/sk-mythes/Makefile b/textproc/sk-mythes/Makefile index 5e6a42fb5982..85a773a0087b 100644 --- a/textproc/sk-mythes/Makefile +++ b/textproc/sk-mythes/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= mythes -PORTVERSION= 2018.05.13 +PORTVERSION= 2018.05.20 CATEGORIES= textproc MASTER_SITES= LOCAL/sunpoet/${PORTNAME}/ PKGNAMEPREFIX= sk- diff --git a/textproc/sk-mythes/distinfo b/textproc/sk-mythes/distinfo index 3939c70d808a..14383b88b0ad 100644 --- a/textproc/sk-mythes/distinfo +++ b/textproc/sk-mythes/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1526309189 -SHA256 (mythes/OOo-Thesaurus2-sk_SK-20180513.zip) = c434d88303869ddb6f8a4ec56e5909a74b32b5d20ee072fb6984316d5255ccd6 -SIZE (mythes/OOo-Thesaurus2-sk_SK-20180513.zip) = 239453 +TIMESTAMP = 1526866375 +SHA256 (mythes/OOo-Thesaurus2-sk_SK-20180520.zip) = 2ba08336c7f36c148b43662a4fa1272c9e3a24aad5a08b5a4e605c726b2f31f0 +SIZE (mythes/OOo-Thesaurus2-sk_SK-20180520.zip) = 239453 diff --git a/www/Makefile b/www/Makefile index 2187d80845b2..8f84c09b5bcc 100644 --- a/www/Makefile +++ b/www/Makefile @@ -664,6 +664,7 @@ SUBDIR += p5-CGI-FormBuilder SUBDIR += p5-CGI-Framework SUBDIR += p5-CGI-Kwiki + SUBDIR += p5-CGI-Lite SUBDIR += p5-CGI-Minimal SUBDIR += p5-CGI-PSGI SUBDIR += p5-CGI-Pager @@ -683,7 +684,6 @@ SUBDIR += p5-CGI-Utils SUBDIR += p5-CGI-XMLApplication SUBDIR += p5-CGI.pm - SUBDIR += p5-CGI_Lite SUBDIR += p5-CIF-Client SUBDIR += p5-CSS-DOM SUBDIR += p5-CSS-Inliner @@ -1503,6 +1503,7 @@ SUBDIR += py-albatross SUBDIR += py-amf SUBDIR += py-apachelog + SUBDIR += py-arxiv SUBDIR += py-autobahn SUBDIR += py-aws-requests-auth SUBDIR += py-azure-common diff --git a/www/miniflux/Makefile b/www/miniflux/Makefile index 21171f0c97d3..0cbb810febfb 100644 --- a/www/miniflux/Makefile +++ b/www/miniflux/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= miniflux -DISTVERSION= 2.0.5 -PORTREVISION= 1 +DISTVERSION= 2.0.7 CATEGORIES= www MAINTAINER= krion@FreeBSD.org diff --git a/www/miniflux/distinfo b/www/miniflux/distinfo index 544ee4ff03ee..eda782df77f7 100644 --- a/www/miniflux/distinfo +++ b/www/miniflux/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1523181614 -SHA256 (miniflux-miniflux-2.0.5_GH0.tar.gz) = 0d81155182886a76ab2bc57e2d0805711633ae75f329a655ae3abb454bf8595a -SIZE (miniflux-miniflux-2.0.5_GH0.tar.gz) = 12417244 +TIMESTAMP = 1526805966 +SHA256 (miniflux-miniflux-2.0.7_GH0.tar.gz) = f968c710235538b4c02c963e08f5e9a2692068a8fe2cba063ff763f257be377a +SIZE (miniflux-miniflux-2.0.7_GH0.tar.gz) = 12435198 diff --git a/www/mod_auth_openidc/Makefile b/www/mod_auth_openidc/Makefile index d41054f5d725..c27d921141f2 100644 --- a/www/mod_auth_openidc/Makefile +++ b/www/mod_auth_openidc/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mod_auth_openidc -PORTVERSION= 2.3.3 +PORTVERSION= 2.3.5 DISTVERSIONPREFIX= v CATEGORIES= www PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX} diff --git a/www/mod_auth_openidc/distinfo b/www/mod_auth_openidc/distinfo index a6928df67517..c1ad19be8743 100644 --- a/www/mod_auth_openidc/distinfo +++ b/www/mod_auth_openidc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1511443561 -SHA256 (pingidentity-mod_auth_openidc-v2.3.3_GH0.tar.gz) = 658eaa71c9ee6a7edb31aa67d62f4483c13d64a96ba5fab26934323ad0604f5c -SIZE (pingidentity-mod_auth_openidc-v2.3.3_GH0.tar.gz) = 216339 +TIMESTAMP = 1526867206 +SHA256 (pingidentity-mod_auth_openidc-v2.3.5_GH0.tar.gz) = 63b210ec7aaa121dc29eacc62af54059b11a14077b7b0634196f6741bce2fa95 +SIZE (pingidentity-mod_auth_openidc-v2.3.5_GH0.tar.gz) = 216759 diff --git a/www/p5-CGI_Lite/Makefile b/www/p5-CGI-Lite/Makefile similarity index 97% rename from www/p5-CGI_Lite/Makefile rename to www/p5-CGI-Lite/Makefile index a9f546669c48..1918184f2fda 100644 --- a/www/p5-CGI_Lite/Makefile +++ b/www/p5-CGI-Lite/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= CGI-Lite -PORTVERSION= 3.01 +PORTVERSION= 3.02 CATEGORIES= www perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/www/p5-CGI-Lite/distinfo b/www/p5-CGI-Lite/distinfo new file mode 100644 index 000000000000..5158bec55854 --- /dev/null +++ b/www/p5-CGI-Lite/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1526842795 +SHA256 (CGI-Lite-3.02.tar.gz) = 41e8a17cd1615fa45900662a254a1b8a443e048611eb0abe5a9881b17dcacf7d +SIZE (CGI-Lite-3.02.tar.gz) = 38073 diff --git a/www/p5-CGI_Lite/pkg-descr b/www/p5-CGI-Lite/pkg-descr similarity index 100% rename from www/p5-CGI_Lite/pkg-descr rename to www/p5-CGI-Lite/pkg-descr diff --git a/www/p5-CGI_Lite/pkg-plist b/www/p5-CGI-Lite/pkg-plist similarity index 100% rename from www/p5-CGI_Lite/pkg-plist rename to www/p5-CGI-Lite/pkg-plist diff --git a/www/p5-CGI_Lite/distinfo b/www/p5-CGI_Lite/distinfo deleted file mode 100644 index c3eaef3a017a..000000000000 --- a/www/p5-CGI_Lite/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (CGI-Lite-3.01.tar.gz) = 807ced3220da5603ed66bbcad26477d118408fd226f08a5d7ababc0536346801 -SIZE (CGI-Lite-3.01.tar.gz) = 37561 diff --git a/www/py-arxiv/Makefile b/www/py-arxiv/Makefile new file mode 100644 index 000000000000..246d25a08d50 --- /dev/null +++ b/www/py-arxiv/Makefile @@ -0,0 +1,22 @@ +# Created by: Po-Chuan Hsieh +# $FreeBSD$ + +PORTNAME= arxiv +PORTVERSION= 0.2.2 +CATEGORIES= www python +MASTER_SITES= CHEESESHOP +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} + +MAINTAINER= sunpoet@FreeBSD.org +COMMENT= Python wrapper for the arXiv API + +LICENSE= MIT + +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}feedparser>=0:textproc/py-feedparser@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR} + +NO_ARCH= yes +USE_PYTHON= autoplist concurrent distutils +USES= python + +.include diff --git a/www/py-arxiv/distinfo b/www/py-arxiv/distinfo new file mode 100644 index 000000000000..c4112c2029b1 --- /dev/null +++ b/www/py-arxiv/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1520970061 +SHA256 (arxiv-0.2.2.tar.gz) = 0e9e1700537adf3f5e2944bd8e1d6a66d737723aee6dbcfe16e5ec9e173f0879 +SIZE (arxiv-0.2.2.tar.gz) = 2279 diff --git a/www/py-arxiv/pkg-descr b/www/py-arxiv/pkg-descr new file mode 100644 index 000000000000..a1147eeafcdc --- /dev/null +++ b/www/py-arxiv/pkg-descr @@ -0,0 +1,16 @@ +arxiv.py is a Python wrapper for the arXiv API +(http://arxiv.org/help/api/index). + +arXiv is a project by the Cornell University Library that provides open access +to 1,000,000+ articles in Physics, Mathematics, Computer Science, Quantitative +Biology, Quantitative Finance, and Statistics. + +They have an API that uses ATOM feeds to serve simple database queries. +Unfortunately, handling these ATOM requsts can be clumsy (especially given +inconsistency in data between different result objects, even in the same query). +This is where arxiv.py comes it: it constructs requests for arXiv and gets ATOM +feeds via a simple handful of methods, and parses the results into an intuitive +format. + +WWW: https://pypi.org/project/arxiv/ +WWW: https://github.com/lukasschwab/arxiv.py diff --git a/www/rubygem-jekyll/Makefile b/www/rubygem-jekyll/Makefile index 39d3abc09b15..7abaa769004e 100644 --- a/www/rubygem-jekyll/Makefile +++ b/www/rubygem-jekyll/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= jekyll -PORTVERSION= 3.8.1 +PORTVERSION= 3.8.2 CATEGORIES= www rubygems MASTER_SITES= RG diff --git a/www/rubygem-jekyll/distinfo b/www/rubygem-jekyll/distinfo index 03caa0acddfd..1dda41a228e4 100644 --- a/www/rubygem-jekyll/distinfo +++ b/www/rubygem-jekyll/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1525281746 -SHA256 (rubygem/jekyll-3.8.1.gem) = 266e2b664fb6ff5cc1730793bb77d94e4b417ed5448e7f432e7337276fc94107 -SIZE (rubygem/jekyll-3.8.1.gem) = 112640 +TIMESTAMP = 1526839457 +SHA256 (rubygem/jekyll-3.8.2.gem) = e895c273cf64a43ae1b31f6c3744edcc251bc5be5f2ff7e9898213c7648ce1b2 +SIZE (rubygem/jekyll-3.8.2.gem) = 112640 diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index f7c8ad9a1ec2..eefae6caeda6 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -3,7 +3,7 @@ PORTNAME?= xorg-server PORTVERSION?= 1.18.4 -PORTREVISION?= 6 +PORTREVISION?= 8 PORTEPOCH?= 1 CATEGORIES= x11-servers MASTER_SITES= XORG/individual/xserver @@ -65,7 +65,7 @@ BUILD_DEPENDS+= libepoxy>0:graphics/libepoxy # only for configure USE_GL+= gbm USE_XORG+= pciaccess xf86dgaproto xf86vidmodeproto CONFIGURE_ARGS+=--disable-dmx --disable-xephyr --disable-xnest --disable-xvfb \ - --disable-xwayland + --disable-xwayland --enable-xcsecurity SUB_FILES= pkg-install pkg-deinstall .else CONFIGURE_ARGS+=--disable-xorg diff --git a/x11-servers/xorg-server/files/patch-CVE-2017-10971 b/x11-servers/xorg-server/files/patch-CVE-2017-10971 new file mode 100644 index 000000000000..6eae9000fe40 --- /dev/null +++ b/x11-servers/xorg-server/files/patch-CVE-2017-10971 @@ -0,0 +1,163 @@ +From 215f894965df5fb0bb45b107d84524e700d2073c Mon Sep 17 00:00:00 2001 +From: Michal Srb +Date: Wed, 24 May 2017 15:54:40 +0300 +Subject: dix: Disallow GenericEvent in SendEvent request. + +The SendEvent request holds xEvent which is exactly 32 bytes long, no more, +no less. Both ProcSendEvent and SProcSendEvent verify that the received data +exactly match the request size. However nothing stops the client from passing +in event with xEvent::type = GenericEvent and any value of +xGenericEvent::length. + +In the case of ProcSendEvent, the event will be eventually passed to +WriteEventsToClient which will see that it is Generic event and copy the +arbitrary length from the receive buffer (and possibly past it) and send it to +the other client. This allows clients to copy unitialized heap memory out of X +server or to crash it. + +In case of SProcSendEvent, it will attempt to swap the incoming event by +calling a swapping function from the EventSwapVector array. The swapped event +is written to target buffer, which in this case is local xEvent variable. The +xEvent variable is 32 bytes long, but the swapping functions for GenericEvents +expect that the target buffer has size matching the size of the source +GenericEvent. This allows clients to cause stack buffer overflows. + +Signed-off-by: Michal Srb +Reviewed-by: Peter Hutterer +Signed-off-by: Peter Hutterer +--- + dix/events.c | 6 ++++++ + dix/swapreq.c | 7 +++++++ + 2 files changed, 13 insertions(+) + +diff --git a/dix/events.c b/dix/events.c +index 3e3a01e..d3a33ea 100644 +--- dix/events.c ++++ dix/events.c +@@ -5366,6 +5366,12 @@ ProcSendEvent(ClientPtr client) + client->errorValue = stuff->event.u.u.type; + return BadValue; + } ++ /* Generic events can have variable size, but SendEvent request holds ++ exactly 32B of event data. */ ++ if (stuff->event.u.u.type == GenericEvent) { ++ client->errorValue = stuff->event.u.u.type; ++ return BadValue; ++ } + if (stuff->event.u.u.type == ClientMessage && + stuff->event.u.u.detail != 8 && + stuff->event.u.u.detail != 16 && stuff->event.u.u.detail != 32) { +diff --git a/dix/swapreq.c b/dix/swapreq.c +index 719e9b8..6785059 100644 +--- dix/swapreq.c ++++ dix/swapreq.c +@@ -292,6 +292,13 @@ SProcSendEvent(ClientPtr client) + swapl(&stuff->destination); + swapl(&stuff->eventMask); + ++ /* Generic events can have variable size, but SendEvent request holds ++ exactly 32B of event data. */ ++ if (stuff->event.u.u.type == GenericEvent) { ++ client->errorValue = stuff->event.u.u.type; ++ return BadValue; ++ } ++ + /* Swap event */ + proc = EventSwapVector[stuff->event.u.u.type & 0177]; + if (!proc || proc == NotImplemented) /* no swapping proc; invalid event type? */ +-- +cgit v1.1 + +From 8caed4df36b1f802b4992edcfd282cbeeec35d9d Mon Sep 17 00:00:00 2001 +From: Michal Srb +Date: Wed, 24 May 2017 15:54:41 +0300 +Subject: Xi: Verify all events in ProcXSendExtensionEvent. + +The requirement is that events have type in range +EXTENSION_EVENT_BASE..lastEvent, but it was tested +only for first event of all. + +Signed-off-by: Michal Srb +Reviewed-by: Peter Hutterer +Signed-off-by: Peter Hutterer +--- + Xi/sendexev.c | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +diff --git a/Xi/sendexev.c b/Xi/sendexev.c +index 1cf118a..5e63bfc 100644 +--- Xi/sendexev.c ++++ Xi/sendexev.c +@@ -117,7 +117,7 @@ SProcXSendExtensionEvent(ClientPtr client) + int + ProcXSendExtensionEvent(ClientPtr client) + { +- int ret; ++ int ret, i; + DeviceIntPtr dev; + xEvent *first; + XEventClass *list; +@@ -141,10 +141,12 @@ ProcXSendExtensionEvent(ClientPtr client) + /* The client's event type must be one defined by an extension. */ + + first = ((xEvent *) &stuff[1]); +- if (!((EXTENSION_EVENT_BASE <= first->u.u.type) && +- (first->u.u.type < lastEvent))) { +- client->errorValue = first->u.u.type; +- return BadValue; ++ for (i = 0; i < stuff->num_events; i++) { ++ if (!((EXTENSION_EVENT_BASE <= first[i].u.u.type) && ++ (first[i].u.u.type < lastEvent))) { ++ client->errorValue = first[i].u.u.type; ++ return BadValue; ++ } + } + + list = (XEventClass *) (first + stuff->num_events); +-- +cgit v1.1 + +From ba336b24052122b136486961c82deac76bbde455 Mon Sep 17 00:00:00 2001 +From: Michal Srb +Date: Wed, 24 May 2017 15:54:42 +0300 +Subject: Xi: Do not try to swap GenericEvent. + +The SProcXSendExtensionEvent must not attempt to swap GenericEvent because +it is assuming that the event has fixed size and gives the swapping function +xEvent-sized buffer. + +A GenericEvent would be later rejected by ProcXSendExtensionEvent anyway. + +Signed-off-by: Michal Srb +Reviewed-by: Peter Hutterer +Signed-off-by: Peter Hutterer +--- + Xi/sendexev.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/Xi/sendexev.c b/Xi/sendexev.c +index 5e63bfc..5c2e0fc 100644 +--- Xi/sendexev.c ++++ Xi/sendexev.c +@@ -95,9 +95,17 @@ SProcXSendExtensionEvent(ClientPtr client) + + eventP = (xEvent *) &stuff[1]; + for (i = 0; i < stuff->num_events; i++, eventP++) { ++ if (eventP->u.u.type == GenericEvent) { ++ client->errorValue = eventP->u.u.type; ++ return BadValue; ++ } ++ + proc = EventSwapVector[eventP->u.u.type & 0177]; +- if (proc == NotImplemented) /* no swapping proc; invalid event type? */ ++ /* no swapping proc; invalid event type? */ ++ if (proc == NotImplemented) { ++ client->errorValue = eventP->u.u.type; + return BadValue; ++ } + (*proc) (eventP, &eventT); + *eventP = eventT; + } +-- +cgit v1.1 + diff --git a/x11-servers/xorg-server/files/patch-CVE-2017-10972 b/x11-servers/xorg-server/files/patch-CVE-2017-10972 new file mode 100644 index 000000000000..444d0d2c5d2a --- /dev/null +++ b/x11-servers/xorg-server/files/patch-CVE-2017-10972 @@ -0,0 +1,38 @@ +From 05442de962d3dc624f79fc1a00eca3ffc5489ced Mon Sep 17 00:00:00 2001 +From: Michal Srb +Date: Wed, 24 May 2017 15:54:39 +0300 +Subject: Xi: Zero target buffer in SProcXSendExtensionEvent. + +Make sure that the xEvent eventT is initialized with zeros, the same way as +in SProcSendEvent. + +Some event swapping functions do not overwrite all 32 bytes of xEvent +structure, for example XSecurityAuthorizationRevoked. Two cooperating +clients, one swapped and the other not, can send +XSecurityAuthorizationRevoked event to each other to retrieve old stack data +from X server. This can be potentialy misused to go around ASLR or +stack-protector. + +Signed-off-by: Michal Srb +Reviewed-by: Peter Hutterer +Signed-off-by: Peter Hutterer +--- + Xi/sendexev.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Xi/sendexev.c b/Xi/sendexev.c +index 11d8202..1cf118a 100644 +--- Xi/sendexev.c ++++ Xi/sendexev.c +@@ -78,7 +78,7 @@ SProcXSendExtensionEvent(ClientPtr client) + { + CARD32 *p; + int i; +- xEvent eventT; ++ xEvent eventT = { .u.u.type = 0 }; + xEvent *eventP; + EventSwapPtr proc; + +-- +cgit v1.1 + diff --git a/x11-wm/xcompmgr/Makefile b/x11-wm/xcompmgr/Makefile index 2562d5c7620f..2d96d6c665b9 100644 --- a/x11-wm/xcompmgr/Makefile +++ b/x11-wm/xcompmgr/Makefile @@ -3,13 +3,14 @@ PORTNAME= xcompmgr PORTVERSION= 1.1.7 +PORTREVISION= 1 CATEGORIES= x11-wm MAINTAINER= x11@FreeBSD.org COMMENT= Sample X compositing manager XORG_CAT= app -USE_XORG= x11 xcomposite xfixes xdamage xrender +USE_XORG= x11 xcomposite xext xfixes xdamage xrender PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz diff --git a/x11-wm/xcompmgr/files/patch-xcompmgr.c b/x11-wm/xcompmgr/files/patch-xcompmgr.c new file mode 100644 index 000000000000..91f2ad186da5 --- /dev/null +++ b/x11-wm/xcompmgr/files/patch-xcompmgr.c @@ -0,0 +1,28 @@ +--- xcompmgr.c.orig 2015-04-17 05:56:17 UTC ++++ xcompmgr.c +@@ -1028,7 +1028,6 @@ paint_all (Display *dpy, XserverRegion region) + { + w->borderClip = XFixesCreateRegion (dpy, NULL, 0); + XFixesCopyRegion (dpy, w->borderClip, region); +- XFixesIntersectRegion(dpy, w->borderClip, w->borderClip, w->borderSize); + } + w->prev_trans = t; + t = w; +@@ -1080,6 +1079,8 @@ paint_all (Display *dpy, XserverRegion region) + if (w->mode == WINDOW_TRANS) + { + int x, y, wid, hei; ++ XFixesIntersectRegion(dpy, w->borderClip, w->borderClip, w->borderSize); ++ XFixesSetPictureClipRegion(dpy, rootBuffer, 0, 0, w->borderClip); + #if HAS_NAME_WINDOW_PIXMAP + x = w->a.x; + y = w->a.y; +@@ -1099,6 +1100,8 @@ paint_all (Display *dpy, XserverRegion region) + else if (w->mode == WINDOW_ARGB) + { + int x, y, wid, hei; ++ XFixesIntersectRegion(dpy, w->borderClip, w->borderClip, w->borderSize); ++ XFixesSetPictureClipRegion(dpy, rootBuffer, 0, 0, w->borderClip); + #if HAS_NAME_WINDOW_PIXMAP + x = w->a.x; + y = w->a.y; diff --git a/x11/Makefile b/x11/Makefile index cb03251ed1c0..c444cde0e6a8 100644 --- a/x11/Makefile +++ b/x11/Makefile @@ -512,6 +512,7 @@ SUBDIR += xrsh SUBDIR += xrsi SUBDIR += xrx + SUBDIR += xscope SUBDIR += xscreensaver SUBDIR += xscreensaver-gnome SUBDIR += xscreensaver-gnome-hacks diff --git a/x11/libwacom/Makefile b/x11/libwacom/Makefile index 4d40852fd300..bc09daee54bc 100644 --- a/x11/libwacom/Makefile +++ b/x11/libwacom/Makefile @@ -3,6 +3,7 @@ PORTNAME= libwacom PORTVERSION= 0.23 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= https://sourceforge.net/projects/linuxwacom/files/libwacom/ @@ -21,4 +22,7 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes INSTALL_TARGET= install-strip +post-patch: + @${REINPLACE_CMD} -e 's/-printf "%P\\n"/-print0 | xargs -0 basename/' ${WRKSRC}/data/Makefile.in + .include diff --git a/x11/libwacom/pkg-plist b/x11/libwacom/pkg-plist index e8560c5ff6b0..efea85c7b54f 100644 --- a/x11/libwacom/pkg-plist +++ b/x11/libwacom/pkg-plist @@ -5,3 +5,120 @@ lib/libwacom.so lib/libwacom.so.2 lib/libwacom.so.2.5.1 libdata/pkgconfig/libwacom.pc +%%DATADIR%%/bamboo-0fg-s-p.tablet +%%DATADIR%%/bamboo-16fg-m-pt.tablet +%%DATADIR%%/bamboo-16fg-s-p.tablet +%%DATADIR%%/bamboo-16fg-s-pt.tablet +%%DATADIR%%/bamboo-16fg-s-t.tablet +%%DATADIR%%/bamboo-2fg-fun-m-pt.tablet +%%DATADIR%%/bamboo-2fg-fun-s-pt.tablet +%%DATADIR%%/bamboo-2fg-m-p.tablet +%%DATADIR%%/bamboo-2fg-s-p.tablet +%%DATADIR%%/bamboo-2fg-s-pt.tablet +%%DATADIR%%/bamboo-2fg-s-t.tablet +%%DATADIR%%/bamboo-4fg-fun-m.tablet +%%DATADIR%%/bamboo-4fg-fun-s.tablet +%%DATADIR%%/bamboo-4fg-s-pt.tablet +%%DATADIR%%/bamboo-4fg-s-t.tablet +%%DATADIR%%/bamboo-4fg-se-m-pt.tablet +%%DATADIR%%/bamboo-4fg-se-s-pt.tablet +%%DATADIR%%/bamboo-one.tablet +%%DATADIR%%/cintiq-12wx.tablet +%%DATADIR%%/cintiq-13hd.tablet +%%DATADIR%%/cintiq-13hdt.tablet +%%DATADIR%%/cintiq-20wsx.tablet +%%DATADIR%%/cintiq-21ux.tablet +%%DATADIR%%/cintiq-21ux2.tablet +%%DATADIR%%/cintiq-22hd.tablet +%%DATADIR%%/cintiq-22hdt.tablet +%%DATADIR%%/cintiq-24hd-touch.tablet +%%DATADIR%%/cintiq-24hd.tablet +%%DATADIR%%/cintiq-27hd.tablet +%%DATADIR%%/cintiq-27hdt.tablet +%%DATADIR%%/cintiq-companion-2.tablet +%%DATADIR%%/cintiq-companion-hybrid.tablet +%%DATADIR%%/cintiq-companion.tablet +%%DATADIR%%/dtf-720.tablet +%%DATADIR%%/dth-2242.tablet +%%DATADIR%%/dti-520.tablet +%%DATADIR%%/dtk-1651.tablet +%%DATADIR%%/dtk-2241.tablet +%%DATADIR%%/dtu-1031.tablet +%%DATADIR%%/dtu-1031x.tablet +%%DATADIR%%/dtu-1141.tablet +%%DATADIR%%/dtu-1631.tablet +%%DATADIR%%/dtu-1931.tablet +%%DATADIR%%/dtu-2231.tablet +%%DATADIR%%/ek-remote.tablet +%%DATADIR%%/generic.tablet +%%DATADIR%%/graphire-wireless-8x6.tablet +%%DATADIR%%/graphire3-4x5.tablet +%%DATADIR%%/graphire3-6x8.tablet +%%DATADIR%%/graphire4-4x5.tablet +%%DATADIR%%/huion-h610-pro.tablet +%%DATADIR%%/intuos-12x12.tablet +%%DATADIR%%/intuos-12x18.tablet +%%DATADIR%%/intuos-4x5.tablet +%%DATADIR%%/intuos-6x8.tablet +%%DATADIR%%/intuos-9x12.tablet +%%DATADIR%%/intuos-m-p.tablet +%%DATADIR%%/intuos-m-p2.tablet +%%DATADIR%%/intuos-m-pt.tablet +%%DATADIR%%/intuos-m-pt2.tablet +%%DATADIR%%/intuos-pro-l.tablet +%%DATADIR%%/intuos-pro-m.tablet +%%DATADIR%%/intuos-pro-s.tablet +%%DATADIR%%/intuos-s-p.tablet +%%DATADIR%%/intuos-s-p2.tablet +%%DATADIR%%/intuos-s-pt.tablet +%%DATADIR%%/intuos-s-pt2.tablet +%%DATADIR%%/intuos2-12x12.tablet +%%DATADIR%%/intuos2-12x18.tablet +%%DATADIR%%/intuos2-4x5.tablet +%%DATADIR%%/intuos2-6x8.tablet +%%DATADIR%%/intuos2-9x12.tablet +%%DATADIR%%/intuos3-12x12.tablet +%%DATADIR%%/intuos3-12x19.tablet +%%DATADIR%%/intuos3-4x5.tablet +%%DATADIR%%/intuos3-4x6.tablet +%%DATADIR%%/intuos3-6x11.tablet +%%DATADIR%%/intuos3-6x8.tablet +%%DATADIR%%/intuos3-9x12.tablet +%%DATADIR%%/intuos4-12x19.tablet +%%DATADIR%%/intuos4-4x6.tablet +%%DATADIR%%/intuos4-6x9-wl.tablet +%%DATADIR%%/intuos4-6x9.tablet +%%DATADIR%%/intuos4-8x13.tablet +%%DATADIR%%/intuos5-m.tablet +%%DATADIR%%/intuos5-s.tablet +%%DATADIR%%/intuos5-touch-l.tablet +%%DATADIR%%/intuos5-touch-m.tablet +%%DATADIR%%/intuos5-touch-s.tablet +%%DATADIR%%/isdv4-100.tablet +%%DATADIR%%/isdv4-101.tablet +%%DATADIR%%/isdv4-10d.tablet +%%DATADIR%%/isdv4-10f.tablet +%%DATADIR%%/isdv4-114.tablet +%%DATADIR%%/isdv4-116.tablet +%%DATADIR%%/isdv4-12c.tablet +%%DATADIR%%/isdv4-4004.tablet +%%DATADIR%%/isdv4-4800.tablet +%%DATADIR%%/isdv4-5000.tablet +%%DATADIR%%/isdv4-5002.tablet +%%DATADIR%%/isdv4-5040.tablet +%%DATADIR%%/isdv4-504a.tablet +%%DATADIR%%/isdv4-90.tablet +%%DATADIR%%/isdv4-93.tablet +%%DATADIR%%/isdv4-e3.tablet +%%DATADIR%%/isdv4-e5.tablet +%%DATADIR%%/isdv4-e6.tablet +%%DATADIR%%/isdv4-ec.tablet +%%DATADIR%%/isdv4-ed.tablet +%%DATADIR%%/isdv4-ef.tablet +%%DATADIR%%/libwacom.stylus +%%DATADIR%%/mobilestudio-pro-13.tablet +%%DATADIR%%/mobilestudio-pro-16.tablet +%%DATADIR%%/n-trig-pen.tablet +%%DATADIR%%/one-by-wacom-m-p.tablet +%%DATADIR%%/one-by-wacom-s-p.tablet +%%DATADIR%%/serial-wacf004.tablet diff --git a/x11/xscope/Makefile b/x11/xscope/Makefile new file mode 100644 index 000000000000..510e78499ed9 --- /dev/null +++ b/x11/xscope/Makefile @@ -0,0 +1,18 @@ +# $FreeBSD$ + +PORTNAME= xscope +PORTVERSION= 1.4.1 +CATEGORIES= x11 +MASTER_SITES= XORG/individual/${XORG_CAT}/ + +MAINTAINER= x11@FreeBSD.org +COMMENT= X Window Protocol Viewer + +LICENSE= MIT + +XORG_CAT= app +USE_XORG= xproto x11 xext + +PLIST_FILES= bin/xscope man/man1/xscope.1.gz + +.include diff --git a/x11/xscope/distinfo b/x11/xscope/distinfo new file mode 100644 index 000000000000..888cb982a853 --- /dev/null +++ b/x11/xscope/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1526823367 +SHA256 (xorg/app/xscope-1.4.1.tar.bz2) = 33807fbd51822435b23c28e7e78116e552826a6ca4d85632f098ad0ddf1ff423 +SIZE (xorg/app/xscope-1.4.1.tar.bz2) = 216128 diff --git a/x11/xscope/pkg-descr b/x11/xscope/pkg-descr new file mode 100644 index 000000000000..089bdde40d64 --- /dev/null +++ b/x11/xscope/pkg-descr @@ -0,0 +1,8 @@ +Xscope sits in-between an X11 client and an X11 server and prints +the contents of each request, reply, error, or event that is +communicated between them. Xscope can decode the core X11 protocol +and several extensions, including BIG-REQUESTS, LBX, MIT-SHM, +NCD-WinCenterPro, RANDR, and RENDER. This information can be useful +in debugging and performance tuning of X11 servers and clients. + +WWW: https://www.x.org/releases/X11R7.6/doc/man/man1/xscope.1.xhtml