/hg/release/icedtea6-1.13: 10 new changesets

andrew at icedtea.classpath.org andrew at icedtea.classpath.org
Fri Nov 13 02:45:33 UTC 2015


changeset ae390d52ddeb in /hg/release/icedtea6-1.13
details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=ae390d52ddeb
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Tue Oct 27 18:34:34 2015 +0000

	Add backports destined for the next update, 1.13.9.

	S6440786, PR363: Cannot create a ZIP file containing zero entries
	S6599383, PR363: Unable to open zip files more than 2GB in size
	S6929479, PR363: Add a system property sun.zip.disableMemoryMapping to disable mmap use in ZipFile
	S7105461, PR2662: Large JTables are not rendered correctly with Xrender pipeline
	S7150134, PR2662: JCK api/java_awt/Graphics/index.html#DrawLine fails with OOM for jdk8 with XRender pipeline
	PR2513: Reset success following calls in LayoutManager.cpp

	2015-10-12  Andrew John Hughes  <gnu.andrew at redhat.com>

		* Makefile.am:
		(ICEDTEA_PATCHES): Add new patches.
		* NEWS: Updated.
		* patches/openjdk/6440786-pr363-zero_entry_zips.patch,
		* patches/openjdk/6599383-pr363-large_zip_files.patch,
		* patches/openjdk/6929479-pr363-disable_mmap_zip.patch,
		* patches/openjdk/7105461-pr2662-xrender_jtables.patch,
		* patches/openjdk/7150134-pr2662-xrender_drawline_oom.patch,
		* patches/pr2513-layoutengine_reset.patch:
		New backports for issues to be fixed in 1.13.9.


changeset 7dfc8157286e in /hg/release/icedtea6-1.13
details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=7dfc8157286e
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Tue Aug 18 23:08:20 2015 +0100

	Bump to next release, b37.

	2015-08-18  Andrew John Hughes  <gnu.andrew at redhat.com>

		* Makefile.am:
		(OPENJDK_VERSION): Bump to next release, b37.


changeset 6ddafe528889 in /hg/release/icedtea6-1.13
details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=6ddafe528889
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Tue Oct 27 16:35:07 2015 +0000

	Update to build against October 2015 security fixes.

	2015-10-27  Andrew John Hughes  <gnu.andrew at redhat.com>

		* Makefile.am:
		(OPENJDK_DATE): Bump to b37 creation date;
		27th of October, 2015.
		(OPENJDK_SHA256SUM): Update for b37 tarball.

	2015-10-26  Andrew John Hughes  <gnu.andrew at redhat.com>

		* NEWS: Updated.
		* generated/java/nio/BufferOverflowException.java,
		* generated/java/nio/BufferUnderflowException.java,
		* generated/java/nio/ByteBuffer.java,
		* generated/java/nio/ByteBufferAsCharBufferB.java,
		* generated/java/nio/ByteBufferAsCharBufferL.java,
		* generated/java/nio/ByteBufferAsCharBufferRB.java,
		* generated/java/nio/ByteBufferAsCharBufferRL.java,
		* generated/java/nio/ByteBufferAsDoubleBufferB.java,
		* generated/java/nio/ByteBufferAsDoubleBufferL.java,
		* generated/java/nio/ByteBufferAsDoubleBufferRB.java,
		* generated/java/nio/ByteBufferAsDoubleBufferRL.java,
		* generated/java/nio/ByteBufferAsFloatBufferB.java,
		* generated/java/nio/ByteBufferAsFloatBufferL.java,
		* generated/java/nio/ByteBufferAsFloatBufferRB.java,
		* generated/java/nio/ByteBufferAsFloatBufferRL.java,
		* generated/java/nio/ByteBufferAsIntBufferB.java,
		* generated/java/nio/ByteBufferAsIntBufferL.java,
		* generated/java/nio/ByteBufferAsIntBufferRB.java,
		* generated/java/nio/ByteBufferAsIntBufferRL.java,
		* generated/java/nio/ByteBufferAsLongBufferB.java,
		* generated/java/nio/ByteBufferAsLongBufferL.java,
		* generated/java/nio/ByteBufferAsLongBufferRB.java,
		* generated/java/nio/ByteBufferAsLongBufferRL.java,
		* generated/java/nio/ByteBufferAsShortBufferB.java,
		* generated/java/nio/ByteBufferAsShortBufferL.java,
		* generated/java/nio/ByteBufferAsShortBufferRB.java,
		* generated/java/nio/ByteBufferAsShortBufferRL.java,
		* generated/java/nio/CharBuffer.java,
		* generated/java/nio/DirectByteBuffer.java,
		* generated/java/nio/DirectByteBufferR.java,
		* generated/java/nio/DirectCharBufferRS.java,
		* generated/java/nio/DirectCharBufferRU.java,
		* generated/java/nio/DirectCharBufferS.java,
		* generated/java/nio/DirectCharBufferU.java,
		* generated/java/nio/DirectDoubleBufferRS.java,
		* generated/java/nio/DirectDoubleBufferRU.java,
		* generated/java/nio/DirectDoubleBufferS.java,
		* generated/java/nio/DirectDoubleBufferU.java,
		* generated/java/nio/DirectFloatBufferRS.java,
		* generated/java/nio/DirectFloatBufferRU.java,
		* generated/java/nio/DirectFloatBufferS.java,
		* generated/java/nio/DirectFloatBufferU.java,
		* generated/java/nio/DirectIntBufferRS.java,
		* generated/java/nio/DirectIntBufferRU.java,
		* generated/java/nio/DirectIntBufferS.java,
		* generated/java/nio/DirectIntBufferU.java,
		* generated/java/nio/DirectLongBufferRS.java,
		* generated/java/nio/DirectLongBufferRU.java,
		* generated/java/nio/DirectLongBufferS.java,
		* generated/java/nio/DirectLongBufferU.java,
		* generated/java/nio/DirectShortBufferRS.java,
		* generated/java/nio/DirectShortBufferRU.java,
		* generated/java/nio/DirectShortBufferS.java,
		* generated/java/nio/DirectShortBufferU.java,
		* generated/java/nio/DoubleBuffer.java,
		* generated/java/nio/FloatBuffer.java,
		* generated/java/nio/HeapByteBuffer.java,
		* generated/java/nio/HeapByteBufferR.java,
		* generated/java/nio/HeapCharBuffer.java,
		* generated/java/nio/HeapCharBufferR.java,
		* generated/java/nio/HeapDoubleBuffer.java,
		* generated/java/nio/HeapDoubleBufferR.java,
		* generated/java/nio/HeapFloatBuffer.java,
		* generated/java/nio/HeapFloatBufferR.java,
		* generated/java/nio/HeapIntBuffer.java,
		* generated/java/nio/HeapIntBufferR.java,
		* generated/java/nio/HeapLongBuffer.java,
		* generated/java/nio/HeapLongBufferR.java,
		* generated/java/nio/HeapShortBuffer.java,
		* generated/java/nio/HeapShortBufferR.java,
		* generated/java/nio/IntBuffer.java,
		* generated/java/nio/InvalidMarkException.java,
		* generated/java/nio/LongBuffer.java,
		* generated/java/nio/ReadOnlyBufferException.java,
		* generated/java/nio/ShortBuffer.java,
		* generated/java/nio/channels/AlreadyConnectedException.java,
		* generated/java/nio/channels/AsynchronousCloseException.java,
		* generated/java/nio/channels/CancelledKeyException.java,
		* generated/java/nio/channels/ClosedByInterruptException.java,
		* generated/java/nio/channels/ClosedChannelException.java,
		* generated/java/nio/channels/ClosedSelectorException.java,
		* generated/java/nio/channels/ConnectionPendingException.java,
		* generated/java/nio/channels/FileLockInterruptionException.java,
		* generated/java/nio/channels/IllegalBlockingModeException.java,
		* generated/java/nio/channels/IllegalSelectorException.java,
		* generated/java/nio/channels/NoConnectionPendingException.java,
		* generated/java/nio/channels/NonReadableChannelException.java,
		* generated/java/nio/channels/NonWritableChannelException.java,
		* generated/java/nio/channels/NotYetBoundException.java,
		* generated/java/nio/channels/NotYetConnectedException.java,
		* generated/java/nio/channels/OverlappingFileLockException.java,
		* generated/java/nio/channels/UnresolvedAddressException.java,
		* generated/java/nio/channels/UnsupportedAddressTypeException.java,
		* generated/java/nio/charset/CharacterCodingException.java,
		* generated/java/nio/charset/CharsetDecoder.java,
		* generated/java/nio/charset/CharsetEncoder.java,
		* generated/java/nio/charset/IllegalCharsetNameException.java,
		* generated/java/nio/charset/UnsupportedCharsetException.java:
		Replaced by versions from a build of OpenJDK 6 b37.
		* patches/openjdk/p11cipher-6867345-turkish_regional_options_cause_npe_in_algoid.patch:
		Regenerated.
		* patches/version.patch:
		Fix path from Version-template.java to Version.java.template,
		following 6888701 upstream.


