Add missing patch

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

3 files changed, 216 insertions, 9 deletions

diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index f7bbe1eda1f5..539ccc7e6b3f 100644
--- a/dev-java/icedtea/ChangeLog
+++ b/dev-java/icedtea/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/icedtea
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.65 2012/02/24 18:43:48 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.66 2012/02/25 06:12:50 sera Exp $
+
+  25 Feb 2012; Ralph Sennhauser <sera@gentoo.org>
+  +files/icedtea-7.2.0_pax_kernel_support.patch:
+  Add missing patch
 
 *icedtea-7.2.1 (24 Feb 2012)
 *icedtea-7.2.0.1 (24 Feb 2012)
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 3831db25dc33..71eb0e4f528a 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -4,6 +4,7 @@ Hash: SHA1
 AUX fontconfig.Gentoo.properties.src 15602 RMD160 d5ae1cb403072b630c126a908d14b5b462e1514f SHA1 04af30bfae3decf6fdb51187a07bf75fb04a83f0 SHA256 d48a9b43d82f45425464e985955f3f3700738a98c0dc97ab7577230ca11fe647
 AUX generate-cacerts.pl 11051 RMD160 9b874c62ffa0afe16353f1e7b32f124f1d31356f SHA1 65e55b84506ecf14711db0996eccf3cfba2fe9e3 SHA256 6ee6fb155e3fa85d0a7e9015b53ebd55948c6599d100fdb69b574b6d11f73433
 AUX icedtea-6_pax_kernel_support.patch 4152 RMD160 a1800e5985d90db6e4827b0bea784cb034962c69 SHA1 625177d004e57cad81d522d1436aaa33dba45a6a SHA256 4a6f3462e9dd47dcc5941dd67a56bbd9ea874dca2a94566f0f38c2d241efeb74
+AUX icedtea-7.2.0_pax_kernel_support.patch 6511 RMD160 ca6ff5d7f8c1157558af28ef631ed4fd5f67f901 SHA1 538bb29bc10978ae14114cfed525c3905e808984 SHA256 4771937bbb89a92fd77dc5e5945231ae511f284fa368648bb7aa34e0fb48ba9e
 AUX icedtea.env 1074 RMD160 6806fd80d619c54f6ab50255c12ee2a9920ad72f SHA1 4ddbddd4464fcf11fad45426ba0430818747249d SHA256 b4ad677dede5c06785db6540d51a9dbe6401e894f03857f5b14dbf6bdf9a33a8
 DIST 0a76e5390e68.tar.gz 128547 RMD160 ea975ce953ec0eb5751ea2aee8d3dc98da6933ff SHA1 9fc523399df6a8736ce540f7d7f0412188eb8b51 SHA256 bb47d452a61ed154fad98fda35f93e6e0f3328632ef2cf0afa1d95cd6264071e
 DIST 0e651e004747.tar.gz 8994812 RMD160 5101219f10cd0e1f61a37169472f0662876420af SHA1 fe21eabdcb334456907df772a269a21fee8f3c19 SHA256 d68455e5cdb14280cd61155a4e9d531e90b073607f4367e93ead0fcf34476ae1
@@ -53,16 +54,16 @@ EBUILD icedtea-7.2.0-r2.ebuild 11502 RMD160 f610645dbe8a6c2828730cf08cc88fcb16c6
 EBUILD icedtea-7.2.0-r3.ebuild 13812 RMD160 07d5d6f9fa70f3a61b009d71c7cb9dce333ffa59 SHA1 e2b173afed251761040c9dc5570f875fd8e98bf8 SHA256 c4c8dcdb805deb035282ffbfc6b53daecf272859013d5d6a909c93779856aa49
 EBUILD icedtea-7.2.0.1.ebuild 11275 RMD160 09a2358884d89f42a2b4f75cfa579c310fed5758 SHA1 d17a4d5fc6816e1910fcb2d3758c843df30a155c SHA256 9dd48d63aeb1c4cf994acf13b5f19654facf16eadb2709bc3bb02798e15235d1
 EBUILD icedtea-7.2.1.ebuild 11494 RMD160 d131e3f2033833824ee78da80b8d96f8b04619b6 SHA1 c50b1a3570de3507fcf44e474d8c9f218dd79a66 SHA256 401c99aeb32ee21518415946f11b5f8ea291d6ca350d1f4bf47b1fb92bdd3104
