Update to aarch64-shenandoah-jdk8u302-b08 (GA)

Update release notes for 8u302-b08. Switch to GA mode for final release. Remove non-Free test and demo files from source tarball. Resolves: rhbz#1967813
2021-08-08 06:04:15 +01:00 · 2021-08-08 06:04:15 +01:00 · eb98e068b7
commit eb98e068b7
parent 6f55767b15
6 changed files with 106 additions and 18 deletions
--- a/.gitignore
+++ b/.gitignore
@ -237,3 +237,5 @@
 /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u302-b05-4curve.tar.xz
 /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u302-b06-4curve.tar.xz
 /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u302-b07-4curve.tar.xz
+/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u302-b08-4curve.tar.xz
+/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u302-b08-4curve-clean.tar.xz
--- a/15
+++ b/15
@ -10,6 +10,20 @@ Live versions of these release notes can be found at:
  * https://builds.shipilev.net/backports-monitor/release-notes-openjdk8u302.txt

 * 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
  - JDK-6878250: (so) IllegalBlockingModeException thrown when reading from a closed SocketChannel's InputStream
  - JDK-6990210: [TEST_BUG] EventDispatchThread/HandleExceptionOnEDT/HandleExceptionOnEDT.java fails on gnome
@ -144,6 +158,7 @@ Live versions of these release notes can be found at:
  - JDK-8268444: keytool -v -list print is incorrect after backport JDK-8141457
  - JDK-8269388: Default build of OpenJDK 8 fails on newer GCCs with warnings as errors on format-overflow
  - JDK-8269468: JDK-8269388 breaks the build on older GCCs
+  - JDK-8270533: AArch64: size_fits_all_mem_uses should return false if its output is a CAS
 * Shenandoah
  - [backport] JDK-8259580: Shenandoah: uninitialized label in VerifyThreadGCState
  - [backport] JDK-8259954: gc/shenandoah/mxbeans tests fail with -Xcomp
--- a/generate_source_tarball.sh
+++ b/generate_source_tarball.sh
@ -19,12 +19,25 @@
 # level folder, name is created, based on parameter
 #

+SCRIPT_DIR=$(dirname $0)
+JCONSOLE_JS_PATCH_DEFAULT=${SCRIPT_DIR}/jconsole-plugin.patch
+
 if [ ! "x$PR3822" = "x" ] ; then
  if [ ! -f "$PR3822" ] ; then
-    echo "You have specified PR3822 as $PR3822 but it does not exists. exiting"
+    echo "You have specified PR3822 as $PR3822 but it does not exist. Exiting"
    exit 1
  fi
 fi
+
+if [ "x${JCONSOLE_JS_PATCH}" != "x" ] ; then
+    if [ ! -f "${JCONSOLE_JS_PATCH}" ] ; then
+	echo "You have specified the jconsole.js patch as ${JCONSOLE_JS_PATCH} but it does not exist. Exiting.";
+	exit 2;
+    fi
+else
+    JCONSOLE_JS_PATCH=${JCONSOLE_JS_PATCH_DEFAULT}
+fi
+
 set -e

 OPENJDK_URL_DEFAULT=http://hg.openjdk.java.net
@ -42,6 +55,7 @@ if [ "x$1" = "xhelp" ] ; then
    echo "FILE_NAME_ROOT - name of the archive, minus extensions (optional; defaults to PROJECT_NAME-REPO_NAME-VERSION)"
    echo "REPO_ROOT - the location of the Mercurial repository to archive (optional; defaults to OPENJDK_URL/PROJECT_NAME/REPO_NAME)"
    echo "PR3822 - the path to the PR3822 patch to apply (optional; downloaded if unavailable)"
+    echo "JCONSOLE_JS_PATCH - the path to a patch to fix non-availiability of jconsole.js (optional; defaults to ${JCONSOLE_JS_PATCH_DEFAULT})"
    echo "REPOS - specify the repositories to use (optional; defaults to ${REPOS_DEFAULT})"
    exit 1;
 fi
@ -88,6 +102,22 @@ if [ "x$REPO_ROOT" = "x" ] ; then
    REPO_ROOT="${OPENJDK_URL}/${PROJECT_NAME}/${REPO_NAME}"
    echo "No repository root specified; default to ${REPO_ROOT}"
 fi;
