commit: 5605706f987f9a38efccc128c36408d8cda42db5 Author: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org> AuthorDate: Wed Jul 8 19:24:12 2015 +0000 Commit: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org> CommitDate: Wed Jul 8 19:24:12 2015 +0000 URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=5605706f
Fix executable stack on JamVM. Package-Manager: portage-2.2.17 Manifest-Sign-Key: 35964222 dev-java/jamvm/ChangeLog | 4 +++ dev-java/jamvm/Manifest | 11 ++++---- dev-java/jamvm/files/noexecstack.patch | 48 ++++++++++++++++++++++++++++++++++ dev-java/jamvm/jamvm-2.0.0-r1.ebuild | 1 + 4 files changed, 59 insertions(+), 5 deletions(-) diff --git a/dev-java/jamvm/ChangeLog b/dev-java/jamvm/ChangeLog index 51118ed..4e972b6 100644 --- a/dev-java/jamvm/ChangeLog +++ b/dev-java/jamvm/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/dev-java/jamvm/ChangeLog,v 1.53 2014/08/10 20:16:11 slyfox Exp $ + 08 Jul 2015; Andrew John Hughes <[email protected]> + +files/noexecstack.patch, jamvm-2.0.0-r1.ebuild: + Fix executable stack on JamVM. + *jamvm-2.0.0-r1 (08 Jul 2015) 08 Jul 2015; Andrew John Hughes <[email protected]> +files/javac.in, diff --git a/dev-java/jamvm/Manifest b/dev-java/jamvm/Manifest index 93f76ea..5f5dcc2 100644 --- a/dev-java/jamvm/Manifest +++ b/dev-java/jamvm/Manifest @@ -4,14 +4,15 @@ Hash: SHA256 AUX classes-location.patch 1276 SHA256 98ecad3eeb0623b3dc01155c9cbd9aacf31e5d5854b183a7be11b64bfdd838a6 SHA512 c399cb8ebce0556a778a1511fec43eeedc2e8d4b1ca732ebd201faf49d6a607baef914fb54e34f2c5b494ace6f5c072d296fb30c65038461e97a518c9e1924bd WHIRLPOOL 91d9c75a260f6f5943d1221bfba77032fc1ce1f8d85217ec4a80aa50b826f36816aa4fe0e1a2ae7cb27c171ec029d8ee3ad512a506c1d31e02276a02b1858e42 AUX jamvm.env 557 SHA256 c8185ae5da1d7313874d74f7af9a9f43f24456916733e11ad8f2e5b37acb85d7 SHA512 cd2390afa41c5c82a6848b1f033936211675b1235a82b9af59a10588c5eeff6b07e35594811d3e913098319dccd342f36887c1318744cbc2cef2472c433b48cb WHIRLPOOL 706986f259343d12ca2007dcfd62ced48eca458d48324f855b038a9b26cac6855891bf57f89459adad590e8175f29f8ff471b7f57ad811c365ce1984510d2ced AUX javac.in 1739 SHA256 3bb23cff0a6e5a7a820e19cce4b9b0f51a7b84ee9e0eeb048b463a5f3e996db0 SHA512 65170b747012e114b072cd28a688089cdf2f54ddd151ba0cea92241b9b75fd0c7c410bfa4186cf9d233af4328bf962e13e8838a0cc09a1fbf2c28d29b13e36cb WHIRLPOOL 2237edd6abffdfb762d178e611768396f0b93a38f8a70f83c986049b60e26bb7084e3a38b70ed29c09df739091cdbfbfdd688e5eccee6ca4ea4006c23cf2b7d8 +AUX noexecstack.patch 1387 SHA256 6a6028e55532ba3debf1f170790cc609b0bbd0cfe7fd7b5a14f4513e6b46873b SHA512 17c38ad0017e5659295dea7ed57f263eb0eee673bbc1f5d1e44e0c8fe588f4172a8a05c832a1fd41f3dc094779fade66aa710c8ce48c754412b0b6afdea6551a WHIRLPOOL e06573fa48c98c29ae1f53ce19b511f21ee594d32c840a4649d3a6df7754e594e729551429610c4d04d5dc97aa42678a35e68fb17709125e60ae2c53c51c9fd4 DIST jamvm-2.0.0.tar.gz 741459 SHA256 76428e96df0ae9dd964c7a7c74c1e9a837e2f312c39e9a357fa8178f7eff80da SHA512 8ac27787ee94fa8fde962635d3c08d1dc1e5244c9d56bb693e73f3fd9b58e944ad3f7a0127afeed727d7c00d904a775d2c483157f5ac87e7eab6ecade1aad21d WHIRLPOOL 7e80be683fafb444cd417502b96089ce4f6879a049ca49e33691b4d5d6755814654ab4ed7626b666dd48f9d6101567b2a12de43b916055ea1d067c5d4df06443 -EBUILD jamvm-2.0.0-r1.ebuild 3638 SHA256 eb50d4ffd77ba4530ec5db91b7781f94ca20f6578c0dd39723e33505c5553a5c SHA512 2725c9a8c881c15be5c7a4b9c66e55f0ecd81403b7755c5edaa42241552a0d40202212a771b004c100a7f18f00d44ac1cc6061300b5b1e44428c353bcb3a0eec WHIRLPOOL ebecc34e5569e707a3af7857cbbd1f7aacdeb05320c3f61a008047a0dd26286056a4657f7c8777d9191f8051bf0872eea070db83240ca763e50cd659d1a94f4e -MISC ChangeLog 7914 SHA256 4b8d70ebea77b97dbb49677123aa859e82db4c8c62d79c3c1bfc07eed966c457 SHA512 dda1f1208eef826f97750cd6394e454622093e9da5a3dee4943256a6ac61cd226fb3906858e01fe0ab19b8a495a6540c0229feaf5c353cfcccc8cbb3c21009d0 WHIRLPOOL 5a0da761b104c9cf717843a4ae8db72ba43f3d1ba1ef88b3e115ae9a71521908377dec0735012da05927ef715bcd0483ccf0649e889dcfa39cd4e45be8588e6f +EBUILD jamvm-2.0.0-r1.ebuild 3678 SHA256 59115d5dfac85c6d13f46b4f0a9d40bfa742f017ede85bc1ebb12c18329bd3d1 SHA512 6de21870914c7f9381239b8139e23af24045e8660c708ae03f2f858b53fd3c30b39b5565b09ad623ca06f4746e1a7a3535bffd93f6417ec89a723cffef892185 WHIRLPOOL bc6c98958d34dd2cb40b918ab1ddf29e032a84681253d806b1b7aa1294c920377ce81cf18457bb8d1b46bc4727128903ff161243999c73a398847d36992a7b85 +MISC ChangeLog 8061 SHA256 85980b000e428b82af2b8628a6a19ac75e54edb9a6f7861209ad51e0d9f258c8 SHA512 a8169dd06ff1c4fea02d71de71671c084fbe6e168952639fb81e61f98463e923098ff48f93f4bb159fc13da752b6534e549d1d2970a1feed630a09c306939c5c WHIRLPOOL 6f11eac52d7ec2d6f12584b4433aa6ff37cedd5a681af56825592752943b4c0e5b1174663438b94f1db8bd10403b11f5b3b92f193926f07c3eafecf8bf109c95 MISC metadata.xml 159 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb SHA512 74dc9ada199a90543b8e1c168c7054f2e973fbfa2551e2b959d67501f2538e269cfb4b2f0905a88a1afa04c20b33961336310ba876f80d47c8e7615b2d7c830a WHIRLPOOL a0ac49efeca233ec4d8f63eb69c8e46e1d4ecbd926693c25b1b8c7415e4c565680936aec46f0c4197116fd7a19a3bb571beee493c18bdae1e5e978e3db84f17a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iF4EARYIAAYFAlWdd7cACgkQz9oPmzWWQiKk5wEApG/PTylRLGExVrBfAmOh0mMU -f/S5VAdIjlr1FPtA0XUA/3hK6D80/enHZFOIMAZo6fzwHx9NeIS8DTFOyiBMLT0D -=oUeK +iF4EARYIAAYFAlWdeNsACgkQz9oPmzWWQiLoVAD8CvMKmJmxFNHv7dR494aOZLfO +imNBTFaC++3aRvcCXcYBAPDG8cyRipZ14l+QvhDmQ7VaRWJuX3wJzmJMri82hnkL +=HAtl -----END PGP SIGNATURE----- diff --git a/dev-java/jamvm/files/noexecstack.patch b/dev-java/jamvm/files/noexecstack.patch new file mode 100644 index 0000000..2a0f14c --- /dev/null +++ b/dev-java/jamvm/files/noexecstack.patch @@ -0,0 +1,48 @@ +diff --git a/src/os/linux/arm/callNative.S b/src/os/linux/arm/callNative.S +index 245afd1..1583023 100644 +--- a/src/os/linux/arm/callNative.S ++++ b/src/os/linux/arm/callNative.S +@@ -36,3 +36,7 @@ + #include "callNativeOABI.S" + #endif + #endif ++ ++#if defined(__linux__) && defined(__ELF__) ++.section .note.GNU-stack,"",%progbits ++#endif +diff --git a/src/os/linux/mips/callNative.S b/src/os/linux/mips/callNative.S +index cede343..90d9163 100644 +--- a/src/os/linux/mips/callNative.S ++++ b/src/os/linux/mips/callNative.S +@@ -184,3 +184,7 @@ return: + j $31 + .end callJNIMethod + #endif ++ ++#if defined(__linux__) && defined(__ELF__) ++.section .note.GNU-stack,"",%progbits ++#endif +diff --git a/src/os/linux/powerpc/callNative.S b/src/os/linux/powerpc/callNative.S +index aa47f6a..763dc0a 100644 +--- a/src/os/linux/powerpc/callNative.S ++++ b/src/os/linux/powerpc/callNative.S +@@ -281,3 +281,7 @@ return: + mr 1,11 + blr + #endif ++ ++#if defined(__linux__) && defined(__ELF__) ++.section .note.GNU-stack,"",%progbits ++#endif +diff --git a/src/os/linux/x86_64/callNative.S b/src/os/linux/x86_64/callNative.S +index 26404e6..9fb5cdf 100644 +--- a/src/os/linux/x86_64/callNative.S ++++ b/src/os/linux/x86_64/callNative.S +@@ -267,3 +267,7 @@ float_ret: + addq $8, %rcx + jmp return + #endif ++ ++#if defined(__linux__) && defined(__ELF__) ++.section .note.GNU-stack,"",%progbits ++#endif diff --git a/dev-java/jamvm/jamvm-2.0.0-r1.ebuild b/dev-java/jamvm/jamvm-2.0.0-r1.ebuild index 0d8d443..ab0ebab 100644 --- a/dev-java/jamvm/jamvm-2.0.0-r1.ebuild +++ b/dev-java/jamvm/jamvm-2.0.0-r1.ebuild @@ -24,6 +24,7 @@ RDEPEND="${DEPEND}" src_prepare() { # without this patch, classes.zip is not found at runtime epatch "${FILESDIR}/classes-location.patch" + epatch "${FILESDIR}/noexecstack.patch" eautoreconf # These come precompiled.
