Version bump for security bug 462452.

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

3 files changed, 82 insertions, 5 deletions

diff --git a/dev-ruby/actionpack/ChangeLog b/dev-ruby/actionpack/ChangeLog
index 0fe72edafd6b..0fdc929551a7 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.248 2013/03/30 09:32:29 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionpack/ChangeLog,v 1.249 2013/03/30 13:17:10 graaff Exp $
+
+*actionpack-3.1.12 (30 Mar 2013)
+
+  30 Mar 2013; Hans de Graaff <graaff@gentoo.org> +actionpack-3.1.12.ebuild:
+  Version bump for security bug 462452.
 
 *actionpack-2.3.18 (30 Mar 2013)
 
diff --git a/dev-ruby/actionpack/Manifest b/dev-ruby/actionpack/Manifest
index 74ef487c8cc5..d9d6cbf7fd5b 100644
--- a/dev-ruby/actionpack/Manifest
+++ b/dev-ruby/actionpack/Manifest
@@ -9,6 +9,7 @@ DIST actionpack-2.3.17.gem 744448 SHA256 f97f0e9804a0b3e8969b2ddd096d05bb6766d4c
 DIST actionpack-2.3.18.gem 749568 SHA256 304a9759801fe00928c14991e6ab252dbbbfa560e41ff9e5fdc66a65a2cf2ebd SHA512 d08af1e8a15b4b16f2160fe431b41b081f9442d0680bd30af20075186cec07febff85ac467924fd65cf8ed4f2fb808c5dd2e8f7d50c9e24d12e177659f30c3ce WHIRLPOOL 8d8aade452b5e715060ef327f41f78677624134ec0a9953a61dbf26ed0ab54bfdc7ed4f43e19f5ea190038c997cf25146912349bd35a1840c635d7713bfdfd1e
 DIST rails-3.1.10.tgz 3394031 SHA256 d0614db8c4011ed1fcb4bd0afeb8220634b1ec8b196ee40a956c77a76026ef65 SHA512 c6b3db4043345c81582ab22289c29630e3946dc1936adebff0af196f461236805ab146e74ed400fe045d980df562ae44479e36c2c8747ed8a6ba6807add23e6b WHIRLPOOL 5329cd31170ce2ee7c109c9c1152b5eed35c8ec1af48a84d03eff4bb4fe083a7a9840ceb076575961d84c6baeb725fe1c5eed1a4756d39a8bc52a26f23dc6123
 DIST rails-3.1.11.tgz 3393987 SHA256 763719d4bdb46b6b45594985439b1f063375f4da4f0af000414267e5d4633e57 SHA512 ddd3ef1ee9a9bcdc9048958adfb45fa60cf79e961b8fd728e55bb2281dcb51e8f010d2d14de97a60c4c3ff1480b419562d8281031c8ea1c02269263e52fb8918 WHIRLPOOL 76df2b987b2291b01a1d17bba54d3836c11523309b8e30be164ee901a2e4af8f2be943dfc928b64d2e8e2477472fb4a2632b4de30b933cb89d277e3cd3df0298
+DIST rails-3.1.12.tgz 3394369 SHA256 2321d18cd5b5c4929f09472d17fd05e21cc6470d7efd2886bfcf52bb89dbdfcc SHA512 49b886bf05c1c51b67cdf4a7ad688e633bdd0b180ef328f18c942cd13095668ed70cfe3b40ed2d77a2c8ca8c3d8474413dfa25c282afabe21ce790567874716f WHIRLPOOL 66e9d9709b7e8b00b096c43a5c5703fd20addf020c10df5764457ebf6ac515451f9e6db93a4925da9ab88e6942427f5a7fc0d20cf6381e8530f830605db7503e
 DIST rails-3.2.11.tgz 3547068 SHA256 3f05603f84bfb7a99f999f878af247533706255e6b3baa4111439b6f5fd8ab70 SHA512 50644772186127887bd4d7537ad41cbe549c5c8496274cad2765f21859528a0f42f5b8dbe3a1627a08b1724b2e019c0ec6526cccfdff3da4ffcec285f9259558 WHIRLPOOL 70d5620fc611872b2af62351c81abbe43b3b1d41c92a1d1935cef704a4a655c9bb043599bc758c947c14378ef52e34b44c61536d5a048401cc6bfaef613eba23
 DIST rails-3.2.12.tgz 3547449 SHA256 b3371bd5706903f740cb091deb992758011ef2dc3e9c79c8fda64819f0251f0f SHA512 61c74648fd81758b561ec8102573bf0099d67dd4c43bd76e93d2409ac03002dc4062154159e904cf52543e931980c418ceec8a785a5d977967d27bc60cf06a13 WHIRLPOOL 995dea20c8bee1fa93352430600257a4d2cc50fa433a9d06bbbbaa0d5e36f96e0d56fc599dcc092791ec982c8aaba8bbd608eaf8c2db81abd2ad8147c8d73da9
 EBUILD actionpack-2.3.16.ebuild 2231 SHA256 13447a302e027a5b3fcf1f2560a175bb14411d99d845517420fba426afe9dca5 SHA512 9cf59fc53595548e45022900c85f3e2cea869640537826077521a9e0046c85a8483cea2209f24af149b763f11819c3a00b9b917058152d2795d36a500d2da6c3 WHIRLPOOL e5956ec960137f064ba2fe50840d8100dc952bbefc82f70db7f76580f6684a5a847a3988120e8367c30c6d1d904c191124f90356515820916316e179dcdb1c14
