--- a/ChangeLog	Mon Nov 14 07:24:36 2016 +0000
+++ b/ChangeLog	Mon Feb 06 09:48:33 2017 +0000
@@ -1,3 +1,30 @@
+2017-02-05  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	Bump to icedtea-2.7.0pre09.
+	* patches/pr3209-backout.patch,
+	* patches/pr3211.patch:
+	Remove upstreamed patches.
+	(CORBA_CHANGESET): Update to icedtea-2.7.0pre09.
+	(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.
+	(ICEDTEA_PATCHES): Remove PR3211 patch
+	and PR3209 backout now applied upstream.
+	(ICEDTEA_ENV): Update INFINALITY_SUPPORT
+	setting to IMPROVED_FONT_RENDERING,
+	following PR3318.
+	* NEWS: Updated.
+	* configure.ac: Bump to 2.7.0pre09.
+	* hotspot.map.in: Update to icedtea-2.7.0pre09.
+
 2016-11-13  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	* NEWS: Add 2.6.8 release notes.

--- a/Makefile.am	Mon Nov 14 07:24:36 2016 +0000
+++ b/Makefile.am	Mon Feb 06 09:48:33 2017 +0000
@@ -4,19 +4,19 @@
 BUILD_VERSION = b01
 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
 
-CORBA_CHANGESET = 257b4ab13740
-JAXP_CHANGESET = 36695a562f29
-JAXWS_CHANGESET = 1c02daf6ea6b
-JDK_CHANGESET = 15b47679f447
-LANGTOOLS_CHANGESET = 5f91109e8834
-OPENJDK_CHANGESET = e95e10d502c6
-
-CORBA_SHA256SUM = 8beb63234213c72c8ab47e663439c8e34bf60ffb422cc5150fa181dd4a137dcc
-JAXP_SHA256SUM = 7150afa874f4ca40f2d533313aecfedb1f1b7be4efae34f82142d13f31406bdf
-JAXWS_SHA256SUM = f82d397e25678e40c9b791f9125bfa7906d5d21a3e44f47b2679b4f0de94c36f
-JDK_SHA256SUM = 2e46a9415ff866108ce45ed7080ace6701f39214ff817426b6fd7f61d6343511
-LANGTOOLS_SHA256SUM = 57ab591d78e7d40c539ad18b915f802810d6fb73e02a07423b3852cb0d0ca31d
-OPENJDK_SHA256SUM = 3978c2e61ef8ecb7b1b1d903d2858334b7fe8f3d6f3370907308a62ca2d22938
+CORBA_CHANGESET = 34cc7c768cc0
+JAXP_CHANGESET = 7f680da239ad
+JAXWS_CHANGESET = 5d6370bdcd06
+JDK_CHANGESET = 2f95b16f0065
+LANGTOOLS_CHANGESET = 03fc0f1fced1
+OPENJDK_CHANGESET = 7c45a1a0378b
+
+CORBA_SHA256SUM = 0b71c691df6e849acd053241ec77b8eb5d5403714285db5fde5e1efd767c3b9e
+JAXP_SHA256SUM = 0b75e2591f9c3b4300d1dbbce9fe1d86b9d3cf11bc6083687d84741ae5334569
+JAXWS_SHA256SUM = cbde1ec8a1cc8be6f3c9291bd7fd609daa5d827d87fd4f62f286544946b37770
+JDK_SHA256SUM = 955f2533639a2039a631c1affe3a366b402090bd5972e349c6ffe2616c003e64
+LANGTOOLS_SHA256SUM = 8be139ef7e43ebb489441efb86c02e4b136221c7514032f8db7b4be1d41aafa3
+OPENJDK_SHA256SUM = ff0fbb8983dd3a9f9c91116dbfdd406fe3bf3cdb4eb2307bd3074b98af427ddb
 
 DROP_URL = http://icedtea.classpath.org/download/drops
 
@@ -371,7 +371,7 @@
 
 # Patch list
 
-ICEDTEA_PATCHES = patches/pr3211.patch patches/pr3209-backout.patch
+ICEDTEA_PATCHES = 
 
 # Conditional patches
 
@@ -741,7 +741,7 @@
 
 if ENABLE_INFINALITY
 ICEDTEA_ENV += \
-       INFINALITY_SUPPORT="true"
+	IMPROVED_FONT_RENDERING="true"
 endif
 
 if USE_ALT_CACERTS_FILE

--- a/NEWS	Mon Nov 14 07:24:36 2016 +0000
+++ b/NEWS	Mon Feb 06 09:48:33 2017 +0000
@@ -17,9 +17,22 @@
 * New features
   - PR3180: Support building without pre-compiled headers
 * Backports
+  - S7102489, PR3316, RH1390708: RFE: cleanup jlong typedef on __APPLE__and _LLP64 systems.
+  - S8000351, PR3316, RH1390708: Tenuring threshold should be unsigned
   - S8076221, PR2809, RH1302385: Disable RC4 cipher suites
+  - S8153711, PR3313, RH1284948: [REDO] JDWP: Memory Leak: GlobalRefs never deleted when processing invokeMethod command
+  - S8170888, PR3316, RH1390708: [linux] Experimental support for cgroup memory limits in container (ie Docker) environments
 * Bug fixes
   - PR3162: Remove reference to AbstractPlainDatagramSocketImpl.c, removed in 8072466
+  - PR3318: Always round glyph advance in 26.6 space
+  - PR3318: Fix compatibility with vanilla Fontconfig
+  - PR3318: Fix glyph y advance
+  - PR3318: Replace 'infinality' with 'improved font rendering' (--enable-improved-font-rendering)
+  - PR3318: Simplify glyph advance handling
+* AArch64 port
+  - S8165673: AArch64: Fix JNI floating point argument handling
+  - PR3209: Backed out changeset 3cc3ab869ccf
+  - PR3211: AArch64 build fails with pre-compiled headers disabled
 
 New in release 2.6.8 (2016-11-13):
 

--- a/configure.ac	Mon Nov 14 07:24:36 2016 +0000
+++ b/configure.ac	Mon Feb 06 09:48:33 2017 +0000
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.7.0pre08], [distro-pkg-dev@openjdk.java.net])
+AC_INIT([icedtea], [2.7.0pre09], [distro-pkg-dev@openjdk.java.net])
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
 AM_MAINTAINER_MODE([enable])
 AC_CONFIG_FILES([Makefile])

