Update generate_source_tarball.sh script to use the PR3756 patch and retain the secp256k1 curve.

Regenerate source tarball using the updated script and add the -'4curve' suffix.

generate_source_tarball.sh

@@ -4,7 +4,7 @@
 # Example:
 # When used from local repo set REPO_ROOT pointing to file:// with your repo
 # If your local repo follows upstream forests conventions, it may be enough to set OPENJDK_URL
-# If you want to use a local copy of patch PR3667, set the path to it in the PR3667 variable
+# If you want to use a local copy of patch PR3756, set the path to it in the PR3756 variable
 #
 # In any case you have to set PROJECT_NAME REPO_NAME and VERSION. eg:
 # PROJECT_NAME=jdk8u   OR   aarch64-port 
@@ -19,9 +19,9 @@
 # level folder, name is created, based on parameter
 #
 
-if [ ! "x$PR3667" = "x" ] ; then
+if [ ! "x$PR3756" = "x" ] ; then
-  if [ ! -f "$PR3667" ] ; then
+  if [ ! -f "$PR3756" ] ; then
-    echo "You have specified PR3667 as $PR3667 but it does not exists. exiting"
+    echo "You have specified PR3756 as $PR3756 but it does not exists. exiting"
     exit 1
   fi
 fi
@@ -41,7 +41,7 @@ if [ "x$1" = "xhelp" ] ; then
     echo "COMPRESSION - the compression type to use (optional; defaults to ${COMPRESSION_DEFAULT})"
     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 "PR3667 - the path to the PR3667 patch to apply (optional; downloaded if unavailable)"
+    echo "PR3756 - the path to the PR3756 patch to apply (optional; downloaded if unavailable)"
     echo "REPOS - specify the repositories to use (optional; defaults to ${REPOS_DEFAULT})"
     exit 1;
 fi
@@ -124,15 +124,15 @@ rm -vf jdk/src/share/native/sun/security/ec/impl/ecp_224.c
 
 echo "Syncing EC list with NSS"
 
-if [ "x$PR3667" = "x" ] ; then
+if [ "x$PR3756" = "x" ] ; then
-# get pr3667.patch (from http://icedtea.classpath.org/hg/icedtea8) from most correct tag
+# get pr3756.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=3667)
+# Do not push it or publish it (see http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3756)
-    wget http://icedtea.classpath.org/hg/icedtea8/raw-file/tip/patches/pr3667.patch
+    wget http://icedtea.classpath.org/hg/icedtea8/raw-file/tip/patches/pr3756.patch
-    patch -Np1 < pr3667.patch
+    patch -Np1 < pr3756.patch
-    rm pr3667.patch
+    rm pr3756.patch
 else
-    echo "Applying ${PR3667}"
+    echo "Applying ${PR3756}"
-    patch -Np1 < $PR3667
+    patch -Np1 < $PR3756
 fi;
 fi
 find . -name '*.orig' -exec rm -vf '{}' ';'
@@ -140,12 +140,14 @@ find . -name '*.orig' -exec rm -vf '{}' ';'
 popd
 echo "Compressing remaining forest"
 if [ "X$COMPRESSION" = "Xxz" ] ; then
-    tar --exclude-vcs -cJf ${FILE_NAME_ROOT}.tar.${COMPRESSION} openjdk
+    SWITCH=cJf
 else
-    tar --exclude-vcs -czf ${FILE_NAME_ROOT}.tar.${COMPRESSION} openjdk
+    SWITCH=czf
 fi
+TARBALL_NAME=${FILE_NAME_ROOT}-4curve.tar.${COMPRESSION}
+tar --exclude-vcs -$SWITCH ${TARBALL_NAME} openjdk
+mv ${TARBALL_NAME} ..
 
-mv ${FILE_NAME_ROOT}.tar.${COMPRESSION}  ..
 popd
 echo "Done. You may want to remove the uncompressed version."
 

java-1.8.0-openjdk.spec

@@ -245,7 +245,7 @@
 %global updatever       %(VERSION=%{whole_update}; echo ${VERSION##*u})
 # eg jdk8u60-b27 -> b27
 %global buildver        %(VERSION=%{version_tag}; echo ${VERSION##*-})
-%global rpmrelease      2
+%global rpmrelease      3
 # Define milestone (EA for pre-releases, GA ("fcs") for releases)
 # Release will be (where N is usually a number starting at 1):
 # - 0.N%%{?extraver}%%{?dist} for EA releases,
@@ -1047,7 +1047,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}.tar.xz
+Source0: %{shenandoah_project}-%{shenandoah_repo}-%{shenandoah_revision}-4curve.tar.xz
 
 # Custom README for -src subpackage
 Source2:  README.md
@@ -2236,6 +2236,10 @@ require "copy_jdk_configs.lua"
 %endif
 
 %changelog
+* Fri May 22 2020 Andrew John Hughes <gnu.andrew@redhat.com> - 1:1.8.0.252.b01-0.3.ea
+- Update generate_source_tarball.sh script to use the PR3756 patch and retain the secp256k1 curve.
+- Regenerate source tarball using the updated script and add the -'4curve' suffix.
+
 * Wed May 20 2020 Nicolas De Amicis <deamicis@bluewin.ch> - 1:1.8.0.252.b01-0.2.ea
 - Switch package openjfx from openjfx to openjfx8
 

sources

@@ -1,2 +1,2 @@
 SHA512 (tapsets-icedtea-3.15.0.tar.xz) = c752a197cb3d812d50c35e11e4722772be40096c81d2a57933e0d9b8a3c708b9c157b8108a4e33a06ca7bb81648170994408c75d6f69d5ff12785d0c31009671
-SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u252-b01.tar.xz) = 0cf78ddff5601964371ae754713d7e46e271dab183aa87bf9de760a45050a80e5183022404ec4b73215fb38b6baeecd1a29bc81139c59b773107ed350c6c7e81
+SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u252-b01-4curve.tar.xz) = 168ca286aef346c6c525ce47606c062bdda241d231594a9f7cd9f7ee99a633bbf9aebd59bbee1c0af43b1eb61362d33114aa066f296629916836067692c82eaa