- Update rails to 3.2.17 [1]

- Update polyglot to 0.3.4 since rails wants the newer version
- Update redmine to use new rails

Security:	CVE-2014-0080 [1]
Security:	CVE-2014-0081 [1]
Security:	CVE-2014-0082 [1]
MFH:		2014Q1

12 files changed, 51 insertions, 24 deletions

diff --git a/www/redmine/Makefile b/www/redmine/Makefile
index d68200e99ddc..fcc327449ba0 100644
--- a/www/redmine/Makefile
+++ b/www/redmine/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	redmine
 PORTVERSION=	2.3.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/www/redmine/files/patch-Gemfile b/www/redmine/files/patch-Gemfile
index 891002b70802..fb04bc8595cd 100644
--- a/www/redmine/files/patch-Gemfile
+++ b/www/redmine/files/patch-Gemfile
@@ -1,11 +1,11 @@
---- ./Gemfile.orig	2013-09-14 06:48:49.000000000 +0000
-+++ ./Gemfile	2014-02-02 03:35:31.663193270 +0000
+--- Gemfile.orig	2013-09-14 06:48:49.000000000 +0000
++++ Gemfile	2014-02-18 22:11:46.426041222 +0000
 @@ -1,11 +1,11 @@
  source 'https://rubygems.org'
  
 -gem "rails", "3.2.13"
 -gem "jquery-rails", "~> 2.0.2"
-+gem "rails", "3.2.16"
++gem "rails", "~> 3.2.17"
 +gem "jquery-rails", "~> 3.0"
  gem "i18n", "~> 0.6.0"
 -gem "coderay", "~> 1.0.9"
diff --git a/www/rubygem-actionpack/Makefile b/www/rubygem-actionpack/Makefile
index bacd9299bfa5..1953862aa58b 100644
--- a/www/rubygem-actionpack/Makefile
+++ b/www/rubygem-actionpack/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	actionpack
-PORTVERSION=	3.2.16
-PORTREVISION=	1
+PORTVERSION=	3.2.17
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 
@@ -26,7 +25,4 @@ USE_RUBY=	yes
 USE_RUBYGEMS=	yes
 RUBYGEM_AUTOPLIST=	yes
 
-post-patch:
-	@${REINPLACE_CMD} -e '115 s|~>|>=|' ${WRKSRC}/${GEM_NAME}.gemspec
-
 .include <bsd.port.mk>