-MISC ChangeLog 14226 RMD160 d2c9a5982199060746b1d50374aac75a44f7c1f8 SHA1 2433ef55abcee6e9513d6db3918de24dcbd13d4f SHA256 8b82a2e1556f8fab20c85281ff2ed58280bc7c2ab8da7e19bf7953b03c3493e9
+MISC ChangeLog 14346 RMD160 dda411f2d61053dd182b297c621e7bc21c53f442 SHA1 9e6396f97d25a42a9ed13b9adbb9c8e6bdef1560 SHA256 af05443fcdd156e217f718b7d3e463e074523e2cfea3b137b17b8fa032499af6
 MISC metadata.xml 1527 RMD160 f4c3b81c9dbd245fe86bde62f68de8bfdce86247 SHA1 019c890e1dbac991ca55b1cde57a5c21d055d857 SHA256 dea1435f46708be4a8dda218c537c63700bd2def279f7eccae2d80cf49c90c5b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPR9pzAAoJEIUJ+svaV1631FgIAI99jT4QxmNXt6tff9Oyv9+/
-8VIUChJOE5mpdOeOEvW8OaSrYky4aw3q+KDzVD/pjGr7jWP/boQL18+pqSZOmqsa
-w+ICKAASUCfbkoM3ByiUZXU6y25ZRJYWranWtj/QV6Qi2xHcdHyUjCHUPtqfsuq1
-v2FE/u8ZDPjji3+oWMHOTwYd5aiyjP18kKa0abYz2tNDPdUVPA8r72l1dQE2LiwN
-8Q42iiYyV7FJDtTwuy3wlH67CnrZ7HA9vvIg0ZPu07afKsqydIKem2TiK1woot/k
-KXqQYcn39/sDaujAAsBZd0Z4Ee63qH2WvLa1Bjx0e7ESe+hlsDek7brf1uu2DXo=
-=yATr
+iQEcBAEBAgAGBQJPSHv4AAoJEIUJ+svaV163EYAH/0NXRqPaTpw6WspWf6AQXZkI
+g+7kM9/Jqd6DBLQWwvL5gEW1PNXowb08/0Vs/gFvSShF4z2Wjp62yA4tEQsxqs/6
+xafl9T5+O1atOKrrpDzDYGQCst7ZJ8rQ42wtom0Yfgsm+hmmKov1rS/OL6VhbIqb
+BPSqWc0EJ1evoFMaXb/aZURI0VcxIiXX2UCFzuYwOgcTN58LQ6zXczb+SnLYU3Lo
+uEvTEZB2wjMIW7qEW3Y9pev6UTv6abEAO9WDk53HygTg7QMpm/On4awP1FjxQjbf
+IzPS96/EHhztlZA9PbX3qKHHZ3nXGbXsajXNTButLmNQsT467OgHHOz1i+3l5Cc=
+=aIJ2
 -----END PGP SIGNATURE-----
