Date: Thu, 26 Dec 2024 22:39:39 +0800 From: Po-Chuan Hsieh <sunpoet@freebsd.org> To: Matthias Fechner <mfechner@freebsd.org> Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: 4cd25fe4d2cc - main - www/gitlab: fix regression from 001ec8e60d233781c71246f5434306c06cafb453 Message-ID: <CAMHz58QzvZCTsQbqcAT-3MrJm5a6Srk8=x7E-4_TUezdMNwnPw@mail.gmail.com> In-Reply-To: <202412261013.4BQADniS082657@gitrepo.freebsd.org> References: <202412261013.4BQADniS082657@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--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 <mfechner@freebsd.= org> wrote: > The branch main has been updated by mfechner: > > URL: > https://cgit.FreeBSD.org/ports/commit/?id=3D4cd25fe4d2cc8b075be5f3348adf4= 834e50dfe42 > > commit 4cd25fe4d2cc8b075be5f3348adf4834e50dfe42 > Author: Matthias Fechner <mfechner@FreeBSD.org> > AuthorDate: 2024-12-26 10:12:06 +0000 > Commit: Matthias Fechner <mfechner@FreeBSD.org> > 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 <bsd.port.mk> > 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 <div dir=3D"ltr"><div dir=3D"ltr">On Thu, Dec 26, 2024 at 6:13=E2=80=AFPM M= atthias Fechner <<a href=3D"mailto:mfechner@freebsd.org">mfechner@freebs= d.org</a>> wrote:</div><div class=3D"gmail_quote gmail_quote_container">= <blockquote class=3D"gmail_quote" style=3D"margin:0px 0px 0px 0.8ex;border-= left:1px solid rgb(204,204,204);padding-left:1ex">The branch main has been = updated by mfechner:<br> <br> URL: <a href=3D"https://cgit.FreeBSD.org/ports/commit/?id=3D4cd25fe4d2cc8b0= 75be5f3348adf4834e50dfe42" rel=3D"noreferrer" target=3D"_blank">https://cgi= t.FreeBSD.org/ports/commit/?id=3D4cd25fe4d2cc8b075be5f3348adf4834e50dfe42</= a><br> <br> commit 4cd25fe4d2cc8b075be5f3348adf4834e50dfe42<br> Author:=C2=A0 =C2=A0 =C2=A0Matthias Fechner <mfechner@FreeBSD.org><br= > AuthorDate: 2024-12-26 10:12:06 +0000<br> Commit:=C2=A0 =C2=A0 =C2=A0Matthias Fechner <mfechner@FreeBSD.org><br= > CommitDate: 2024-12-26 10:12:06 +0000<br> <br> =C2=A0 =C2=A0 www/gitlab: fix regression from 001ec8e60d233781c71246f543430= 6c06cafb453<br> <br> =C2=A0 =C2=A0 Error message:<br> =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<br> <br> =C2=A0 =C2=A0 Make rubygem-rexml version 3.3 available for a specific port = for gitlab.<br></blockquote><div><br></div><div>Hello,</div><div><br></div>= <div>Sorry for the=C2=A0breakage.</div><div>I prepared rubygem-rexml33 and = gitlab patch but forgot to add gitlab part to the commit script.</div><div>= Should I remove rubygem-rexml33?</div><div><br></div><div>Best regards,</di= v><div>sunpoet</div><div><br></div><blockquote class=3D"gmail_quote" style= =3D"margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding= -left:1ex"> ---<br> =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 +<br> =C2=A0textproc/rubygem-rexml-gitlab/Makefile=C2=A0 | 20 +++++++++++++++++++= +<br> =C2=A0textproc/rubygem-rexml-gitlab/distinfo=C2=A0 |=C2=A0 3 +++<br> =C2=A0textproc/rubygem-rexml-gitlab/pkg-descr |=C2=A0 9 +++++++++<br> =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 +-<br> =C2=A0www/gitlab/Makefile.common=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 |=C2=A0 2 +-<br> =C2=A06 files changed, 35 insertions(+), 2 deletions(-)<br> <br> diff --git a/textproc/Makefile b/textproc/Makefile<br> index cfc33ca05a80..2dbdd52b4b75 100644<br> --- a/textproc/Makefile<br> +++ b/textproc/Makefile<br> @@ -1945,6 +1945,7 @@<br> =C2=A0 =C2=A0 =C2=A0SUBDIR +=3D rubygem-representable<br> =C2=A0 =C2=A0 =C2=A0SUBDIR +=3D rubygem-reverse_markdown<br> =C2=A0 =C2=A0 =C2=A0SUBDIR +=3D rubygem-rexml<br> +=C2=A0 =C2=A0 SUBDIR +=3D rubygem-rexml-gitlab<br> =C2=A0 =C2=A0 =C2=A0SUBDIR +=3D rubygem-rexml32<br> =C2=A0 =C2=A0 =C2=A0SUBDIR +=3D rubygem-rexml33<br> =C2=A0 =C2=A0 =C2=A0SUBDIR +=3D rubygem-ri_cal<br> diff --git a/textproc/rubygem-rexml-gitlab/Makefile b/textproc/rubygem-rexm= l-gitlab/Makefile<br> new file mode 100644<br> index 000000000000..d39e751aff30<br> --- /dev/null<br> +++ b/textproc/rubygem-rexml-gitlab/Makefile<br> @@ -0,0 +1,20 @@<br> +PORTNAME=3D=C2=A0 =C2=A0 =C2=A0 rexml<br> +PORTVERSION=3D=C2=A0 =C2=A03.3.9<br> +CATEGORIES=3D=C2=A0 =C2=A0 textproc rubygems<br> +MASTER_SITES=3D=C2=A0 RG<br> +PKGNAMESUFFIX=3D -gitlab<br> +<br> +MAINTAINER=3D=C2=A0 =C2=A0 mfechner@FreeBSD.org<br> +COMMENT=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0XML toolkit for Ruby<br> +WWW=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0<a href=3D"https://github.c= om/ruby/rexml" rel=3D"noreferrer" target=3D"_blank">https://github.com/ruby= /rexml</a><br> +<br> +LICENSE=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0BSD2CLAUSE<br> +LICENSE_FILE=3D=C2=A0 ${WRKSRC}/LICENSE.txt<br> +<br> +USES=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 cpe gem<br> +<br> +NO_ARCH=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0yes<br> +<br> +CPE_VENDOR=3D=C2=A0 =C2=A0 ruby-lang<br> +<br> +.include <<a href=3D"http://bsd.port.mk" rel=3D"noreferrer" target=3D"_= blank">bsd.port.mk</a>><br> diff --git a/textproc/rubygem-rexml-gitlab/distinfo b/textproc/rubygem-rexm= l-gitlab/distinfo<br> new file mode 100644<br> index 000000000000..c8516a2fb213<br> --- /dev/null<br> +++ b/textproc/rubygem-rexml-gitlab/distinfo<br> @@ -0,0 +1,3 @@<br> +TIMESTAMP =3D 1735207203<br> +SHA256 (rubygem/rexml-3.3.9.gem) =3D d71875b85299f341edf47d44df0212e7658cb= df35aeb69cefdb63f57af3137c9<br> +SIZE (rubygem/rexml-3.3.9.gem) =3D 104448<br> diff --git a/textproc/rubygem-rexml-gitlab/pkg-descr b/textproc/rubygem-rex= ml-gitlab/pkg-descr<br> new file mode 100644<br> index 000000000000..bf3143c3967e<br> --- /dev/null<br> +++ b/textproc/rubygem-rexml-gitlab/pkg-descr<br> @@ -0,0 +1,9 @@<br> +REXML was inspired by the Electric XML library for Java, which features an= <br> +easy-to-use API, small size, and speed. Hopefully, REXML, designed with th= e same<br> +philosophy, has these same features. I've tried to keep the API as int= uitive as<br> +possible, and have followed the Ruby methodology for method naming and cod= e<br> +flow, rather than mirroring the Java API.<br> +<br> +REXML supports both tree and stream document parsing. Stream parsing is fa= ster<br> +(about 1.5 times as fast). However, with stream parsing, you don't get= access to<br> +features such as XPath.<br> diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile<br> index 21bda951eb42..6e27c4048a38 100644<br> --- a/www/gitlab/Makefile<br> +++ b/www/gitlab/Makefile<br> @@ -64,7 +64,7 @@ MY_DEPENDS=3D=C2=A0 =C2=A0gitaly>=3D${GITLAB_VERSION}:= devel/gitaly \<br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 rubygem-doorkeeper-rails70>=3D5.8.1<6:sec= urity/rubygem-doorkeeper-rails70 \<br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 rubygem-doorkeeper-openid_connect>=3D1.8.10&= lt;2:security/rubygem-doorkeeper-openid_connect \<br> =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 \<br> +=C2=A0 =C2=A0 =C2=A0 =C2=A0rubygem-rexml-gitlab>=3D3.3.2<3.4:textpro= c/rubygem-rexml-gitlab \<br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 rubygem-ruby-saml>=3D1.17.0<1.18:security= /rubygem-ruby-saml \<br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 rubygem-omniauth>=3D2.1.0<3:security/ruby= gem-omniauth \<br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 rubygem-omniauth-auth0-gitlab>=3D3.1.0<3.= 2.0:net/rubygem-omniauth-auth0-gitlab \<br> diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common<br> index 6af36d5afcbe..ee9e90787a11 100644<br> --- a/www/gitlab/Makefile.common<br> +++ b/www/gitlab/Makefile.common<br> @@ -1,5 +1,5 @@<br> =C2=A0GITLAB_VERSION=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 17.7.0<br> -GITLAB_PORTREVISION=3D=C2=A0 =C2=A00<br> +GITLAB_PORTREVISION=3D=C2=A0 =C2=A01<br> <br> =C2=A0# Git version gitaly should use (from gitlab mirror)<br> =C2=A0# Find current tag from Makefile and .gitlab-ci.yaml<br> </blockquote></div></div> --0000000000000b7936062a2d536d--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAMHz58QzvZCTsQbqcAT-3MrJm5a6Srk8=x7E-4_TUezdMNwnPw>