# HG changeset patch
# User Andrew John Hughes <gnu_andrew@member.fsf.org>
# Date 1358258830 0
# Node ID e4826de9d75bef6c553adfa930d282f50bdf66ba
# Parent  9cc2d9873b77cdf48b89233785bce0dcabf7922a
G422525: Fix building with PaX enabled kernels.

2013-01-15  Andrew John Hughes  <gnu.andrew@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.

diff -r 9cc2d9873b77 -r e4826de9d75b ChangeLog
--- a/ChangeLog	Tue Jan 15 14:00:43 2013 +0000
+++ b/ChangeLog	Tue Jan 15 14:07:10 2013 +0000
@@ -1,3 +1,14 @@
+2013-01-15  Andrew John Hughes  <gnu.andrew@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@member.fsf.org>
 
 	* Makefile.am:
diff -r 9cc2d9873b77 -r e4826de9d75b Makefile.am
--- a/Makefile.am	Tue Jan 15 14:00:43 2013 +0000
+++ b/Makefile.am	Tue Jan 15 14:07:10 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 e4826de9d75b NEWS
--- a/NEWS	Tue Jan 15 14:00:43 2013 +0000
+++ b/NEWS	Tue Jan 15 14:07:10 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 e4826de9d75b 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 14:07:10 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                           \