diff --git a/www/rubygem-actionpack/distinfo b/www/rubygem-actionpack/distinfo
index ad41fe583c7f..c5add78646d4 100644
--- a/www/rubygem-actionpack/distinfo
+++ b/www/rubygem-actionpack/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rubygem/actionpack-3.2.16.gem) = 32061d3c6545a695fdaad2e237f8797e477f72a875d03a294fc2d1f9c0a6f727
-SIZE (rubygem/actionpack-3.2.16.gem) = 290816
+SHA256 (rubygem/actionpack-3.2.17.gem) = 6eeedf42ddbfb2393bcdd7fa89625fb115010c20265efe125f267ad601cbe068
+SIZE (rubygem/actionpack-3.2.17.gem) = 291840
diff --git a/www/rubygem-actionpack/files/patch-gemspec b/www/rubygem-actionpack/files/patch-gemspec
new file mode 100644
index 000000000000..9084038e8f3a
--- /dev/null
+++ b/www/rubygem-actionpack/files/patch-gemspec
@@ -0,0 +1,11 @@
+--- actionpack-3.2.17.gemspec.orig	2014-02-19 02:23:41.415999759 +0000
++++ actionpack-3.2.17.gemspec	2014-02-19 02:24:09.604998016 +0000
+@@ -134,7 +134,7 @@
+   version_requirements: &id008 !ruby/object:Gem::Requirement 
+     none: false
+     requirements: 
+-    - - ~>
++    - - ">="
+       - !ruby/object:Gem::Version 
+         hash: 5
+         segments: 
diff --git a/www/rubygem-activeresource/Makefile b/www/rubygem-activeresource/Makefile
index 5ed09d550fe4..8e75ba2c3609 100644
--- a/www/rubygem-activeresource/Makefile
+++ b/www/rubygem-activeresource/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	activeresource
-PORTVERSION=	3.2.16
+PORTVERSION=	3.2.17
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 
diff --git a/www/rubygem-activeresource/distinfo b/www/rubygem-activeresource/distinfo
index 0da7db7889cc..c2cb3fb1fc20 100644
--- a/www/rubygem-activeresource/distinfo
+++ b/www/rubygem-activeresource/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rubygem/activeresource-3.2.16.gem) = 252ffe9458e87619f8a69b46b8cc01fa25426f19df0042507cfd84498e507937
-SIZE (rubygem/activeresource-3.2.16.gem) = 37888
+SHA256 (rubygem/activeresource-3.2.17.gem) = 67793805973d85c2d2716ff44de25bafa769761a2701c4ff81da4844662ebfb7
+SIZE (rubygem/activeresource-3.2.17.gem) = 36864
diff --git a/www/rubygem-rails/Makefile b/www/rubygem-rails/Makefile
index ce58fca9d5f7..e68012134d71 100644
--- a/www/rubygem-rails/Makefile
+++ b/www/rubygem-rails/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	rails
-PORTVERSION=	3.2.16
-PORTREVISION=	1
+PORTVERSION=	3.2.17
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 
diff --git a/www/rubygem-rails/distinfo b/www/rubygem-rails/distinfo
index 5acd7e6d0530..f159e2dd03e1 100644
--- a/www/rubygem-rails/distinfo
+++ b/www/rubygem-rails/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rubygem/rails-3.2.16.gem) = fc470010d70c7628e9e6c4bd535f85571a24cdfadf9b58560e6b2d5f3d396ab0
-SIZE (rubygem/rails-3.2.16.gem) = 4608
+SHA256 (rubygem/rails-3.2.17.gem) = 8eff1bbf9f22fa943e58e9b71c6bdbe5d5d95caf022bec38ce083599961cb984
+SIZE (rubygem/rails-3.2.17.gem) = 3584
diff --git a/www/rubygem-railties/Makefile b/www/rubygem-railties/Makefile
index 0b14ba797192..6d074ba9f4e5 100644
--- a/www/rubygem-railties/Makefile
+++ b/www/rubygem-railties/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	railties
-PORTVERSION=	3.2.16
+PORTVERSION=	3.2.17
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 
@@ -22,7 +22,4 @@ RUBYGEM_AUTOPLIST=	yes
 
 PLIST_FILES=	bin/rails
 
-post-patch:
-	@${REINPLACE_CMD} -e '61,72 d' ${WRKSRC}/${GEM_NAME}.gemspec
-
 .include <bsd.port.mk>
diff --git a/www/rubygem-railties/distinfo b/www/rubygem-railties/distinfo
index 577eef94ccfe..97c90d54dcaf 100644
--- a/www/rubygem-railties/distinfo
+++ b/www/rubygem-railties/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rubygem/railties-3.2.16.gem) = 177c699a03e3bb4d1d0fec745890dd4ee0998d04ce42e5b606028584cbb19d88
-SIZE (rubygem/railties-3.2.16.gem) = 1587712
+SHA256 (rubygem/railties-3.2.17.gem) = 34b9a5d07f5998541138acbc9966fbbaebb3904a73c442903a0b8f9b0ba7dea7
+SIZE (rubygem/railties-3.2.17.gem) = 1590784
diff --git a/www/rubygem-railties/files/patch-gemspec b/www/rubygem-railties/files/patch-gemspec
new file mode 100644
index 000000000000..06390a0f7426
--- /dev/null
+++ b/www/rubygem-railties/files/patch-gemspec
@@ -0,0 +1,24 @@
+--- railties-3.2.17.gemspec.orig	2014-02-19 02:43:27.232919992 +0000
++++ railties-3.2.17.gemspec	2014-02-19 02:43:36.405917593 +0000
+@@ -75,21 +75,6 @@
+   name: thor
+ - !ruby/object:Gem::Dependency 
+   type: :runtime
+-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+-    none: false
+-    requirements: 
+-    - - ~>
+-      - !ruby/object:Gem::Version 
+-        hash: 15
+-        segments: 
+-        - 3
+-        - 4
+-        version: "3.4"
+-  prerelease: false
+-  requirement: *id004
+-  name: rdoc
+-- !ruby/object:Gem::Dependency 
+-  type: :runtime
+   version_requirements: &id005 !ruby/object:Gem::Requirement 
+     none: false
+     requirements: