Pullup ticket 3353 - requested by taca

security update

Revisions pulled up:
- pkgsrc/databases/ruby-activerecord/Makefile     1.21
- pkgsrc/databases/ruby-activerecord/distinfo     1.21
- pkgsrc/devel/ruby-activesupport/Makefile        1.24
- pkgsrc/devel/ruby-activesupport/distinfo        1.21
- pkgsrc/mail/ruby-actionmailer/Makefile          1.19
- pkgsrc/mail/ruby-actionmailer/distinfo          1.20
- pkgsrc/www/ruby-actionpack/Makefile             1.22
- pkgsrc/www/ruby-actionpack/distinfo             1.22
- pkgsrc/www/ruby-actionpack/PLIST                1.21
- pkgsrc/www/ruby-activeresource/Makefile         1.11
- pkgsrc/www/ruby-activeresource/distinfo         1.11
- pkgsrc/www/ruby-rails/Makefile                  1.2
- pkgsrc/www/ruby-rails/distinfo                  1.2

Files deleted:
pkgsrc/www/ruby-rails/patches/patch-ad

-------------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   taca
   Date:           Wed Feb  9 12:37:58 UTC 2011

   Modified Files:
           pkgsrc/devel/ruby-activesupport: Makefile distinfo

   Log Message:
   Update ruby-activesupport package to 2.3.11.

   It is update of version only for Ruby on Rails 2.3.11 update.


   To generate a diff of this commit:
   cvs rdiff -u -r1.23 -r1.24 pkgsrc/devel/ruby-activesupport/Makefile
   cvs rdiff -u -r1.20 -r1.21 pkgsrc/devel/ruby-activesupport/distinfo

   -------------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   taca
   Date:           Wed Feb  9 12:39:41 UTC 2011

   Modified Files:
           pkgsrc/databases/ruby-activerecord: Makefile distinfo

   Log Message:
   Update ruby-activerecord package to 2.3.11.

   * More strict dependency reflect gemspec's description.
   * It is update of version only for Ruby on Rails 2.3.11 update.


   To generate a diff of this commit:
   cvs rdiff -u -r1.20 -r1.21 pkgsrc/databases/ruby-activerecord/Makefile \
       pkgsrc/databases/ruby-activerecord/distinfo

   -------------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   taca
   Date:           Wed Feb  9 12:40:52 UTC 2011

   Modified Files:
           pkgsrc/www/ruby-actionpack: Makefile PLIST distinfo

   Log Message:
   Update ruby-actionpack package to 2.3.11.

   * More strict dependency reflect gemspec's description.

   *2.3.11 (February 9, 2011)*

   * Two security fixes. CVE-2011-0446, CVE-2011-0447


   To generate a diff of this commit:
   cvs rdiff -u -r1.21 -r1.22 pkgsrc/www/ruby-actionpack/Makefile \
       pkgsrc/www/ruby-actionpack/distinfo
   cvs rdiff -u -r1.20 -r1.21 pkgsrc/www/ruby-actionpack/PLIST

   -------------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   taca
   Date:           Wed Feb  9 12:42:26 UTC 2011

   Modified Files:
           pkgsrc/mail/ruby-actionmailer: Makefile distinfo

   Log Message:
   Update ruby-actionmailer package to 2.3.11.

   * More strict dependency reflect gemspec's description.
   * It is update of version only for Ruby on Rails 2.3.11 update.


   To generate a diff of this commit:
   cvs rdiff -u -r1.18 -r1.19 pkgsrc/mail/ruby-actionmailer/Makefile
   cvs rdiff -u -r1.19 -r1.20 pkgsrc/mail/ruby-actionmailer/distinfo

   -------------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   taca
   Date:           Wed Feb  9 12:43:09 UTC 2011

   Modified Files:
           pkgsrc/www/ruby-activeresource: Makefile distinfo

   Log Message:
   Update ruby-activeresource/ package to 2.3.11.

   * More strict dependency reflect gemspec's description.
   * It is update of version only for Ruby on Rails 2.3.11 update.


   To generate a diff of this commit:
   cvs rdiff -u -r1.10 -r1.11 pkgsrc/www/ruby-activeresource/Makefile \
       pkgsrc/www/ruby-activeresource/distinfo

   -------------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   taca
   Date:           Wed Feb  9 12:44:07 UTC 2011

   Modified Files:
           pkgsrc/www/ruby-rails: Makefile distinfo
   Removed Files:
           pkgsrc/www/ruby-rails/patches: patch-ad

   Log Message:
   Update ruby-rails package to 2.3.11.

   * More strict dependency reflect gemspec's description.
   * It is update of version only for Ruby on Rails 2.3.11 update.


   To generate a diff of this commit:
   cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/www/ruby-rails/Makefile \
       pkgsrc/www/ruby-rails/distinfo
   cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/www/ruby-rails/patches/patch-ad