+if [ "x$REPOS" = "x" ] ; then
+    REPOS=${REPOS_DEFAULT}
+    echo "No repositories specified; defaulting to ${REPOS}"
+fi;
+
+echo -e "Settings:"
+echo -e "\tVERSION: ${VERSION}"
+echo -e "\tPROJECT_NAME: ${PROJECT_NAME}"
+echo -e "\tREPO_NAME: ${REPO_NAME}"
+echo -e "\tOPENJDK_URL: ${OPENJDK_URL}"
+echo -e "\tCOMPRESSION: ${COMPRESSION}"
+echo -e "\tFILE_NAME_ROOT: ${FILE_NAME_ROOT}"
+echo -e "\tREPO_ROOT: ${REPO_ROOT}"
+echo -e "\tPR3822: ${PR3822}"
+echo -e "\tJCONSOLE_JS_PATCH: ${JCONSOLE_JS_PATCH}"
+echo -e "\tREPOS: ${REPOS}"

 mkdir "${FILE_NAME_ROOT}"
 pushd "${FILE_NAME_ROOT}"
@ -96,22 +126,22 @@ echo "Cloning ${VERSION} root repository from ${REPO_ROOT}"
 hg clone ${REPO_ROOT} openjdk -r ${VERSION}
 pushd openjdk
 	
-
-if [ "x$REPOS" = "x" ] ; then
-    repos=${REPOS_DEFAULT}
-    echo "No repositories specified; defaulting to ${repos}"
-else
-    repos=$REPOS
-    echo "Repositories: ${repos}"
-fi;
-
-for subrepo in $repos
+for subrepo in ${REPOS}
 do
    echo "Cloning ${VERSION} ${subrepo} repository from ${REPO_ROOT}"
    hg clone ${REPO_ROOT}/${subrepo} -r ${VERSION}
 done

-if [ -d jdk ]; then 
+# UnderlineTaglet.java has a BSD license with a field-of-use restriction, making it non-Free
+if [ -d langtools ] ; then
+    echo "Removing langtools test case with non-Free license"
+    rm -vf langtools/test/tools/javadoc/api/basic/TagletPathTest.java
+    rm -vf langtools/test/tools/javadoc/api/basic/taglets/UnderlineTaglet.java
+fi
+if [ -d jdk ]; then
+# jconsole.js has a BSD license with a field-of-use restriction, making it non-Free
+echo "Removing jconsole-plugin file with non-Free license"
+rm -vf jdk/src/share/demo/scripting/jconsole-plugin/src/resources/jconsole.js
 echo "Removing EC source code we don't build"
 rm -vf jdk/src/share/native/sun/security/ec/impl/ec2.h
 rm -vf jdk/src/share/native/sun/security/ec/impl/ec2_163.c
@ -123,7 +153,6 @@ rm -vf jdk/src/share/native/sun/security/ec/impl/ecp_192.c
 rm -vf jdk/src/share/native/sun/security/ec/impl/ecp_224.c

 echo "Syncing EC list with NSS"
-
 if [ "x$PR3822" = "x" ] ; then
 # get pr3822.patch (from http://icedtea.classpath.org/hg/icedtea8) from most correct tag
 # Do not push it or publish it (see http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3822)
@ -135,6 +164,10 @@ else
    patch -Np1 < $PR3822
 fi;
 fi
+
+echo "Patching out use of jconsole.js"
+patch -Np1 < ${JCONSOLE_JS_PATCH}
+
 find . -name '*.orig' -exec rm -vf '{}' ';'

 popd
@ -144,7 +177,7 @@ if [ "X$COMPRESSION" = "Xxz" ] ; then
 else
    SWITCH=czf
 fi
-TARBALL_NAME=${FILE_NAME_ROOT}-4curve.tar.${COMPRESSION}
+TARBALL_NAME=${FILE_NAME_ROOT}-4curve-clean.tar.${COMPRESSION}
 tar --exclude-vcs -$SWITCH ${TARBALL_NAME} openjdk
 mv ${TARBALL_NAME} ..

--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@ -274,7 +274,7 @@
 # note, following three variables are sedded from update_sources if used correctly. Hardcode them rather there.
 %global shenandoah_project	aarch64-port
 %global shenandoah_repo		jdk8u-shenandoah
-%global shenandoah_revision    	aarch64-shenandoah-jdk8u302-b07
+%global shenandoah_revision    	aarch64-shenandoah-jdk8u302-b08
 # Define old aarch64/jdk8u tree variables for compatibility
 %global project         %{shenandoah_project}
 %global repo            %{shenandoah_repo}
