Version bump for security bug 453844.

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

3 files changed, 77 insertions, 5 deletions

diff --git a/dev-ruby/actionpack/ChangeLog b/dev-ruby/actionpack/ChangeLog
index f8ad66d0da45..5e80c6483480 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.233 2013/01/28 21:39:10 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionpack/ChangeLog,v 1.234 2013/01/28 22:23:33 graaff Exp $
+
+*actionpack-3.0.20 (28 Jan 2013)
+
+  28 Jan 2013; Hans de Graaff <graaff@gentoo.org> +actionpack-3.0.20.ebuild:
+  Version bump for security bug 453844.
 
 *actionpack-2.3.16 (28 Jan 2013)
 
diff --git a/dev-ruby/actionpack/Manifest b/dev-ruby/actionpack/Manifest
index 051b3a14fc20..98622fab5e48 100644
--- a/dev-ruby/actionpack/Manifest
+++ b/dev-ruby/actionpack/Manifest
@@ -7,21 +7,23 @@ AUX actionpack-2.3.8-custom-cookie-fix.patch 3009 SHA256 9368cd7b35fbc0b5d4161e1
 DIST actionpack-2.3.15.gem 749056 SHA256 7fe685d93655ded1b5f2a63617c0bc1fa9b7a0a755680771fca44bc60dca0ffd SHA512 08a8288b96a89e1587fddd5cecb665b084a5798391fc314aa9475499807d710e3912176b4087385065ae0d3a60075576d4d02019cecec3b8b8f05b735c16743c WHIRLPOOL d5a3195d2079387791cd4eef66c9225382b1791b7582aa150e42a63aa0659b493ca58bce5af4b53f30d94279d599ef38098044b019e2085b1a805e1d7a3a1d78
 DIST actionpack-2.3.16.gem 744448 SHA256 ea7b7f9e544b574ee393799e161a7b0b3e1d4dad3d5051b1055a8b95bdaeca68 SHA512 d2d3f8d90512014004c1fa3cf584c224a54e9d3ea80832a9e22c69ca3d305ef1364371a53dfcca6398ba6d0548f6993db6165c1a85d65e411246e3c3b35246c5 WHIRLPOOL 4f2675edf03e3e279d8776d89befffb388f200de516c7c2f13efc5aa4b20ac655daa2946f23f926462e3999193a6e9e97f3a930c1b7f23a30a37ec3d74fd0dc8
 DIST rails-3.0.19.tgz 3510042 SHA256 a8a9c7ce5aba53bc13d6621ddf2b55adf1f8ad18999217580af2171db30cec43 SHA512 98ccc8724767202999007592571e9aff85fe121616d4e31409cbdd0917e8419c858b4e9cb547721da0e5bd6e5c46f3c31344c91227abef97009ad96bfe31f952 WHIRLPOOL 2d8bf0941d8a6efc78a69601ea8c44f61026974aa3ff58ab076873388866dd3d05eb9a7ad0db4e6772e17cb2b4c4c2113b5bb506066d7dd9b508b44a2a52cf76
