Update rails packages to 2.3.5. This fixes a cross-site scripting

vulnerability in ruby-actionpack.

Major changes:
- Improved compatibility with Ruby 1.9
- RailsXss plugin availability
- Fixes for the Nokogiri backend for XmlMini

7 files changed, 35 insertions, 26 deletions

diff --git a/www/rails/Makefile b/www/rails/Makefile
index be950ddcd60..64b5874aa81 100644
--- a/www/rails/Makefile
+++ b/www/rails/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2009/09/12 22:14:17 minskim Exp $
+# $NetBSD: Makefile,v 1.17 2009/12/01 23:24:24 minskim Exp $
 
-DISTNAME=	rails-2.3.4
+DISTNAME=	rails-2.3.5
 CATEGORIES=	www
 
 MAINTAINER=	minskim@NetBSD.org
@@ -8,11 +8,11 @@ HOMEPAGE=	http://www.rubyonrails.org/
 COMMENT=	Framework for developing database-backed web applications
 
 DEPENDS+=	rake>=0.8.1:../../devel/rake
-DEPENDS+=	${RUBY_PKGPREFIX}-activerecord>=2.3.4:../../databases/ruby-activerecord
-DEPENDS+=	${RUBY_PKGPREFIX}-activesupport>=2.3.4:../../devel/ruby-activesupport
-DEPENDS+=	${RUBY_PKGPREFIX}-actionmailer>=2.3.4:../../mail/ruby-actionmailer
-DEPENDS+=	${RUBY_PKGPREFIX}-activeresource>=2.3.4:../../www/ruby-activeresource
-DEPENDS+=	${RUBY_PKGPREFIX}-actionpack>=2.3.4:../../www/ruby-actionpack
+DEPENDS+=	${RUBY_PKGPREFIX}-activerecord>=2.3.5:../../databases/ruby-activerecord
+DEPENDS+=	${RUBY_PKGPREFIX}-activesupport>=2.3.5:../../devel/ruby-activesupport
+DEPENDS+=	${RUBY_PKGPREFIX}-actionmailer>=2.3.5:../../mail/ruby-actionmailer
+DEPENDS+=	${RUBY_PKGPREFIX}-activeresource>=2.3.5:../../www/ruby-activeresource
+DEPENDS+=	${RUBY_PKGPREFIX}-actionpack>=2.3.5:../../www/ruby-actionpack
 DEPENDS+=	${RUBY_PKGPREFIX}-rack-[0-9]*:../../www/ruby-rack
 
 REPLACE_RUBY=	bin/about bin/console bin/dbconsole bin/destroy \
diff --git a/www/rails/distinfo b/www/rails/distinfo
index c3d1b22a0c7..3a9648b1ef6 100644
--- a/www/rails/distinfo
+++ b/www/rails/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.12 2009/09/12 22:14:17 minskim Exp $
+$NetBSD: distinfo,v 1.13 2009/12/01 23:24:24 minskim Exp $
 
-SHA1 (rails-2.3.4.gem) = cd7d3e0407fd70db70c1a751fe7796e2f231f017
-RMD160 (rails-2.3.4.gem) = e2b808f2d01ab5b9a9d8a90ca4871f69332e85dd
-Size (rails-2.3.4.gem) = 1258496 bytes
+SHA1 (rails-2.3.5.gem) = e341aba6d1be9ec89ffe924a960e2c56c073954c
+RMD160 (rails-2.3.5.gem) = 6807ad6bbf04949e0f866ce05da0b321600572ea
+Size (rails-2.3.5.gem) = 1258496 bytes
diff --git a/www/ruby-actionpack/Makefile b/www/ruby-actionpack/Makefile
index 46d1f968f45..447e88d530b 100644
--- a/www/ruby-actionpack/Makefile
+++ b/www/ruby-actionpack/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2009/09/12 22:14:17 minskim Exp $
+# $NetBSD: Makefile,v 1.18 2009/12/01 23:24:24 minskim Exp $
 
-DISTNAME=	actionpack-2.3.4
+DISTNAME=	actionpack-2.3.5
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
 CATEGORIES=	www
 
@@ -8,7 +8,7 @@ MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://rubyforge.org/projects/actionpack/
 COMMENT=	Two-step approach to web response generation
 
-DEPENDS+=	${RUBY_PKGPREFIX}-activesupport>=2.3.2:../../devel/ruby-activesupport
+DEPENDS+=	${RUBY_PKGPREFIX}-activesupport>=2.3.5:../../devel/ruby-activesupport
 
 .include "../../misc/rubygems/rubygem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ruby-actionpack/PLIST b/www/ruby-actionpack/PLIST