changeset a6864f33e6a0 in /hg/release/icedtea6-1.13
details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=a6864f33e6a0
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Tue Oct 27 18:58:03 2015 +0000

	Prepare for 1.13.9 release.

	2015-10-27  Andrew John Hughes  <gnu.andrew at redhat.com>

		* NEWS: Set release date to this Thursday.
		* configure.ac: Bump to 1.13.9.


changeset 1f0441256d8f in /hg/release/icedtea6-1.13
details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=1f0441256d8f
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Sat Oct 31 07:14:22 2015 +0000

	S6763122, PR363: ZipFile ctor does not throw exception when file is not a zip file

	2015-10-31  Andrew John Hughes  <gnu.andrew at redhat.com>

		* Makefile.am:
		(ICEDTEA_PATCHES): Add new patch.
		* NEWS: Updated.
		* patches/openjdk/6763122-no_zipfile_ctor_exception.patch:
		Add fix for TCK regression introduced by PR363.


changeset a0599a4d5f1e in /hg/release/icedtea6-1.13
details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=a0599a4d5f1e
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Nov 04 14:06:52 2015 +0000

	Update for revised b37 tarball.

	2015-11-04  Andrew John Hughes  <gnu.andrew at redhat.com>

		* Makefile.am:
		(OPENJDK_DATE): Bump to new b37 creation date;
		4th of November, 2015.
		(OPENJDK_SHA256SUM): Update for new b37 tarball.


changeset eed2636be24b in /hg/release/icedtea6-1.13
details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=eed2636be24b
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Tue Nov 10 04:54:58 2015 +0000

	Update for revised b37 tarball (v3).

	2015-11-10  Andrew John Hughes  <gnu.andrew at redhat.com>

		* Makefile.am:
		(OPENJDK_DATE): Bump to new b37 creation date;
		10th of November, 2015.
		(OPENJDK_SHA256SUM): Update for new b37 tarball.


