Bump patch to sbcl-1.1.17-gentoo-fix_nopie_for_hardened_toolchain.patch to change _ to - in the filename sbcl-1.1.17/src/runtime/Config.x86-64-linux

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x618E971F

4 files changed, 34 insertions, 27 deletions

diff --git a/dev-lisp/sbcl/ChangeLog b/dev-lisp/sbcl/ChangeLog
index d84af6ebfe4f..3341f3bd0ace 100644
--- a/dev-lisp/sbcl/ChangeLog
+++ b/dev-lisp/sbcl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lisp/sbcl
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/ChangeLog,v 1.202 2014/04/28 03:15:51 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/ChangeLog,v 1.203 2014/04/28 06:35:54 gienah Exp $
+
+  28 Apr 2014; Mark Wright <gienah@gentoo.org>
+  +files/sbcl-1.1.17-gentoo-fix_nopie_for_hardened_toolchain.patch,
+  sbcl-1.1.17.ebuild:
+  Bump patch to sbcl-1.1.17-gentoo-fix_nopie_for_hardened_toolchain.patch to
+  change _ to - in the filename sbcl-1.1.17/src/runtime/Config.x86-64-linux
 
 *sbcl-1.1.17 (28 Apr 2014)
 
diff --git a/dev-lisp/sbcl/Manifest b/dev-lisp/sbcl/Manifest
index 4c4633727823..503f548aba8f 100644
--- a/dev-lisp/sbcl/Manifest
+++ b/dev-lisp/sbcl/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX bsd-sockets-test.patch 748 SHA256 e23fff91524c4a5c12e5e6b088c9b9785ea86854690583b44118f4ed56fa423d SHA512 d46e08c92d8bf98095762b1a8601c9f9292ea41f55f0089f7fd150977b9cacdf7edd9340fab4242a9c100d7023bd7f12e4dd492c435bbdb2d849a6aba6907e42 WHIRLPOOL 435ac6780f8412fe982acc75902e577f9ff266ce05b14f629e70492a115f1bba5e84d9787fff9a595a549b7fb4e275bdfbd4a5c6701872d9641383663aceb6c7
 AUX concurrency-test.patch 924 SHA256 363aa5f82c4c238df4459deb345d63185c7a3bc557880831d628753af8b48a13 SHA512 831860e23a430959de1833c542cee546d68d62cdb7ca10a45f338b35cf37b4521036eb721ac5a06747ab2f018b3fea7b47d5a25f1f52d669e41ea17716698462 WHIRLPOOL f55031d3b0483d942fa3267dc2f6c51227bc65d3e461b8bc70bc1b2fae694f8e5e82ed1bef53daf6ef4ace6bd6e56866ffbc4713f315c049419d1aca9d9c9a28
 AUX gentoo-fix_install_man.patch 399 SHA256 7e3e3f84be6d4dae51953825daaf26d8fe1482fd2f4e9d017297dd8ef55ebe47 SHA512 bc5118ddf2fd851dcabf773cc7443fa0d3f5a5b83715173110f9164c631faaf8c2d6b247f7ac205da23bb388ff459eba228deeaa2a45202870b7f97376564030 WHIRLPOOL abc43631045e56b9d373c3966eb1d2f5575d258db239e6f1f9a2247492fcb0aab8d000ece39c504aeec5462f7e0ce7e6efc3a215e5776fa64d460b20c0f52a21
@@ -8,6 +5,7 @@ AUX gentoo-fix_linux-os-c.patch 418 SHA256 50b310b3d72b380b91828730a5539638decb6
 AUX gentoo-fix_nopie_for_hardened_toolchain.patch 1122 SHA256 80cdbc63648c2ea84bb4cd33815b7332bdca9a6101caab130705f0ef2bc078a4 SHA512 95dd9f7ccfc7ce274d84f71b1a2ab3ffb39dd5d8000ff52d9b154a0e5d7bb2cc7eea394c05adbcf050073becfe789d94abed72ce56bc494a64199e9e7cb9c7d1 WHIRLPOOL 45bb11865fbbd95f3fda806e339cf3097168732dcbc5e2f23770a49a8e7415a14262c1a9c217c4b431ffb247f74776956447d9494e2a7be35ca60928a788da99
 AUX gentoo_fix_waitpid_c.patch 407 SHA256 6f0f2c40f0074f509a0f4cd38286896d6fb8f21eab296c7896d6162f20849f9a SHA512 7c049dabf8eeef335dbaead9e74a99f45824201c94b5f09e51b91f8927d444238232c896bff9de9f362e11e854e30ac30bb7c7552497251cd69c98b84479979d WHIRLPOOL 7b6fd6e45688697775defa9cc366f0195eec7de52405a726033bcb2f5e911600bd1c89d2edfffc2022d74252afc98a4f337b8576c812dd213e7dc81805a69e2a
 AUX sbcl-1.0.55_no_doc_install.patch 1778 SHA256 aae79884a1f8dd693ef4c10129920ccbcc32bacb72e076b326c6fd6730988b9b SHA512 41b5c5274cb0465f706156444c249516db115cade23eeadd4f20fdf4a5a355fc0fc5b71c5b02c26d13c2118e63a53e0c1ccd525a44b301ffc03b8cb2c45c6ad3 WHIRLPOOL b119518fcf01a3e4bd4189e56620aa3216aeaaa6b22fa7943c75a4e07fac815e6f2490f89b5fc19b6054ce22144e6af25994824615e565af0ad6b009cc529c60
