--- a/ChangeLog	Thu Feb 04 18:18:40 2021 +0000
+++ b/ChangeLog	Fri Feb 05 00:55:48 2021 +0000
@@ -1,3 +1,28 @@
+2021-02-04  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	Bump to icedtea-3.18.0.
+	* Makefile.am:
+	(CORBA_CHANGESET): Update to icedtea-3.18.0 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.
+	* NEWS: Updated.
+	* acinclude.m4:
+	(IT_DETERMINE_VERSION): Set JDK_UPDATE_VERSION
+	to 282 and BUILD_VERSION to b08.
+	* configure.ac: Bump to 3.18.0.
+	* hotspot.map.in: Update to icedtea-3.18.0 tag.
+
 2021-02-04  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	Bump aarch32 to jdk8u282-ga-aarch32-20210125.

--- a/Makefile.am	Thu Feb 04 18:18:40 2021 +0000
+++ b/Makefile.am	Fri Feb 05 00:55:48 2021 +0000
@@ -1,20 +1,20 @@
 # Dependencies
 
-CORBA_CHANGESET = 9900c5052dc8
-JAXP_CHANGESET = f7131ba06615
-JAXWS_CHANGESET = 041bec57e152
-JDK_CHANGESET = 2207d468c781
-LANGTOOLS_CHANGESET = 46c4c126f559
-OPENJDK_CHANGESET = f8fecdfef399
-NASHORN_CHANGESET = c3cf7b1edca2
-
-CORBA_SHA256SUM = cda3a7108ce3a5f400ef43225007617426ac14ca3926508e8f929ae10a2f5a02
-JAXP_SHA256SUM = 0ac06b706129fb5443f9590be860ff246442340f06808197dc209ca1502b8b74
-JAXWS_SHA256SUM = e487665bc4fcbc597c3b3d3e9c9819e03adfa63f904ba3c650b36a5c5d4b67a5
-JDK_SHA256SUM = 6fd62ed755c9e1ddbe1d3ff58722b70c8e867c4d280adaa0c0fcce40820039cf
-LANGTOOLS_SHA256SUM = 0d5f936dc5d8280686d511aedb21009d0075b4fd5c7b5f2d7897b3fa940f7069
-OPENJDK_SHA256SUM = b1ef1d1dc3c3eac88b7bece739251b479fe0fefa122a62d1911f811b853408de
-NASHORN_SHA256SUM = 206bcc49633138cc09128aa4ec71d0259ecea4f8d6a55981bd0dc1fb76bf1728
+CORBA_CHANGESET = d59f0469fa04
+JAXP_CHANGESET = 061e5c9ba6d4
+JAXWS_CHANGESET = f8612a9ad613
+JDK_CHANGESET = d8a3d99c0350
+LANGTOOLS_CHANGESET = cd1c5b6dfb61
+OPENJDK_CHANGESET = b8690148b02e
+NASHORN_CHANGESET = 7ab7b1755f9a
+
+CORBA_SHA256SUM = 72762977b4d53df53cd110df6e518848c7c74e94da822186f7c90913bf4f5355
+JAXP_SHA256SUM = 84d29f9e969a301607547f3479689e2e34f94c851091e8cf1eedf445a049afca
+JAXWS_SHA256SUM = 2f304535f1fa7c916975e8972cb748bf2679d0eb7d2b3fd1230ded58e2e1ecf2
+JDK_SHA256SUM = c265bbd54c1ac4e4ba0dc9e77329fc59ec7d130b45228ccefda8d08fee458134
+LANGTOOLS_SHA256SUM = 4d76c80df0443d0e3aef8577468afeb517a14d1d741cfb3baa65acc21b6eafb5
+OPENJDK_SHA256SUM = 6de67e0ff2b27ab158e86f2484f1bce3481a9090f8ad8c744f2e9b736525c1f4
+NASHORN_SHA256SUM = 4aae629c96ac941739a7a2893b823375ab7d9221032b9e03903cf82be0211693
 
 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`"

--- a/NEWS	Thu Feb 04 18:18:40 2021 +0000
+++ b/NEWS	Fri Feb 05 00:55:48 2021 +0000
@@ -13,101 +13,123 @@
 
 New in release 3.18.0 (2021-01-19):
 
-* Shenandoah
+* Security fixes
+  - JDK-8247619: Improve Direct Buffering of Characters
+* Import of OpenJDK 8 u282 build 01
+  - JDK-6962725: Regtest javax/swing/JFileChooser/6738668/bug6738668.java fails under Linux
+  - JDK-8025936: Windows .pdb and .map files does not have proper dependencies setup
   - JDK-8030350: Enable additional compiler warnings for GCC
+  - JDK-8031423: Test java/awt/dnd/DisposeFrameOnDragCrash/DisposeFrameOnDragTest.java fails by Timeout on Windows
   - JDK-8036122: Fix warning 'format not a string literal'
+  - JDK-8051853: new URI("x/").resolve("..").getSchemeSpecificPart() returns null!
+  - JDK-8132664: closed/javax/swing/DataTransfer/DefaultNoDrop/DefaultNoDrop.java locks on Windows
+  - JDK-8134632: Mark javax/sound/midi/Devices/InitializationHang.java as headful
+  - JDK-8148854: Class names "SomeClass" and "LSomeClass;" treated by JVM as an equivalent
+  - JDK-8148916: Mark bug6400879.java as intermittently failing
+  - JDK-8148983: Fix extra comma in changes for JDK-8148916
+  - JDK-8160438: javax/swing/plaf/nimbus/8057791/bug8057791.java fails
+  - JDK-8165808: Add release barriers when allocating objects with concurrent collection
+  - JDK-8185003: JMX: Add a version of ThreadMXBean.dumpAllThreads with a maxDepth argument
+  - JDK-8202076: test/jdk/java/io/File/WinSpecialFiles.java on windows with VS2017
+  - JDK-8207766: [testbug] Adapt tests for Aix.
+  - JDK-8212070: Introduce diagnostic flag to abort VM on failed JIT compilation
+  - JDK-8213448: [TESTBUG] enhance jfr/jvm/TestDumpOnCrash
+  - JDK-8215727: Restore JFR thread sampler loop to old / previous behavior
+  - JDK-8220657: JFR.dump does not work when filename is set
+  - JDK-8221342: [TESTBUG] Generate Dockerfile for docker testing
+  - JDK-8224502: [TESTBUG] JDK docker test TestSystemMetrics.java fails with access issues and OOM
+  - JDK-8231209: [REDO] ThreadMXBean::getThreadAllocatedBytes() can be quicker for self thread
+  - JDK-8231968: getCurrentThreadAllocatedBytes default implementation s/b getThreadAllocatedBytes
+  - JDK-8232114: JVM crashed at imjpapi.dll in native code
+  - JDK-8234270: [REDO] JDK-8204128 NMT might report incorrect numbers for Compiler area
+  - JDK-8234339: replace JLI_StrTok in java_md_solinux.c
+  - JDK-8238448: RSASSA-PSS signature verification fail when using certain odd key sizes
+  - JDK-8242335: Additional Tests for RSASSA-PSS
+  - JDK-8244225: stringop-overflow warning on strncpy call from compile_the_world_in
+  - JDK-8245400: Upgrade to LittleCMS 2.11
+  - JDK-8248214: Add paddings for TaskQueueSuper to reduce false-sharing cache contention
+  - JDK-8249176: Update GlobalSignR6CA test certificates
+  - JDK-8250665: Wrong translation for the month name of May in ar_JO,LB,SY
+  - JDK-8250928: JFR: Improve hash algorithm for stack traces
+  - JDK-8251469: Better cleanup for test/jdk/javax/imageio/SetOutput.java
+  - JDK-8251840: Java_sun_awt_X11_XToolkit_getDefaultScreenData should not be in make/mapfiles/libawt_xawt/mapfile-vers
+  - JDK-8252384: [TESTBUG] Some tests refer to COMPAT provider rather than JRE
+  - JDK-8252395: [8u] --with-native-debug-symbols=external doesn't include debuginfo files for binaries
+  - JDK-8252497: Incorrect numeric currency code for ROL
+  - JDK-8252754: Hash code calculation of JfrStackTrace is inconsistent
+  - JDK-8252904: VM crashes when JFR is used and JFR event class is transformed
+  - JDK-8252975: [8u] JDK-8252395 breaks the build for --with-native-debug-symbols=internal
+  - JDK-8253284: Zero OrderAccess barrier mappings are incorrect
+  - JDK-8253550: [8u] JDK-8252395 breaks the build for make STRIP_POLICY=no_strip
+  - JDK-8253752: test/sun/management/jmxremote/bootstrap/RmiBootstrapTest.java fails randomly
+  - JDK-8254081: java/security/cert/PolicyNode/GetPolicyQualifiers.java fails due to an expired certificate
+  - JDK-8254144: Non-x86 Zero builds fail with return-type warning in os_linux_zero.cpp
+  - JDK-8254166: Zero: return-type warning in zeroInterpreter_zero.cpp
+  - JDK-8254683: [TEST_BUG] jdk/test/sun/tools/jconsole/WorkerDeadlockTest.java fails
+  - JDK-8255003: Build failures on Solaris
+* Import of OpenJDK 8 u282 build 02
+  - JDK-8253837: JFR 8u fix symbol and cstring hashtable equals implementaion
+  - JDK-8255269: Unsigned overflow in g1Policy.cpp
+* Import of OpenJDK 8 u282 build 03
+  - JDK-8163161: [PIT][TEST_BUG] increase timeout in javax/swing/plaf/nimbus/8057791/bug8057791.java
+  - JDK-8168292: [TESTBUG] [macosx] Test java/awt/TrayIcon/DragEventSource/DragEventSource.java fails on OS X
+  - JDK-8168682: jdk/test/java/lang/ClassLoader/forNameLeak/ClassForNameLeak.java fails with -Xcomp
+  - JDK-8223108: Test java/awt/EventQueue/NonComponentSourcePost.java is unstable
+  - JDK-8255603: Memory/Performance regression after JDK-8210985
+* Import of OpenJDK 8 u282 build 04
+  - JDK-8022535: [TEST BUG] javax/swing/text/html/parser/Test8017492.java fails
   - JDK-8043899: compiler/5091921/Test7005594.java fails if specified -Xmx is less than 1600m
-  - JDK-8148854: Class names "SomeClass" and "LSomeClass;" treated by JVM as an equivalent
+  - JDK-8046221: [TEST_BUG] Cleanup datatransfer tests
+  - JDK-8058805: [TEST_BUG]Test java/awt/TrayIcon/SecurityCheck/NoPermissionTest/NoPermissionTest.java fails
+  - JDK-8068275: Some tests failed after JDK-8063104
+  - JDK-8069211: (zipfs) ZipFileSystem creates corrupted zip if entry output stream gets closed more than once
+  - JDK-8130772: Util.hitMnemonics does not work: getSystemMnemonicKeyCodes() returns ALT_MASK rather than VK_ALT
   - JDK-8156803: Turn StressLCM/StressGCM flags to diagnostic
   - JDK-8160761: [TESTBUG] Several compiler tests fail with product bits
-  - JDK-8165808: Add release barriers when allocating objects with concurrent collection
+  - JDK-8166015: [PIT][TEST_BUG] stray character in java/awt/Focus/ModalDialogActivationTest/ModalDialogActivationTest.java
   - JDK-8166583: Add oopDesc::klass_or_null_acquire()
   - JDK-8166663: Simplify oops_on_card_seq_iterate_careful
   - JDK-8166862: CMS needs klass_or_null_acquire
   - JDK-8179083: Uninitialized notifier in Java Monitor Wait tracing event
-  - JDK-8185003: JMX: Add a version of ThreadMXBean.dumpAllThreads with a maxDepth argument
-  - JDK-8212070: Introduce diagnostic flag to abort VM on failed JIT compilation
-  - JDK-8215727: Restore JFR thread sampler loop to old / previous behavior
+  - JDK-8205507: jdk/javax/xml/crypto/dsig/GenerationTests.java timed out
   - JDK-8217362: Emergency dump does not work when disk=false is set
   - JDK-8217766: Container Support doesn't work for some Join Controllers combinations
+  - JDK-8219013: Update Apache Santuario (XML Signature) to version 2.1.3
   - JDK-8219562: Line of code in osContainer_linux.cpp L102 appears unreachable
-  - JDK-8221342: [TESTBUG] Generate Dockerfile for docker testing
+  - JDK-8220579: [Containers] SubSystem.java out of sync with osContainer_linux.cpp
+  - JDK-8221340: [TESTBUG] TestCgroupMetrics.java fails after fix for JDK-8219562
   - JDK-8221710: [TESTBUG] more configurable parameters for docker testing
   - JDK-8227006: [linux] Runtime.availableProcessors execution time increased by factor of 100
   - JDK-8229868: Update Apache Santuario TPRM version
-  - JDK-8231209: [REDO] ThreadMXBean::getThreadAllocatedBytes() can be quicker for self thread
   - JDK-8233548: Update CUP to v0.11b
-  - JDK-8234270: [REDO] JDK-8204128 NMT might report incorrect numbers for Compiler area
-  - JDK-8244225: stringop-overflow warning on strncpy call from compile_the_world_in
-  - JDK-8245400: Upgrade to LittleCMS 2.11
-  - JDK-8248214: Add paddings for TaskQueueSuper to reduce false-sharing cache contention
+  - JDK-8242480: Negative value may be returned by getFreeSwapSpaceSize() in the docker
+  - JDK-8246648: issue with OperatingSystemImpl getFreeSwapSpaceSize in docker after 8242480
+  - JDK-8249846: Change of behavior after JDK-8237117: Better ForkJoinPool behavior
   - JDK-8250636: iso8601_time returns incorrect offset part on MacOS
-  - JDK-8250928: JFR: Improve hash algorithm for stack traces
   - JDK-8251365: Build failure on AIX after 8250636
-  - JDK-8252754: Hash code calculation of JfrStackTrace is inconsistent
-  - JDK-8252904: VM crashes when JFR is used and JFR event class is transformed
-  - JDK-8253036: Support building the Zero assembler port on AArch64
-  - JDK-8253284: Zero OrderAccess barrier mappings are incorrect
-  - JDK-8253837: JFR 8u fix symbol and cstring hashtable equals implementaion
-  - JDK-8254144: Non-x86 Zero builds fail with return-type warning in os_linux_zero.cpp
-  - JDK-8254166: Zero: return-type warning in zeroInterpreter_zero.cpp
-  - JDK-8255269: Unsigned overflow in g1Policy.cpp
   - JDK-8255717: Fix JFR crash in WriteObjectSampleStacktrace due to object not initialized
   - JDK-8256618: Zero: Linux x86_32 build still fails
   - JDK-8256671: Incorrect assignment operator used in guarantee() in genCollectedHeap
+  - JDK-8256752: 8252395 incorrect copy rule for macos .dSYM folder
+  - JDK-8257397: [TESTBUG] test/lib/containers/docker/Common.java refers to -Xlog:os+container=trace
+* Import of OpenJDK 8 u282 build 05
+  - JDK-8254982: (tz) Upgrade time-zone data to tzdata2020c
+* Import of OpenJDK 8 u282 build 06
+  - JDK-8255226: (tz) Upgrade time-zone data to tzdata2020d
+* Import of OpenJDK 8 u282 build 07
+  - JDK-8225072: Add LuxTrust certificate that is expiring in March 2021 to list of allowed but expired certs
+  - JDK-8239105: Add exception for expiring Digicert root certificates to VerifyCACerts test
+  - JDK-8258630: Add expiry exception for QuoVadis root certificate
+* Shenandoah
   - Shenandoah: Fix racy update of code roots
 * AArch32 port
-  - JDK-8030350: Enable additional compiler warnings for GCC
-  - JDK-8036122: Fix warning 'format not a string literal'
-  - JDK-8043899: compiler/5091921/Test7005594.java fails if specified -Xmx is less than 1600m
-  - JDK-8062808: [aarch32] Turn on the -Wreturn-type warning
-  - JDK-8148854: Class names "SomeClass" and "LSomeClass;" treated by JVM as an equivalent
-  - JDK-8156803: Turn StressLCM/StressGCM flags to diagnostic
-  - JDK-8160761: [TESTBUG] Several compiler tests fail with product bits
-  - JDK-8165808: Add release barriers when allocating objects with concurrent collection
-  - JDK-8166583: Add oopDesc::klass_or_null_acquire()
-  - JDK-8166663: Simplify oops_on_card_seq_iterate_careful
-  - JDK-8166862: CMS needs klass_or_null_acquire
-  - JDK-8179083: Uninitialized notifier in Java Monitor Wait tracing event
-  - JDK-8185003: JMX: Add a version of ThreadMXBean.dumpAllThreads with a maxDepth argument
-  - JDK-8197981: Missing return statement in __sync_val_compare_and_swap_8
-  - JDK-8212070: Introduce diagnostic flag to abort VM on failed JIT compilation
-  - JDK-8215727: Restore JFR thread sampler loop to old / previous behavior
-  - JDK-8217362: Emergency dump does not work when disk=false is set
-  - JDK-8217766: Container Support doesn't work for some Join Controllers combinations
-  - JDK-8219562: Line of code in osContainer_linux.cpp L102 appears unreachable
-  - JDK-8221342: [TESTBUG] Generate Dockerfile for docker testing
-  - JDK-8221710: [TESTBUG] more configurable parameters for docker testing
-  - JDK-8227006: [linux] Runtime.availableProcessors execution time increased by factor of 100
-  - JDK-8229868: Update Apache Santuario TPRM version
-  - JDK-8231209: [REDO] ThreadMXBean::getThreadAllocatedBytes() can be quicker for self thread
-  - JDK-8233548: Update CUP to v0.11b
-  - JDK-8234270: [REDO] JDK-8204128 NMT might report incorrect numbers for Compiler area
-  - JDK-8244225: stringop-overflow warning on strncpy call from compile_the_world_in
-  - JDK-8245400: Upgrade to LittleCMS 2.11
-  - JDK-8248214: Add paddings for TaskQueueSuper to reduce false-sharing cache contention
-  - JDK-8250636: iso8601_time returns incorrect offset part on MacOS
-  - JDK-8250861: Crash in MinINode::Ideal(PhaseGVN*, bool)
-  - JDK-8250928: JFR: Improve hash algorithm for stack traces
-  - JDK-8251365: Build failure on AIX after 8250636
-  - JDK-8252754: Hash code calculation of JfrStackTrace is inconsistent
-  - JDK-8252904: VM crashes when JFR is used and JFR event class is transformed
   - JDK-8253036: Support building the Zero assembler port on AArch64
-  - JDK-8253284: Zero OrderAccess barrier mappings are incorrect
-  - JDK-8253837: JFR 8u fix symbol and cstring hashtable equals implementaion
-  - JDK-8254144: Non-x86 Zero builds fail with return-type warning in os_linux_zero.cpp
-  - JDK-8254166: Zero: return-type warning in zeroInterpreter_zero.cpp
-  - JDK-8255269: Unsigned overflow in g1Policy.cpp
-  - JDK-8255717: Fix JFR crash in WriteObjectSampleStacktrace due to object not initialized
-  - JDK-8256618: Zero: Linux x86_32 build still fails
-  - JDK-8256671: Incorrect assignment operator used in guarantee() in genCollectedHeap
 
 New in release 3.17.1 (2020-11-26):
 
 * Import of OpenJDK 8 u275 build 01
   - JDK-8214440: ldap over a TLS connection negotiate failed with "javax.net.ssl.SSLPeerUnverifiedException: hostname of the server '' does not match the hostname in the server's certificate"
   - JDK-8223940: Private key not supported by chosen signature algorithm
-  - JDK-8236512: PKCS11 Connection closed after Cipher.doFinal and NoPadding
   - JDK-8250861: Crash in MinINode::Ideal(PhaseGVN*, bool)
 * Bug fixes
   - PR3815: Fix new s390 size_t issue in g1ConcurrentMarkObjArrayProcessor.cpp

--- a/acinclude.m4	Thu Feb 04 18:18:40 2021 +0000
+++ b/acinclude.m4	Fri Feb 05 00:55:48 2021 +0000
@@ -2089,8 +2089,8 @@
   AC_MSG_CHECKING([which branch and release of IcedTea is being built])
   JAVA_VER=1.8.0
   JAVA_VENDOR=openjdk
-  JDK_UPDATE_VERSION=275
-  BUILD_VERSION=b01
+  JDK_UPDATE_VERSION=282
+  BUILD_VERSION=b08
   MILESTONE=fcs
   if test "x${MILESTONE}" = "xfcs"; then
     COMBINED_VERSION=${JDK_UPDATE_VERSION}-${BUILD_VERSION}

--- a/configure.ac	Thu Feb 04 18:18:40 2021 +0000
+++ b/configure.ac	Fri Feb 05 00:55:48 2021 +0000
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [3.18.0pre00], [distro-pkg-dev@openjdk.java.net])
+AC_INIT([icedtea], [3.18.0], [distro-pkg-dev@openjdk.java.net])
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])

--- a/hotspot.map.in	Thu Feb 04 18:18:40 2021 +0000
+++ b/hotspot.map.in	Fri Feb 05 00:55:48 2021 +0000
@@ -1,4 +1,4 @@
 # version type(drop/hg) url changeset sha256sum
-default drop https://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ e7fd2b284bd0 9205bc1f1dd558c726bcd3770ef4a4960c505e96a48f07d9fd1a7bf40627af22
+default drop https://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ adc340baec52 14da112dfc7cc123ecaa3a4eda3e83785263e31330aaf67e4a9c8232b79a9359
 shenandoah drop https://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ 6c6414cb341e 5a8fc20326573b96eaa36a80f40d1fcd35cd2bd93e81d7621ff5eb95253a4ecf
 aarch32 drop https://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ 21692a35b634 d41b9df79e09256e10f4bf387955b67132d5eac6f7e66d805846e3a77e71f15d