Update to 3.4.9

Changes:	https://redmine.org/projects/redmine/wiki/Changelog

5 files changed, 15 insertions, 15 deletions

diff --git a/www/redmine/Makefile b/www/redmine/Makefile
index 85acf9d21049..f62891c1f34d 100644
--- a/www/redmine/Makefile
+++ b/www/redmine/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	redmine
-PORTVERSION=	3.4.6
-PORTREVISION=	1
+PORTVERSION=	3.4.9
 CATEGORIES=	www
 MASTER_SITES=	https://www.redmine.org/releases/
 
@@ -14,7 +13,7 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/doc/COPYING
 
 RUN_DEPENDS=	rubygem-bundler>=1.5.0:sysutils/rubygem-bundler \
-		rubygem-rails4>=4.2.8:www/rubygem-rails4 \
+		rubygem-rails4>=4.2.11:www/rubygem-rails4 \
 		rubygem-jquery-rails>=3.1.4:www/rubygem-jquery-rails \
 		rubygem-coderay>=1.1.1:textproc/rubygem-coderay \
 		rubygem-request_store>=1.0.5:devel/rubygem-request_store \
@@ -28,7 +27,7 @@ RUN_DEPENDS=	rubygem-bundler>=1.5.0:sysutils/rubygem-bundler \
 		rubygem-nokogiri>=1.8.1:textproc/rubygem-nokogiri \
 		rubygem-i18n>=0.7:devel/rubygem-i18n \
 		rubygem-rails-html-sanitizer>=1.0.3:textproc/rubygem-rails-html-sanitizer \
-		rubygem-rbpdf>=1.19.3:print/rubygem-rbpdf \
+		rubygem-rbpdf>=1.19.6:print/rubygem-rbpdf \
 		rubygem-net-ldap>=0.12:net/rubygem-net-ldap \
 		rubygem-ruby-openid>=2.3:net/rubygem-ruby-openid \
 		rubygem-rack-openid>=0:www/rubygem-rack-openid \
@@ -57,7 +56,7 @@ NO_OPTIONS_SORT=	yes
 MYSQL_RUN_DEPENDS=	rubygem-mysql2>=0.4.6:databases/rubygem-mysql2
 POSTGRESQL_RUN_DEPENDS=	rubygem-pg018>=0.18.1:databases/rubygem-pg018
 MARKDOWN_RUN_DEPENDS=	rubygem-redcarpet>=3.4.0:textproc/rubygem-redcarpet
-RMAGIC_RUN_DEPENDS=	rubygem-rmagick>=2.14.0:graphics/rubygem-rmagick
+RMAGIC_RUN_DEPENDS=	rubygem-rmagick>=2.16.0:graphics/rubygem-rmagick
 THIN_RUN_DEPENDS=	rubygem-thin>=1.6.2:www/rubygem-thin
 THIN_SUB_LIST=		WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 THIN_VARS=		USE_RC_SUBR=redmine
diff --git a/www/redmine/distinfo b/www/redmine/distinfo
index f6fef224cdab..5318c50ae5b0 100644
--- a/www/redmine/distinfo
+++ b/www/redmine/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1533412076
-SHA256 (redmine-3.4.6.tar.gz) = e3b1ed59a5dddbd323d2e7da8fc3643d3a03f8aebd90d78e63870b62afc15395
-SIZE (redmine-3.4.6.tar.gz) = 2448628
+TIMESTAMP = 1550859446
+SHA256 (redmine-3.4.9.tar.gz) = c26f41c165cca182f81e489c45b04763010b43cf7c4edcea9e9205a1a67ffab8
+SIZE (redmine-3.4.9.tar.gz) = 2454011
diff --git a/www/redmine/files/patch-Gemfile b/www/redmine/files/patch-Gemfile
index df348f1b5cbb..1bc45e670ec2 100644
--- a/www/redmine/files/patch-Gemfile
+++ b/www/redmine/files/patch-Gemfile
@@ -4,8 +4,8 @@
    abort "Redmine requires Bundler 1.5.0 or higher (you're using #{Bundler::VERSION}).\nPlease update with 'gem update bundler'."
  end
  
--gem "rails", "4.2.8"
-+gem "rails", ">= 4.2.8"
+-gem "rails", "4.2.11"
++gem "rails", ">= 4.2.11"
  gem "addressable", "2.4.0" if RUBY_VERSION < "2.0"
  if RUBY_VERSION < "2.1"
    gem "public_suffix", (RUBY_VERSION < "2.0" ? "~> 1.4" : "~> 2.0.5")
@@ -30,9 +30,9 @@
 -gem "i18n", "~> 0.7.0"
 +gem "i18n", ">= 0.7"
  gem "ffi", "1.9.14", :platforms => :mingw if RUBY_VERSION < "2.0"
+ gem "xpath", "< 3.2.0" if RUBY_VERSION < "2.3"
  
- # Request at least rails-html-sanitizer 1.0.3 because of security advisories
-@@ -33,76 +33,15 @@ gem "rbpdf", "~> 1.19.3"
+@@ -33,76 +33,15 @@ gem "rbpdf", "~> 1.19.6"
  
  # Optional gem for LDAP authentication
  group :ldap do
@@ -50,7 +50,7 @@
 -platforms :mri, :mingw, :x64_mingw do
 -  # Optional gem for exporting the gantt to a PNG file, not supported with jruby
 -  group :rmagick do
--    gem "rmagick", ">= 2.14.0"
+-    gem "rmagick", "~> 2.16.0"
 -  end
 -
 -  # Optional Markdown support, not for JRuby
@@ -104,7 +104,7 @@
 -  # TODO: remove this after upgrading to Rails 5
 -  gem "test_after_commit", "~> 0.4.2"
 -  # For running UI tests
--  gem "capybara"
+-  gem "capybara", '~> 2.13'
 -  gem "selenium-webdriver", "~> 2.53.4"
 -end
 -
diff --git a/www/redmine/files/rmagic.rb b/www/redmine/files/rmagic.rb
index 8b50a86e3e62..a57b05f848d7 100644
--- a/www/redmine/files/rmagic.rb
+++ b/www/redmine/files/rmagic.rb
@@ -1 +1 @@
-gem "rmagick", ">= 2.14.0"
+gem "rmagick", "~> 2.16.0"
diff --git a/www/redmine/pkg-plist b/www/redmine/pkg-plist
index ba74aef53b21..9b27a8912d2f 100644
--- a/www/redmine/pkg-plist
+++ b/www/redmine/pkg-plist
@@ -1722,6 +1722,7 @@
 %%WWWDIR%%/test/fixtures/files/import_dates.csv
 %%WWWDIR%%/test/fixtures/files/import_iso8859-1.csv
 %%WWWDIR%%/test/fixtures/files/import_issues.csv
+%%WWWDIR%%/test/fixtures/files/import_issues_utf8_with_bom.csv
 %%WWWDIR%%/test/fixtures/files/import_subtasks.csv
 %%WWWDIR%%/test/fixtures/files/invalid-Shift_JIS.csv
 %%WWWDIR%%/test/fixtures/files/iso8859-1.txt