Version bump for security bug 493284.

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

3 files changed, 86 insertions, 5 deletions

diff --git a/dev-ruby/actionpack/ChangeLog b/dev-ruby/actionpack/ChangeLog
index 3b190d95e03e..ca4453d98e76 100644
--- a/dev-ruby/actionpack/ChangeLog
+++ b/dev-ruby/actionpack/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/actionpack
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionpack/ChangeLog,v 1.263 2013/12/04 08:05:27 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionpack/ChangeLog,v 1.264 2013/12/04 19:23:51 graaff Exp $
+
+*actionpack-4.0.2 (04 Dec 2013)
+
+  04 Dec 2013; Hans de Graaff <graaff@gentoo.org> +actionpack-4.0.2.ebuild:
+  Version bump for security bug 493284.
 
 *actionpack-3.2.16 (04 Dec 2013)
 
diff --git a/dev-ruby/actionpack/Manifest b/dev-ruby/actionpack/Manifest
index 735ffcaaebc9..206762be529d 100644
--- a/dev-ruby/actionpack/Manifest
+++ b/dev-ruby/actionpack/Manifest
@@ -8,16 +8,18 @@ DIST actionpack-2.3.18.gem 749568 SHA256 304a9759801fe00928c14991e6ab252dbbbfa56
 DIST rails-3.2.15.tgz 3566493 SHA256 6fc98f28742e6423efd151d4a0005c10cdf83bf1cef3350042f305d15474b286 SHA512 c2fa25a81b5c77a9054fc8b42a9fdc0733ef175a981ccdbff77eb33a08aa299c3a3ca9469ab80234b01fbc4eef7ccf09c4b3f55dd04e81bf4f8cbfc7eaf58719 WHIRLPOOL 18e8f8b2b90886bca4572efe24508fb77f5a227fd3f3d4732da68f52baea9a2fdf7b620023c8cf229354e4fca85eb9f28886b7b27f862693dbd383a063e961cd
 DIST rails-3.2.16.tgz 3566631 SHA256 8fe61b98496e40d8aaef5f8db217f2aad56c9add1bf8417c37a0cbd24f74a57e SHA512 304ef964c33eccfdd4dc1a1c47d43b05e7498d869c64a2ba7a62e8356a07d03cd3f48e1edb9b80d2de1cafc8d91f6ac491df9b0abf3c30d6d22f34f39571965e WHIRLPOOL 5a6ba360c741a7aa3979722ae20790df65e05347a4bad77eea805a9601de2e4cc50a02b8f75d7b7e827da8bef62e8e4e72bb4d4c1de9e783f8f5b95d156bceac
 DIST rails-4.0.0.tgz 3705371 SHA256 644601ae66881313346ffeacd9ea372d249df55aa7abe853acdcb231fffe6bbf SHA512 3e03f25de83ff894a7affdebe948fd151cff81c8ec906692119036633d891c9ba5cbb312e3ab32f1e62f4a383fcfc2e878daeb62fc04336e932b2e2bda63f7cf WHIRLPOOL 792513f2fdfcbc2a57633e3ef344943948e5614c638b06cae1245fd84716d84b5391a7906123a94a1a325ad789bdc465a4f7e2b774924bd0f18d341c29109a82
+DIST rails-4.0.2.tgz 3720518 SHA256 cd973b85cfff735da80d8ed4e11421e2242be735d96cbe4d83ac0c4b6ca7c8d1 SHA512 67d7580c0081deeec4271f96caca6d6db8f65864c876a237e7e3f0e8c6e495d299f103dcbe7627385fa4fd3699dac5015e20be90187ef3b2af49352ad9c8d6af WHIRLPOOL 5b496df36ca4de6a4b55951fab2403bd8b31b3505d17d450bf2edf084429a7689c4fdeb8d19d0be40b2d4d0ada8cefd6c3fc104c2428769d2ca8e434d97c6465
 EBUILD actionpack-2.3.18.ebuild 2333 SHA256 1ca52f8abc2833f4e1284fb8c91630a4a8781fadfbfdd2c73a935ae0b473d936 SHA512 a7b6d6cac222d9dc34aa15e9d52e188f76c8701703a235580b3fddda9e2d11966e43c18eabd4303a3a3911115073f203c4c9843795bffbdaeed86b112e571c7c WHIRLPOOL f61842f109e5d167f38481ea7a6e4505ea5d1b5bf69a37754a968558ba83dc128647afebe0d195c14bea5a8857a712a7a95344b0019da0b34670bd42ef9705c3
 EBUILD actionpack-3.2.15.ebuild 2702 SHA256 f73b96d5bdad658005bfb7a1d742dd2965ff7d2989dbefa757c2553555e93a23 SHA512 163b7db4d989bd3a0221500c1a2f3a89f2eba5b477e873a46ff90b0d2eea3b7fdacc41167819a3b01d68e1ac8ca66d8987e67bfaa5165c87dc98f3a39522835f WHIRLPOOL d380cddbd41389168e09b52d2488ef93ba4ec7e51c94f0085b647f86cea31c445976106d42841a916b663936a81dee5200d76bcd53414829e4722264613f30fa
 EBUILD actionpack-3.2.16.ebuild 2858 SHA256 3e8c5cd7b27264c8170df6ec7f09377050df9166c6f8954760f59fca3a076b0d SHA512 628b22915c8285aefdfd643f729e97b6097aa0e3875e55b61749e1718081a9b8be362207096efed2ebd44d2bdef091c2f826626a7cdcfb67bc13b758d37e3eec WHIRLPOOL 264d516b1204bbc46a8d64209d3716f19d487b64b5a324d05b9f1bb5a1c83e3cc6989bc81a91ab2ab57144faf7831a8a8931020fec3de00bbb1b7369ba64b39e
 EBUILD actionpack-4.0.0.ebuild 2768 SHA256 527ccec953879e51fed121185225c237a9818862daf030d401dd56ae420975de SHA512 639687a105b01c08358bc44a6ebc149fec91a5e4d46546d6ae1d902e70ef91f691eaa4b07446e523380d5e83971fc2abcecc63afd797a61b2468cff872a4f3dd WHIRLPOOL 059d29a645c87a9cfcf0a57986212202e9a99463411a2992917c14996074d4066f1e285aaa9366f8efaffa95fa5bfbc42b27f97769829ca5770d5715a591052c
