From nobody Sun Feb 18 05:16:17 2024 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 4Tcv5s6P43z5BVqK; Sun, 18 Feb 2024 05:16:17 +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 4Tcv5s1ZNjz4Z06; Sun, 18 Feb 2024 05:16:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708233377; 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=DiiztbjU083tHhxSuE2tkmd8aIyQ+pUADiO26lBQLcA=; b=PAdVwikreJHxIu/ucKgBy+qcPd2vzh6byZaIT2ZnnI3teR6Mm/kk3EhebgnRf+4b+FE3Er zjBPsxa6Vh9co4HGjzqinVOKUKvMUcMMTcaLIhXQekLs/RZBcFqM02DQW+OlUC2iJrs7xy RwuGE2120I9InPa/q1N7b2vIURgCsD0ESEOPwnG0MpLmz7NrlOUvrSJR1idd7GlmLXp/3x oYQx/N+jK7kVV4/yvW0eCh+aZqmgCjnKm6b5E//uAzf+t/lxPGHo61sbMdpbqy0RepRhuQ I5QEsRJlYa8cEzvJjfx/4shhcFqr3v5SxEJfE0V06/Y4e4SbEpzeEKfhXGHlPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708233377; 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=DiiztbjU083tHhxSuE2tkmd8aIyQ+pUADiO26lBQLcA=; b=LPvIn++MtPVAWC0OPj/yk9HIEStmuaSHbUSzXVA2G1IMNoKd9kdODGttrnyqOQMGILNnp3 0gZTaf3KHsRn3u4uFh3eNIEqVF41Kp5q/BUrYmNdg9ay/6NHU5lhluQJRa2AP4/+pxg2yj uW2TUU1ifyxo6b8gnto5E7U3ryPQYeaHHFjFA8TR/L5jYsQ2HHyOsVhd6oj+u5xvT4zmib uYau5AX+Qodc9WvDLUgGl0h1WHsIL6qLVAQYYjRhx7OtcBCXl06/PieDDjxcMUbn25girU M/mF0TL2n0otxGxwIyZLcZGFuLHc3AmmoMVpqVBObR5hwoqtdbLsiy2lhZKQDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708233377; a=rsa-sha256; cv=none; b=unLAL5PNmP0LzcTP9+5XNAq0xFnrnnbLGBBkY19bzbsnr5H/eKk3FuJuIwLjTuXJ0+uLr7 /U3HOdRde4Tfjfqzn6H6iusPtnD7liippFidigrBqmLPByDxLbohlVCvrMRXY+SUdEMeg9 yUARLTL1HFVlvu5lbrA8G5xDR0V0ounOVRb4n9HV497KeCNbGpgob5C+/AugwIkOONGuAg ifqaKsR7HSg1L/Oj874vpezY73r6iuhaeAaW+Fm1Hazj108zwJEW6qJML03l2lPnjS0eTc 5ZVmR8X/2MtFEAGt1g4x3UvmSSSVJufgczRN3EWeBT2pB2TiTwFoLOSN3JKsfA== 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 4Tcv5s0gRTzdNZ; Sun, 18 Feb 2024 05:16:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41I5GHtT096596; Sun, 18 Feb 2024 05:16:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41I5GH8x096593; Sun, 18 Feb 2024 05:16:17 GMT (envelope-from git) Date: Sun, 18 Feb 2024 05:16:17 GMT Message-Id: <202402180516.41I5GH8x096593@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Fechner Subject: git: 2490cad1712c - main - www/redmine50: fix compile problem due to nokogiri update to 1.16.0 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: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2490cad1712cd83bfe8e45373b42451d104bea04 Auto-Submitted: auto-generated The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=2490cad1712cd83bfe8e45373b42451d104bea04 commit 2490cad1712cd83bfe8e45373b42451d104bea04 Author: Matthias Fechner AuthorDate: 2024-01-26 12:47:00 +0000 Commit: Matthias Fechner CommitDate: 2024-02-18 04:53:31 +0000 www/redmine50: fix compile problem due to nokogiri update to 1.16.0 --- www/redmine50/Makefile | 2 +- www/redmine50/files/patch-Gemfile | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/www/redmine50/Makefile b/www/redmine50/Makefile index a3ff0538a666..c52cc1f7046e 100644 --- a/www/redmine50/Makefile +++ b/www/redmine50/Makefile @@ -1,6 +1,6 @@ PORTNAME= redmine PORTVERSION= 5.0.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= https://www.redmine.org/releases/ PKGNAMESUFFIX= 50 diff --git a/www/redmine50/files/patch-Gemfile b/www/redmine50/files/patch-Gemfile index 31b94952299b..ff93cfc7b6ba 100644 --- a/www/redmine50/files/patch-Gemfile +++ b/www/redmine50/files/patch-Gemfile @@ -1,6 +1,6 @@ ---- Gemfile.orig 2023-03-05 21:35:36 UTC +--- Gemfile.orig 2023-11-27 20:30:01 UTC +++ Gemfile -@@ -3,30 +3,30 @@ gem 'bundler', '>= 1.12.0' +@@ -3,30 +3,30 @@ source 'https://rubygems.org' ruby '>= 2.5.0', '< 3.2.0' gem 'bundler', '>= 1.12.0' @@ -23,7 +23,8 @@ - '~> 1.13.10' + '>= 1.13.9' else - '~> 1.15.2' +- '~> 1.15.2' ++ '~> 1.15' end) gem "rexml", require: false if Gem.ruby_version >= Gem::Version.new('3.0') -gem 'i18n', '~> 1.10.0' @@ -39,7 +40,7 @@ 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') -@@ -40,85 +40,10 @@ group :ldap do +@@ -40,85 +40,10 @@ gem 'rqrcode' # Optional gem for LDAP authentication group :ldap do @@ -126,7 +127,7 @@ local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local") if File.exist?(local_gemfile) eval_gemfile local_gemfile -@@ -127,4 +52,8 @@ Dir.glob File.expand_path("../plugins/*/{Gemfile,Plugi +@@ -127,4 +52,8 @@ end # Load plugins' Gemfiles Dir.glob File.expand_path("../plugins/*/{Gemfile,PluginGemfile}", __FILE__) do |file| eval_gemfile file