@ -294,7 +294,7 @@
 # Release will be (where N is usually a number starting at 1):
 # - 0.N%%{?extraver}%%{?dist} for EA releases,
 # - N%%{?extraver}{?dist} for GA releases
-%global is_ga           0
+%global is_ga           1
 %if %{is_ga}
 %global milestone          fcs
 %global milestone_version  %{nil}
@ -1217,7 +1217,7 @@ URL:      http://openjdk.java.net/
 # FILE_NAME_ROOT=%%{shenandoah_project}-%%{shenandoah_repo}-${VERSION}
 # REPO_ROOT=<path to checked-out repository> generate_source_tarball.sh
 # where the source is obtained from http://hg.openjdk.java.net/%%{project}/%%{repo}
-Source0: %{shenandoah_project}-%{shenandoah_repo}-%{shenandoah_revision}-4curve.tar.xz
+Source0: %{shenandoah_project}-%{shenandoah_repo}-%{shenandoah_revision}-4curve-clean.tar.xz

 # Custom README for -src subpackage
 Source2:  README.md
@ -2452,6 +2452,13 @@ cjc.mainProgram(args)
 %endif

 %changelog
+* Sun Aug 08 2021 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.302.b08-0
+- Update to aarch64-shenandoah-jdk8u302-b08 (GA)
+- Update release notes for 8u302-b08.
+- Switch to GA mode for final release.
+- Remove non-Free test and demo files from source tarball.
+- Resolves: rhbz#1967813
+
 * Thu Jul 08 2021 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.302.b07-0.0.ea
 - Update to aarch64-shenandoah-jdk8u302-b07 (EA)
 - Update release notes for 8u302-b07.
--- a/jconsole-plugin.patch
+++ b/jconsole-plugin.patch
@ -0,0 +1,31 @@
+diff --git openjdk.orig/jdk/src/share/demo/scripting/jconsole-plugin/README.txt openjdk/jdk/src/share/demo/scripting/jconsole-plugin/README.txt
+--- openjdk.orig/jdk/src/share/demo/scripting/jconsole-plugin/README.txt
+++ openjdk/jdk/src/share/demo/scripting/jconsole-plugin/README.txt
+@@ -18,11 +18,9 @@
+     engine      javax.script.ScriptEngine
+     plugin      com.sun.tools.jconsole.JConsolePlugin
+ 
+-If you use JavaScript, there are many useful global functions defined in 
+-./src/resources/jconsole.js. This is built into the script plugin jar file. 
+-In addition, you can add other global functions and global variables by 
+-defining those in ~/jconsole.js (or jconsole.<ext> where <ext> is the file 
+-extension for your scripting language of choice under your home directory).
+You can add global functions and global variables by defining those in
+~/jconsole.js (or jconsole.<ext> where <ext> is the file extension for
+your scripting language of choice under your home directory).
+ 
+ How do I compile script console plugin?
+ 
+diff --git openjdk.orig/jdk/src/share/demo/scripting/jconsole-plugin/build.xml openjdk/jdk/src/share/demo/scripting/jconsole-plugin/build.xml
+--- openjdk.orig/jdk/src/share/demo/scripting/jconsole-plugin/build.xml
+++ openjdk/jdk/src/share/demo/scripting/jconsole-plugin/build.xml
+@@ -73,9 +73,6 @@
+     <copy todir="${classes.dir}/META-INF/services">
+       <fileset dir="${src.dir}/META-INF/services"/>
+     </copy>
+-    <copy todir="${resources.dir}">
+-      <fileset dir="${src.dir}/resources"/>
+-    </copy>
+   </target>
+ 
+   <target name="all" depends="compile" description="buile deployment bundle">
--- a/2
+++ b/2
@ -1,2 +1,2 @@
 SHA512 (tapsets-icedtea-3.15.0.tar.xz) = c752a197cb3d812d50c35e11e4722772be40096c81d2a57933e0d9b8a3c708b9c157b8108a4e33a06ca7bb81648170994408c75d6f69d5ff12785d0c31009671
-SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u302-b07-4curve.tar.xz) = a228681a8b5fa437b9b0e2da5ce4ef1fa27b7cfcc639a375f499339479e10f68e422b69eda4a7db661769c8ef1290586c200c2d0197ec72cb56d99b4765f2c08
+SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u302-b08-4curve-clean.tar.xz) = 04ecdcde841038c0042b44fb3c5303a08616864566fb918ab261fc381fae8804a21f875b1645538e864a1c6db5985f16dfc13b91eb1caeeab54d6d07828c7657