Version bump for security bug 520212.

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

4 files changed, 128 insertions, 15 deletions

diff --git a/dev-ruby/actionpack/ChangeLog b/dev-ruby/actionpack/ChangeLog
index a97cf553b4fa..d3f5dd09e816 100644
--- a/dev-ruby/actionpack/ChangeLog
+++ b/dev-ruby/actionpack/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/actionpack
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionpack/ChangeLog,v 1.288 2014/08/16 15:58:53 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionpack/ChangeLog,v 1.289 2014/08/18 22:17:52 graaff Exp $
+
+*actionpack-4.1.5 (18 Aug 2014)
+*actionpack-4.0.9 (18 Aug 2014)
+
+  18 Aug 2014; Hans de Graaff <graaff@gentoo.org> +actionpack-4.0.9.ebuild,
+  +actionpack-4.1.5.ebuild:
+  Version bump for security bug 520212.
 
   16 Aug 2014; Anthony G. Basile <blueness@gentoo.org> actionpack-3.2.19.ebuild,
   actionpack-4.0.8.ebuild:
diff --git a/dev-ruby/actionpack/Manifest b/dev-ruby/actionpack/Manifest
index 286219c7a225..1eb40787c662 100644
--- a/dev-ruby/actionpack/Manifest
+++ b/dev-ruby/actionpack/Manifest
@@ -6,26 +6,20 @@ AUX actionpack-2.3.11-rails3.patch 416 SHA256 8b2dc793f9e8b996c57dc77b3898a54757
 AUX actionpack-2.3.8-custom-cookie-fix.patch 3009 SHA256 9368cd7b35fbc0b5d4161e121aa9ced113ea831b738a47b6c59828bb17f24c04 SHA512 4e8a1ed63446c946722922b2cd5901b27df4ddcd7125b0c1777148e675117537e9394ba998093667f79e1349ec79a61b7e2e9c6d704327a3e000992f7ae3deb9 WHIRLPOOL e7a716f7b45b8f20eeb0be4faacdb973b172a7f44168862a228ce242afd88db512c73b64cf9bb8faab1e5ca698e65dad8746ca1fbf7cbdf9273819d722c3d32e
 DIST rails-3.2.19.tgz 3567409 SHA256 41d63edbdb0cd880a80ac806b1e1c903efad40f5ea64e99e19ecc98b134dba41 SHA512 4e75777f292ac329c893d13f7632ff7ab9cd3c953eaca6bfc90f6371821ae5f95a6dbcb00f76e202fc256c1da0be641fa804a4f589805521be0a1736331e41ba WHIRLPOOL 8e5a4cd46cdc97587bfab2dcf392625e5832265171a1951409323d9ed9f9896c986a81e90e5b570c008125d042090400afb963d12a029237a5e69895ddcbf207
 DIST rails-4.0.8.tgz 3754211 SHA256 8e005661e342feca5145e3100bd814387f23b6e1578731c0f0051d361f23ba4d SHA512 4344b58bd02ff7d14d634260c65030d4f4d6bbb52096d34399ef97c40f6892987d5111cc80653eb33e4ad579fec6b863bfc66dd3a577663c29155b03da113d6b WHIRLPOOL bcc901197404f03af025eac239c82be64643860da88c1626918322aff28c40fe24e440d4b711d7f3fc9f247fb7f273d05154f5ff04c1a91ed138b49bb4e6804c
+DIST rails-4.0.9.tgz 3755070 SHA256 cd9d1fc5e24ad6d5312c1d43954cf3a03128158541ce06b763e8e004dd39f9c2 SHA512 b41162cdc26253b43142fa628475996652ddadb571956588bf8e869a56e31f116cb89d514ad23f7b8cb4c2820a043ead476a8cee4a289d3b8bc164b71d38c67e WHIRLPOOL 9559a6bc01b409a5d48b8f19be5aa20b02f1dd8bf15a75277a0dfe88d2dc766804bc8d92211a385c2b15d32d8a174790ccf98158c8bef92c1d05c3cc41c324e7
 DIST rails-4.1.4.tgz 3698616 SHA256 77cfd1a7cc5ef37ae3bb9373e3d6770e5886c8bb316bc3d043dfc7afeccc877b SHA512 95eee02d04669ce47799df1677709c3c7364c18f23e1403d090826f18a087c890a329920a00de46d2b23c458464fea72dbcfb067bae229880c2bec979ae5c083 WHIRLPOOL 538fdca3e46b74f612b4c594e96fbbad5c100ab8230d38442b5ec9058b5f69ed606096025e7ec531ce747ec9a773d8f8daf717a41eedb4f509bb525d282efee5