+DIST rails-3.0.20.tgz 3515055 SHA256 01e1364804bc329c8d6f3a93ed7dbc578e667c7138a5b6e3b0cd85cbc1fc4e6e SHA512 06e23aa7176640dac0f912a31177b067f0297ad2d2d3301bfe7c9a0dc6b140716fcc4b28daef75620376218e77aac3a387e5712d7cd9dab8ca8020216ed4ec89 WHIRLPOOL f5e66a55537f569d54a5ac81166be39104d209a832151c99af91ca5dd889ce12f2baaf80364f11909ac191c3fc058921d370464792db1c3e7f742f45c2a1b41c
 DIST rails-3.1.10.tgz 3394031 SHA256 d0614db8c4011ed1fcb4bd0afeb8220634b1ec8b196ee40a956c77a76026ef65 SHA512 c6b3db4043345c81582ab22289c29630e3946dc1936adebff0af196f461236805ab146e74ed400fe045d980df562ae44479e36c2c8747ed8a6ba6807add23e6b WHIRLPOOL 5329cd31170ce2ee7c109c9c1152b5eed35c8ec1af48a84d03eff4bb4fe083a7a9840ceb076575961d84c6baeb725fe1c5eed1a4756d39a8bc52a26f23dc6123
 DIST rails-3.1.3.tgz 3638313 SHA256 412c8a3ae4e0d5283ace45a2ee95127418d6b70fb1a954087b09755ab3a25e99 SHA512 286434f02c16f9cde51c160a5f84ac9b53d9d3aaf44c6c8018cef3250213cd39909013006223cceea8bd68ffe0bdc8ce50b0695e57756d8bb9ec44ab5986a711 WHIRLPOOL 710aa7c64c71b46741e19be41023aa6acf7dfeb25b94f8f14c10748f4a4a4cacd61ecf51a9db0b4eae1d0a1797f4287fd9b0f139a874f1659cab8fa5f252c200
 DIST rails-3.2.11.tgz 3547068 SHA256 3f05603f84bfb7a99f999f878af247533706255e6b3baa4111439b6f5fd8ab70 SHA512 50644772186127887bd4d7537ad41cbe549c5c8496274cad2765f21859528a0f42f5b8dbe3a1627a08b1724b2e019c0ec6526cccfdff3da4ffcec285f9259558 WHIRLPOOL 70d5620fc611872b2af62351c81abbe43b3b1d41c92a1d1935cef704a4a655c9bb043599bc758c947c14378ef52e34b44c61536d5a048401cc6bfaef613eba23
 EBUILD actionpack-2.3.15.ebuild 2231 SHA256 30bd9606593cfbf5af04523ec272636d4d486b831060bc93247a7513e063d64a SHA512 dfa647759cb16c6087de87beb127767fc6dbc8a0608760c6774f54b42510d279f8023f5f9b1cb3e7fdf24a158f586afbffe1989c71e3981749e122ba687aed39 WHIRLPOOL dc990036210a646f7b274c82db36fc3520d94dc728be24107ff840c07d75b4d9f4dd8e24193c7b4a9c3a528a022f5650eb77ee497fd6e783e93891e774c67402
 EBUILD actionpack-2.3.16.ebuild 2238 SHA256 bed690ebc00223f1ad9d0f623ca90be7418215c158bc403f23813480ca268f81 SHA512 8572468a57b077c500bbcfb16c8ad29e68c634805bb986ffc21777182712397129188d1421602072f0916418df4a610478eaebc12731d6ed4810f415da55536a WHIRLPOOL 31aeb2237c85c1882c2336fa5a8336e75419bea5ab4c0a26c482793d104a9d99b7ae4113c18ac6a469f4b423a8f6f21c64ac8e19a28fac92194bc5f28ea5f2fb
 EBUILD actionpack-3.0.19.ebuild 2077 SHA256 fce82cb31595da23a26c597e0d6e3767545d415282222ae51af9546ac8b4977d SHA512 52900c968560cf6cd04b94175e6d336b8365ec657611962fc010c17934524e03531039a7cbcf855a41a0abc2cac80f3616868b5aea8796a0c40ccdcb5063db64 WHIRLPOOL 324c4c5dccf0990b4b45c8dd91db5f5146afb30838b6617224076b154dc652b11bf40489da172bb91a8e6846367580c4d3cc2aa698ef73d8ae98b5e942cf216d
+EBUILD actionpack-3.0.20.ebuild 2077 SHA256 9489895376421fca5f842dafe36f930efdf51c81bfbe8059112a3d8727492408 SHA512 5ac34546f0190cc2901119de086a15eb5218d727838e8d83daf2d8b10ad770974afa8c2c9fe0a5084ebcbc3eb595fe33e4f392c001b9edee8a165139c6bd5c45 WHIRLPOOL 83fc186390abbbb9a417a37dbff973e738cd64e98aae841a52c0e462269d3ff34465718b48be0e17e7dceddec2d4b4d7135ccb277084de97c3903d7ddadefbdb
 EBUILD actionpack-3.1.10.ebuild 2580 SHA256 54abcad05f2efcfe8941ed77c982a5dfc1efb3775808aacf9b2ed822635324ce SHA512 1e0be27e84c67c85fc4ba264d3d4a0233ca4970e5e9eeacfd757e7b5ad802f0e35ec0de930ee5e3d1105b11bd247c37c604f1ec91f4da8d71b549a254bb0df37 WHIRLPOOL d6527bc2235b3a15c7924c0b63f21fea587900d11c606aa65d84ac0201f3b66b1d884c33c91e613438cdce082a8ef07446973a947b04383ea56d8e351c70c53a
 EBUILD actionpack-3.1.3.ebuild 2098 SHA256 39c689e1b3250e1bad2686463bbc08c6610ca89056de9737b23742a2f9421ffc SHA512 916fa25972bfe90d60607d6142c448c4bf6610d517943f367e81468454393b977bd32d269cbdd27e38ddd68e2aa967d8f343f66276480694ac4a49af9c8d34bc WHIRLPOOL cde148eea4d530126c10910f4d36abd431c061c2979b0cefc5ebc80450020e3e5495732f4291dcdf278c88c550835da696423b997bfb54938191e90a369d0725
 EBUILD actionpack-3.2.11.ebuild 2478 SHA256 2fd15e02d9d11c1663fb09439a26ea6b97a6f7565c7e88df0aeb40a39a3f8afc SHA512 d81bbddccb05fa5aa648fc87308a271e2a8b6d5f37da1605233ea41f32a275817b70b64f2ca0a199dc4dedaebcad0ceb18bf647d4c5825087dfc86ecdbde07be WHIRLPOOL 2a85b232d0ef81284fbe8b47b198040649d430e3a7d0b57e6daab2f26bf493693b109750f9e129c1482dcc72fd4661241c237ead18fdbae8fd36abad9e219c86
