# HG changeset patch
# User Andrew John Hughes <gnu.andrew@redhat.com>
# Date 1366710652 -3600
# Node ID 2a08fdbf2a11caced8d155e5828c706c02365c57
# Parent  a08f636892a865c7bf5a8b0e733814fa8cde2926
Fix offset problem in ICU LETableReference.

2013-04-22  Andrew John Hughes  <gnu.andrew@redhat.com>

	* Makefile.am:
	(ICEDTEA_PATCHES): Add new patch.
	* NEWS: List patch and list backports
	in previous change correctly.
	* patches/fix-font-layout-tck.patch:
	New patch backported from 2.3.9.

diff -r a08f636892a8 -r 2a08fdbf2a11 ChangeLog
--- a/ChangeLog	Mon Apr 22 17:13:26 2013 -0400
+++ b/ChangeLog	Tue Apr 23 10:50:52 2013 +0100
@@ -1,3 +1,12 @@
+2013-04-22  Andrew John Hughes  <gnu.andrew@redhat.com>
+
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Add new patch.
+	* NEWS: List patch and list backports
+	in previous change correctly.
+	* patches/fix-font-layout-tck.patch:
+	New patch backported from 2.3.9.
+
 2013-04-22  Elliott Baron  <ebaron@redhat.com>
 
 	* Makefile.am:
diff -r a08f636892a8 -r 2a08fdbf2a11 Makefile.am
--- a/Makefile.am	Mon Apr 22 17:13:26 2013 -0400
+++ b/Makefile.am	Tue Apr 23 10:50:52 2013 +0100
@@ -539,7 +539,8 @@
 	patches/openjdk/7197906-handle_32_bit_shifts.patch \
 	patches/aarch64.patch \
 	patches/jaxws-tempfiles-ioutils-6.patch \
-	patches/object-factory-cl-internal.patch
+	patches/object-factory-cl-internal.patch \
+	patches/fix-font-layout-tck.patch
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
diff -r a08f636892a8 -r 2a08fdbf2a11 NEWS
--- a/NEWS	Mon Apr 22 17:13:26 2013 -0400
+++ b/NEWS	Tue Apr 23 10:50:52 2013 +0100
@@ -15,10 +15,13 @@
 
 * Security fixes
   - RH952389: Temporary files created with insecure permissions
+* Backports
+  - S7133220: Additional patches to JAXP 1.4.5 update 1 for 7u4 (partial for S6657673)
+  - S6657673: Issues with JAXP (include fragment dependent on S7133220)
 * Bug fixes
   - PR1402: Support glibc < 2.17 with AArch64 patch
   - Give xalan/xerces access to their own internal packages.
-  - Fix backport from S6657673.
+  - Fix offset problem in ICU LETableReference.
 
 New in release 1.11.10 (2013-04-17):
 
diff -r a08f636892a8 -r 2a08fdbf2a11 patches/fix-font-layout-tck.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/fix-font-layout-tck.patch	Tue Apr 23 10:50:52 2013 +0100
@@ -0,0 +1,12 @@
+diff --git a/src/share/native/sun/font/layout/LETableReference.h b/src/share/native/sun/font/layout/LETableReference.h
+--- openjdk/jdk/src/share/native/sun/font/layout/LETableReference.h
++++ openjdk/jdk/src/share/native/sun/font/layout/LETableReference.h
+@@ -433,7 +433,7 @@
+    */
+   LEReferenceTo(const LETableReference &parent, LEErrorCode &success, const void* atPtr)
+     : LETableReference(parent, parent.ptrToOffset(atPtr, success), LE_UINTPTR_MAX, success) {
+-    verifyLength(parent.ptrToOffset(atPtr,success), LETableVarSizer<T>::getSize(), success);
++    verifyLength(0, LETableVarSizer<T>::getSize(), success);
+     if(LE_FAILURE(success)) clear();
+   }
+   /**