Mercurial > hg > release > icedtea6-1.13
view patches/version.patch @ 3231:6ddafe528889
Update to build against October 2015 security fixes.
2015-10-27 Andrew John Hughes <gnu.andrew@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@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.
author | Andrew John Hughes <gnu.andrew@redhat.com> |
---|---|
date | Tue, 27 Oct 2015 16:35:07 +0000 |
parents | 41fca4a6cb61 |
children |
line wrap: on
line source
diff -r 134c345baf84 make/common/shared/Defs.gmk --- openjdk.orig/jdk/make/common/shared/Defs.gmk Thu Jun 18 11:12:13 2009 +0800 +++ openjdk/jdk/make/common/shared/Defs.gmk Sat Jan 09 00:26:19 2010 +0000 @@ -194,7 +194,7 @@ # Default names ifdef OPENJDK - LAUNCHER_NAME = openjdk + LAUNCHER_NAME = java PRODUCT_NAME = OpenJDK PRODUCT_SUFFIX = Runtime Environment JDK_RC_PLATFORM_NAME = Platform diff -r 134c345baf84 make/java/version/Makefile --- openjdk.orig/jdk/make/java/version/Makefile Thu Jun 18 11:12:13 2009 +0800 +++ openjdk/jdk/make/java/version/Makefile Sat Jan 09 00:26:19 2010 +0000 @@ -39,7 +39,12 @@ $(SED) -e 's/@@launcher_name@@/$(LAUNCHER_NAME)/g' \ -e 's/@@java_version@@/$(RELEASE)/g' \ -e 's/@@java_runtime_version@@/$(FULL_VERSION)/g' \ + -e 's/@@jdk_derivative_name@@/$(JDK_DERIVATIVE_NAME)/g' \ + -e 's/@@distro_name@@/$(DISTRO_NAME)/g' \ + -e 's/@@distro_package_version@@/$(DISTRO_PACKAGE_VERSION)/g' \ -e 's/@@java_runtime_name@@/$(RUNTIME_NAME)/g' \ + -e 's/@@jdk_revid@@/$(JDK_REVID)/g' \ + -e 's/@@hotspot_revid@@/$(HOTSPOT_REVID)/g' \ $< > $@.temp @$(MV) $@.temp $@ diff -r 134c345baf84 src/share/classes/sun/misc/Version-template.java --- openjdk.orig/jdk/src/share/classes/sun/misc/Version.java.template Thu Jun 18 11:12:13 2009 +0800 +++ openjdk/jdk/src/share/classes/sun/misc/Version.java.template Sat Jan 09 00:26:19 2010 +0000 @@ -41,6 +41,21 @@ private static final String java_runtime_version = "@@java_runtime_version@@"; + private static final String jdk_derivative_name = + "@@jdk_derivative_name@@"; + + private static final String distro_name = + "@@distro_name@@"; + + private static final String distro_package_version = + "@@distro_package_version@@"; + + private static final String jdk_revid = + "@@jdk_revid@@"; + + private static final String hotspot_revid = + "@@hotspot_revid@@"; + static { init(); } @@ -81,14 +96,34 @@ /* First line: platform version. */ ps.println(launcher_name + " version \"" + java_version + "\""); + String java_vm_name = System.getProperty("java.vm.name"); + /* Second line: runtime version (ie, libraries). */ - ps.println(java_runtime_name + " (build " + - java_runtime_version + ")"); + StringBuilder sb = new StringBuilder(); + if (java_vm_name.toLowerCase().startsWith("cacao")) { + sb.append("IcedTea Runtime Environment"); + } else { + sb.append(java_runtime_name); + } + if (jdk_derivative_name.length() > 0) { + sb.append(" (").append(jdk_derivative_name).append(")"); + } + if (distro_package_version.length() > 0) { + sb.append(" (").append(distro_package_version).append(")"); + } else { + sb.append(" ("); + if (distro_name.length() > 0) + sb.append(distro_name).append(" "); + sb.append("build ").append(java_runtime_version); + if (jdk_revid.length() > 0) + sb.append("+").append(jdk_revid); + sb.append(")"); + } + ps.println(sb.toString()); /* Third line: JVM information. */ - String java_vm_name = System.getProperty("java.vm.name"); String java_vm_version = System.getProperty("java.vm.version"); String java_vm_info = System.getProperty("java.vm.info"); ps.println(java_vm_name + " (build " + java_vm_version + ", " + java_vm_info + ")"); }