diff --git a/.gitignore b/.gitignore index 66dce17..f3a18f1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -SOURCES/icedtea6-1.13.5.tar.xz +SOURCES/icedtea6-1.13.6.tar.xz SOURCES/java-access-bridge-1.23.0.tar.bz2 -SOURCES/openjdk-6-src-b33-14_oct_2014-rhel.tar.xz +SOURCES/openjdk-6-src-b34-20_jan_2015-rhel.tar.xz diff --git a/.java-1.6.0-openjdk.metadata b/.java-1.6.0-openjdk.metadata index 8182aac..1e854b0 100644 --- a/.java-1.6.0-openjdk.metadata +++ b/.java-1.6.0-openjdk.metadata @@ -1,3 +1,3 @@ -14a31346a016e01140266c2ce90e387cbbfd455d SOURCES/icedtea6-1.13.5.tar.xz +45482c5f0b52d49f338b059541b75a214c006560 SOURCES/icedtea6-1.13.6.tar.xz aa2c61cc73bad1e1a09e8843f341270f70921dbf SOURCES/java-access-bridge-1.23.0.tar.bz2 -2a025c0f92682b82ede2630b3391034670cf1cf7 SOURCES/openjdk-6-src-b33-14_oct_2014-rhel.tar.xz +f0ecba331385a38068dddcdc3926bb436157488e SOURCES/openjdk-6-src-b34-20_jan_2015-rhel.tar.xz diff --git a/SOURCES/generate-rhel-zip.sh b/SOURCES/generate-rhel-zip.sh index b05d12f..52a207d 100644 --- a/SOURCES/generate-rhel-zip.sh +++ b/SOURCES/generate-rhel-zip.sh @@ -78,6 +78,9 @@ rm -f \ rm -rf \ openjdk/jdk/src/share/demo/java2d/J2DBench +# Requires IcedTea patch PR2125 (not included) +echo "Syncing EC list with NSS" +patch -Np0 < pr2125.patch # Create new tarball with new name. pushd openjdk > /dev/null diff --git a/SOURCES/no_pr2125.patch b/SOURCES/no_pr2125.patch new file mode 100644 index 0000000..6226e1f --- /dev/null +++ b/SOURCES/no_pr2125.patch @@ -0,0 +1,9 @@ +diff -r f0c900038574 fsg.sh.in +--- a/fsg.sh.in Tue Jan 20 06:46:55 2015 +0000 ++++ b/fsg.sh.in Tue Jan 20 07:12:11 2015 +0000 +@@ -90,5 +90,3 @@ + openjdk/jdk/src/solaris/doc/sun/man/man1/javaws.1 \ + openjdk/jdk/src/solaris/doc/sun/man/man1/ja/javaws.1 + +-echo "Syncing EC list with NSS" +-patch -Np0 < @abs_top_srcdir@/patches/pr2125.patch diff --git a/SOURCES/type_hsx23_patch4.patch b/SOURCES/type_hsx23_patch4.patch deleted file mode 100644 index 6d199fa..0000000 --- a/SOURCES/type_hsx23_patch4.patch +++ /dev/null @@ -1,19 +0,0 @@ -# HG changeset patch -# User andrew -# Date 1379536490 -3600 -# Node ID af221c82682c974e06cc78b24808262d9ffc5af2 -# Parent 4fc9d4d964adf1f5316d81d1db1813ffd9f2286b -Cast should use same type as GCDrainStackTargetSize (uintx). - -diff --git a/src/share/vm/gc_implementation/g1/concurrentMark.cpp b/src/share/vm/gc_implementation/g1/concurrentMark.cpp ---- a/openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp -+++ b/openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp -@@ -3632,7 +3632,7 @@ - // of things to do) or totally (at the very end). - size_t target_size; - if (partially) { -- target_size = MIN2((size_t)_task_queue->max_elems()/3, GCDrainStackTargetSize); -+ target_size = MIN2((uintx)_task_queue->max_elems()/3, GCDrainStackTargetSize); - } else { - target_size = 0; - } diff --git a/SPECS/java-1.6.0-openjdk.spec b/SPECS/java-1.6.0-openjdk.spec index 9b372b7..26793c1 100644 --- a/SPECS/java-1.6.0-openjdk.spec +++ b/SPECS/java-1.6.0-openjdk.spec @@ -7,10 +7,10 @@ %define debug 0 -%define icedteaver 1.13.5 +%define icedteaver 1.13.6 %define icedteasnapshot %{nil} -%define openjdkver b33 -%define openjdkdate 14_oct_2014 +%define openjdkver 34 +%define openjdkdate 20_jan_2015 %define genurl http://cvs.fedoraproject.org/viewcvs/devel/java-1.6.0-openjdk/ @@ -22,7 +22,7 @@ %define accessurl http://ftp.gnome.org/pub/GNOME/sources/java-access-bridge/ %define openjdkurl https://java.net/downloads/openjdk6/ -%define rhelzip openjdk-6-src-%{openjdkver}-%{openjdkdate}-rhel.tar.xz +%define rhelzip openjdk-6-src-b%{openjdkver}-%{openjdkdate}-rhel.tar.xz %define multilib_arches ppc64 sparc64 x86_64 @@ -122,7 +122,7 @@ %define origin openjdk %define priority 16000 %define javaver 1.6.0 -%define buildver 33 +%define buildver %{openjdkver} # Standard JPackage directories and symbolic links. # Make 64-bit JDKs just another alternative on 64-bit architectures. @@ -162,7 +162,7 @@ Name: java-%{javaver}-%{origin} Version: %{javaver}.%{buildver} -Release: %{icedteaver}.0%{?dist} +Release: %{icedteaver}.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 @@ -199,7 +199,9 @@ Patch3: java-1.6.0-openjdk-java-access-bridge-security.patch Patch4: java-1.6.0-openjdk-accessible-toolkit.patch Patch5: java-1.6.0-openjdk-debugdocs.patch Patch6: %{name}-debuginfo.patch -Patch104: type_hsx23_patch4.patch +# This turns off the application of PR2125 by fsg.sh as +# we do it ourselves ahead of time via generate-rhel-zip.sh +Patch7: no_pr2125.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -354,6 +356,7 @@ The OpenJDK API documentation. %setup -q -n icedtea6-%{icedteaver}%{icedteasnapshot} %setup -q -n icedtea6-%{icedteaver}%{icedteasnapshot} -T -D -a 2 %patch0 +%patch7 -p1 cp %{SOURCE4} . @@ -386,9 +389,6 @@ patch -l -p0 < %{PATCH5} patch -l -p0 < %{PATCH6} %endif -patch -l -p1 < %{PATCH104} - - %if %{gcjbootstrap} make stamps/patch-ecj.stamp %endif @@ -791,6 +791,8 @@ exit 0 %{jvmjardir} %dir %{_jvmdir}/%{jredir}/lib/security %{_jvmdir}/%{jredir}/lib/security/cacerts +%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/US_export_policy.jar +%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/local_policy.jar %config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.policy %config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.security %config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.security.old @@ -876,6 +878,26 @@ exit 0 %doc %{_javadocdir}/%{name} %changelog +* Thu Jan 22 2015 Andrew Hughes - 1:1.6.0.34-1.13.6.0.1 +- Update to latest 1.13.6 release candidate tarball +- Fixes a number of issues found with b34: +- * OJ51, PR2187: Sync patch for 4873188 with 7 version +- * OJ52, PR2185: Application of 6786276 introduces compatibility issue +- * OJ53, PR2181: strict-aliasing warnings issued on PPC32 +- * OJ54, PR2182: 6911104 reintroduces test fragment removed in existing 6964018 backport +- * S6730740, PR2186: Fix for 6729881 has apparently broken several 64 bit tests: "Bad address" +- * S7031830, PR2183: bad_record_mac failure on TLSv1.2 enabled connection with SSLEngine +- Resolves: rhbz#1180292 + +* Tue Jan 20 2015 Andrew Hughes - 1:1.6.0.34-1.13.6.0 +- Update to IcedTea 1.13.6 +- Remove upstream patch type_hsx23_patch4.patch. +- Apply pr2125.patch in generate_rhel_zip.sh to remove unwanted elliptic curves. +- Add no_pr2125.patch to avoid repeating the procedure during the IcedTea build. +- Avoid duplicating the OpenJDK build version by making more use of %%{openjdkver}. +- Add US_export_policy.jar and local_policy.jar to packages. +- Resolves: rhbz#1180292 + * Thu Oct 09 2014 Andrew Hughes - 1:1.6.0.33-1.13.5.0 - Update to IcedTea 1.13.5 - Remove upstreamed patches.