From 90430cfa0efa91792c5bc21d52ad9c1789af4f02 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jan 12 2017 12:01:23 +0000 Subject: import java-1.6.0-openjdk-1.6.0.41-1.13.13.1.el7_3 --- diff --git a/.gitignore b/.gitignore index b1ab069..8f3f937 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -SOURCES/icedtea6-1.13.12.tar.xz +SOURCES/icedtea6-1.13.13.tar.xz SOURCES/java-access-bridge-1.23.0.tar.bz2 -SOURCES/openjdk-6-src-b40-22_aug_2016-rhel.tar.xz +SOURCES/openjdk-6-src-b41-04_jan_2017-rhel.tar.xz diff --git a/.java-1.6.0-openjdk.metadata b/.java-1.6.0-openjdk.metadata index 726eda0..67d15f6 100644 --- a/.java-1.6.0-openjdk.metadata +++ b/.java-1.6.0-openjdk.metadata @@ -1,3 +1,3 @@ -334ec1614dbbe68bc042844c54d43c0c931a620c SOURCES/icedtea6-1.13.12.tar.xz +34250fb1bbd723091cc2645a5e41590aa69c9331 SOURCES/icedtea6-1.13.13.tar.xz aa2c61cc73bad1e1a09e8843f341270f70921dbf SOURCES/java-access-bridge-1.23.0.tar.bz2 -9bea0177b0dac662fe56d7aed483d61f71409d24 SOURCES/openjdk-6-src-b40-22_aug_2016-rhel.tar.xz +7c23132d2cbea7605ce749fe0c350b7b21e76236 SOURCES/openjdk-6-src-b41-04_jan_2017-rhel.tar.xz diff --git a/SOURCES/add-final-location-rpaths.patch b/SOURCES/add-final-location-rpaths.patch index 1340e6a..b78ff45 100644 --- a/SOURCES/add-final-location-rpaths.patch +++ b/SOURCES/add-final-location-rpaths.patch @@ -7,15 +7,14 @@ linux capabilities are added to the binary. Fix launcher to treat the case where capabilities are set as identical to a setuid binary: don't expect LD_LIBRARY_PATH to be set. -diff -r b85872bd06da Makefile.am ---- a/Makefile.am Thu Apr 09 20:20:00 2015 +0100 -+++ b/Makefile.am Thu Apr 09 20:41:52 2015 +0100 -@@ -815,7 +815,8 @@ - CC=$(CC)$(GCC_SUFFIX) \ +--- a/Makefile.am.orig 2017-01-03 02:21:55.611333388 -0500 ++++ b/Makefile.am 2017-01-03 02:22:48.670489697 -0500 +@@ -837,7 +837,8 @@ CXX=$(CXX)$(GCC_SUFFIX) \ COMPILER_WARNINGS_FATAL="$(WERROR_STATUS)" \ -- UNLIMITED_CRYPTO="true" -+ UNLIMITED_CRYPTO="true" \ + UNLIMITED_CRYPTO="true" \ +- ARM32JIT="${ARM32JIT_STATUS}" ++ ARM32JIT="${ARM32JIT_STATUS}" \ + INSTALL_LOCATION="${INSTALL_LOCATION}" if ENABLE_CACAO diff --git a/SPECS/java-1.6.0-openjdk.spec b/SPECS/java-1.6.0-openjdk.spec index 1fe59ba..0a8a85c 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.12 +%define icedteaver 1.13.13 %define icedteasnapshot %{nil} -%define openjdkver 40 -%define openjdkdate 22_aug_2016 +%define openjdkver 41 +%define openjdkdate 04_jan_2017 %define genurl http://cvs.fedoraproject.org/viewcvs/devel/java-1.6.0-openjdk/ @@ -158,7 +158,7 @@ Name: java-%{javaver}-%{origin} Version: %{javaver}.%{buildver} -Release: %{icedteaver}.9%{?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 @@ -898,6 +898,19 @@ exit 0 %doc %{_javadocdir}/%{name} %changelog +* Wed Jan 04 2017 Andrew Hughes - 1:1.6.0.41-1.13.13.1 +- Update to new 1.13.13 and b41 tarballs to correct TCK failure. +- Resolves: rhbz#1381990 + +* Tue Jan 03 2017 Andrew Hughes - 1:1.6.0.41-1.13.13.0 +- Update to new 1.13.13 tarball with PR3275 and PR3276 fixes. +- Resolves: rhbz#1381990 + +* Tue Jan 03 2017 Andrew Hughes - 1:1.6.0.41-1.13.13.0 +- Update to IcedTea 1.13.13 & OpenJDK 6 b41. +- Fix context for rpath patch following PR3213. +- Resolves: rhbz#1381990 + * Mon Sep 05 2016 Andrew Hughes - 1:1.6.0.40-1.13.12.9 - Require a JDK with RH1334465/PR2956 fixed and turn off bootstrapping for Zero architectures. - Resolves: rhbz#1350047