Gentoo Archives: gentoo-commits

From: Peter Wilmott <p@×××××.info>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/ruby-overlay:master commit in: dev-ruby/bcrypt-ruby/files/, dev-ruby/bcrypt-ruby/
Date: Tue, 25 Feb 2014 20:11:34
Message-Id: 1393358089.dfd12f427b6bb527caf768b3976d95426547690e.p8952@gentoo
1 commit: dfd12f427b6bb527caf768b3976d95426547690e
2 Author: Peter Wilmott <p <AT> p8952 <DOT> info>
3 AuthorDate: Tue Feb 25 19:54:49 2014 +0000
4 Commit: Peter Wilmott <p <AT> p8952 <DOT> info>
5 CommitDate: Tue Feb 25 19:54:49 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/ruby-overlay.git;a=commit;h=dfd12f42
7
8 dev-ruby/bcrypt-ruby: version bump, update homepage
9
10 Package-Manager: portage-2.2.7
11
12 ---
13 dev-ruby/bcrypt-ruby/ChangeLog | 83 ++++++++++++++++++++++
14 dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.7.ebuild | 60 ++++++++++++++++
15 .../bcrypt-ruby-3.0.1-undefined-symbols.patch | 42 +++++++++++
16 dev-ruby/bcrypt-ruby/metadata.xml | 5 ++
17 4 files changed, 190 insertions(+)
18
19 diff --git a/dev-ruby/bcrypt-ruby/ChangeLog b/dev-ruby/bcrypt-ruby/ChangeLog
20 new file mode 100644
21 index 0000000..2412081
22 --- /dev/null
23 +++ b/dev-ruby/bcrypt-ruby/ChangeLog
24 @@ -0,0 +1,83 @@
25 +# ChangeLog for dev-ruby/bcrypt-ruby
26 +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
27 +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bcrypt-ruby/ChangeLog,v 1.17 2014/02/23 07:03:01 graaff Exp $
28 +
29 +*bcrypt-ruby-3.1.7 (25 Feb 2014)
30 +
31 + 25 Feb 2014; Peter Wilmott <p@×××××.info> +bcrypt-ruby-3.1.7.ebuild,
32 + +files/bcrypt-ruby-3.0.1-undefined-symbols.patch, +metadata.xml:
33 + dev-ruby/bcrypt-ruby: version bump, update homepage
34 +
35 +*bcrypt-ruby-3.1.6 (25 Feb 2014)
36 +*bcrypt-ruby-3.1.7 (25 Feb 2014)
37 +
38 + 25 Feb 2014; Peter Wilmott <p@×××××.info> +bcrypt-ruby-3.1.6.ebuild,
39 + +bcrypt-ruby-3.1.7.ebuild, +files/bcrypt-ruby-3.0.1-undefined-symbols.patch,
40 + +metadata.xml:
41 + dev-ruby/bcrypt-ruby: version bump, update homepage
42 +
43 +*bcrypt-ruby-3.1.6 (23 Feb 2014)
44 +
45 + 23 Feb 2014; Hans de Graaff <graaff@g.o> +bcrypt-ruby-3.1.6.ebuild:
46 + Version bump. Handle renaming of the gem from bcrypt-ruby to bcrypt. Install
47 + compability gemspec.
48 +
49 +*bcrypt-ruby-3.1.2-r1 (05 Nov 2013)
50 +
51 + 05 Nov 2013; Manuel Rüger <mrueg@g.o> +bcrypt-ruby-3.1.2-r1.ebuild,
52 + -bcrypt-ruby-3.0.1.ebuild, -bcrypt-ruby-3.1.1.ebuild,
53 + -bcrypt-ruby-3.1.2.ebuild:
54 + Add ruby20 target. Cleanup old.
55 +
56 +*bcrypt-ruby-3.1.2 (27 Aug 2013)
57 +
58 + 27 Aug 2013; Hans de Graaff <graaff@g.o> +bcrypt-ruby-3.1.2.ebuild:
59 + Version bump.
60 +
61 +*bcrypt-ruby-3.1.1 (18 Jul 2013)
62 +
63 + 18 Jul 2013; Manuel Rüger <mrueg@g.o> +bcrypt-ruby-3.1.1.ebuild:
64 + Version bump
65 +
66 + 14 May 2013; Hans de Graaff <graaff@g.o> bcrypt-ruby-3.0.1.ebuild,
67 + +files/bcrypt-ruby-3.0.1-undefined-symbols.patch:
68 + Remove unused code triggering unused symbols, bug 469690.
69 +
70 + 16 Jan 2013; Rick Farina <zerochaos@g.o> bcrypt-ruby-3.0.1.ebuild:
71 + adding ~arm keywords to net-analyzer/metasploit rdeps
72 +
73 + 30 Jul 2012; Hans de Graaff <graaff@g.o> bcrypt-ruby-3.0.1.ebuild:
74 + Use RSpec recipe. Avoid implicit dependency on git.
75 +
76 + 01 May 2012; Raúl Porcel <armin76@g.o> bcrypt-ruby-3.0.1.ebuild:
77 + Drop ia64/sparc keywords
78 +
79 + 11 Mar 2012; Brent Baude <ranger@g.o> bcrypt-ruby-3.0.1.ebuild:
80 + Marking bcrypt-ruby-3.0.1 ~ppc64 for bug 385763
81 +
82 + 08 Mar 2012; Naohiro Aota <naota@g.o> bcrypt-ruby-3.0.1.ebuild:
83 + Add ~x86-fbsd.
84 +
85 + 06 Feb 2012; Brent Baude <ranger@g.o> bcrypt-ruby-3.0.1.ebuild:
86 + Marking bcrypt-ruby-3.0.1 ~ppc for bug 385763
87 +
88 + 31 Dec 2011; Fabian Groffen <grobian@g.o> bcrypt-ruby-3.0.1.ebuild:
89 + Add Prefix keywords, bug #396547
90 +
91 + 27 Dec 2011; Hans de Graaff <graaff@g.o> bcrypt-ruby-3.0.1.ebuild:
92 + Add ruby19.
93 +
94 + 03 Dec 2011; Raúl Porcel <armin76@g.o> bcrypt-ruby-3.0.1.ebuild:
95 + Add ~ia64/~sparc wrt #385763
96 +
97 + 13 Nov 2011; Markus Meier <maekke@g.o> bcrypt-ruby-3.0.1.ebuild:
98 + add ~x86, bug #385763
99 +
100 + 10 Oct 2011; Fabian Groffen <grobian@g.o> bcrypt-ruby-3.0.1.ebuild:
101 + Keyworded for Prefix, bug #385763
102 +
103 +*bcrypt-ruby-3.0.1 (05 Oct 2011)
104 +
105 + 05 Oct 2011; Hans de Graaff <graaff@g.o> +bcrypt-ruby-3.0.1.ebuild,
106 + +metadata.xml:
107 + Initial import from my overlay. New dependency for Rails 3.1.
108
109 diff --git a/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.7.ebuild b/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.7.ebuild
110 new file mode 100644
111 index 0000000..7968d33
112 --- /dev/null
113 +++ b/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.7.ebuild
114 @@ -0,0 +1,60 @@
115 +# Copyright 1999-2014 Gentoo Foundation
116 +# Distributed under the terms of the GNU General Public License v2
117 +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.6.ebuild,v 1.1 2014/02/23 07:03:01 graaff Exp $
118 +
119 +EAPI=5
120 +
121 +USE_RUBY="ruby18 ruby19 ruby20"
122 +
123 +RUBY_FAKEGEM_RECIPE_TEST="rspec"
124 +
125 +RUBY_FAKEGEM_TASK_DOC=""
126 +RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
127 +
128 +RUBY_FAKEGEM_NAME="bcrypt"
129 +
130 +inherit multilib ruby-fakegem
131 +
132 +DESCRIPTION="An easy way to keep your users' passwords secure."
133 +HOMEPAGE="https://github.com/codahale/bcrypt-ruby"
134 +LICENSE="MIT"
135 +
136 +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
137 +SLOT="0"
138 +IUSE=""
139 +
140 +all_ruby_prepare() {
141 + rm Gemfile || die
142 + sed -i -e '/git ls-files/d' bcrypt.gemspec || die
143 +}
144 +
145 +each_ruby_configure() {
146 + ${RUBY} -Cext/mri extconf.rb || die
147 +}
148 +
149 +each_ruby_compile() {
150 + emake -Cext/mri V=1
151 + cp ext/mri/*$(get_modname) lib/ || die
152 +}
153 +
154 +each_ruby_install() {
155 + each_fakegem_install
156 +
157 + # bcrypt was called bcrypt-ruby before, so add a spec file that
158 + # simply loads bcrypt to make sure that old projects load correctly
159 + # we don't even need to create a file to load this: the `require
160 + # bcrypt` was already part of bcrypt-ruby requirements.
161 + cat - <<EOF > "${T}/bcrypt-ruby.gemspec"
162 +Gem::Specification.new do |s|
163 + s.name = "bcrypt-ruby"
164 + s.version = "${RUBY_FAKEGEM_VERSION}"
165 + s.summary = "Fake gem to load bcrypt"
166 + s.homepage = "${HOMEPAGE}"
167 + s.specification_version = 3
168 + s.add_runtime_dependency("${RUBY_FAKEGEM_NAME}", ["= ${RUBY_FAKEGEM_VERSION}"])
169 +end
170 +EOF
171 + RUBY_FAKEGEM_NAME=bcrypt-ruby \
172 + RUBY_FAKEGEM_GEMSPEC="${T}/bcrypt-ruby.gemspec" \
173 + ruby_fakegem_install_gemspec
174 +}
175
176 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
177 new file mode 100644
178 index 0000000..37abf26
179 --- /dev/null
180 +++ b/dev-ruby/bcrypt-ruby/files/bcrypt-ruby-3.0.1-undefined-symbols.patch
181 @@ -0,0 +1,42 @@
182 +commit 94f8d0ae95ed773cb9e31a71e4046d3b97e11d70
183 +Author: Aman Gupta <aman@××××.net>
184 +Date: Sat Mar 30 19:52:19 2013 -0700
185 +
186 + remove last of TBR code (fixes #46)
187 +
188 +diff --git a/ext/mri/bcrypt_ext.c b/ext/mri/bcrypt_ext.c
189 +index cce35df..13f5e4e 100644
190 +--- a/ext/mri/bcrypt_ext.c
191 ++++ b/ext/mri/bcrypt_ext.c
192 +@@ -4,31 +4,6 @@
193 + static VALUE mBCrypt;
194 + static VALUE cBCryptEngine;
195 +
196 +-#ifdef RUBY_VM
197 +-# define RUBY_1_9
198 +-#endif
199 +-
200 +-#ifdef RUBY_1_9
201 +-
202 +-/* When on Ruby 1.9+, we will want to unlock the GIL while performing
203 +- * expensive calculations, for greater concurrency. Do not do this for
204 +- * cheap calculations because locking/unlocking the GIL incurs some overhead as well.
205 +- */
206 +-#define GIL_UNLOCK_COST_THRESHOLD 9
207 +-
208 +-typedef struct {
209 +- char *output;
210 +- const char *key;
211 +- const char *salt;
212 +-} BCryptArguments;
213 +-
214 +-static VALUE bcrypt_wrapper(void *_args) {
215 +- BCryptArguments *args = (BCryptArguments *)_args;
216 +- return (VALUE)ruby_bcrypt(args->output, args->key, args->salt);
217 +-}
218 +-
219 +-#endif /* RUBY_1_9 */
220 +-
221 + /* Given a logarithmic cost parameter, generates a salt for use with +bc_crypt+.
222 + */
223 + static VALUE bc_salt(VALUE self, VALUE prefix, VALUE count, VALUE input) {
224
225 diff --git a/dev-ruby/bcrypt-ruby/metadata.xml b/dev-ruby/bcrypt-ruby/metadata.xml
226 new file mode 100644
227 index 0000000..8521361
228 --- /dev/null
229 +++ b/dev-ruby/bcrypt-ruby/metadata.xml
230 @@ -0,0 +1,5 @@
231 +<?xml version="1.0" encoding="UTF-8"?>
232 +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
233 +<pkgmetadata>
234 +<herd>ruby</herd>
235 +</pkgmetadata>