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

[andrew at icedtea.classpath.org]

changeset e4826de9d75b in /hg/release/icedtea7-2.2
details: http://icedtea.classpath.org/hg/release/icedtea7-2.2?cmd=changeset;node=e4826de9d75b
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Jan 15 14:07:10 2013 +0000

	G422525: Fix building with PaX enabled kernels.

	2013-01-15  Andrew John Hughes  <gnu.andrew at member.fsf.org>

		* Makefile.am:
		(ICEDTEA_PATCHES): Add patch when building
		with PaX.
		* NEWS: Mention PaX bug fix from Gentoo,
		G422525.
		* patches/pax-mark-rmic-java.patch:
		PaX mark output directory before running just-built
		rmic.


changeset a4e92bc2183a in /hg/release/icedtea7-2.2
details: http://icedtea.classpath.org/hg/release/icedtea7-2.2?cmd=changeset;node=a4e92bc2183a
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Jan 15 14:08:07 2013 +0000

	Bump to 2.2.4.

	2013-01-15  Andrew John Hughes  <gnu.andrew at member.fsf.org>

		* configure.ac: Bump to 2.2.4 proper.


changeset 729585045b3b in /hg/release/icedtea7-2.2
details: http://icedtea.classpath.org/hg/release/icedtea7-2.2?cmd=changeset;node=729585045b3b
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Jan 15 16:56:13 2013 +0000

	Added tag icedtea-2.2.4 for changeset a4e92bc2183a


diffstat:

 .hgtags                          |   1 +
 ChangeLog                        |  15 +++++++++++++++
 Makefile.am                      |   4 +++-
 NEWS                             |   2 ++
 configure.ac                     |   2 +-
 patches/pax-mark-rmic-java.patch |  10 ++++++++++
 6 files changed, 32 insertions(+), 2 deletions(-)

diffs (79 lines):

diff -r 9cc2d9873b77 -r 729585045b3b .hgtags
--- a/.hgtags	Tue Jan 15 14:00:43 2013 +0000
+++ b/.hgtags	Tue Jan 15 16:56:13 2013 +0000
@@ -37,3 +37,4 @@
 3ae81734f023f89f4b69bdfbd0cbd3601003a397 icedtea-2.2.1
 760e7996f6dd1c325b03a024c60747571b7dc899 icedtea-2.2.2
 e0645102f9be06f1d691c4d9033c1b8684b2ad1e icedtea-2.2.3
+a4e92bc2183a7a0e4a1a5f23d8d1f013ed267fe7 icedtea-2.2.4
diff -r 9cc2d9873b77 -r 729585045b3b ChangeLog
--- a/ChangeLog	Tue Jan 15 14:00:43 2013 +0000
+++ b/ChangeLog	Tue Jan 15 16:56:13 2013 +0000
@@ -1,3 +1,18 @@
+2013-01-15  Andrew John Hughes  <gnu.andrew at member.fsf.org>
+
+	* configure.ac: Bump to 2.2.4 proper.
+
+2013-01-15  Andrew John Hughes  <gnu.andrew at member.fsf.org>
+
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Add patch when building
+	with PaX.
+	* NEWS: Mention PaX bug fix from Gentoo,
+	G422525.
+	* patches/pax-mark-rmic-java.patch:
+	PaX mark output directory before running just-built
+	rmic.
+
 2013-01-15  Andrew John Hughes  <gnu_andrew at member.fsf.org>
 
 	* Makefile.am:
diff -r 9cc2d9873b77 -r 729585045b3b Makefile.am
--- a/Makefile.am	Tue Jan 15 14:00:43 2013 +0000
+++ b/Makefile.am	Tue Jan 15 16:56:13 2013 +0000
@@ -277,7 +277,9 @@
 endif
 
 if WITH_PAX
-ICEDTEA_PATCHES += patches/test_gamma.patch
+ICEDTEA_PATCHES += \
+	patches/test_gamma.patch \
+	patches/pax-mark-rmic-java.patch
 endif
 
 ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES)
diff -r 9cc2d9873b77 -r 729585045b3b NEWS
--- a/NEWS	Tue Jan 15 14:00:43 2013 +0000
+++ b/NEWS	Tue Jan 15 16:56:13 2013 +0000
@@ -16,6 +16,8 @@
   - S8004933, CVE-2012-3174: Improve MethodHandle interaction with libraries
   - S8006017, CVE-2013-0422: Improve lookup resolutions
   - S8006125: Update MethodHandles library interactions
+* Bug fixes
+  - G422525: Fix building with PaX enabled kernels.
 
 New in release 2.2.3 (2012-10-17):
 
diff -r 9cc2d9873b77 -r 729585045b3b configure.ac
--- a/configure.ac	Tue Jan 15 14:00:43 2013 +0000
+++ b/configure.ac	Tue Jan 15 16:56:13 2013 +0000
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.2.4pre], [distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea], [2.2.4], [distro-pkg-dev at openjdk.java.net])
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
 AC_CONFIG_FILES([Makefile])
 
diff -r 9cc2d9873b77 -r 729585045b3b patches/pax-mark-rmic-java.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/pax-mark-rmic-java.patch	Tue Jan 15 16:56:13 2013 +0000
@@ -0,0 +1,10 @@
+--- openjdk/jdk/make/com/sun/jmx/Makefile
++++ openjdk/jdk/make/com/sun/jmx/Makefile
+@@ -119,6 +119,7 @@
+ 
+ $(CLASSDESTDIR)/%_Stub.class: $(CLASSDESTDIR)/%.class
+ 	$(prep-target)
++	"$(TOPDIR)"/../../pax-mark-vm "$(OUTPUTDIR)"
+ 	$(RMIC) -classpath "$(CLASSDESTDIR)"    \
+                 -d $(CLASSDESTDIR)              \
+                 -v1.2                           \