Revision bump, security bug 294797. Remove stale patch

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

5 files changed, 53 insertions, 19 deletions

diff --git a/dev-ruby/actionpack/ChangeLog b/dev-ruby/actionpack/ChangeLog
index 5ea3e57484d7..3beac690b29c 100644
--- a/dev-ruby/actionpack/ChangeLog
+++ b/dev-ruby/actionpack/ChangeLog
@@ -1,6 +1,13 @@
 # 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.129 2009/11/28 09:19:32 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionpack/ChangeLog,v 1.130 2009/11/28 11:18:29 a3li Exp $
+
+*actionpack-2.2.3-r1 (28 Nov 2009)
+
+  28 Nov 2009; Alex Legler <a3li@gentoo.org>
+  -files/2.1.2-csrf-circumvention.patch, +actionpack-2.2.3-r1.ebuild,
+  +files/actionpack-2.2.3-strip_tags.patch:
+  Revision bump, security bug 294797. Remove stale patch
 
 *actionpack-2.3.5 (28 Nov 2009)
 
diff --git a/dev-ruby/actionpack/Manifest b/dev-ruby/actionpack/Manifest
index ff9e8be2973b..22eeb6b0b8ce 100644
--- a/dev-ruby/actionpack/Manifest
+++ b/dev-ruby/actionpack/Manifest
@@ -1,19 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 2.1.2-csrf-circumvention.patch 503 RMD160 27bd4b489c46df39e3aa700a0e4362952ba3257b SHA1 80d12de8adf84a2ca7ae106f32b68f2b225b4028 SHA256 56755d72e2499a8a8b221e5f304c121e2ecd2af813a6aad73e098bec674c05ba
+AUX actionpack-2.2.3-strip_tags.patch 649 RMD160 d503951da305c307911dc51c84e56783712bf6f2 SHA1 76e50d0fa191502cb4f6fe25df52860b62244828 SHA256 b96743939465ed9bd042e741f888aba95d3327f97b182d41554a5b5364d3e57b
 DIST actionpack-2.2.3.gem 718848 RMD160 6b5407cf15a0a0874bd959d650a7f66894485a50 SHA1 cae01c4d1622286705ab9ff0d963eda6b104c96e SHA256 f00dc9b5fe33b56797550ea4e1111a44e5acd413ecb7ad8dbc184f58bd704fb5
 DIST actionpack-2.3.4.gem 733184 RMD160 83626e6af9f7d0992c2582295e5a0bf8b0522d8c SHA1 a468b2feb3a15813b0a8d10968ad2c2c09e6eac0 SHA256 fbdfc7970df6beeaefcf7e1f9f6be244e1164915f1a434fa8f97fbd8d85086ba
 DIST actionpack-2.3.5.gem 737792 RMD160 b9b9f1451ecdf050ca9a376e6fde020e7aebdb61 SHA1 6c46dbcbde1840202ebd2bcfa690d53047e47c9e SHA256 28630d5955c36290fdc8918966e45f1d1a48514b663b43f3459dd9453b35370c
+EBUILD actionpack-2.2.3-r1.ebuild 775 RMD160 0efb8d365334b0089d0307dcb5b19d1b5f036b14 SHA1 5549c00b91ef3b3a0dc8911398c41fc03e389223 SHA256 5045f1ad484dc3f11b5c088cc7777800eeaddd36e725606dd6e9ce2ebbd2e504
 EBUILD actionpack-2.2.3.ebuild 530 RMD160 02c0d1a88d5d7224874395fe38f2f7ff391f1ece SHA1 ca0ab9c394d968ce472864d2cb12f9bb75947de3 SHA256 aae47b93d473d8afb9deae2b8bf39d4e2378172a0180c5a6e9b937407b7d8ef5
 EBUILD actionpack-2.3.4.ebuild 578 RMD160 7f61e86ad36caa43ce7168a9494115a3c4c26ed2 SHA1 800bdc19a817c6d30dd8c8f9f1a6ade2b5200021 SHA256 1541b25901dfd67db5df7e8bbced08076b46e7f5b8174d26891fa9c45298579c
 EBUILD actionpack-2.3.5.ebuild 582 RMD160 e2b19f90f5bd2b16fbe192d9996934c0ade47f3a SHA1 840f861f9fca2207247882e3887881c6f90faec6 SHA256 ed68f826b5e36aa6d316afbf28bb78fcae84854876252bfca916d6200e88a925
