/hg/release/icedtea7-2.3: 3 new changesets

[andrew at icedtea.classpath.org]

changeset ee8144fe33e6 in /hg/release/icedtea7-2.3
details: http://icedtea.classpath.org/hg/release/icedtea7-2.3?cmd=changeset;node=ee8144fe33e6
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Jun 28 01:30:06 2013 -0500

	Turn off system LCMS by default and warn if enabled, as it is unlikely to have the latest security updates.

	2013-06-28  Andrew John Hughes  <gnu.andrew at member.fsf.org>

		* acinclude.m4:
		(IT_WITH_HOTSPOT_BUILD): Define once.
		(IT_CHECK_FOR_LCMS): Turn system LCMS off by default
		and warn if enabled as it is unlikely to have
		the new security fixes.
		* configure.ac: Drop IT_ENABLE_ZERO_BUILD; called
		by IT_WITH_HOTSPOT_BUILD.


changeset 5f0394d24af3 in /hg/release/icedtea7-2.3
details: http://icedtea.classpath.org/hg/release/icedtea7-2.3?cmd=changeset;node=5f0394d24af3
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Jun 28 01:31:54 2013 -0500

	Prepare for 2.3.10 release.

	2013-06-28  Andrew John Hughes  <gnu.andrew at member.fsf.org>

		* configure.ac: Set to 2.3.10.
		* NEWS: Set release date.


changeset 62bc3780164c in /hg/release/icedtea7-2.3
details: http://icedtea.classpath.org/hg/release/icedtea7-2.3?cmd=changeset;node=62bc3780164c
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Jun 28 14:15:40 2013 +0100

	Added tag icedtea-2.3.10 for changeset 5f0394d24af3


diffstat:

 .hgtags      |   1 +
 ChangeLog    |  15 +++++++++++++++
 NEWS         |   2 +-
 acinclude.m4 |   7 ++++---
 configure.ac |   3 +--
 5 files changed, 22 insertions(+), 6 deletions(-)

diffs (90 lines):

diff -r 066d3181805f -r 62bc3780164c .hgtags
--- a/.hgtags	Fri Jun 28 07:20:34 2013 +0100
+++ b/.hgtags	Fri Jun 28 14:15:40 2013 +0100
@@ -46,3 +46,4 @@
 8e87a16a613cf9f2b6a9496c514fb098eb872f7f icedtea-2.3.7
 eeda7cda31dc55c0faa4d2773cfc4c2f27bb6d7a icedtea-2.3.8
 b382dc61dbdde9e404a459b5b71608674e6e3c34 icedtea-2.3.9
+5f0394d24af3ae26333240f3c98c94eb170ffb0c icedtea-2.3.10
diff -r 066d3181805f -r 62bc3780164c ChangeLog
--- a/ChangeLog	Fri Jun 28 07:20:34 2013 +0100
+++ b/ChangeLog	Fri Jun 28 14:15:40 2013 +0100
@@ -1,3 +1,18 @@
+2013-06-28  Andrew John Hughes  <gnu.andrew at member.fsf.org>
+
+	* configure.ac: Set to 2.3.10.
+	* NEWS: Set release date.
+
+2013-06-28  Andrew John Hughes  <gnu.andrew at member.fsf.org>
+
+	* acinclude.m4:
+	(IT_WITH_HOTSPOT_BUILD): Define once.
+	(IT_CHECK_FOR_LCMS): Turn system LCMS off by default
+	and warn if enabled as it is unlikely to have
+	the new security fixes.
+	* configure.ac: Drop IT_ENABLE_ZERO_BUILD; called
+	by IT_WITH_HOTSPOT_BUILD.
+
 2013-06-28  Andrew John Hughes  <gnu.andrew at member.fsf.org>
 
 	* NEWS: Mention that 8001330 is not in Zero.
diff -r 066d3181805f -r 62bc3780164c NEWS
--- a/NEWS	Fri Jun 28 07:20:34 2013 +0100
+++ b/NEWS	Fri Jun 28 14:15:40 2013 +0100
@@ -10,7 +10,7 @@
 
 CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
 
-New in release 2.3.10 (2013-06-XX):
+New in release 2.3.10 (2013-06-28):
 
 * Security fixes
   - S6741606, CVE-2013-2407: Integrate Apache Santuario
diff -r 066d3181805f -r 62bc3780164c acinclude.m4
--- a/acinclude.m4	Fri Jun 28 07:20:34 2013 +0100
+++ b/acinclude.m4	Fri Jun 28 14:15:40 2013 +0100
@@ -921,7 +921,7 @@
   AC_SUBST([GCJ])
 ])
 
-AC_DEFUN([IT_WITH_HOTSPOT_BUILD],
+AC_DEFUN_ONCE([IT_WITH_HOTSPOT_BUILD],
 [
   AC_REQUIRE([IT_ENABLE_ZERO_BUILD])
   if test "x${use_zero}" = "xyes"; then
@@ -1912,15 +1912,16 @@
 [
   AC_MSG_CHECKING([whether to use the system LCMS install])
   AC_ARG_ENABLE([system-lcms],
-	      [AS_HELP_STRING(--enable-system-lcms,use the system LCMS [[default=yes]])],
+	      [AS_HELP_STRING(--enable-system-lcms,use the system LCMS [[default=no]])],
   [
     ENABLE_SYSTEM_LCMS="${enableval}"
   ],
   [
-    ENABLE_SYSTEM_LCMS="yes"
+    ENABLE_SYSTEM_LCMS="no"
   ])
   AC_MSG_RESULT(${ENABLE_SYSTEM_LCMS})
   if test x"${ENABLE_SYSTEM_LCMS}" = "xyes"; then
+    AC_MSG_WARN([System LCMS may not have the latest security updates])
     dnl Check for LCMS2 headers and libraries.
     PKG_CHECK_MODULES(LCMS2, lcms2,[LCMS2_FOUND=yes],[LCMS2_FOUND=no])
     if test "x${LCMS2_FOUND}" = xno
diff -r 066d3181805f -r 62bc3780164c configure.ac
--- a/configure.ac	Fri Jun 28 07:20:34 2013 +0100
+++ b/configure.ac	Fri Jun 28 14:15:40 2013 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.3.10pre], [distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea], [2.3.10], [distro-pkg-dev at openjdk.java.net])
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
 AC_CONFIG_FILES([Makefile])
 
@@ -180,7 +180,6 @@
 IT_ENABLE_WERROR
 IT_ENABLE_JAR_COMPRESSION
 IT_SET_SHARK_BUILD
-IT_ENABLE_ZERO_BUILD
 IT_CHECK_ADDITIONAL_VMS
 
 IT_WITH_VERSION_SUFFIX