+DIST rails-4.1.5.tgz 3698902 SHA256 e11a06f8e2d442540c96bacd6d185b4a46d33801c699ddbc42066708c4198ad4 SHA512 37d9bb6bd67edafbec72167a30b0e82aad3fbeb33f492a58367214a68a05f659423f508df23bbecc9d4a4477ee3e7ee03772d985cb86e9c85fb5f358d4fb00ba WHIRLPOOL ca5cab98837fde771b96bcb4317427faec7d984bf0ad8a249a4087c4552bcf9100d39faa81fc2b9b5781c0d2a0b6175ed13dc1b14f8a2c07f8af8255e590859b
 EBUILD actionpack-3.2.19.ebuild 2881 SHA256 125bbae5565c7c64e8c3cfaaddb6d1950c44b053e8e186937bf9d60eb6ef4ee8 SHA512 a9794240ad53f46caf8e6b01cb2cbf4e78139bfaff7abb19a3a97c87bf08bae7a95f0249d70e0daf8e2024bc2d00c6a3d177a6b4ee5925999b098061e01f8922 WHIRLPOOL a7ad6836b316cb0d1a60bc759516044ca2fb3a0d4af6af25870f6fef31d8943eac33e6aa8d5b59abb6344d5b77d4b6b80ffd10ef84d40db2b08c334772a24c32
 EBUILD actionpack-4.0.8.ebuild 2211 SHA256 d01cd06eac9a177b2e89f74ae5f6f91abbd20c99e54b93c5acd0bb3a84d01d0f SHA512 e4a298dfbfa21ab5e0b1dfde609190b64b89ae763002c9d84f2e837a0e526806df74acc013e9e9c45d70099fcd43579acf21e049f9abcf20cb6f6afc9f417714 WHIRLPOOL 021b795b15aa2eb25b904a1b9f1bb64a4ca0250606df548772aa781c8113192a7b5d11dab76aec775b9e2e017db210be9672f0b3d0eeb5e9f528feaadc523b63
+EBUILD actionpack-4.0.9.ebuild 2209 SHA256 34c213b2ef7eac5ab2ebc21709d0c414d30e7aa960a672f444964edb24318918 SHA512 3a1cdb35ba96f83a3da86ce2d27b8392d108047584901c17ea457a2b515e5f69410a91126ee50349f1b8fcef9f83af1a99ee28003b13fc7cab7072210b5398e6 WHIRLPOOL 3c8d60c5b79433d3096455c95ecd512495fe26b4776ff1f008f458785aa4ee9e9e56fc1134364bf0a89d1a0ecabdaae9bacf5f542eb75bad58da369a23c209be
 EBUILD actionpack-4.1.4.ebuild 1439 SHA256 59ed785ac3fbc2a15beccdc004f1752caeb102952cb06d29fd9248cb4daaafce SHA512 d3637f1623064a6b6dc2060e8339e03e0ac0385695cc5d6f3aea5ad0a3d80c304abb5a0a974b8981ec122012a5f0b7e035de12245d57093482e224d6f844e6f9 WHIRLPOOL c1158a148018409bfec5fe3dc2cc73a80fc848fa4907ee5915c525fd0ec313479a85115491243d079adc0357794f0c9b7b0dbc93609d8db53dbd4e4296db4a5a