--- a/hotspot.map.in	Mon Nov 14 07:24:36 2016 +0000
+++ b/hotspot.map.in	Mon Feb 06 09:48:33 2017 +0000
@@ -1,2 +1,2 @@
 # version type(drop/hg) url changeset sha256sum
-default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ c2a745174c84 1864dbc8106ee30156b5be3a11e7cd6035f26853aff4490c096ef105036c92b0
+default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 9a1457cc02ae 0f37b16e50161097cf17542d2d9684b88d7e90a34ace5bca9af6c687739783b5

--- a/patches/pr3209-backout.patch	Mon Nov 14 07:24:36 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1477589125 -3600
-#      Thu Oct 27 18:25:25 2016 +0100
-# Node ID fff29c78ee406a290e5b79dc14a1b1a98de1d0f4
-# Parent  f23cc792224c21431b71da6a31ab751ac6f5c236
-PR3209: Backed out changeset 3cc3ab869ccf
-
-diff --git a/src/share/vm/opto/lcm.cpp b/src/share/vm/opto/lcm.cpp
---- openjdk/hotspot/src/share/vm/opto/lcm.cpp
-+++ openjdk/hotspot/src/share/vm/opto/lcm.cpp
-@@ -1068,14 +1068,11 @@
-     Block *sb = _succs[i];
-     // Clone the entire area; ignoring the edge fixup for now.
-     for( uint j = end; j > beg; j-- ) {
-+      // It is safe here to clone a node with anti_dependence
-+      // since clones dominate on each path.
-       Node *clone = _nodes[j-1]->clone();
-       sb->_nodes.insert( 1, clone );
-       bbs.map(clone->_idx,sb);
--#ifdef AARCH64
--      if (clone->needs_anti_dependence_check()) {
--        insert_anti_dependences(sb, clone);
--      }
--#endif
-     }
-   }
- 

--- a/patches/pr3211.patch	Mon Nov 14 07:24:36 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1477547871 -3600
-#      Thu Oct 27 06:57:51 2016 +0100
-# Node ID f23cc792224c21431b71da6a31ab751ac6f5c236
-# Parent  76e61db9631544414570a5238b66c12465e6a821
-PR3211: AArch64 build fails with pre-compiled headers disabled
-Contributed-by: Tiago Stürmer Daitx <tdaitx@gmail.com>
-
-diff --git a/src/cpu/aarch64/vm/assembler_aarch64.cpp b/src/cpu/aarch64/vm/assembler_aarch64.cpp
---- openjdk/hotspot/src/cpu/aarch64/vm/assembler_aarch64.cpp
-+++ openjdk/hotspot/src/cpu/aarch64/vm/assembler_aarch64.cpp
-@@ -64,6 +64,7 @@
- #include "gc_implementation/g1/heapRegion.hpp"
- #endif
- 
-+#include "opto/compile.hpp"
- 
- extern "C" void entry(CodeBuffer *cb);
- 
-diff --git a/src/cpu/aarch64/vm/vm_version_aarch64.cpp b/src/cpu/aarch64/vm/vm_version_aarch64.cpp
---- openjdk/hotspot/src/cpu/aarch64/vm/vm_version_aarch64.cpp
-+++ openjdk/hotspot/src/cpu/aarch64/vm/vm_version_aarch64.cpp
-@@ -25,6 +25,9 @@
-  */
- 
- #include "precompiled.hpp"
-+#include "asm/assembler.hpp"
-+#include "asm/assembler.inline.hpp"
-+#include "utilities/sizes.hpp"
- #include "assembler_aarch64.hpp"
- #include "memory/resourceArea.hpp"
- #include "runtime/java.hpp"