14 files changed, 47 insertions, 59 deletions

diff --git a/databases/ruby-activerecord/Makefile b/databases/ruby-activerecord/Makefile
index 23ed4fde965..b6ee6abf15b 100644
--- a/databases/ruby-activerecord/Makefile
+++ b/databases/ruby-activerecord/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.20 2010/10/15 11:35:19 taca Exp $
+# $NetBSD: Makefile,v 1.20.4.1 2011/02/14 18:26:32 spz Exp $
 
-DISTNAME=	activerecord-2.3.10
+DISTNAME=	activerecord-2.3.11
 CATEGORIES=	databases
 
 MAINTAINER=	minskim@NetBSD.org
@@ -8,7 +8,7 @@ HOMEPAGE=	http://rubyforge.org/projects/activerecord/
 COMMENT=	Object-relation mapping put on rails
 LICENSE=	mit
 
-DEPENDS+=	${RUBY_PKGPREFIX}-activesupport>=2.3.10<3.0.0:../../devel/ruby-activesupport
+DEPENDS+=	${RUBY_PKGPREFIX}-activesupport>=2.3.11<2.3.12:../../devel/ruby-activesupport
 
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/ruby-activerecord/distinfo b/databases/ruby-activerecord/distinfo
index 3cde48411c6..22c1ec4f6ae 100644
--- a/databases/ruby-activerecord/distinfo
+++ b/databases/ruby-activerecord/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.20 2010/10/15 11:35:19 taca Exp $
+$NetBSD: distinfo,v 1.20.4.1 2011/02/14 18:26:32 spz Exp $
 
-SHA1 (activerecord-2.3.10.gem) = bfc5e21989bc281f5f17c3a39fa16fb4286ff055
-RMD160 (activerecord-2.3.10.gem) = ec649a857933bede759420a1bb3a9d9f0e2c2540
-Size (activerecord-2.3.10.gem) = 572928 bytes
+SHA1 (activerecord-2.3.11.gem) = 3e3733cc8242cd80041ff7b3342c421ea76baa4b
+RMD160 (activerecord-2.3.11.gem) = 1d62643e45ea92056d0dcf7a2c96b344abb310ac
+Size (activerecord-2.3.11.gem) = 571392 bytes
diff --git a/devel/ruby-activesupport/Makefile b/devel/ruby-activesupport/Makefile
index b6af8339257..15a58f6d6eb 100644
--- a/devel/ruby-activesupport/Makefile
+++ b/devel/ruby-activesupport/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2010/10/15 11:32:29 taca Exp $
+# $NetBSD: Makefile,v 1.23.4.1 2011/02/14 18:26:32 spz Exp $
 
-DISTNAME=	activesupport-2.3.10
+DISTNAME=	activesupport-2.3.11
 CATEGORIES=	devel
 
 MAINTAINER=	minskim@NetBSD.org
diff --git a/devel/ruby-activesupport/distinfo b/devel/ruby-activesupport/distinfo
index 2c35deb01c6..a343a81c2af 100644
--- a/devel/ruby-activesupport/distinfo
+++ b/devel/ruby-activesupport/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.20 2010/10/15 11:32:29 taca Exp $
+$NetBSD: distinfo,v 1.20.4.1 2011/02/14 18:26:32 spz Exp $
 