index 6ce98ba949c..f75657fd9e6 100644
--- a/www/ruby-actionpack/PLIST
+++ b/www/ruby-actionpack/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2009/09/12 22:14:17 minskim Exp $
+@comment $NetBSD: PLIST,v 1.18 2009/12/01 23:24:24 minskim Exp $
 ${GEM_HOME}/cache/actionpack-${PKGVERSION}.gem
 ${GEM_LIBDIR}/CHANGELOG
 ${GEM_LIBDIR}/MIT-LICENSE
@@ -44,6 +44,7 @@ ${GEM_LIBDIR}/lib/action_controller/mime_types.rb
 ${GEM_LIBDIR}/lib/action_controller/params_parser.rb
 ${GEM_LIBDIR}/lib/action_controller/performance_test.rb
 ${GEM_LIBDIR}/lib/action_controller/polymorphic_routes.rb
+${GEM_LIBDIR}/lib/action_controller/rack_lint_patch.rb
 ${GEM_LIBDIR}/lib/action_controller/record_identifier.rb
 ${GEM_LIBDIR}/lib/action_controller/reloader.rb
 ${GEM_LIBDIR}/lib/action_controller/request.rb
@@ -65,6 +66,7 @@ ${GEM_LIBDIR}/lib/action_controller/session/mem_cache_store.rb
 ${GEM_LIBDIR}/lib/action_controller/session_management.rb
 ${GEM_LIBDIR}/lib/action_controller/status_codes.rb
 ${GEM_LIBDIR}/lib/action_controller/streaming.rb
+${GEM_LIBDIR}/lib/action_controller/string_coercion.rb
 ${GEM_LIBDIR}/lib/action_controller/templates/rescues/_request_and_response.erb
 ${GEM_LIBDIR}/lib/action_controller/templates/rescues/_trace.erb
 ${GEM_LIBDIR}/lib/action_controller/templates/rescues/diagnostics.erb
@@ -106,6 +108,7 @@ ${GEM_LIBDIR}/lib/action_view/helpers/form_tag_helper.rb
 ${GEM_LIBDIR}/lib/action_view/helpers/javascript_helper.rb
 ${GEM_LIBDIR}/lib/action_view/helpers/number_helper.rb
 ${GEM_LIBDIR}/lib/action_view/helpers/prototype_helper.rb
+${GEM_LIBDIR}/lib/action_view/helpers/raw_output_helper.rb
 ${GEM_LIBDIR}/lib/action_view/helpers/record_identification_helper.rb
 ${GEM_LIBDIR}/lib/action_view/helpers/record_tag_helper.rb
 ${GEM_LIBDIR}/lib/action_view/helpers/sanitize_helper.rb
@@ -121,6 +124,7 @@ ${GEM_LIBDIR}/lib/action_view/paths.rb
 ${GEM_LIBDIR}/lib/action_view/reloadable_template.rb
 ${GEM_LIBDIR}/lib/action_view/renderable.rb
 ${GEM_LIBDIR}/lib/action_view/renderable_partial.rb
+${GEM_LIBDIR}/lib/action_view/safe_buffer.rb
 ${GEM_LIBDIR}/lib/action_view/template.rb
 ${GEM_LIBDIR}/lib/action_view/template_error.rb
 ${GEM_LIBDIR}/lib/action_view/template_handler.rb
@@ -149,6 +153,7 @@ ${GEM_LIBDIR}/test/controller/controller_fixtures/vendor/plugins/bad_plugin/lib/
 ${GEM_LIBDIR}/test/controller/cookie_test.rb
 ${GEM_LIBDIR}/test/controller/deprecation/deprecated_base_methods_test.rb
 ${GEM_LIBDIR}/test/controller/dispatcher_test.rb
+${GEM_LIBDIR}/test/controller/dom_assertions_test.rb
 ${GEM_LIBDIR}/test/controller/failsafe_test.rb
 ${GEM_LIBDIR}/test/controller/fake_controllers.rb
 ${GEM_LIBDIR}/test/controller/fake_models.rb
@@ -233,6 +238,7 @@ ${GEM_LIBDIR}/test/fixtures/good_customers/_good_customer.html.erb
 ${GEM_LIBDIR}/test/fixtures/helpers/abc_helper.rb
 ${GEM_LIBDIR}/test/fixtures/helpers/fun/games_helper.rb
 ${GEM_LIBDIR}/test/fixtures/helpers/fun/pdf_helper.rb
+${GEM_LIBDIR}/test/fixtures/layout_tests/abs_path_layout.rhtml
 ${GEM_LIBDIR}/test/fixtures/layout_tests/alt/hello.rhtml
 ${GEM_LIBDIR}/test/fixtures/layout_tests/alt/layouts/alt.rhtml
 ${GEM_LIBDIR}/test/fixtures/layout_tests/layouts/controller_name_space/nested.rhtml
@@ -321,6 +327,7 @@ ${GEM_LIBDIR}/test/fixtures/test/_customer_counter.erb
 ${GEM_LIBDIR}/test/fixtures/test/_customer_greeting.erb
 ${GEM_LIBDIR}/test/fixtures/test/_customer_with_var.erb
 ${GEM_LIBDIR}/test/fixtures/test/_form.erb
