Mercurial > hg > release > icedtea7-2.3

changeset 2664:ee8144fe33e6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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@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.
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Fri, 28 Jun 2013 01:30:06 -0500
parents 066d3181805f
children 5f0394d24af3
files ChangeLog acinclude.m4 configure.ac
diffstat 3 files changed, 14 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Jun 28 07:20:34 2013 +0100
+++ b/ChangeLog	Fri Jun 28 01:30:06 2013 -0500
@@ -1,3 +1,13 @@
+2013-06-28  Andrew John Hughes  <gnu.andrew@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@member.fsf.org>
 
 	* NEWS: Mention that 8001330 is not in Zero.
--- a/acinclude.m4	Fri Jun 28 07:20:34 2013 +0100
+++ b/acinclude.m4	Fri Jun 28 01:30:06 2013 -0500
@@ -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
--- a/configure.ac	Fri Jun 28 07:20:34 2013 +0100
+++ b/configure.ac	Fri Jun 28 01:30:06 2013 -0500
@@ -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