Version bump for Rails 3.2.18, security bug 509706.

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

3 files changed, 93 insertions, 2 deletions

diff --git a/dev-ruby/actionpack/ChangeLog b/dev-ruby/actionpack/ChangeLog
index 04d92010322e..dc0ca442f72e 100644
--- a/dev-ruby/actionpack/ChangeLog
+++ b/dev-ruby/actionpack/ChangeLog
@@ -1,6 +1,11 @@
 # 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.275 2014/05/04 18:05:34 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionpack/ChangeLog,v 1.276 2014/05/06 18:52:29 graaff Exp $
+
+*actionpack-3.2.18 (06 May 2014)
+
+  06 May 2014; Hans de Graaff <graaff@gentoo.org> +actionpack-3.2.18.ebuild:
+  Version bump for Rails 3.2.18, security bug 509706.
 
   04 May 2014; Manuel Rüger <mrueg@gentoo.org> actionpack-3.2.17.ebuild:
   Add ruby20 support.
diff --git a/dev-ruby/actionpack/Manifest b/dev-ruby/actionpack/Manifest
index e0b70c1156cb..921d6b8a371c 100644
--- a/dev-ruby/actionpack/Manifest
+++ b/dev-ruby/actionpack/Manifest
@@ -1,13 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX actionpack-2.3.10-i18n-0.4.2.patch 2671 SHA256 7060319a5037c3623e8c5beb36133dde6d3e358746fecfc0ee072edbec5b33e5 SHA512 d9e258d26b60166987649b52e7edccc22c37f8e915688a2ceee7088b853a1ca262cf34630b5712c7a02f027984b4eb37296d1274475a16317cbb5778777cd173 WHIRLPOOL cfaa63240a403b09b23893f76205aacc317e010936cca8cd46b7603eab4aacf7c2b09974ff3d5533524f40eb4318db30c0bab3403a688588da194ee2c6df17c7
 AUX actionpack-2.3.11-rails3.patch 416 SHA256 8b2dc793f9e8b996c57dc77b3898a54757f330b8c95ee94c9bdf3b0013350093 SHA512 3e9540bb1777b29736285561ce1d7466f0497150927d40169fd5ce222f803df595105c9f222ff223e923b8b5411d90a92d265b727104f1f494693a7bb100b3d2 WHIRLPOOL 3000e6b584ff572e246d2b281cda1075449af85f905dff6bf591f75de60145868e81af7753882b29af48d45e69f79db3898610646ac5af7862e13f0e24dfbdfe
 AUX actionpack-2.3.8-custom-cookie-fix.patch 3009 SHA256 9368cd7b35fbc0b5d4161e121aa9ced113ea831b738a47b6c59828bb17f24c04 SHA512 4e8a1ed63446c946722922b2cd5901b27df4ddcd7125b0c1777148e675117537e9394ba998093667f79e1349ec79a61b7e2e9c6d704327a3e000992f7ae3deb9 WHIRLPOOL e7a716f7b45b8f20eeb0be4faacdb973b172a7f44168862a228ce242afd88db512c73b64cf9bb8faab1e5ca698e65dad8746ca1fbf7cbdf9273819d722c3d32e
 DIST rails-3.2.17.tgz 3566537 SHA256 f94972ed71c005ae1f7520d8840852872fbdf6c834bb2eaf1516fe63e406d609 SHA512 4ad32d71108d444bd791ffb2fded25deed69a304a4d6497fb12a586e07348bf4cd1a453614eb932a907063ad6166b89f4778742cb5c2c420f17a116e11b964f6 WHIRLPOOL 0b0911120202e3152a74d31f3b7f8a24261f8e163577ad88c12fd85be088871a0f8ed46b305325250bb830f786231ff349e847b2f642cba02905a95a9a022d68