changeset 18a10878a755 in /hg/release/icedtea6-1.13
details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=18a10878a755
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Nov 11 03:15:41 2015 +0000

	Update for revised b37 tarball (v4).

	2015-11-11  Andrew John Hughes  <gnu.andrew at redhat.com>

		* Makefile.am:
		(OPENJDK_DATE): Bump to new b37 creation date;
		11th of November, 2015.
		(OPENJDK_SHA256SUM): Update for new b37 tarball.


changeset 16ccd05e93d3 in /hg/release/icedtea6-1.13
details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=16ccd05e93d3
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Nov 11 03:24:00 2015 +0000

	Update NEWS with changes in b37 v2, v3 and v4. Update potential release date.

	2015-11-11  Andrew John Hughes  <gnu.andrew at redhat.com>

		* NEWS: Update with changes added
		in 2nd, 3rd and 4th b37 tarball revisions.
		Set release date to this coming Friday.


changeset 5e2a004ba433 in /hg/release/icedtea6-1.13
details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=5e2a004ba433
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Fri Nov 13 02:45:06 2015 +0000

	Added tag icedtea6-1.13.9 for changeset 16ccd05e93d3


diffstat:

 .hgtags                                                                              |    1 +
 ChangeLog                                                                            |  173 +++++
 Makefile.am                                                                          |   17 +-
 NEWS                                                                                 |  104 +++-
 configure.ac                                                                         |    2 +-
 generated/java/nio/BufferOverflowException.java                                      |   12 +-
 generated/java/nio/BufferUnderflowException.java                                     |   12 +-
 generated/java/nio/ByteBuffer.java                                                   |   14 +-
 generated/java/nio/ByteBufferAsCharBufferB.java                                      |   13 +-
 generated/java/nio/ByteBufferAsCharBufferL.java                                      |   13 +-
 generated/java/nio/ByteBufferAsCharBufferRB.java                                     |   13 +-
 generated/java/nio/ByteBufferAsCharBufferRL.java                                     |   13 +-
 generated/java/nio/ByteBufferAsDoubleBufferB.java                                    |   13 +-
 generated/java/nio/ByteBufferAsDoubleBufferL.java                                    |   13 +-
 generated/java/nio/ByteBufferAsDoubleBufferRB.java                                   |   13 +-
 generated/java/nio/ByteBufferAsDoubleBufferRL.java                                   |   13 +-
 generated/java/nio/ByteBufferAsFloatBufferB.java                                     |   13 +-
 generated/java/nio/ByteBufferAsFloatBufferL.java                                     |   13 +-
 generated/java/nio/ByteBufferAsFloatBufferRB.java                                    |   13 +-
 generated/java/nio/ByteBufferAsFloatBufferRL.java                                    |   13 +-
 generated/java/nio/ByteBufferAsIntBufferB.java                                       |   13 +-
 generated/java/nio/ByteBufferAsIntBufferL.java                                       |   13 +-
 generated/java/nio/ByteBufferAsIntBufferRB.java                                      |   13 +-
 generated/java/nio/ByteBufferAsIntBufferRL.java                                      |   13 +-
 generated/java/nio/ByteBufferAsLongBufferB.java                                      |   13 +-
 generated/java/nio/ByteBufferAsLongBufferL.java                                      |   13 +-
 generated/java/nio/ByteBufferAsLongBufferRB.java                                     |   13 +-
 generated/java/nio/ByteBufferAsLongBufferRL.java                                     |   13 +-
 generated/java/nio/ByteBufferAsShortBufferB.java                                     |   13 +-
 generated/java/nio/ByteBufferAsShortBufferL.java                                     |   13 +-
 generated/java/nio/ByteBufferAsShortBufferRB.java                                    |   13 +-
 generated/java/nio/ByteBufferAsShortBufferRL.java                                    |   13 +-
 generated/java/nio/CharBuffer.java                                                   |   14 +-
 generated/java/nio/DirectByteBuffer.java                                             |   61 +-
 generated/java/nio/DirectByteBufferR.java                                            |   23 +-
 generated/java/nio/DirectCharBufferRS.java                                           |   23 +-
 generated/java/nio/DirectCharBufferRU.java                                           |   23 +-
 generated/java/nio/DirectCharBufferS.java                                            |   51 +-
 generated/java/nio/DirectCharBufferU.java                                            |   51 +-
 generated/java/nio/DirectDoubleBufferRS.java                                         |   23 +-
 generated/java/nio/DirectDoubleBufferRU.java                                         |   23 +-
 generated/java/nio/DirectDoubleBufferS.java                                          |   51 +-
 generated/java/nio/DirectDoubleBufferU.java                                          |   51 +-
 generated/java/nio/DirectFloatBufferRS.java                                          |   23 +-
 generated/java/nio/DirectFloatBufferRU.java                                          |   23 +-
 generated/java/nio/DirectFloatBufferS.java                                           |   51 +-
 generated/java/nio/DirectFloatBufferU.java                                           |   51 +-
 generated/java/nio/DirectIntBufferRS.java                                            |   23 +-
 generated/java/nio/DirectIntBufferRU.java                                            |   23 +-
 generated/java/nio/DirectIntBufferS.java                                             |   51 +-
 generated/java/nio/DirectIntBufferU.java                                             |   51 +-
 generated/java/nio/DirectLongBufferRS.java                                           |   23 +-
 generated/java/nio/DirectLongBufferRU.java                                           |   23 +-
 generated/java/nio/DirectLongBufferS.java                                            |   51 +-
 generated/java/nio/DirectLongBufferU.java                                            |   51 +-
 generated/java/nio/DirectShortBufferRS.java                                          |   23 +-
 generated/java/nio/DirectShortBufferRU.java                                          |   23 +-
 generated/java/nio/DirectShortBufferS.java                                           |   51 +-
 generated/java/nio/DirectShortBufferU.java                                           |   51 +-
 generated/java/nio/DoubleBuffer.java                                                 |   14 +-
 generated/java/nio/FloatBuffer.java                                                  |   14 +-
 generated/java/nio/HeapByteBuffer.java                                               |   12 +-
 generated/java/nio/HeapByteBufferR.java                                              |   12 +-
 generated/java/nio/HeapCharBuffer.java                                               |   12 +-
 generated/java/nio/HeapCharBufferR.java                                              |   12 +-
 generated/java/nio/HeapDoubleBuffer.java                                             |   12 +-
 generated/java/nio/HeapDoubleBufferR.java                                            |   12 +-
 generated/java/nio/HeapFloatBuffer.java                                              |   12 +-
 generated/java/nio/HeapFloatBufferR.java                                             |   12 +-
 generated/java/nio/HeapIntBuffer.java                                                |   12 +-
 generated/java/nio/HeapIntBufferR.java                                               |   12 +-
 generated/java/nio/HeapLongBuffer.java                                               |   12 +-
 generated/java/nio/HeapLongBufferR.java                                              |   12 +-
 generated/java/nio/HeapShortBuffer.java                                              |   12 +-
 generated/java/nio/HeapShortBufferR.java                                             |   12 +-
 generated/java/nio/IntBuffer.java                                                    |   14 +-
 generated/java/nio/InvalidMarkException.java                                         |   12 +-
 generated/java/nio/LongBuffer.java                                                   |   14 +-
 generated/java/nio/ReadOnlyBufferException.java                                      |   12 +-
 generated/java/nio/ShortBuffer.java                                                  |   14 +-
 generated/java/nio/channels/AlreadyConnectedException.java                           |   12 +-
 generated/java/nio/channels/AsynchronousCloseException.java                          |   12 +-
 generated/java/nio/channels/CancelledKeyException.java                               |   12 +-
 generated/java/nio/channels/ClosedByInterruptException.java                          |   12 +-
 generated/java/nio/channels/ClosedChannelException.java                              |   12 +-
 generated/java/nio/channels/ClosedSelectorException.java                             |   12 +-
 generated/java/nio/channels/ConnectionPendingException.java                          |   12 +-
 generated/java/nio/channels/FileLockInterruptionException.java                       |   12 +-
 generated/java/nio/channels/IllegalBlockingModeException.java                        |   12 +-
 generated/java/nio/channels/IllegalSelectorException.java                            |   12 +-
 generated/java/nio/channels/NoConnectionPendingException.java                        |   12 +-
 generated/java/nio/channels/NonReadableChannelException.java                         |   12 +-
 generated/java/nio/channels/NonWritableChannelException.java                         |   12 +-
 generated/java/nio/channels/NotYetBoundException.java                                |   12 +-
 generated/java/nio/channels/NotYetConnectedException.java                            |   12 +-
 generated/java/nio/channels/OverlappingFileLockException.java                        |   12 +-
 generated/java/nio/channels/UnresolvedAddressException.java                          |   12 +-
 generated/java/nio/channels/UnsupportedAddressTypeException.java                     |   12 +-
 generated/java/nio/charset/CharacterCodingException.java                             |   12 +-
 generated/java/nio/charset/CharsetDecoder.java                                       |   12 +-
 generated/java/nio/charset/CharsetEncoder.java                                       |   12 +-
 generated/java/nio/charset/IllegalCharsetNameException.java                          |   12 +-
 generated/java/nio/charset/UnsupportedCharsetException.java                          |   12 +-
 patches/openjdk/6440786-pr363-zero_entry_zips.patch                                  |  237 +++++++
 patches/openjdk/6599383-pr363-large_zip_files.patch                                  |  214 ++++++
 patches/openjdk/6763122-no_zipfile_ctor_exception.patch                              |  138 ++++
 patches/openjdk/6929479-pr363-disable_mmap_zip.patch                                 |  331 ++++++++++
 patches/openjdk/7105461-pr2662-xrender_jtables.patch                                 |  117 +++
 patches/openjdk/7150134-pr2662-xrender_drawline_oom.patch                            |   51 +
 patches/openjdk/p11cipher-6867345-turkish_regional_options_cause_npe_in_algoid.patch |   60 +-
 patches/pr2513-layoutengine_reset.patch                                              |   22 +
 patches/version.patch                                                                |    4 +-
 112 files changed, 2524 insertions(+), 821 deletions(-)

