changeset in /hg/icedtea6: 2008-07-15 Lillian Angel <langel at re...

[Lillian Angel]

changeset 5a7febd10bf2 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=5a7febd10bf2
description:
	2008-07-15  Lillian Angel  <langel at redhat.com>

	        * Makefile.am: Added new patch.
	        * patches/icedtea-security-updates.patch: Removed patch that cannot be
	        applied to ports.
	        * patches/icedtea-security-updates-nonzero.patch: Added removed patch
	        into this file.

diffstat:

4 files changed, 21 insertions(+), 12 deletions(-)
ChangeLog                                      |    8 ++++++++
Makefile.am                                    |    3 ++-
patches/icedtea-security-updates-nonzero.patch |   11 +++++++++++
patches/icedtea-security-updates.patch         |   11 -----------

diffs (64 lines):

diff -r 264b708e4668 -r 5a7febd10bf2 ChangeLog
--- a/ChangeLog	Tue Jul 15 13:28:14 2008 -0400
+++ b/ChangeLog	Tue Jul 15 16:08:49 2008 -0400
@@ -1,3 +1,11 @@ 2008-07-15  Lillian Angel  <langel at redha
+2008-07-15  Lillian Angel  <langel at redhat.com>
+
+	* Makefile.am: Added new patch.
+	* patches/icedtea-security-updates.patch: Removed patch that cannot be
+	applied to ports.
+	* patches/icedtea-security-updates-nonzero.patch: Added removed patch
+	into this file.
+
 2008-07-15  Lillian Angel  <langel at redhat.com>
 
 	* INSTALL: Added rhino to the list.
diff -r 264b708e4668 -r 5a7febd10bf2 Makefile.am
--- a/Makefile.am	Tue Jul 15 13:28:14 2008 -0400
+++ b/Makefile.am	Tue Jul 15 16:08:49 2008 -0400
@@ -348,7 +348,8 @@ ZERO_PATCHES = \
 
 # Patches needed when not using the newer OpenJDK 7 HotSpot for zero.
 NON_ZERO_PATCHES = \
-	patches/icedtea-eclipse-hotspot-6614100-6b06.patch
+	patches/icedtea-eclipse-hotspot-6614100-6b06.patch \
+	patches/icedtea-security-updates-nonzero.patch
 
 if ZERO_BUILD
   ZERO_PATCHES_COND = $(ZERO_PATCHES)
diff -r 264b708e4668 -r 5a7febd10bf2 patches/icedtea-security-updates-nonzero.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-security-updates-nonzero.patch	Tue Jul 15 16:08:49 2008 -0400
@@ -0,0 +1,11 @@
+--- old/src/share/vm/opto/parse3.cpp    Wed Apr  9 12:49:10 2008
++++ openjdk/hotspot/src/share/vm/opto/parse3.cpp        Wed Apr  9 12:49:08 2008
+@@ -398,7 +398,7 @@
+   // fill the lowest dimensions with unknown sizes
+   for (int index = 0; index < mdimensions - ndimensions; index++) {
+     const TypeAry* arr0 = TypeAry::make(prev_type, TypeInt::POS);
+-    prev_type = TypeAryPtr::make(TypePtr::BotPTR, arr0, prev_array, true, 0);
++    prev_type = TypeAryPtr::make(TypePtr::BotPTR, arr0, prev_array, false, 0);
+     prev_array = NULL; // array klasses can be lazy, except the first
+   }
+
diff -r 264b708e4668 -r 5a7febd10bf2 patches/icedtea-security-updates.patch
--- a/patches/icedtea-security-updates.patch	Tue Jul 15 13:28:14 2008 -0400
+++ b/patches/icedtea-security-updates.patch	Tue Jul 15 16:08:49 2008 -0400
@@ -881,17 +881,6 @@ No differences encountered
 @@ -0,0 +1,2 @@
 +<?xml version="1.0"?>
 +<doc>this is a secret</doc>
---- old/src/share/vm/opto/parse3.cpp	Wed Apr  9 12:49:10 2008
-+++ openjdk/hotspot/src/share/vm/opto/parse3.cpp	Wed Apr  9 12:49:08 2008
-@@ -398,7 +398,7 @@
-   // fill the lowest dimensions with unknown sizes
-   for (int index = 0; index < mdimensions - ndimensions; index++) {
-     const TypeAry* arr0 = TypeAry::make(prev_type, TypeInt::POS);
--    prev_type = TypeAryPtr::make(TypePtr::BotPTR, arr0, prev_array, true, 0);
-+    prev_type = TypeAryPtr::make(TypePtr::BotPTR, arr0, prev_array, false, 0);
-     prev_array = NULL; // array klasses can be lazy, except the first
-   }
- 
 --- /dev/null	Mon Jun  2 09:19:39 2008
 +++ openjdk/jdk/test/sun/management/jmxremote/bootstrap/LocalOnlyTest.java	Mon Jun  2 09:19:39 2008
 @@ -0,0 +1,97 @@