Mercurial > hg > icedtea8

changeset 2874:611ec60d8ee4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bump to icedtea-3.11.0pre01. Upstream changes: - PR3667, PR1983: Backed out changeset 48c15869ecd5 - PR3667, PR1983: Backed out changeset f0635543beb3 - PR3667, PR2127: Backed out changeset 0ff7720931e8 - PR3667, PR2815: Backed out changeset 26e2e029ee25 - PR3667, PR2899: Backed out changeset 9dc0eca5fa89 - PR3667, PR2934: Backed out changeset 7513dae3426b - PR3667, PR3479, RH1486025: Backed out changeset 5dcb55da00c1 ChangeLog: 2019-01-08 Andrew John Hughes <gnu_andrew@member.fsf.org> Bump to icedtea-3.11.0pre01. * Makefile.am, (CORBA_CHANGESET): Update to icedtea-3.11.0pre01 tag. (JAXP_CHANGESET): Likewise. (JAXWS_CHANGESET): Likewise. (JDK_CHANGESET): Likewise. (LANGTOOLS_CHANGESET): Likewise. (OPENJDK_CHANGESET): Likewise. (NASHORN_CHANGESET): Likewise. (CORBA_SHA256SUM): Likewise. (JAXP_SHA256SUM): Likewise. (JAXWS_SHA256SUM): Likewise. (JDK_SHA256SUM): Likewise. (LANGTOOLS_SHA256SUM): Likewise. (OPENJDK_SHA256SUM): Likewise. (NASHORN_SHA256SUM): Likewise. (ICEDTEA_CONFIGURE): Remove use of system-nss option which no longer exists, following PR3667. * NEWS: Updated. * configure.ac: Bump to 3.11.0pre01. * fsg.sh.in: Don't delete in-tree SunEC implementation or builds with it enabled will now fail, following PR3667. * hotspot.map.in: Update to icedtea-3.11.0pre01 tag.
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Wed, 09 Jan 2019 01:09:25 +0000
parents 4ccca4e748f2
children 84a332f0659a
files ChangeLog Makefile.am NEWS configure.ac fsg.sh.in hotspot.map.in
diffstat 6 files changed, 50 insertions(+), 25 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Jan 03 03:01:07 2019 +0000
+++ b/ChangeLog	Wed Jan 09 01:09:25 2019 +0000
@@ -1,3 +1,29 @@
+2019-01-08  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	Bump to icedtea-3.11.0pre01.
+	* Makefile.am,
+	(CORBA_CHANGESET): Update to icedtea-3.11.0pre01 tag.
+	(JAXP_CHANGESET): Likewise.
+	(JAXWS_CHANGESET): Likewise.
+	(JDK_CHANGESET): Likewise.
+	(LANGTOOLS_CHANGESET): Likewise.
+	(OPENJDK_CHANGESET): Likewise.
+	(NASHORN_CHANGESET): Likewise.
+	(CORBA_SHA256SUM): Likewise.
+	(JAXP_SHA256SUM): Likewise.
+	(JAXWS_SHA256SUM): Likewise.
+	(JDK_SHA256SUM): Likewise.
+	(LANGTOOLS_SHA256SUM): Likewise.
+	(OPENJDK_SHA256SUM): Likewise.
+	(NASHORN_SHA256SUM): Likewise.
+	(ICEDTEA_CONFIGURE): Remove use of system-nss
+	option which no longer exists, following PR3667.
+	* NEWS: Updated.
+	* configure.ac: Bump to 3.11.0pre01.
+	* fsg.sh.in: Don't delete in-tree SunEC implementation
+	or builds with it enabled will now fail, following PR3667.
+	* hotspot.map.in: Update to icedtea-3.11.0pre01 tag.
+
 2019-01-02  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	PR3675: Update CVE URL
--- a/Makefile.am	Thu Jan 03 03:01:07 2019 +0000
+++ b/Makefile.am	Wed Jan 09 01:09:25 2019 +0000
@@ -1,20 +1,20 @@
 # Dependencies
 
