From nobody Thu Dec 26 10:13:49 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 4YJkx93lqPz5hdlJ; Thu, 26 Dec 2024 10:13:49 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YJkx935LQz453t; Thu, 26 Dec 2024 10:13:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735208029; 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=SL2QCoWeBElYIFjwFQlSLLQDjD9u1D14GiJVUi1Dkk0=; b=nWNFULveMcQGDWHchjEAVbIaKTc2XQufu2PtZ4SsMTHjWoEn5PFzjjA0EDNpyTLoz4vwOh FlHrPJr39q7B/L8DrKJha8YkgkXpggir4/s/2QhpL9wxe80LUk0dcQviD4cDt+9kw2k4pG dSQhaYtVIjNht+Jdqc46hf4X355h+dxptC8F2G/CFcGMb85N3Q0nT86g3qj7IOCjNxHNg2 VmDGJ5DhKTTp1r0kKkFvlJR+eY9KxFWNl26R+V62fB7sgC/WDWZyYWxIfCvx+5KJYLQe1+ xCHkPXF+Y7efY6i0PjJFOnn+40ByJcRhLhvkDZHcuWzwU3Bld9P12u4ut4x/SQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735208029; 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=SL2QCoWeBElYIFjwFQlSLLQDjD9u1D14GiJVUi1Dkk0=; b=LpuAeq/D5qkKd0VgkJMlRweDIX8lITQwjiW/FwDhAG1PGN2TXaHy5i9cTOK2UjLSGRq/HZ 9vgcwwFJc2scuuJeQWtkb9gzDNLI59j+AD1AXZFV574pmnfDl+P+2wVba3EdVWqkcsdnwt hmKNE9oj2FYNqvrAowPUtMy8FUuYof8B4OXR1H2ME8Ki9FhGAcQR8/8GK4BpMOiRjwQ1Gh pOOMhqbySeN+NeaJim8GMqQHn+LSG77wSJecply+tHRKdINBijOHjmrn51LRUJE+KLUzhL HIquD+5yh4tMCIVrb/yCGXmjCqScwjzeHvzQmM9TBUBmCE4QxUhs1qKRp/C6aQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735208029; a=rsa-sha256; cv=none; b=dZpJJXGolJwipDaR6NbBeNiynrzSwSJlcC0TIcOecANv2+fQI1AxqUNmbGm9+cJhl+jRmG lC1wxt3rUxA8TVLzvMQb7N5mboMwz2F/LCCZKOOuVUE/7+sK3sy+zvvVc8bcXH6XahX/Ef PG2uKH7TrC4Ukz3LrnlYaWgGgWwnre1SOcPT+NgTu8lupt0cIS+NxHr2PYNO4jse6xhxSQ b957AVFhcilWENRgO9AzWWbqF79ZNYziU6rZOAofo7I4UOc4MW+5Por3m5H5G8d52+oPHE HQFID5bXIUHBsgppW9rI86ML0GdsCcDDsGo1KZ/8c08FiYjqEI0yrcpUskaFAQ== 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 4YJkx92fHgzqh6; Thu, 26 Dec 2024 10:13:49 +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 4BQADnRw082660; Thu, 26 Dec 2024 10:13:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BQADniS082657; Thu, 26 Dec 2024 10:13:49 GMT (envelope-from git) Date: Thu, 26 Dec 2024 10:13:49 GMT Message-Id: <202412261013.4BQADniS082657@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: 4cd25fe4d2cc - main - www/gitlab: fix regression from 001ec8e60d233781c71246f5434306c06cafb453 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-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: 4cd25fe4d2cc8b075be5f3348adf4834e50dfe42 Auto-Submitted: auto-generated The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=4cd25fe4d2cc8b075be5f3348adf4834e50dfe42 commit 4cd25fe4d2cc8b075be5f3348adf4834e50dfe42 Author: Matthias Fechner AuthorDate: 2024-12-26 10:12:06 +0000 Commit: Matthias Fechner CommitDate: 2024-12-26 10:12:06 +0000 www/gitlab: fix regression from 001ec8e60d233781c71246f5434306c06cafb453 Error message: ===> gitlab-ce-17.7.0 depends on package: rubygem-rexml>=3.3.2<3.4 - not found Make rubygem-rexml version 3.3 available for a specific port for gitlab. --- textproc/Makefile | 1 + textproc/rubygem-rexml-gitlab/Makefile | 20 ++++++++++++++++++++ textproc/rubygem-rexml-gitlab/distinfo | 3 +++ textproc/rubygem-rexml-gitlab/pkg-descr | 9 +++++++++ www/gitlab/Makefile | 2 +- www/gitlab/Makefile.common | 2 +- 6 files changed, 35 insertions(+), 2 deletions(-) diff --git a/textproc/Makefile b/textproc/Makefile index cfc33ca05a80..2dbdd52b4b75 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -1945,6 +1945,7 @@ SUBDIR += rubygem-representable SUBDIR += rubygem-reverse_markdown SUBDIR += rubygem-rexml + SUBDIR += rubygem-rexml-gitlab SUBDIR += rubygem-rexml32 SUBDIR += rubygem-rexml33 SUBDIR += rubygem-ri_cal diff --git a/textproc/rubygem-rexml-gitlab/Makefile b/textproc/rubygem-rexml-gitlab/Makefile new file mode 100644 index 000000000000..d39e751aff30 --- /dev/null +++ b/textproc/rubygem-rexml-gitlab/Makefile @@ -0,0 +1,20 @@ +PORTNAME= rexml +PORTVERSION= 3.3.9 +CATEGORIES= textproc rubygems +MASTER_SITES= RG +PKGNAMESUFFIX= -gitlab + +MAINTAINER= mfechner@FreeBSD.org +COMMENT= XML toolkit for Ruby +WWW= https://github.com/ruby/rexml + +LICENSE= BSD2CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE.txt + +USES= cpe gem + +NO_ARCH= yes + +CPE_VENDOR= ruby-lang + +.include diff --git a/textproc/rubygem-rexml-gitlab/distinfo b/textproc/rubygem-rexml-gitlab/distinfo new file mode 100644 index 000000000000..c8516a2fb213 --- /dev/null +++ b/textproc/rubygem-rexml-gitlab/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1735207203 +SHA256 (rubygem/rexml-3.3.9.gem) = d71875b85299f341edf47d44df0212e7658cbdf35aeb69cefdb63f57af3137c9 +SIZE (rubygem/rexml-3.3.9.gem) = 104448 diff --git a/textproc/rubygem-rexml-gitlab/pkg-descr b/textproc/rubygem-rexml-gitlab/pkg-descr new file mode 100644 index 000000000000..bf3143c3967e --- /dev/null +++ b/textproc/rubygem-rexml-gitlab/pkg-descr @@ -0,0 +1,9 @@ +REXML was inspired by the Electric XML library for Java, which features an +easy-to-use API, small size, and speed. Hopefully, REXML, designed with the same +philosophy, has these same features. I've tried to keep the API as intuitive as +possible, and have followed the Ruby methodology for method naming and code +flow, rather than mirroring the Java API. + +REXML supports both tree and stream document parsing. Stream parsing is faster +(about 1.5 times as fast). However, with stream parsing, you don't get access to +features such as XPath. diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile index 21bda951eb42..6e27c4048a38 100644 --- a/www/gitlab/Makefile +++ b/www/gitlab/Makefile @@ -64,7 +64,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-doorkeeper-rails70>=5.8.1<6:security/rubygem-doorkeeper-rails70 \ rubygem-doorkeeper-openid_connect>=1.8.10<2:security/rubygem-doorkeeper-openid_connect \ rubygem-doorkeeper-device_authorization_grant>=1.0.0<1.1:security/rubygem-doorkeeper-device_authorization_grant \ - rubygem-rexml>=3.3.2<3.4:textproc/rubygem-rexml \ + rubygem-rexml-gitlab>=3.3.2<3.4:textproc/rubygem-rexml-gitlab \ rubygem-ruby-saml>=1.17.0<1.18:security/rubygem-ruby-saml \ rubygem-omniauth>=2.1.0<3:security/rubygem-omniauth \ rubygem-omniauth-auth0-gitlab>=3.1.0<3.2.0:net/rubygem-omniauth-auth0-gitlab \ diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common index 6af36d5afcbe..ee9e90787a11 100644 --- a/www/gitlab/Makefile.common +++ b/www/gitlab/Makefile.common @@ -1,5 +1,5 @@ GITLAB_VERSION= 17.7.0 -GITLAB_PORTREVISION= 0 +GITLAB_PORTREVISION= 1 # Git version gitaly should use (from gitlab mirror) # Find current tag from Makefile and .gitlab-ci.yaml