# HG changeset patch
# User Andrew John Hughes <gnu_andrew@member.fsf.org>
# Date 1613103025 0
# Node ID f1239bef7efdb9e62ca0050734b9b3c5ccb31565
# Parent  1ea37d1972ccc5f185cc44f05db4c87c538c2613
Bump to 2.6.25.

2021-02-09  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	Bump to 2.6.25.
	* Makefile.am:
	(CORBA_CHANGESET): Update to icedtea-2.6.25.
	(JAXP_CHANGESET): Likewise.
	(JAXWS_CHANGESET): Likewise.
	(JDK_CHANGESET): Likewise.
	(LANGTOOLS_CHANGESET): Likewise.
	(OPENJDK_CHANGESET): Likewise.
	(CORBA_SHA256SUM): Likewise.
	(JAXP_SHA256SUM): Likewise.
	(JAXWS_SHA256SUM): Likewise.
	(JDK_SHA256SUM): Likewise.
	(LANGTOOLS_SHA256SUM): Likewise.
	(OPENJDK_SHA256SUM): Likewise.
	* NEWS: Updated.
	* acinclude.m4:
	(JDK_UPDATE_VERSION): Bump to 291.
	* configure.ac: Bump to 2.6.25.
	* hotspot.map.in: Update to icedtea-2.6.25.

diff -r 1ea37d1972cc -r f1239bef7efd ChangeLog
--- a/ChangeLog	Fri Nov 06 06:29:40 2020 +0000
+++ b/ChangeLog	Fri Feb 12 04:10:25 2021 +0000
@@ -1,3 +1,25 @@
+2021-02-09  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	Bump to 2.6.25.
+	* Makefile.am:
+	(CORBA_CHANGESET): Update to icedtea-2.6.25.
+	(JAXP_CHANGESET): Likewise.
+	(JAXWS_CHANGESET): Likewise.
+	(JDK_CHANGESET): Likewise.
+	(LANGTOOLS_CHANGESET): Likewise.
+	(OPENJDK_CHANGESET): Likewise.
+	(CORBA_SHA256SUM): Likewise.
+	(JAXP_SHA256SUM): Likewise.
+	(JAXWS_SHA256SUM): Likewise.
+	(JDK_SHA256SUM): Likewise.
+	(LANGTOOLS_SHA256SUM): Likewise.
+	(OPENJDK_SHA256SUM): Likewise.
+	* NEWS: Updated.
+	* acinclude.m4:
+	(JDK_UPDATE_VERSION): Bump to 291.
+	* configure.ac: Bump to 2.6.25.
+	* hotspot.map.in: Update to icedtea-2.6.25.
+
 2020-11-04  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	Bump to 2.6.24.
diff -r 1ea37d1972cc -r f1239bef7efd Makefile.am
--- a/Makefile.am	Fri Nov 06 06:29:40 2020 +0000
+++ b/Makefile.am	Fri Feb 12 04:10:25 2021 +0000
@@ -1,18 +1,18 @@
 # Dependencies
 
