------------------------------------------------------------
revno: 764
committer: Matthias Klose <[email protected]>
branch nick: openjdk8
timestamp: Wed 2021-11-03 13:53:36 +0000
message:
* Update to 8u312-b07 (GA).
* Security fixes
- JDK-8130183, CVE-2021-35588: InnerClasses: VM permits wrong Throw
ClassFormatError if InnerClasses attribute's inner_class_info_index is 0.
- JDK-8161016: Strange behavior of URLConnection with proxy.
- JDK-8163326, CVE-2021-35550: Update the default enabled cipher suites
preference.
- JDK-8254967, CVE-2021-35565: com.sun.net.HttpsServer spins on TLS
session close.
- JDK-8263314: Enhance XML Dsig modes.
- JDK-8265167, CVE-2021-35556: Richer Text Editors.
- JDK-8265574: Improve handling of sheets.
- JDK-8265580, CVE-2021-35559: Enhanced style for RTF kit.
- JDK-8265776: Improve Stream handling for SSL.
- JDK-8266097, CVE-2021-35561: Better hashing support.
- JDK-8266103: Better specified spec values.
- JDK-8266109: More Resilient Classloading.
- JDK-8266115: More Manifest Jar Loading.
- JDK-8266137, CVE-2021-35564: Improve Keystore integrity.
- JDK-8266689, CVE-2021-35567: More Constrained Delegation.
- JDK-8267086: ArrayIndexOutOfBoundsException in
java.security.KeyFactory.generatePublic.
- JDK-8267712: Better LDAP reference processing.
- JDK-8267729, CVE-2021-35578: Improve TLS client handshaking.
- JDK-8267735, CVE-2021-35586: Better BMP support.
- JDK-8268193: Improve requests of certificates.
- JDK-8268199: Correct certificate requests.
- JDK-8268506: More Manifest Digests.
- JDK-8269618, CVE-2021-35603: Better session identification.
- JDK-8269624: Enhance method selection support.
- JDK-8270398: Enhance canonicalization.
- JDK-8270404: Better canonicalization.
* Use mktemp instead of tempfile in maintainer script.
* Update to 8u302-b08 (GA).
* Security fixes
- JDK-8256157: Improve bytecode assembly
- JDK-8256491: Better HTTP transport
- JDK-8258432, CVE-2021-2341: Improve file transfers
- JDK-8260453: Improve Font Bounding
- JDK-8260960: Signs of jarsigner signing
- JDK-8260967, CVE-2021-2369: Better jar file validation
- JDK-8262380: Enhance XML processing passes
- JDK-8262403: Enhanced data transfer
- JDK-8262410: Enhanced rules for zones
- JDK-8262477: Enhance String Conclusions
- JDK-8262967: Improve Zip file support
- JDK-8264066, CVE-2021-2388: Enhance compiler validation
- JDK-8264079: Improve abstractions
- JDK-8264460: Improve NTLM support
* Other changes:
See https://mail.openjdk.java.net/pipermail/jdk8u-dev/2021-July/014118.html
* Update to 8u292-b10 (GA).
* Security fixes
- JDK-8227467: Better class method invocations
- JDK-8244473: Contextualize registration for JNDI
- JDK-8244543: Enhanced handling of abstract classes
- JDK-8249906, CVE-2021-2163: Enhance opening JARs
- JDK-8250568, CVE-2021-2161: Less ambiguous processing
- JDK-8253799: Make lists of normal filenames
* Other changes:
See https://mail.openjdk.java.net/pipermail/jdk8u-dev/2021-April/013680.html
removed:
debian/patches/compare-pointer-with-literal.patch
debian/patches/enable-sa-on-aarch64.diff
debian/patches/jdk-java-nio-bits-unligned-aarch64.diff
modified:
corba.tar.xz
debian/JB-jre-headless.postinst.in
debian/changelog
debian/control
debian/control.in
debian/patches/aarch32.diff
debian/patches/aarch64.diff
debian/patches/hotspot-warn-no-errformat.diff
debian/patches/zero-sh.diff
debian/rules
hotspot-aarch32.tar.xz
hotspot-aarch64.tar.xz
hotspot.tar.xz
jaxp.tar.xz
jaxws.tar.xz
jdk.tar.xz
langtools.tar.xz
nashorn.tar.xz
root.tar.xz
--
lp:~openjdk/openjdk/openjdk8
https://code.launchpad.net/~openjdk/openjdk/openjdk8
Your team Debian Java Maintainers is subscribed to branch
lp:~openjdk/openjdk/openjdk8.
To unsubscribe from this branch go to
https://code.launchpad.net/~openjdk/openjdk/openjdk8/+edit-subscription
=== modified file 'corba.tar.xz'
Binary files corba.tar.xz 2021-04-21 10:35:15 +0000 and corba.tar.xz 2021-11-03 13:53:36 +0000 differ
=== modified file 'debian/JB-jre-headless.postinst.in'
--- debian/JB-jre-headless.postinst.in 2014-05-29 08:50:43 +0000
+++ debian/JB-jre-headless.postinst.in 2021-11-03 13:53:36 +0000
@@ -109,7 +109,7 @@
# activate class data sharing
case @archdir@ in i386|sparc)
rm -f $basedir/jre/lib/@archdir@/client/classes.jsa
- log=$(tempfile)
+ log=$(mktemp)
if ! $basedir/bin/java -client -Xshare:dump -XX:PermSize=128m > $log; then
cat >&2 $log
rm -f $log
@@ -121,7 +121,7 @@
esac
case @archdir@ in amd64|i386|sparc)
rm -f $basedir/jre/lib/@archdir@/server/classes.jsa
- log=$(tempfile)
+ log=$(mktemp)
if ! $basedir/bin/java -server -Xshare:dump > $log; then
cat >&2 $log
rm -f $log
=== modified file 'debian/changelog'
--- debian/changelog 2021-04-21 10:35:15 +0000
+++ debian/changelog 2021-11-03 13:53:36 +0000
@@ -1,3 +1,79 @@
+openjdk-8 (8u312-b07-0ubuntu1) jammy; urgency=medium
+
+ * Update to 8u312-b07 (GA).
+ * Security fixes
+ - JDK-8130183, CVE-2021-35588: InnerClasses: VM permits wrong Throw
+ ClassFormatError if InnerClasses attribute's inner_class_info_index is 0.
+ - JDK-8161016: Strange behavior of URLConnection with proxy.
+ - JDK-8163326, CVE-2021-35550: Update the default enabled cipher suites
+ preference.
+ - JDK-8254967, CVE-2021-35565: com.sun.net.HttpsServer spins on TLS
+ session close.
+ - JDK-8263314: Enhance XML Dsig modes.
+ - JDK-8265167, CVE-2021-35556: Richer Text Editors.
+ - JDK-8265574: Improve handling of sheets.
+ - JDK-8265580, CVE-2021-35559: Enhanced style for RTF kit.
+ - JDK-8265776: Improve Stream handling for SSL.
+ - JDK-8266097, CVE-2021-35561: Better hashing support.
+ - JDK-8266103: Better specified spec values.
+ - JDK-8266109: More Resilient Classloading.
+ - JDK-8266115: More Manifest Jar Loading.
+ - JDK-8266137, CVE-2021-35564: Improve Keystore integrity.
+ - JDK-8266689, CVE-2021-35567: More Constrained Delegation.
+ - JDK-8267086: ArrayIndexOutOfBoundsException in
+ java.security.KeyFactory.generatePublic.
+ - JDK-8267712: Better LDAP reference processing.
+ - JDK-8267729, CVE-2021-35578: Improve TLS client handshaking.
+ - JDK-8267735, CVE-2021-35586: Better BMP support.
+ - JDK-8268193: Improve requests of certificates.
+ - JDK-8268199: Correct certificate requests.
+ - JDK-8268506: More Manifest Digests.
+ - JDK-8269618, CVE-2021-35603: Better session identification.
+ - JDK-8269624: Enhance method selection support.
+ - JDK-8270398: Enhance canonicalization.
+ - JDK-8270404: Better canonicalization.
+ * Use mktemp instead of tempfile in maintainer script.
+
+ -- Matthias Klose <[email protected]> Wed, 03 Nov 2021 14:27:30 +0200
+
+openjdk-8 (8u302-b08-0ubuntu2) impish; urgency=medium
+
+ * Update to 8u302-b08 (GA).
+ * Security fixes
+ - JDK-8256157: Improve bytecode assembly
+ - JDK-8256491: Better HTTP transport
+ - JDK-8258432, CVE-2021-2341: Improve file transfers
+ - JDK-8260453: Improve Font Bounding
+ - JDK-8260960: Signs of jarsigner signing
+ - JDK-8260967, CVE-2021-2369: Better jar file validation
+ - JDK-8262380: Enhance XML processing passes
+ - JDK-8262403: Enhanced data transfer
+ - JDK-8262410: Enhanced rules for zones
+ - JDK-8262477: Enhance String Conclusions
+ - JDK-8262967: Improve Zip file support
+ - JDK-8264066, CVE-2021-2388: Enhance compiler validation
+ - JDK-8264079: Improve abstractions
+ - JDK-8264460: Improve NTLM support
+ * Other changes:
+ See https://mail.openjdk.java.net/pipermail/jdk8u-dev/2021-July/014118.html
+
+ -- Matthias Klose <[email protected]> Mon, 23 Aug 2021 16:45:43 +0200
+
+openjdk-8 (8u292-b10-0ubuntu1) hirsute; urgency=medium
+
+ * Update to 8u292-b10 (GA).
+ * Security fixes
+ - JDK-8227467: Better class method invocations
+ - JDK-8244473: Contextualize registration for JNDI
+ - JDK-8244543: Enhanced handling of abstract classes
+ - JDK-8249906, CVE-2021-2163: Enhance opening JARs
+ - JDK-8250568, CVE-2021-2161: Less ambiguous processing
+ - JDK-8253799: Make lists of normal filenames
+ * Other changes:
+ See https://mail.openjdk.java.net/pipermail/jdk8u-dev/2021-April/013680.html
+
+ -- Matthias Klose <[email protected]> Wed, 21 Apr 2021 12:25:15 +0200
+
openjdk-8 (8u282-b08-0ubuntu1) hirsute; urgency=medium
* Update to 8u282-b08 (GA).
=== modified file 'debian/control'
--- debian/control 2021-04-21 10:35:15 +0000
+++ debian/control 2021-11-03 13:53:36 +0000
@@ -7,10 +7,10 @@
Build-Depends: debhelper (>= 9), quilt, m4, lsb-release, zip, unzip,
sharutils, gawk, cpio, pkg-config, procps, wdiff, tzdata,
xvfb<!nocheck>, xauth<!nocheck>, xfonts-base<!nocheck>, libgl1-mesa-dri [!x32]<!nocheck>, xfwm4<!nocheck>, x11-xkb-utils<!nocheck>, dbus-x11<!nocheck>,
- jtreg<!nocheck>, testng<!nocheck>, default-jre-headless (>= 2:1.8)<!nocheck>, time,
+ jtreg<!nocheck>, testng<!nocheck>, time,
fastjar (>= 2:0.96-0ubuntu2),
autoconf (>= 2.69), automake, autotools-dev, ant, ant-optional,
- g++-9,
+ g++-11,
openjdk-8-jdk | openjdk-7-jdk,
libxtst-dev, libxi-dev, libxt-dev, libxaw7-dev, libxrender-dev, libcups2-dev, libasound2-dev, liblcms2-dev, libfreetype6-dev (>= 2.2.1), libxinerama-dev, libkrb5-dev, xsltproc, libpcsclite-dev, libgtk2.0-dev,
libffi-dev,
=== modified file 'debian/control.in'
--- debian/control.in 2021-04-21 10:35:15 +0000
+++ debian/control.in 2021-11-03 13:53:36 +0000
@@ -7,7 +7,7 @@
Build-Depends: debhelper (>= 9), quilt, m4, lsb-release, zip, unzip,
sharutils, gawk, cpio, pkg-config, procps, wdiff, tzdata,
xvfb@nocheck@, xauth@nocheck@, xfonts-base@nocheck@, libgl1-mesa-dri [!x32]@nocheck@, xfwm4@nocheck@, x11-xkb-utils@nocheck@, dbus-x11@nocheck@,
- jtreg@nocheck@, testng@nocheck@, default-jre-headless (>= 2:1.8)@nocheck@, time,
+ jtreg@nocheck@, testng@nocheck@, time,
@bd_fastjar@
@bd_autotools@ @bd_ant@
@bd_gcc@
=== modified file 'debian/patches/aarch32.diff'
--- debian/patches/aarch32.diff 2019-03-18 13:17:46 +0000
+++ debian/patches/aarch32.diff 2021-11-03 13:53:36 +0000
@@ -21,9 +21,9 @@
+ if test "x$OPENJDK_TARGET_CPU" = xaarch32; then
+ INCLUDE_SA=false
+ fi
- if test "x$OPENJDK_TARGET_CPU" = xaarch64; then
- INCLUDE_SA=false
- fi
+ AC_SUBST(INCLUDE_SA)
+
+ if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
--- a/common/autoconf/platform.m4
+++ b/common/autoconf/platform.m4
@@ -56,8 +56,8 @@ AC_DEFUN([PLATFORM_EXTRACT_VARS_FROM_CPU
@@ -166,7 +166,7 @@
+-client IGNORE
--- a/hotspot/make/defs.make
+++ b/hotspot/make/defs.make
-@@ -333,6 +333,11 @@ ifneq ($(OSNAME),windows)
+@@ -335,6 +335,11 @@ ifneq ($(OSNAME),windows)
LIBARCH/ppc64 = ppc64
LIBARCH/aarch32 = aarch32
@@ -175,6 +175,6 @@
+ LIBARCH = arm
+ endif
+
- LP64_ARCH += sparcv9 amd64 ia64 ppc64 zero
+ LP64_ARCH += sparcv9 amd64 ia64 ppc64 aarch64 zero
endif
=== modified file 'debian/patches/aarch64.diff'
--- debian/patches/aarch64.diff 2021-04-21 10:35:15 +0000
+++ debian/patches/aarch64.diff 2021-11-03 13:53:36 +0000
@@ -18,67 +18,3 @@
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
---- a/jdk/make/lib/SoundLibraries.gmk
-+++ b/jdk/make/lib/SoundLibraries.gmk
-@@ -143,6 +143,10 @@ else
- ifeq ($(OPENJDK_TARGET_CPU), ppc64le)
- LIBJSOUND_CFLAGS += -DX_ARCH=X_PPC64LE
- endif
-+
-+ ifeq ($(OPENJDK_TARGET_CPU), aarch64)
-+ LIBJSOUND_CFLAGS += -DX_ARCH=X_AARCH64
-+ endif
- endif
-
- LIBJSOUND_CFLAGS += -DEXTRA_SOUND_JNI_LIBS='"$(EXTRA_SOUND_JNI_LIBS)"'
---- a/jdk/src/share/native/com/sun/media/sound/SoundDefs.h
-+++ b/jdk/src/share/native/com/sun/media/sound/SoundDefs.h
-@@ -45,6 +45,7 @@
- #define X_PPC 8
- #define X_PPC64 9
- #define X_PPC64LE 10
-+#define X_AARCH64 11
-
- // **********************************
- // Make sure you set X_PLATFORM and X_ARCH defines correctly.
---- /dev/null
-+++ b/jdk/src/solaris/bin/aarch64/jvm.cfg
-@@ -0,0 +1,38 @@
-+# Copyright (c) 2011, 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
-+# under the terms of the GNU General Public License version 2 only, as
-+# published by the Free Software Foundation. Oracle designates this
-+# particular file as subject to the "Classpath" exception as provided
-+# by Oracle in the LICENSE file that accompanied this code.
-+#
-+# This code is distributed in the hope that it will be useful, but WITHOUT
-+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+# version 2 for more details (a copy is included in the LICENSE file that
-+# accompanied this code).
-+#
-+# You should have received a copy of the GNU General Public License version
-+# 2 along with this work; if not, write to the Free Software Foundation,
-+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+#
-+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+# or visit www.oracle.com if you need additional information or have any
-+# questions.
-+#
-+# List of JVMs that can be used as an option to java, javac, etc.
-+# Order is important -- first in this list is the default JVM.
-+# NOTE that this both this file and its format are UNSUPPORTED and
-+# WILL GO AWAY in a future release.
-+#
-+# You may also select a JVM in an arbitrary location with the
-+# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
-+# and may not be available in a future release.
-+#
-+# n.b. server must be first so it is used as the default
-+-server KNOWN
-+-minimal ERROR
-+-zero KNOWN
-+-shark ERROR
-+-jamvm ERROR
=== removed file 'debian/patches/compare-pointer-with-literal.patch'
--- debian/patches/compare-pointer-with-literal.patch 2017-01-23 10:17:38 +0000
+++ debian/patches/compare-pointer-with-literal.patch 1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
---- a/jdk/src/solaris/native/sun/awt/awt_Font.c
-+++ b/jdk/src/solaris/native/sun/awt/awt_Font.c
-@@ -502,7 +502,7 @@ awtJNI_GetFontData(JNIEnv * env, jobject
- jio_snprintf(fdata->flist[i].xlfd, strlen(nativename) + 10,
- nativename, size * 10);
-
-- if (nativename != NULL && nativename != "")
-+ if (nativename && !strcmp(nativename, ""))
- JNU_ReleaseStringPlatformChars(env, fontDescriptorName, (const char *) nativename);
-
- /*
=== removed file 'debian/patches/enable-sa-on-aarch64.diff'
--- debian/patches/enable-sa-on-aarch64.diff 2019-10-01 06:30:46 +0000
+++ debian/patches/enable-sa-on-aarch64.diff 1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
---- a/common/autoconf/generated-configure.sh
-+++ b/common/autoconf/generated-configure.sh
-@@ -14612,9 +14612,6 @@ $as_echo "$with_jvm_variants" >&6; }
- if test "x$VAR_CPU" = xppc64 -o "x$VAR_CPU" = xppc64le ; then
- INCLUDE_SA=false
- fi
-- if test "x$OPENJDK_TARGET_CPU" = xaarch64; then
-- INCLUDE_SA=false
-- fi
-
-
- if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
---- a/common/autoconf/jdk-options.m4
-+++ b/common/autoconf/jdk-options.m4
-@@ -161,9 +161,6 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JVM_VARIANTS
- if test "x$VAR_CPU" = xppc64 -o "x$VAR_CPU" = xppc64le ; then
- INCLUDE_SA=false
- fi
-- if test "x$OPENJDK_TARGET_CPU" = xaarch64; then
-- INCLUDE_SA=false
-- fi
- AC_SUBST(INCLUDE_SA)
-
- if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
=== modified file 'debian/patches/hotspot-warn-no-errformat.diff'
--- debian/patches/hotspot-warn-no-errformat.diff 2019-03-17 17:34:59 +0000
+++ debian/patches/hotspot-warn-no-errformat.diff 2021-11-03 13:53:36 +0000
@@ -9,11 +9,11 @@
-WARNINGS_ARE_ERRORS = -Werror
+WARNINGS_ARE_ERRORS = -Werror -Wno-error=format
# Enable these warnings. See 'info gcc' about details on these options
- WARNING_FLAGS = -Wpointer-arith -Wconversion -Wsign-compare -Wundef
+ WARNING_FLAGS = -Wpointer-arith -Wconversion -Wsign-compare -Wundef -Wformat=2
CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(WARNING_FLAGS)
--- a/hotspot/make/linux/makefiles/gcc.make
+++ b/hotspot/make/linux/makefiles/gcc.make
-@@ -201,7 +201,7 @@ else
+@@ -202,7 +202,7 @@ else
endif
# Compiler warnings are treated as errors
=== removed file 'debian/patches/jdk-java-nio-bits-unligned-aarch64.diff'
--- debian/patches/jdk-java-nio-bits-unligned-aarch64.diff 2019-03-17 17:34:59 +0000
+++ debian/patches/jdk-java-nio-bits-unligned-aarch64.diff 1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1502409945 -3600
-# Node ID 64e09337b9b7d253243e6160660e025b7269e04d
-# Parent 0c14af84f624bce3b6eafa8dedc1b4b4e85ab1f9
-8186090: java.nio.Bits.unaligned() doesn't handle aarch64
-Summary: Check for "aarch64" along with other unaligned access supporting architectures.
-Reviewed-by: andrew
-Contributed-by: Derek White <[email protected]>
-
---- a/jdk/src/share/classes/java/nio/Bits.java
-+++ b/jdk/src/share/classes/java/nio/Bits.java
-@@ -615,7 +615,8 @@ class Bits {
- new sun.security.action.GetPropertyAction("os.arch"));
- unaligned = arch.equals("i386") || arch.equals("x86")
- || arch.equals("amd64") || arch.equals("x86_64")
-- || arch.equals("ppc64") || arch.equals("ppc64le");
-+ || arch.equals("ppc64") || arch.equals("ppc64le")
-+ || arch.equals("aarch64");
- unalignedKnown = true;
- return unaligned;
- }
---- a/jdk/src/share/classes/sun/security/provider/ByteArrayAccess.java
-+++ b/jdk/src/share/classes/sun/security/provider/ByteArrayAccess.java
-@@ -94,7 +94,8 @@ final class ByteArrayAccess {
- String arch = java.security.AccessController.doPrivileged
- (new sun.security.action.GetPropertyAction("os.arch", ""));
- return arch.equals("i386") || arch.equals("x86") || arch.equals("amd64")
-- || arch.equals("x86_64") || arch.equals("ppc64") || arch.equals("ppc64le");
-+ || arch.equals("x86_64") || arch.equals("ppc64") || arch.equals("ppc64le")
-+ || arch.equals("aarch64");
- }
-
- /**
=== modified file 'debian/patches/zero-sh.diff'
--- debian/patches/zero-sh.diff 2021-04-21 10:35:15 +0000
+++ debian/patches/zero-sh.diff 2021-11-03 13:53:36 +0000
@@ -2,15 +2,15 @@
--- a/hotspot/src/os/linux/vm/os_linux.cpp
+++ b/hotspot/src/os/linux/vm/os_linux.cpp
-@@ -1971,6 +1971,7 @@ void * os::dll_load(const char *filename
+@@ -1976,6 +1976,7 @@ void * os::dll_load(const char *filename
{EM_PARISC, EM_PARISC, ELFCLASS32, ELFDATA2MSB, (char*)"PARISC"},
- {EM_68K, EM_68K, ELFCLASS32, ELFDATA2MSB, (char*)"M68k"}
+ {EM_68K, EM_68K, ELFCLASS32, ELFDATA2MSB, (char*)"M68k"},
{EM_AARCH64, EM_AARCH64, ELFCLASS64, ELFDATA2LSB, (char*)"AARCH64"},
+ {EM_SH, EM_SH, ELFCLASS32, ELFDATA2LSB, (char*)"Hitachi SH"}
};
#if (defined IA32)
-@@ -2002,9 +2003,11 @@ void * os::dll_load(const char *filename
+@@ -2008,9 +2009,11 @@ void * os::dll_load(const char *filename
static Elf32_Half running_arch_code=EM_68K;
#elif (defined AARCH64)
static Elf32_Half running_arch_code=EM_AARCH64;
@@ -18,8 +18,8 @@
+ static Elf32_Half running_arch_code=EM_SH;
#else
#error Method os::dll_load requires that one of following is defined:\
-- IA32, AMD64, IA64, __sparc, __powerpc__, ARM, S390, ALPHA, MIPS, MIPSEL, PARISC, M68K
-+ IA32, AMD64, IA64, __sparc, __powerpc__, ARM, S390, ALPHA, MIPS, MIPSEL, PARISC, M68K, SH
+- IA32, AMD64, IA64, __sparc, __powerpc__, ARM, S390, ALPHA, MIPS, MIPSEL, PARISC, M68K, AARCH64
++ IA32, AMD64, IA64, __sparc, __powerpc__, ARM, S390, ALPHA, MIPS, MIPSEL, PARISC, M68K, AARCH64, SH
#endif
// Identify compatability class for VM's architecture and library's architecture
=== modified file 'debian/rules'
--- debian/rules 2021-04-21 10:35:15 +0000
+++ debian/rules 2021-11-03 13:53:36 +0000
@@ -132,6 +132,9 @@
ifneq (,$(filter $(DEB_HOST_ARCH), armel))
with_check = disabled running check on $(DEB_HOST_ARCH)
endif
+ifneq (,$(filter $(distrel),precise))
+ with_check = disabled running check on $(distrel)
+endif
#with_check = disabled for this build
with_docs = $(if $(findstring nodoc, $(DEB_BUILD_OPTIONS)),,yes)
@@ -251,16 +254,16 @@
else ifneq (,$(filter $(distrel),wheezy quantal raring))
export CC = gcc-4.7
export CXX = g++-4.7
-else ifneq (,$(filter $(distrel),precise))
- export CC = gcc-4.6
- export CXX = g++-4.6
-else ifneq (,$(filter $(distrel),saucy trusty))
+#else ifneq (,$(filter $(distrel),precise))
+# export CC = gcc-4.6
+# export CXX = g++-4.6
+else ifneq (,$(filter $(distrel),saucy))
export CC = gcc-4.8
export CXX = g++-4.8
else ifneq (,$(filter $(distrel),utopic vivid jessie))
export CC = gcc-4.9
export CXX = g++-4.9
-else ifneq (,$(filter $(distrel),wily xenial))
+else ifneq (,$(filter $(distrel),xenial wily))
export CC = $(DEB_HOST_GNU_TYPE)-gcc-5
export CXX = $(DEB_HOST_GNU_TYPE)-g++-5
else ifneq (,$(filter $(distrel),zesty stretch))
@@ -269,12 +272,16 @@
else ifneq (,$(filter $(distrel),artful bionic))
export CC = $(DEB_HOST_GNU_TYPE)-gcc-7
export CXX = $(DEB_HOST_GNU_TYPE)-g++-7
-else ifneq (,$(filter $(distrel),buster))
+#else ifneq (,$(filter $(distrel),buster precise trusty))
+else ifneq (,$(filter $(distrel),buster precise))
export CC = $(DEB_HOST_GNU_TYPE)-gcc-8
export CXX = $(DEB_HOST_GNU_TYPE)-g++-8
-else
+else ifneq (,$(filter $(distrel),trusty xenial bionic focal hirsute))
export CC = $(DEB_HOST_GNU_TYPE)-gcc-9
export CXX = $(DEB_HOST_GNU_TYPE)-g++-9
+else
+ export CC = $(DEB_HOST_GNU_TYPE)-gcc-11
+ export CXX = $(DEB_HOST_GNU_TYPE)-g++-11
endif
ifneq (,$(filter $(DEB_HOST_ARCH), armel armhf))
@@ -352,7 +359,6 @@
workaround_expand_exec_shield_cs_limit.diff \
zero-architectures.diff \
adlc-parser.patch \
- compare-pointer-with-literal.patch \
multiple-pkcs11-library-init.patch \
applet-hole.patch \
libjpeg-fix.diff \
@@ -365,7 +371,6 @@
compiler-flags.diff \
jdk-841269-filechooser.patch \
jdk-i18n-pt_BR.diff \
- jdk-java-nio-bits-unligned-aarch64.diff \
hotspot-ia64.diff \
# FIXME:
@@ -422,9 +427,6 @@
ifneq (,$(filter $(DEB_HOST_ARCH), $(hotspot_aarch32_archs)))
COMMON_PATCHES += \
aarch32.diff
-else
- COMMON_PATCHES += \
- enable-sa-on-aarch64.diff
endif
ifneq (,$(filter $(DEB_HOST_ARCH), kfreebsd-amd64 kfreebsd-i386))
@@ -577,7 +579,14 @@
--with-libjpeg=system \
--with-lcms=system \
--with-libpcsclite=system \
+
+ifneq (,$(filter $(distrel),precise trusty))
+ COMMON_CONFIGURE_ARGS += \
+ --with-stdc++lib=static
+else
+ COMMON_CONFIGURE_ARGS += \
--with-stdc++lib=dynamic
+endif
ifneq (,$(NJOBS))
COMMON_CONFIGURE_ARGS += --with-num-cores=$(NJOBS)
@@ -659,26 +668,29 @@
# This section should be in sync with "CC/CXX" definition
ifneq (,$(filter $(distrel),squeeze lucid))
bd_gcc = g++-4.4 (>= 4.4.1),
-else ifneq (,$(filter $(distrel), precise))
- bd_gcc = g++-4.6,
+#else ifneq (,$(filter $(distrel), precise))
+# bd_gcc = g++-4.6,
else ifneq (,$(filter $(distrel), wheezy))
bd_gcc = g++-4.7, g++-4.4 [mips mipsel],
else ifneq (,$(filter $(distrel), quantal raring))
bd_gcc = g++-4.7,
-else ifneq (,$(filter $(distrel), saucy trusty))
+else ifneq (,$(filter $(distrel), saucy))
bd_gcc = g++-4.8,
else ifneq (,$(filter $(distrel),utopic vivid jessie))
bd_gcc = g++-4.9,
-else ifneq (,$(filter $(distrel),wily xenial))
+else ifneq (,$(filter $(distrel),xenial wily))
bd_gcc = g++-5,
else ifneq (,$(filter $(distrel),stretch zesty))
bd_gcc = g++-6,
else ifneq (,$(filter $(distrel),artful bionic))
bd_gcc = g++-7,
-else ifneq (,$(filter $(distrel),buster))
+#else ifneq (,$(filter $(distrel),buster precise trusty))
+else ifneq (,$(filter $(distrel),buster precise))
bd_gcc = g++-8,
-else
+else ifneq (,$(filter $(distrel),trusty xenial bionic focal hirsute))
bd_gcc = g++-9,
+else
+ bd_gcc = g++-11,
endif
bd_syslibs = zlib1g-dev, libattr1-dev,
ifneq (,$(filter $(distrel),squeeze lucid))
@@ -1995,17 +2007,17 @@
is_release =
is_release = yes
hg_project = jdk8u
-hg_tag = jdk8u282-b08
+hg_tag = jdk8u312-b07
package_version = $(subst jdk,,$(hg_tag))
ifneq ($(is_release),yes)
package_version := $(subst -,~,$(package_version))
endif
hg_url = http://hg.openjdk.java.net/jdk8u/$(hg_project)
hg_project_aarch64 = jdk8u-shenandoah
-hg_tag_aarch64 = aarch64-shenandoah-jdk8u282-b06
+hg_tag_aarch64 = aarch64-shenandoah-jdk8u312-b07
hg_url_aarch64 = http://hg.openjdk.java.net/aarch64-port/$(hg_project_aarch64)
hg_project_aarch32 = jdk8u
-hg_tag_aarch32 = jdk8u282-b07-aarch32-20210111
+hg_tag_aarch32 = jdk8u312-b07-aarch32-20211101
hg_url_aarch32 = http://hg.openjdk.java.net/aarch32-port/$(hg_project_aarch32)
origdir = ../openjdk-8-$(package_version).orig
orig_tarball = ../openjdk-8_$(package_version).orig.tar.xz
=== modified file 'hotspot-aarch32.tar.xz'
Binary files hotspot-aarch32.tar.xz 2021-04-21 10:35:15 +0000 and hotspot-aarch32.tar.xz 2021-11-03 13:53:36 +0000 differ
=== modified file 'hotspot-aarch64.tar.xz'
Binary files hotspot-aarch64.tar.xz 2021-04-21 10:35:15 +0000 and hotspot-aarch64.tar.xz 2021-11-03 13:53:36 +0000 differ
=== modified file 'hotspot.tar.xz'
Binary files hotspot.tar.xz 2021-04-21 10:35:15 +0000 and hotspot.tar.xz 2021-11-03 13:53:36 +0000 differ
=== modified file 'jaxp.tar.xz'
Binary files jaxp.tar.xz 2021-04-21 10:35:15 +0000 and jaxp.tar.xz 2021-11-03 13:53:36 +0000 differ
=== modified file 'jaxws.tar.xz'
Binary files jaxws.tar.xz 2021-04-21 10:35:15 +0000 and jaxws.tar.xz 2021-11-03 13:53:36 +0000 differ
=== modified file 'jdk.tar.xz'
Binary files jdk.tar.xz 2021-04-21 10:35:15 +0000 and jdk.tar.xz 2021-11-03 13:53:36 +0000 differ
=== modified file 'langtools.tar.xz'
Binary files langtools.tar.xz 2021-04-21 10:35:15 +0000 and langtools.tar.xz 2021-11-03 13:53:36 +0000 differ
=== modified file 'nashorn.tar.xz'
Binary files nashorn.tar.xz 2021-04-21 10:35:15 +0000 and nashorn.tar.xz 2021-11-03 13:53:36 +0000 differ
=== modified file 'root.tar.xz'
Binary files root.tar.xz 2021-04-21 10:35:15 +0000 and root.tar.xz 2021-11-03 13:53:36 +0000 differ
__
This is the maintainer address of Debian's Java team
<https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-maintainers>.
Please use
[email protected] for discussions and questions.
