/hg/release/icedtea7-2.1: 4 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu May 2 09:57:03 PDT 2013
changeset 3311abee7c58 in /hg/release/icedtea7-2.1
details: http://icedtea.classpath.org/hg/release/icedtea7-2.1?cmd=changeset;node=3311abee7c58
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu May 02 10:20:45 2013 +0100
Bring in security fixes and other recent forest changes.
2013-05-01 Andrew John Hughes <gnu.andrew at member.fsf.org>
(HOTSPOT_CHANGESET): Update to IcedTea 2.1 forest HEAD,
bringing in security fixes, RH928500 & debuginfo file
removal.
(JAXP_CHANGESET): Likewise.
(JAXWS_CHANGESET): Likewise.
(JDK_CHANGESET): Likewise.
(HOTSPOT_SHA256SUM): Likewise.
(JAXP_SHA256SUM): Likewise.
(JAXWS_SHA256SUM): Likewise.
(JDK_SHA256SUM): Likewise.
* NEWS: Updated.
* patches/boot/ecj-diamond.patch:
Regenerate due to security patches.
changeset 0f170ac337a6 in /hg/release/icedtea7-2.1
details: http://icedtea.classpath.org/hg/release/icedtea7-2.1?cmd=changeset;node=0f170ac337a6
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu May 02 10:21:43 2013 +0100
Prepare for 2.1.8 release.
2013-05-02 Andrew John Hughes <gnu.andrew at member.fsf.org>
* configure.ac: Bump to 2.1.8 proper.
* NEWS: Set release date for 2.1.8.
changeset 40b919581506 in /hg/release/icedtea7-2.1
details: http://icedtea.classpath.org/hg/release/icedtea7-2.1?cmd=changeset;node=40b919581506
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu May 02 16:10:08 2013 +0100
PR1404: Failure to bootstrap with ecj 4.2
2013-05-02 Andrew John Hughes <gnu.andrew at member.fsf.org>
* Makefile.am:
(ICEDTEA_BOOTSTRAP_CLASSES): Initialise to
empty so it always has a value. Change
addition of classes to += from =.
* acinclude.m4:
(IT_CHECK_FOR_METHOD): Remove call to
IT_CHECK_JAVA_AND_JAVAC_WORK to avoid backporting.
(IT_CHECK_FOR_CONSTRUCTOR): Likewise.
2013-04-18 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR1404: Failure to bootstrap with ecj 4.2
* Makefile.am:
(ICEDTEA_BOOTSTRAP_CLASSES): Add SSLContext,
SSLEngine and SslRMIServerSocketFactory if
methods are missing.
(IT_LANGUAGE_SOURCE_VERSION): Set to 7 if supported.
(IT_CLASS_TARGET_VERSION): Likewise.
* configure.ac: Mention bugs in comments.
Add tests for getDefaultSSLParameters/setSSLParameters
and new 7 SslRMIServerSocketFactory.
* NEWS: Updated.
2013-01-11 Andrew John Hughes <gnu.andrew at redhat.com>
* acinclude.m4:
(IT_CHECK_FOR_CLASS): Write class toString() output
to System.err rather than throwing it away. It then
appears in config.log and may be useful in debugging.
(IT_CHECK_FOR_METHOD): Fix documentation and add
System.err output as for IT_CHECK_FOR_CLASS.
(IT_CHECK_FOR_CONSTRUCTOR): New macro to test for
the presence of a specific constructor. Works
with both private & protected constructors by
using a subclass for the compile test.
2012-08-13 Andrew John Hughes <gnu_andrew at member.fsf.org>
* Makefile.am:
(ICEDTEA_BOOTSTRAP_CLASSES): Only add Matcher if
the quoteReplacement method is absent.
* acinclude.m4:
(IT_JAVAH): Explicitly set source & target.
(IT_LIBRARY_CHECK): Likewise.
(IT_PR40630_CHECK): Likewise.
(IT_CHECK_FOR_CLASS): Likewise.
(IT_DIAMOND_CHECK): Specify target as 7 as well.
(IT_CHECK_FOR_METHOD): New macro to check for the
existence of a Java method both at build and runtime.
* configure.ac:
Check for java.util.regex.Matcher.quoteReplacement.
changeset bda6f93d4927 in /hg/release/icedtea7-2.1
details: http://icedtea.classpath.org/hg/release/icedtea7-2.1?cmd=changeset;node=bda6f93d4927
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu May 02 17:56:53 2013 +0100
Added tag icedtea-2.1.8 for changeset 40b919581506
diffstat:
.hgtags | 1 +
ChangeLog | 75 ++++++++++++++++++++++
Makefile.am | 50 +++++++++++---
NEWS | 40 +++++++++++-
acinclude.m4 | 135 ++++++++++++++++++++++++++++++++++++++--
configure.ac | 25 +++++++-
patches/boot/ecj-diamond.patch | 4 +-
7 files changed, 308 insertions(+), 22 deletions(-)
diffs (469 lines):
diff -r 9ee6ad4f47a9 -r bda6f93d4927 .hgtags
--- a/.hgtags Mon Apr 08 01:25:42 2013 +0100
+++ b/.hgtags Thu May 02 17:56:53 2013 +0100
@@ -44,3 +44,4 @@
763c13001988cc50ffd1d195a110c1650b2d7fe1 icedtea-2.1.5
05bc6e6f7d9cbed6d4760813236856c9782c5277 icedtea-2.1.6
04dbdea00c8531667d0273ed9ee76fa7db645f94 icedtea-2.1.7
+40b919581506871ff1e35d9b635b4bb371d656aa icedtea-2.1.8
diff -r 9ee6ad4f47a9 -r bda6f93d4927 ChangeLog
--- a/ChangeLog Mon Apr 08 01:25:42 2013 +0100
+++ b/ChangeLog Thu May 02 17:56:53 2013 +0100
@@ -1,3 +1,78 @@
+2013-05-02 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * Makefile.am:
+ (ICEDTEA_BOOTSTRAP_CLASSES): Initialise to
+ empty so it always has a value. Change
+ addition of classes to += from =.
+ * acinclude.m4:
+ (IT_CHECK_FOR_METHOD): Remove call to
+ IT_CHECK_JAVA_AND_JAVAC_WORK to avoid backporting.
+ (IT_CHECK_FOR_CONSTRUCTOR): Likewise.
+
+2013-04-18 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR1404: Failure to bootstrap with ecj 4.2
+ * Makefile.am:
+ (ICEDTEA_BOOTSTRAP_CLASSES): Add SSLContext,
+ SSLEngine and SslRMIServerSocketFactory if
+ methods are missing.
+ (IT_LANGUAGE_SOURCE_VERSION): Set to 7 if supported.
+ (IT_CLASS_TARGET_VERSION): Likewise.
+ * configure.ac: Mention bugs in comments.
+ Add tests for getDefaultSSLParameters/setSSLParameters
+ and new 7 SslRMIServerSocketFactory.
+ * NEWS: Updated.
+
+2013-01-11 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * acinclude.m4:
+ (IT_CHECK_FOR_CLASS): Write class toString() output
+ to System.err rather than throwing it away. It then
+ appears in config.log and may be useful in debugging.
+ (IT_CHECK_FOR_METHOD): Fix documentation and add
+ System.err output as for IT_CHECK_FOR_CLASS.
+ (IT_CHECK_FOR_CONSTRUCTOR): New macro to test for
+ the presence of a specific constructor. Works
+ with both private & protected constructors by
+ using a subclass for the compile test.
+
+2012-08-13 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ * Makefile.am:
+ (ICEDTEA_BOOTSTRAP_CLASSES): Only add Matcher if
+ the quoteReplacement method is absent.
+ * acinclude.m4:
+ (IT_JAVAH): Explicitly set source & target.
+ (IT_LIBRARY_CHECK): Likewise.
+ (IT_PR40630_CHECK): Likewise.
+ (IT_CHECK_FOR_CLASS): Likewise.
+ (IT_DIAMOND_CHECK): Specify target as 7 as well.
+ (IT_CHECK_FOR_METHOD): New macro to check for the
+ existence of a Java method both at build and runtime.
+ * configure.ac:
+ Check for java.util.regex.Matcher.quoteReplacement.
+
+2013-05-02 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * configure.ac: Bump to 2.1.8 proper.
+ * NEWS: Set release date for 2.1.8.
+
+2013-05-01 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ (HOTSPOT_CHANGESET): Update to IcedTea 2.1 forest HEAD,
+ bringing in security fixes, RH928500 & debuginfo file
+ removal.
+ (JAXP_CHANGESET): Likewise.
+ (JAXWS_CHANGESET): Likewise.
+ (JDK_CHANGESET): Likewise.
+ (HOTSPOT_SHA256SUM): Likewise.
+ (JAXP_SHA256SUM): Likewise.
+ (JAXWS_SHA256SUM): Likewise.
+ (JDK_SHA256SUM): Likewise.
+ * NEWS: Updated.
+ * patches/boot/ecj-diamond.patch:
+ Regenerate due to security patches.
+
2013-04-08 Andrew John Hughes <gnu.andrew at member.fsf.org>
* Makefile.am:
diff -r 9ee6ad4f47a9 -r bda6f93d4927 Makefile.am
--- a/Makefile.am Mon Apr 08 01:25:42 2013 +0100
+++ b/Makefile.am Thu May 02 17:56:53 2013 +0100
@@ -4,19 +4,19 @@
JDK_UPDATE_VERSION = 03
COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)
-HOTSPOT_CHANGESET = 4e4dd75d54e7
+HOTSPOT_CHANGESET = 2c4981784101
CORBA_CHANGESET = 313f1ee32118
-JAXP_CHANGESET = 691f82a0de0b
-JAXWS_CHANGESET = a48ebab198a4
-JDK_CHANGESET = 1040c44a496d
+JAXP_CHANGESET = c04b95aa746c
+JAXWS_CHANGESET = d04602077b14
+JDK_CHANGESET = acaa2de9f547
LANGTOOLS_CHANGESET = c63c8a2164e4
OPENJDK_CHANGESET = c1c649636704
-HOTSPOT_SHA256SUM = 46b4bb240e3ebea1e151c57aa9afb0cb4706f4fc467b651a6c5090101352853d
+HOTSPOT_SHA256SUM = 977617c76292f1de33b83daba80815a743159a9d050be2326ae41e20923e3a2b
CORBA_SHA256SUM = 9326c1fc0dedcbc2af386cb73b80727416e24664ccbf766221450f6e2138e952
-JAXP_SHA256SUM = 17a242852010f535c11f874aae07a6d60f7007541fe1586666638cc6d58f8f1f
-JAXWS_SHA256SUM = 57dab4837468b775ff55e21352c7920f3f35c1e6ceb130154fb89eeb163e176f
-JDK_SHA256SUM = e624a809f099870100330022bda9dafe30bfa4539ee14ec118ffa3ebbafa012d
+JAXP_SHA256SUM = 9df7d4d04168c9c6e57c5b51ca3a54defe5e892d56a256b3d3deda3b12173e63
+JAXWS_SHA256SUM = 1ca9cb115591eb20143cf0d88a57f07fb631ea41246d05017e30a6ae3766517d
+JDK_SHA256SUM = bbfa99c5d9900d16a9359fbdfd1cca9cbfd49095a823eb06ca56d75bca0a8eaf
LANGTOOLS_SHA256SUM = 46d93bd9069d86ea233464d5a9777b12f0a027142b9ac665e3b244f69a5416b6
OPENJDK_SHA256SUM = 6cb4258bf22daba0dd5b8cbfee8acd8a378b3e1f36259b6437f7589c74ed6e4f
@@ -98,22 +98,50 @@
SOURCEPATH_DIRS = $(abs_top_srcdir)/generated:$(OPENJDK_SOURCEPATH_DIRS)
# Sources used from OpenJDK.
+ICEDTEA_BOOTSTRAP_CLASSES =
+
if LACKS_SUN_AWT_TOOLKIT
-#PR43148 - javac fails due to missing java.util.regex.Matcher.quoteReplacement
#PR48033 - Missing javax.management.remote.JMXServiceURL
#PR48034 - javax.management.modelmbean.ModelMBeanInfo
#PR42003 - Missing javax.swing.plaf.basic.BasicDirectoryModel methods cause OpenJDK build failure
-ICEDTEA_BOOTSTRAP_CLASSES = \
- $(SHARE)/java/util/regex/Matcher.java \
+ICEDTEA_BOOTSTRAP_CLASSES += \
$(SHARE)/javax/management/remote/JMXServiceURL.java \
$(SHARE)/javax/management/modelmbean/ModelMBeanInfo.java \
$(SHARE)/javax/swing/plaf/basic/BasicDirectoryModel.java
endif
+#PR43148 - javac fails due to missing java.util.regex.Matcher.quoteReplacement
+if LACKS_JAVA_UTIL_REGEX_MATCHER_QUOTEREPLACEMENT
+ICEDTEA_BOOTSTRAP_CLASSES += \
+ $(SHARE)/java/util/regex/Matcher.java
+endif
+
+#PR56553 - SSLParameters support missing
+if LACKS_JAVAX_NET_SSL_SSLCONTEXT_GETDEFAULTSSLPARAMETERS
+ICEDTEA_BOOTSTRAP_CLASSES += \
+ $(SHARE)/javax/net/ssl/SSLContext.java
+endif
+if LACKS_JAVAX_NET_SSL_SSLENGINE_SETSSLPARAMETERS
+ICEDTEA_BOOTSTRAP_CLASSES += \
+ $(SHARE)/javax/net/ssl/SSLEngine.java
+endif
+
+#PR57008 - Add missing SslRMIServerSocketFactory constructor from 7
+if LACKS_JAVAX_RMI_SSL_SSLRMISERVERSOCKETFACTORY_7
+ICEDTEA_BOOTSTRAP_CLASSES += \
+ $(SHARE)/javax/rmi/ssl/SslRMIServerSocketFactory.java
+endif
+
# Settings for javac
+if NO_BYTECODE7
IT_LANGUAGE_SOURCE_VERSION=6
IT_CLASS_TARGET_VERSION=6
+else
+IT_LANGUAGE_SOURCE_VERSION=7
+IT_CLASS_TARGET_VERSION=7
+endif
+
IT_JAVAC_SETTINGS=-g -encoding utf-8 $(JAVACFLAGS) $(MEMORY_LIMIT) $(PREFER_SOURCE)
IT_JAVACFLAGS=$(IT_JAVAC_SETTINGS) -source $(IT_LANGUAGE_SOURCE_VERSION) -target $(IT_CLASS_TARGET_VERSION)
diff -r 9ee6ad4f47a9 -r bda6f93d4927 NEWS
--- a/NEWS Mon Apr 08 01:25:42 2013 +0100
+++ b/NEWS Thu May 02 17:56:53 2013 +0100
@@ -10,10 +10,48 @@
CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
-New in release 2.1.8 (2013-04-XX):
+New in release 2.1.8 (2013-05-02):
+* Security fixes
+ - S6657673, CVE-2013-1518: Issues with JAXP
+ - S7200507: Refactor Introspector internals
+ - S8000724, CVE-2013-2417: Improve networking serialization
+ - S8001031, CVE-2013-2419: Better font processing
+ - S8001040, CVE-2013-1537: Rework RMI model
+ - S8001322: Refactor deserialization
+ - S8001329, CVE-2013-1557: Augment RMI logging
+ - S8003335: Better handling of Finalizer thread
+ - S8003445: Adjust JAX-WS to focus on API
+ - S8003543, CVE-2013-2415: Improve processing of MTOM attachments
+ - S8004261: Improve input validation
+ - S8004336, CVE-2013-2431: Better handling of method handle intrinsic frames
+ - S8004986, CVE-2013-2383: Better handling of glyph table
+ - S8004987, CVE-2013-2384: Improve font layout
+ - S8004994, CVE-2013-1569: Improve checking of glyph table
+ - S8005432: Update access to JAX-WS
+ - S8005943: (process) Improved Runtime.exec
+ - S8006309: More reliable control panel operation
+ - S8006435, CVE-2013-2424: Improvements in JMX
+ - S8006790: Improve checking for windows
+ - S8006795: Improve font warning messages
+ - S8007406: Improve accessibility of AccessBridge
+ - S8007617, CVE-2013-2420: Better validation of images
+ - S8007667, CVE-2013-2430: Better image reading
+ - S8007918, CVE-2013-2429: Better image writing
+ - S8008140: Better method handle resolution
+ - S8009049, CVE-2013-2436: Better method handle binding
+ - S8009063, CVE-2013-2426: Improve reliability of ConcurrentHashMap
+ - S8009305, CVE-2013-0401: Improve AWT data transfer
+ - S8009677, CVE-2013-2423: Better setting of setters
+ - S8009699, CVE-2013-2421: Methodhandle lookup
+ - S8009814, CVE-2013-1488: Better driver management
+ - S8009857, CVE-2013-2422: Problem with plugin
+* Backports
+ - S7130662, RH928500: GTK file dialog crashes with a NPE
* Bug fixes
- PR1363: Fedora 19 / rawhide FTBFS SIGILL
+ - Fix offset problem in ICU LETableReference.
+ - Don't create debuginfo files if not stripping.
New in release 2.1.7 (2013-03-11):
diff -r 9ee6ad4f47a9 -r bda6f93d4927 acinclude.m4
--- a/acinclude.m4 Mon Apr 08 01:25:42 2013 +0100
+++ b/acinclude.m4 Thu May 02 17:56:53 2013 +0100
@@ -1181,7 +1181,7 @@
public native void doStuff();
}
EOF
-if $JAVAC -cp . $JAVACFLAGS $SUBCLASS >&AS_MESSAGE_LOG_FD 2>&1; then
+if $JAVAC -cp . $JAVACFLAGS -source 5 -target 5 $SUBCLASS >&AS_MESSAGE_LOG_FD 2>&1; then
if $JAVAH -classpath . $SUB >&AS_MESSAGE_LOG_FD 2>&1; then
if cat $SUBHEADER | grep POTATO >&AS_MESSAGE_LOG_FD 2>&1; then
it_cv_cp39408_javah=no;
@@ -1232,7 +1232,7 @@
}
}
EOF
-if $JAVAC -cp . $JAVACFLAGS $SRC >&AS_MESSAGE_LOG_FD 2>&1; then
+if $JAVAC -cp . $JAVACFLAGS -source 5 -target 5 $SRC >&AS_MESSAGE_LOG_FD 2>&1; then
if $JAVAH -classpath . $CLASSFILE >&AS_MESSAGE_LOG_FD 2>&1; then
if test -e Test_Inner.h ; then
it_cv_cp45526_javah=no;
@@ -1333,7 +1333,7 @@
}
}]
EOF
-if $JAVAC -cp . $JAVACFLAGS $CLASS >&AS_MESSAGE_LOG_FD 2>&1 ; then
+if $JAVAC -cp . $JAVACFLAGS -source 5 -target 5 $CLASS >&AS_MESSAGE_LOG_FD 2>&1 ; then
if $JAVA -classpath . $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1 ; then
it_cv_cp40616=no;
else
@@ -1373,7 +1373,7 @@
}
}]
EOF
- if $JAVAC -cp . $JAVACFLAGS $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then
+ if $JAVAC -cp . $JAVACFLAGS -source 5 -target 5 $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then
if $JAVA -classpath . $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1; then
it_cv_cp40630=no;
else
@@ -1470,12 +1470,12 @@
{
public static void main(String[] args)
{
- $2.class.toString();
+ System.err.println("Class found: " + $2.class);
}
}
]
EOF
-if $JAVAC -cp . $JAVACFLAGS -nowarn $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then
+if $JAVAC -cp . $JAVACFLAGS -source 5 -target 5 -nowarn $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then
if $JAVA -classpath . $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1; then
it_cv_$1=no;
else
@@ -1727,7 +1727,7 @@
}
}]
EOF
- if $JAVAC -cp . $JAVACFLAGS -source 7 $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then
+ if $JAVAC -cp . $JAVACFLAGS -source 7 -target 7 $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then
it_cv_diamond=no;
else
it_cv_diamond=yes;
@@ -2178,3 +2178,124 @@
AM_CONDITIONAL([NO_BYTECODE7], test x"${it_cv_bytecode7}" = "xyes")
AC_PROVIDE([$0])dnl
])
+
+dnl Generic macro to check for a Java constructor
+dnl Takes four arguments: the name of the macro,
+dnl the name of the class, the method signature
+dnl and an example call to the method. The macro name
+dnl is usually the name of the class with '.'
+dnl replaced by '_' and all letters capitalised.
+dnl e.g. IT_CHECK_FOR_CONSTRUCTOR([JAVAX_MANAGEMENT_STANDARDMBEAN_MXBEAN_TWO_ARG],[javax.management.StandardMBean],[Class.class,Boolean.TYPE],[Object.class, true])
+AC_DEFUN([IT_CHECK_FOR_CONSTRUCTOR],[
+AC_CACHE_CHECK([if $2($3) is missing], it_cv_$1, [
+CLASS=Test.java
+BYTECODE=$(echo $CLASS|sed 's#\.java##')
+mkdir tmp.$$
+cd tmp.$$
+cat << \EOF > $CLASS
+[/* [#]line __oline__ "configure" */
+import java.lang.reflect.Constructor;
+
+public class Test
+{
+ public static void main(String[] args)
+ {
+ Class<?> cl = $2.class;
+ try
+ {
+ Constructor<?> cons = cl.getDeclaredConstructor($3);
+ System.err.println("Constructor found: " + cons);
+ }
+ catch (NoSuchMethodException e)
+ {
+ System.exit(-1);
+ }
+ }
+
+ private class TestCons extends $2
+ {
+ TestCons()
+ {
+ super($4);
+ }
+ }
+
+}
+
+]
+EOF
+if $JAVAC -cp . $JAVACFLAGS -source 5 -target 5 -nowarn $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then
+ if $JAVA -classpath . $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1; then
+ it_cv_$1=no;
+ else
+ it_cv_$1=yes;
+ fi
+else
+ it_cv_$1=yes;
+fi
+])
+rm -f $CLASS *.class
+cd ..
+rmdir tmp.$$
+AM_CONDITIONAL([LACKS_$1], test x"${it_cv_$1}" = "xyes")
+AC_PROVIDE([$0])dnl
+])
+
+dnl Generic macro to check for a Java method
+dnl Takes five arguments: the name of the macro,
+dnl the name of the method, the name of the class,
+dnl the method signature and an example call to the
+dnl method. The macro name is usually the name of
+dnl the class with '.' replaced by '_' and all letters
+dnl capitalised.
+dnl e.g. IT_CHECK_FOR_METHOD([JAVA_UTIL_REGEX_MATCHER_QUOTEREPLACEMENT],[java.util.regex.Matcher.quoteReplacement],[java.util.regex.Matcher],["quoteReplacement",String.class],java.util.regex.Matcher.quoteReplacement("Blah"))
+AC_DEFUN([IT_CHECK_FOR_METHOD],[
+AC_CACHE_CHECK([if $2 is missing], it_cv_$1, [
+CLASS=Test.java
+BYTECODE=$(echo $CLASS|sed 's#\.java##')
+mkdir tmp.$$
+cd tmp.$$
+cat << \EOF > $CLASS
+[/* [#]line __oline__ "configure" */
+import java.lang.reflect.Method;
+
+public class Test
+{
+ public static void main(String[] args)
+ {
+ Class<?> cl = $3.class;
+ try
+ {
+ Method m = cl.getDeclaredMethod($4);
+ System.err.println("Method found: " + m);
+ }
+ catch (NoSuchMethodException e)
+ {
+ System.exit(-1);
+ }
+ }
+
+ public void dontRun()
+ {
+ $5;
+ }
+
+}
+]
+EOF
+if $JAVAC -cp . $JAVACFLAGS -source 5 -target 5 -nowarn $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then
+ if $JAVA -classpath . $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1; then
+ it_cv_$1=no;
+ else
+ it_cv_$1=yes;
+ fi
+else
+ it_cv_$1=yes;
+fi
+])
+rm -f $CLASS *.class
+cd ..
+rmdir tmp.$$
+AM_CONDITIONAL([LACKS_$1], test x"${it_cv_$1}" = "xyes")
+AC_PROVIDE([$0])dnl
+])
diff -r 9ee6ad4f47a9 -r bda6f93d4927 configure.ac
--- a/configure.ac Mon Apr 08 01:25:42 2013 +0100
+++ b/configure.ac Thu May 02 17:56:53 2013 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.1.8pre], [distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea], [2.1.8], [distro-pkg-dev at openjdk.java.net])
AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
AC_CONFIG_FILES([Makefile])
@@ -116,6 +116,29 @@
IT_CHECK_FOR_CLASS([JAVAX_ANNOTATION_RESOURCE], [javax.annotation.Resource])
IT_GETDTDTYPE_CHECK
IT_CHECK_FOR_CLASS([SUN_AWT_TOOLKIT], [sun.awt.SunToolkit])
+dnl PR43148 - javac fails due to missing java.util.regex.Matcher.quoteReplacement
+IT_CHECK_FOR_METHOD([JAVA_UTIL_REGEX_MATCHER_QUOTEREPLACEMENT],[java.util.regex.Matcher.quoteReplacement],[java.util.regex.Matcher],["quoteReplacement",String.class],java.util.regex.Matcher.quoteReplacement("Blah"))
+dnl PR56553 - SSLParameters support missing
+IT_CHECK_FOR_METHOD([JAVAX_NET_SSL_SSLCONTEXT_GETDEFAULTSSLPARAMETERS],
+ [javax.net.ssl.SSLContext.getDefaultSSLParameters],
+ [javax.net.ssl.SSLContext],
+ ["getDefaultSSLParameters"],
+ [try { javax.net.ssl.SSLContext.getDefault().getDefaultSSLParameters(); } catch (Exception e) {}]
+)
+IT_CHECK_FOR_METHOD([JAVAX_NET_SSL_SSLENGINE_SETSSLPARAMETERS],
+ [javax.net.ssl.SSLEngine.setSSLParameters],
+ [javax.net.ssl.SSLEngine],
+ ["setSSLParameters", javax.net.ssl.SSLParameters.class],
+ [try { javax.net.ssl.SSLContext.getDefault().createSSLEngine().setSSLParameters(new javax.net.ssl.SSLParameters()); }
+ catch (Exception e) {}]
+)
+dnl PR57008 - Add missing SslRMIServerSocketFactory constructor from 7
+IT_CHECK_FOR_CONSTRUCTOR([JAVAX_RMI_SSL_SSLRMISERVERSOCKETFACTORY_7],
+ [javax.rmi.ssl.SslRMIServerSocketFactory],
+ [javax.net.ssl.SSLContext.class,String@<:@@:>@.class,String@<:@@:>@.class,Boolean.TYPE],
+ [null,null,null,true]
+)
+
IT_CHECK_ENABLE_WARNINGS
IT_DIAMOND_CHECK
IT_BYTECODE7_CHECK
diff -r 9ee6ad4f47a9 -r bda6f93d4927 patches/boot/ecj-diamond.patch
--- a/patches/boot/ecj-diamond.patch Mon Apr 08 01:25:42 2013 +0100
+++ b/patches/boot/ecj-diamond.patch Thu May 02 17:56:53 2013 +0100
@@ -948,8 +948,8 @@
*/
final class ThreadGroupContext {
-- private static final Map<ThreadGroup, ThreadGroupContext> contexts = new WeakHashMap<>();
-+ private static final Map<ThreadGroup, ThreadGroupContext> contexts = new WeakHashMap();
+- private static final WeakIdentityMap<ThreadGroupContext> contexts = new WeakIdentityMap<>();
++ private static final WeakIdentityMap<ThreadGroupContext> contexts = new WeakIdentityMap<ThreadGroupContext>();
/**
* Returns the appropriate {@code AppContext} for the caller,
More information about the distro-pkg-dev
mailing list