Version bump for security issue CVE-2014-7818.

Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64
Manifest-Sign-Key: 0x8883FA56A308A8D7!

5 files changed, 157 insertions, 5 deletions

diff --git a/dev-ruby/activemodel/ChangeLog b/dev-ruby/activemodel/ChangeLog
index 1e85ead69547..3a663803f0da 100644
--- a/dev-ruby/activemodel/ChangeLog
+++ b/dev-ruby/activemodel/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-ruby/activemodel
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activemodel/ChangeLog,v 1.92 2014/09/12 06:27:09 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activemodel/ChangeLog,v 1.93 2014/10/31 08:56:19 graaff Exp $
+
+*activemodel-4.1.7 (31 Oct 2014)
+*activemodel-4.0.11 (31 Oct 2014)
+*activemodel-3.2.20 (31 Oct 2014)
+
+  31 Oct 2014; Hans de Graaff <graaff@gentoo.org> +activemodel-3.2.20.ebuild,
+  +activemodel-4.0.11.ebuild, +activemodel-4.1.7.ebuild:
+  Version bump for security issue CVE-2014-7818.
 
 *activemodel-4.1.6 (12 Sep 2014)
 
diff --git a/dev-ruby/activemodel/Manifest b/dev-ruby/activemodel/Manifest
index cca5ed37f874..606404a505d4 100644
--- a/dev-ruby/activemodel/Manifest
+++ b/dev-ruby/activemodel/Manifest
@@ -2,21 +2,27 @@
 Hash: SHA256
 
 DIST rails-3.2.19.tgz 3567409 SHA256 41d63edbdb0cd880a80ac806b1e1c903efad40f5ea64e99e19ecc98b134dba41 SHA512 4e75777f292ac329c893d13f7632ff7ab9cd3c953eaca6bfc90f6371821ae5f95a6dbcb00f76e202fc256c1da0be641fa804a4f589805521be0a1736331e41ba WHIRLPOOL 8e5a4cd46cdc97587bfab2dcf392625e5832265171a1951409323d9ed9f9896c986a81e90e5b570c008125d042090400afb963d12a029237a5e69895ddcbf207
+DIST rails-3.2.20.tgz 3567367 SHA256 373e66ad1ea7af66504e676b0925806a20532673e2d9da7fa0131aa0559dad5c SHA512 2f39d14c1543e203a6e182528967bfa00d08a29872fd233022e2c3bd6e1a1d4cac754016258c1d7f5f821942e83d5c0f4df39a8c4fa4d5d7ba135f79bcda26a3 WHIRLPOOL e011cccc18a74ed924368077a90e43b14824e460f0d05fbe4c1a4a3092df2fb63808c148190b0f4920bf60ea94fd1be5f56f0d628e8afaf431fb9ba702fa6f71
 DIST rails-4.0.10.tgz 3759373 SHA256 97d10ff2b7ed776742a2f7c076cfaa62ac1922e9378a03a99c79064c4b0ff82e SHA512 61bf602ed38ebe27d8c821b3edb297e485c15c32265a86c19a6b50f929b561f7fd0551772afcb8bec86713375f96471d9a115c535e1edffd386638bb53f0b696 WHIRLPOOL 4228cdb02bab116e733d6335d1a1d1192229efa8f1d20d91bd8d194c5fc5f5a6d21972efe32c1015b2b9fa898b5d787bb6f3f4160ef4dc9523bd91190ac1dd22
