Mercurial > hg > release > icedtea7-2.2

changeset 1560:9302e22fea74

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bump to b44. 2009-01-26 Andrew John Hughes <ahughes@redhat.com> Bump to b44. * patches/icedtea-io_util-overflow.patch: Dropped, applied upstream. * HACKING: Updated. * Makefile.am: Bump to b44, drop io_util-overflow patch. * patches/icedtea-linker-libs-order.patch: Recreated against b44.
author Andrew John Hughes <ahughes@redhat.com>
date Tue, 27 Jan 2009 02:23:20 +0000
parents db632fa8e811
children 52b6f4605e43
files ChangeLog HACKING Makefile.am patches/icedtea-io_util-overflow.patch patches/icedtea-linker-libs-order.patch
diffstat 5 files changed, 48 insertions(+), 76 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Jan 26 23:34:26 2009 +0000
+++ b/ChangeLog	Tue Jan 27 02:23:20 2009 +0000
@@ -1,4 +1,14 @@
-2009-01-19  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+2009-01-26  Andrew John Hughes  <ahughes@redhat.com>
+
+	Bump to b44.
+	* patches/icedtea-io_util-overflow.patch:
+	Dropped, applied upstream.
+	* HACKING: Updated.
+	* Makefile.am: Bump to b44, drop io_util-overflow patch.
+	* patches/icedtea-linker-libs-order.patch:
+	Recreated against b44.
+
+2009-01-19  Andrew John Hughes  <ahughes@redhat.com>
 
 	Merge with IcedTea6.
 	* patches/hotspot/original/icedtea-sparc64-linux.patch,
@@ -65,7 +75,7 @@
 	* ports/hotspot/src/share/vm/shark/sharkFunction.cpp:
 	Merged.
 
-2009-01-18  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+2009-01-18  Andrew John Hughes  <ahughes@redhat.com>
 
 	Bump to b43.
 	* patches/icedtea-6761856-freetypescaler.patch,
@@ -101,12 +111,12 @@
 	* ports/hotspot/src/cpu/zero/vm/globals_zero.hpp
 	(StackShadowPages): Increase for 64-bit builds.
 
-2008-12-22  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+2008-12-22  Andrew John Hughes  <ahughes@redhat.com>
 
 	* Makefile.am: Fix b42 tarball name and checksum
 	due to reroll.
 
-2008-12-20  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+2008-12-20  Andrew John Hughes  <ahughes@redhat.com>
 
 	* HACKING: Updated.
 	* Makefile.am: Bump to b42.
@@ -292,13 +302,13 @@
 	(stamps/extract.stamp): Use AWK here rather than cut.
 	* hotspot.map: Add md5sum for 14.0b08.
 
-2008-12-17  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+2008-12-17  Andrew John Hughes  <ahughes@redhat.com>
 
 	* acinclude.m4:
 	(FIND_RHINO_JAR): Check for js.jar
 	in Gentoo install location too.
 
-2008-12-17  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+2008-12-17  Andrew John Hughes  <ahughes@redhat.com>
 
 	* Makefile.am:
 	No need to check again that SYSTEM_GCJ_DIR exists.
@@ -311,7 +321,7 @@
 	More --with-x-home options to macros in acinclude.m4.
 	Remove redundant erroneous use of GCC_OLD.
 
-2008-12-17  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+2008-12-17  Andrew John Hughes  <ahughes@redhat.com>
 
 	* Makefile.am:
 	Remove use of LIBGCJ_JAR, replacing with
@@ -325,7 +335,7 @@
 	* javac.in:
 	Use SYSTEM_GCJ_DIR/jre/lib/rt.jar not LIBGCJ_JAR.
 
-2008-12-17  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+2008-12-17  Andrew John Hughes  <ahughes@redhat.com>
 
 	* Makefile.am:
 	Remove the HotSpot directory while extracting
@@ -397,7 +407,7 @@
 	* rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: Provide new 
 	cacheable param to JARDesc constructor.
 
-2008-12-09  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+2008-12-09  Andrew John Hughes  <ahughes@redhat.com>
 
 	* patches/xrender/icedtea-000.patch:
 	Removed, already applied in OpenJDK7.
@@ -406,7 +416,7 @@
 	* patches/xrender/icedtea-004.patch:
 	Recreated against OpenJDK7.
 
