/hg/release/icedtea6-1.7: 2 new changesets

[andrew at icedtea.classpath.org]

changeset 15fbe52e01df in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=15fbe52e01df
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Mar 31 21:44:56 2010 +0100

	Bump to 1.7.3. Mention changes in NEWS.

	2010-03-31 Andrew John Hughes <ahughes at redhat.com>

	 * configure.ac: Bump version to 1.7.3.
		* NEWS: Add 1.7.3 changes.


changeset cf5e5cb5f1cd in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=cf5e5cb5f1cd
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Mar 31 22:49:05 2010 +0100

	Add fix for Ant 1.8.0 -diagnostics.

	2010-03-31 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: Add Ant patch.
		* NEWS: Mention Ant patch.
		* patches/ant-1.8.0.patch: Fix for Ant -diagnostics with Ant
	1.8.0
	http://hg.openjdk.java.net/jdk7/tl/langtools/rev/de6375751eb7


diffstat:

5 files changed, 51 insertions(+), 2 deletions(-)
ChangeLog               |   13 +++++++++++++
Makefile.am             |    3 ++-
NEWS                    |    4 ++++
configure.ac            |    2 +-
patches/ant-1.8.0.patch |   31 +++++++++++++++++++++++++++++++

diffs (88 lines):

diff -r 94084cbf82d3 -r cf5e5cb5f1cd ChangeLog
--- a/ChangeLog	Wed Mar 31 10:37:24 2010 +0200
+++ b/ChangeLog	Wed Mar 31 22:49:05 2010 +0100
@@ -1,3 +1,16 @@ 2010-03-31  Matthias Klose  <doko at ubuntu
+2010-03-31  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am: Add Ant patch.
+	* NEWS: Mention Ant patch.
+	* patches/ant-1.8.0.patch:
+	Fix for Ant -diagnostics with Ant 1.8.0
+	http://hg.openjdk.java.net/jdk7/tl/langtools/rev/de6375751eb7
+
+2010-03-31  Andrew John Hughes  <ahughes at redhat.com>
+
+	* configure.ac: Bump version to 1.7.3.
+	* NEWS: Add 1.7.3 changes.
+
 2010-03-31  Matthias Klose  <doko at ubuntu.com>
 
 	* plugin/icedteanp/IcedTeaNPPlugin.cc (plugin_start_appletviewer):
diff -r 94084cbf82d3 -r cf5e5cb5f1cd Makefile.am
--- a/Makefile.am	Wed Mar 31 10:37:24 2010 +0200
+++ b/Makefile.am	Wed Mar 31 22:49:05 2010 +0100
@@ -331,7 +331,8 @@ ICEDTEA_PATCHES = \
 	patches/security/20100330/6910590.patch \
 	patches/security/20100330/6914823.patch \
 	patches/security/20100330/6914866.patch \
-	patches/security/20100330/6932480.patch
+	patches/security/20100330/6932480.patch \
+	patches/ant-1.8.0.patch
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
diff -r 94084cbf82d3 -r cf5e5cb5f1cd NEWS
--- a/NEWS	Wed Mar 31 10:37:24 2010 +0200
+++ b/NEWS	Wed Mar 31 22:49:05 2010 +0100
@@ -1,3 +1,7 @@ New in release 1.7.2 (2010-03-31):
+New in release 1.7.3 (2010-03-31):
+- Fix for plugin buffer overflow: https://bugzilla.mozilla.org/show_bug.cgi?id=555342
+- Fix issue with ant -diagnostics on ant 1.8.0 due to changed exit code
+
 New in release 1.7.2 (2010-03-31):
 
 - Latest security updates and hardening patches:
diff -r 94084cbf82d3 -r cf5e5cb5f1cd configure.ac
--- a/configure.ac	Wed Mar 31 10:37:24 2010 +0200
+++ b/configure.ac	Wed Mar 31 22:49:05 2010 +0100
@@ -1,4 +1,4 @@ AC_INIT([icedtea6], [1.7.2], [distro-pkg
-AC_INIT([icedtea6], [1.7.2], [distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea6], [1.7.3], [distro-pkg-dev at openjdk.java.net])
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
 AC_CONFIG_FILES([Makefile])
 
diff -r 94084cbf82d3 -r cf5e5cb5f1cd patches/ant-1.8.0.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/ant-1.8.0.patch	Wed Mar 31 22:49:05 2010 +0100
@@ -0,0 +1,31 @@
+
+# HG changeset patch
+# User ohair
+# Date 1269668224 25200
+# Node ID de6375751eb789306126ccfa23a8145bf43af828
+# Parent 65e422bbb9841febf9bfa706322b0870711fe6a0
+6938326: Use of "ant -diagnostics" a problem with ant 1.8.0, exit code 1 now
+Reviewed-by: jjg
+
+--- openjdk.orig/langtools/make/Makefile	Wed Mar 24 17:02:35 2010 -0700
++++ openjdk/langtools/make/Makefile	Fri Mar 26 22:37:04 2010 -0700
+@@ -188,10 +188,16 @@ clobber: clean
+ # All ant targets of interest
+ ANT_TARGETS = build clean sanity post-sanity diagnostics # for now
+ 
++# Create diagnostics log (careful, ant 1.8.0 -diagnostics always does an exit 1)
++$(OUTPUTDIR)/build/ant-diagnostics.log:
++	@mkdir -p $(OUTPUTDIR)/build $(ANT_TMPDIR)
++	@$(RM) $@
++	$(ANT_JAVA_HOME) $(ANT_OPTS) $(ANT) -diagnostics > $@ ; \
++	  $(ANT_JAVA_HOME) $(ANT_OPTS) $(ANT) -version >> $@
++
+ # Create a make target for each
+-$(ANT_TARGETS):
++$(ANT_TARGETS): $(OUTPUTDIR)/build/ant-diagnostics.log
+ 	@ mkdir -p $(OUTPUTDIR)/build $(ANT_TMPDIR)
+-	$(ANT_JAVA_HOME) $(ANT_OPTS) $(ANT) -diagnostics > $(OUTPUTDIR)/build/ant-diagnostics.log
+ 	$(ANT_JAVA_HOME) $(ANT_OPTS) $(ANT) $(ANT_OPTIONS) $@
+ 
+ #-------------------------------------------------------------------
+