Revbump to fix the 2.1 slot for bug 247549.

Package-Manager: portage-2.2_rc25/cvs/Linux x86_64

4 files changed, 58 insertions, 2 deletions

diff --git a/dev-ruby/actionpack/ChangeLog b/dev-ruby/actionpack/ChangeLog
index 117ffd6e4ae8..37e7201bdb3c 100644
--- a/dev-ruby/actionpack/ChangeLog
+++ b/dev-ruby/actionpack/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/actionpack
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionpack/ChangeLog,v 1.98 2009/01/10 16:30:20 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionpack/ChangeLog,v 1.99 2009/03/14 15:32:13 a3li Exp $
+
+*actionpack-2.1.2-r1 (14 Mar 2009)
+
+  14 Mar 2009; Alex Legler <a3li@gentoo.org>
+  +files/2.1.2-csrf-circumvention.patch, +actionpack-2.1.2-r1.ebuild:
+  Revbump to include patch for secbug #247549 for 2.1.2.
 
   10 Jan 2009; Raúl Porcel <armin76@gentoo.org> actionpack-2.2.2.ebuild:
   ia64 stable wrt #253425
diff --git a/dev-ruby/actionpack/Manifest b/dev-ruby/actionpack/Manifest
index 2791d8c0d1ff..9d796775da27 100644
--- a/dev-ruby/actionpack/Manifest
+++ b/dev-ruby/actionpack/Manifest
@@ -1,10 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 2.1.2-csrf-circumvention.patch 503 RMD160 27bd4b489c46df39e3aa700a0e4362952ba3257b SHA1 80d12de8adf84a2ca7ae106f32b68f2b225b4028 SHA256 56755d72e2499a8a8b221e5f304c121e2ecd2af813a6aad73e098bec674c05ba
 DIST actionpack-1.13.6.gem 616960 RMD160 16a58b59f6b5c808e215d5d5717a7f7e1e4f858d SHA1 449d8923898a9f6dd5c04fd2e0791684fe9d5e18 SHA256 5731a4ec086c9f35b4910eb5e7913a65f69b8ead764c94e0005f250219a95d80
 DIST actionpack-2.0.5.gem 715776 RMD160 7d9392c2d34949e48af2fa9bb2e68bf20f239511 SHA1 b9168a976f0c7f7a8034a27f6c5edfd1b0e788fd SHA256 521a5cd1c6d7bbc933468b00292505b5c102985b5242a8bb0eb7f4a37d2ecd29
 DIST actionpack-2.1.2.gem 744448 RMD160 c1ee5beab7ad8e9b5b577f7f55ee57bc6c19f276 SHA1 31a316355c555e2826584b7576cc6f60ac1fcde6 SHA256 d81577e31046ac627a9156f219e7930f8d12c67c11aaf02c3bacfa987b73743e
 DIST actionpack-2.2.2.gem 717824 RMD160 d7e78b64a5c3ec616a11dd08a96a33de91bf936b SHA1 02b9aec25f90e6237487aa981d993760ce4a3869 SHA256 a865bf614e2f58d89b16c3034c8ac8fa61865dff46c15590ff838d5836d4c806
 EBUILD actionpack-1.13.6.ebuild 514 RMD160 3cf7b4be47cc341e097356a56e83700d36511b45 SHA1 1279ed422af73ac4468e90d4371fec3fcc915f4e SHA256 9b83d673d965999871fabb838480fc647a0387172d3d5797ed5ac70fc2cb1c29
 EBUILD actionpack-2.0.5.ebuild 515 RMD160 d44e394e16ab7ad0c127a894c4d2c1247b21e863 SHA1 3c14e1a338102ae94e2e1c84d3c54a4cedd1db07 SHA256 f1eecd4aad8e5fa67b6b4b9eb288014076d15ff8cb6e3ff0e4a6bf6704d82672