@@ -16,14 +17,15 @@ EBUILD actionpack-2.3.17.ebuild 2319 SHA256 8f4cabeee6a449be0f65c53808ce24aac5d7
 EBUILD actionpack-2.3.18.ebuild 2340 SHA256 abe08633783be80fa41fc0cd3630c2b685f2e68a0862d51a6976f87e7f5d9180 SHA512 aefeb72839b7712f483892e2efc8885905a5270ce2eb5940725d18b12cbc45b4247d98dc521397df363feab46b7c75ccca38207233b543306a76ff899eb21899 WHIRLPOOL 1584c0c361239e7c5075a9bb889753c04ee230df42d3867caf48fa349e85f374eee16e207fe17c973bb1fa1a3eb853c006d5120b21f81d468c71f008e0c6b9bf
 EBUILD actionpack-3.1.10.ebuild 2580 SHA256 54abcad05f2efcfe8941ed77c982a5dfc1efb3775808aacf9b2ed822635324ce SHA512 1e0be27e84c67c85fc4ba264d3d4a0233ca4970e5e9eeacfd757e7b5ad802f0e35ec0de930ee5e3d1105b11bd247c37c604f1ec91f4da8d71b549a254bb0df37 WHIRLPOOL d6527bc2235b3a15c7924c0b63f21fea587900d11c606aa65d84ac0201f3b66b1d884c33c91e613438cdce082a8ef07446973a947b04383ea56d8e351c70c53a
 EBUILD actionpack-3.1.11.ebuild 2577 SHA256 cdcb2121887693fce6222bdc1effdc992900c86b1a77f054ef7fb498b6d052c0 SHA512 e7d4567a2d3d1576ed08cac7184e463c65b068123999a34a28898f3d2114aaba3d587e806a425ea783344f5dfb14798d67d1ba9c8031de08498518fdd676d68c WHIRLPOOL 43cadc657d5bf1fd9c52e8cb784d264eca62c9ea28b28ee9c8f9b3762c35a764f75407c1f486a24ba1fc0a0ce82a818eeade24fe4b8cc301c0467bbf2e46e0ea
+EBUILD actionpack-3.1.12.ebuild 2571 SHA256 ea13f8e791e4efd5c05aa7bc7b0c7452fca17e2ce2e8f947467017e95b76b590 SHA512 ed35fe8e02afa072e8fcf454e07927b9ed38010adb99e1f4c98962e23908f4b3bcae4aedcbfaa67c75219ef4cbf98289e63689cc6ccfe68ac0561be69c40ca0a WHIRLPOOL f71fe5e000f7a553426a79729467a963aeab68d5c8436e1a44e20481f2ceed80768395f5c257c01ead3e5ef51c6278734b30ee14bf1cc2f2e82e9abfea7a8cb3
 EBUILD actionpack-3.2.11.ebuild 2478 SHA256 2fd15e02d9d11c1663fb09439a26ea6b97a6f7565c7e88df0aeb40a39a3f8afc SHA512 d81bbddccb05fa5aa648fc87308a271e2a8b6d5f37da1605233ea41f32a275817b70b64f2ca0a199dc4dedaebcad0ceb18bf647d4c5825087dfc86ecdbde07be WHIRLPOOL 2a85b232d0ef81284fbe8b47b198040649d430e3a7d0b57e6daab2f26bf493693b109750f9e129c1482dcc72fd4661241c237ead18fdbae8fd36abad9e219c86
 EBUILD actionpack-3.2.12.ebuild 2659 SHA256 c38763624080b5490cd90c64055ea1020e3ef6ae58fc9799fb7630311196eb95 SHA512 b2283a6378203e274ce2779997c7bdceb787c5eec4d2e47cbecae48194dea14cc3495a2b98a98f47acc116202a43b6482a3ea6f2279d6fa26ae8e4bce450011d WHIRLPOOL 4dc0b69311d3adb022a1b9269cf2e141acbab2a667537d91d79e95f441731a9715c7884bd8951aadc17833d3ab32b91b2d38fee45cbb557f07a35198a5898118
