From nobody Fri Mar 04 13:31:35 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 0024019EBF55; Fri, 4 Mar 2022 13:31:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K97zq6cfwz3Dx3; Fri, 4 Mar 2022 13:31:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646400695; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MrhCSAGVgOyPgBgSeGoEVRzJBVFbNGGBkFGXVVppGec=; b=ehDEwL0F4DP/FCpIl5IsOuSlOHQ8CELwC2dVkpWU3rmbUcK1c+xUVHi3IpztWDpzKUrcey q12Ub9yFHvHuPyaSWtESbCHOgoQkKulyrndnCfzmoo8McKUFQT/ulVGGl3kydT9xoQTeub btJER4d6qHbXeqACFqE8cchU8pfIYPZ5BEzZwCmuKfRkifcYNiMXqLYW4+lzVa5XLnXH2F I7LnvCHK2EiYJyTJtGKHgKzAu+pT7EKnAlJYGK0p0BtGdraE9fcas+YfqwUxs/uBHklqZC EjozQBCWl3zxWr0DgDY1MVYOEDtJ12CQpIX5c03aJzGyViKXu25zzoTsyaMGYg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C34274EA3; Fri, 4 Mar 2022 13:31:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 224DVZVj067923; Fri, 4 Mar 2022 13:31:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 224DVZBq067922; Fri, 4 Mar 2022 13:31:35 GMT (envelope-from git) Date: Fri, 4 Mar 2022 13:31:35 GMT Message-Id: <202203041331.224DVZBq067922@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikael Urankar Subject: git: e012b71bc8e8 - main - www/redmine42: Update to 4.2.4 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e012b71bc8e85552739b4bd005f8df71de4c5c1c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646400695; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MrhCSAGVgOyPgBgSeGoEVRzJBVFbNGGBkFGXVVppGec=; b=gUUFWnxxzg2ZIGpoL18bewsJfkDQVX5DC2r359+pOkvqn6DTm5VAI6vTx4PW9jq7VH1+io kJNO2bWbKeO8mDmn62ochzx/AYuIaNzG9zeVDgoThFsd8JNSuP+oYdUQdMFhG14XojAFQx aP6zocPCdlKzVKXLEsVjGKwHD6tER2QwQRV8S2QuXVfhaH7mgKNeY1TWlmt7fe+aL01AZe +fx223eusnNWG7ZeVTcfR1pDMtBB6xFgrZQc7WhwHfNJbn8F4WcMeovOLdtTgLt/lD2m3E F036gQRJ2T8HEJX0WoCqM3ER2uPDau76kmFL1CuKevGwFnK7GK8CEIdRWt3zHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646400695; a=rsa-sha256; cv=none; b=Mygd4cea3c9/v5n8bx+BV/SfctS3sx4YfgL0UMs/YbnwVDqotIwfsbQjVkPzobuCtyzzKT qu4WHcTo/JQgAmoFO3IdSziMEHLGQjthUlxYzIorFbIuxfdhh/QiveQde0ZJh6AejldxgS 8mbtdqdSlnYhlQLe1ofWKzUs7TYTveHLgyRmQE8LfDEsItT9/JW5XqVVBOY68+pONm7Gji GY75rk/ACDs1YWGkIaSNEi13/rNlVulWaEm3lB3oUJ2gnCgJIYY8s4h+GFPiw4zv2i5/Ik ddeEWluQfdxkeeSEUmQ0QeSCyqGvT1uMxGvts0S3TGDPbOl3wJcbKB88D3rf1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=e012b71bc8e85552739b4bd005f8df71de4c5c1c commit e012b71bc8e85552739b4bd005f8df71de4c5c1c Author: Mikael Urankar AuthorDate: 2022-03-04 10:14:40 +0000 Commit: Mikael Urankar CommitDate: 2022-03-04 13:31:11 +0000 www/redmine42: Update to 4.2.4 Changes: https://www.redmine.org/projects/redmine/wiki/Changelog_4_2 --- www/redmine42/Makefile | 3 +-- www/redmine42/distinfo | 6 +++--- www/redmine42/files/patch-Gemfile | 20 ++++++++++++++------ www/redmine42/pkg-plist | 1 + 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/www/redmine42/Makefile b/www/redmine42/Makefile index 59bf1d3b1d05..b9635eaf496a 100644 --- a/www/redmine42/Makefile +++ b/www/redmine42/Makefile @@ -1,6 +1,5 @@ PORTNAME= redmine -PORTVERSION= 4.2.3 -PORTREVISION= 1 +PORTVERSION= 4.2.4 CATEGORIES= www MASTER_SITES= https://www.redmine.org/releases/ PKGNAMESUFFIX= 42 diff --git a/www/redmine42/distinfo b/www/redmine42/distinfo index c974f4e9b893..49dd3eb74485 100644 --- a/www/redmine42/distinfo +++ b/www/redmine42/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1633877757 -SHA256 (redmine-4.2.3.tar.gz) = 72f633dc954217948558889ca85325fe6410cd18a2d8b39358e5d75932a47a0c -SIZE (redmine-4.2.3.tar.gz) = 3039136 +TIMESTAMP = 1646387373 +SHA256 (redmine-4.2.4.tar.gz) = cf649f5d4ff783582f82bebd4a5099ef63acb3d5573bbe6b4bf64f293c61c9ce +SIZE (redmine-4.2.4.tar.gz) = 3040533 diff --git a/www/redmine42/files/patch-Gemfile b/www/redmine42/files/patch-Gemfile index 7fccf134febe..7921212f9746 100644 --- a/www/redmine42/files/patch-Gemfile +++ b/www/redmine42/files/patch-Gemfile @@ -1,7 +1,11 @@ --- Gemfile.orig 2021-04-30 11:34:49 UTC +++ Gemfile -@@ -6,14 +6,14 @@ gem 'bundler', '>= 1.12.0' - gem 'rails', '5.2.6' +@@ -3,19 +3,19 @@ gem 'bundler', '>= 1.12.0' + ruby '>= 2.4.0', '< 2.8.0' + gem 'bundler', '>= 1.12.0' + +-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.26.0' @@ -16,9 +20,12 @@ -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.8.2' +-gem 'i18n', '~> 1.8.2' ++gem 'i18n', '>= 1.8.2' gem "rbpdf", "~> 1.20.0" -@@ -38,67 +38,6 @@ group :openid do + gem 'addressable' + gem 'rubyzip', '~> 2.3.0' +@@ -38,68 +38,6 @@ end gem "rack-openid" end @@ -38,7 +45,8 @@ -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| @@ -86,7 +94,7 @@ local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local") if File.exists?(local_gemfile) eval_gemfile local_gemfile -@@ -107,4 +46,8 @@ end +@@ -108,4 +46,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 diff --git a/www/redmine42/pkg-plist b/www/redmine42/pkg-plist index 47cd800dc602..55f1348d9f41 100644 --- a/www/redmine42/pkg-plist +++ b/www/redmine42/pkg-plist @@ -1753,6 +1753,7 @@ %%WWWDIR%%/test/fixtures/files/import_issues.csv %%WWWDIR%%/test/fixtures/files/import_issues_auto_mapping.csv %%WWWDIR%%/test/fixtures/files/import_issues_utf8_with_bom.csv +%%WWWDIR%%/test/fixtures/files/import_issues_with_relation_and_invalid_issues.csv %%WWWDIR%%/test/fixtures/files/import_subtasks.csv %%WWWDIR%%/test/fixtures/files/import_subtasks_with_relations.csv %%WWWDIR%%/test/fixtures/files/import_subtasks_with_unique_id.csv