+AUX sbcl-1.1.17-gentoo-fix_nopie_for_hardened_toolchain.patch 1024 SHA256 fe2f2e62d480bd5a593c782f14faeeb0fcd3d26507ff4f17aa19fad3a7069843 SHA512 a09efe91a082fd2bed9dc30652f3e5ed51e416697b7b2fee4d6c5f90db0ecbadca7adf652f532d79869fde9186e9d16855f5fd81321cb2a82e1a158d4cde9e97 WHIRLPOOL d475627395ceb118614dd67c1cd9d434cf62a7987bc48a16dad7b564b20daafaf5ddeb807b1bf30b572f6a10ed21b05f0b9773efa05389142762167fc806ca9f
 DIST sbcl-1.0.28-alpha-linux-binary.tar.bz2 7573824 SHA256 0bd8125e1375a75b9dda286439dcbe9861d6df5c6fc8475fd217b8b757edf9cc SHA512 85ceb4d3bf971777f5444a63cbabd88ccfaf16ed3b3c86cc5ea6cb3fd3189c4cd5a5ebbf785c97366afb7026604ffc34a1129936291deede5993056e158125ab WHIRLPOOL 839363a0d2fcc7cf383143fc130c40bf6f03468a89eb4b5eecb39339ba376a6b3a2096938934a91cf689310bff20807d2ac24b99c0d6e3673729b26d9edb83aa
 DIST sbcl-1.0.28-powerpc-linux-binary.tar.bz2 7621107 SHA256 b51fe8cd3a998d178fc1876d10016439cfa4ed3566d761c331cacab364acd591 SHA512 e3386d25ae44c03cac5ecf2a9ba95338348b51955dc731f0bb57a124e572601b84170b452ff0c3540af07278053f1e5d153a4f1a621b376ceb1861f84777bad3 WHIRLPOOL 1c16053a0c15b3bec892811185945df59765f4d220045e0f116234aa18f843c6a6b8ce472029603624e47751185822891ffaaeb96dfd87f714b8fddf74149f26
 DIST sbcl-1.0.28-sparc-linux-binary.tar.bz2 8032042 SHA256 a2e848ac11b0f16bb91866bd187949d908ad94fabb958a0b56320fc0e8b8923e SHA512 cea1ba06f85169fca9fe3026813c6e7e8e8209b874e048b7bd63cb3a1c5bd7c829e8dbb2c486977e190a0390d28e4845938a9e84378f4f2f16f72bf0b6f45c80 WHIRLPOOL e7f7e9bc7b43cab7b729792a22f0f41be12d8dd97a1c45fa039a49607865b977dd336fef8c7ccda087a9e9e32f92241c83e05da442e12cf883d3dfb3c2fda169
@@ -25,25 +23,6 @@ EBUILD sbcl-1.0.55-r1.ebuild 6161 SHA256 764c48efc217326b8a9862bcc4589df7c2e1ba2
 EBUILD sbcl-1.0.55-r2.ebuild 6230 SHA256 02574bec1fb07d17dd604daa7c4279a5125d0e9362247eaa2bde4ac55d0db607 SHA512 125165bf61e89a98f4796c792bc9c39dd8caa9595253bda3b2d50af762a5a597438966cbb5faa0d2e37563104b97185c88718be3d2df6a8fdb56af7bfe0d00c5 WHIRLPOOL 5f945702055282b0a989001f39b5ceb4de62ec750902018a3421562098298c405f23c855b2a00dd5a02b25aedfe3a92eab3de13a19de98670f15f2ebe6197a22
 EBUILD sbcl-1.1.15.ebuild 6886 SHA256 66da6a3f0d6c3c6ae713f5285de69bd82eb0cae3d73d40cfb54388ce3e046419 SHA512 07ef57b521b97933b2c47f33e33cf05566de98524e5e3c02148cc336b1946b5015bb258193d73c5f52b5c3046c7102db543d32073fdae0064796d4f27656a89d WHIRLPOOL a0f6dae5a08cf7a580dc003a260d1def659ffbe033a888e554d32c92e9329ffb8f9c638c205aae9af9bbbd0824fb87c3438dc01ff1c61e9ecd3f7d6fff0fd04c
 EBUILD sbcl-1.1.16.ebuild 6886 SHA256 1a7654de5b78618224fa88508af1c2eef11ce894835abce55474b9849327a0ca SHA512 4103a075b9708aa267ed34a3e314fcfbd7a29734695e200f6138544a0673a29c51ddb3363f84497fcb5c5aef6ee8c6546a46df9d7d815a85705e8b87d7f30fc7 WHIRLPOOL cf39987e7cd36cdb96de692af1979ac54b599c7f23a7e351d7afe0e1cfc1b798b9b462f649d2c6f68dfaa2aefd746d344fe5e4ac942457129c4ed310df110d36