+DIST rails-4.0.11.tgz 3759423 SHA256 cb44b605bc0e6477c9cf389f9c6a8274de10de6a98f979a53ef8505b7eed9e33 SHA512 a38eee261aa76070417ea248ac8f79536f19a75e5ee4bf16ae59f1eff5a9c751b033257a5cdbd1cfdcd80796142ef2ea1f8b2be5cc73604e96759fe2979f9b41 WHIRLPOOL e4b52b5f3d3ddae13ce4aefa1f5890813370de7874e8c5edce1e4f1df32704782babe52013dfa96cf4e60327429602f7b9534af2c19a9ef269d179186a8e1b62
 DIST rails-4.0.9.tgz 3755070 SHA256 cd9d1fc5e24ad6d5312c1d43954cf3a03128158541ce06b763e8e004dd39f9c2 SHA512 b41162cdc26253b43142fa628475996652ddadb571956588bf8e869a56e31f116cb89d514ad23f7b8cb4c2820a043ead476a8cee4a289d3b8bc164b71d38c67e WHIRLPOOL 9559a6bc01b409a5d48b8f19be5aa20b02f1dd8bf15a75277a0dfe88d2dc766804bc8d92211a385c2b15d32d8a174790ccf98158c8bef92c1d05c3cc41c324e7
 DIST rails-4.1.5.tgz 3698902 SHA256 e11a06f8e2d442540c96bacd6d185b4a46d33801c699ddbc42066708c4198ad4 SHA512 37d9bb6bd67edafbec72167a30b0e82aad3fbeb33f492a58367214a68a05f659423f508df23bbecc9d4a4477ee3e7ee03772d985cb86e9c85fb5f358d4fb00ba WHIRLPOOL ca5cab98837fde771b96bcb4317427faec7d984bf0ad8a249a4087c4552bcf9100d39faa81fc2b9b5781c0d2a0b6175ed13dc1b14f8a2c07f8af8255e590859b
 DIST rails-4.1.6.tgz 3707083 SHA256 cb7263c0eefc4f93b01570172b54d9bbdc8699297ca12a13b3aef89bb26e93a7 SHA512 3fdbd7081f9a1afa889d010a2ab971a1b0428d100ebfe7eff781a3eeb0a42fcf4c41e57024edc1706a1562c298ecb3f4e6029f68bc28667a7f3256bc8dd58093 WHIRLPOOL 784f07965997c285fda878d953835a6defd171bd138cf380df7d2ad70bfcabe6c02bd901f049c3b700194f5f252a6978d155d6f2513592244bcd941d187b6326
+DIST rails-4.1.7.tgz 3708137 SHA256 c57a1bf954c4725649b9d11f893c3f6c81de77b36d7f8065d5d0a87fb7cf18e1 SHA512 6fd29ba7b552ec29225ebcb7df78d6043383f36e4c6b1e66880b0bae69bd9f9ae36b1bc63700a8e491818b495087944c990d34d33b6ee566182e2f38370ac0d0 WHIRLPOOL 0a53c4936a9792cebb98b997cafad30f895a908c169d9e8a8d370e3da55a2ba17d594b03e2dbf6a6181fafddc75697d50b0f0e57f44868ac00b4deceda03d5af
 EBUILD activemodel-3.2.19.ebuild 1624 SHA256 5cf9a6605432078aa18d3ff5abd2632c0657de0ebd91e0900e2d0003f80e5107 SHA512 cae4b4d3c21ae9a2f51076f10421f004e1c5bced0636e0c56c2879568a23c844caa4b63725240f8aec238fd893faf66582d466fe80ffcaf12566c05d42371749 WHIRLPOOL 2ae1c9ea79b216cf785df0ec5a060ddc380d21ab102c7ce8385dd2bcaddfb9df43bb14e977bd4f1cad9b7b588a336cb7f252713183f965ebbdf3e56873114677
+EBUILD activemodel-3.2.20.ebuild 1436 SHA256 0fa9d808c36ff208425eb64ca04fcf84aa73b20e4b2855ecf8a6624038609ba9 SHA512 c9ae59c91fe00d9bdf641f1fbc8803e60ea0e555009f606e15b688f42b8704f86bc446bcece20ef2316a12118978d2bf3e720a7395fbcac38ef5102cd14ef919 WHIRLPOOL 9015396aa7d3df5e44de20ff64cb730e10d6d0deef671730065d13a3466ac6bbfa3472b2c6d132bb982db53f26510368d69c57fea5647c6edfa1ac4073dfd2d6
 EBUILD activemodel-4.0.10.ebuild 1624 SHA256 402de7e2ba4742d6edbc8666274027e126772d90006aed8aab979e2ecc340cd4 SHA512 4eae7b7ff21c9308dc99391a3fc4c3ac7a4d2e017f8ad2772044de2d31c9ac5480aa4f38bea266614c4331360d425c8d8de4f160eb57ca05c4c730dac11eec1f WHIRLPOOL eda572c3b33a2347561c8c448a33f564da5ad8f06257a219db2307c0616623d60d196c5ebde2d2ecac0fa2b94fcdeb0b5984fce623aec5fff50848a27cd716ba