-SHA1 (activesupport-2.3.10.gem) = 4d8dc737ae579fc7adfa8e7032e2fe72c94bbd82
-RMD160 (activesupport-2.3.10.gem) = 57d3f4a907e12ec5d6686ef201b34f6f15994a2a
-Size (activesupport-2.3.10.gem) = 431104 bytes
+SHA1 (activesupport-2.3.11.gem) = d0107e22406ed130e0c7779bcbe7d195f37ddbcf
+RMD160 (activesupport-2.3.11.gem) = 61984c2281996efc3ba3dd3d788c28ce9d9009fa
+Size (activesupport-2.3.11.gem) = 431104 bytes
diff --git a/mail/ruby-actionmailer/Makefile b/mail/ruby-actionmailer/Makefile
index bd0a2a2b130..d4f0a33ee54 100644
--- a/mail/ruby-actionmailer/Makefile
+++ b/mail/ruby-actionmailer/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2010/10/15 11:38:11 taca Exp $
+# $NetBSD: Makefile,v 1.18.4.1 2011/02/14 18:26:32 spz Exp $
 
-DISTNAME=	actionmailer-2.3.10
+DISTNAME=	actionmailer-2.3.11
 CATEGORIES=	mail
 
 MAINTAINER=	minskim@NetBSD.org
@@ -8,7 +8,7 @@ HOMEPAGE=	http://rubyforge.org/projects/actionmailer/
 COMMENT=	Ruby framework for designing email-service layers
 LICENSE=	mit
 
-DEPENDS+=	${RUBY_PKGPREFIX}-actionpack>=2.3.10<3.0.0:../../www/ruby-actionpack
+DEPENDS+=	${RUBY_PKGPREFIX}-actionpack>=2.3.11<2.3.12:../../www/ruby-actionpack
 
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/ruby-actionmailer/distinfo b/mail/ruby-actionmailer/distinfo
index d9b6c504db4..a7e5e76300f 100644
--- a/mail/ruby-actionmailer/distinfo
+++ b/mail/ruby-actionmailer/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.19 2010/10/15 11:38:11 taca Exp $
+$NetBSD: distinfo,v 1.19.4.1 2011/02/14 18:26:32 spz Exp $
 
-SHA1 (actionmailer-2.3.10.gem) = 2023dc0fd10be2498c21b02e7ac3ffe596e9187d
-RMD160 (actionmailer-2.3.10.gem) = 4f966eeb53306aa6fee74bcf364a1b9100e3636f
-Size (actionmailer-2.3.10.gem) = 273408 bytes
+SHA1 (actionmailer-2.3.11.gem) = b112d4a74d8a11b8463a01680cd7c1daaa7ef5e1
+RMD160 (actionmailer-2.3.11.gem) = 5c584457d6752c240efe4b6dcf6dbfd01889e80f
+Size (actionmailer-2.3.11.gem) = 273920 bytes
diff --git a/www/ruby-actionpack/Makefile b/www/ruby-actionpack/Makefile
index c423240dedc..95cfffe9693 100644
--- a/www/ruby-actionpack/Makefile
+++ b/www/ruby-actionpack/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2010/10/15 11:37:04 taca Exp $
+# $NetBSD: Makefile,v 1.21.4.1 2011/02/14 18:26:32 spz Exp $
 
-DISTNAME=	actionpack-2.3.10
+DISTNAME=	actionpack-2.3.11
 CATEGORIES=	www
 
 MAINTAINER=	minskim@NetBSD.org
@@ -8,7 +8,7 @@ HOMEPAGE=	http://rubyforge.org/projects/actionpack/
 COMMENT=	Two-step approach to web response generation
 LICENSE=	mit
 
-DEPENDS+=	${RUBY_PKGPREFIX}-activesupport>=2.3.10<3.0.0:../../devel/ruby-activesupport
+DEPENDS+=	${RUBY_PKGPREFIX}-activesupport>=2.3.11<2.3.12:../../devel/ruby-activesupport
 DEPENDS+=	${RUBY_PKGPREFIX}-rack>=1.1.0<1.2.0:../../www/ruby-rack11
 
 .include "../../lang/ruby/gem.mk"
diff --git a/www/ruby-actionpack/PLIST b/www/ruby-actionpack/PLIST
index 24d1cd108e3..fd3cf66644d 100644
--- a/www/ruby-actionpack/PLIST
+++ b/www/ruby-actionpack/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2010/10/15 11:37:04 taca Exp $
+@comment $NetBSD: PLIST,v 1.20.4.1 2011/02/14 18:26:32 spz Exp $
 ${GEM_HOME}/cache/${GEM_NAME}.gem
 ${GEM_LIBDIR}/CHANGELOG
 ${GEM_LIBDIR}/MIT-LICENSE
