diff --git a/www/redmine4/Makefile b/www/redmine4/Makefile index b9b8220738e8..63f0b66002f9 100644 --- a/www/redmine4/Makefile +++ b/www/redmine4/Makefile @@ -1,102 +1,101 @@ PORTNAME= redmine -PORTVERSION= 4.1.5 -PORTREVISION= 1 +PORTVERSION= 4.1.6 CATEGORIES= www MASTER_SITES= https://www.redmine.org/releases/ PKGNAMESUFFIX= 4 MAINTAINER= mikael@FreeBSD.org COMMENT= Flexible project management web application LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/doc/COPYING PORTSCOUT= limit:^4\.1\. RUN_DEPENDS= rubygem-bundler>=1.5.0:sysutils/rubygem-bundler \ rubygem-rails52>=5.2.5<5.3:www/rubygem-rails52 \ rubygem-rouge312>=3.12.0:textproc/rubygem-rouge312 \ rubygem-request_store14>=1.0.5:devel/rubygem-request_store14 \ rubygem-mini_mime>=1.0.1:mail/rubygem-mini_mime \ rubygem-actionpack-xml_parser-rails52>=0:textproc/rubygem-actionpack-xml_parser-rails52 \ rubygem-roadie-rails-rails52>=2.1.0:mail/rubygem-roadie-rails-rails52 \ rubygem-mail>=2.7.1:mail/rubygem-mail \ rubygem-csv>=3.1.1:devel/rubygem-csv \ rubygem-nokogiri111>=1.11.0:textproc/rubygem-nokogiri111 \ rubygem-i18n>=0.7:devel/rubygem-i18n \ rubygem-rbpdf>=1.19.6:print/rubygem-rbpdf \ rubygem-net-ldap>=0.16:net/rubygem-net-ldap \ rubygem-ruby-openid>=2.9.2:net/rubygem-ruby-openid \ rubygem-rack-openid>=0:www/rubygem-rack-openid \ rubygem-rake>=0:devel/rubygem-rake USES= cpe USE_RUBY= yes CONFLICTS_INSTALL= redmine42 NO_ARCH= yes NO_BUILD= yes USERS= ${WWWOWN} GROUPS= ${WWWGRP} PLIST_SUB= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} SUB_LIST= RUBY_SUFFIX=${RUBY_SUFFIX} OPTIONS_DEFINE= MYSQL POSTGRESQL MARKDOWN RMAGIC THIN OPTIONS_DEFAULT=MYSQL MARKDOWN RMAGIC THIN OPTIONS_SUB= yes POSTGRESQL_DESC=Enable PostgreSQL support MARKDOWN_DESC= Enable Markdown support RMAGIC_DESC= Enable Gantt charts support THIN_DESC= Use Thin WEB server MYSQL_DESC= MySQL database support (via mysql2 rubygem) NO_OPTIONS_SORT= yes MYSQL_RUN_DEPENDS= rubygem-mysql2>=0.5.0:databases/rubygem-mysql2 POSTGRESQL_RUN_DEPENDS= rubygem-pg>=1.1.4:databases/rubygem-pg MARKDOWN_RUN_DEPENDS= rubygem-redcarpet>=3.4.0:textproc/rubygem-redcarpet RMAGIC_RUN_DEPENDS= rubygem-mini_magick>=4.9.5:graphics/rubygem-mini_magick THIN_RUN_DEPENDS= rubygem-thin>=1.6.2:www/rubygem-thin THIN_SUB_LIST= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} THIN_VARS= USE_RC_SUBR=redmine .include post-extract: @${RM} -r ${WRKSRC}/.hgignore ${WRKSRC}/.gitignore ${WRKSRC}/.github \ ${WRKSRC}/files/delete.me ${WRKSRC}/log/delete.me @${MV} ${WRKSRC}/config/settings.yml ${WRKSRC}/config/settings.yml.sample @${MV} ${WRKSRC}/config/database.yml.example ${WRKSRC}/config/database.yml.sample post-patch: @${RM} ${WRKSRC}/Gemfile.orig do-install: ${MKDIR} ${STAGEDIR}${WWWDIR} ${MKDIR} ${STAGEDIR}${WWWDIR}/bundler.d ${MKDIR} ${STAGEDIR}${WWWDIR}/log ${MKDIR} ${STAGEDIR}${WWWDIR}/public/plugin_assets ${MKDIR} ${STAGEDIR}${WWWDIR}/tmp cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR} ${TOUCH} ${STAGEDIR}${WWWDIR}/Gemfile.lock do-install-MYSQL-on: ${CP} ${FILESDIR}/mysql.rb ${STAGEDIR}${WWWDIR}/bundler.d do-install-POSTGRESQL-on: ${CP} ${FILESDIR}/pg.rb ${STAGEDIR}${WWWDIR}/bundler.d do-install-MARKDOWN-on: ${CP} ${FILESDIR}/markdown.rb ${STAGEDIR}${WWWDIR}/bundler.d do-install-RMAGIC-on: ${CP} ${FILESDIR}/mini_magick.rb ${STAGEDIR}${WWWDIR}/bundler.d do-install-THIN-on: ${CP} ${FILESDIR}/thin.rb ${STAGEDIR}${WWWDIR}/bundler.d post-install: (cd ${STAGEDIR}${WWWDIR} && ${RM} Gemfile.lock && bundle install --local) .include diff --git a/www/redmine4/distinfo b/www/redmine4/distinfo index 5524066f8c1a..ef3c24be5ba2 100644 --- a/www/redmine4/distinfo +++ b/www/redmine4/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1633877816 -SHA256 (redmine-4.1.5.tar.gz) = 624dfeab7db5cda35a03d791b5fa83a836717ca280856c51cd089ed638f8678e -SIZE (redmine-4.1.5.tar.gz) = 2722929 +TIMESTAMP = 1646389213 +SHA256 (redmine-4.1.6.tar.gz) = ad78999cb65ba2d1be344fdd582e4f24a9b97c88710ab217a954df437e04072f +SIZE (redmine-4.1.6.tar.gz) = 2723049 diff --git a/www/redmine4/files/patch-Gemfile b/www/redmine4/files/patch-Gemfile index bc935ec1a11a..4f2e3d9f2ced 100644 --- a/www/redmine4/files/patch-Gemfile +++ b/www/redmine4/files/patch-Gemfile @@ -1,115 +1,116 @@ --- Gemfile.orig 2021-04-22 10:46:10 UTC +++ Gemfile -@@ -1,21 +1,21 @@ +@@ -1,21 +1,21 @@ source 'https://rubygems.org' source 'https://rubygems.org' -ruby '>= 2.3.0', '< 2.7.0' if Bundler::VERSION >= '1.12.0' +ruby '>= 2.3.0', '< 2.8.0' if Bundler::VERSION >= '1.12.0' gem "bundler", ">= 1.5.0" --gem 'rails', '5.2.6' -+gem 'rails', '~> 5.2.5' +-gem 'rails', '5.2.6.2' ++gem 'rails', '5.2.6' gem 'sprockets', '~> 3.7.2' if RUBY_VERSION < '2.5' gem 'globalid', '~> 0.4.2' if Gem.ruby_version < Gem::Version.new('2.6.0') gem "rouge", "~> 3.12.0" gem "request_store", "~> 1.4.1" -gem "mini_mime", "~> 1.0.1" +gem "mini_mime", ">= 1.0.1" gem "actionpack-xml_parser" -gem "roadie-rails", (RUBY_VERSION < "2.5" ? "~> 1.3.0" : "~> 2.1.0") +gem "roadie-rails", (RUBY_VERSION < "2.5" ? "~> 1.3.0" : "~> 2.2.0") gem 'marcel' gem "mail", "~> 2.7.1" -gem 'csv', (RUBY_VERSION < '2.5' ? ['>= 3.1.1', '<= 3.1.5'] : '~> 3.1.1') +gem 'csv', (RUBY_VERSION < '2.5' ? ['>= 3.1.1', '<= 3.1.5'] : '~> 3.2.0') gem 'nokogiri', (RUBY_VERSION < '2.5' ? '~> 1.10.0' : '~> 1.11.1') -gem "i18n", "~> 1.6.0" +gem "i18n", ">= 1.6.0" gem "rbpdf", "~> 1.20.0" # Windows does not include zoneinfo files, so bundle the tzinfo-data gem -@@ -22,7 +22,7 @@ gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :ms +@@ -23,7 +23,7 @@ group :ldap do # Optional gem for LDAP authentication group :ldap do - gem "net-ldap", "~> 0.16.0" -+ gem "net-ldap", "~> 0.17.0" ++ gem "net-ldap", ">= 0.17.0" end # Optional gem for OpenID authentication -@@ -31,66 +31,6 @@ group :openid do +@@ -32,67 +32,6 @@ end gem "rack-openid" end -# Optional gem for exporting the gantt to a PNG file -group :minimagick do - gem "mini_magick", "~> 4.9.5" -end - -# Optional Markdown support, not for JRuby -group :markdown do - gem 'redcarpet', '~> 3.5.1' -end - -# Include database gems for the adapters found in the database -# configuration file -require 'erb' -require 'yaml' -database_file = File.join(File.dirname(__FILE__), "config/database.yml") -if File.exist?(database_file) -- database_config = YAML::load(ERB.new(IO.read(database_file)).result) +- yaml_config = ERB.new(IO.read(database_file)).result +- database_config = YAML.respond_to?(:unsafe_load) ? YAML.unsafe_load(yaml_config) : YAML.load(yaml_config) - adapters = database_config.values.map {|c| c['adapter']}.compact.uniq - if adapters.any? - adapters.each do |adapter| - case adapter - when 'mysql2' - gem "mysql2", "~> 0.5.0", :platforms => [:mri, :mingw, :x64_mingw] - when /postgresql/ - gem "pg", "~> 1.1.4", :platforms => [:mri, :mingw, :x64_mingw] - when /sqlite3/ - gem "sqlite3", "~> 1.4.0", :platforms => [:mri, :mingw, :x64_mingw] - when /sqlserver/ - gem "tiny_tds", "~> 2.1.2", :platforms => [:mri, :mingw, :x64_mingw] - gem "activerecord-sqlserver-adapter", "~> 5.2.1", :platforms => [:mri, :mingw, :x64_mingw] - else - warn("Unknown database adapter `#{adapter}` found in config/database.yml, use Gemfile.local to load your own database gems") - end - end - else - warn("No adapter found in config/database.yml, please configure it first") - end -else - warn("Please configure your config/database.yml first") -end - -group :development do - gem "yard" -end - -group :test do - gem "rails-dom-testing" - gem 'mocha', '>= 1.4.0' - gem "simplecov", "~> 0.17.0", :require => false - gem "ffi", platforms: [:mingw, :x64_mingw, :mswin] - # For running system tests - gem 'puma', '~> 3.7' - gem "capybara", (RUBY_VERSION < "2.4" ? "~> 3.15.1" : "~> 3.25.0") - gem "selenium-webdriver" - # RuboCop - gem 'rubocop', '~> 0.76.0' - gem 'rubocop-performance', '~> 1.5.0' - gem 'rubocop-rails', '~> 2.3.0' -end - local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local") if File.exists?(local_gemfile) eval_gemfile local_gemfile -@@ -99,4 +39,8 @@ end +@@ -101,4 +40,8 @@ Dir.glob File.expand_path("../plugins/*/{Gemfile,Plugi # Load plugins' Gemfiles Dir.glob File.expand_path("../plugins/*/{Gemfile,PluginGemfile}", __FILE__) do |file| eval_gemfile file +end + +Dir["#{File.dirname(__FILE__)}/bundler.d/*.rb"].each do |bundle| + self.instance_eval(Bundler.read_file(bundle)) end