+EBUILD actionpack-2.1.2-r1.ebuild 773 RMD160 aba0de3fc9fced9ced2e9b8ed844de68f9c0cf41 SHA1 a1578251beb6425e7bce24288481ba0dce0f549e SHA256 89212d57aa50741df942484ae492e89933863580d8c3f39b987ecb53c36181f0
 EBUILD actionpack-2.1.2.ebuild 516 RMD160 eae7d8342acb2ff3f28aaf27168cb73158b1ef93 SHA1 bfce9768d8daa9abd30bcb5f53bd44429f62f0ea SHA256 bc162f8b8f6e33eba2953096aac2e6174d3423d4750f01590c6fb5c6d15685bf
 EBUILD actionpack-2.2.2.ebuild 513 RMD160 0494ac9a9833c40b01609d807a3e6ad3abdac6f4 SHA1 a3bebbdf0e2e8d64bf7c2bff5c8f0a22e72bbb36 SHA256 1e84391f266198183c334dc61aa675ce9bbfaa788d7f9b908f56cde761ba7449
-MISC ChangeLog 12636 RMD160 8a8caceb4cdea096408a7ac2f5569c8673d01dd6 SHA1 de643f82375e927051474ae75cdc46af28c45ede SHA256 4e0ab5e32c9d21223602d14027ac36b7aa985966b0dce7652e9082a1878ddb63
+MISC ChangeLog 12842 RMD160 80d099dd5204b553894a2bd6e676f6ce6fb40eb7 SHA1 6b70d8a9dfa25e48723f579ee58d182aecc9d595 SHA256 ef920afc177b74b11a84cdc90e4248642c635c3b4e20ab91ba133b67e73b868d
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.10 (GNU/Linux)
+
+iEYEARECAAYFAkm7zggACgkQk3qunHEll7PfZgCgl+zKs4odD31byjXZmonrg7e0
+nTUAn1TJS40EPS2R+851/a2DZm64KE7p
+=G7dV
+-----END PGP SIGNATURE-----
diff --git a/dev-ruby/actionpack/actionpack-2.1.2-r1.ebuild b/dev-ruby/actionpack/actionpack-2.1.2-r1.ebuild
new file mode 100644
index 000000000000..a624a8c50821
--- /dev/null
+++ b/dev-ruby/actionpack/actionpack-2.1.2-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionpack/actionpack-2.1.2-r1.ebuild,v 1.1 2009/03/14 15:32:13 a3li Exp $
+
+inherit eutils ruby gems
+
+DESCRIPTION="Eases web-request routing, handling, and response."
+HOMEPAGE="http://rubyforge.org/projects/actionpack/"
+
+LICENSE="MIT"
+SLOT="2.1"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=">=dev-lang/ruby-1.8.5
+	=dev-ruby/activesupport-2.1.2"
+
+src_install() {
+	gems_src_install
+
+	# Patch for bug 247579.
+	# Yes, I know, but we cannot patch gems in a different way *yet*.
+	cd "${D}/$(gem18 env gemdir)/gems/${P}/lib" || die "cd failed"
+	epatch "${FILESDIR}/${PV}-csrf-circumvention.patch"
+}
diff --git a/dev-ruby/actionpack/files/2.1.2-csrf-circumvention.patch b/dev-ruby/actionpack/files/2.1.2-csrf-circumvention.patch
new file mode 100644
index 000000000000..a455b39f4635
--- /dev/null
+++ b/dev-ruby/actionpack/files/2.1.2-csrf-circumvention.patch
@@ -0,0 +1,13 @@
+Patch from upstream git (commit 099a98e9) to fix bug #247549.
+
+--- lib/action_controller/mime_type.rb.1
++++ lib/action_controller/mime_type.rb
+@@ -18,7 +18,7 @@
+   #   end
+   class Type
+     @@html_types = Set.new [:html, :all]
+-    @@unverifiable_types = Set.new [:text, :json, :csv, :xml, :rss, :atom, :yaml]
++    @@unverifiable_types = Set.new [:json, :csv, :xml, :rss, :atom, :yaml]
+     cattr_reader :html_types, :unverifiable_types
+ 
+     # A simple helper class used in parsing the accept header