diffs (truncated from 6802 to 500 lines):

diff -r 53d2442cfbec -r 5e2a004ba433 .hgtags
--- a/.hgtags	Sat Aug 15 00:52:55 2015 +0100
+++ b/.hgtags	Fri Nov 13 02:45:06 2015 +0000
@@ -35,3 +35,4 @@
 e6429eecdf6945c6a4b431049bcbf1834b255158 icedtea6-1.13.6
 69d82d8f85f926ca35e610d01727d223519c1c98 icedtea6-1.13.7
 6d96a13066ecea305dc0dcb97396c8d8fb5af49e icedtea6-1.13.8
+16ccd05e93d3ead8ecbac25c7fcb9a3e46a93dbf icedtea6-1.13.9
diff -r 53d2442cfbec -r 5e2a004ba433 ChangeLog
--- a/ChangeLog	Sat Aug 15 00:52:55 2015 +0100
+++ b/ChangeLog	Fri Nov 13 02:45:06 2015 +0000
@@ -1,3 +1,176 @@
+2015-11-11  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* NEWS: Update with changes added
+	in 2nd, 3rd and 4th b37 tarball revisions.
+	Set release date to this coming Friday.
+
+2015-11-11  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* Makefile.am:
+	(OPENJDK_DATE): Bump to new b37 creation date;
+	11th of November, 2015.
+	(OPENJDK_SHA256SUM): Update for new b37 tarball.
+
+2015-11-10  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* Makefile.am:
+	(OPENJDK_DATE): Bump to new b37 creation date;
+	10th of November, 2015.
+	(OPENJDK_SHA256SUM): Update for new b37 tarball.
+
+2015-11-04  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* Makefile.am:
+	(OPENJDK_DATE): Bump to new b37 creation date;
+	4th of November, 2015.
+	(OPENJDK_SHA256SUM): Update for new b37 tarball.
+
+2015-10-31  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Add new patch.
+	* NEWS: Updated.
+	* patches/openjdk/6763122-no_zipfile_ctor_exception.patch:
+	Add fix for TCK regression introduced by PR363.
+
+2015-10-27  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* NEWS: Set release date to this Thursday.
+	* configure.ac: Bump to 1.13.9.
+
+2015-10-27  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* Makefile.am:
+	(OPENJDK_DATE): Bump to b37 creation date;
+	27th of October, 2015.
+	(OPENJDK_SHA256SUM): Update for b37 tarball.
+
+2015-10-26  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* NEWS: Updated.
+	* generated/java/nio/BufferOverflowException.java,
+	* generated/java/nio/BufferUnderflowException.java,
+	* generated/java/nio/ByteBuffer.java,
+	* generated/java/nio/ByteBufferAsCharBufferB.java,
+	* generated/java/nio/ByteBufferAsCharBufferL.java,
+	* generated/java/nio/ByteBufferAsCharBufferRB.java,
+	* generated/java/nio/ByteBufferAsCharBufferRL.java,
+	* generated/java/nio/ByteBufferAsDoubleBufferB.java,
+	* generated/java/nio/ByteBufferAsDoubleBufferL.java,
+	* generated/java/nio/ByteBufferAsDoubleBufferRB.java,
+	* generated/java/nio/ByteBufferAsDoubleBufferRL.java,
+	* generated/java/nio/ByteBufferAsFloatBufferB.java,
+	* generated/java/nio/ByteBufferAsFloatBufferL.java,
+	* generated/java/nio/ByteBufferAsFloatBufferRB.java,
+	* generated/java/nio/ByteBufferAsFloatBufferRL.java,
+	* generated/java/nio/ByteBufferAsIntBufferB.java,
+	* generated/java/nio/ByteBufferAsIntBufferL.java,
+	* generated/java/nio/ByteBufferAsIntBufferRB.java,
+	* generated/java/nio/ByteBufferAsIntBufferRL.java,
+	* generated/java/nio/ByteBufferAsLongBufferB.java,
+	* generated/java/nio/ByteBufferAsLongBufferL.java,
+	* generated/java/nio/ByteBufferAsLongBufferRB.java,
+	* generated/java/nio/ByteBufferAsLongBufferRL.java,
+	* generated/java/nio/ByteBufferAsShortBufferB.java,
+	* generated/java/nio/ByteBufferAsShortBufferL.java,
+	* generated/java/nio/ByteBufferAsShortBufferRB.java,
+	* generated/java/nio/ByteBufferAsShortBufferRL.java,
+	* generated/java/nio/CharBuffer.java,
+	* generated/java/nio/DirectByteBuffer.java,
+	* generated/java/nio/DirectByteBufferR.java,
+	* generated/java/nio/DirectCharBufferRS.java,
+	* generated/java/nio/DirectCharBufferRU.java,
+	* generated/java/nio/DirectCharBufferS.java,
+	* generated/java/nio/DirectCharBufferU.java,
+	* generated/java/nio/DirectDoubleBufferRS.java,
+	* generated/java/nio/DirectDoubleBufferRU.java,
+	* generated/java/nio/DirectDoubleBufferS.java,
+	* generated/java/nio/DirectDoubleBufferU.java,
+	* generated/java/nio/DirectFloatBufferRS.java,
+	* generated/java/nio/DirectFloatBufferRU.java,
+	* generated/java/nio/DirectFloatBufferS.java,
+	* generated/java/nio/DirectFloatBufferU.java,
+	* generated/java/nio/DirectIntBufferRS.java,
+	* generated/java/nio/DirectIntBufferRU.java,
+	* generated/java/nio/DirectIntBufferS.java,
+	* generated/java/nio/DirectIntBufferU.java,
+	* generated/java/nio/DirectLongBufferRS.java,
+	* generated/java/nio/DirectLongBufferRU.java,
+	* generated/java/nio/DirectLongBufferS.java,
+	* generated/java/nio/DirectLongBufferU.java,
+	* generated/java/nio/DirectShortBufferRS.java,
+	* generated/java/nio/DirectShortBufferRU.java,
+	* generated/java/nio/DirectShortBufferS.java,
+	* generated/java/nio/DirectShortBufferU.java,
+	* generated/java/nio/DoubleBuffer.java,
+	* generated/java/nio/FloatBuffer.java,
+	* generated/java/nio/HeapByteBuffer.java,
+	* generated/java/nio/HeapByteBufferR.java,
+	* generated/java/nio/HeapCharBuffer.java,
+	* generated/java/nio/HeapCharBufferR.java,
+	* generated/java/nio/HeapDoubleBuffer.java,
+	* generated/java/nio/HeapDoubleBufferR.java,
+	* generated/java/nio/HeapFloatBuffer.java,
+	* generated/java/nio/HeapFloatBufferR.java,
+	* generated/java/nio/HeapIntBuffer.java,
+	* generated/java/nio/HeapIntBufferR.java,
+	* generated/java/nio/HeapLongBuffer.java,
+	* generated/java/nio/HeapLongBufferR.java,
+	* generated/java/nio/HeapShortBuffer.java,
+	* generated/java/nio/HeapShortBufferR.java,
+	* generated/java/nio/IntBuffer.java,
+	* generated/java/nio/InvalidMarkException.java,
+	* generated/java/nio/LongBuffer.java,
+	* generated/java/nio/ReadOnlyBufferException.java,
+	* generated/java/nio/ShortBuffer.java,
+	* generated/java/nio/channels/AlreadyConnectedException.java,
+	* generated/java/nio/channels/AsynchronousCloseException.java,
+	* generated/java/nio/channels/CancelledKeyException.java,
+	* generated/java/nio/channels/ClosedByInterruptException.java,
+	* generated/java/nio/channels/ClosedChannelException.java,
+	* generated/java/nio/channels/ClosedSelectorException.java,
+	* generated/java/nio/channels/ConnectionPendingException.java,
+	* generated/java/nio/channels/FileLockInterruptionException.java,
+	* generated/java/nio/channels/IllegalBlockingModeException.java,
+	* generated/java/nio/channels/IllegalSelectorException.java,
+	* generated/java/nio/channels/NoConnectionPendingException.java,
+	* generated/java/nio/channels/NonReadableChannelException.java,
+	* generated/java/nio/channels/NonWritableChannelException.java,
+	* generated/java/nio/channels/NotYetBoundException.java,
+	* generated/java/nio/channels/NotYetConnectedException.java,
+	* generated/java/nio/channels/OverlappingFileLockException.java,
+	* generated/java/nio/channels/UnresolvedAddressException.java,
+	* generated/java/nio/channels/UnsupportedAddressTypeException.java,
+	* generated/java/nio/charset/CharacterCodingException.java,
+	* generated/java/nio/charset/CharsetDecoder.java,
+	* generated/java/nio/charset/CharsetEncoder.java,
+	* generated/java/nio/charset/IllegalCharsetNameException.java,
+	* generated/java/nio/charset/UnsupportedCharsetException.java:
+	Replaced by versions from a build of OpenJDK 6 b37.
+	* patches/openjdk/p11cipher-6867345-turkish_regional_options_cause_npe_in_algoid.patch:
+	Regenerated.
+	* patches/version.patch:
+	Fix path from Version-template.java to Version.java.template,
+	following 6888701 upstream.
+
+2015-08-18  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* Makefile.am:
+	(OPENJDK_VERSION): Bump to next release, b37.
+
+2015-10-12  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Add new patches.
+	* NEWS: Updated.
+	* patches/openjdk/6440786-pr363-zero_entry_zips.patch,
+	* patches/openjdk/6599383-pr363-large_zip_files.patch,
+	* patches/openjdk/6929479-pr363-disable_mmap_zip.patch,
+	* patches/openjdk/7105461-pr2662-xrender_jtables.patch,
+	* patches/openjdk/7150134-pr2662-xrender_drawline_oom.patch,
+	* patches/pr2513-layoutengine_reset.patch:
+	New backports for issues to be fixed in 1.13.9.
+
 2015-08-15  Andrew John Hughes  <gnu.andrew at redhat.com>
 
 	* NEWS: Add 1.13.9 section. Correct