-MISC ChangeLog 35438 SHA256 8c6174c878de0c42ad14473919c9a6a8ddfab5301376e26cdd3bf5c56af4bbde SHA512 70b99fad0949967c8e18a29b2523a1e5b18eb7bef8529a52d87bf5539c05812d287abf07dc5aa72c23589296a4fa1cf9042d5be8a33099f44295b6a754b18295 WHIRLPOOL 39439d0695165f25dfc8bd617f4c7c23de057e942bcc91fd1c498852720616455ad9c62f3d9a43d3445312344ff1bf76705193ad78625b7fab607bd0210c85d0
+EBUILD actionpack-4.0.2.ebuild 2768 SHA256 738585537cd7221a5af51181554b3958dc571a4a164f485cd73e1a0e89443a37 SHA512 04e5860205660ad8a197b3ea61a2342a814682654e487317f5623b92be8e597bf3629610e0d00f03a915533c4b18fb35b279d6e64a29fd2e9f9a21708b449903 WHIRLPOOL b7721f98331aff874971874fc66ce29565f97a47ffdb6d3c571966682be8a9a6c787a4cfcbca0fd6c77bdc4524b9bacf3ca42b42b05c59e06a3e1854abdd30c2
+MISC ChangeLog 35588 SHA256 1387f314cf0ceb50f240774fbec2e486b384e1c349bac479c79b4788684a585b SHA512 dd2dff47c79c6f4cabf49c71ac45792c8e780e271a232ceb868dfa4f876b2cc5275110426b7a63337b52c79786b8ec7ad8559cc2a401ab211d53736a3454b239 WHIRLPOOL ebb69ebadfcb3deaa0245eea11c427e973b346c39c45c3dc52bc24ecb1db0ce42846dcb7866c15e64104bf5a158da5aee34745a9318c9c2faccc73290245b6be
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlKe4kgACgkQiIP6VqMIqNfsqAD+LxFoCmiUlhoUdrHoswpmjWc3
-RUAwi61oeh5mu/xWX/MBAIRtGt+5/QssTwfsjBBT1my8c9jm0Q70+ANVR98xdpM9
-=Ozzq
+iF4EAREIAAYFAlKfgUgACgkQiIP6VqMIqNdVZwD+Np0RtArOpytXnLp+C6K2GR+v
+x9Oal6pLssrWhI8j5V0BAJgVrFT7dstTyj9pl1sbtXlHgQE2VKE8HnYlPNHmMXL7
+=8NvE
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/actionpack/actionpack-4.0.2.ebuild b/dev-ruby/actionpack/actionpack-4.0.2.ebuild
new file mode 100644
index 000000000000..5500e931ed6b
--- /dev/null
+++ b/dev-ruby/actionpack/actionpack-4.0.2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionpack/actionpack-4.0.2.ebuild,v 1.1 2013/12/04 19:23:51 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19"
+
+# 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"
+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/sprockets-2.2.1:2.2
+	>=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.29: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\)/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 tests depending on hash ordering
+	sed -i -e '/cookie_3=chocolate/ s:^:#:' test/controller/integration_test.rb || die
+	sed -i -e '/test_to_s/,/end/ s:^:#:' test/template/html-scanner/tag_node_test.rb || die
+	sed -i -e '/"name":"david"/ s:^:#:' test/controller/mime_responds_test.rb || die
+	sed -i -e '/test_option_html_attributes_with_multiple_element_hash/, / end/ s:^:#:' test/template/form_options_helper_test.rb || die
+	sed -i -e '/test_option_html_attributes_with_multiple_hashes/, / end/ s:^:#:' test/template/form_options_helper_test.rb || 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
+}