From dcef721a8b69340d66fda31d7dbb7edbf3e43f87 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 23 Aug 2011 18:08:05 +0000 Subject: [PATCH] QA: Fixed executable stack in AdjustorAsm.o Package-Manager: portage-2.1.10.11/cvs/Linux x86_64 --- dev-lang/ghc/ChangeLog | 6 ++++- dev-lang/ghc/Manifest | 11 ++++---- dev-lang/ghc/files/ghc-7.0.4-nxstack.patch | 31 ++++++++++++++++++++++ dev-lang/ghc/ghc-7.0.4.ebuild | 3 ++- 4 files changed, 44 insertions(+), 7 deletions(-) create mode 100644 dev-lang/ghc/files/ghc-7.0.4-nxstack.patch diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog index 9ba3c216fc70..ac75d80da78b 100644 --- a/dev-lang/ghc/ChangeLog +++ b/dev-lang/ghc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/ghc # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.208 2011/08/23 17:40:45 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.209 2011/08/23 18:08:05 slyfox Exp $ + + 23 Aug 2011; Sergei Trofimovich ghc-7.0.4.ebuild, + +files/ghc-7.0.4-nxstack.patch: + QA: Fixed executable stack in AdjustorAsm.o 23 Aug 2011; Sergei Trofimovich ghc-7.0.4.ebuild: Once again USE=unicode for ncurses is a required depend (bug #380241 by diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest index 458a30e56535..198923324274 100644 --- a/dev-lang/ghc/Manifest +++ b/dev-lang/ghc/Manifest @@ -29,6 +29,7 @@ AUX ghc-7.0.2-CHOST.patch 3027 RMD160 c33e8ab30ffba0e930772784144f7891072e88c3 S AUX ghc-7.0.4-CHOST-prefix.patch 272 RMD160 740e2bb11688261865d9d5bc3f16c0d37f38ab21 SHA1 746515ea3c023ce5aa91df87b3592dbdc8d28202 SHA256 83942dfcbe1968c7f5e0ae09e4d84d77d85778839814fca1689e168cad3a4f66 AUX ghc-7.0.4-CHOST-softfloat.patch 371 RMD160 91988c43d3ec589a49707979eb8c6d785eb39c11 SHA1 df27b850c7fe5ea60cdabdc84df22ee5ab711118 SHA256 90e04c7d56612d24920a1801865b8e53f6ac1e291a11a6219f939117613e5976 AUX ghc-7.0.4-darwin8.patch 486 RMD160 475b8276380291d6c88866fc021fc33c795f28d9 SHA1 1c10dda546a339bb206e3d7047314c7b377d9254 SHA256 b0857679f29aab3719df5538a2f104924cf5df913927a2748be3f77d2c8ea481 +AUX ghc-7.0.4-nxstack.patch 984 RMD160 e475ccc5cc6e06bb736ebb84c72135bc94434d99 SHA1 3cafa50092d0607728999c93225aa4dd67b4a451 SHA256 325f00f12922edaf54e6df56acc7743e40234c53e2f341b9a28e4fe22fb4569f AUX ghc-apply-gmp-hack 2585 RMD160 1246e8fc40bbbb28f52f755457feca97bf3e22cc SHA1 63a7999b829548f82bcdcc4da869956abe2890bf SHA256 0d3c9e52be232734c916e9765fae770225ad6fb04c0948780867450401ff1eed AUX ghc-bash-completion 6496 RMD160 61574aab2f8ed4ae906df5ac291f528384b79b87 SHA1 a0d7c264cc8ff3d235511e151dc82f9e16691bac SHA256 82a862bea2c9248e06fcf74d307de07b05a55f9eb95f412762bd02e53fece822 DIST ghc-6.10.1-i386-apple-darwin.tar.bz2 97910484 RMD160 3764303b9c9161905b5c0e2e4000cfe0fceea85c SHA1 299a829981db533cbab71426051cf924f4a6cdd7 SHA256 b806bf9c163314c3aac389df1cf5f30e31d3557baa0eabce9279f6ef58305d51 @@ -61,13 +62,13 @@ DIST ghc-bin-7.0.4-x86.tbz2 81814964 RMD160 c901d8b58679d243fa0e77ac7b8d0b6c63fc EBUILD ghc-6.10.4-r1.ebuild 13011 RMD160 4feb3ad764af5ad16b3dd5a000d49755c8b91c2a SHA1 c8eb3181598c05053e1f27b5fdb2a3a4264377b1 SHA256 f8c163192a9c5a62158bbb5698cef9872fa0e64956689aeafb3f90c8c9670b0a EBUILD ghc-6.12.3-r2.ebuild 20515 RMD160 6db339fd7d94a8db5d8cd30730037151855bbaf9 SHA1 be6f59c823756aab0ce6c8e492469855b6d04cde SHA256 2a14fff51f910460049540a77e006e0978e7f623907b273bacf779c88d418694 EBUILD ghc-6.12.3.ebuild 15063 RMD160 6476ac66f125ad0d2c13351a73e560b1df67c822 SHA1 15d9cd33ba4bb23b31d8a03111d31d4bd1bfe603 SHA256 f968048385c848f60007ea9bca2598c7d26a06a02945557b912dd587636d3ece -EBUILD ghc-7.0.4.ebuild 19922 RMD160 04c43cd5afa295cdb6efdbb993fa3a5c25ff75a5 SHA1 3fc67814f5e8d73bedbe2a18fc83a110fbfa677d SHA256 8d1246723291595ee4e02b872f2adb3a681750cd45150ab5df2872a8f9ebf805 -MISC ChangeLog 38518 RMD160 807b347a4ce39723edaa532dc8d89b13f57748d5 SHA1 fa29827c86228561b6d279037b17cf4192211c60 SHA256 b694a77f8d1b9cc42989372fcf4b9e0e7b8954ce8c050a316d95086271f488c9 +EBUILD ghc-7.0.4.ebuild 19971 RMD160 0c5427d6b7ca7ca6c390bc3b0134b8fbf7e4f337 SHA1 d04b9475b3e1518b9e728b28ff8251c6c1f85449 SHA256 e526024a54937f560ee7e9a2d26b0189021687475334f1a7276f49a40e5064ef +MISC ChangeLog 38671 RMD160 7954dc4d928bb248b059ddc0c6450140e6ec7987 SHA1 f9d26f62d17215372770ae113fa578f0c0bb5f72 SHA256 23aa6c8736e61aaba18071d816d2c34b6d213b7edd50d6bab97621556eadafda MISC metadata.xml 511 RMD160 79a995fb7989ead0e2a1aaae42a015a34864e2ff SHA1 a7222153de1350459b28c0be825beeb13c0aa16e SHA256 4474d6b9638e6b78e16025c88b5455fa353ca723c05ce80aa3f8b426149ec1dd -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk5T5uwACgkQcaHudmEf86oLtgCcCqkPd6k8ppTjP8lPNN6jQxZj -jP8An2DzWiroFdDYJJ02kUALdLlN2zhh -=Q7Pp +iEYEARECAAYFAk5T7VQACgkQcaHudmEf86qOGQCghDscPe8FixZdkr7/WKm6rUFI +pMUAn3kCo7ZvnvjU+S2NxLWmMof4cbOk +=OCUi -----END PGP SIGNATURE----- diff --git a/dev-lang/ghc/files/ghc-7.0.4-nxstack.patch b/dev-lang/ghc/files/ghc-7.0.4-nxstack.patch new file mode 100644 index 000000000000..791e8defb90a --- /dev/null +++ b/dev-lang/ghc/files/ghc-7.0.4-nxstack.patch @@ -0,0 +1,31 @@ +From 25bf3687361501e711d50a8038f0f8de4a2d2aa3 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Wed, 10 Aug 2011 11:01:26 +0300 +Subject: [PATCH] Mark stack of 'rts/AdjustorAsm.S' as nonexecutable on linux + +Gentoo's scanelf program found executable stack in many resulting binaries: +* RWX --- --- home/prefix/gentoo/usr/lib/ghc-7.2.1/ghc +* !WX --- --- home/prefix/gentoo/usr/lib/ghc-7.2.1/libHSrts.a:AdjustorAsm.o + +More info can be found here: http://www.gentoo.org/proj/en/hardened/gnu-stack.xml + +Signed-off-by: Sergei Trofimovich +--- + rts/AdjustorAsm.S | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/rts/AdjustorAsm.S b/rts/AdjustorAsm.S +index 75b83f6..8045bfe 100644 +--- a/rts/AdjustorAsm.S ++++ b/rts/AdjustorAsm.S +@@ -192,3 +192,7 @@ adjustorCode: + ret + #endif + ++/* mark stack as nonexecutable */ ++#if defined(__linux__) && defined(__ELF__) ++.section .note.GNU-stack,"",@progbits ++#endif +-- +1.7.3.4 + diff --git a/dev-lang/ghc/ghc-7.0.4.ebuild b/dev-lang/ghc/ghc-7.0.4.ebuild index 48a7dfe4af0c..601dc1cdf4ad 100644 --- a/dev-lang/ghc/ghc-7.0.4.ebuild +++ b/dev-lang/ghc/ghc-7.0.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.0.4.ebuild,v 1.2 2011/08/23 17:40:45 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.0.4.ebuild,v 1.3 2011/08/23 18:08:05 slyfox Exp $ # Brief explanation of the bootstrap logic: # @@ -363,6 +363,7 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-7.0.4-darwin8.patch epatch "${FILESDIR}"/${PN}-6.12.3-mach-o-relocation-limit.patch + epatch "${FILESDIR}"/${PN}-7.0.4-nxstack.patch if use prefix; then # Make configure find docbook-xsl-stylesheets from Prefix -- 2.26.2