-MISC ChangeLog 31384 SHA256 cafdebd99fb6c9e561e733f8f2b9e8d6f3d953f8f3c261ba46b046129e511ab2 SHA512 a36770edbca30d58ec6e780df01cc85c605c712e52557c7d55080fa8c669d37b13b6aa1629cf63a0c7d2772e235a3a3e3e96717883b6f0b452ead9690690ab20 WHIRLPOOL a37c31538875705d9cf7e3ee4315d60a357fc549f4c439debaa1c531bce3b03e3f3e47f1a9d87a7cadf4106b1018679fb1fe5f6d4ffeafea93dd4b56dbe8829a
+MISC ChangeLog 31536 SHA256 db296e084f77a28ebef6a755315904ddd17d359c5ba343f1d0094c5cfb99d52a SHA512 ab6888230db4f61a16e6b2c394e3f6e70de832eebb57caa973604ebb86834915d2b296f5bf419610debbb9f33ae158d6c77a4c1a15fafca0eb1e875e9cefb5da WHIRLPOOL c07b28d4d25f9b2c899b44e12bc1cee21c7260baf7422f6772325f48c78adbc38c7fb0c6894a4b072d94d5c69e7cc92556bd60c0f24b8dbc5ae0c949d91cd2bb
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlEG7/8ACgkQiIP6VqMIqNfUTgD/SLqV3kEmxNM4h3A0WTAiTbzl
-3uRBXlEshvAdAHGm6vEA/24V0DRBMBUaQkAKSTsphktR4rSnjMt0jGWi8l2zLF4R
-=SDIl
+iF4EAREIAAYFAlEG+mYACgkQiIP6VqMIqNdNDwD/ejdx1cOxZuxDyFxHbUQhP0gl
+dR/dRvtRfMsjNvPgbeAA/0t4xTtOggP+yb20Z6gUwVkZQ4Y6Ren5WsuqFTJirmvE
+=TMbf
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/actionpack/actionpack-3.0.20.ebuild b/dev-ruby/actionpack/actionpack-3.0.20.ebuild
new file mode 100644
index 000000000000..9d5382473e34
--- /dev/null
+++ b/dev-ruby/actionpack/actionpack-3.0.20.ebuild
@@ -0,0 +1,65 @@
+# 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.0.20.ebuild,v 1.1 2013/01/28 22:23:33 graaff Exp $
+
+EAPI=4
+
+USE_RUBY="ruby18 ree18"
+
+# 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 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.0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RUBY_S="rails-rails-*/actionpack"
+
+ruby_add_rdepend "
+	~dev-ruby/activemodel-${PV}
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/builder-2.1.2:0
+	>=dev-ruby/erubis-2.6.6
+	>=dev-ruby/i18n-0.5.0:0.5
+	>=dev-ruby/rack-1.2.5:1.2
+	>=dev-ruby/rack-mount-0.6.14:0.6
+	>=dev-ruby/rack-test-0.5.7:0.5
+	>=dev-ruby/tzinfo-0.3.23"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/bundler
+		>=dev-ruby/mocha-0.13.0
+		~dev-ruby/activerecord-${PV}
+		~dev-ruby/actionmailer-${PV}
+	)"
+
+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\|horo\|faker\|rbench\|ruby-debug\|pg\|mysql2\)/d' ../Gemfile || die
+	sed -i -e '/thor/d' ../railties/railties.gemspec || die
+	sed -i -e '/mail/d' ../actionmailer/actionmailer.gemspec || die
+
+	# Loosen erubis dependency since this is not slotted.
+	sed -i -e 's/~> 2.6.6/>= 2.6.6/' actionpack.gemspec || die
+
+	# Loosen mocha version restriction
+	sed -i -e 's/0.10.5/>= 0.10.5/' ../Gemfile || die
+
+	# Ignore failure introduced by security measures in 3.0.17.
+	sed -i -e '/test_select_tag_escapes_prompt/,/end/ s:^:#:' test/template/form_tag_helper_test.rb || die
+}