summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Graaff <graaff@gentoo.org>2013-05-14 17:59:27 +0000
committerHans de Graaff <graaff@gentoo.org>2013-05-14 17:59:27 +0000
commit9e28a841f99f4d9f93245e40de513591018520b7 (patch)
tree95d6add37fb057aad71688210d6707294d9ae1bd /dev-ruby
parentVersion bump. (diff)
downloadhistorical-9e28a841f99f4d9f93245e40de513591018520b7.tar.gz
historical-9e28a841f99f4d9f93245e40de513591018520b7.tar.bz2
historical-9e28a841f99f4d9f93245e40de513591018520b7.zip
Remove unused code triggering unused symbols, bug 469690.
Package-Manager: portage-2.1.11.62/cvs/Linux x86_64 Manifest-Sign-Key: 0x8883FA56A308A8D7!
Diffstat (limited to 'dev-ruby')
-rw-r--r--dev-ruby/bcrypt-ruby/ChangeLog6
-rw-r--r--dev-ruby/bcrypt-ruby/Manifest23
-rw-r--r--dev-ruby/bcrypt-ruby/bcrypt-ruby-3.0.1.ebuild6
-rw-r--r--dev-ruby/bcrypt-ruby/files/bcrypt-ruby-3.0.1-undefined-symbols.patch42
4 files changed, 58 insertions, 19 deletions
diff --git a/dev-ruby/bcrypt-ruby/ChangeLog b/dev-ruby/bcrypt-ruby/ChangeLog
index b8590f22c3b4..dbaa04f34445 100644
--- a/dev-ruby/bcrypt-ruby/ChangeLog
+++ b/dev-ruby/bcrypt-ruby/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-ruby/bcrypt-ruby
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bcrypt-ruby/ChangeLog,v 1.12 2013/01/16 01:11:39 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bcrypt-ruby/ChangeLog,v 1.13 2013/05/14 17:59:20 graaff Exp $
+
+ 14 May 2013; Hans de Graaff <graaff@gentoo.org> bcrypt-ruby-3.0.1.ebuild,
+ +files/bcrypt-ruby-3.0.1-undefined-symbols.patch:
+ Remove unused code triggering unused symbols, bug 469690.
16 Jan 2013; Rick Farina <zerochaos@gentoo.org> bcrypt-ruby-3.0.1.ebuild:
adding ~arm keywords to net-analyzer/metasploit rdeps
diff --git a/dev-ruby/bcrypt-ruby/Manifest b/dev-ruby/bcrypt-ruby/Manifest
index d0914a40cee1..773c7a7965f9 100644
--- a/dev-ruby/bcrypt-ruby/Manifest
+++ b/dev-ruby/bcrypt-ruby/Manifest
@@ -1,24 +1,15 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
+AUX bcrypt-ruby-3.0.1-undefined-symbols.patch 1185 SHA256 d833d4299bba19a6fe7031457bf35f31e09a0c94da8e226309235d17973ea3f8 SHA512 9264b081b932a30612c778e3460cec824e3b62462e5ca05191c9e91bca818bcaf4b79566e1d2322a92d3322e7615e327799db18db24f0160c9e924d86d8f920e WHIRLPOOL b259d7542d206dbf403859e6230eaadf3417dfff8d49c894062f1478f786066f5238efb7fdd66449a66f47fd89998828ea9b707457b9fbf62929023210b6ed7a
DIST bcrypt-ruby-3.0.1.gem 42496 SHA256 1c677889ceef0d03680162e5560ee15600c2de60a9f2113b88710ac97c7b6c4c SHA512 9aa44b1e441d2b287800b88a0126efd8e8bc8e6bc024ff2eee77c548da1702c77d0e0f77e8e3507f174fad4fb580977a08a86b3353772072c10d1af9a3e3edbe WHIRLPOOL 16948c7bc7fd6262d0dfb3c74269c2fd2c0e7dba056dfd19e417492589701c7680cb7519300c1f2944c77fd6c6df86ddae4364d14ddd607263dc66eec3e0ace6
-EBUILD bcrypt-ruby-3.0.1.ebuild 965 SHA256 2fcdf8a50aa24cbefae8a3693ccd6750e88a5fcb68153d2c75d199822d2afe6a SHA512 e23413c60af8f2d3bc74f3d0f93ceb1e3afed964fe73b2fe87d3bf98a022d2d927918508ffff5e25fbf04c4da880d5a28581c9566be0e4101e58be1a723d4a7d WHIRLPOOL 78c682d149e2e2cd2eee3b19af47e9b2cc18e9cccf0833f4d9003b7f87fd1fd4ade399ad55b003eb45f1bdb6ca5b5e0a02ce1eb2f4292b6db9f6793131dfc734
-MISC ChangeLog 1637 SHA256 5adaf503fa8a8619b903aa88fee8633b6d2c637b2201f09a821a3d1f91677392 SHA512 d08f237071f151d7bfcf9695ad0a9754d1969db2d99bac741cd953e9b41562130d5e89918cf5a19d4f550bb523f567f50008d01f64eea6ecb35886f413666e6c WHIRLPOOL f55c55e256c14ab4227596b308306cb2a6bc0527b5d6ebf1448b0bf0d165bfaae53f7c5a0330fef5da7e0d968c5c0c0de73bc0666847d0b4f4437881d192803e
+EBUILD bcrypt-ruby-3.0.1.ebuild 1003 SHA256 6aa1c58d783b316c43424c3b3557b5c1371d3796aa0ab089e52c00961bbb5f21 SHA512 230df25856b3c57b686b1e87225c74211eddadd09ac2f9504ba86d2b85e1a62b406604211cca315d5399ded00f420cd1acfad8149636a688fdbdde202c0419bb WHIRLPOOL af398fb7460b35b7f30a716a14d0d9c4064e61e601e35ac7880949fbba1a33f87193c9d6f4da5786c47148c01e62ffb50442c8f6b4c0bce21617b9841ba6b560
+MISC ChangeLog 1823 SHA256 fbafb8b72af8b5f97d9e7120e4a6f7db8681ba4823d34b3f4b93ae93f768ee92 SHA512 2bc0549a404655f541ed9d08350ffe0865bdc18b0722e385e37e390324428781a99673248d36b6208f3d64e67c17adf2f1aca6f1432283e917a5a0ce1c6ebb89 WHIRLPOOL a9b7a0aeca26de2ceeb6b48705f93dbd40950421ab92304e85b8b8cca22da6a3e40b2ce721d7093344f4651333adbb6d608d69c7a0e0e03124e5b508b96bd0b7
MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQIcBAEBCgAGBQJQ9f6PAAoJEKXdFCfdEflKtMAP/0h7M+eTpM7pGNKzHGV2H7la
-TV+q8wFfPqf0KgBo4MtyvAuikkLNJuWke77a1PNIeDLVNDSwWVFbQzdHbIfCQun1
-kZgA5a/x/siRGZUjP0lNbmB0imW2MN+gtvpQl4n7w3DT5OM+q+MJt1S+mvijNRtO
-DW8vxaH2x5kpp9N7cUrXYlKJvF3r4YdEO+4UyOydSgL+C7fs8as/TOyel1pZzNlz
-iq3NZfOf/0/Xc6pH4Doc13+roxQrolGM4fbYVKq+jkjOPsRFd7uI7V3rx8qJwvdq
-2Y9xaVNNX+wNcX5xE2c7ZhZRmJsIXNalqQR9AUVNlmG415ILDFB2MVBZPj0l+jV1
-Dx9ZgQXRvqcOdZEYKP9v5RiuuCjta56csnFbMuTaXHzIqxnmJdFxZLH7X4Ofmhhy
-i5eVYT8ysLbFpFScVb+xgn//pe8oNo1z5RJUW7bD9/GDDvpzGVp77858fyCxZ5y5
-F3KxNlrvE7Rs0ipqyIFOHwGDBvrvMz3SbymTL+Us0kEFsdaofTQoxFVBXRCpwSJR
-rBVPULZLDl4UXGOPQDLadU3qaKtx5O2rEdi/nnpBka1f5HuSDDJJjn5lSAtdwXgt
-nBgQFR6pVQgNeAdPNGRMC6AEnBmhufbCAY0zhGl2vPPPOXUm6/njMvpwx6BTzTLK
-pZcrHkWoXweT+Kd81ghS
-=ZPFR
+iF4EAREIAAYFAlGSe34ACgkQiIP6VqMIqNd0ZQEAkK4Pmf4DXFQE4YOScAIMmUQ6
+xJUkFNeed/Q/KLWFx2gA/17LiyAqKUeZmMW1ZaNQOoT8l6Y5G0PuJ1tsCWlBi1fD
+=PhdK
-----END PGP SIGNATURE-----
diff --git a/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.0.1.ebuild b/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.0.1.ebuild
index b8ee157550e5..179acbf6c8e6 100644
--- a/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.0.1.ebuild
+++ b/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.0.1.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.0.1.ebuild,v 1.12 2013/01/16 01:11:39 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.0.1.ebuild,v 1.13 2013/05/14 17:59:20 graaff Exp $
EAPI=2
-USE_RUBY="ruby18 ruby19 ree18"
+USE_RUBY="ruby18 ruby19"
RUBY_FAKEGEM_RECIPE_TEST="rspec"
@@ -21,6 +21,8 @@ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-ma
SLOT="0"
IUSE=""
+RUBY_PATCHES=( ${P}-undefined-symbols.patch )
+
all_ruby_prepare() {
rm Gemfile || die
sed -i -e '/git ls-files/d' bcrypt-ruby.gemspec || die
diff --git a/dev-ruby/bcrypt-ruby/files/bcrypt-ruby-3.0.1-undefined-symbols.patch b/dev-ruby/bcrypt-ruby/files/bcrypt-ruby-3.0.1-undefined-symbols.patch
new file mode 100644
index 000000000000..37abf2624c02
--- /dev/null
+++ b/dev-ruby/bcrypt-ruby/files/bcrypt-ruby-3.0.1-undefined-symbols.patch
@@ -0,0 +1,42 @@
+commit 94f8d0ae95ed773cb9e31a71e4046d3b97e11d70
+Author: Aman Gupta <aman@tmm1.net>
+Date: Sat Mar 30 19:52:19 2013 -0700
+
+ remove last of TBR code (fixes #46)
+
+diff --git a/ext/mri/bcrypt_ext.c b/ext/mri/bcrypt_ext.c
+index cce35df..13f5e4e 100644
+--- a/ext/mri/bcrypt_ext.c
++++ b/ext/mri/bcrypt_ext.c
+@@ -4,31 +4,6 @@
+ static VALUE mBCrypt;
+ static VALUE cBCryptEngine;
+
+-#ifdef RUBY_VM
+-# define RUBY_1_9
+-#endif
+-
+-#ifdef RUBY_1_9
+-
+-/* When on Ruby 1.9+, we will want to unlock the GIL while performing
+- * expensive calculations, for greater concurrency. Do not do this for
+- * cheap calculations because locking/unlocking the GIL incurs some overhead as well.
+- */
+-#define GIL_UNLOCK_COST_THRESHOLD 9
+-
+-typedef struct {
+- char *output;
+- const char *key;
+- const char *salt;
+-} BCryptArguments;
+-
+-static VALUE bcrypt_wrapper(void *_args) {
+- BCryptArguments *args = (BCryptArguments *)_args;
+- return (VALUE)ruby_bcrypt(args->output, args->key, args->salt);
+-}
+-
+-#endif /* RUBY_1_9 */
+-
+ /* Given a logarithmic cost parameter, generates a salt for use with +bc_crypt+.
+ */
+ static VALUE bc_salt(VALUE self, VALUE prefix, VALUE count, VALUE input) {