diff -r 53d2442cfbec -r 5e2a004ba433 Makefile.am
--- a/Makefile.am	Sat Aug 15 00:52:55 2015 +0100
+++ b/Makefile.am	Fri Nov 13 02:45:06 2015 +0000
@@ -1,8 +1,8 @@
 # Dependencies
 
-OPENJDK_DATE = 22_jul_2015
-OPENJDK_SHA256SUM = c9df23d208b3b61f5f57c030accca2f7b3218a97bd140668506265ececdf26f4
-OPENJDK_VERSION = b36
+OPENJDK_DATE = 11_nov_2015
+OPENJDK_SHA256SUM = 462ac2c28f6dbfb4a18eb46efca232b907d6027f7618715cbc4de5dd73b89e8d
+OPENJDK_VERSION = b37
 OPENJDK_URL = https://java.net/downloads/openjdk6/
 
 CACAO_VERSION = 68fe50ac34ec
@@ -634,7 +634,12 @@
 	patches/pr2460-policy_jar_timestamp.patch \
 	patches/pr2481_sysconfig_clock_spaces.patch \
 	patches/pr2486-768_dh.patch \
-	patches/pr2488-1024_dh.patch
+	patches/pr2488-1024_dh.patch \
+	patches/openjdk/6440786-pr363-zero_entry_zips.patch \
+	patches/openjdk/6763122-no_zipfile_ctor_exception.patch \
+	patches/openjdk/6599383-pr363-large_zip_files.patch \
+	patches/openjdk/6929479-pr363-disable_mmap_zip.patch \
+	patches/pr2513-layoutengine_reset.patch
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
@@ -664,7 +669,9 @@
 if ENABLE_XRENDER
 ICEDTEA_PATCHES += patches/openjdk/6307603-xrender-01.patch \
 	patches/openjdk/6961633-xrender-02.patch \