@@ -99,6 +99,7 @@ ${GEM_LIBDIR}/lib/action_view/helpers/atom_feed_helper.rb
 ${GEM_LIBDIR}/lib/action_view/helpers/benchmark_helper.rb
 ${GEM_LIBDIR}/lib/action_view/helpers/cache_helper.rb
 ${GEM_LIBDIR}/lib/action_view/helpers/capture_helper.rb
+${GEM_LIBDIR}/lib/action_view/helpers/csrf_helper.rb
 ${GEM_LIBDIR}/lib/action_view/helpers/date_helper.rb
 ${GEM_LIBDIR}/lib/action_view/helpers/debug_helper.rb
 ${GEM_LIBDIR}/lib/action_view/helpers/form_helper.rb
diff --git a/www/ruby-actionpack/distinfo b/www/ruby-actionpack/distinfo
index 154ec8b0c71..1d71e6ab81a 100644
--- a/www/ruby-actionpack/distinfo
+++ b/www/ruby-actionpack/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.21 2010/10/15 11:37:04 taca Exp $
+$NetBSD: distinfo,v 1.21.4.1 2011/02/14 18:26:32 spz Exp $
 
-SHA1 (actionpack-2.3.10.gem) = 14c38b6659a801ccdd39722b0d589e39ad194fc8
-RMD160 (actionpack-2.3.10.gem) = 7d7b5305f3218a2e80e25927c3f3c898574ea434
-Size (actionpack-2.3.10.gem) = 1082368 bytes
+SHA1 (actionpack-2.3.11.gem) = fafa3ed0bbf9e4805715b252644370a7d9d6ef0c
+RMD160 (actionpack-2.3.11.gem) = a4a5fa91e63455de8444b0fb5f0f80e636c67172
+Size (actionpack-2.3.11.gem) = 1082880 bytes
 SHA1 (patch-ab) = bfba841b0af9d503a71745cc8d992e9d09d94191
diff --git a/www/ruby-activeresource/Makefile b/www/ruby-activeresource/Makefile
index 395e8697445..0f0f5543a0a 100644
--- a/www/ruby-activeresource/Makefile
+++ b/www/ruby-activeresource/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2010/10/15 11:38:59 taca Exp $
+# $NetBSD: Makefile,v 1.10.4.1 2011/02/14 18:26:33 spz Exp $
 
-DISTNAME=	activeresource-2.3.10
+DISTNAME=	activeresource-2.3.11
 CATEGORIES=	www
 
 MAINTAINER=	minskim@NetBSD.org
@@ -8,7 +8,7 @@ HOMEPAGE=	http://rubyforge.org/projects/activeresource/
 COMMENT=	Object-relational mapping for REST webservices
 LICENSE=	mit
 
-DEPENDS+=	${RUBY_PKGPREFIX}-activesupport>=2.3.10<3.0.0:../../devel/ruby-activesupport
+DEPENDS+=	${RUBY_PKGPREFIX}-activesupport>=2.3.11<2.3.12:../../devel/ruby-activesupport
 
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ruby-activeresource/distinfo b/www/ruby-activeresource/distinfo
index 4a60f17739a..1c847c27930 100644
--- a/www/ruby-activeresource/distinfo
+++ b/www/ruby-activeresource/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.10 2010/10/15 11:38:59 taca Exp $
+$NetBSD: distinfo,v 1.10.4.1 2011/02/14 18:26:33 spz Exp $
 
-SHA1 (activeresource-2.3.10.gem) = 7a5f9b21da2db211c29b6eb5a656d1951e935c1d
-RMD160 (activeresource-2.3.10.gem) = 464d1fc059493117547e34523b8e318339e57a1e
-Size (activeresource-2.3.10.gem) = 73728 bytes
+SHA1 (activeresource-2.3.11.gem) = 9d08a9dc26d14076f005fa2289e8a8b59fad6769
+RMD160 (activeresource-2.3.11.gem) = 6d1dd494550b324f0136a993f5579ad4b38f3fa6
+Size (activeresource-2.3.11.gem) = 74240 bytes
diff --git a/www/ruby-rails/Makefile b/www/ruby-rails/Makefile
index f9704871486..ae1bc32f8e9 100644
--- a/www/ruby-rails/Makefile
+++ b/www/ruby-rails/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/12/26 15:21:40 taca Exp $
+# $NetBSD: Makefile,v 1.1.1.1.2.1 2011/02/14 18:26:33 spz Exp $
 