-MISC ChangeLog 39152 SHA256 3cff904bfc8bbe6cf687fe6f8ab94f7becc1f7fa39ed50c5e32d9a05bc5376d8 SHA512 70573bce05601623486ef737842e7d8bfb9e9b9668e4814fefabba97bfb777cd3e579b4d875b1941fb5f36e51d125c7a9c814e46f999b2eeba04a4fc6af2f2a4 WHIRLPOOL b025457a1472ccdd58c3ef45ebb188897ccb0320b6a91812948604ec582170716cb76745746d58911fcd575162b62a9bba057bc9d39d536f3870dddb9d976d1f
+EBUILD actionpack-4.1.5.ebuild 1437 SHA256 4c59556834f6cd4b0c21ecefa74a82b293f919dfaa677b9a09efb0106a40b161 SHA512 38871dfce22fe9e47e0817cc91de484983712bb318980af2bfd4dd3ccfff5ab4cbb004171b5960cae20aee1ca10ffd0c2e36a5425fdca27a49cce1d6fff73f97 WHIRLPOOL f920935f589f699866b0a4754f9884183384bcc11e107ae446cbe0b7a2970f227456f69b74377001a308234f75f419ef883806e850c90a670fb6b9fd3dc27ee4
+MISC ChangeLog 39360 SHA256 cff3a6131782a50cfac409d514ee8579dbf37db1a24efaf4f58d49f8560bc18d SHA512 e2e202a6d4129d359e3f0a8f4c7f65b5ea21a3408aec06183d60687cc51886592c4c94b574c193fab83a35674a59ae430e0d67e359f2a44e10551bfd93d94c92 WHIRLPOOL 4b2cb4cc5bcefcfbb2c00271d06539d1b2541bd4d9384f8d04cba7776ea9a690d2e33f2509ae7af318977013d4958c2250367a61209662835ded3e7057d74697
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJT74BIAAoJEJOE+m71LUu6uzkP/3Z2lmwTazKNS4ONjKzKlPEw
-W1mpBs1qSDX28/Tnn7V5cydkr7GlbipIKimcFDTJHCi9RT3GxlPpgYXJPXusN8ap
-btGqbPnuHh9h9KPmhnRsy//cy0ttg+DAluQxvaT/jBFgAEozVts3l1JXrgWQTGd0
-iRX3rc3cM5InAgbx/oUiuB1WsuHRODiAlOxi0lzyB6CPW0AVW+wgE7qJSGkuXGw+
-XYKuLcQOxziFACh+aRNpPhUqv2aF9QaX8E1vK8y5e5rmY10U+G6kyNpgygrnOWWt
-You6HgSOjoPWbC52Y7oaY5n0voNFvRrTre6HfWFc0JFEGubllIXO8tY9meEojS3T
-DQKn8x8m8l3qakGd9G6/WLPQzXHsXQOdeG5DcCMZKJOsj3vBPc1eQtB1n7ldlCNa
-knOYOZBF0B3eCTPiThjJAeLmy6wm3yC0vuAiCxN5A0WI9JY280WGLQofgo8vIcaX
-oEEQ2YZ5s+DQkpauWfEPrid+e72tixEZ2+xdrxfAWozrcVNO2Yu8ZhsrEERPcujz
-PGmiylYS8GCVBqhuTzSIQCopbrbiLDvGv+X4etibPmW9mhxPAFHezIuj9CDhgLMf
-Dt15mRpTYcqAhGWfN8xNUaheC4tBTxxgK+iGjDnMc3X7ZtrjecnHrlhticJSsEdZ
-KCupfX5ffpH/sdjf+rSY
-=XExO
+iF4EAREIAAYFAlPye5EACgkQiIP6VqMIqNcfrwD/WhYSf+KZSSxFs5E0cYfKMMh4
+0WSisTeTuXVZg7NZLCQA/jbDNZQ4AtPdL92T0frhHn16c60An9X8C7JnrpBx4QcM
+=K6os
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/actionpack/actionpack-4.0.9.ebuild b/dev-ruby/actionpack/actionpack-4.0.9.ebuild
new file mode 100644
index 000000000000..613c29a2a8d9
--- /dev/null
+++ b/dev-ruby/actionpack/actionpack-4.0.9.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionpack/actionpack-4.0.9.ebuild,v 1.1 2014/08/18 22:17:52 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21"
+
+# The default test task tries to test activerecord with SQLite as well.
+RUBY_FAKEGEM_TASK_TEST="test_action_pack"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Eases web-request routing, handling, and response"
+HOMEPAGE="http://rubyforge.org/projects/actionpack/"
+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/rack-1.5.2:1.5
+	>=dev-ruby/rack-test-0.6.2:0.6
+	>=dev-ruby/erubis-2.7.0"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha:0.13
+		dev-ruby/bundler
+		~dev-ruby/activemodel-${PV}
+		~dev-ruby/activerecord-${PV}
+		~dev-ruby/actionmailer-${PV}
+		dev-ruby/sprockets-rails:2.0
+		>=dev-ruby/tzinfo-0.3.37:0
+		>=dev-ruby/uglifier-1.0.3
+	)"
+
+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 "/\(system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|'mysql'\|journey\|ruby-prof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\)/d" ../Gemfile || die
+
+	sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
+	sed -i -e '/mail/d' ../actionmailer/actionmailer.gemspec || die
+
+	sed -i -e '/bcrypt/ s/3.0.0/3.0/' ../Gemfile || die
+
+	# Add back json in the Gemfile because we dropped some dependencies
+	# earlier that implicitly required it.
+	sed -i -e '$agem "json"' ../Gemfile || die
+
+	# Avoid fragile test that gets more output than it expects.
+	sed -i -e '/test_locals_option_to_assert_template_is_not_supported/,/end/ s:^:#:'  test/controller/render_test.rb || die
+}
diff --git a/dev-ruby/actionpack/actionpack-4.1.5.ebuild b/dev-ruby/actionpack/actionpack-4.1.5.ebuild
new file mode 100644
index 000000000000..fc95686f76fd
--- /dev/null
+++ b/dev-ruby/actionpack/actionpack-4.1.5.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionpack/actionpack-4.1.5.ebuild,v 1.1 2014/08/18 22:17:52 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Eases web-request routing, handling, and response"
+HOMEPAGE="http://rubyforge.org/projects/actionpack/"
+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/actionview-${PV}
+	>=dev-ruby/rack-1.5.2:1.5
+	>=dev-ruby/rack-test-0.6.2:0.6"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha:0.14
+		dev-ruby/bundler
+		~dev-ruby/activemodel-${PV}
+		>=dev-ruby/rack-cache-1.2:1.2
+	)"
+
+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 "/\(system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|'mysql'\|journey\|ruby-prof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\)/ s:^:#:" ../Gemfile || die
+}