-EBUILD sbcl-1.1.17.ebuild 6886 SHA256 4138c9a5e577802b18ec13ed2eeff3597aaceaf091b71e0d3aea4f34cc2396e3 SHA512 7315eec03ac57ec992134a021f42e0afba008edaf7169446f6e50f139c5331eae7463147a3f5384798e803955c92dd39eff3e68f74a29b4ae010c1b93ee7202e WHIRLPOOL 1275ddd0e1a6701573b64bf87031090f0fd2d130c7b680a92a7ad007ba7e606e38ff5b957368d41cce7b67f8e7262eec500ea7e770cdcb0b91106813db9fad9d
-MISC ChangeLog 53804 SHA256 049df084de4f3eb7022366faf618d960050b281651de991afca487570f613748 SHA512 4e03cd5ae9ed4bfd1ec093d6a0f0af1d5e974380dbc40ea62c4f452753ece301305e05c5dda442f52b3568fa6d473e17cb6e8909b6aa3cc5c3c74bf07082a78b WHIRLPOOL 34ee45c88b6453100b44cd9e5c04f73b39cda4af0412c6b6785dabd8f07cf8add283f5c3fbc53de234cc28b297d88707a0374216d843f17dd1e3ecb8c2006116
+EBUILD sbcl-1.1.17.ebuild 6899 SHA256 b8756e3c72a107f2a11e5234a4097cf8e302638977c6623e1545286b4a1e4231 SHA512 862a3deb4bf3cc384a7420a61144dd31bdc10442161d302e82cba54f0ecbfeaca6adc7d57a2d1fb939ddfd4257aa2c79f54c9f7d1dab14115476e1255304562d WHIRLPOOL 11cb46bf8e84dfd805bed11d3b7e068ad3abfeb7ecd3ad2e8545f57a630e0259709b64c27af7c8aa3b57f2cdbf97c29e9f5744309d7a3d5298acefa31d7f5383
+MISC ChangeLog 54095 SHA256 b731ed7b8688eae539ad8bf13d622359896c89f16e94e922aa416b7f689894b0 SHA512 4db534f45df0218463aad094dded7263c3694f6a011246ae06d3923aced437b77905121ba0a7fae22d8d659d7c25f38369f4e106177da97262f34318fc770aab WHIRLPOOL 6524aa52131cb61d75dc7e369b82dfadf354c84548a0f3925d64dc962bd6448bfb6627491b5174c1e52a129ea05ce9edffc16295eff9b92caa066734f719190b
 MISC metadata.xml 1676 SHA256 17fb0c325844368c649a311f15fbb53a87e5ef987021c52424ffa647745101f3 SHA512 54f12b8385602a6f26b35bb63cbfb0414788e899bc2f5240f60ce249d8ac914c1e236b8d66cee893eac1c3602661869a4333223fa4ce043bd284bde51fa99512 WHIRLPOOL 90a7306f698aa56ab618874f1d325bd3bb789961675d4b0728744abff152bfb6e8cb7303c3cc063782e0411ce27551527c313b404846dadbe2638c5ea086e2f1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQJ8BAEBCABmBQJTXcXnXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwOEM0RURGNjY5QzVBNjMwRkU3REVCOTQz
