From nobody Fri Feb 23 15:09:17 2024 X-Original-To: dev-commits-ports-branches@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 4ThD1n53sdz59v94; Fri, 23 Feb 2024 15:09: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 4ThD1n2nM5z4Gq8; Fri, 23 Feb 2024 15:09:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708700957; 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=DoHWFw9slYw/7UtlTFiyQ43870O/zD4M4Qq9bbZS63Q=; b=xpCZIImB241BuuXY0a98zf9SVaQ0KKeqWdCMerT5LkVhRtXY7zYWzm4+d669wQUkFdloHW /oTPE8u9UVv9vR48lsibaRAKzJ/8+9baywnYTPmTatxu9q3ILEfsd6tY6qLkZqkvzw3CJb 7aDrqodS3GvnatFo9pTdRSPLCtXeHPO+QTTN6A/NHrabTaNMUuNHz/I3uc6bNJp5+8XM88 QgKQQ52PCzqMB+R04+IcVnjabScG2hAnZCnsDsB7AXuTfRrS9/TFKRJSQEJPN6aB3Ig8+k r+A3xmuYbSbZy5tpaU1VJU8p+VCr/OpLTlEQAtuODiEmHJ5gaErIPyP5m13ZsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708700957; a=rsa-sha256; cv=none; b=TzT+0HclqRyu05i8FchA3XCeA0zzzHe6pHI+FjtxoG3TEOLVUPbonP5mDioVV0NHGtmlXh cTnR3gNgvbNczx4FUv9dGH8vY7z6AUGpNWeoDVvMM/RV4CayiwbKY0m7wB2L5FkbzzYjYw mxm6xo9mIks6TMeyDGLorXANJ6tuYlfzHEUqz5UxPaXlBMnOWoshafDu/3CZrNInC2v9V0 1Bw2EH6PL2oMBbJC96hvwl0R0plGvNsl4j0neR4+V5VUQ/Ek9qatrc+5Y4Q61Vm1PgsXxA GL90HD7GbpMuIcEclvQNrPRq8YnVGqotgPuMxoJLkBXFUhGTwlPckoryD3rgDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708700957; 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=DoHWFw9slYw/7UtlTFiyQ43870O/zD4M4Qq9bbZS63Q=; b=VYzRhvcCD2D/DGwzHJR7a+SwY80uLBBdlG+rCKaZ9WmyY76by7bN4N5NJyai4VeXSA8Ptb gZUbulZ8HG6x0G5ZmPkr6nVYMMLsVAYS45QbiQ6SwAL1r062r7/5CCj07F7LdEEbPiH3uh CO1/ztnJSnC5V0/S11YxwIEweiiz0raj+K8lmiK6yGgywlwjTHuOfuj4MSmXMp4zpv47g1 8YaGxu1v2Vrq2I/b3j4l/cwtavnv3r0+c57g6m3BSzS0H2QD1uFpLkZ/F81pHgge5sgoNP eBoTFb/B2ZX0Y73uHji/lUQBzmqEnteL7PIwi3pqH1WDCzQRtJC9p53WGwZxOg== 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 4ThD1n1rXDzKyM; Fri, 23 Feb 2024 15:09: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 41NF9H4p028103; Fri, 23 Feb 2024 15:09:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41NF9HSE028100; Fri, 23 Feb 2024 15:09:17 GMT (envelope-from git) Date: Fri, 23 Feb 2024 15:09:17 GMT Message-Id: <202402231509.41NF9HSE028100@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Matthias Fechner Subject: git: 17844ef38d6c - 2024Q1 - www/redmine50: fix compile problem due to nokogiri update to 1.16.0 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2024Q1 X-Git-Reftype: branch X-Git-Commit: 17844ef38d6c5b8595fb05ba53131389978530d4 Auto-Submitted: auto-generated The branch 2024Q1 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=17844ef38d6c5b8595fb05ba53131389978530d4 commit 17844ef38d6c5b8595fb05ba53131389978530d4 Author: Matthias Fechner AuthorDate: 2024-01-26 12:47:00 +0000 Commit: Matthias Fechner CommitDate: 2024-02-23 14:21:45 +0000 www/redmine50: fix compile problem due to nokogiri update to 1.16.0 (cherry picked from commit 2490cad1712cd83bfe8e45373b42451d104bea04) --- www/redmine50/Makefile | 1 + www/redmine50/files/patch-Gemfile | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/www/redmine50/Makefile b/www/redmine50/Makefile index 758accdcc7d7..8c8acef3ceb4 100644 --- a/www/redmine50/Makefile +++ b/www/redmine50/Makefile @@ -1,5 +1,6 @@ PORTNAME= redmine PORTVERSION= 5.0.7 +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