diff --git a/.gitignore b/.gitignore index fc72544..401e9bc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ SOURCES/class-rewriter.tar.gz -SOURCES/openjdk-icedtea-2.6.9.tar.xz +SOURCES/openjdk-icedtea-2.6.10.tar.xz SOURCES/pulseaudio.tar.gz SOURCES/systemtap-tapset-2016-07-20.tar.xz diff --git a/.java-1.7.0-openjdk.metadata b/.java-1.7.0-openjdk.metadata index 6db2a35..e0d125b 100644 --- a/.java-1.7.0-openjdk.metadata +++ b/.java-1.7.0-openjdk.metadata @@ -1,4 +1,4 @@ fcc167de17354efb6e52cb387eb3e7dbb0316b53 SOURCES/class-rewriter.tar.gz -ab167e7666de62316bdbee393b3628479b35206b SOURCES/openjdk-icedtea-2.6.9.tar.xz +b0b9dd34ac08e01b48cea8d5bcd8364dbd670b7f SOURCES/openjdk-icedtea-2.6.10.tar.xz fb72b6b1f4735ad9b5799d0b5058b0b1dec67b17 SOURCES/pulseaudio.tar.gz 99b0cc8fa222bc6339374cfb8f8560d911613502 SOURCES/systemtap-tapset-2016-07-20.tar.xz diff --git a/SOURCES/fsg.sh b/SOURCES/fsg.sh index 7325163..61065cb 100644 --- a/SOURCES/fsg.sh +++ b/SOURCES/fsg.sh @@ -130,5 +130,5 @@ else echo "Applying ${PR2124}" patch -Np0 < $PR2124 fi; -echo "Cleaning up after patch application" +echo "Cleaning up after patch application..." find . -name '*.orig' | xargs rm -vf diff --git a/SOURCES/rh1022017.patch b/SOURCES/rh1022017.patch index 3585029..4983884 100644 --- a/SOURCES/rh1022017.patch +++ b/SOURCES/rh1022017.patch @@ -1,8 +1,8 @@ diff --git a/src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java b/src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java --- openjdk/jdk/src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java +++ openjdk/jdk/src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java -@@ -160,20 +160,10 @@ - } +@@ -168,20 +168,10 @@ + "contains no supported elliptic curves"); } } else { // default curves - int[] ids; diff --git a/SPECS/java-1.7.0-openjdk.spec b/SPECS/java-1.7.0-openjdk.spec index 61d2c68..780180b 100644 --- a/SPECS/java-1.7.0-openjdk.spec +++ b/SPECS/java-1.7.0-openjdk.spec @@ -5,7 +5,7 @@ # conflicting) files in the -debuginfo package %undefine _missing_build_ids_terminate_build -%global icedtea_version 2.6.9 +%global icedtea_version 2.6.10 %global hg_tag icedtea-{icedtea_version} %global aarch64 aarch64 arm64 armv8 @@ -138,8 +138,8 @@ # Standard JPackage naming and versioning defines. %global origin openjdk -%global updatever 131 -%global buildver 00 +%global updatever 141 +%global buildver 02 # Keep priority on 7digits in case updatever>9 %global priority 1700%{updatever} %global javaver 1.7.0 @@ -189,7 +189,7 @@ grep -e md5sum -A 20 $specfile | grep $currentMd5sum Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever} -Release: %{icedtea_version}.0%{?dist} +Release: %{icedtea_version}.1%{?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 @@ -1119,7 +1119,8 @@ if [ "$1" -gt 1 ]; then "${sum}" = '795b59e52fe426f59d76d43defafabab' -o \ "${sum}" = 'ec53f8629ce93fd2d8cdb1a143cbefdf' -o \ "${sum}" = '7969a8d2dbc8db1ee232097cd0375d65' -o \ - "${sum}" = '8576d747a8d0811c3df016b421c38d32' ]; then + "${sum}" = '8576d747a8d0811c3df016b421c38d32' -o \ + "${sum}" = '1f3c5cd32d2afc09d304aea9883648ee' ]; then if [ -f "${javasecurity}.rpmnew" ]; then mv -f "${javasecurity}.rpmnew" "${javasecurity}" fi @@ -1472,6 +1473,18 @@ exit 0 %{_jvmdir}/%{jredir}/lib/accessibility.properties %changelog +* Wed May 03 2017 Andrew Hughes - 1:1.7.0.141-2.6.10.1 +- Bump to u141b02 to include S8011123 fix for TCK failure. +- Resolves: rhbz#1438751 + +* Thu Apr 27 2017 Andrew Hughes - 1:1.7.0.141-2.6.10.0 +- Bump to 2.6.10 and u141b00. +- Adjust RH1022017 following application of 8173783 +- Add more detailed output to fsg.sh and generate_source_tarball.sh. +- Update md5sum list with checksum for the new java.security file. +- Bump to u141b01 to include S8043723 fix for s390. +- Resolves: rhbz#1438751 + * Tue Feb 07 2017 Andrew Hughes - 1:1.7.0.131-2.6.9.0 - Add blacklisted.certs to installation file list. - Resolves: rhbz#1410612