-	patches/openjdk/7018387-xrender_gc_leak.patch
+	patches/openjdk/7018387-xrender_gc_leak.patch \
+	patches/openjdk/7150134-pr2662-xrender_drawline_oom.patch \
+	patches/openjdk/7105461-pr2662-xrender_jtables.patch
 endif
 
 if ENABLE_SYSTEMTAP
diff -r 53d2442cfbec -r 5e2a004ba433 NEWS
--- a/NEWS	Sat Aug 15 00:52:55 2015 +0100
+++ b/NEWS	Fri Nov 13 02:45:06 2015 +0000
@@ -12,7 +12,109 @@
 
 CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
 
-New in release 1.13.8 (2015-10-XX):
+New in release 1.13.9 (2015-11-13):
+
+* Security fixes
+  - S8048030, CVE-2015-4734: Expectations should be consistent
+  - S8068842, CVE-2015-4803: Better JAXP data handling
+  - S8076339, CVE-2015-4903: Better handling of remote object invocation
+  - S8076383, CVE-2015-4835: Better CORBA exception handling
+  - S8076387, CVE-2015-4882: Better CORBA value handling
+  - S8076392, CVE-2015-4881: Improve IIOPInputStream consistency
+  - S8076413, CVE-2015-4883: Better JRMP message handling
+  - S8078427, CVE-2015-4842: More supportive home environment
+  - S8078440: Safer managed types
+  - S8080541: More direct property handling
+  - S8080688, CVE-2015-4860: Service for DGC services
+  - S8081760: Better group dynamics
+  - S8086733, CVE-2015-4893: Improve namespace handling
+  - S8087350: Improve array conversions
+  - S8103671, CVE-2015-4805: More objective stream classes
+  - S8103675: Better Binary searches
+  - S8130078, CVE-2015-4911: Document better processing
+  - S8130193, CVE-2015-4806: Improve HTTP connections
+  - S8130864: Better server identity handling
+  - S8130891, CVE-2015-4843: (bf) More direct buffering
+  - S8131291, CVE-2015-4872: Perfect parameter patterning
+  - S8132042, CVE-2015-4844: Preserve layout presentation
+* Import of OpenJDK6 b37
+  - OJ64: Backport hashtable to map changes from jaxp
+  - OJ65: Remove @Override annotation on interfaces added by 2015/10/20 security fixes
+  - OJ66: Revert 7110373 & 7149751 test removals now 6706974 is present (krb5 test infrastructure)
+  - OJ67: Fix copyright headers on imported files
+  - OJ68: Ensure SharedSecrets are initialised
+  - S6570619: (bf) DirectByteBuffer.get/put(byte[]) does not scale well
+  - S6590930: reed/write does not match for ccache
+  - S6648972: KDCReq.init always read padata
+  - S6676075: RegistryContext (com.sun.jndi.url.rmi.rmiURLContext) coding problem
+  - S6682516: SPNEGO_HTTP_AUTH/WWW_KRB and SPNEGO_HTTP_AUTH/WWW_SPNEGO failed on all non-windows platforms
+  - S6710360: export Kerberos session key to applications
+  - S6733095: Failure when SPNEGO request non-Mutual
+  - S6785456: Read Kerberos setting from Windows environment variables
+  - S6821190: more InquireType values for ExtendedGSSContext
+  - S6843127: krb5 should not try to access unavailable kdc too often
+  - S6844193: support max_retries in krb5.conf
+  - S6844907: krb5 etype order should be from strong to weak
+  - S6844909: support allow_weak_crypto in krb5.conf
+  - S6849275: enhance krb5 reg tests
+  - S6853328: Support OK-AS-DELEGATE flag
+  - S6854308: more ktab options
+  - S6856069: PrincipalName.clone() does not invoke super.clone()
+  - S6857795: krb5.conf ignored if system properties on realm and kdc are provided
+  - S6857802: GSS getRemainingInitLifetime method returns milliseconds not seconds
+  - S6858589: more changes to Config on system properties
+  - S6862679: ESC: AD Authentication with user with umlauts fails
+  - S6877357: IPv6 address does not work
+  - S6888701: Change all template java source files to a .java-template file suffix
+  - S6893158: AP_REQ check should use key version number
+  - S6907425: JCK Kerberos tests fail since b77
+  - S6919610: KeyTabInputStream uses static field for per-instance value
+  - S6932525: Incorrect encryption types of KDC_REQ_BODY of AS-REQ with pre-authentication
+  - S6946669: SSL/Krb5 should not call EncryptedData.reset(data, false)
+  - S6950546: "ktab -d name etype" to "ktab -d name [-e etype] [kvno | all | old]"
+  - S6951366: kerberos login failure on win2008 with AD set to win2000 compat mode
+  - S6952519: kdc_timeout is not being honoured when using TCP
+  - S6959292: regression: cannot login if session key and preauth does not use the same etype
+  - S6960894: Better AS-REQ creation and processing
+  - S6966259: Make PrincipalName and Realm immutable
+  - S6975866: api/org_ietf/jgss/GSSContext/index.html#wrapUnwrapIOTest started to fail since jdk7 b102
+  - S6984764: kerberos fails if service side keytab is generated using JDK ktab
+  - S6997740: ktab entry related test compilation error
+  - S7018928: test failure: sun/security/krb5/auto/SSL.java
+  - S7032354: no-addresses should not be used on acceptor side
+  - S7061379: [Kerberos] Cross-realm authentication fails, due to nameType problem
+  - S7142596: RMI JPRT tests are failing
+  - S7157610: NullPointerException occurs when parsing XML doc
+  - S7158329: NPE in sun.security.krb5.Credentials.acquireDefaultCreds()
+  - S7197159: accept different kvno if there no match
+  - S8004317: TestLibrary.getUnusedRandomPort() fails intermittently, but exception not reported
+  - S8005226: java/rmi/transport/pinClientSocketFactory/PinClientSocketFactory.java fails intermittently
+  - S8006534: CLONE - TestLibrary.getUnusedRandomPort() fails intermittently-doesn't retry enough times
+  - S8014097: add doPrivileged methods with limited privilege scope
+  - S8021191: Add isAuthorized check to limited doPrivileged methods
+  - S8022213: Intermittent test failures in java/net/URLClassLoader
+  - S8028583: Add helper methods to test libraries
+  - S8028780: JDK KRB5 module throws OutOfMemoryError when CCache is corrupt
+  - S8058608: JVM crash during Kerberos logins using des3-cbc-md5 on OSX
+  - S8064331: JavaSecurityAccess.doIntersectionPrivilege() drops the information about the domain combiner of the stack ACC
+  - S8072932: Test fails with java.security.AccessControlException: access denied ("java.security.SecurityPermission" "getDomainCombiner")
+  - S8078822: 8068842 fix missed one new file PrimeNumberSequenceGenerator.java
+  - S8079323: Serialization compatibility for Templates: need to exclude Hashtable from serialization
+  - S8087118: Remove missing package from java.security files
+  - S8098547: (tz) Support tzdata2015e
+  - S8130253: ObjectStreamClass.getFields too restrictive
+  - S8133196, RH1251935: HTTPS hostname invalid issue with InetAddress
+  - S8133321: (tz) Support tzdata2015f
+  - S8135043: ObjectStreamClass.getField(String) too restrictive
+* Backports
+  - S6440786, PR363: Cannot create a ZIP file containing zero entries
+  - S6599383, PR363: Unable to open zip files more than 2GB in size
+  - S6763122, PR363: ZipFile ctor does not throw exception when file is not a zip file
+  - S6929479, PR363: Add a system property sun.zip.disableMemoryMapping to disable mmap use in ZipFile
+  - S7105461, PR2662: Large JTables are not rendered correctly with Xrender pipeline
+  - S7150134, PR2662: JCK api/java_awt/Graphics/index.html#DrawLine fails with OOM for jdk8 with XRender pipeline
+* Bug fixes
+  - PR2513: Reset success following calls in LayoutManager.cpp
 
 New in release 1.13.8 (2015-07-29):
 