-QUZGQ0U5NzREMzRCRDhDAAoJEDr/zpdNNL2MRywP/0e14jJyeEDvog4UV7VhjOfb
-T+3toWYy56ORlwfYYQyDYiN1SiXBqGbjB4GUIjAPRuyHNla79hfAMhjR8UEM/Mtb
-9B7hb0iuXf8V+9UKZOw/B0pa5bQvkHjyuwM+emeuJJZ6vrU1lAUyMH/95fXi9fkW
-ciG2Hz/12zMXCBfzvK8vjRHOuG+btor1aYeN9Ap/Oxzh3APYOIRwhN8/ylaCIfYM
-yVbYo7ZCexLOaXbuxkpDQ5FFv1a4i7y2WFf9dFkLT1NREO0qY7eaqzqWcmmrTJ8V
-lrn55usaJxKMwN/9LBRlg7fG7U5haUWRgh3O0HwjpyYjskl9Pw/cT/x2o7SG8KL+
-/xtKlaQi3Qz8dljIOFQCC2sFG/yjf4dYd1is3FPjplH5pDR+sbvVUvFkfeofDSJK
-vJC5Ti4aFw6dvH23/PkwFtfJunAaEW+PuWKaSvfUB2RVGcF+TZBf6AX9bBqpS6mI
-QAliB/qH6MBt8/m5nv97XEAfYrVXc3hApEONWdLQMdGPVTV9y/BS1GKAa9Owrdzt
-B6bwXe7ASLt3H1HkDBE5IXuyDY8/8p6UkyfQrGZFNQ00OqSU2YlMAGpx16JkiKOU
-HV9idx8TstGbSA6Ja4394p6CYkp5UDmKD+Bl8WmSChqNW3P/PPnGumNJvDj/iwrS
-rl74cOLjhjPFhq3AvS+N
-=iKFh
------END PGP SIGNATURE-----
diff --git a/dev-lisp/sbcl/files/sbcl-1.1.17-gentoo-fix_nopie_for_hardened_toolchain.patch b/dev-lisp/sbcl/files/sbcl-1.1.17-gentoo-fix_nopie_for_hardened_toolchain.patch
new file mode 100644
index 000000000000..bf03ada518fe
--- /dev/null
+++ b/dev-lisp/sbcl/files/sbcl-1.1.17-gentoo-fix_nopie_for_hardened_toolchain.patch
@@ -0,0 +1,22 @@
+--- sbcl-1.1.17-orig/src/runtime/Config.x86-linux	2014-03-31 03:14:22.000000000 +1100
++++ sbcl-1.1.17/src/runtime/Config.x86-linux	2014-04-28 15:34:59.822482441 +1000
+@@ -27,7 +27,7 @@
+ # (You *are* encouraged to design and implement a coherent stable
+ # interface, though.:-| As far as I (WHN 2002-05-19) know, no one is
+ # working on one and it would be a nice thing to have.)
+-LINKFLAGS += -Wl,--export-dynamic -m32
++LINKFLAGS += -Wl,--export-dynamic -m32 -nopie
+ OS_LIBS = -ldl
+ 
+ ifdef LISP_FEATURE_LARGEFILE
+--- sbcl-1.1.17-orig/src/runtime/Config.x86-64-linux	2014-03-31 03:14:22.000000000 +1100
++++ sbcl-1.1.17/src/runtime/Config.x86-64-linux	2014-04-28 15:35:22.364623003 +1000
+@@ -27,7 +27,7 @@
+ # (You *are* encouraged to design and implement a coherent stable
+ # interface, though.:-| As far as I (WHN 2002-05-19) know, no one is
+ # working on one and it would be a nice thing to have.)
+-LINKFLAGS += -Wl,--export-dynamic
++LINKFLAGS += -Wl,--export-dynamic -nopie
+ OS_LIBS = -ldl
+ 
+ ifdef LISP_FEATURE_LARGEFILE
diff --git a/dev-lisp/sbcl/sbcl-1.1.17.ebuild b/dev-lisp/sbcl/sbcl-1.1.17.ebuild
index 52c71425d512..407db46922b5 100644
--- a/dev-lisp/sbcl/sbcl-1.1.17.ebuild
+++ b/dev-lisp/sbcl/sbcl-1.1.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/sbcl-1.1.17.ebuild,v 1.1 2014/04/28 03:15:51 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/sbcl-1.1.17.ebuild,v 1.2 2014/04/28 06:35:54 gienah Exp $
 
 EAPI=5
 inherit multilib eutils flag-o-matic pax-utils
@@ -88,7 +88,7 @@ src_prepare() {
 	# To make the hardened compiler NOT compile with -fPIE -pie
 	if gcc-specs-pie ; then
 		einfo "Disabling PIE..."
-		epatch "${FILESDIR}"/gentoo-fix_nopie_for_hardened_toolchain.patch
+		epatch "${FILESDIR}"/${PN}-1.1.17-gentoo-fix_nopie_for_hardened_toolchain.patch
 	fi
 
 	cp /usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die