diff --git a/.gitignore b/.gitignore index b7a8809..4a93ad0 100644 --- a/.gitignore +++ b/.gitignore @@ -127,3 +127,4 @@ /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u181-b16.tar.xz /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u191-b10.tar.xz /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u191-b12.tar.xz +/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u191-b13.tar.xz diff --git a/generate_source_tarball.sh b/generate_source_tarball.sh index 77a40f0..ecbc982 100755 --- a/generate_source_tarball.sh +++ b/generate_source_tarball.sh @@ -3,8 +3,8 @@ # # Example: # When used from local repo set REPO_ROOT pointing to file:// with your repo -# if your local repo follows upstream forests conventions, you may be enough by setting OPENJDK_URL -# if you wont to use local copy of patch PR2126 set path to it to PR2126 variable +# 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 # # 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$PR2126" = "x" ] ; then - if [ ! -f "$PR2126" ] ; then - echo "You have specified PR2126 as $PR2126 but it does not exists. exiting" +if [ ! "x$PR3667" = "x" ] ; then + if [ ! -f "$PR3667" ] ; then + echo "You have specified PR3667 as $PR3667 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 "PR2126 - the path to the PR2126 patch to apply (optional; downloaded if unavailable)" + echo "PR3667 - the path to the PR3667 patch to apply (optional; downloaded if unavailable)" echo "REPOS - specify the repositories to use (optional; defaults to ${REPOS_DEFAULT})" exit 1; fi @@ -113,22 +113,26 @@ done if [ -d jdk ]; then echo "Removing EC source code we don't build" - -mv -v jdk/src/share/native/sun/security/ec/impl/ecc_impl.h . -rm -vrf jdk/src/share/native/sun/security/ec/impl -mkdir jdk/src/share/native/sun/security/ec/impl -mv -v ecc_impl.h jdk/src/share/native/sun/security/ec/impl +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 +rm -vf jdk/src/share/native/sun/security/ec/impl/ec2_193.c +rm -vf jdk/src/share/native/sun/security/ec/impl/ec2_233.c +rm -vf jdk/src/share/native/sun/security/ec/impl/ec2_aff.c +rm -vf jdk/src/share/native/sun/security/ec/impl/ec2_mont.c +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$PR2126" = "x" ] ; then -# get pr2126.patch (from http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=8d2c9a898f50) from most correct tag -# Do not push it or publish it (see http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2126) - wget http://icedtea.classpath.org/hg/icedtea8/raw-file/tip/patches/pr2126.patch - patch -Np1 < pr2126.patch - rm pr2126.patch + +if [ "x$PR3667" = "x" ] ; then +# get pr3667.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) + wget http://icedtea.classpath.org/hg/icedtea8/raw-file/tip/patches/pr3667.patch + patch -Np1 < pr3667.patch + rm pr3667.patch else - echo "Applying ${PR2126}" - patch -Np1 < $PR2126 + echo "Applying ${PR3667}" + patch -Np1 < $PR3667 fi; fi find . -name '*.orig' -exec rm -vf '{}' ';' diff --git a/java-1.8.0-openjdk-remove-intree-libraries.sh b/java-1.8.0-openjdk-remove-intree-libraries.sh index 201a220..b52d016 100644 --- a/java-1.8.0-openjdk-remove-intree-libraries.sh +++ b/java-1.8.0-openjdk-remove-intree-libraries.sh @@ -129,3 +129,10 @@ rm -vf ${LCMS_SRC}/lcms2.h rm -vf ${LCMS_SRC}/lcms2_internal.h rm -vf ${LCMS_SRC}/lcms2_plugin.h fi + +# Get rid of in-tree SunEC until RH1656676 is implemented +echo "Removing SunEC native code" +mv -v openjdk/jdk/src/share/native/sun/security/ec/impl/ecc_impl.h . +rm -vrf openjdk/jdk/src/share/native/sun/security/ec/impl +mkdir openjdk/jdk/src/share/native/sun/security/ec/impl +mv -v ecc_impl.h openjdk/jdk/src/share/native/sun/security/ec/impl diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index 2529db4..7c9af01 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -225,7 +225,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-jdk8u191-b12 +%global shenandoah_revision aarch64-shenandoah-jdk8u191-b13 # Define old aarch64/jdk8u tree variables for compatibility %global project %{shenandoah_project} %global repo %{shenandoah_repo} @@ -970,7 +970,7 @@ Provides: java-%{javaver}-%{origin}-accessibility = %{epoch}:%{version}-%{releas Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever}.%{buildver} -Release: 13%{?dist} +Release: 0%{?dist} # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons # and this change was brought into RHEL-4. java-1.5.0-ibm packages # also included the epoch in their virtual provides. This created a @@ -2347,6 +2347,11 @@ require "copy_jdk_configs.lua" %endif %changelog +* Wed Jan 09 2019 Andrew Hughes - 1:1.8.0.191.b13-0 +- Update to aarch64-shenandoah-jdk8u191-b13. +- Update tarball generation script in preparation for PR3667/RH1656676 SunEC changes. +- Use remove-intree-libraries.sh to remove the remaining SunEC code for now. + * Wed Dec 19 2018 Andrew John Hughes - 1:1.8.0.191.b12-13 - Fix jdk8073139-pr1758-rh1191652-ppc64_le_says_its_arch_is_ppc64_not_ppc64le_jdk.patch paths to pass git apply diff --git a/sources b/sources index 7cd45d3..0a6bbc4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz) = cf578221b77d8c7e019f69909bc86c419c5fb5e10bceba9592ff6e7f96887b0a7f07c9cefe90800975247a078785ca190fdec5c2d0f841bb447cee784b570f7d -SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u191-b12.tar.xz) = 1cefbddc40a87fcbcbd875dc83d3897137c6ded3bd18190c3c8e96f89bb5c7edb29750095bb47dd96be062d093f488327f4993f9690975fde2dbaededd7d4e55 +SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u191-b13.tar.xz) = 56fc01edf3c8a7f7ad5af719983837d70efa10877b066ab4021cb8e753cf9edfd8c86433e9b04e859f09478d98533fca06360a0ee0d58c17e3405b737c77689a