Skip to content

Commit

Permalink
MERGE(*): import from upstream OpenJDK "jdk8u262-ga"
Browse files Browse the repository at this point in the history 
Fix security holes and update version to jdk8u262-ga.

--bug=81059191

Co-authors:
Co-authored-by: Bobpeng Xie<[email protected]>
  • Loading branch information
@linzang
bobpengxie authored and linzang committed Nov 6, 2020
1 parent ea3bfd1 commit 0607a4a
Show file tree
Hide file tree
Showing 1,530 changed files with 158,551 additions and 3,830 deletions.
30 changes: 14 additions & 16 deletions THIRD_PARTY_README
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1643,7 +1643,7 @@ July 15, 2018

-------------------------------------------------------------------------------

%% This notice is provided with respect to GIFLIB 5.1.8 & libungif 4.1.3,
%% This notice is provided with respect to GIFLIB 5.2.1 & libungif 4.1.3,
which may be included with JRE 8, JDK 8, and OpenJDK 8.

--- begin of LICENSE ---
Expand Down Expand Up @@ -2898,39 +2898,37 @@ to do so,subject to the following conditions:

-------------------------------------------------------------------------------

%% This notice is provided with respect to X Window System 6.8.2, which may be
%% This notice is provided with respect to xwd v1.0.7, which may be
included with JRE 8, JDK 8, and OpenJDK 8 on Linux and Solaris.

xwd utility

--- begin of LICENSE ---

This is the copyright for the files in src/solaris/native/sun/awt: list.h,
multiVis.h, wsutils.h, list.c, multiVis.c
Copyright (c) 1994 Hewlett-Packard Co.
Copyright (c) 1996 X Consortium
Copyright 1994 Hewlett-Packard Co.
Copyright 1996, 1998 The Open Group

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
the above copyright notice appear in all copies and that both that
copyright notice and this permission notice appear in supporting
documentation.

The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.

Except as contained in this notice, the name of the X Consortium shall
Except as contained in this notice, the name of The Open Group shall
not be used in advertising or otherwise to promote the sale, use or
other dealings in this Software without prior written authorization
from the X Consortium.
from The Open Group.

--- end of LICENSE ---
_____________________________
Expand Down
55 changes: 50 additions & 5 deletions common/autoconf/generated-configure.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -844,6 +844,7 @@ JDK_MICRO_VERSION
JDK_MINOR_VERSION
JDK_MAJOR_VERSION
USER_RELEASE_SUFFIX
ENABLE_JFR
COMPRESS_JARS
UNLIMITED_CRYPTO
CACERTS_FILE
Expand Down Expand Up @@ -1013,6 +1014,7 @@ infodir
docdir
oldincludedir
includedir
runstatedir
localstatedir
sharedstatedir
sysconfdir
Expand Down Expand Up @@ -1060,6 +1062,7 @@ enable_headful
enable_hotspot_test_in_build
with_cacerts_file
enable_unlimited_crypto
enable_jfr
with_milestone
with_update_version
with_user_release_suffix
Expand Down Expand Up @@ -1255,6 +1258,7 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
Expand Down Expand Up @@ -1507,6 +1511,15 @@ do
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;

-runstatedir | --runstatedir | --runstatedi | --runstated \
| --runstate | --runstat | --runsta | --runst | --runs \
| --run | --ru | --r)
ac_prev=runstatedir ;;
-runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
| --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
| --run=* | --ru=* | --r=*)
runstatedir=$ac_optarg ;;

-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
Expand Down Expand Up @@ -1644,7 +1657,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
libdir localedir mandir
libdir localedir mandir runstatedir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
Expand Down Expand Up @@ -1797,6 +1810,7 @@ Fine tuning of the installation directories:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
Expand Down Expand Up @@ -1847,6 +1861,7 @@ Optional Features:
run the Queens test after Hotspot build [disabled]
--enable-unlimited-crypto
Enable unlimited crypto policy [disabled]
--enable-jfr Enable Java Flight Recorder support [disabled]
--disable-debug-symbols disable generation of debug symbols [enabled]
--disable-zip-debug-info
disable zipping of debug-info files [enabled]
Expand Down Expand Up @@ -3916,7 +3931,7 @@ pkgadd_help() {


#
# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
Expand Down Expand Up @@ -4392,7 +4407,7 @@ VS_SDK_PLATFORM_NAME_2017=
#CUSTOM_AUTOCONF_INCLUDE

# Do not change or remove the following line, it is needed for consistency checks:
DATE_WHEN_GENERATED=1585090987
DATE_WHEN_GENERATED=1589212500

###############################################################################
#
Expand Down Expand Up @@ -19851,6 +19866,36 @@ fi



###############################################################################
#
# Enable or disable JFR
#
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build jfr" >&5
$as_echo_n "checking whether to build jfr... " >&6; }
# Check whether --enable-jfr was given.
if test "${enable_jfr+set}" = set; then :
enableval=$enable_jfr;
else
enable_jfr=auto
fi

