Attachment 186283 Details for Bug 220251 – fixed patch to 3.2.7

[patch] fixed patch to 3.2.7

redmine-3.2.7.fix.patch (text/plain), 9.16 KB, created by Miroslav Lachman on 2017-09-12 00:05:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Miroslav Lachman

Created: 2017-09-12 00:05:05 UTC

Size: 9.16 KB

patch

obsolete

>diff -r -u default/www/redmine/Makefile redmine/www/redmine/Makefile
>--- Makefile	2017-03-27 21:16:29.000000000 +0200
>+++ Makefile	2017-09-12 01:54:12.971566889 +0200
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/www/redmine/Makefile 437079 2017-03-27 19:16:29Z sunpoet $
> 
> PORTNAME=	redmine
>-PORTVERSION=	3.2.3
>-PORTREVISION=	7
>+PORTVERSION=	3.2.7
> CATEGORIES=	www
> MASTER_SITES=	http://www.redmine.org/releases/
> 
>@@ -14,22 +13,27 @@
> LICENSE_FILE=	${WRKSRC}/doc/COPYING
> 
> RUN_DEPENDS=	rubygem-bundler>=1.5.0:sysutils/rubygem-bundler \
>-		rubygem-rails4>=4.2.5:www/rubygem-rails4 \
>-		rubygem-jquery-rails>=3.1.4:www/rubygem-jquery-rails \
>+		rubygem-rails4>=4.2.7.1:www/rubygem-rails4 \
>+		rubygem-jquery-rails>=4.3.0:www/rubygem-jquery-rails \
> 		rubygem-coderay>=1.1.0:textproc/rubygem-coderay \
> 		rubygem-builder>=3.0.4:devel/rubygem-builder \
> 		rubygem-request_store>=1.0.5:devel/rubygem-request_store \
> 		rubygem-mime-types>=0:misc/rubygem-mime-types \
>-		rubygem-mimemagic>=0:misc/rubygem-mimemagic \
> 		rubygem-protected_attributes>=0:devel/rubygem-protected_attributes \
> 		rubygem-actionpack-action_caching>=0:devel/rubygem-actionpack-action_caching \
> 		rubygem-actionpack-xml_parser1>=0:textproc/rubygem-actionpack-xml_parser1 \
>-		rubygem-roadie-rails>=0:mail/rubygem-roadie-rails \
>-		rubygem-rbpdf>=1.19.0:print/rubygem-rbpdf \
>-		rubygem-rake>=0:devel/rubygem-rake \
>+		rubygem-roadie-rails>=1.2.0:mail/rubygem-roadie-rails \
>+		rubygem-roadie>=3.2.1:mail/rubygem-roadie \
>+		rubygem-mimemagic>=0:misc/rubygem-mimemagic \
>+		rubygem-nokogiri>=1.7.2:textproc/rubygem-nokogiri \
>+		rubygem-i18n>=0.8.5:devel/rubygem-i18n \
>+		rubygem-ffi>=1.9.14:devel/rubygem-ffi \
>+		rubygem-rails-html-sanitizer>=1.0.3:textproc/rubygem-rails-html-sanitizer \
>+		rubygem-rbpdf>=1.19.2:print/rubygem-rbpdf \
>+		rubygem-net-ldap>=0.12.0:net/rubygem-net-ldap \
> 		rubygem-ruby-openid>=2.3.0:net/rubygem-ruby-openid \
> 		rubygem-rack-openid>=0:www/rubygem-rack-openid \
>-		rubygem-net-ldap>=0.12.0:net/rubygem-net-ldap
>+		rubygem-rake>=0:devel/rubygem-rake
> 
> NO_ARCH=	yes
> NO_BUILD=	yes
>@@ -55,7 +59,7 @@
> MYSQL_DESC=	MySQL database support (via mysql2 rubygem)
> NO_OPTIONS_SORT=	yes
> 
>-MYSQL_RUN_DEPENDS=	rubygem-mysql2>=0.4.5:databases/rubygem-mysql2
>+MYSQL_RUN_DEPENDS=	rubygem-mysql2>=0.4.6:databases/rubygem-mysql2
> PASSENGER_RUN_DEPENDS=	passenger-config:www/rubygem-passenger
> POSTGRESQL_RUN_DEPENDS=	rubygem-pg>=0.18.1:databases/rubygem-pg
> MARKDOWN_RUN_DEPENDS=	rubygem-redcarpet>=3.3.2:textproc/rubygem-redcarpet
>@@ -80,6 +84,14 @@
> 	${MKDIR} ${STAGEDIR}${WWWDIR}
> 	${MKDIR} ${STAGEDIR}${WWWDIR}/tmp/pids
> 	${MKDIR} ${STAGEDIR}${WWWDIR}/bundler.d
>+	${MKDIR} ${STAGEDIR}${WWWDIR}/tmp/pdf
>+	${TOUCH} ${STAGEDIR}${WWWDIR}/tmp/pdf/empty
>+	${MKDIR} ${STAGEDIR}${WWWDIR}/tmp/test
>+	${TOUCH} ${STAGEDIR}${WWWDIR}/tmp/test/empty
>+	${MKDIR} ${STAGEDIR}${WWWDIR}/tmp/thumbnails
>+	${TOUCH} ${STAGEDIR}${WWWDIR}/tmp/thumbnails/empty
>+	${MKDIR} ${STAGEDIR}${WWWDIR}/log
>+	${TOUCH} ${STAGEDIR}${WWWDIR}/log/development.log
> 	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}
> 	${TOUCH} ${STAGEDIR}${WWWDIR}/Gemfile.lock
> 
>diff -r -u default/www/redmine/distinfo redmine/www/redmine/distinfo
>--- distinfo	2016-06-21 10:21:23.000000000 +0200
>+++ distinfo	2017-09-05 12:48:09.206543177 +0200
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1466169440
>-SHA256 (redmine-3.2.3.tar.gz) = 570f039ce72112297c915d2f7e78228a4750020f1633fe479f23f6fdb5f8fa24
>-SIZE (redmine-3.2.3.tar.gz) = 2311713
>+TIMESTAMP = 1499413714
>+SHA256 (redmine-3.2.7.tar.gz) = f6ec163474e2a2cac21215d130c5bd3ccee54019165052943feaffc5fe5b34fc
>+SIZE (redmine-3.2.7.tar.gz) = 2322680
>diff -r -u default/www/redmine/files/mysql.rb redmine/www/redmine/files/mysql.rb
>--- files/mysql.rb	2017-01-03 06:06:33.000000000 +0100
>+++ files/mysql.rb	2017-09-11 21:18:34.564825710 +0200
>@@ -1 +1 @@
>-gem "mysql2", "~> 0.4.5"
>+gem "mysql2", "~> 0.4.6"
>diff -r -u default/www/redmine/files/patch-Gemfile redmine/www/redmine/files/patch-Gemfile
>--- files/patch-Gemfile	2017-02-25 10:56:05.000000000 +0100
>+++ files/patch-Gemfile	2017-09-11 23:12:58.000000000 +0200
>@@ -1,13 +1,14 @@
>---- Gemfile.orig	2016-06-05 07:30:30 UTC
>+--- Gemfile.orig	2017-07-02 13:29:06 UTC
> +++ Gemfile
>-@@ -4,11 +4,11 @@ if Gem::Version.new(Bundler::VERSION) < 
>+@@ -4,22 +4,22 @@ if Gem::Version.new(Bundler::VERSION) < 
>    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.5.2"
>+-gem "rails", "4.2.7.1"
>++gem "rails", ">= 4.2.7.1"
>+ gem "addressable", "2.4.0" if RUBY_VERSION < "2.0"
> -gem "jquery-rails", "~> 3.1.4"
>-+gem "rails", ">= 4.2.5.2"
>-+gem "jquery-rails"
>++gem "jquery-rails", "~> 4.3.0"
>  gem "coderay", "~> 1.1.0"
>  gem "builder", ">= 3.0.4"
> -gem "request_store", "1.0.5"
>@@ -15,16 +16,20 @@
>  gem "mime-types", (RUBY_VERSION >= "2.0" ? "~> 3.0" : "~> 2.99")
>  gem "protected_attributes"
>  gem "actionpack-action_caching"
>-@@ -17,7 +17,7 @@ gem "roadie-rails"
>+ gem "actionpack-xml_parser"
>+-gem "roadie-rails", "~> 1.1.1"
>++gem "roadie-rails", "~> 1.2.0"
>+ gem "roadie", "~> 3.2.1"
>  gem "mimemagic"
>  
>- # Request at least nokogiri 1.6.7.2 because of security advisories
>--gem "nokogiri", ">= 1.6.7.2"
>+-gem "nokogiri", (RUBY_VERSION >= "2.1" ? "~> 1.7.2" : "~> 1.6.8")
>+-gem "i18n", "~> 0.7.0"
> +gem "nokogiri"
>++gem "i18n", "~> 0.8.5"
>+ gem "ffi", "1.9.14", :platforms => :mingw if RUBY_VERSION < "2.0"
>  
>  # Request at least rails-html-sanitizer 1.0.3 because of security advisories 
>- gem "rails-html-sanitizer", ">= 1.0.3"
>-@@ -28,27 +28,15 @@ gem "rbpdf", "~> 1.19.0"
>+@@ -31,27 +31,15 @@ gem "rbpdf", "~> 1.19.2"
>  
>  # Optional gem for LDAP authentication
>  group :ldap do
>@@ -54,27 +59,12 @@
>  platforms :jruby do
>    # jruby-openssl is bundled with JRuby 1.7.0
>    gem "jruby-openssl" if Object.const_defined?(:JRUBY_VERSION) && JRUBY_VERSION < '1.7.0'
>-@@ -67,12 +55,12 @@ if File.exist?(database_file)
>-     adapters.each do |adapter|
>-       case adapter
>-       when 'mysql2'
>--        gem "mysql2", "~> 0.3.11", :platforms => [:mri, :mingw, :x64_mingw]
>-+        gem "mysql2", "~> 0.4.5", :platforms => [:mri, :mingw, :x64_mingw]
>-         gem "activerecord-jdbcmysql-adapter", :platforms => :jruby
>-       when 'mysql'
>-         gem "activerecord-jdbcmysql-adapter", :platforms => :jruby
>-       when /postgresql/
>--        gem "pg", "~> 0.18.1", :platforms => [:mri, :mingw, :x64_mingw]
>-+        gem "pg", ">= 0.18.1", :platforms => [:mri, :mingw, :x64_mingw]
>-         gem "activerecord-jdbcpostgresql-adapter", :platforms => :jruby
>-       when /sqlite3/
>-         gem "sqlite3", :platforms => [:mri, :mingw, :x64_mingw]
>-@@ -92,21 +80,6 @@ else
>+@@ -96,21 +84,6 @@ else
>    warn("Please configure your config/database.yml first")
>  end
>  
> -group :development do
>--  gem "rdoc", ">= 2.4.2"
>+-  gem "rdoc", "~> 4.3"
> -  gem "yard"
> -end
> -
>@@ -85,13 +75,13 @@
> -  gem "simplecov", "~> 0.9.1", :require => false
> -  # For running UI tests
> -  gem "capybara"
>--  gem "selenium-webdriver"
>+-  gem "selenium-webdriver", "~> 2.53.4"
> -end
> -
>  local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
>  if File.exists?(local_gemfile)
>    eval_gemfile local_gemfile
>-@@ -116,3 +89,7 @@ end
>+@@ -120,3 +93,7 @@ end
>  Dir.glob File.expand_path("../plugins/*/{Gemfile,PluginGemfile}", __FILE__) do |file|
>    eval_gemfile file
>  end
>diff -r -u default/www/redmine/pkg-plist redmine/www/redmine/pkg-plist
>--- pkg-plist	2016-06-21 10:21:23.000000000 +0200
>+++ pkg-plist	2017-09-05 12:48:09.208543591 +0200
>@@ -1664,6 +1664,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/invalid-Shift_JIS.csv
> %%WWWDIR%%/test/fixtures/files/iso8859-1.txt
> %%WWWDIR%%/test/fixtures/files/japanese-utf-8.txt
> %%WWWDIR%%/test/fixtures/files/testfile.txt
>@@ -1990,6 +1991,7 @@
> %%WWWDIR%%/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb
> %%WWWDIR%%/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb
> %%WWWDIR%%/test/unit/lib/redmine/scm/adapters/subversion_adapter_test.rb
>+%%WWWDIR%%/test/unit/lib/redmine/syntax_highlighting/coderay_test.rb
> %%WWWDIR%%/test/unit/lib/redmine/themes_test.rb
> %%WWWDIR%%/test/unit/lib/redmine/unified_diff_test.rb
> %%WWWDIR%%/test/unit/lib/redmine/utils/date_calculation.rb
>@@ -2053,13 +2055,14 @@
> @(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/tmp/pdf/empty
> @(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/tmp/test/empty
> @(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/tmp/thumbnails/empty
>-@dir %%WWWDIR%%/test/fixtures/mailer
>-@dir %%WWWDIR%%/test/mocks/development
>-@dir %%WWWDIR%%/test/mocks/test
>+@dir(%%WWWOWN%%,%%WWWGRP%%,)  %%WWWDIR%%/test/fixtures/mailer
>+@dir(%%WWWOWN%%,%%WWWGRP%%,)  %%WWWDIR%%/test/mocks/development
>+@dir(%%WWWOWN%%,%%WWWGRP%%,)  %%WWWDIR%%/test/mocks/test
> @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/tmp/cache
> @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/tmp/imports
> @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/tmp/pids
> @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/tmp/sessions
> @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/tmp/sockets
>-@(%%WWWOWN%%,%%WWWGRP%%,0664) %%WWWDIR%%/log/development.log
>-@dir %%WWWDIR%%/vendor
>+@(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/log/development.log
>+@dir(%%WWWOWN%%,%%WWWGRP%%,)  %%WWWDIR%%/vendor
>+@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/log

Actions: View | Diff

Attachments on bug 220251: 184155 | 186283