Pullup ticket #4915 - requested by taca

devel/ruby-activemodel32: security fix
devel/ruby-activesupport32: security fix
devel/ruby-railties32: security fix
mail/ruby-actionmailer32: security fix
www/ruby-actionpack32: security fix
www/ruby-activeresource32: security fix
www/ruby-rails32: security fix

Revisions pulled up:
- databases/ruby-activerecord32/distinfo                        1.22
- devel/ruby-activemodel32/distinfo                             1.22
- devel/ruby-activesupport32/PLIST                              1.2
- devel/ruby-activesupport32/distinfo                           1.22
- devel/ruby-railties32/Makefile                                1.11
- devel/ruby-railties32/distinfo                                1.22
- lang/ruby/rails.mk                                            1.53
- mail/ruby-actionmailer32/distinfo                             1.22
- www/ruby-actionpack32/distinfo                                1.22
- www/ruby-activeresource32/distinfo                            1.22
- www/ruby-rails32/distinfo                                     1.22

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Mon Feb  1 13:42:36 UTC 2016

   Modified Files:
   	pkgsrc/lang/ruby: rails.mk

   Log Message:
   Start update of Ruby on Rails to 3.2.22.1.

   Also tweak _RAILS_{MAJOR,MINOR,TEENY} variable definition.

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Mon Feb  1 13:43:56 UTC 2016

   Modified Files:
   	pkgsrc/devel/ruby-activesupport32: PLIST distinfo

   Log Message:
   Update ruby-activesupport32 to 3.2.22.1.

   * Add ActiveSupport::SecurityUtils module which is required for
     security fix of  actionpack.

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Mon Feb  1 13:45:10 UTC 2016

   Modified Files:
   	pkgsrc/devel/ruby-activemodel32: distinfo

   Log Message:
   Update ruby-activemodel32 to 3.2.22.1.

   * No change except version.

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Mon Feb  1 13:46:12 UTC 2016

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

   Log Message:
   Update ruby-activerecord32 to 3.2.22.1.

   * No change except version.

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Mon Feb  1 13:47:02 UTC 2016

   Modified Files:
   	pkgsrc/www/ruby-activeresource32: distinfo

   Log Message:
   Update ruby-activeresource32 to 3.2.22.1.

   * No change except version.

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Mon Feb  1 13:48:02 UTC 2016

   Modified Files:
   	pkgsrc/www/ruby-actionpack32: distinfo

   Log Message:
   Note update of ruby-actionpack32 to 3.2.22.1.

   * Use secure string comparisons for basic auth username / password.
     (CVE-2015-7576)
   * Stop caching mime types globally.  (CVE-2016-0751)
   * Don't short-circuit reject_if proc.  (CVE-2015-7577)
   * Allow :file to be outside rails root, but anything else must be inside
     the rails view directory.  (CVE-2016-0752)

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Mon Feb  1 13:48:55 UTC 2016

   Modified Files:
   	pkgsrc/mail/ruby-actionmailer32: distinfo

   Log Message:
   Update ruby-actionmailer32  to 3.2.22.1.

   * No change except version.

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Mon Feb  1 13:49:57 UTC 2016

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

   Log Message:
   Update ruby-railties32 to 3.2.22.1.

   * No change except version.

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Mon Feb  1 13:50:48 UTC 2016

   Modified Files:
   	pkgsrc/www/ruby-rails32: distinfo

   Log Message:
   Update ruby-rails32 to 3.2.22.1.

   * No change except version.

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Mon Feb  1 13:46:12 UTC 2016

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

   Log Message:
   Update ruby-activerecord32 to 3.2.22.1.

   * No change except version.

1 files changed, 5 insertions, 5 deletions

diff --git a/lang/ruby/rails.mk b/lang/ruby/rails.mk
index 9505cdfcbe2..109e07dee28 100644
--- a/lang/ruby/rails.mk
+++ b/lang/ruby/rails.mk
@@ -1,4 +1,4 @@
-# $NetBSD: rails.mk,v 1.52 2015/06/22 13:49:38 taca Exp $
+# $NetBSD: rails.mk,v 1.52.6.1 2016/02/10 19:22:41 bsiegert Exp $
 
 .if !defined(_RUBY_RAILS_MK)
 _RUBY_RAILS_MK=	# defined
@@ -38,7 +38,7 @@ _RUBY_RAILS_MK=	# defined
 #
 # current Ruby on Rails versions.
 #
-RUBY_RAILS32_VERSION?=	3.2.22
+RUBY_RAILS32_VERSION?=	3.2.22.1
 
 RUBY_RAILS_SUPPORTED?=	# defined
 RUBY_RAILS_DEFAULT?=	32
@@ -69,9 +69,9 @@ RUBY_RAILS_VERSION:=	${RUBY_RAILS32_VERSION}
 #
 # Components of Ruby's version.
 #
-_RAILS_MAJOR=	${RUBY_RAILS_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\1/}
-_RAILS_MINOR=	${RUBY_RAILS_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\2/}
-_RAILS_TEENY=	${RUBY_RAILS_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\3/}
+_RAILS_MAJOR=	${RUBY_RAILS_VERSION:C/([0-9]+)\..*/\1/}
+_RAILS_MINOR=	${RUBY_RAILS_VERSION:C/([0-9]+)\.([0-9]+)\..*/\2/}
+_RAILS_TEENY=	${RUBY_RAILS_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+).*/\3/}
 
 #
 # If RUBY_RAILS_STRICT_DEP is defined, match exact current Ruby no Rails