+DIST rails-3.2.18.tgz 3566632 SHA256 25f5c98c965a222b001ee07eefa7e2c3719bfd8f6a9b44eedd4759c646b05895 SHA512 31e219eb038bffe395d2dddd59d5b861001f5ffe88bb1fa33e87e584d70f0d0a8143b905cf736dd328dcea1934ff662e59ab20e3e9593d919b1110bb1f92a3f1 WHIRLPOOL 3188b58902092c5f2a4c6ea905698200b65e9158c0bac41374187bccea9fc68bfc05631060b2ef6506cb69d13fcf38ee7c8a5aec9e3166a9914c59110b4e3592
 DIST rails-4.0.3.tgz 3721788 SHA256 deed80da9b800789a718f95dde5a0a13f18fe6d0169987165a54e7b6d8edd4f8 SHA512 4ac37e5f2c3992aa33020cb7287c9415a014c475dc176b2b51e6112da8bef3b8626216134c5495a8643a9452c7bd78af9a4e2bc77e9c098f8908335d4a27a918 WHIRLPOOL 52bdd5ad2cfe74976b2565963cddc6cefd51ec95fa4f6ca6cc81fe7444271e734caa0800b3cc7a425be0f7dfa47298079b10cacc5909925072935661cfc78974
 DIST rails-4.0.4.tgz 3742294 SHA256 301c7320cf2609a52c230b72f694a669637e39625bbbc42286903b1ebcbc9816 SHA512 781fc5b19ff20da39793ee99761db476de30d55c6b82af040a8f6c69ee608780c14fb91047cd5dbc1d0ba44d2f1b3e862de45210a2373d98fc9bd2beb526e282 WHIRLPOOL 9535db2609e56e0c161beaf50e798334b6619ffc90c09b7dd54cd7b1e0a04b7095d8a21da99a4c6978390f09f1a43341e9e810d13e0eeb2ee54dfaf04f07a139
 DIST rails-4.1.0.tgz 3678238 SHA256 0f2cff305d20d374a7326fbaaae991ac380676b1a4a710f36ac99b410902cabd SHA512 16a6ff43f19cb1bdbe0cdd4729bf9d198ec38ef258362832e6f1d2a065569a133527c7bb4f3394d8544cb012e9af41a643122600b8a196f9d75ab541a32034f5 WHIRLPOOL fb365255d0752104815f0d143f45c696b50863b83af0634a26c407d01d3d1f402b516aac3de425e696cb62e33ccb0395884e0ae68b9eb90608bb203bb1d2ee2c
 EBUILD actionpack-3.2.17.ebuild 2867 SHA256 747b932a47d677b9f4eefe0e41639b549b60d21f974a6430a9d013fe9e0ff988 SHA512 03beab9a3c2ddf5a6725f48ce6ae65655ba8455a6be603e60afddc6d15283547a9e8c6d6b357b76b5525679b0f758c3d5547e9259db02524cde73eb99f07b79c WHIRLPOOL d32c2923d961a2d7bfd77525862587da1703881e53378c56aaba37fd6584bfeb945a9c4939af8f79548d8156745d3ebc0170f93246ef54709692ea12a94ee051
