View | Details | Raw Unified | Return to bug 220251 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-9 / +21 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	redmine
4
PORTNAME=	redmine
5
PORTVERSION=	3.2.3
5
PORTVERSION=	3.2.7
6
PORTREVISION=	7
7
CATEGORIES=	www
6
CATEGORIES=	www
8
MASTER_SITES=	http://www.redmine.org/releases/
7
MASTER_SITES=	http://www.redmine.org/releases/
9
8
Lines 14-35 Link Here
14
LICENSE_FILE=	${WRKSRC}/doc/COPYING
13
LICENSE_FILE=	${WRKSRC}/doc/COPYING
15
14
16
RUN_DEPENDS=	rubygem-bundler>=1.5.0:sysutils/rubygem-bundler \
15
RUN_DEPENDS=	rubygem-bundler>=1.5.0:sysutils/rubygem-bundler \
17
		rubygem-rails4>=4.2.5:www/rubygem-rails4 \
16
		rubygem-rails4>=4.2.7.1:www/rubygem-rails4 \
18
		rubygem-jquery-rails>=3.1.4:www/rubygem-jquery-rails \
17
		rubygem-jquery-rails>=3.1.4:www/rubygem-jquery-rails \
19
		rubygem-coderay>=1.1.0:textproc/rubygem-coderay \
18
		rubygem-coderay>=1.1.0:textproc/rubygem-coderay \
20
		rubygem-builder>=3.0.4:devel/rubygem-builder \
19
		rubygem-builder>=3.0.4:devel/rubygem-builder \
21
		rubygem-request_store>=1.0.5:devel/rubygem-request_store \
20
		rubygem-request_store>=1.0.5:devel/rubygem-request_store \
22
		rubygem-mime-types>=0:misc/rubygem-mime-types \
21
		rubygem-mime-types>=0:misc/rubygem-mime-types \
23
		rubygem-mimemagic>=0:misc/rubygem-mimemagic \
24
		rubygem-protected_attributes>=0:devel/rubygem-protected_attributes \
22
		rubygem-protected_attributes>=0:devel/rubygem-protected_attributes \
25
		rubygem-actionpack-action_caching>=0:devel/rubygem-actionpack-action_caching \
23
		rubygem-actionpack-action_caching>=0:devel/rubygem-actionpack-action_caching \
26
		rubygem-actionpack-xml_parser1>=0:textproc/rubygem-actionpack-xml_parser1 \
24
		rubygem-actionpack-xml_parser1>=0:textproc/rubygem-actionpack-xml_parser1 \
27
		rubygem-roadie-rails>=0:mail/rubygem-roadie-rails \
25
		rubygem-roadie-rails>=1.1.1:mail/rubygem-roadie-rails \
28
		rubygem-rbpdf>=1.19.0:print/rubygem-rbpdf \
26
		rubygem-roadie>=3.2.1:mail/rubygem-roadie \
29
		rubygem-rake>=0:devel/rubygem-rake \
27
		rubygem-mimemagic>=0:misc/rubygem-mimemagic \
28
		rubygem-nokogiri>=1.7.2:textproc/rubygem-nokogiri \
29
		rubygem-i18n>=0.7.0:devel/rubygem-i18n \
30
		rubygem-ffi>=1.9.14:devel/rubygem-ffi \
31
		rubygem-rails-html-sanitizer>=1.0.3:textproc/rubygem-rails-html-sanitizer \
32
		rubygem-rbpdf>=1.19.2:print/rubygem-rbpdf \
33
		rubygem-net-ldap>=0.12.0:net/rubygem-net-ldap \
30
		rubygem-ruby-openid>=2.3.0:net/rubygem-ruby-openid \
34
		rubygem-ruby-openid>=2.3.0:net/rubygem-ruby-openid \
31
		rubygem-rack-openid>=0:www/rubygem-rack-openid \
35
		rubygem-rack-openid>=0:www/rubygem-rack-openid \
32
		rubygem-net-ldap>=0.12.0:net/rubygem-net-ldap
36
		rubygem-rake>=0:devel/rubygem-rake