-CORBA_CHANGESET = 5ab7d5830c08
-JAXP_CHANGESET = 96d393c36e10
-JAXWS_CHANGESET = 13560866994e
-JDK_CHANGESET = b8b51d9e706f
-LANGTOOLS_CHANGESET = d23c12cebe15
-OPENJDK_CHANGESET = 6f4a38fb67c4
-
-CORBA_SHA256SUM = b6f9735a5fffc7d57b79912a3d4569a332a7c8901cb6739c70e07f30e6ee79f8
-JAXP_SHA256SUM = 6984918947478df781ab2e62998368c6fef73d9df63aa4d818efd59dc83a4dbc
-JAXWS_SHA256SUM = 1203b8e9cfcaf19d66111b4d9605220875938e0e582ce08eb1bac3031f7aca7e
-JDK_SHA256SUM = a35151b44730c29bb99e78ee86ffb5ea5ded7ad47c955c871802e6cd3ce4ee3e
-LANGTOOLS_SHA256SUM = cc01192670d6aa39725b190a34443e2494f64c6b7b34104430c57947e72e3ad6
-OPENJDK_SHA256SUM = 21024509f59e57769640f3cfbb0ef5870c6cba4f55b5a5a43bed033e25a16c46
+CORBA_CHANGESET = c52262cf62de
+JAXP_CHANGESET = 1a519f148114
+JAXWS_CHANGESET = 554eae8a0e5a
+JDK_CHANGESET = 4b1813281fa9
+LANGTOOLS_CHANGESET = 359498d2d9de
+OPENJDK_CHANGESET = 6bfd9fef1b23
+
+CORBA_SHA256SUM = b7d750b22135079a76f9282044b9520a411ef51345cfddb7d2816d389c837cd2
+JAXP_SHA256SUM = e2521f4d636287925dd5916249380a63f90250a41d81e5944b65b9cd55576c95
+JAXWS_SHA256SUM = c40eda9cbebefacb346bb44bd08e6eb89d1185e90efc6f4862cf612fe9a2a92f
+JDK_SHA256SUM = b60b68748a7250649307d5a8b3353eb1ba13ede215cb1be89b84b76c87e12648
+LANGTOOLS_SHA256SUM = 739d911279086d06f35eb6154a09bf4aa9f8dd647c304bfeec61db076b1c1114
+OPENJDK_SHA256SUM = 993174ab32deb4051f22599c301fe08704f80fcac814f39c7c1eb84ddc353a64
 
 DROP_URL = https://icedtea.classpath.org/download/drops
 
diff -r 1ea37d1972cc -r f1239bef7efd NEWS
--- a/NEWS	Fri Nov 06 06:29:40 2020 +0000
+++ b/NEWS	Fri Feb 12 04:10:25 2021 +0000
@@ -12,6 +12,15 @@
 
 CVE-XXXX-YYYY: https://cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
 
+New in release 2.6.25 (2021-02-12):
+
+* Security fixes
+  - JDK-8247619: Improve Direct Buffering of Characters
+* Import of OpenJDK 7 u291 build 1
+  - JDK-8254177: (tz) Upgrade time-zone data to tzdata2020b
+  - JDK-8254982: (tz) Upgrade time-zone data to tzdata2020c
+  - JDK-8255226: (tz) Upgrade time-zone data to tzdata2020d
+
 New in release 2.6.24 (2020-11-05):
 
 * Security fixes
diff -r 1ea37d1972cc -r f1239bef7efd acinclude.m4
--- a/acinclude.m4	Fri Nov 06 06:29:40 2020 +0000
+++ b/acinclude.m4	Fri Feb 12 04:10:25 2021 +0000
@@ -2948,7 +2948,7 @@
   AC_MSG_CHECKING([which branch and release of IcedTea is being built])
   JAVA_VER=1.7.0
   JAVA_VENDOR=openjdk
-  JDK_UPDATE_VERSION=281
+  JDK_UPDATE_VERSION=291
   BUILD_VERSION=b01
   MILESTONE=fcs
   if test "x${MILESTONE}" = "xfcs"; then
diff -r 1ea37d1972cc -r f1239bef7efd configure.ac
--- a/configure.ac	Fri Nov 06 06:29:40 2020 +0000
+++ b/configure.ac	Fri Feb 12 04:10:25 2021 +0000
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.6.24], [distro-pkg-dev@openjdk.java.net])
+AC_INIT([icedtea], [2.6.25], [distro-pkg-dev@openjdk.java.net])
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
diff -r 1ea37d1972cc -r f1239bef7efd hotspot.map.in
--- a/hotspot.map.in	Fri Nov 06 06:29:40 2020 +0000
+++ b/hotspot.map.in	Fri Feb 12 04:10:25 2021 +0000
@@ -1,2 +1,2 @@
 # version type(drop/hg) url changeset sha256sum
-default drop https://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 77288aadc5a7 6dc258a6f1277f85a3d0417730986bbb963dbaae85f891a72fca812b9fb370f9
+default drop https://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 12acd094c5a3 8ffa8283c12d42342e38339f124d37cddaf4581be95e70ff8ed1ddfc94524c7f