-2008-12-09  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+2008-12-09  Andrew John Hughes  <ahughes@redhat.com>
 
 	* Makefile.am:
 	Support use of HGREV.
@@ -421,14 +431,14 @@
 	Fix XRender wildcard to work where
 	srcdir != builddir.
 
-2008-12-09  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+2008-12-09  Andrew John Hughes  <ahughes@redhat.com>
 
 	* Makefile.am:
 	Properly support --with-openjdk-src-dir.
 	* acinclude.m4:
 	Correct the define for OPENJDK_SRC_DIR.
 
-2008-12-09  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+2008-12-09  Andrew John Hughes  <ahughes@redhat.com>
 
 	* Makefile.am:
 	Support downloading from the Mercurial repository.
@@ -437,12 +447,12 @@
 	* configure.ac:
 	Check for --enable-hg.
 
-2008-12-09  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+2008-12-09  Andrew John Hughes  <ahughes@redhat.com>
 
 	* configure.ac:
 	Capitalise 'XRender' in configure option.
 
-2008-12-09  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+2008-12-09  Andrew John Hughes  <ahughes@redhat.com>
 
 	* Makefile.am:
 	Don't use find to locate the hotspot directory,
@@ -519,7 +529,7 @@
 	* acinclude.m4:
 	Apply linux32 on s390 as well.
 
-2008-12-04  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+2008-12-04  Andrew John Hughes  <ahughes@redhat.com>
 
 	* patches/ecj/icedtea-hotspot-14.0b08.patch,
 	* patches/hotspot/14.0b08/icedtea-bytecodeInterpreter.patch,
@@ -562,7 +572,7 @@
 	* patches/hotspot/original/icedtea-version.patch,
 	* patches/hotspot/original/icedtea-zero-build.patch: here.
 
-2008-12-04  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+2008-12-04  Andrew John Hughes  <ahughes@redhat.com>
 
 	* Makefile.am:
 	Prefix make invocations with
@@ -574,7 +584,7 @@
 	* configure.ac:
 	Check for linux32.
 
-2008-12-04  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+2008-12-04  Andrew John Hughes  <ahughes@redhat.com>
 
 	Merge from IcedTea6.
 	* patches/icedtea-ecj-jopt.patch,
@@ -788,7 +798,7 @@
 	* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/StreamSampleSpecification.java:
 	Make class package-private.
 
-2008-12-03  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+2008-12-03  Andrew John Hughes  <ahughes@redhat.com>
 
 	Create hierarchical patch space.
 	* patches/icedtea-4486841.patch,
@@ -970,7 +980,7 @@
 	patches/icedtea-6755943.patch,
 	patches/icedtea-6766136.patch: New files.
 	
-2008-12-02  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+2008-12-02  Andrew John Hughes  <ahughes@redhat.com>
 
 	* patches/icedtea-bytecodeInterpreter.patch,
 	* patches/icedtea-hotspot7-build-fixes.patch:
@@ -1099,7 +1109,7 @@
 	patches/icedtea-6755943.patch,
 	patches/icedtea-6766136.patch: New file
 	
-2008-12-01  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+2008-12-01  Andrew John Hughes  <ahughes@redhat.com>
 
 	* patches/icedtea-hotspot-params-cast-size_t.patch,
 	* patches/icedtea-hotspot-use-idx_t.patch,
@@ -2142,7 +2152,7 @@
 	(stamps/patch.stamp): Encode PKGVERSION in IcedTea version.
 	* patches/icedtea-version.patch: Add DISTRIBUTION_ID in vm crash report.
 
-2008-10-20  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+2008-10-20  Andrew John Hughes  <ahughes@redhat.com>
 
 	* HACKING: Add new patch.
 	* Makefile.am: Compile PulseAudio Java
@@ -2162,7 +2172,7 @@
 	* Makefile.am: Changed all instances of $(srcdir) to
 	$(abs_top_srcdir).
 
-2008-10-20  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+2008-10-20  Andrew John Hughes  <ahughes@redhat.com>
 
 	* Makefile.am:
 	Use GCJ if not equal to no instead
@@ -2173,7 +2183,7 @@
 	Use AC_CHECK_WITH_GCJ in preference to
 	just checking for GCJ.
 
-2008-10-20  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+2008-10-20  Andrew John Hughes  <ahughes@redhat.com>
 
 	* Makefile.am:
 	Build native ecj for ecj builds when
