diff --git a/www/redmine50/Makefile b/www/redmine50/Makefile index 544d3e7dd4a4..14b71f1b2820 100644 --- a/www/redmine50/Makefile +++ b/www/redmine50/Makefile @@ -1,120 +1,119 @@ PORTNAME= redmine -PORTVERSION= 5.0.4 -PORTREVISION= 1 +PORTVERSION= 5.0.5 CATEGORIES= www MASTER_SITES= https://www.redmine.org/releases/ PKGNAMESUFFIX= 50 MAINTAINER= mikael@FreeBSD.org COMMENT= Flexible project management web application WWW= https://www.redmine.org/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/doc/COPYING RUN_DEPENDS= rubygem-bundler>=1.12.0:sysutils/rubygem-bundler \ rubygem-globalid-rails61>0:databases/rubygem-globalid-rails61 \ rubygem-rails61>=6.1:www/rubygem-rails61 \ rubygem-rouge>=3.28.0:textproc/rubygem-rouge \ rubygem-request_store>=1.5.0:devel/rubygem-request_store \ rubygem-mini_mime>=1.0.1:mail/rubygem-mini_mime \ rubygem-actionpack-xml_parser-rails61>=0:textproc/rubygem-actionpack-xml_parser-rails61 \ rubygem-roadie-rails-rails61>=3.0.0:mail/rubygem-roadie-rails-rails61 \ rubygem-marcel>0:devel/rubygem-marcel \ rubygem-mail>=2.7.1:mail/rubygem-mail \ rubygem-csv>=3.2.0:devel/rubygem-csv \ rubygem-nokogiri>=1.13.8:textproc/rubygem-nokogiri \ rubygem-i18n>=1.10.0:devel/rubygem-i18n \ rubygem-rbpdf>=1.20.0:print/rubygem-rbpdf \ rubygem-addressable>0:www/rubygem-addressable \ rubygem-rubyzip>0:archivers/rubygem-rubyzip \ rubygem-net-smtp>0:mail/rubygem-net-smtp \ rubygem-net-imap>0:mail/rubygem-net-imap \ rubygem-net-pop>0:mail/rubygem-net-pop \ rubygem-psych>0:textproc/rubygem-psych \ rubygem-net-ldap>=0.17.0:net/rubygem-net-ldap \ rubygem-rotp>=5.0.0:devel/rubygem-rotp \ rubygem-rqrcode>0:www/rubygem-rqrcode \ rubygem-erb>0:devel/rubygem-erb # Per https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=264638#c9 # to be removed if https://www.redmine.org/issues/37394 is fixed RUN_DEPENDS+= rubygem-redcarpet>=3.5.1:textproc/rubygem-redcarpet \ rubygem-html-pipeline>=2.13.2:textproc/rubygem-html-pipeline \ rubygem-commonmarker>=0.23.6:textproc/rubygem-commonmarker \ rubygem-sanitize>=6.0:textproc/rubygem-sanitize \ rubygem-deckar01-task_list>=2.3.1:www/rubygem-deckar01-task_list USES= cpe ruby 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.2.2:databases/rubygem-pg MARKDOWN_RUN_DEPENDS= rubygem-redcarpet>=3.5.1:textproc/rubygem-redcarpet RMAGIC_RUN_DEPENDS= rubygem-mini_magick>=4.11.0: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 # https://www.redmine.org/issues/37394 ${CP} ${FILESDIR}/commonmark.rb ${STAGEDIR}${WWWDIR}/bundler.d 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) ${RM} ${STAGEDIR}${WWWDIR}/package.json \ ${STAGEDIR}${WWWDIR}/yarn.lock .include diff --git a/www/redmine50/distinfo b/www/redmine50/distinfo index 478f04c3e901..f6182d2e3ca2 100644 --- a/www/redmine50/distinfo +++ b/www/redmine50/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1671100842 -SHA256 (redmine-5.0.4.tar.gz) = 39436f5f8d26f5b7ce17e79903a3112e556e924da4f51c05b57f5defbe6f2924 -SIZE (redmine-5.0.4.tar.gz) = 3114593 +TIMESTAMP = 1678193211 +SHA256 (redmine-5.0.5.tar.gz) = a89ad1c4bb9bf025e6527c77ab18c8faf7749c94a975caf2cfdbba00eb12a481 +SIZE (redmine-5.0.5.tar.gz) = 3115940 diff --git a/www/redmine50/files/patch-Gemfile b/www/redmine50/files/patch-Gemfile index f4544f08f60a..55e7c3ee8080 100644 --- a/www/redmine50/files/patch-Gemfile +++ b/www/redmine50/files/patch-Gemfile @@ -1,119 +1,126 @@ ---- Gemfile.orig 2023-02-03 08:57:08.281666000 +0100 -+++ Gemfile 2023-02-03 08:57:33.131793000 +0100 +--- Gemfile.orig 2023-03-07 15:50:05.013891000 +0100 ++++ Gemfile 2023-03-08 09:01:06.479289000 +0100 @@ -3,24 +3,24 @@ gem 'bundler', '>= 1.12.0' ruby '>= 2.5.0', '< 3.2.0' gem 'bundler', '>= 1.12.0' --gem 'rails', '6.1.7' +-gem 'rails', '6.1.7.2' +gem 'rails', '>=6.1.6' gem 'globalid', '~> 0.4.2' if Gem.ruby_version < Gem::Version.new('2.6.0') -gem 'rouge', '~> 3.28.0' +gem 'rouge', '>= 3.28.0' gem 'request_store', '~> 1.5.0' gem 'mini_mime', '~> 1.1.0' gem "actionpack-xml_parser" gem 'roadie-rails', (Gem.ruby_version < Gem::Version.new('2.6.0') ? '~> 2.2.0' : '~> 3.0.0') gem 'marcel' -gem "mail", "~> 2.7.1" +gem "mail", ">= 2.7" gem 'csv', '~> 3.2.0' - gem 'nokogiri', (Gem.ruby_version < Gem::Version.new('2.6.0') ? '~> 1.12.5' : '~> 1.13.4') +-gem 'nokogiri', (Gem.ruby_version < Gem::Version.new('2.6.0') ? '~> 1.12.5' : '~> 1.13.10') ++gem 'nokogiri', (Gem.ruby_version < Gem::Version.new('2.6.0') ? '~> 1.12.5' : '>= 1.13.9') gem "rexml", require: false if Gem.ruby_version >= Gem::Version.new('3.0') -gem 'i18n', '~> 1.10.0' +-gem 'rbpdf', '~> 1.21.0' +gem 'i18n', '>= 1.10.0' - gem "rbpdf", "~> 1.20.0" ++gem 'rbpdf', '>= 1.21.0' gem 'addressable' gem 'rubyzip', '~> 2.3.0' gem 'net-smtp', '~> 0.3.0' -gem 'net-imap', '~> 0.2.2' +gem 'net-imap', '>= 0.2.2' gem 'net-pop', '~> 0.1.1' # Rails 6.1.6.1 does not work with Pysch 3.0.2, which is installed by default with Ruby 2.5. See https://github.com/rails/rails/issues/45590 gem 'psych', '>= 3.1.0' if Gem.ruby_version < Gem::Version.new('2.6.0') -@@ -37,77 +37,6 @@ end +@@ -37,82 +37,6 @@ end gem 'net-ldap', '~> 0.17.0' end -# Optional gem for exporting the gantt to a PNG file -group :minimagick do - gem 'mini_magick', '~> 4.11.0' -end - -# Optional Markdown support, not for JRuby -# ToDo: Remove common_mark group when common_mark is decoupled from markdown. See defect (#36892) for more details. -gem 'redcarpet', '~> 3.5.1', groups: [:markdown, :common_mark] - -# Optional CommonMark support, not for JRuby -group :common_mark do - gem "html-pipeline", "~> 2.13.2" -- gem "commonmarker", (Gem.ruby_version < Gem::Version.new('2.6.0') ? '0.21.0' : '~> 0.23.6') +- gem "commonmarker", (Gem.ruby_version < Gem::Version.new('2.6.0') ? '0.21.0' : '~> 0.23.8') - gem "sanitize", "~> 6.0" - gem 'deckar01-task_list', '2.3.2' -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) - 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.2.2", :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", "~> 6.1.0", :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 'listen', '~> 3.3' - gem "yard" -end - -group :test do - gem "rails-dom-testing" - gem 'mocha', (Gem.ruby_version < Gem::Version.new('2.7.0') ? ['>= 1.4.0', '< 2.0.0'] : '>= 1.4.0') - gem 'simplecov', '~> 0.21.2', :require => false - gem "ffi", platforms: [:mingw, :x64_mingw, :mswin] - # For running system tests -- # TODO: Remove version specification once Capybara supports Puma 6 -- gem 'puma', '< 6.0.0' -- gem 'capybara', (Gem.ruby_version < Gem::Version.new('2.6.0') ? '~> 3.35.3' : '~> 3.36.0') +- gem 'puma', (Gem.ruby_version < Gem::Version.new('2.7') ? '< 6.0.0' : '>= 0') +- gem 'capybara', (if Gem.ruby_version < Gem::Version.new('2.6') +- '~> 3.35.3' +- elsif Gem.ruby_version < Gem::Version.new('2.7') +- '~> 3.36.0' +- else +- '~> 3.38.0' +- end) - gem "selenium-webdriver", "~> 3.142.7" - gem 'webdrivers', '4.6.1', require: false - # RuboCop - gem 'rubocop', '~> 1.26.0' - gem 'rubocop-performance', '~> 1.13.0' - gem 'rubocop-rails', '~> 2.14.0' -end - local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local") if File.exist?(local_gemfile) eval_gemfile local_gemfile -@@ -116,4 +45,8 @@ Dir.glob File.expand_path("../plugins/*/{Gemfile,Plugi +@@ -121,4 +45,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