-DISTNAME=	rails-2.3.10
+DISTNAME=	rails-2.3.11
 CATEGORIES=	www
 
 MAINTAINER=	minskim@NetBSD.org
@@ -13,11 +13,11 @@ LICENSE=	mit
 .if ${RUBY_VER} == "18"
 DEPENDS+=	${RUBY_PKGPREFIX}-rake>=0.8.3:../../devel/rake
 .endif
-DEPENDS+=	${RUBY_PKGPREFIX}-activesupport>=2.3.10<3.0.0:../../devel/ruby-activesupport
-DEPENDS+=	${RUBY_PKGPREFIX}-activerecord>=2.3.10<3.0.0:../../databases/ruby-activerecord
-DEPENDS+=	${RUBY_PKGPREFIX}-actionpack>=2.3.10<3.0.0:../../www/ruby-actionpack
-DEPENDS+=	${RUBY_PKGPREFIX}-actionmailer>=2.3.10<3.0.0:../../mail/ruby-actionmailer
-DEPENDS+=	${RUBY_PKGPREFIX}-activeresource>=2.3.10<3.0.0:../../www/ruby-activeresource
+DEPENDS+=	${RUBY_PKGPREFIX}-activesupport>=2.3.11<2.3.12:../../devel/ruby-activesupport
+DEPENDS+=	${RUBY_PKGPREFIX}-activerecord>=2.3.11<2.3.12:../../databases/ruby-activerecord
+DEPENDS+=	${RUBY_PKGPREFIX}-actionpack>=2.3.11<2.3.12:../../www/ruby-actionpack
+DEPENDS+=	${RUBY_PKGPREFIX}-actionmailer>=2.3.11<2.3.12:../../mail/ruby-actionmailer
+DEPENDS+=	${RUBY_PKGPREFIX}-activeresource>=2.3.11<2.3.12:../../www/ruby-activeresource
 
 CONFLICTS+=	ruby[1-9][0-9]-rails-[0-9]* rails-[0-9]*
 
diff --git a/www/ruby-rails/distinfo b/www/ruby-rails/distinfo
index faf38033e81..a2088b23a69 100644
--- a/www/ruby-rails/distinfo
+++ b/www/ruby-rails/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2010/12/26 15:21:40 taca Exp $
+$NetBSD: distinfo,v 1.1.1.1.2.1 2011/02/14 18:26:33 spz Exp $
 
-SHA1 (rails-2.3.10.gem) = 14cafcd32b3560570f52fc12f470bcb31169f3ed
-RMD160 (rails-2.3.10.gem) = d776b061118890367f1e3831b456b042c1416ad4
-Size (rails-2.3.10.gem) = 1709056 bytes
+SHA1 (rails-2.3.11.gem) = 7d2d451d0410eb95abed956aafec22dec2bde46a
+RMD160 (rails-2.3.11.gem) = 20e360142e3a662fa045ba39c4bf0c25a23dee04
+Size (rails-2.3.11.gem) = 211968 bytes
 SHA1 (patch-aa) = e59e8ad345d035fe850a5fe87aeff7a82590493e
-SHA1 (patch-ad) = 7bdfc7dd1f54232e4a8e85218a773af0d789e1ba
diff --git a/www/ruby-rails/patches/patch-ad b/www/ruby-rails/patches/patch-ad
deleted file mode 100644
index e71db804f83..00000000000
--- a/www/ruby-rails/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2010/12/26 15:21:40 taca Exp $
-
---- ../rails-2.3.10.gemspec.orig	2010-10-15 02:35:21.000000000 +0000
-+++ ../rails-2.3.10.gemspec
-@@ -126,7 +126,6 @@ files: 
- - CHANGELOG
- - fresh_rakefile
- - MIT-LICENSE
--- railties-3.0.0.beta3.gem
- - Rakefile
- - README
- - bin/about