@@ -2185,7 +2195,7 @@
 	and readable.
 	* javac.in: Use native ecj when available.
 
-2008-10-20  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+2008-10-20  Andrew John Hughes  <ahughes@redhat.com>
 
 	* Makefile.am:
 	Fix LiveConnect and PulseAudio paths to work
--- a/HACKING	Mon Jan 26 23:34:26 2009 +0000
+++ b/HACKING	Tue Jan 27 02:23:20 2009 +0000
@@ -75,7 +75,6 @@
 * icedtea-6728542-epoll.patch: Make EPoll work on non-x86 platforms. (PR265)
 * icedtea-fortify-source.patch: Fix build failures with -D_FORTIFY_SOURCE=2.
 * icedtea-format-warnings.patch: Fix build failures with -Wformat=1.
-* icedtea-io_util-overflow.patch: Replace some code to correctly handle overflows. (S6788196)
 * icedtea-cc-interp-jvmti.patch: Disable some JVMTI capabilities which are unsupported or do not work with the C++ interpreter.
 * icedtea-demo-swingapplet.patch: Add missing html file needed to run the demo.
 * icedtea-6791168.patch: Fix build failure with GCC-4.4 (PR 38725) and compiler warnings.
@@ -100,6 +99,7 @@
   #6761856, swing TextLayout.getBounds() returns shifted bounds (applied in OpenJDK7 b43).
 * icedtea-timerqueue.patch: Fix setting of running variable (PR87/S6623943).
 * icedtea-version.patch: Fix (langtools) ant build to honor fcs MILESTONE setting (S6778493).
+* icedtea-io_util-overflow.patch: Replace some code to correctly handle overflows. (S6788196)
 
 The following patches are only applied to OpenJDK in IcedTea:
 
--- a/Makefile.am	Mon Jan 26 23:34:26 2009 +0000
+++ b/Makefile.am	Tue Jan 27 02:23:20 2009 +0000
@@ -1,6 +1,6 @@
-OPENJDK_DATE = 15_jan_2009
-OPENJDK_MD5SUM = 71d680eab0a8e82ba6a76f66322ff2ab
-OPENJDK_VERSION = b43
+OPENJDK_DATE = 22_jan_2009
+OPENJDK_MD5SUM = 6d5ce33b6ffa65966675b769b59e3d0c
+OPENJDK_VERSION = b44
 
 CACAO_VERSION = 0.99.3
 CACAO_MD5SUM = 80de3ad344c1a20c086ec5f1390bd1b8
@@ -1897,7 +1897,6 @@
         patches/security/icedtea-6734167.patch \
         patches/security/icedtea-6755943.patch \
         patches/security/icedtea-6766136.patch \
-	patches/icedtea-io_util-overflow.patch \
 	patches/icedtea-cc-interp-jvmti.patch \
 	patches/hotspot/$(HSBUILD)/icedtea-6791168.patch \
 	patches/hotspot/$(HSBUILD)/icedtea-includedb.patch
