From nobody Sun Dec 15 08:44:47 2024 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 4Y9xTW5Vlmz5gVkD; Sun, 15 Dec 2024 08:44:47 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y9xTW51Yrz4R5n; Sun, 15 Dec 2024 08:44:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734252287; 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=mrSdvI8FW3U1TrFN1GcnGVjWgaYmW8qraP1VCNHkB7A=; b=E0Y7Pn/AM4xdPWFnDwlitlfq57dQOIYI5Ewx8f4InvplSkSKEt/GCuw+AZbKHk5Dijv29F sceVPQySCHzaXHfJ0OInSOF/ldsMV6F1Kns3v1FmtWwagRxi+ni+HmGHD1jR8gEwQm+RvW oGAxLluj240o9/IVw6F72+5hs2ZbTG9ilmmZw4mzQo4+FU4wp/VhZDvM/Ew+FNFwo53l75 2hNkRxpmO54leQ/bQXwm2zw0fm8X2N6thb3r4s4iOffvN5U06KpC7U1ujjb0YxfSnai4J1 V4Rbm+Zf+xr7szpI94OWnYKjdLw6FwKL3fP7eoSU/gqyUBYiFXzGtqeaC01K2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734252287; 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=mrSdvI8FW3U1TrFN1GcnGVjWgaYmW8qraP1VCNHkB7A=; b=e021wjniGsS5GwTLj3WLOF4nrUbiLJ6ABRbRkPTmLjI3T/oK2GD+5V7vv/ADQEp4l1APJo YZF+8f7zu0g9yYi1IvTilODVaWqGiNzg9j8/aAFfLryF4zJXxLuj1/7qCnAi0WXO8Fi7cF Tk7KbWUOMYVnJndhEMqNGqoj+944bqZXTGnks26rgEjfSQOBtEOElDzGN52GmLHMllD23r 4Dpr7dpG6Sah4rn43g7qvf4ozORj1tjNsGiJLXSfExNPQ/wHtAUEHuhq9BGJ2K3/kAvIoo U5EsAKhOuKsfUmJiafGRvPCPgXyw1mv3s4R1OiW7mFFIjrU0uOq2BpN7XGlxWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734252287; a=rsa-sha256; cv=none; b=cfXbpHAKgSNnvczET0mUPAwe5gMtaui9K1vbOPry6SesrxUY07Aec53xmBcVeXScbQlzGf HU6rO+Col/wy9O2uPAEQUQIULx7ZA1XdapAo2jp2HLlrsSsTEE7CG+FGm22UNYkaxD+pfL rhGA4ZkQOkByEaTC8uot8/F5bvd6Rj7VatGFVeQIQbPoV+vEcYaTSqujr2L5DMW/Rtou3Q +j4akgYH2vy48LEORMrVzeiDhakzdI6KyOY70grIipkVqeil9TylnaI/b7CffBHNx+zN9l Yt3KE3cxWmrSX8LRt6nXqeezlhXGfJ1M8mqr0IKHTr4x232rjOhouRGDtIyNqA== 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 4Y9xTW4chSz11kZ; Sun, 15 Dec 2024 08:44:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BF8il3L095465; Sun, 15 Dec 2024 08:44:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BF8ilCE095462; Sun, 15 Dec 2024 08:44:47 GMT (envelope-from git) Date: Sun, 15 Dec 2024 08:44:47 GMT Message-Id: <202412150844.4BF8ilCE095462@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Xin LI Subject: git: de817d09bfc5 - main - www/redmine51: upgrade to 5.1.5 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: de817d09bfc53ea4cd3071cd8b10baff288772fd Auto-Submitted: auto-generated The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/ports/commit/?id=de817d09bfc53ea4cd3071cd8b10baff288772fd commit de817d09bfc53ea4cd3071cd8b10baff288772fd Author: Xin LI AuthorDate: 2024-12-14 23:02:34 +0000 Commit: Xin LI CommitDate: 2024-12-15 08:44:36 +0000 www/redmine51: upgrade to 5.1.5 --- www/redmine51/Makefile | 2 +- www/redmine51/distinfo | 6 +++--- www/redmine51/files/patch-Gemfile | 25 ++++++++++++++++--------- www/redmine51/pkg-plist | 1 + 4 files changed, 21 insertions(+), 13 deletions(-) diff --git a/www/redmine51/Makefile b/www/redmine51/Makefile index 2e7a21ebc9d8..0572633c9a2a 100644 --- a/www/redmine51/Makefile +++ b/www/redmine51/Makefile @@ -1,5 +1,5 @@ PORTNAME= redmine -PORTVERSION= 5.1.4 +PORTVERSION= 5.1.5 CATEGORIES= www MASTER_SITES= https://www.redmine.org/releases/ PKGNAMESUFFIX= 51 diff --git a/www/redmine51/distinfo b/www/redmine51/distinfo index 7e5bfeeb8b5f..c25ca60764a7 100644 --- a/www/redmine51/distinfo +++ b/www/redmine51/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1731143000 -SHA256 (redmine-5.1.4.tar.gz) = f5738d6a107f231b8f4b0ae5410e0c45742d75e0ef30c4b31a27c0ac9dafd51c -SIZE (redmine-5.1.4.tar.gz) = 3256191 +TIMESTAMP = 1734211981 +SHA256 (redmine-5.1.5.tar.gz) = 2c9739511712fc1381d9584fa005f911a3022e8366d1d6a53fec0f014dac0168 +SIZE (redmine-5.1.5.tar.gz) = 3257204 diff --git a/www/redmine51/files/patch-Gemfile b/www/redmine51/files/patch-Gemfile index aa3f6198db48..f703349ad123 100644 --- a/www/redmine51/files/patch-Gemfile +++ b/www/redmine51/files/patch-Gemfile @@ -1,4 +1,4 @@ ---- Gemfile.orig 2024-11-03 22:15:03 UTC +--- Gemfile.orig 2024-12-11 18:25:01 UTC +++ Gemfile @@ -2,25 +2,25 @@ ruby '>= 2.7.0', '< 3.3.0' @@ -33,7 +33,7 @@ gem 'rexml', require: false if Gem.ruby_version >= Gem::Version.new('3.0') # Windows does not include zoneinfo files, so bundle the tzinfo-data gem -@@ -31,88 +31,14 @@ gem 'rqrcode' +@@ -31,95 +31,14 @@ gem 'rqrcode' gem 'rqrcode' # HTML pipeline and sanitization @@ -65,16 +65,23 @@ - -# 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.filter_map {|c| c['adapter']}.uniq +- database_config = File.read(database_file) +- +- # Requiring libraries in a Gemfile may cause Bundler warnings or +- # unexpected behavior, especially if multiple gem versions are available. +- # So, process database.yml through ERB only if it contains ERB syntax +- # in the adapter setting. See https://www.redmine.org/issues/41749. +- if database_config.match?(/^ *adapter: *<%=/) +- require 'erb' +- database_config = ERB.new(database_config).result +- end +- +- adapters = database_config.scan(/^ *adapter: *(.*)/).flatten.uniq - if adapters.any? - adapters.each do |adapter| -- case adapter +- case adapter.strip - when 'mysql2' - gem "mysql2", "~> 0.5.0", :platforms => [:mri, :mingw, :x64_mingw] - gem "with_advisory_lock" @@ -124,7 +131,7 @@ local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local") if File.exist?(local_gemfile) eval_gemfile local_gemfile -@@ -121,4 +47,8 @@ Dir.glob File.expand_path("../plugins/*/{Gemfile,Plugi +@@ -128,4 +47,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/redmine51/pkg-plist b/www/redmine51/pkg-plist index a49d076ac740..5ee171338a84 100644 --- a/www/redmine51/pkg-plist +++ b/www/redmine51/pkg-plist @@ -2097,6 +2097,7 @@ %%WWWDIR%%/test/system/quick_jump_test.rb %%WWWDIR%%/test/system/sudo_mode_test.rb %%WWWDIR%%/test/system/timelog_test.rb +%%WWWDIR%%/test/system/versions_test.rb %%WWWDIR%%/test/test_helper.rb %%WWWDIR%%/test/unit/activity_test.rb %%WWWDIR%%/test/unit/attachment_test.rb