diff --git a/dev-java/icedtea/files/icedtea-7.2.0_pax_kernel_support.patch b/dev-java/icedtea/files/icedtea-7.2.0_pax_kernel_support.patch
new file mode 100644
index 000000000000..2d8f8ce1c15a
--- /dev/null
+++ b/dev-java/icedtea/files/icedtea-7.2.0_pax_kernel_support.patch
@@ -0,0 +1,202 @@
+Author: Ralph Sennhaser <sera@gentoo.org>
+
+The idea is to apply the pax markings before using a freshly built jdk. Be it
+for running tests or building additonal vms or after bootstrap to build the
+final jdk.
+
+There are currently two types of pax markings with the userspace utilities
+chpax and paxctl. Both types of pax marking are base on modifing the ELFs. A
+third type based on xattrs is in development.
+
+The embedded test_gamma.patch is taken from icedtea 2.0 itself.
+
+diff --git a/Makefile.am b/Makefile.am
+index 129edf2..158b149 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -279,6 +279,10 @@ else
+ ICEDTEA_PATCHES += patches/nss-not-enabled-config.patch
+ endif
+ 
++if WITH_PAX
++ICEDTEA_PATCHES += patches/test_gamma.patch
++endif
++
+ ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES)
+ 
+ # Bootstrapping patches
+@@ -300,7 +304,6 @@ ICEDTEA_BOOT_PATCHES = \
+ 	patches/boot/jar.patch \
+ 	patches/boot/symbols.patch \
+ 	patches/boot/tobin.patch \
+-	patches/boot/test_gamma.patch \
+ 	patches/boot/tools.jar.patch \
+ 	patches/boot/jopt.patch \
+ 	patches/boot/jaxp-dependency.patch \
+@@ -320,6 +323,10 @@ ICEDTEA_BOOT_PATCHES = \
+ 	patches/boot/ecj-autoboxing.patch \
+ 	patches/boot/xsltproc.patch
+ 
++if !WITH_PAX
++ICEDTEA_BOOT_PATCHES += patches/boot/test_gamma.patch
++endif
++
+ if CP39408_JAVAH
+ ICEDTEA_BOOT_PATCHES += patches/boot/pr39408.patch
+ endif
+@@ -1612,6 +1619,7 @@ stamps/icedtea.stamp: stamps/bootstrap-directory-symlink-stage2.stamp \
+ 	  $(ICEDTEA_ENV) \
+ 	  -C openjdk/ \
+ 	  $(ICEDTEA_BUILD_TARGET)
++	$(abs_top_builddir)/pax-mark-vm $(BUILD_OUTPUT_DIR)/j2sdk-image
+ 	mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
+ 	mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
+ 	mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext
+@@ -1765,6 +1773,7 @@ stamps/icedtea-boot.stamp: stamps/bootstrap-directory-symlink-stage1.stamp \
+ 	  $(ICEDTEA_ENV_BOOT) \
+ 	  -C openjdk-boot \
+ 	  $(ICEDTEA_BUILD_TARGET)
++	$(abs_top_builddir)/pax-mark-vm $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image
+ 	@echo "Bootstrapped IcedTea is served:" \
+ 	  $(BOOT_BUILD_OUTPUT_DIR)
+ 	mkdir -p stamps
+diff --git a/acinclude.m4 b/acinclude.m4
+index 5310d71..f08f1a9 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -2181,3 +2181,49 @@ rmdir tmp.$$
+ AM_CONDITIONAL([NO_BYTECODE7], test x"${it_cv_bytecode7}" = "xyes")
+ AC_PROVIDE([$0])dnl
+ ])
++
++AC_DEFUN_ONCE([IT_WITH_PAX],
++[
++  AC_MSG_CHECKING([for pax utility to use])
++  AC_ARG_WITH([pax],
++              [AS_HELP_STRING(--with-pax=COMMAND,the command used for pax marking)],
++  [
++    PAX_COMMAND=${withval}
++    if test "x${PAX_COMMAND}" = "xno"; then
++      PAX_COMMAND="not specified"
++    fi
++  ],
++  [ 
++    PAX_COMMAND="not specified"
++  ])
++  case "x${PAX_COMMAND}" in
++    xchpax)
++      case "${host_cpu}" in
++        i?86)
++          PAX_COMMAND_ARGS="-msp"
++          ;;
++        *)
++          PAX_COMMAND_ARGS="-m"
++          ;;
++      esac
++      ;;
++    xpaxctl)
++      case "${host_cpu}" in
++        i?86)
++          PAX_COMMAND_ARGS="-msp"
++          ;;
++        *)
++          PAX_COMMAND_ARGS="-m"
++          ;;
++      esac
++      ;;
++    *)
++      PAX_COMMAND="not specified"
++      PAX_COMMAND_ARGS="not specified"
++      ;;
++  esac
++  AM_CONDITIONAL(WITH_PAX, test "x${PAX_COMMAND}" != "xnot specified")
++  AC_MSG_RESULT(${PAX_COMMAND})
++  AC_SUBST(PAX_COMMAND)
++  AC_SUBST(PAX_COMMAND_ARGS)
++])
+diff --git a/configure.ac b/configure.ac
+index e0b866b..7c665ef 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -146,6 +146,9 @@ IT_WITH_PROJECT
+ IT_ENABLE_HG
+ IT_WITH_TZDATA_DIR
+ 
++IT_WITH_PAX
++AC_CONFIG_FILES([pax-mark-vm], [chmod +x pax-mark-vm])
++
+ AC_PATH_TOOL([HG],[hg])
+ if test "x${enable_hg}" = "xyes"; then
+   if test "x${HG}" = x; then
+diff --git a/patches/test_gamma.patch b/patches/test_gamma.patch
+new file mode 100644
+index 0000000..7e8d3d6
+--- /dev/null
++++ b/patches/test_gamma.patch
+@@ -0,0 +1,47 @@
++diff -Nru ../openjdk.orig/openjdk/hotspot/make/linux/Makefile openjdk/hotspot/make/linux/Makefile
++--- ../openjdk.orig/openjdk/hotspot/make/linux/Makefile	2009-10-30 17:37:07.000000000 +0000
+++++ openjdk/hotspot/make/linux/Makefile	2009-10-30 17:45:40.000000000 +0000
++@@ -287,42 +287,36 @@
++ 
++ $(TARGETS_C2):  $(SUBDIRS_C2)
++ 	cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS)
++-	cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && ./test_gamma
++ ifdef INSTALL
++ 	cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) install
++ endif
++ 
++ $(TARGETS_TIERED):  $(SUBDIRS_TIERED)
++ 	cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS)
++-	cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && ./test_gamma
++ ifdef INSTALL
++ 	cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) install
++ endif
++ 
++ $(TARGETS_C1):  $(SUBDIRS_C1)
++ 	cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS)
++-	cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && ./test_gamma
++ ifdef INSTALL
++ 	cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) install
++ endif
++ 
++ $(TARGETS_CORE):  $(SUBDIRS_CORE)
++ 	cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS)
++-	cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && ./test_gamma
++ ifdef INSTALL
++ 	cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install
++ endif
++ 
++ $(TARGETS_ZERO):  $(SUBDIRS_ZERO)
++ 	cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS)
++-	cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && ./test_gamma
++ ifdef INSTALL
++ 	cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) install
++ endif
++ 
++ $(TARGETS_SHARK):  $(SUBDIRS_SHARK)
++    cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS)
++-   cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && ./test_gamma
++ ifdef INSTALL
++    cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) install
++ endif
++ 
+diff --git a/pax-mark-vm.in b/pax-mark-vm.in
+new file mode 100644
+index 0000000..118bb61
+--- /dev/null
++++ b/pax-mark-vm.in
+@@ -0,0 +1,13 @@
++#!/bin/sh
++
++# Taken from Gentoo's pax-utils.eclass
++list_paxables() {
++	file "$@" 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//'
++}
++
++if test "@PAX_COMMAND@" != "not specified"; then
++	for paxable in `list_paxables "${1}"/bin/* "${1}"/jre/bin/*`; do
++		echo "PaX mark @PAX_COMMAND_ARGS@ ${paxable}"
++		@PAX_COMMAND@ @PAX_COMMAND_ARGS@ "${paxable}"
++	done
++fi