Fix a) paxmarkings on installer and b) RWX GNU STACK on libstl.so

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

diff --git a/dev-lang/ekopath/ChangeLog b/dev-lang/ekopath/ChangeLog
index ceaf39b62566a90c3d2502c932d10a36f2e2ed6f..1e35e7c883217a7eb96f0852d9a67d71da9810b5 100644 (file)
--- a/dev-lang/ekopath/ChangeLog
+++ b/dev-lang/ekopath/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/ekopath
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ekopath/ChangeLog,v 1.4 2011/07/31 08:04:04 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ekopath/ChangeLog,v 1.5 2011/08/03 14:00:24 blueness Exp $
+
+  03 Aug 2011; Anthony G. Basile <blueness@gentoo.org>
+  ekopath-4.0.10_pre20110728.ebuild:
+  Fix a) paxmarkings on installer and b) RWX GNU STACK on libstl.so
+  This is for pax enabled kernels, but tested and safe on vanilla.
 
 *ekopath-4.0.10_pre20110728 (31 Jul 2011)
 

diff --git a/dev-lang/ekopath/Manifest b/dev-lang/ekopath/Manifest
index 66c4b44d9fc2840b471ce6b891af9aeae7b753aa..8282b5ce48c361547f199d1a46fbcedf0a17dc0f 100644 (file)
--- a/dev-lang/ekopath/Manifest
+++ b/dev-lang/ekopath/Manifest
@@ -4,15 +4,13 @@ Hash: SHA256
 DIST ekopath-4.0.10_pre20110717.run 35461851 RMD160 fde252cfcf50a7716cdf6b9088dbc5f173be5a64 SHA1 3240775874c0f8709a27e74354478dcaa03036d5 SHA256 55f2f2c63a4fddc056030e945ff91ecea392ef1acc2f806ea2c7ebba6b805602
 DIST ekopath-4.0.10_pre20110728.run 38656910 RMD160 838e285068bcedbae60296126024ac74b3ae86fa SHA1 2e0f05565d2b45e65ca0fe0b14ff57b0d63e3dd0 SHA256 d77046cf0b1ad2f9f633b3278b2d85d69867ddcfa386bbc5c9555a8aa12e466b
 EBUILD ekopath-4.0.10_pre20110717-r1.ebuild 1632 RMD160 d00c0f07363f4323878fd6854f8ecb19b2510191 SHA1 00331f0522d6be08083c93c21d1517d2d4dfca43 SHA256 1132031993df232bc44a3281eec46ffb658af750b39194b438ff35b6450b8ce4
-EBUILD ekopath-4.0.10_pre20110728.ebuild 1629 RMD160 0b9fc95ef9ebca95f1b381db3dc6770054fcd05b SHA1 3afd0e0e11203f5cf7a774e0176413c205e4c033 SHA256 3e548a5369742ce87a721e1f49e2027f2c7a2ca96fe4095de8c0db9d703ffde0
-MISC ChangeLog 1592 RMD160 0045b4dc6fc543912464e577e191b128b815dafd SHA1 14dd6195f883ac9391e1ee59fa6a4c462d871280 SHA256 bceba28bac629a149869c271677b929b6ea70a66f0bbc1ad2aff3fc0dbefef03
+EBUILD ekopath-4.0.10_pre20110728.ebuild 2186 RMD160 2026e736c428af38023db7940b0f50a6fc813198 SHA1 5fcbd54a8fb864dfa7494e5ddcddd05047d5a598 SHA256 f5dc25869a85ab5b10604c092bdf6ffb696e7c86e69a783c4bf756b38218e7cc
+MISC ChangeLog 1818 RMD160 c1f261a6ce5e97f9e0084eb8c54f40c552bb2bf9 SHA1 e5655e77cd5f05785b04b47076894f7dbf3632e2 SHA256 34a5bee5b019f1ffcd94d13ab05a061d9717d7b3d884b580eca8c0d53f909ea6
 MISC metadata.xml 595 RMD160 0511b409a0d8423fabc6cb3f70c34a2138a7cb6b SHA1 daab1fb73ebf67abf36f1131014d0bd1ea7bd0d7 SHA256 18598a62f173c7cbe97b0c970c180e6202d17075d1455bafd8aab4c39ab8d45d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk41DIAACgkQIiMqcbOVdxTZ3gP/QhJKFwkFFTwc0o29qBKyd6zI
-HHfj96iZsWcep89SNaI/WUIGEhHyfpIyDhdkoVZWklej0ieLB6IBmd23SN45UjYF
-7G/TDh12bjMUBchWl+fih7yr2o3XMLhKXxqo4o68i4zx29Q0R6aPQUDg02c5B7uo
-q9XGGhVZRZYeuCZc7oY=
-=w0IC
+iEYEAREIAAYFAk45VIIACgkQl5yvQNBFVTXXfACfRzDvtip+2tnZ7EI1SlwKUw4w
+5EAAoIeBj5yyGRTe8/FPGI+nj11urkXS
+=5qV7
 -----END PGP SIGNATURE-----

diff --git a/dev-lang/ekopath/ekopath-4.0.10_pre20110728.ebuild b/dev-lang/ekopath/ekopath-4.0.10_pre20110728.ebuild
index 17d3cc49abb20fd8f8b0974c1d606ea070230865..fe9fa1d74021d279193c7a15f730b43f3346f803 100644 (file)
--- a/dev-lang/ekopath/ekopath-4.0.10_pre20110728.ebuild
+++ b/dev-lang/ekopath/ekopath-4.0.10_pre20110728.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/ekopath/ekopath-4.0.10_pre20110728.ebuild,v 1.1 2011/07/31 08:04:04 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ekopath/ekopath-4.0.10_pre20110728.ebuild,v 1.2 2011/08/03 14:00:25 blueness Exp $
 
 EAPI=4
 
@@ -58,9 +58,21 @@ src_prepare() {
 }
 
 src_install() {
+       # You must paxmark -m EI_PAX (not PT_PAX) to run the installer
+       # on a pax enabled kernel.  Adding PT_PAX breaks the binary.
+       /usr/bin/scanelf -Xxz m ${P}.run >> /dev/null
+
        ./${P}.run \
                --prefix "${D}/opt/${PN}" \
                --mode unattended || die
+
+       # This is a temporary/partial fix to remove a RWX GNU STACK header
+       # from libstl.so.  It still leaves libstl.a in bad shape.
+       # The correct fix is in the assembly atomic-cxx.S, which we don't get
+       #   See http://www.gentoo.org/proj/en/hardened/gnu-stack.xml
+       #   Section 6.  How to fix the stack (in practice)
+       /usr/bin/scanelf -Xe "${D}/opt/ekopath/lib/4.0.11/x8664/64/libstl.so"
+
        rm -rf "${D}"/opt/${PN}/uninstall || die
        doenvd "99${PN}"
 }