+${GEM_LIBDIR}/test/fixtures/test/_from_helper.erb
 ${GEM_LIBDIR}/test/fixtures/test/_hash_greeting.erb
 ${GEM_LIBDIR}/test/fixtures/test/_hash_object.erb
 ${GEM_LIBDIR}/test/fixtures/test/_hello.builder
@@ -407,6 +414,7 @@ ${GEM_LIBDIR}/test/template/javascript_helper_test.rb
 ${GEM_LIBDIR}/test/template/number_helper_i18n_test.rb
 ${GEM_LIBDIR}/test/template/number_helper_test.rb
 ${GEM_LIBDIR}/test/template/prototype_helper_test.rb
+${GEM_LIBDIR}/test/template/raw_output_helper_test.rb
 ${GEM_LIBDIR}/test/template/record_tag_helper_test.rb
 ${GEM_LIBDIR}/test/template/render_test.rb
 ${GEM_LIBDIR}/test/template/sanitize_helper_test.rb
@@ -418,5 +426,6 @@ ${GEM_LIBDIR}/test/template/text_helper_test.rb
 ${GEM_LIBDIR}/test/template/translation_helper_test.rb
 ${GEM_LIBDIR}/test/template/url_helper_test.rb
 ${GEM_LIBDIR}/test/testing_sandbox.rb
+${GEM_LIBDIR}/test/view/safe_buffer_test.rb
 ${GEM_LIBDIR}/test/view/test_case_test.rb
 ${GEM_HOME}/specifications/actionpack-${PKGVERSION}.gemspec
diff --git a/www/ruby-actionpack/distinfo b/www/ruby-actionpack/distinfo
index fcccf122e42..e650a776bd2 100644
--- a/www/ruby-actionpack/distinfo
+++ b/www/ruby-actionpack/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.18 2009/09/12 22:14:17 minskim Exp $
+$NetBSD: distinfo,v 1.19 2009/12/01 23:24:24 minskim Exp $
 
-SHA1 (actionpack-2.3.4.gem) = a468b2feb3a15813b0a8d10968ad2c2c09e6eac0
-RMD160 (actionpack-2.3.4.gem) = 83626e6af9f7d0992c2582295e5a0bf8b0522d8c
-Size (actionpack-2.3.4.gem) = 733184 bytes
+SHA1 (actionpack-2.3.5.gem) = 6c46dbcbde1840202ebd2bcfa690d53047e47c9e
+RMD160 (actionpack-2.3.5.gem) = b9b9f1451ecdf050ca9a376e6fde020e7aebdb61
+Size (actionpack-2.3.5.gem) = 737792 bytes
 SHA1 (patch-ab) = bfba841b0af9d503a71745cc8d992e9d09d94191
diff --git a/www/ruby-activeresource/Makefile b/www/ruby-activeresource/Makefile
index 1517fd295d4..7949f43bb9b 100644
--- a/www/ruby-activeresource/Makefile
+++ b/www/ruby-activeresource/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2009/09/12 22:14:17 minskim Exp $
+# $NetBSD: Makefile,v 1.7 2009/12/01 23:24:24 minskim Exp $
 
-DISTNAME=	activeresource-2.3.4
+DISTNAME=	activeresource-2.3.5
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
 CATEGORIES=	www
 
@@ -8,7 +8,7 @@ MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://rubyforge.org/projects/activeresource/
 COMMENT=	Object-relational mapping for REST webservices
 
-DEPENDS+=	${RUBY_PKGPREFIX}-activesupport>=2.3.2:../../devel/ruby-activesupport
+DEPENDS+=	${RUBY_PKGPREFIX}-activesupport>=2.3.5:../../devel/ruby-activesupport
 
 .include "../../misc/rubygems/rubygem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ruby-activeresource/distinfo b/www/ruby-activeresource/distinfo
index 751c4a71f1e..dde39842fbc 100644
--- a/www/ruby-activeresource/distinfo
+++ b/www/ruby-activeresource/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2009/09/12 22:14:17 minskim Exp $
+$NetBSD: distinfo,v 1.7 2009/12/01 23:24:24 minskim Exp $
 
-SHA1 (activeresource-2.3.4.gem) = 214db73f7bfc62cfe5234c3cbf30e4fec6ef16d5
-RMD160 (activeresource-2.3.4.gem) = 730ce680f78450b1f175faf5b2184ebae420d019
-Size (activeresource-2.3.4.gem) = 51712 bytes
+SHA1 (activeresource-2.3.5.gem) = 2b4bb421e0857f73d8e9aa2bdd164d6c11bebc00
+RMD160 (activeresource-2.3.5.gem) = cd09fdf2b0d79547af49aa91f21dacebe1cd800f
+Size (activeresource-2.3.5.gem) = 64000 bytes