-MISC ChangeLog 16596 RMD160 9f2f120f5745a045e7499b2534c8a7228002aada SHA1 35fbcf5ef897fcf479b60aa60037378a28513dfd SHA256 dc04d849f99d51df2d6289a333a11829ab855fb7501faba0b4877f998d221894
+MISC ChangeLog 16849 RMD160 e5dd14796c5b9a320339bb9aca1270c6589dc19e SHA1 58a1c8d0b010c75485ae06917193b5ac58f39363 SHA256 58d8562df4fc810bde03eae2d0d6583898566e1ec6d5178283f7424f250f44cb
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAksQ6yoACgkQaGsKqSU7eCTwnACfRmmGSbOwDBeY+3qVppniohks
-JkcAnjDsrLvg+t47SxW2VGiD7I6WZsaO
-=AkTm
+iEYEARECAAYFAksRBwwACgkQaGsKqSU7eCR5PACgkvE0VD+pX9vCUGn08Bs+r2lR
+MykAnROZ0xDcRxCb2YnRdksju2cM8ciV
+=dDwy
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/actionpack/actionpack-2.2.3-r1.ebuild b/dev-ruby/actionpack/actionpack-2.2.3-r1.ebuild
new file mode 100644
index 000000000000..ba7974edc076
--- /dev/null
+++ b/dev-ruby/actionpack/actionpack-2.2.3-r1.ebuild
@@ -0,0 +1,26 @@
+# 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.2.3-r1.ebuild,v 1.1 2009/11/28 11:18:29 a3li Exp $
+
+inherit ruby gems
+USE_RUBY="ruby18"
+
+DESCRIPTION="Eases web-request routing, handling, and response."
+HOMEPAGE="http://rubyforge.org/projects/actionpack/"
+
+LICENSE="MIT"
+SLOT="2.2"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=">=dev-lang/ruby-1.8.5
+	=dev-ruby/activesupport-2.2.3"
+
+src_install() {
+	gems_src_install
+
+	# Patch for bug 294797.
+	# 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}/${P}-strip_tags.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
deleted file mode 100644
index a455b39f4635..000000000000
--- a/dev-ruby/actionpack/files/2.1.2-csrf-circumvention.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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
diff --git a/dev-ruby/actionpack/files/actionpack-2.2.3-strip_tags.patch b/dev-ruby/actionpack/files/actionpack-2.2.3-strip_tags.patch
new file mode 100644
index 000000000000..01638dcceae1
--- /dev/null
+++ b/dev-ruby/actionpack/files/actionpack-2.2.3-strip_tags.patch
@@ -0,0 +1,13 @@
+Patch for bug 294797 (strip_tags XSS), based on upstream commit 785281ade8. -a3li@g.o
+
+--- action_controller/vendor/html-scanner/html/node.rb.orig	2009-11-28 12:09:54.476218352 +0100
++++ action_controller/vendor/html-scanner/html/node.rb	2009-11-28 12:10:12.748213673 +0100
+@@ -162,7 +162,7 @@
+           end
+           
+           closing = ( scanner.scan(/\//) ? :close : nil )
+-          return Text.new(parent, line, pos, content) unless name = scanner.scan(/[\w:-]+/)
++          return Text.new(parent, line, pos, content) unless name = scanner.scan(/[-:\w\x00-\x09\x0b-\x0c\x0e-\x1f]+/)
+           name.downcase!
+   
+           unless closing