33
37
34
NO_ARCH=	yes
38
NO_ARCH=	yes
35
NO_BUILD=	yes
39
NO_BUILD=	yes
Lines 55-61 Link Here
55
MYSQL_DESC=	MySQL database support (via mysql2 rubygem)
59
MYSQL_DESC=	MySQL database support (via mysql2 rubygem)
56
NO_OPTIONS_SORT=	yes
60
NO_OPTIONS_SORT=	yes
57
61
58
MYSQL_RUN_DEPENDS=	rubygem-mysql2>=0.4.5:databases/rubygem-mysql2
62
MYSQL_RUN_DEPENDS=	rubygem-mysql2>=0.4.6:databases/rubygem-mysql2
59
PASSENGER_RUN_DEPENDS=	passenger-config:www/rubygem-passenger
63
PASSENGER_RUN_DEPENDS=	passenger-config:www/rubygem-passenger
60
POSTGRESQL_RUN_DEPENDS=	rubygem-pg>=0.18.1:databases/rubygem-pg
64
POSTGRESQL_RUN_DEPENDS=	rubygem-pg>=0.18.1:databases/rubygem-pg
61
MARKDOWN_RUN_DEPENDS=	rubygem-redcarpet>=3.3.2:textproc/rubygem-redcarpet
65
MARKDOWN_RUN_DEPENDS=	rubygem-redcarpet>=3.3.2:textproc/rubygem-redcarpet
Lines 80-85 Link Here
80
	${MKDIR} ${STAGEDIR}${WWWDIR}
84
	${MKDIR} ${STAGEDIR}${WWWDIR}
81
	${MKDIR} ${STAGEDIR}${WWWDIR}/tmp/pids
85
	${MKDIR} ${STAGEDIR}${WWWDIR}/tmp/pids
82
	${MKDIR} ${STAGEDIR}${WWWDIR}/bundler.d
86
	${MKDIR} ${STAGEDIR}${WWWDIR}/bundler.d
87
	${MKDIR} ${STAGEDIR}${WWWDIR}/tmp/pdf
88
	${TOUCH} ${STAGEDIR}${WWWDIR}/tmp/pdf/empty
89
	${MKDIR} ${STAGEDIR}${WWWDIR}/tmp/test
90
	${TOUCH} ${STAGEDIR}${WWWDIR}/tmp/test/empty
91
	${MKDIR} ${STAGEDIR}${WWWDIR}/tmp/thumbnails
92
	${TOUCH} ${STAGEDIR}${WWWDIR}/tmp/thumbnails/empty
93
	${MKDIR} ${STAGEDIR}${WWWDIR}/log
94
	${TOUCH} ${STAGEDIR}${WWWDIR}/log/development.log
83
	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}
95
	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}
84
	${TOUCH} ${STAGEDIR}${WWWDIR}/Gemfile.lock
96
	${TOUCH} ${STAGEDIR}${WWWDIR}/Gemfile.lock
85
97
(-)distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1466169440
1
TIMESTAMP = 1499413714
2
SHA256 (redmine-3.2.3.tar.gz) = 570f039ce72112297c915d2f7e78228a4750020f1633fe479f23f6fdb5f8fa24
2
SHA256 (redmine-3.2.7.tar.gz) = f6ec163474e2a2cac21215d130c5bd3ccee54019165052943feaffc5fe5b34fc
3
SIZE (redmine-3.2.3.tar.gz) = 2311713
3
SIZE (redmine-3.2.7.tar.gz) = 2322680
(-)files/patch-Gemfile (-31 / +16 lines)
Lines 1-13 Link Here
1
--- Gemfile.orig	2016-06-05 07:30:30 UTC
1
--- Gemfile.orig	2017-07-02 13:29:06 UTC
2
+++ Gemfile
2
+++ Gemfile
3
@@ -4,11 +4,11 @@ if Gem::Version.new(Bundler::VERSION) < 
3
@@ -4,12 +4,12 @@ if Gem::Version.new(Bundler::VERSION) < 
4
   abort "Redmine requires Bundler 1.5.0 or higher (you're using #{Bundler::VERSION}).\nPlease update with 'gem update bundler'."
4
   abort "Redmine requires Bundler 1.5.0 or higher (you're using #{Bundler::VERSION}).\nPlease update with 'gem update bundler'."
5
 end
5
 end
6
 
6
 
7
-gem "rails", "4.2.5.2"
7
-gem "rails", "4.2.7.1"
8
-gem "jquery-rails", "~> 3.1.4"
8
+gem "rails", ">= 4.2.7.1"
9
+gem "rails", ">= 4.2.5.2"
9
 gem "addressable", "2.4.0" if RUBY_VERSION < "2.0"
10
+gem "jquery-rails"
10
 gem "jquery-rails", "~> 3.1.4"
11
 gem "coderay", "~> 1.1.0"
11
 gem "coderay", "~> 1.1.0"