diff -r 53d2442cfbec -r 5e2a004ba433 configure.ac
--- a/configure.ac	Sat Aug 15 00:52:55 2015 +0100
+++ b/configure.ac	Fri Nov 13 02:45:06 2015 +0000
@@ -1,4 +1,4 @@
-AC_INIT([icedtea6],[1.13.9pre],[distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea6],[1.13.9],[distro-pkg-dev at openjdk.java.net])
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
diff -r 53d2442cfbec -r 5e2a004ba433 generated/java/nio/BufferOverflowException.java
--- a/generated/java/nio/BufferOverflowException.java	Sat Aug 15 00:52:55 2015 +0100
+++ b/generated/java/nio/BufferOverflowException.java	Fri Nov 13 02:45:06 2015 +0000
@@ -1,13 +1,13 @@
 /*
- * Copyright 2000-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2000, 2007, Oracle and/or its affiliates. All rights reserved.
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Sun designates this
+ * published by the Free Software Foundation.  Oracle designates this
  * particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
  *
  * This code is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -19,9 +19,9 @@
  * 2 along with this work; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
  *
  */
 
diff -r 53d2442cfbec -r 5e2a004ba433 generated/java/nio/BufferUnderflowException.java
--- a/generated/java/nio/BufferUnderflowException.java	Sat Aug 15 00:52:55 2015 +0100
+++ b/generated/java/nio/BufferUnderflowException.java	Fri Nov 13 02:45:06 2015 +0000
@@ -1,13 +1,13 @@
 /*
- * Copyright 2000-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2000, 2007, Oracle and/or its affiliates. All rights reserved.
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Sun designates this
+ * published by the Free Software Foundation.  Oracle designates this
  * particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
  *
  * This code is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -19,9 +19,9 @@
  * 2 along with this work; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
  *
  */
 