+EBUILD activemodel-4.0.11.ebuild 1624 SHA256 a664619a9046183d8eb804618080a2da2d65fa568ecac3ce4db22ba7311d2b6e SHA512 b59a9daa360422e632fc0003622b7978c1d3bd5f2cf13188868d9e623bbf3b18bfd15dda45e174a0a7a9195a0a412dd1810aad3263d22be870813e6b7e385f9b WHIRLPOOL 0f42f4cf8fb3654ef87b56eb086dcdc9e7346ef9807059e67b50c6bfec0e336643ceaa223eb017d40a17f18a1af995f4477d8ec76070a8481601d6843f871b2d
 EBUILD activemodel-4.0.9.ebuild 1623 SHA256 c4f6140bb8a32b76326ee21b8372cc5da05297a01bbfd977cf5b0680db0e8465 SHA512 3291dcc6d9d29a761ba9bb54beb47773d482e96c129e05aa63e432612ddedf9834abfe45f175f998361132dd8ae6fb82160f74953c23f4c6505fd0861d427ce0 WHIRLPOOL dae694228ee752919ae9d00b023bab1c6a8a44f3bd04cd6251b843ca7ad3a0e0ddaa8fabc1705b0c9015e59a8b00e72a1ff06841dca16be70e9ea06c28e43d4e
 EBUILD activemodel-4.1.5.ebuild 1166 SHA256 2ccaa0c76281ab94196f39d348b87fc16da4e3e468ee95feecb462e0b96d681b SHA512 6c6727354f4b90ac0ea587a3f1d84d51652c357399a49f055b0756797cbd11f4fd38299a775d4cc12a0b72f2b33e3358bf3f0aaaaabf09ce60105c6a0f3727ed WHIRLPOOL 7564c62474b144384a29c62ba7f2143b18c52d230d56cbb0e4985c0ea12f54a809d071c91e879b70f42441aa3dc959dce69bb87da3abedc5264f351f96b1de5a
 EBUILD activemodel-4.1.6.ebuild 1166 SHA256 d573d78c3a0238236722693baaabeb318936dfc8a385f2082173d8a9b90655dd SHA512 6a25030b604b999b1d3a6caef13fa721b055a983372cbf0e07bad5ad2157f9e91f5fa69f1e7024694440e09b5d2de28a17a7f5129ca5ae28b3759a39b6cbacaa WHIRLPOOL e8873909b6a4056dd504d085889345e522814add53ea3b2e349f89ccde0281ec2b773a78f413eef1b19bd26c62da84c0ff529944d60c1a1e85ec8173a0238dd1