--- a/patches/icedtea-io_util-overflow.patch	Mon Jan 26 23:34:26 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-diff -r 201a75db9b35 openjdk/jdk/src/share/native/java/io/io_util.c
---- openjdk/jdk/src/share/native/java/io/io_util.c	Mon Dec 22 12:32:44 2008 +0000
-+++ openjdk/jdk/src/share/native/java/io/io_util.c	Mon Dec 22 12:48:49 2008 +0000
-@@ -25,6 +25,7 @@
- 
- #include <stdlib.h>
- #include <string.h>
-+#include <assert.h>
- 
- #include "jni.h"
- #include "jni_util.h"
-@@ -73,9 +74,10 @@
-         return -1;
-     }
-     datalen = (*env)->GetArrayLength(env, bytes);
-+    assert(datalen >= 0);
- 
--    if ((off < 0) || (off > datalen) ||
--        (len < 0) || ((off + len) > datalen) || ((off + len) < 0)) {
-+    if ((off < 0) || (len < 0) ||
-+        (((uint32_t) off + (uint32_t) len) > (uint32_t) datalen)) {
-         JNU_ThrowByName(env, "java/lang/IndexOutOfBoundsException", 0);
-         return -1;
-     }
-@@ -146,9 +148,10 @@
-         return;
-     }
-     datalen = (*env)->GetArrayLength(env, bytes);
-+    assert(datalen >= 0);
- 
--    if ((off < 0) || (off > datalen) ||
--        (len < 0) || ((off + len) > datalen) || ((off + len) < 0)) {
-+    if ((off < 0) || (len < 0) ||
-+        (((uint32_t) off + (uint32_t) len) > (uint32_t) datalen)) {
-         JNU_ThrowByName(env, "java/lang/IndexOutOfBoundsException", 0);
-         return;
-     }
--- a/patches/icedtea-linker-libs-order.patch	Mon Jan 26 23:34:26 2009 +0000
+++ b/patches/icedtea-linker-libs-order.patch	Tue Jan 27 02:23:20 2009 +0000
@@ -1,6 +1,6 @@
 diff -Nru openjdk.orig/jdk/make/com/sun/java/pack/Makefile openjdk/jdk/make/com/sun/java/pack/Makefile
---- openjdk.orig/jdk/make/com/sun/java/pack/Makefile	2008-11-17 13:13:17.000000000 +0000
-+++ openjdk/jdk/make/com/sun/java/pack/Makefile	2008-11-17 14:25:44.000000000 +0000
+--- openjdk.orig/jdk/make/com/sun/java/pack/Makefile	2009-01-27 00:55:08.000000000 +0000
++++ openjdk/jdk/make/com/sun/java/pack/Makefile	2009-01-27 01:18:13.000000000 +0000
 @@ -75,12 +75,12 @@
  	     $(ZIPOBJDIR)/infutil.$(OBJECT_SUFFIX) \
  	     $(ZIPOBJDIR)/inffast.$(OBJECT_SUFFIX)
@@ -37,13 +37,13 @@
  	$(prep-target)
 -	$(LINKER)  $(LDDFLAGS) $(UNPACK_EXE_FILES_o) $(RES) $(LIBCXX) $(LDOUTPUT)$(TEMPDIR)/unpack200$(EXE_SUFFIX)
 +	$(LINKER)  $(LDDFLAGS) $(UNPACK_EXE_FILES_o) $(RES) $(OTHER_LDLIBS) $(LIBCXX) $(LDOUTPUT)$(TEMPDIR)/unpack200$(EXE_SUFFIX)
- 	$(CP) $(TEMPDIR)/unpack200$(EXE_SUFFIX) $(UNPACK_EXE)
- 
- 
+ ifdef MT
+ 	$(MT) /manifest $(TEMPDIR)/unpack200$(EXE_SUFFIX).manifest /outputresource:$(TEMPDIR)/unpack200$(EXE_SUFFIX);#1
+ endif
 diff -Nru openjdk.orig/jdk/make/common/shared/Sanity.gmk openjdk/jdk/make/common/shared/Sanity.gmk
---- openjdk.orig/jdk/make/common/shared/Sanity.gmk	2008-11-06 08:44:09.000000000 +0000
-+++ openjdk/jdk/make/common/shared/Sanity.gmk	2008-11-17 14:25:44.000000000 +0000
-@@ -1345,7 +1345,7 @@
+--- openjdk.orig/jdk/make/common/shared/Sanity.gmk	2009-01-22 08:46:11.000000000 +0000
++++ openjdk/jdk/make/common/shared/Sanity.gmk	2009-01-27 01:16:47.000000000 +0000
+@@ -1343,7 +1343,7 @@
  ifdef ALSA_VERSION_CHECK
  $(ALSA_VERSION_CHECK): $(ALSA_VERSION_CHECK).c
  	@$(prep-target)
@@ -53,8 +53,8 @@
  $(ALSA_VERSION_CHECK).c:
  	@$(prep-target)
 diff -Nru openjdk.orig/jdk/make/javax/sound/jsoundalsa/Makefile openjdk/jdk/make/javax/sound/jsoundalsa/Makefile
---- openjdk.orig/jdk/make/javax/sound/jsoundalsa/Makefile	2008-11-06 08:44:10.000000000 +0000
-+++ openjdk/jdk/make/javax/sound/jsoundalsa/Makefile	2008-11-17 14:25:44.000000000 +0000
+--- openjdk.orig/jdk/make/javax/sound/jsoundalsa/Makefile	2009-01-22 08:46:12.000000000 +0000
++++ openjdk/jdk/make/javax/sound/jsoundalsa/Makefile	2009-01-27 01:16:47.000000000 +0000
 @@ -65,7 +65,7 @@
  	$(MIDIFILES_export) \
  	$(PORTFILES_export)