if test "x$enable_jfr" = "xno" -o "x$enable_jfr" = "xauto"; then
ENABLE_JFR=false
elif test "x$enable_jfr" = "xyes" ; then
if test "x$JVM_VARIANT_MINIMAL1" = "xtrue" -o "x$JVM_VARIANT_ZERO" = "xtrue"; then
as_fn_error $? "cannot enable JFR on minimal1 VM or zero build" "$LINENO" 5
elif test "x$OPENJDK_TARGET_OS" = xaix; then
as_fn_error $? "AIX does not support JFR" "$LINENO" 5
else
ENABLE_JFR=true
fi
else
as_fn_error $? "--enable-jfr must either be set to yes or no" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ENABLE_JFR" >&5
$as_echo "$ENABLE_JFR" >&6; }



# Source the version numbers
. $AUTOCONF_DIR/version-numbers
Expand Down Expand Up @@ -28003,7 +28048,7 @@ $as_echo "$as_me: The result from running with --version was: \"$COMPILER_VERSIO
COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \
$SED -e 's/ *Copyright .*//'`
COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \
$SED -e 's/^.* \([1-9]\.[0-9.]*\) .*$/\1/'`
$SED -e 's/^.* \([1-9][0-9]*\.[0-9.]*\) .*$/\1/'`
elif test "x$TOOLCHAIN_TYPE" = xclang; then
# clang --version output typically looks like
# Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn)
Expand Down Expand Up @@ -29744,7 +29789,7 @@ $as_echo "$as_me: The result from running with --version was: \"$COMPILER_VERSIO
COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \
$SED -e 's/ *Copyright .*//'`
COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \
$SED -e 's/^.* \([1-9]\.[0-9.]*\) .*$/\1/'`
$SED -e 's/^.* \([1-9][0-9]*\.[0-9.]*\) .*$/\1/'`
elif test "x$TOOLCHAIN_TYPE" = xclang; then
# clang --version output typically looks like
# Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn)
Expand Down
26 changes: 25 additions & 1 deletion common/autoconf/jdk-options.m4
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
Expand Down Expand Up @@ -432,6 +432,30 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS],
COMPRESS_JARS=false
AC_SUBST(COMPRESS_JARS)
###############################################################################
#
# Enable or disable JFR
#
AC_MSG_CHECKING([whether to build jfr])
AC_ARG_ENABLE(jfr, [AS_HELP_STRING([--enable-jfr],
[Enable Java Flight Recorder support @<:@disabled@:>@])],,
[enable_jfr=auto])
if test "x$enable_jfr" = "xno" -o "x$enable_jfr" = "xauto"; then
ENABLE_JFR=false
elif test "x$enable_jfr" = "xyes" ; then
if test "x$JVM_VARIANT_MINIMAL1" = "xtrue" -o "x$JVM_VARIANT_ZERO" = "xtrue"; then
AC_MSG_ERROR([cannot enable JFR on minimal1 VM or zero build])
elif test "x$OPENJDK_TARGET_OS" = xaix; then
AC_MSG_ERROR([AIX does not support JFR])
else
ENABLE_JFR=true
fi
else
AC_MSG_ERROR([--enable-jfr must either be set to yes or no])
fi
AC_MSG_RESULT([$ENABLE_JFR])
AC_SUBST(ENABLE_JFR)
])