diff -r 53d2442cfbec -r 5e2a004ba433 generated/java/nio/ByteBuffer.java
--- a/generated/java/nio/ByteBuffer.java	Sat Aug 15 00:52:55 2015 +0100
+++ b/generated/java/nio/ByteBuffer.java	Fri Nov 13 02:45:06 2015 +0000
@@ -1,12 +1,12 @@
 /*
- * Copyright 2000-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2000, 2007, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Sun designates this
+ * published by the Free Software Foundation.  Oracle designates this
  * particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
  *
  * This code is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
  * 2 along with this work; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
  */
 
 // -- This file was mechanically generated: Do not edit! -- //
@@ -1059,7 +1059,7 @@
 
 
 
-    
+
 
     /**
      * Returns the current hash code of this buffer.
diff -r 53d2442cfbec -r 5e2a004ba433 generated/java/nio/ByteBufferAsCharBufferB.java
--- a/generated/java/nio/ByteBufferAsCharBufferB.java	Sat Aug 15 00:52:55 2015 +0100
+++ b/generated/java/nio/ByteBufferAsCharBufferB.java	Fri Nov 13 02:45:06 2015 +0000
@@ -1,12 +1,12 @@
 /*
- * Copyright 2000-2004 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Sun designates this
+ * published by the Free Software Foundation.  Oracle designates this
  * particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
  *
  * This code is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
  * 2 along with this work; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
  */
 
 // -- This file was mechanically generated: Do not edit! -- //
@@ -150,6 +150,7 @@
         sb.compact();
         position(rem);
         limit(capacity());
+        discardMark();
         return this;
 
 
diff -r 53d2442cfbec -r 5e2a004ba433 generated/java/nio/ByteBufferAsCharBufferL.java
--- a/generated/java/nio/ByteBufferAsCharBufferL.java	Sat Aug 15 00:52:55 2015 +0100


More information about the distro-pkg-dev mailing list