12
 gem "builder", ">= 3.0.4"
12
 gem "builder", ">= 3.0.4"
13
-gem "request_store", "1.0.5"
13
-gem "request_store", "1.0.5"
Lines 15-30 Link Here
15
 gem "mime-types", (RUBY_VERSION >= "2.0" ? "~> 3.0" : "~> 2.99")
15
 gem "mime-types", (RUBY_VERSION >= "2.0" ? "~> 3.0" : "~> 2.99")
16
 gem "protected_attributes"
16
 gem "protected_attributes"
17
 gem "actionpack-action_caching"
17
 gem "actionpack-action_caching"
18
@@ -17,7 +17,7 @@ gem "roadie-rails"
18
@@ -18,7 +18,7 @@ gem "roadie-rails", "~> 1.1.1"
19
 gem "roadie", "~> 3.2.1"
19
 gem "mimemagic"
20
 gem "mimemagic"
20
 
21
 
21
 # Request at least nokogiri 1.6.7.2 because of security advisories
22
-gem "nokogiri", (RUBY_VERSION >= "2.1" ? "~> 1.7.2" : "~> 1.6.8")
22
-gem "nokogiri", ">= 1.6.7.2"
23
+gem "nokogiri"
23
+gem "nokogiri"
24
 gem "i18n", "~> 0.7.0"
25
 gem "ffi", "1.9.14", :platforms => :mingw if RUBY_VERSION < "2.0"
24
 
26
 
25
 # Request at least rails-html-sanitizer 1.0.3 because of security advisories 
27
@@ -31,27 +31,15 @@ gem "rbpdf", "~> 1.19.2"
26
 gem "rails-html-sanitizer", ">= 1.0.3"
27
@@ -28,27 +28,15 @@ gem "rbpdf", "~> 1.19.0"
28
 
28
 
29
 # Optional gem for LDAP authentication
29
 # Optional gem for LDAP authentication
30
 group :ldap do
30
 group :ldap do
Lines 54-80 Link Here
54
 platforms :jruby do
54
 platforms :jruby do
55
   # jruby-openssl is bundled with JRuby 1.7.0
55
   # jruby-openssl is bundled with JRuby 1.7.0
56
   gem "jruby-openssl" if Object.const_defined?(:JRUBY_VERSION) && JRUBY_VERSION < '1.7.0'
56
   gem "jruby-openssl" if Object.const_defined?(:JRUBY_VERSION) && JRUBY_VERSION < '1.7.0'
57
@@ -67,12 +55,12 @@ if File.exist?(database_file)
57
@@ -96,21 +84,6 @@ else
58
     adapters.each do |adapter|
59
       case adapter
60
       when 'mysql2'
61
-        gem "mysql2", "~> 0.3.11", :platforms => [:mri, :mingw, :x64_mingw]
62
+        gem "mysql2", "~> 0.4.5", :platforms => [:mri, :mingw, :x64_mingw]
63
         gem "activerecord-jdbcmysql-adapter", :platforms => :jruby
64
       when 'mysql'
65
         gem "activerecord-jdbcmysql-adapter", :platforms => :jruby
66
       when /postgresql/
67
-        gem "pg", "~> 0.18.1", :platforms => [:mri, :mingw, :x64_mingw]
68
+        gem "pg", ">= 0.18.1", :platforms => [:mri, :mingw, :x64_mingw]
69
         gem "activerecord-jdbcpostgresql-adapter", :platforms => :jruby
70
       when /sqlite3/
71
         gem "sqlite3", :platforms => [:mri, :mingw, :x64_mingw]
72
@@ -92,21 +80,6 @@ else
73
   warn("Please configure your config/database.yml first")
58
   warn("Please configure your config/database.yml first")
74
 end
59
 end
75
 
60
 
76
-group :development do
61
-group :development do
77
-  gem "rdoc", ">= 2.4.2"
62
-  gem "rdoc", "~> 4.3"
78
-  gem "yard"
63
-  gem "yard"
79
-end
64
-end
80
-
65
-
Lines 85-97 Link Here
85
-  gem "simplecov", "~> 0.9.1", :require => false
70
-  gem "simplecov", "~> 0.9.1", :require => false
86
-  # For running UI tests
71
-  # For running UI tests
87
-  gem "capybara"
72
-  gem "capybara"
88
-  gem "selenium-webdriver"
73
-  gem "selenium-webdriver", "~> 2.53.4"
89
-end
74
-end
90
-
75
-
91
 local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