+EBUILD actionpack-3.2.18.ebuild 2868 SHA256 564c8b8afd05ba7b7a185b44ab3cc7cdd50f383b08952d2f401344fb3bded5ae SHA512 0e8a673a8504f2660f53ddccba1c99895360bd8a26293f90ef7bb512d33edeebd93e6b08b98b13b2ff1c68973cdae34dc9e2a65cf2afd00afffe36c11bafe81f WHIRLPOOL d20d6e3a77e51a122c133f87ff66cae96e1b1d3b7c6763a8d09ffb01bd4bd8264052b2f5e965f6c519d04413eab00e3f3c10b3a78713259ad8609ccfd621348a
 EBUILD actionpack-4.0.3.ebuild 2771 SHA256 ebeec611db2676836b269a492cef7bd0d11f02f5ecdc972e0941e03741470bab SHA512 a7f7de5cf3e9b1a24e79fceea840f8d6dbb6487a7ed69e3c29e27cd198a182631bf918706b5ab3bbdb0accda8007c5d4e0929d45a3ec546136ba3690c0830a72 WHIRLPOOL 9f58a9541a1830ce5a4cafd9781117ec0e51859e259e327d5d6b07ff63db26f4d4bb3daf31a7043c7902bebb9373a39908615c6a860773672378dc666ea3bd38
 EBUILD actionpack-4.0.4.ebuild 2755 SHA256 9541b5f7af43b8f18ccea9b4040fe4672a657fd8af892bd35c08826c2a0d19cb SHA512 e218731065f29b08a9464e610f1b9c3a6fceb3a648891045e401928153be31db81a427a7486cea35b92ff4b273bb617bac2faffa5ca37e922209015ac0e85995 WHIRLPOOL d01cc8b9b33d13088c9e310f026d39fa1b61b41b240c8edfe2eef77f7ab8141c7c342bafb9d123a86d323a3de3381dd7ae0d8f108389da2402198791a5780895
 EBUILD actionpack-4.1.0.ebuild 1416 SHA256 a6e0d72ef2c6f2f4efe932b294ce9b43abc5ac0f47ea32eaf746f1491eec5bf9 SHA512 0dfa0e07e9dd801327d8662dce5bc65c8e0bfc0368fa12b75572adc97c1733c3fb8386207d3d94f50ca827ee27e27f408d4aab6f26a1f31f77bd3a5ea311f388 WHIRLPOOL 80b870ffd5fe373cb3efc842cf4843ed8e6c6087fc7e16308f5905838eddb48c091e43db65bd4331aadf23b36a71c3ff33302d833e7fd205c542b639fd14f539
-MISC ChangeLog 37049 SHA256 70a7a34441d58651a9e521a0b21466f17d8115672a46b712ac5f7934b1fc0601 SHA512 0e80688cddd40eedc756f2f1b6c9f215b96f7828efd76f60fce2fa4b12a4fd619496aa41daad8d6db48034ffc35889e785fdbe418f4da559b36f2f69319b401a WHIRLPOOL 0d6b6d60d6f55c58029159f4a84af052dac6630d530d2aa36df89161a6919a3d1ed7524aac01485dd40e7627c7d17fb11da79fee25adfd60c3ecc828780624e3
+MISC ChangeLog 37216 SHA256 fe55d91185fbca4ecd3d90445ab629b6599f4b712ab92fafcd1631f494215d4d SHA512 18171690661d52437203ab75b4cf23d9649b665ee7c0526370111f46d7bfb51f57460a4280aa55414316d1628e60496a7b432026b1a2546dbb3f449e80f4bc75 WHIRLPOOL 5abb6dec85386cee15d2fe04096fe3b4215665129ae2d1309e640464c5c58b59b7ab45b9fd24bb899be6f172f5d2a710c500efb775c3f4645574bdc4678eba02
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iF4EAREIAAYFAlNpL24ACgkQiIP6VqMIqNfu7gEAiNkHeHtLJ89UYNqd+HZYHFHs
+Gi4HhgEDJmL8wP5vi9IA/RZaTCpJRFQcSeag73Id+wVTt+lCyeUWoaB1fot1iGO5
+=+CDY
+-----END PGP SIGNATURE-----
diff --git a/dev-ruby/actionpack/actionpack-3.2.18.ebuild b/dev-ruby/actionpack/actionpack-3.2.18.ebuild
new file mode 100644
index 000000000000..bbf6e9ae5efd
--- /dev/null
+++ b/dev-ruby/actionpack/actionpack-3.2.18.ebuild
@@ -0,0 +1,74 @@
+# 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-3.2.18.ebuild,v 1.1 2014/05/06 18:52:29 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20"
+
+# 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 ~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/activemodel-${PV}
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/rack-cache-1.2
+	>=dev-ruby/builder-3.0.0:3
+	>=dev-ruby/rack-1.4.5:1.4
+	>=dev-ruby/rack-test-0.6.1:0.6
+	>=dev-ruby/journey-1.0.4:1.0
+	>=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/activerecord-${PV}
+		~dev-ruby/actionmailer-${PV}
+		>=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\|nokogiri\)/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
+
+	# 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
+
+	# Avoid test broken by security updates in i18n.
+	sed -i -e '/test_number_to_i18n_currency/,/end/ s:^:#:' test/template/number_helper_i18n_test.rb || die
+}