###############################################################################
Expand Down
2 changes: 1 addition & 1 deletion common/autoconf/toolchain.m4
View file
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ AC_DEFUN([TOOLCHAIN_EXTRACT_COMPILER_VERSION],
COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \
$SED -e 's/ *Copyright .*//'`
COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \
$SED -e 's/^.* \(@<:@1-9@:>@\.@<:@0-9.@:>@*\) .*$/\1/'`
$SED -e 's/^.* \(@<:@1-9@:>@@<:@0-9@:>@*\.@<:@0-9.@:>@*\) .*$/\1/'`
elif test "x$TOOLCHAIN_TYPE" = xclang; then
# clang --version output typically looks like
# Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn)
Expand Down
30 changes: 14 additions & 16 deletions corba/THIRD_PARTY_README
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1643,7 +1643,7 @@ July 15, 2018

-------------------------------------------------------------------------------

%% This notice is provided with respect to GIFLIB 5.1.8 & libungif 4.1.3,
%% This notice is provided with respect to GIFLIB 5.2.1 & libungif 4.1.3,
which may be included with JRE 8, JDK 8, and OpenJDK 8.

--- begin of LICENSE ---
Expand Down Expand Up @@ -2898,39 +2898,37 @@ to do so,subject to the following conditions:

-------------------------------------------------------------------------------

%% This notice is provided with respect to X Window System 6.8.2, which may be
%% This notice is provided with respect to xwd v1.0.7, which may be
included with JRE 8, JDK 8, and OpenJDK 8 on Linux and Solaris.

xwd utility

--- begin of LICENSE ---

This is the copyright for the files in src/solaris/native/sun/awt: list.h,
multiVis.h, wsutils.h, list.c, multiVis.c
Copyright (c) 1994 Hewlett-Packard Co.
Copyright (c) 1996 X Consortium
Copyright 1994 Hewlett-Packard Co.
Copyright 1996, 1998 The Open Group

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
the above copyright notice appear in all copies and that both that
copyright notice and this permission notice appear in supporting
documentation.

The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.

Except as contained in this notice, the name of the X Consortium shall
Except as contained in this notice, the name of The Open Group shall
not be used in advertising or otherwise to promote the sale, use or
other dealings in this Software without prior written authorization
from the X Consortium.
from The Open Group.

--- end of LICENSE ---
_____________________________
Expand Down
30 changes: 14 additions & 16 deletions hotspot/THIRD_PARTY_README
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1643,7 +1643,7 @@ July 15, 2018

-------------------------------------------------------------------------------

%% This notice is provided with respect to GIFLIB 5.1.8 & libungif 4.1.3,
%% This notice is provided with respect to GIFLIB 5.2.1 & libungif 4.1.3,
which may be included with JRE 8, JDK 8, and OpenJDK 8.

--- begin of LICENSE ---
Expand Down Expand Up @@ -2898,39 +2898,37 @@ to do so,subject to the following conditions:

-------------------------------------------------------------------------------

%% This notice is provided with respect to X Window System 6.8.2, which may be
%% This notice is provided with respect to xwd v1.0.7, which may be
included with JRE 8, JDK 8, and OpenJDK 8 on Linux and Solaris.

xwd utility

--- begin of LICENSE ---

This is the copyright for the files in src/solaris/native/sun/awt: list.h,
multiVis.h, wsutils.h, list.c, multiVis.c
Copyright (c) 1994 Hewlett-Packard Co.
Copyright (c) 1996 X Consortium
Copyright 1994 Hewlett-Packard Co.
Copyright 1996, 1998 The Open Group

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
the above copyright notice appear in all copies and that both that
copyright notice and this permission notice appear in supporting
documentation.

The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.

Except as contained in this notice, the name of the X Consortium shall
Except as contained in this notice, the name of The Open Group shall
not be used in advertising or otherwise to promote the sale, use or
other dealings in this Software without prior written authorization
from the X Consortium.
from The Open Group.

--- end of LICENSE ---
_____________________________
Expand Down
7 changes: 6 additions & 1 deletion hotspot/agent/src/os/bsd/libproc_impl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,12 @@ lib_info* add_lib_info_fd(struct ps_prochandle* ph, const char* libname, int fd,
return NULL;
}

strncpy(newlib->name, libname, sizeof(newlib->name));
if (strlen(libname) >= sizeof(newlib->name)) {
print_debug("libname %s too long\n", libname);
return NULL;
}
strcpy(newlib->name, libname);

newlib->base = base;

if (fd == -1) {
Expand Down
Loading

0 comments on commit 0607a4a

Please sign in to comment.