diff --git a/.gitignore b/.gitignore index fc1fd5d..76f2656 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -SOURCES/icedtea6-1.13.3.tar.gz +SOURCES/icedtea6-1.13.4.tar.gz SOURCES/java-access-bridge-1.23.0.tar.bz2 -SOURCES/openjdk-6-src-b31-15_apr_2014-rhel.tar.gz +SOURCES/openjdk-6-src-b32-15_jul_2014-rhel.tar.gz diff --git a/.java-1.6.0-openjdk.metadata b/.java-1.6.0-openjdk.metadata index 5623611..283f7bc 100644 --- a/.java-1.6.0-openjdk.metadata +++ b/.java-1.6.0-openjdk.metadata @@ -1,3 +1,3 @@ -5bd9308bd65145a71a8f905006edc64910b7cf21 SOURCES/icedtea6-1.13.3.tar.gz +f7722ca7d26e31d313c375c4b47176a1dfc163a1 SOURCES/icedtea6-1.13.4.tar.gz aa2c61cc73bad1e1a09e8843f341270f70921dbf SOURCES/java-access-bridge-1.23.0.tar.bz2 -5f74e3cd4efe2725e296b7bfdc44f5f245ba896c SOURCES/openjdk-6-src-b31-15_apr_2014-rhel.tar.gz +6b53f67be1196a1bb25bd7c3c42215587610cf63 SOURCES/openjdk-6-src-b32-15_jul_2014-rhel.tar.gz diff --git a/SOURCES/java-1.6.0-openjdk-debugdocs.patch b/SOURCES/java-1.6.0-openjdk-debugdocs.patch index dbfebb2..fd7b5cc 100644 --- a/SOURCES/java-1.6.0-openjdk-debugdocs.patch +++ b/SOURCES/java-1.6.0-openjdk-debugdocs.patch @@ -1,12 +1,39 @@ --- oldMakefile 2008-07-02 17:48:01.000000000 -0400 +++ openjdk/Makefile 2008-07-02 17:48:09.000000000 -0400 -@@ -176,8 +176,7 @@ - - COMMON_DEBUG_FLAGS= \ - DEBUG_NAME=$(DEBUG_NAME) \ -- ALT_OUTPUTDIR=$(_OUTPUTDIR)-$(DEBUG_NAME) \ -- NO_DOCS=true -+ ALT_OUTPUTDIR=$(_OUTPUTDIR)-$(DEBUG_NAME) - - product_build: setup - @$(ECHO) $@ build started: `$(DATE) '+%y-%m-%d %H:%M'` +@@ -143,7 +143,7 @@ + create_fresh_product_bootdir: FRC + @$(START_ECHO) + $(MAKE) ALT_OUTPUTDIR=$(ABS_BOOTDIR_OUTPUTDIR) \ +- GENERATE_DOCS=false \ ++ GENERATE_DOCS=true \ + BOOT_CYCLE_SETTINGS= \ + build_product_image + @$(FINISH_ECHO) +@@ -151,7 +151,7 @@ + create_fresh_debug_bootdir: FRC + @$(START_ECHO) + $(MAKE) ALT_OUTPUTDIR=$(ABS_BOOTDIR_OUTPUTDIR) \ +- GENERATE_DOCS=false \ ++ GENERATE_DOCS=true \ + BOOT_CYCLE_DEBUG_SETTINGS= \ + build_debug_image + @$(FINISH_ECHO) +@@ -159,7 +159,7 @@ + create_fresh_fastdebug_bootdir: FRC + @$(START_ECHO) + $(MAKE) ALT_OUTPUTDIR=$(ABS_BOOTDIR_OUTPUTDIR) \ +- GENERATE_DOCS=false \ ++ GENERATE_DOCS=true \ + BOOT_CYCLE_DEBUG_SETTINGS= \ + build_fastdebug_image + @$(FINISH_ECHO) +@@ -212,7 +212,7 @@ + $(MAKE) \ + ALT_OUTPUTDIR=$(ABS_OUTPUTDIR)-$(DEBUG_NAME) \ + DEBUG_NAME=$(DEBUG_NAME) \ +- GENERATE_DOCS=false \ ++ GENERATE_DOCS=true \ + $(BOOT_CYCLE_DEBUG_SETTINGS) \ + generic_build_repo_series + @$(FINISH_ECHO) + diff --git a/SOURCES/java-1.6.0-openjdk-debuginfo.patch b/SOURCES/java-1.6.0-openjdk-debuginfo.patch index 263d59e..197c6ef 100644 --- a/SOURCES/java-1.6.0-openjdk-debuginfo.patch +++ b/SOURCES/java-1.6.0-openjdk-debuginfo.patch @@ -1,20 +1,20 @@ --- openjdk/hotspot/build/linux/makefiles/saproc.make_back 2009-12-14 13:35:46.000000000 +0100 +++ openjdk/hotspot/make/linux/makefiles/saproc.make 2009-12-14 13:36:47.000000000 +0100 -@@ -67,6 +67,7 @@ - -I$(BOOT_JAVA_HOME)/include/$(Platform_os_family) \ +@@ -87,6 +87,7 @@ $(SASRCFILES) \ $(SA_LFLAGS) \ + $(SA_DEBUG_CFLAGS) \ + -g \ -o $@ \ -lthread_db - + $(QUIETLY) [ -f $(LIBSAPROC_G) ] || { ln -s $@ $(LIBSAPROC_G); } --- openjdk/hotspot/build/linux/makefiles/jsig.make_back 2009-12-14 13:34:56.000000000 +0100 +++ openjdk/hotspot/make/linux/makefiles/jsig.make 2009-12-14 13:35:31.000000000 +0100 -@@ -44,6 +44,7 @@ +@@ -59,6 +59,7 @@ $(LIBJSIG): $(JSIGSRCDIR)/jsig.c $(LIBJSIG_MAPFILE) @echo Making signal interposition lib... $(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \ + -g \ - $(LFLAGS_JSIG) -o $@ $< -ldl - - install_jsig: $(LIBJSIG) + $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) -o $@ $< -ldl + $(QUIETLY) [ -f $(LIBJSIG_G) ] || { ln -s $@ $(LIBJSIG_G); } + ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) diff --git a/SOURCES/rh1115580-unsyncHashMap.patch b/SOURCES/rh1115580-unsyncHashMap.patch new file mode 100644 index 0000000..ebddc2c --- /dev/null +++ b/SOURCES/rh1115580-unsyncHashMap.patch @@ -0,0 +1,57 @@ +# HG changeset patch +# User vkarnauk +# Date 1340286118 -14400 +# Thu Jun 21 17:41:58 2012 +0400 +# Node ID f71b6117fd7bbb13ed4c1f68ace873695edd49cb +# Parent 762ae4a20c8b115e5cb486c5204d8bdee747ee59 +7027300: Unsynchronized HashMap access causes endless loop +Reviewed-by: bae, prr + +diff -r 762ae4a20c8b -r f71b6117fd7b src/share/classes/sun/font/SunLayoutEngine.java +--- openjdk/jdk/src/share/classes/sun/font/SunLayoutEngine.java Thu Jun 21 14:19:12 2012 +0400 ++++ openjdk/jdk/src/share/classes/sun/font/SunLayoutEngine.java Thu Jun 21 17:41:58 2012 +0400 +@@ -33,7 +33,7 @@ + import sun.font.GlyphLayout.*; + import java.awt.geom.Point2D; + import java.lang.ref.SoftReference; +-import java.util.HashMap; ++import java.util.concurrent.ConcurrentHashMap; + import java.util.Locale; + + /* +@@ -129,9 +129,9 @@ + + // !!! don't need this unless we have more than one sun layout engine... + public LayoutEngine getEngine(LayoutEngineKey key) { +- HashMap cache = (HashMap)cacheref.get(); ++ ConcurrentHashMap cache = (ConcurrentHashMap)cacheref.get(); + if (cache == null) { +- cache = new HashMap(); ++ cache = new ConcurrentHashMap(); + cacheref = new SoftReference(cache); + } + +# HG changeset patch +# User prr +# Date 1342804653 25200 +# Fri Jul 20 10:17:33 2012 -0700 +# Node ID 84d5cdbe7bce2caf907ec842ac7b4fa2097fb295 +# Parent bf5bf37108c14d1d01b8a1043f9e3ff0e3727869 +7183251: Netbeans editor renders text wrong on JDK 7u6 build +Reviewed-by: igor, jgodinez + +diff -r bf5bf37108c1 -r 84d5cdbe7bce src/share/classes/sun/font/SunLayoutEngine.java +--- openjdk/jdk/src/share/classes/sun/font/SunLayoutEngine.java Fri Jul 20 13:58:52 2012 +0400 ++++ openjdk/jdk/src/share/classes/sun/font/SunLayoutEngine.java Fri Jul 20 10:17:33 2012 -0700 +@@ -137,8 +137,9 @@ + + LayoutEngine e = (LayoutEngine)cache.get(key); + if (e == null) { +- e = new SunLayoutEngine(key.copy()); +- cache.put(key, e); ++ LayoutEngineKey copy = key.copy(); ++ e = new SunLayoutEngine(copy); ++ cache.put(copy, e); + } + return e; + } diff --git a/SPECS/java-1.6.0-openjdk.spec b/SPECS/java-1.6.0-openjdk.spec index 4684d7b..9d29cfa 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.3 +%define icedteaver 1.13.4 %define icedteasnapshot %{nil} -%define openjdkver b31 -%define openjdkdate 15_apr_2014 +%define openjdkver b32 +%define openjdkdate 15_jul_2014 %define genurl http://cvs.fedoraproject.org/viewcvs/devel/java-1.6.0-openjdk/ @@ -72,12 +72,16 @@ %endif %if %{debug} -%define debugbuild icedtea-debug +%define debugbuild icedtea-debug-against-icedtea %else %define debugbuild %{nil} %endif +%if %{debug} +%define buildoutputdir openjdk.build-debug +%else %define buildoutputdir openjdk.build +%endif %if %{gcjbootstrap} @@ -196,6 +200,9 @@ 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 +#tmp patch to speedup backport +Patch9: rh1115580-unsyncHashMap.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -382,11 +389,13 @@ patch -l -p0 < %{PATCH6} %endif patch -l -p1 < %{PATCH104} +patch -l -p0 < %{PATCH9} + %if %{gcjbootstrap} make stamps/patch-ecj.stamp %endif -make %{debugbuild} +make %{debugbuild} INSTALL_LOCATION="%{_jvmdir}/%{sdkdir}" %ifarch %{jit_arches} chmod 644 $(pwd)/%{buildoutputdir}/j2sdk-image/lib/sa-jdi.jar @@ -870,6 +879,12 @@ exit 0 %doc %{_javadocdir}/%{name} %changelog +* Mon Jul 14 2014 Jiri Vanek - 1:1.6.0.1-6.1.13.4 +- moved to icedteaver 1.13.4 +- moved to openjdkver b32 and openjdkdate 15_jul_2014 +- added upstreamed patch patch9 rh1115580-unsyncHashMap.patch +- Resolves: rhbz#1115869 + * Tue May 20 2014 Jiri Vanek - 1:1.6.0.1-6.1.13.3 - updated to icedtea 1.13.3 - updated to openjdk-6-src-b31-15_apr_2014