-MISC ChangeLog 33334 SHA256 498b93993d40c78a834e91dfe21a8cc50585a270013dbb64e25ef55b6551b84f SHA512 5d5eca2d53d9f0efec8abaedd31eef551fdd56956ea1302dd5a46c0b35cf47a33d22d9148b04da4cafa0119142c02406dd7166e1312af85d61eaa35c9bcad659 WHIRLPOOL 172069ad70437abdee800eb9c140ae7175b4529f6734db3bee8ef49aad838b3fd09f34ba7802d8de7f28d9de5fbe8c85ee3fa2b04c988b4bb86b1237d085b58c
+MISC ChangeLog 33486 SHA256 025574920c0fba59b48324fc02acf35c6ff06f3fe9e2a5aeeb55545860cefa90 SHA512 3122d51f3a8b86df173fe3b2a3dd4552a946964ad2e4f3b42cdbea7df4dd9ce3f689514ad397785aa694f3cc1c810de371a78b53e79e5b255278819a55dc2a87 WHIRLPOOL 8619ffa472260a33e103515f234b256fded5ddc60791257f268aa86b08a63fa1bb9da8e2d5126282ebf19a58e7a90016c2946278c35cd51f131b2ff380d88aea
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlFWsS4ACgkQiIP6VqMIqNd1DQD9HcAsB9gtYzsasGrluN6OkuBX
-ibeYQpCRErDuXBroXiMA/03Mvm6DRr9UXK9VbBwINuALe1l5vjrOT6woMI95GyId
-=PW3v
+iF4EAREIAAYFAlFW5dcACgkQiIP6VqMIqNd+nAD+LDC2dIvDHRAieBvboC8XOSHx
+ycjxtI6lTS6BRjXztfkA/04PV61hZCWf3+OKuhHLACLbTAXcpG0UC5bE8F3Vw5Zc
+=XHX/
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/actionpack/actionpack-3.1.12.ebuild b/dev-ruby/actionpack/actionpack-3.1.12.ebuild
new file mode 100644
index 000000000000..f8a269a670e6
--- /dev/null
+++ b/dev-ruby/actionpack/actionpack-3.1.12.ebuild
@@ -0,0 +1,70 @@
+# 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-3.1.12.ebuild,v 1.1 2013/03/30 13:17:10 graaff Exp $
+
+EAPI=4
+
+USE_RUBY="ruby18 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
+
+DESCRIPTION="Eases web-request routing, handling, and response."
+HOMEPAGE="http://rubyforge.org/projects/actionpack/"
+SRC_URI="http://github.com/rails/rails/tarball/v${PV} -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="3.1"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RUBY_S="rails-rails-*/actionpack"
+
+ruby_add_rdepend "
+	~dev-ruby/activemodel-${PV}
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/rack-cache-1.2
+	>=dev-ruby/builder-3.0.0:3
+	>=dev-ruby/erubis-2.7.0
+	>=dev-ruby/i18n-0.6:0.6
+	>=dev-ruby/rack-1.3.6:1.3
+	>=dev-ruby/rack-mount-0.8.2:0.8
+	>=dev-ruby/rack-test-0.6.1:0.6
+	>=dev-ruby/sprockets-2.0.4:2.0"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha
+		dev-ruby/bundler
+		~dev-ruby/activerecord-${PV}
+		~dev-ruby/actionmailer-${PV}
+		>=dev-ruby/tzinfo-0.3.29
+	)"
+
+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"\|ruby-prof\|benchmark-ips\)/d' ../Gemfile || die
+
+	sed -i -e '/\(rack-ssl\|thor\)/d' ../railties/railties.gemspec || die
+	sed -i -e '/mail/d' ../actionmailer/actionmailer.gemspec || die
+	sed -i -e "s/, '< 1.3'//" ../activesupport/activesupport.gemspec || die
+
+	# Loosen mocha version restriction
+	sed -i -e 's/0.10.5/>= 0.10.5/' ../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
+}