From nobody Fri Mar 4 13:31:36 2022 X-Original-To: dev-commits-ports-all@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 4679419EC383; Fri, 4 Mar 2022 13:31:37 +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 4K97zs17gwz3F9t; Fri, 4 Mar 2022 13:31:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646400697; 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=TliGYKfJ00/Wwx1aRjvBpQW1thdbRXLV2+T5+wEpDbg=; b=fmQ3G+v7dA2rdybDya2u2uvWOAdQw1lhJH7tnVrXqZaqDd0oXHu4YylBJ3sJ82RHfGihhm HD9OU5DAsWp7SVQCnda3lUMUfrVXwH8WDFxp1/kFHPrOzhTlAIbdQwiV+JpXpCKCUq8UD1 GAOv7XDpLqqzQfjrZcDX2Q5geD2JXPgqHT3Clrp23k2tMGeq7WsnnscqgQ8XzecuHz+SJJ 3D0OGuQlt6UUdvHDi4OMyD8lvXXTN84B01jJdHKQhUfMo5oa/vByMazL/j9nXTZpOZJjL5 QJVET6hw/liWB4lhN3WMbinzYdio78cEBAqkwP6ArQFYsNFvUyKteAoc/scDzg== 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 EA6524D36; Fri, 4 Mar 2022 13:31:36 +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 224DVaoQ067947; Fri, 4 Mar 2022 13:31:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 224DVa04067946; Fri, 4 Mar 2022 13:31:36 GMT (envelope-from git) Date: Fri, 4 Mar 2022 13:31:36 GMT Message-Id: <202203041331.224DVa04067946@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: 3c6cd3e83538 - main - www/redmine4: Update to 4.1.6 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 3c6cd3e83538625b83935e18d3acffb2e335f112 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646400697; 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=TliGYKfJ00/Wwx1aRjvBpQW1thdbRXLV2+T5+wEpDbg=; b=a/z3uPPHekV+bWR7T6qpxFlMgGmE7MM/6bhmG5RtqDNf2oIxWOnSN7H3BLky73xTMtCd4D 3iw3NsRE7JBp2SnYYh1Dl5q7+qGCg6GsBVkaw73fORWe0gthQgAYISpUSV1TBM9AAe24VA Pu+A7KFl3GwY5fRj73yaVL4pjsRpf6AcKBgxg5ZZOCMiMdVGhCYeQJmkvZq+yH7SGyi1mx 0FQ04rP0MrNPDXMZDYKgMoUUlKVhYy5CKBZOAuN0V6LiT2ZHnj+bdwzd/8oARfhWP8XyVj gtu24/ctBRIvkqfuvLRArizZc6HVN/ua8ctR8HeBs3+8gODZszQUIDlQ/n+kYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646400697; a=rsa-sha256; cv=none; b=YpFCccUMxrQTrTMm6fsvZ7PYHE51iBt+cblP+r7KoFCo1qANzfm7JYN1Nazn4kT7dqNZl4 6TQZJPH7RiEigVerXhP7ds0IWi6gqTCFFmLoxr2kKq8LMaaNmGmfXXqGmiqmzRxGJv0fC3 PxrdNWCGynQkVag6HnbXWh0YUGwNredw4HgtohIe7YC4UqVpsQDwq4OcYEq5/EzZ4Q9QBb M1bEGNUvpAIlqKMfPAp88W3v+QBAveM7XDs3sRH/D1kPs0LA32EgVOBcPsid9MmqhQfQK6 GJnYSXt8AIK0qkX8QSF7HDKUbhyoKHhDNO/35pV7QwRsd/rwaTEoHqIDElT/dQ== 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=3c6cd3e83538625b83935e18d3acffb2e335f112 commit 3c6cd3e83538625b83935e18d3acffb2e335f112 Author: Mikael Urankar AuthorDate: 2022-03-04 13:23:48 +0000 Commit: Mikael Urankar CommitDate: 2022-03-04 13:31:11 +0000 www/redmine4: Update to 4.1.6 Changes: https://www.redmine.org/projects/redmine/wiki/Changelog_4_1 --- www/redmine4/Makefile | 3 +-- www/redmine4/distinfo | 6 +++--- www/redmine4/files/patch-Gemfile | 17 +++++++++-------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/www/redmine4/Makefile b/www/redmine4/Makefile index b9b8220738e8..63f0b66002f9 100644 --- a/www/redmine4/Makefile +++ b/www/redmine4/Makefile @@ -1,6 +1,5 @@ PORTNAME= redmine -PORTVERSION= 4.1.5 -PORTREVISION= 1 +PORTVERSION= 4.1.6 CATEGORIES= www MASTER_SITES= https://www.redmine.org/releases/ PKGNAMESUFFIX= 4 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,14 +1,14 @@ --- 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" @@ -28,16 +28,16 @@ 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 @@ -57,7 +57,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| @@ -104,7 +105,7 @@ 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