/hg/release/icedtea7-2.6: 5 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Apr 22 06:12:50 UTC 2016
changeset 1818eebd5305 in /hg/release/icedtea7-2.6
details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=1818eebd5305
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Apr 21 23:27:41 2016 +0100
PR2665: icedtea/jamvm 2.6 fails as a build VM for icedtea
2016-04-20 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR2665: icedtea/jamvm 2.6 fails as a
build VM for icedtea
* Makefile.am:
(ICEDTEA_PATCHES): Add new patch.
* NEWS: Updated.
* patches/jamvm/pr2665.patch:
Set the classLoader field in java.lang.Class
when a class is defined.
changeset dcc404efa123 in /hg/release/icedtea7-2.6
details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=dcc404efa123
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Apr 22 02:46:06 2016 +0100
PR2929: configure: error: "A JDK home directory could not be found."
2016-04-21 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR2929: configure: error: "A JDK home directory
could not be found."
* NEWS: Updated.
* acinclude.m4:
(IT_FIND_RHINO_JAR): Refactor to be more
verbose and helpful to the user.
(IT_CHECK_FOR_JDK): Point user to the
configure option if we fail to find the JDK.
changeset 56b5aa4739a2 in /hg/release/icedtea7-2.6
details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=56b5aa4739a2
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Apr 22 03:48:04 2016 +0100
PR2935: Check that freetype defines FT_CONFIG_OPTION_INFINALITY_PATCHSET if enabling infinality
2016-04-21 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR2935: Check that freetype defines
FT_CONFIG_OPTION_INFINALITY_PATCHSET if
enabling infinality
* NEWS: Updated.
* acinclude.m4:
(IT_ENABLE_INFINALITY): Depend on
IT_CHECK_FOR_FREETYPE and check that
FreeType defines
FT_CONFIG_OPTION_INFINALITY_PATCHSET.
(IT_CHECK_FOR_FREETYPE): Moved from
configure.ac to its own macro so
IT_ENABLE_INFINALITY can depend on it.
* configure.ac:
Move FreeType check to its own macro.
changeset eb28ef741d14 in /hg/release/icedtea7-2.6
details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=eb28ef741d14
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Apr 22 05:49:16 2016 +0100
Bump to icedtea-2.6.6.
Upstream changes:
- Bump to icedtea-2.6.6
- PR2938: Fix build of 8148487 backport
- PR2939: Remove rogue ReleaseStringUTFChars line remaining from merge of 7u101 b00
- S4858370: JDWP: Memory Leak: GlobalRefs never deleted when processing invokeMethod command
- S4963723: Implement SHA-224
- S6414899: P11Digest should support cloning
- S6956398: make ephemeral DH key match the length of the certificate key
- S7044060: Need to support NSA Suite B Cryptography algorithms
- S7127906: (launcher) convert the launcher regression tests to java
- S8002116: This JdbReadTwiceTest.sh gets an exit 1
- S8004007: test/sun/tools/jinfo/Basic.sh fails on when runSA is set to true
- S8006935: Need to take care of long secret keys in HMAC/PRF compuation
- S8007890: [TESTBUG] JcmdWithNMTDisabled.java fails when invoked with NMT explicitly turned on
- S8027705: com/sun/jdi/JdbMethodExitTest.sh fails when a background thread is generating events.
- S8028537: PPC64: Updated the JDK regression tests to run on AIX
- S8036132: Tab characters in test/com/sun/jdi files
- S8038963: com/sun/jdi tests fail because cygwin's ps sometimes misses processes
- S8039921: SHA1WithDSA with key > 1024 bits not working
- S8044419: TEST_BUG: com/sun/jdi/JdbReadTwiceTest.sh fails when run under root
- S8059661: Test SoftReference and OOM behavior
- S8072753: Nondeterministic wrong answer on arithmetic
- S8073735: [TEST_BUG] compiler/loopopts/CountedLoopProblem.java got OOME
- S8074146: [TEST_BUG] jdb has succeded to read an unreadable file
- S8081475: SystemTap does not work when JDK is compiled with GCC 5
- S8087120: [GCC5] java.lang.StackOverflowError on Zero JVM initialization on non x86 platforms.
- S8129952: Ensure thread consistency
- S8132051: Better byte behavior
- S8134297: NPE in GSSNameElement nameType check
- S8134650: Xsl transformation gives different results in 8u66
- S8138593: Make DSA more fair
- S8139008: Better state table management
- S8141229: [Parfait] Null pointer dereference in cmsstrcasecmp of cmserr.c
- S8143002: [Parfait] JNI exception pending in fontpath.c:1300
- S8143167: Better buffering of XML strings
- S8144430: Improve JMX connections
- S8146477: [TEST_BUG] ClientJSSEServerJSSE.java failing again
- S8146494: Better ligature substitution
- S8146498: Better device table adjustments
- S8146967: [TEST_BUG] javax/security/auth/SubjectDomainCombiner/Optimize.java should use 4-args ProtectionDomain constructor
- S8147567: InterpreterRuntime::post_field_access not updated for boolean in JDK-8132051
- S8148446: (tz) Support tzdata2016a
- S8148475: Missing SA Bytecode updates.
- S8148487: PPC64: Better byte behavior
- S8149170: Better byte behavior for native arguments
- S8149367: PolicyQualifierInfo/index_Ctor JCk test fails with IOE: Invalid encoding for PolicyQualifierInfo
- S8150012: Better byte behavior for reflection
- S8150790: 8u75 L10n resource file translation update
- S8153673: [BACKOUT] JDWP: Memory Leak: GlobalRefs never deleted when processing invokeMethod command
- S8154210: Zero: Better byte behaviour
- S8154413: AArch64: Better byte behaviour
2016-04-21 Andrew John Hughes <gnu.andrew at member.fsf.org>
Bump to icedtea-2.6.6.
* Makefile.am,
(JDK_UPDATE_VERSION): Bump to 101.
(CORBA_CHANGESET): Update to icedtea-2.6.6.
(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.
* configure.ac: Bump to 2.6.6.
* hotspot.map.in: Update to icedtea-2.6.6.
* patches/boot/ecj-diamond.patch:
Regenerated. Add new case in
javax/management/remote/rmi/RMIJRMPServerImpl.java
changeset 00bafbd9a1cc in /hg/release/icedtea7-2.6
details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=00bafbd9a1cc
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Apr 22 07:13:53 2016 +0100
Added tag icedtea-2.6.6 for changeset eb28ef741d14
diffstat:
.hgtags | 1 +
ChangeLog | 63 +
Makefile.am | 31 +-
NEWS | 50 +-
acinclude.m4 | 96 +-
configure.ac | 13 +-
hotspot.map.in | 2 +-
patches/boot/ecj-diamond.patch | 1408 ++++++++++++++++++++-------------------
patches/jamvm/pr2665.patch | 36 +
9 files changed, 947 insertions(+), 753 deletions(-)
diffs (truncated from 4267 to 500 lines):
diff -r c37d028fc49b -r 00bafbd9a1cc .hgtags
--- a/.hgtags Tue Apr 19 01:17:25 2016 +0100
+++ b/.hgtags Fri Apr 22 07:13:53 2016 +0100
@@ -67,3 +67,4 @@
17770cf44bc6da12e4e465bfb65f7966dfac4ef9 icedtea-2.6.3
c9ed028a5bd92024c7f7cb75e6baf994d7b0bc6a icedtea-2.6.4
72847c7c840d9ec1849a9d8d85226e0634d003bf icedtea-2.6.5
+eb28ef741d14a98ba1b1afbcf8372445aca722f5 icedtea-2.6.6
diff -r c37d028fc49b -r 00bafbd9a1cc ChangeLog
--- a/ChangeLog Tue Apr 19 01:17:25 2016 +0100
+++ b/ChangeLog Fri Apr 22 07:13:53 2016 +0100
@@ -1,3 +1,66 @@
+2016-04-21 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ Bump to icedtea-2.6.6.
+ * Makefile.am,
+ (JDK_UPDATE_VERSION): Bump to 101.
+ (CORBA_CHANGESET): Update to icedtea-2.6.6.
+ (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.
+ * configure.ac: Bump to 2.6.6.
+ * hotspot.map.in: Update to icedtea-2.6.6.
+ * patches/boot/ecj-diamond.patch:
+ Regenerated. Add new case in
+ javax/management/remote/rmi/RMIJRMPServerImpl.java
+
+2016-04-21 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR2935: Check that freetype defines
+ FT_CONFIG_OPTION_INFINALITY_PATCHSET if
+ enabling infinality
+ * NEWS: Updated.
+ * acinclude.m4:
+ (IT_ENABLE_INFINALITY): Depend on
+ IT_CHECK_FOR_FREETYPE and check that
+ FreeType defines
+ FT_CONFIG_OPTION_INFINALITY_PATCHSET.
+ (IT_CHECK_FOR_FREETYPE): Moved from
+ configure.ac to its own macro so
+ IT_ENABLE_INFINALITY can depend on it.
+ * configure.ac:
+ Move FreeType check to its own macro.
+
+2016-04-21 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR2929: configure: error: "A JDK home directory
+ could not be found."
+ * NEWS: Updated.
+ * acinclude.m4:
+ (IT_FIND_RHINO_JAR): Refactor to be more
+ verbose and helpful to the user.
+ (IT_CHECK_FOR_JDK): Point user to the
+ configure option if we fail to find the JDK.
+
+2016-04-20 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR2665: icedtea/jamvm 2.6 fails as a
+ build VM for icedtea
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add new patch.
+ * NEWS: Updated.
+ * patches/jamvm/pr2665.patch:
+ Set the classLoader field in java.lang.Class
+ when a class is defined.
+
2016-04-17 Andrew John Hughes <gnu.andrew at member.fsf.org>
Bump to icedtea-2.6.6pre01.
diff -r c37d028fc49b -r 00bafbd9a1cc Makefile.am
--- a/Makefile.am Tue Apr 19 01:17:25 2016 +0100
+++ b/Makefile.am Fri Apr 22 07:13:53 2016 +0100
@@ -1,22 +1,22 @@
# Dependencies
-JDK_UPDATE_VERSION = 99
+JDK_UPDATE_VERSION = 101
BUILD_VERSION = b00
COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
-CORBA_CHANGESET = bd2be90026f7
-JAXP_CHANGESET = 5ab0648fce58
-JAXWS_CHANGESET = 16ce6457a33a
-JDK_CHANGESET = a4a37396e04b
-LANGTOOLS_CHANGESET = 83f998d6c0af
-OPENJDK_CHANGESET = b8b43305701a
-
-CORBA_SHA256SUM = 9c72e2b16f845759f3d27aaab4e1f2822e175bf2059d479aa726298408f3540e
-JAXP_SHA256SUM = 8b60389217b2120d44be70800d0d040fb9aec7af8b60f5233011176c88b27826
-JAXWS_SHA256SUM = 45c806ae53732d5c632123d7bcfb7d3a7e7de791238ee9157646bdb2e3c86718
-JDK_SHA256SUM = 5659a4490d5bb725740f07715d791070e6690b8eef0247f585bee431582f7610
-LANGTOOLS_SHA256SUM = 5b1f263842eee44a0c6586718e9f0b7fdf9513fc57bf7eb4c779208f8bb59b74
-OPENJDK_SHA256SUM = 8a62724548c31ef5b74aaa1a0b8b315a99799f16245d3c16e534748f792676b1
+CORBA_CHANGESET = ca3e3c4c5a61
+JAXP_CHANGESET = 683427778edf
+JAXWS_CHANGESET = 63f7bf7ed2d4
+JDK_CHANGESET = 55c38c1ace75
+LANGTOOLS_CHANGESET = e42dd50480d3
+OPENJDK_CHANGESET = 882cfee70fe8
+
+CORBA_SHA256SUM = ce886c97a150465df3a36c4281d5f36ba8ee2b081b5b76ecfbefaddb723b6a2d
+JAXP_SHA256SUM = 679eb46054afea3098713beee85639c4a5a5af881e94be527409feaea4272d30
+JAXWS_SHA256SUM = f9af138096f4d11e381c3cc949dd3ee37cee5bfff15dc21cff5c16a2f9e7c218
+JDK_SHA256SUM = 1baa92ca72db1b80fff18ca26bd49e5fd5f2927df9eceebf3456cbd86a710a9f
+LANGTOOLS_SHA256SUM = 54bb2cee7b4fc5bbc63a4c9d7008602e12f75431c7f129ade7c405b53c2363f3
+OPENJDK_SHA256SUM = 24f813e6cb938272a4da37b46b48aa86820b13be0747747e6c8fb4aad72cadf3
DROP_URL = http://icedtea.classpath.org/download/drops
@@ -403,7 +403,8 @@
ICEDTEA_PATCHES += \
patches/jamvm/find_class_from_caller.patch \
patches/jamvm/pr2172-tempdir.patch \
- patches/jamvm/noexecstack.patch
+ patches/jamvm/noexecstack.patch \
+ patches/jamvm/pr2665.patch
endif
if ENABLE_NSS
diff -r c37d028fc49b -r 00bafbd9a1cc NEWS
--- a/NEWS Tue Apr 19 01:17:25 2016 +0100
+++ b/NEWS Fri Apr 22 07:13:53 2016 +0100
@@ -12,12 +12,60 @@
CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
-New in release 2.6.6 (2016-04-19):
+New in release 2.6.6 (2016-04-21):
+* Security fixes
+ - S8129952, CVE-2016-0686: Ensure thread consistency
+ - S8132051, CVE-2016-0687: Better byte behavior
+ - S8138593, CVE-2016-0695: Make DSA more fair
+ - S8139008: Better state table management
+ - S8143167, CVE-2016-3425: Better buffering of XML strings
+ - S8144430, CVE-2016-3427: Improve JMX connections
+ - S8146494: Better ligature substitution
+ - S8146498: Better device table adjustments
+* Import of OpenJDK 7 u101 build 0
+ - S4858370: JDWP: Memory Leak: GlobalRefs never deleted when processing invokeMethod command
+ - S7127906: (launcher) convert the launcher regression tests to java
+ - S8002116: This JdbReadTwiceTest.sh gets an exit 1
+ - S8004007: test/sun/tools/jinfo/Basic.sh fails on when runSA is set to true
+ - S8007890: [TESTBUG] JcmdWithNMTDisabled.java fails when invoked with NMT explicitly turned on
+ - S8027705: com/sun/jdi/JdbMethodExitTest.sh fails when a background thread is generating events.
+ - S8028537: PPC64: Updated the JDK regression tests to run on AIX
+ - S8036132: Tab characters in test/com/sun/jdi files
+ - S8038963: com/sun/jdi tests fail because cygwin's ps sometimes misses processes
+ - S8044419: TEST_BUG: com/sun/jdi/JdbReadTwiceTest.sh fails when run under root
+ - S8059661: Test SoftReference and OOM behavior
+ - S8072753: Nondeterministic wrong answer on arithmetic
+ - S8073735: [TEST_BUG] compiler/loopopts/CountedLoopProblem.java got OOME
+ - S8074146: [TEST_BUG] jdb has succeded to read an unreadable file
+ - S8134297: NPE in GSSNameElement nameType check
+ - S8134650: Xsl transformation gives different results in 8u66
+ - S8141229: [Parfait] Null pointer dereference in cmsstrcasecmp of cmserr.c
+ - S8143002: [Parfait] JNI exception pending in fontpath.c:1300
+ - S8146477: [TEST_BUG] ClientJSSEServerJSSE.java failing again
+ - S8146967: [TEST_BUG] javax/security/auth/SubjectDomainCombiner/Optimize.java should use 4-args ProtectionDomain constructor
+ - S8147567: InterpreterRuntime::post_field_access not updated for boolean in JDK-8132051
+ - S8148446: (tz) Support tzdata2016a
+ - S8148475: Missing SA Bytecode updates.
+ - S8149170: Better byte behavior for native arguments
+ - S8149367: PolicyQualifierInfo/index_Ctor JCk test fails with IOE: Invalid encoding for PolicyQualifierInfo
+ - S8150012: Better byte behavior for reflection
+ - S8150790: 8u75 L10n resource file translation update
+ - S8153673: [BACKOUT] JDWP: Memory Leak: GlobalRefs never deleted when processing invokeMethod command
+ - S8154210: Zero: Better byte behaviour
+* Backports
+ - S8148487: PPC64: Better byte behavior
+ - S8154413: AArch64: Better byte behaviour
* Bug fixes
- PR2889: OpenJDK should check for system cacerts database (e.g. /etc/pki/java/cacerts)
+ - PR2929: configure: error: "A JDK home directory could not be found."
+ - PR2935: Check that freetype defines FT_CONFIG_OPTION_INFINALITY_PATCHSET if enabling infinality
+ - PR2938: Fix build of 8148487 backport
+ - PR2939: Remove rogue ReleaseStringUTFChars line remaining from merge of 7u101 b00
* AArch64 port
- PR2914: byte_map_base is not page aligned on OpenJDK 7
+* JamVM
+ - PR2665: icedtea/jamvm 2.6 fails as a build VM for icedtea
New in release 2.6.5 (2016-03-24):
diff -r c37d028fc49b -r 00bafbd9a1cc acinclude.m4
--- a/acinclude.m4 Tue Apr 19 01:17:25 2016 +0100
+++ b/acinclude.m4 Fri Apr 22 07:13:53 2016 +0100
@@ -602,43 +602,62 @@
[
case "${withval}" in
yes)
- RHINO_JAR=yes
+ RHINO_RESULT=yes
;;
no)
- RHINO_JAR=no
+ RHINO_RESULT=no
;;
*)
- if test -f "${withval}"; then
- RHINO_JAR="${withval}"
- else
- AC_MSG_RESULT([not found])
- AC_MSG_ERROR("The rhino jar ${withval} was not found.")
- fi
+ RHINO_RESULT=yes
+ RHINO_JAR="${withval}"
;;
esac
],
[
- RHINO_JAR=yes
+ RHINO_RESULT=yes
])
- if test x"${RHINO_JAR}" = "xyes"; then
- if test -e "/usr/share/java/rhino.jar"; then
- RHINO_JAR=/usr/share/java/rhino.jar
- elif test -e "/usr/share/java/js.jar"; then
- RHINO_JAR=/usr/share/java/js.jar
- elif test -e "/usr/share/rhino-1.6/lib/js.jar"; then
- RHINO_JAR=/usr/share/rhino-1.6/lib/js.jar
+ AC_MSG_RESULT([$RHINO_RESULT])
+ if test "x${RHINO_RESULT}" = "xyes"; then
+ if test "x${RHINO_JAR}" != x; then
+ AC_MSG_CHECKING([if ${RHINO_JAR} is a valid JAR file])
+ if test -f ${RHINO_JAR}; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ RHINO_JAR=
+ fi
fi
- if test x"${RHINO_JAR}" = "xyes"; then
- AC_MSG_RESULT([not found])
- AC_MSG_ERROR("A rhino jar was not found in /usr/share/java as either rhino.jar or js.jar.")
+ if test "x${RHINO_JAR}" = x; then
+ RHINO_JAR="/usr/share/java/rhino.jar"
+ AC_MSG_CHECKING([if ${RHINO_JAR} is a valid JAR file])
+ if test -f ${RHINO_JAR}; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ RHINO_JAR="/usr/share/java/js.jar"
+ AC_MSG_CHECKING([if ${RHINO_JAR} is a valid JAR file])
+ if test -f ${RHINO_JAR}; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ RHINO_JAR="/usr/share/rhino-1.6/lib/js.jar"
+ AC_MSG_CHECKING([if ${RHINO_JAR} is a valid JAR file])
+ if test -f ${RHINO_JAR}; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ RHINO_JAR=
+ fi
+ fi
+ fi
+ fi
+ if test x"${RHINO_JAR}" = "x"; then
+ AC_MSG_ERROR([A Rhino JAR could not be found; specify one using --with-rhino=jar=<FILE> or use --without-rhino.])
+ else
+ AC_MSG_NOTICE([Using Rhino JAR: ${RHINO_JAR}])
fi
fi
- AC_MSG_RESULT(${RHINO_JAR})
- AM_CONDITIONAL(WITH_RHINO, test x"${RHINO_JAR}" != "xno")
-dnl Clear RHINO_JAR if it doesn't contain a valid filename
- if test x"${RHINO_JAR}" = "xno"; then
- RHINO_JAR=
- fi
+ AM_CONDITIONAL(WITH_RHINO, test x"${RHINO_JAR}" != "x")
AC_SUBST(RHINO_JAR)
])
@@ -1160,7 +1179,7 @@
AC_MSG_RESULT(${SYSTEM_JDK_DIR})
fi
if ! test -d "${SYSTEM_JDK_DIR}"; then
- AC_MSG_ERROR("A JDK home directory could not be found.")
+ AC_MSG_ERROR("A JDK home directory could not be found. Try specifying one using --with-jdk-home=<DIR>")
fi
AC_SUBST(SYSTEM_JDK_DIR)
])
@@ -2819,6 +2838,7 @@
AC_DEFUN_ONCE([IT_ENABLE_INFINALITY],
[
+ AC_REQUIRE([IT_CHECK_FOR_FREETYPE])
AC_REQUIRE([IT_CHECK_FOR_FONTCONFIG])
AC_MSG_CHECKING([whether to use fontconfig to provide better font rendering])
AC_ARG_ENABLE([infinality],
@@ -2842,6 +2862,20 @@
if test "x${ENABLE_SYSTEM_FONTCONFIG}" != "xtrue"; then
AC_MSG_ERROR([Infinality support requires fontconfig. Either --enable-system-fontconfig or --disable-infinality])
fi
+ AC_MSG_CHECKING([if FreeType is patched with infinality support])
+ AC_LANG_PUSH([C])
+ CFLAGS_SAVED=$CFLAGS
+ CFLAGS="$CFLAGS $FREETYPE2_CFLAGS"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+ #include <ft2build.h>
+ #include FT_FREETYPE_H
+ #ifndef FT_CONFIG_OPTION_INFINALITY_PATCHSET
+ #error Infinality not supported
+ #endif
+ ]])], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); \
+ AC_MSG_ERROR([Infinality support requires infinality support in FreeType.])])
+ CFLAGS=$CFLAGS_SAVED
+ AC_LANG_POP([C])
fi
])
@@ -3341,3 +3375,13 @@
AM_CONDITIONAL(USE_ALT_CACERTS_FILE, test "x${ALT_CACERTS_FILE}" != "xno")
AC_SUBST(ALT_CACERTS_FILE)
])
+
+AC_DEFUN_ONCE([IT_CHECK_FOR_FREETYPE],
+[
+dnl Check for freetype2 headers and libraries.
+ PKG_CHECK_MODULES(FREETYPE2, freetype2,[]
+ ,[AC_MSG_ERROR([Could not find freetype2 - \
+ Try installing freetype2-devel.])])
+ AC_SUBST(FREETYPE2_CFLAGS)
+ AC_SUBST(FREETYPE2_LIBS)
+])
diff -r c37d028fc49b -r 00bafbd9a1cc configure.ac
--- a/configure.ac Tue Apr 19 01:17:25 2016 +0100
+++ b/configure.ac Fri Apr 22 07:13:53 2016 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.6.6pre01], [distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea], [2.6.6], [distro-pkg-dev at openjdk.java.net])
AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
AM_MAINTAINER_MODE([enable])
AC_CONFIG_FILES([Makefile])
@@ -359,17 +359,6 @@
AC_SUBST(XTST_CFLAGS)
AC_SUBST(XTST_LIBS)
-dnl Check for freetype2 headers and libraries.
-PKG_CHECK_MODULES(FREETYPE2, freetype2,[FREETYPE2_FOUND=yes]
- ,[FREETYPE2_FOUND=no])
-if test "x${FREETYPE2_FOUND}" = xno
-then
- AC_MSG_ERROR([Could not find freetype2 - \
- Try installing freetype2-devel.])
-fi
-AC_SUBST(FREETYPE2_CFLAGS)
-AC_SUBST(FREETYPE2_LIBS)
-
dnl Check for alsa headers and libraries (only required for Linux).
if test "x${BUILD_OS_DIR}" = "xlinux"
then
diff -r c37d028fc49b -r 00bafbd9a1cc hotspot.map.in
--- a/hotspot.map.in Tue Apr 19 01:17:25 2016 +0100
+++ b/hotspot.map.in Fri Apr 22 07:13:53 2016 +0100
@@ -1,2 +1,2 @@
# version type(drop/hg) url changeset sha256sum
-default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 825fa447453a a75da544a79cc8bf288a76cc96da82702ac269bfb5208fdd9b7718d984aa5b1e
+default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 3022a3d80efd a4e8f4fef724a34e5eece3c2c1de4e60ff12e752549c8df11ddcd6f3042e0dc2
diff -r c37d028fc49b -r 00bafbd9a1cc patches/boot/ecj-diamond.patch
--- a/patches/boot/ecj-diamond.patch Tue Apr 19 01:17:25 2016 +0100
+++ b/patches/boot/ecj-diamond.patch Fri Apr 22 07:13:53 2016 +0100
@@ -1,6 +1,6 @@
diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java
---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2016-01-18 15:52:10.000000000 +0000
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2016-01-20 01:43:32.528245741 +0000
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2016-04-18 06:49:20.000000000 +0100
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2016-04-22 04:41:51.693514130 +0100
@@ -58,7 +58,7 @@
private CorbaConnection conn;
@@ -11,8 +11,8 @@
public static synchronized void cleanCache( ORB orb ) {
synchronized (iorMapLock) {
diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java
---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java 2016-01-18 15:52:10.000000000 +0000
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java 2016-01-20 01:43:32.528245741 +0000
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java 2016-04-18 06:49:20.000000000 +0100
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java 2016-04-22 04:41:51.693514130 +0100
@@ -50,7 +50,7 @@
*/
private class HookPutFields extends ObjectOutputStream.PutField
@@ -23,8 +23,8 @@
/**
* Put the value of the named boolean field into the persistent field.
diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java
---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2016-01-18 15:52:10.000000000 +0000
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2016-01-20 01:43:32.528245741 +0000
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2016-04-18 06:49:20.000000000 +0100
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2016-04-22 04:41:51.693514130 +0100
@@ -1315,7 +1315,7 @@
protected void shutdownServants(boolean wait_for_completion) {
Set<ObjectAdapterFactory> oaset;
@@ -35,8 +35,8 @@
for (ObjectAdapterFactory oaf : oaset)
diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java
---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2016-01-18 15:52:10.000000000 +0000
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2016-01-20 01:43:32.528245741 +0000
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2016-04-18 06:49:20.000000000 +0100
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2016-04-22 04:41:51.693514130 +0100
@@ -108,7 +108,7 @@
private ThreadGroup threadGroup;
@@ -56,8 +56,8 @@
for (WorkerThread wt : copy) {
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java 2016-01-18 15:52:13.000000000 +0000
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java 2016-01-20 01:43:32.528245741 +0000
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java 2016-04-18 06:49:21.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java 2016-04-22 04:41:51.693514130 +0100
@@ -192,7 +192,7 @@
NodeSet dist = new NodeSet();
dist.setShouldCacheNodes(true);
@@ -68,8 +68,8 @@
for (int i = 0; i < nl.getLength(); i++)
{
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java 2016-01-18 15:52:13.000000000 +0000
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java 2016-01-20 01:43:32.528245741 +0000
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java 2016-04-18 06:49:21.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java 2016-04-22 04:41:51.693514130 +0100
@@ -220,7 +220,7 @@
public Map<String, Object> getEnvironmentHash()
{
@@ -188,8 +188,8 @@
jarVersions.put(new Long(440237), "xalan.jar from xalan-j_1_2");
jarVersions.put(new Long(436094), "xalan.jar from xalan-j_1_2_1");
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java 2016-01-18 15:52:13.000000000 +0000
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java 2016-01-20 01:43:32.528245741 +0000
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java 2016-04-18 06:49:21.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java 2016-04-22 04:41:51.693514130 +0100
@@ -51,7 +51,7 @@
/**
* Legal conversions between internal types.
@@ -200,8 +200,8 @@
static {
// Possible type conversions between internal types
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java 2016-01-18 15:52:13.000000000 +0000
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java 2016-01-20 01:43:32.528245741 +0000
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java 2016-04-18 06:49:21.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java 2016-04-22 04:41:51.693514130 +0100
@@ -139,7 +139,7 @@
private boolean _isStatic = false;
@@ -225,18 +225,18 @@
// Possible conversions between Java and internal types
java2Internal.put(Boolean.TYPE, Type.Boolean);
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java 2016-01-18 15:52:13.000000000 +0000
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java 2016-01-20 01:43:32.528245741 +0000
-@@ -106,7 +106,7 @@
-
- // Check if we have any declared namesaces
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java 2016-04-18 06:49:21.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java 2016-04-22 04:44:46.770697237 +0100
+@@ -107,7 +107,7 @@
+
+ // Check if we have any declared namespaces
if (_accessedPrefixes == null) {
-- _accessedPrefixes = new HashMap<>();
-+ _accessedPrefixes = new HashMap<String,String>();
+- _accessedPrefixes = new Hashtable<>();
++ _accessedPrefixes = new Hashtable<String,String>();
}
else {
if (!declared) {
-@@ -168,7 +168,7 @@
+@@ -169,7 +169,7 @@
*/
public void addAttribute(SyntaxTreeNode attribute) {
if (_attributeElements == null) {
@@ -245,7 +245,7 @@
}
_attributeElements.add(attribute);
}
-@@ -178,7 +178,7 @@
+@@ -179,7 +179,7 @@
*/
public void setFirstAttribute(SyntaxTreeNode attribute) {
if (_attributeElements == null) {
@@ -254,7 +254,7 @@
}
_attributeElements.add(0, attribute);
}
-@@ -204,7 +204,7 @@
More information about the distro-pkg-dev
mailing list