-CORBA_CHANGESET = 8249f00d6619
-JAXP_CHANGESET = a1b060ef4f06
-JAXWS_CHANGESET = c0f01861a7fd
-JDK_CHANGESET = 6e67500d0ed8
-LANGTOOLS_CHANGESET = 7036a6fa432e
-OPENJDK_CHANGESET = 90de74e82bfb
-NASHORN_CHANGESET = 6cf21321f367
-
-CORBA_SHA256SUM = 69200a5f46b917f5ffcdb64729e6871cdbe152d767a569e18be3725b45536a32
-JAXP_SHA256SUM = 79277071c09112f9383de9b0fd813a5e135e4525562890c17ed44ca0d90dbcfb
-JAXWS_SHA256SUM = 92f3cb8a4f615e962fcb6dd40e81dc3134741dbb0dba1556527604d15d765786
-JDK_SHA256SUM = c29b268f08c5615904098126458c5ccc32d9d31457482b97d2ed70b94b79cab5
-LANGTOOLS_SHA256SUM = f2786cd6963696cb989fcd27054505ec74c0f2e31a485f5550ddbe3ad065a917
-OPENJDK_SHA256SUM = fc760130ce1c6dc2379f5b219615344ee25d6380ea24813da53fe034eeb4d156
-NASHORN_SHA256SUM = 9ed937e497e30344a2ee4a938cdec81b5b79642f3c7106f3abf911318fdda99d
+CORBA_CHANGESET = 978ace4a2d1f
+JAXP_CHANGESET = 3e7294812366
+JAXWS_CHANGESET = 20b1d763b33e
+JDK_CHANGESET = 1a1eac5703fc
+LANGTOOLS_CHANGESET = aeb6ac72f496
+OPENJDK_CHANGESET = 5814556a8741
+NASHORN_CHANGESET = 287a6c783833
+
+CORBA_SHA256SUM = 5d3784dd597b7030d021153dd28841cc7bf4303085f73b9359150accf83f9b28
+JAXP_SHA256SUM = d07c15052528a0b8d32870e4e10b0d777ec050407422ea0943f3ad0852d79dcf
+JAXWS_SHA256SUM = 586b4bf11dbd174e4b061f4f836860c41b3ebc5cfa3f4a16fe183c744387cbd5
+JDK_SHA256SUM = da1c227bf2cb3e8d59c5bdec92bb998a6f16354813a33ba2c5d8a79f06d79eac
+LANGTOOLS_SHA256SUM = f3d74bdf5255af808be5f08146c15edf6442e471859d6f74b4f5054ea406a9ef
+OPENJDK_SHA256SUM = 61a43284d087d9825daaad33cb52c40acec66b088fa535cf606482cd8bc8812a
+NASHORN_SHA256SUM = 9f08a4bf46eeb160ea5c1ab9d6090efb1cfd89494519e783b2e4dbecc338e08c
 
 HS_TYPE = "`$(AWK) 'version==$$1 {print $$2}' version=$(HSBUILD) $(abs_top_builddir)/hotspot.map`"
 HS_URL = "`$(AWK) 'version==$$1 {print $$3}' version=$(HSBUILD) $(abs_top_builddir)/hotspot.map`"
@@ -557,11 +557,6 @@
 ICEDTEA_CONFIGURE_ENV += \
 	NSS_LIBS="${SUNEC_LIBS}" \
 	NSS_CFLAGS="${SUNEC_CFLAGS}"
-ICEDTEA_CONFIGURE += \
-	--enable-system-nss
-else
-ICEDTEA_CONFIGURE += \
-	--disable-system-nss
 endif
 
 if USE_SYSTEM_KERBEROS
--- a/NEWS	Thu Jan 03 03:01:07 2019 +0000
+++ b/NEWS	Wed Jan 09 01:09:25 2019 +0000
@@ -13,6 +13,13 @@
 New in release 3.11.0 (2019-01-XX):
 
 * Bug fixes
+  - PR3667, PR1983: Backed out changeset 48c15869ecd5
+  - PR3667, PR1983: Backed out changeset f0635543beb3
+  - PR3667, PR2127: Backed out changeset 0ff7720931e8
+  - PR3667, PR2815: Backed out changeset 26e2e029ee25
+  - PR3667, PR2899: Backed out changeset 9dc0eca5fa89
+  - PR3667, PR2934: Backed out changeset 7513dae3426b
+  - PR3667, PR3479, RH1486025: Backed out changeset 5dcb55da00c1
   - PR3675: Update CVE URL
 
 New in release 3.10.0 (2018-12-25):
--- a/configure.ac	Thu Jan 03 03:01:07 2019 +0000
+++ b/configure.ac	Wed Jan 09 01:09:25 2019 +0000
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [3.11.0pre00], [distro-pkg-dev@openjdk.java.net])
+AC_INIT([icedtea], [3.11.0pre01], [distro-pkg-dev@openjdk.java.net])
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
--- a/fsg.sh.in	Thu Jan 03 03:01:07 2019 +0000
+++ b/fsg.sh.in	Wed Jan 09 01:09:25 2019 +0000
@@ -10,9 +10,6 @@
 rm -rvf openjdk/jdk/src/share/classes/com/sun/jmx/snmp
 rm -rvf openjdk/jdk/test/com/sun/jmx/snmp
 
-echo "Removing EC source code we don't build"
-rm -rvf openjdk/jdk/src/share/native/sun/security/ec/impl
-
 if test "x@ENABLE_NON_NSS_CURVES@" = "xno"; then
   echo "Syncing EC list with NSS"
   patch -Np0 < @abs_top_srcdir@/patches/pr2126.patch
--- a/hotspot.map.in	Thu Jan 03 03:01:07 2019 +0000
+++ b/hotspot.map.in	Wed Jan 09 01:09:25 2019 +0000
@@ -1,4 +1,4 @@
 # version type(drop/hg) url changeset sha256sum
-default drop http://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ 4e4ead43a282 ce71e125b3ac598f8a46bcbdd2c9e5727beeee15c1e081b06d49aa5346afb897
+default drop http://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ 1423aed335d6 c51ab73c8025c58859eb67457b939fc99fa7f7eb33c28bc84ecf19890631db23
 shenandoah drop http://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ bc4deb768b1d 9c7654b2a6574cef171999689bf938fcba4bba9bbd500c1daaafd3a25bf7c3f1
 aarch32 drop http://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ f38b47a322eb b2a76be156bf7af00dd705abe80ea819afa7b42ad2dbc37dac4df05f87d3803c