-MISC ChangeLog 13796 SHA256 29bdbb45b4b4e7037aa3e634de1b3215317ca467b8ced36a679d84188b17ce48 SHA512 69953eddb3bdf6e3910fbd2f25c977e322875f5c2075716fcd1dfaaa7bb042f238e6cfed2f280e63b8b4ea9cbc8ea410be7172586ae96923e8c6ee7095249a55 WHIRLPOOL ee37893340e4def561577d2051e8f75bf24c7279f32cdda62b6106acb7d8d36043e0c731f5d74781e2c5ccda4d5dd55bc7b8da015091ce8c6c418f4b507de351
+EBUILD activemodel-4.1.7.ebuild 1166 SHA256 503cfb9fb28e755f9113b2e664c9c0554366d8bce48f6cbf09c6609bb275f9df SHA512 c923d2d32d7a9efdfc0a8c74f6a4187830a815a1f7043562ea0209df30a82da3c7ba4e99d70d6e6e2c4b1c729e498d57429f722485e3a72cb69ffd16a6530a46 WHIRLPOOL 0da29175aa21a6695d1964a53e9c58edd2b03035a1a218bc3c554a44faebbe194eb892800d20500571665f2dc48180268a0affa2c5d61b9d52887129c04e48b5
+MISC ChangeLog 14083 SHA256 df7cd2129ee6478f2abade58b8237a79960322e5bdf4ab9a1751e4a3595e57a9 SHA512 2776b7c25b601ab5acd38debe2b7b9e238db923978a2e3a91042a763fe319d2c6e16db6e417e18837b1fd041ce06655fd840e6c2efcfe47e267c88b18ea13336 WHIRLPOOL 52c7a7b85056c3e7105a4123722d1303a9c197bd59842b58a6bb1fba71d4036d993ac95abca5ee7dc5ff80392f95631292b2751d27975ddeb4688dd5087e329c
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlQSkj4ACgkQiIP6VqMIqNcMmgD+KoTmnG+wZDSNL+P38BIG9IHd
-94A6cFJy1tOoTS303WsA/3Z9SUu4ycQ9ere5O8XDdDbDHiskuBuN/kZAMtuSP7ht
-=32m6
+iF4EAREIAAYFAlRTTrQACgkQiIP6VqMIqNfDwgD/XMirn6nZdFvqJkcffO0Bu8Hd
+s1fYU8eUS3zymt+2nOQBAJBV543xOj7gIRDVrY3QwF0/aE5JzQh/AXbGVt7SdINv
+=Nlr5
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/activemodel/activemodel-3.2.20.ebuild b/dev-ruby/activemodel/activemodel-3.2.20.ebuild
new file mode 100644
index 000000000000..777ed5384d16
--- /dev/null
+++ b/dev-ruby/activemodel/activemodel-3.2.20.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activemodel/activemodel-3.2.20.ebuild,v 1.1 2014/10/31 08:56:19 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="A toolkit for building modeling frameworks like Active Record and Active Resource"
+HOMEPAGE="http://github.com/rails/rails"
+SRC_URI="http://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/builder-3.0.0:3
+	>=dev-ruby/bcrypt-ruby-3.0.0"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/mocha-0.13.0:0.13
+	)"
+
+all_ruby_prepare() {
+	# Set test environment to our hand.
+	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
+	sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
+
+	# Fix bcrypt dependency since bcrypt uses semantic versioning.
+	sed -i -e '/bcrypt-ruby/ s/3.0.0/3.0/' lib/active_model/secure_password.rb || die
+}
diff --git a/dev-ruby/activemodel/activemodel-4.0.11.ebuild b/dev-ruby/activemodel/activemodel-4.0.11.ebuild
new file mode 100644
index 000000000000..8ce21f2c823a
--- /dev/null
+++ b/dev-ruby/activemodel/activemodel-4.0.11.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activemodel/activemodel-4.0.11.ebuild,v 1.1 2014/10/31 08:56:19 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="A toolkit for building modeling frameworks like Active Record and Active Resource"
+HOMEPAGE="http://github.com/rails/rails"
+SRC_URI="http://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/builder-3.1.0:3.1
+	>=dev-ruby/bcrypt-ruby-3.1.7"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/bundler
+		>=dev-ruby/railties-4.0.0
+		dev-ruby/test-unit:2
+		>=dev-ruby/mocha-0.13.0:0.13
+	)"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|'mysql'\|journey\|ruby-prof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\)/d" ../Gemfile || die
+	sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
+
+	# Fix bcrypt dependency since bcrypt uses semantic versioning.
+	sed -i -e '/bcrypt-ruby/ s/3.0.0/3.0/' lib/active_model/secure_password.rb || die
+}
diff --git a/dev-ruby/activemodel/activemodel-4.1.7.ebuild b/dev-ruby/activemodel/activemodel-4.1.7.ebuild
new file mode 100644
index 000000000000..c39698b635df
--- /dev/null
+++ b/dev-ruby/activemodel/activemodel-4.1.7.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activemodel/activemodel-4.1.7.ebuild,v 1.1 2014/10/31 08:56:19 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="A toolkit for building modeling frameworks like Active Record and Active Resource"
+HOMEPAGE="http://github.com/rails/rails"
+SRC_URI="http://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/builder-3.1.0:3.1
+"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/railties-4.0.0
+		dev-ruby/test-unit:2
+		>=dev-ruby/mocha-0.14.0:0.14
+		>=dev-ruby/bcrypt-ruby-3.1.7
+	)"
+
+all_ruby_prepare() {
+	# Set test environment to our hand.
+	sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
+}