From nobody Thu Dec 26 14:39:39 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 4YJrrc6qXSz5jBK2 for ; Thu, 26 Dec 2024 14:40:16 +0000 (UTC) (envelope-from sunpoet@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YJrrc4Msyz4VXC for ; Thu, 26 Dec 2024 14:40:16 +0000 (UTC) (envelope-from sunpoet@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735224016; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=aNG2B5APlSVAW/qJ2O8LBrihHOEvbxJZTLbSoB9Mfs8=; b=iXQHapDTz77GtALykaa158NVMZvfJzQwe35T8GdS4RTzxKVcXmYmeR+sODCvTk/ltpZ77C Rzjd+OBC+EFBGNVVOJRbqC+GBkT0TFdZ4X/XRQ4702ChpjkezZ+zVuvrIubtjbG8upq2R7 wN6ImKqQbHIEKDtHxS0HFKNPRXm5BUi/9uOXcKlebwYnfpT6Gn4lSX7+J7yUxc6jWt266H FUQSdNcQquwyL2IHAQUnxYmjVVPq0ysEnTkzXtS5d3Vw9e6+E5hkdyW9efcH5gXn5i+hed TVmBUSe3R7adLi2cnmwquJ0hp5BthXzHNs/DaAuylaavALHl2xAlOsZq+TBD8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735224016; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=aNG2B5APlSVAW/qJ2O8LBrihHOEvbxJZTLbSoB9Mfs8=; b=j6wlVDRck6n4dPU9x2zax1e8Go3kpgnSMGlvs6G31K36D8hqzWf3+g+UZBKN+rOnxbPE3u 9o3v6rp02PZNriQT2iZ5u9mozq10FNbmMUb99wJ++Ze5WZEk4iWg7Kjn3+WRhd2FxSr+8D 3d7yWGp6x2bzaVb77MdZq/y/y8dWscIRBF7KACwkMdS5GQl0H4d93wIXIeARqWg++qa7jk 0RA20V5CbitFLU+R1497bTfW8JRpFpvMDP9e7b/mdzMr25iQY6XeE3CiIlnkXi4MvAwsuI bgaQsSiUVk3Z7wm/p1EGd6iDDtniMWwnnP9R2nFTMlYSNhbOcfH6U1JZu5qcrg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735224016; a=rsa-sha256; cv=none; b=rtbIvRwMlWdc1CP4bdHcmGcwmEc7xsClMiQt26ENBbRC1MUmlk56V4u9nX5ey7B5mj6Szw 2Q8Xn1vIAHUrVnnueUrGw5yXtTC/fsXS4TKHRA4RkYJOpGts68lR7EnenH4HvlEy5fpYW7 wjEca1MWVcX12OeuJ963/5FBFN/ZSKByzU4BDE1g2urgScrjiP98kl1yTWKF0DrUDYj6bT Wt3a60OSKF/Jzx1sBP3wpdO9dLgKeEmTnLXUR5JFPvgU9gqYrWA44VfRWcfJDNqb/k8S0u oySpM3eDsWBydqviJNj1vzPptJ76GPoSLv1TGN9cm0WvjOBOIC5MS97r1IQVHw== Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) (Authenticated sender: sunpoet) by smtp.freebsd.org (Postfix) with ESMTPSA id 4YJrrc3x0Bz1Pt0 for ; Thu, 26 Dec 2024 14:40:16 +0000 (UTC) (envelope-from sunpoet@freebsd.org) Received: by mail-ed1-f46.google.com with SMTP id 4fb4d7f45d1cf-5d3f28a4fccso9687298a12.2 for ; Thu, 26 Dec 2024 06:40:16 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCVZPmkWkON+vcIyP1x25+e9kpE1FRfzBufgf75KSTLt2ImP7/oowYLYcWhjstLpiMtIJLF19QmQbjbfwi3/Gd6TocJ71HI=@freebsd.org X-Gm-Message-State: AOJu0Yxbcnnmwhlf3iPq7C8WpgOQRbvmphuIeprVzrN4dbYG6HPJysQI 06Q4S6fU598CC4msoJpbCPU/+4uSxOfIgS8YaHC957pEVYJU4WqfLea4JMHepmwYqKTp5Jis74F kVipnjhyW2QzLCIsaCjnfIkmMoJzziiyY1sL1Wg== X-Google-Smtp-Source: AGHT+IE2u9ac3XIVYo7zMWs+8CsyMXAyLObVriUBzo/hl+1ibVl7evktb60Kqv39Cq9RlamogKuNEZiOD3JLb/775KU= X-Received: by 2002:a17:907:7288:b0:aa6:a9fe:46dd with SMTP id a640c23a62f3a-aac346507b2mr1747100566b.38.1735224015406; Thu, 26 Dec 2024 06:40:15 -0800 (PST) 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 References: <202412261013.4BQADniS082657@gitrepo.freebsd.org> In-Reply-To: <202412261013.4BQADniS082657@gitrepo.freebsd.org> From: Po-Chuan Hsieh Date: Thu, 26 Dec 2024 22:39:39 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: 4cd25fe4d2cc - main - www/gitlab: fix regression from 001ec8e60d233781c71246f5434306c06cafb453 To: Matthias Fechner Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Content-Type: multipart/alternative; boundary="0000000000000b7936062a2d536d" --0000000000000b7936062a2d536d Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, Dec 26, 2024 at 6:13=E2=80=AFPM Matthias Fechner wrote: > The branch main has been updated by mfechner: > > URL: > https://cgit.FreeBSD.org/ports/commit/?id=3D4cd25fe4d2cc8b075be5f3348adf4= 834e50dfe42 > > 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: > =3D=3D=3D> gitlab-ce-17.7.0 depends on package: rubygem-rexml>=3D3.= 3.2<3.4 - > not found > > Make rubygem-rexml version 3.3 available for a specific port for > gitlab. > Hello, Sorry for the breakage. I prepared rubygem-rexml33 and gitlab patch but forgot to add gitlab part to the commit script. Should I remove rubygem-rexml33? Best regards, sunpoet --- > 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 +=3D rubygem-representable > SUBDIR +=3D rubygem-reverse_markdown > SUBDIR +=3D rubygem-rexml > + SUBDIR +=3D rubygem-rexml-gitlab > SUBDIR +=3D rubygem-rexml32 > SUBDIR +=3D rubygem-rexml33 > SUBDIR +=3D 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=3D rexml > +PORTVERSION=3D 3.3.9 > +CATEGORIES=3D textproc rubygems > +MASTER_SITES=3D RG > +PKGNAMESUFFIX=3D -gitlab > + > +MAINTAINER=3D mfechner@FreeBSD.org > +COMMENT=3D XML toolkit for Ruby > +WWW=3D https://github.com/ruby/rexml > + > +LICENSE=3D BSD2CLAUSE > +LICENSE_FILE=3D ${WRKSRC}/LICENSE.txt > + > +USES=3D cpe gem > + > +NO_ARCH=3D yes > + > +CPE_VENDOR=3D 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 =3D 1735207203 > +SHA256 (rubygem/rexml-3.3.9.gem) =3D > d71875b85299f341edf47d44df0212e7658cbdf35aeb69cefdb63f57af3137c9 > +SIZE (rubygem/rexml-3.3.9.gem) =3D 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=3D gitaly>=3D${GITLAB_VERSION}:devel/gital= y \ > > rubygem-doorkeeper-rails70>=3D5.8.1<6:security/rubygem-doorkeeper-rails70= \ > > rubygem-doorkeeper-openid_connect>=3D1.8.10<2:security/rubygem-doorkeeper= -openid_connect > \ > > rubygem-doorkeeper-device_authorization_grant>=3D1.0.0<1.1:security/rubyg= em-doorkeeper-device_authorization_grant > \ > - rubygem-rexml>=3D3.3.2<3.4:textproc/rubygem-rexml \ > + rubygem-rexml-gitlab>=3D3.3.2<3.4:textproc/rubygem-rexml-gitlab \ > rubygem-ruby-saml>=3D1.17.0<1.18:security/rubygem-ruby-saml \ > rubygem-omniauth>=3D2.1.0<3:security/rubygem-omniauth \ > > rubygem-omniauth-auth0-gitlab>=3D3.1.0<3.2.0:net/rubygem-omniauth-auth0-g= itlab > \ > 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=3D 17.7.0 > -GITLAB_PORTREVISION=3D 0 > +GITLAB_PORTREVISION=3D 1 > > # Git version gitaly should use (from gitlab mirror) > # Find current tag from Makefile and .gitlab-ci.yaml > --0000000000000b7936062a2d536d Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
On Thu, Dec 26, 2024 at 6:13=E2=80=AFPM M= atthias Fechner <mfechner@freebs= d.org> wrote:
=
The branch main has been = updated by mfechner:

URL: https://cgi= t.FreeBSD.org/ports/commit/?id=3D4cd25fe4d2cc8b075be5f3348adf4834e50dfe42

commit 4cd25fe4d2cc8b075be5f3348adf4834e50dfe42
Author:=C2=A0 =C2=A0 =C2=A0Matthias Fechner <mfechner@FreeBSD.org> AuthorDate: 2024-12-26 10:12:06 +0000
Commit:=C2=A0 =C2=A0 =C2=A0Matthias Fechner <mfechner@FreeBSD.org> CommitDate: 2024-12-26 10:12:06 +0000

=C2=A0 =C2=A0 www/gitlab: fix regression from 001ec8e60d233781c71246f543430= 6c06cafb453

=C2=A0 =C2=A0 Error message:
=C2=A0 =C2=A0 =3D=3D=3D>=C2=A0 =C2=A0gitlab-ce-17.7.0 depends on package= : rubygem-rexml>=3D3.3.2<3.4 - not found

=C2=A0 =C2=A0 Make rubygem-rexml version 3.3 available for a specific port = for gitlab.


=
Sorry for the=C2=A0breakage.
I prepared rubygem-rexml33 and = gitlab patch but forgot to add gitlab part to the commit script.
= Should I remove rubygem-rexml33?

Best regards,
sunpoet

---
=C2=A0textproc/Makefile=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 1 +
=C2=A0textproc/rubygem-rexml-gitlab/Makefile=C2=A0 | 20 +++++++++++++++++++= +
=C2=A0textproc/rubygem-rexml-gitlab/distinfo=C2=A0 |=C2=A0 3 +++
=C2=A0textproc/rubygem-rexml-gitlab/pkg-descr |=C2=A0 9 +++++++++
=C2=A0www/gitlab/Makefile=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 2 +-
=C2=A0www/gitlab/Makefile.common=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 |=C2=A0 2 +-
=C2=A06 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 @@
=C2=A0 =C2=A0 =C2=A0SUBDIR +=3D rubygem-representable
=C2=A0 =C2=A0 =C2=A0SUBDIR +=3D rubygem-reverse_markdown
=C2=A0 =C2=A0 =C2=A0SUBDIR +=3D rubygem-rexml
+=C2=A0 =C2=A0 SUBDIR +=3D rubygem-rexml-gitlab
=C2=A0 =C2=A0 =C2=A0SUBDIR +=3D rubygem-rexml32
=C2=A0 =C2=A0 =C2=A0SUBDIR +=3D rubygem-rexml33
=C2=A0 =C2=A0 =C2=A0SUBDIR +=3D rubygem-ri_cal
diff --git a/textproc/rubygem-rexml-gitlab/Makefile b/textproc/rubygem-rexm= l-gitlab/Makefile
new file mode 100644
index 000000000000..d39e751aff30
--- /dev/null
+++ b/textproc/rubygem-rexml-gitlab/Makefile
@@ -0,0 +1,20 @@
+PORTNAME=3D=C2=A0 =C2=A0 =C2=A0 rexml
+PORTVERSION=3D=C2=A0 =C2=A03.3.9
+CATEGORIES=3D=C2=A0 =C2=A0 textproc rubygems
+MASTER_SITES=3D=C2=A0 RG
+PKGNAMESUFFIX=3D -gitlab
+
+MAINTAINER=3D=C2=A0 =C2=A0 mfechner@FreeBSD.org
+COMMENT=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0XML toolkit for Ruby
+WWW=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0https://github.com/ruby= /rexml
+
+LICENSE=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0BSD2CLAUSE
+LICENSE_FILE=3D=C2=A0 ${WRKSRC}/LICENSE.txt
+
+USES=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 cpe gem
+
+NO_ARCH=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0yes
+
+CPE_VENDOR=3D=C2=A0 =C2=A0 ruby-lang
+
+.include <bsd.port.mk>
diff --git a/textproc/rubygem-rexml-gitlab/distinfo b/textproc/rubygem-rexm= l-gitlab/distinfo
new file mode 100644
index 000000000000..c8516a2fb213
--- /dev/null
+++ b/textproc/rubygem-rexml-gitlab/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP =3D 1735207203
+SHA256 (rubygem/rexml-3.3.9.gem) =3D d71875b85299f341edf47d44df0212e7658cb= df35aeb69cefdb63f57af3137c9
+SIZE (rubygem/rexml-3.3.9.gem) =3D 104448
diff --git a/textproc/rubygem-rexml-gitlab/pkg-descr b/textproc/rubygem-rex= ml-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 th= e same
+philosophy, has these same features. I've tried to keep the API as int= uitive as
+possible, and have followed the Ruby methodology for method naming and cod= e
+flow, rather than mirroring the Java API.
+
+REXML supports both tree and stream document parsing. Stream parsing is fa= ster
+(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=3D=C2=A0 =C2=A0gitaly>=3D${GITLAB_VERSION}:= devel/gitaly \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 rubygem-doorkeeper-rails70>=3D5.8.1<6:sec= urity/rubygem-doorkeeper-rails70 \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 rubygem-doorkeeper-openid_connect>=3D1.8.10&= lt;2:security/rubygem-doorkeeper-openid_connect \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 rubygem-doorkeeper-device_authorization_grant&g= t;=3D1.0.0<1.1:security/rubygem-doorkeeper-device_authorization_grant \<= br> -=C2=A0 =C2=A0 =C2=A0 =C2=A0rubygem-rexml>=3D3.3.2<3.4:textproc/rubyg= em-rexml \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0rubygem-rexml-gitlab>=3D3.3.2<3.4:textpro= c/rubygem-rexml-gitlab \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 rubygem-ruby-saml>=3D1.17.0<1.18:security= /rubygem-ruby-saml \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 rubygem-omniauth>=3D2.1.0<3:security/ruby= gem-omniauth \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 rubygem-omniauth-auth0-gitlab>=3D3.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 @@
=C2=A0GITLAB_VERSION=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 17.7.0
-GITLAB_PORTREVISION=3D=C2=A0 =C2=A00
+GITLAB_PORTREVISION=3D=C2=A0 =C2=A01

=C2=A0# Git version gitaly should use (from gitlab mirror)
=C2=A0# Find current tag from Makefile and .gitlab-ci.yaml
--0000000000000b7936062a2d536d--