76
 local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
92
 if File.exists?(local_gemfile)
77
 if File.exists?(local_gemfile)
93
   eval_gemfile local_gemfile
78
   eval_gemfile local_gemfile
94
@@ -116,3 +89,7 @@ end
79
@@ -120,3 +93,7 @@ end
95
 Dir.glob File.expand_path("../plugins/*/{Gemfile,PluginGemfile}", __FILE__) do |file|
80
 Dir.glob File.expand_path("../plugins/*/{Gemfile,PluginGemfile}", __FILE__) do |file|
96
   eval_gemfile file
81
   eval_gemfile file
97
 end
82
 end
(-)pkg-plist (-5 / +8 lines)
Lines 1664-1669 Link Here
1664
%%WWWDIR%%/test/fixtures/files/import_dates.csv
1664
%%WWWDIR%%/test/fixtures/files/import_dates.csv
1665
%%WWWDIR%%/test/fixtures/files/import_iso8859-1.csv
1665
%%WWWDIR%%/test/fixtures/files/import_iso8859-1.csv
1666
%%WWWDIR%%/test/fixtures/files/import_issues.csv
1666
%%WWWDIR%%/test/fixtures/files/import_issues.csv
1667
%%WWWDIR%%/test/fixtures/files/invalid-Shift_JIS.csv
1667
%%WWWDIR%%/test/fixtures/files/iso8859-1.txt
1668
%%WWWDIR%%/test/fixtures/files/iso8859-1.txt
1668
%%WWWDIR%%/test/fixtures/files/japanese-utf-8.txt
1669
%%WWWDIR%%/test/fixtures/files/japanese-utf-8.txt
1669
%%WWWDIR%%/test/fixtures/files/testfile.txt
1670
%%WWWDIR%%/test/fixtures/files/testfile.txt
Lines 1990-1995 Link Here
1990
%%WWWDIR%%/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb
1991
%%WWWDIR%%/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb
1991
%%WWWDIR%%/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb
1992
%%WWWDIR%%/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb
1992
%%WWWDIR%%/test/unit/lib/redmine/scm/adapters/subversion_adapter_test.rb
1993
%%WWWDIR%%/test/unit/lib/redmine/scm/adapters/subversion_adapter_test.rb
1994
%%WWWDIR%%/test/unit/lib/redmine/syntax_highlighting/coderay_test.rb
1993
%%WWWDIR%%/test/unit/lib/redmine/themes_test.rb
1995
%%WWWDIR%%/test/unit/lib/redmine/themes_test.rb
1994
%%WWWDIR%%/test/unit/lib/redmine/unified_diff_test.rb
1996
%%WWWDIR%%/test/unit/lib/redmine/unified_diff_test.rb
1995
%%WWWDIR%%/test/unit/lib/redmine/utils/date_calculation.rb
1997
%%WWWDIR%%/test/unit/lib/redmine/utils/date_calculation.rb
Lines 2053-2065 Link Here
2053
@(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/tmp/pdf/empty
2055
@(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/tmp/pdf/empty
2054
@(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/tmp/test/empty
2056
@(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/tmp/test/empty
2055
@(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/tmp/thumbnails/empty
2057
@(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/tmp/thumbnails/empty
2056
@dir %%WWWDIR%%/test/fixtures/mailer
2058
@dir(%%WWWOWN%%,%%WWWGRP%%,)  %%WWWDIR%%/test/fixtures/mailer
2057
@dir %%WWWDIR%%/test/mocks/development
2059
@dir(%%WWWOWN%%,%%WWWGRP%%,)  %%WWWDIR%%/test/mocks/development
2058
@dir %%WWWDIR%%/test/mocks/test
2060
@dir(%%WWWOWN%%,%%WWWGRP%%,)  %%WWWDIR%%/test/mocks/test
2059
@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/tmp/cache
2061
@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/tmp/cache
2060
@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/tmp/imports
2062
@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/tmp/imports
2061
@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/tmp/pids
2063
@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/tmp/pids
2062
@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/tmp/sessions
2064
@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/tmp/sessions
2063
@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/tmp/sockets
2065
@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/tmp/sockets
2064
@(%%WWWOWN%%,%%WWWGRP%%,0664) %%WWWDIR%%/log/development.log
2066
@(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/log/development.log
2065
@dir %%WWWDIR%%/vendor
2067
@dir(%%WWWOWN%%,%%WWWGRP%%,)  %%WWWDIR%%/vendor
2068
@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/log

Return to bug 220251