Date: Sat, 13 Nov 2021 19:50:43 +0300 From: Dima Panov <fluffy@FreeBSD.org> To: dev-commits-ports-all@FreeBSD.org, ports-committers@FreeBSD.org, dev-commits-ports-main@FreeBSD.org, Matthias Fechner <mfechner@FreeBSD.org> Subject: Re: git: 73b8be01a195 - main - www/gitlab-ce: upgrade to 14.4.2 Message-ID: <35a05f8b-0af3-4066-8850-939387c8e618@Canary> In-Reply-To: <202111131446.1ADEk0x0022439@gitrepo.freebsd.org> References: <202111131446.1ADEk0x0022439@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--618fece3_643c9869_750 Content-Type: multipart/alternative; boundary="618fece3_327b23c6_750" --618fece3_327b23c6_750 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Moin=21 =46ails to fetch 2.patch due to size mismatch =3D> Attempting to fetch https://gitlab.com/mfechner/gitaly/-/merge=5Freq= uests/2.patch fetch: https://gitlab.com/mfechner/gitaly/-/merge=5Frequests/2.patch: siz= e unknown fetch: https://gitlab.com/mfechner/gitaly/-/merge=5Frequests/2.patch: siz= e of remote file is not known 2.patch 54 kB 520 kBps 00s =3D> =46etched file size mismatch (expected 55587, actual 55629) -- Dima. (desktop, kde, x11, office, ports-secteam)=40=46reeBSD team (fluffy=40=46reeBSD.org, https://t.me/dima=5Fpanov) > On Saturday, Nov 13, 2021 at 5:47 PM, Matthias =46echner <mfechner=40=46= reeBSD.org (mailto:mfechner=40=46reeBSD.org)> wrote: > The branch main has been updated by mfechner: > > URL: https://cgit.=46reeBSD.org/ports/commit/=3Fid=3D73b8be01a1957162d7= 635f299842c8bd29b691ca > > commit 73b8be01a1957162d7635f299842c8bd29b691ca > Author: Matthias =46echner <mfechner=40=46reeBSD.org> > AuthorDate: 2021-11-12 05:49:38 +0000 > Commit: Matthias =46echner <mfechner=40=46reeBSD.org> > CommitDate: 2021-11-13 14:44:45 +0000 > > www/gitlab-ce: upgrade to 14.4.2 > > Changelog: > https://about.gitlab.com/releases/2021/11/08/gitlab-14-4-2-released/ > --- > devel/gitaly/Makefile =7C 8 ++++++-- > devel/gitaly/distinfo =7C 8 +++++--- > devel/gitaly/files/patch-ruby=5FGemfile =7C 9 --------- > www/gitlab-ce/Makefile =7C 4 ++-- > www/gitlab-ce/distinfo =7C 6 +++--- > www/gitlab-workhorse/Makefile =7C 4 ++-- > www/gitlab-workhorse/distinfo =7C 6 +++--- > 7 files changed, 21 insertions(+), 24 deletions(-) > > diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile > index 13d9bad28724..1eedb00b65dd 100644 > --- a/devel/gitaly/Makefile > +++ b/devel/gitaly/Makefile > =40=40 -1,8 +1,12 =40=40 > PORTNAME=3D gitaly > -DISTVERSION=3D 14.4.1 > +DISTVERSION=3D 14.4.2 > PORTREVISION=3D 0 > CATEGORIES=3D devel > > +PATCH=5FSITES=3D https://gitlab.com/mfechner/gitaly/-/merge=5Frequests= / > +=23 Make sure we have grpc files for grpc 1.41.0 available > +PATCH=46ILES=3D 2.patch:-p1 > + > MAINTAINER=3D mfechner=40=46reeBSD.org > COMMENT=3D Smart reverse proxy for GitLab > > =40=40 -45,7 +49,7 =40=40 MAKE=5FENV+=3D =24=7BGO=5FENV=7D > USE=5FGITLAB=3D yes > GL=5FACCOUNT=3D gitlab-org > =23 =46ind this here: https://gitlab.com/gitlab-org/gitaly/-/tags > -GL=5FCOMMIT=3D 735a55dc3d633b50c81fc1b69947a9774c40a658 > +GL=5FCOMMIT=3D 00071e4ab87eaae7c4f68705613191046cd023be > > =23 for go dependencies > USE=5FGITHUB=3D nodefault > diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo > index c8e4938f6764..4043b095258e 100644 > --- a/devel/gitaly/distinfo > +++ b/devel/gitaly/distinfo > =40=40 -1,4 +1,4 =40=40 > -TIMESTAMP =3D 1635579522 > +TIMESTAMP =3D 1636801531 > SHA256 (Azure-azure-pipeline-go-v0.2.3=5FGH0.tar.gz) =3D 99bd58f4a07dd0= 2d9615e3638b3bb6dbfad80ef678ccdb8e17e3fa2b0fef343e > SIZE (Azure-azure-pipeline-go-v0.2.3=5FGH0.tar.gz) =3D 17102 > SHA256 (Azure-azure-storage-blob-go-v0.13.0=5FGH0.tar.gz) =3D 6bf714521= 0331efa3f0417f6684cf764c22743cf23122048ec136600daebf443 > =40=40 -267,9 +267,11 =40=40 SHA256 (xanzy-ssh-agent-v0.3.0=5FGH0.tar.g= z) =3D 7ce80a93d0fdbeb6760f97d6d166d11c215 > SIZE (xanzy-ssh-agent-v0.3.0=5FGH0.tar.gz) =3D 8421 > SHA256 (gonum-gonum-v0.8.2=5FGH0.tar.gz) =3D a2aad1ac038d36d568939910f3= 9eb0c58cae3c6f0b18df3ca74a8daa954d1663 > SIZE (gonum-gonum-v0.8.2=5FGH0.tar.gz) =3D 3226037 > -SHA256 (gitlab-org-gitaly-735a55dc3d633b50c81fc1b69947a9774c40a658=5FG= L0.tar.gz) =3D 13d9d89eacb259fd1535631c9952c2cf129814d4977a34eb5576e2e84a= 17090f > -SIZE (gitlab-org-gitaly-735a55dc3d633b50c81fc1b69947a9774c40a658=5FGL0= .tar.gz) =3D 3704820 > +SHA256 (gitlab-org-gitaly-00071e4ab87eaae7c4f68705613191046cd023be=5FG= L0.tar.gz) =3D c847a4d2f5996a68fc3d58de4a5793932dd06e945f48141d4d773c0c11= 68e574 > +SIZE (gitlab-org-gitaly-00071e4ab87eaae7c4f68705613191046cd023be=5FGL0= .tar.gz) =3D 3704730 > SHA256 (gitlab-org-gitlab-shell-50da611814d256c77e689977265ec7e07633a4d= c=5FGL0.tar.gz) =3D a00e10d3dbe50e7c70b75c5fcf7d42a039a24c13b0b751a0339bb= 18261ac50af > SIZE (gitlab-org-gitlab-shell-50da611814d256c77e689977265ec7e07633a4dc=5F= GL0.tar.gz) =3D 124516 > SHA256 (gitlab-org-labkit-397363e2404ac0276b1959373a1c1c2bc1610d67=5FGL= 0.tar.gz) =3D e48dae8ea183f946189a9ac7e4cbe4bc0fa583e6baafb0074a3463a8795= 65ecb > SIZE (gitlab-org-labkit-397363e2404ac0276b1959373a1c1c2bc1610d67=5FGL0.= tar.gz) =3D 171896 > +SHA256 (2.patch) =3D 3143aa6bda5ceb3c252931445ffb69bfca012420609eca2ed= 856347ed052fcb1 > +SIZE (2.patch) =3D 55587 > diff --git a/devel/gitaly/files/patch-ruby=5FGemfile b/devel/gitaly/fil= es/patch-ruby=5FGemfile > index dadd748f9300..231c2569c123 100644 > --- a/devel/gitaly/files/patch-ruby=5FGemfile > +++ b/devel/gitaly/files/patch-ruby=5FGemfile > =40=40 -1,14 +1,5 =40=40 > --- ruby/Gemfile.orig 2021-10-21 21:58:10 UTC > +++ ruby/Gemfile > -=40=40 -7,7 +7,7 =40=40 gem 'activesupport', '=7E> 6.1.4.1' > - gem 'rdoc', '=7E> 6.0' > - gem 'gitlab-gollum-lib', '=7E> 4.2.7.10.gitlab.1', require: false > - gem 'gitlab-gollum-rugged=5Fadapter', '=7E> 0.4.4.4.gitlab.1', requir= e: false > --gem 'grpc', '=7E> 1.30.2' > -+gem 'grpc', '=7E> 1.30' > - gem 'sentry-raven', '=7E> 3.0', require: false > - gem 'faraday', '=7E> 1.0' > - gem 'rbtrace', require: false > =40=40 -19,15 +19,5 =40=40 gem 'gitlab-labkit', '=7E> 0.21.1' > =23 This version needs to be in sync with GitLab CE/EE > gem 'licensee', '=7E> 9.14.1' > diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile > index ba2ba36b3755..6195812b8206 100644 > --- a/www/gitlab-ce/Makefile > +++ b/www/gitlab-ce/Makefile > =40=40 -1,7 +1,7 =40=40 > =23 Created by: Torsten Zuehlsdorff <tz=40=46reeBSD.org> > > PORTNAME=3D gitlab-ce > -PORTVERSION=3D 14.4.1 > +PORTVERSION=3D 14.4.2 > PORTREVISION=3D 0 > CATEGORIES=3D www devel > > =40=40 -271,7 +271,7 =40=40 USE=5FGITLAB=3D yes > GL=5FACCOUNT=3D gitlab-org > GL=5FPROJECT=3D gitlab-foss > =23 =46ind the here: https://gitlab.com/gitlab-org/gitlab-foss/-/tags > -GL=5FCOMMIT=3D 1a23d731c9f1149b8be1f16a1d781490df288f18 > +GL=5FCOMMIT=3D 1ce86e92f81869fc38ece6ae212b5ea9d5ffd405 > > USERS=3D git > GROUPS=3D git > diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo > index cd3b2cfa683b..c970922dd18f 100644 > --- a/www/gitlab-ce/distinfo > +++ b/www/gitlab-ce/distinfo > =40=40 -1,3 +1,3 =40=40 > -TIMESTAMP =3D 1635579320 > -SHA256 (gitlab-org-gitlab-foss-1a23d731c9f1149b8be1f16a1d781490df288f1= 8=5FGL0.tar.gz) =3D 5f30bcbbc448b5cd08048131532e0aeff0428d03b7e25331913fa= 3614f2100d0 > -SIZE (gitlab-org-gitlab-foss-1a23d731c9f1149b8be1f16a1d781490df288f18=5F= GL0.tar.gz) =3D 94874743 > +TIMESTAMP =3D 1636563242 > +SHA256 (gitlab-org-gitlab-foss-1ce86e92f81869fc38ece6ae212b5ea9d5ffd40= 5=5FGL0.tar.gz) =3D c7c26d75cce1030d6f8a61ae8b81ca6bfc92910eb30b0a1941ab6= ac4f45b45e7 > +SIZE (gitlab-org-gitlab-foss-1ce86e92f81869fc38ece6ae212b5ea9d5ffd405=5F= GL0.tar.gz) =3D 94877267 > diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makef= ile > index e38d753bea2c..11f14b0ad246 100644 > --- a/www/gitlab-workhorse/Makefile > +++ b/www/gitlab-workhorse/Makefile > =40=40 -1,7 +1,7 =40=40 > =23 Created by: Torsten Zuehlsdorff <tz=40=46reeBSD.org> > > PORTNAME=3D gitlab-workhorse > -PORTVERSION=3D 14.4.1 > +PORTVERSION=3D 14.4.2 > PORTREVISION=3D 0 > CATEGORIES=3D www > > =40=40 -23,7 +23,7 =40=40 USE=5FGITLAB=3D yes > GL=5FACCOUNT=3D gitlab-org > GL=5FPROJECT=3D gitlab-foss > =23 =46ind the commit hash here: https://gitlab.com/gitlab-org/gitlab-f= oss/-/tags > -GL=5FCOMMIT=3D 1a23d731c9f1149b8be1f16a1d781490df288f18 > +GL=5FCOMMIT=3D 1ce86e92f81869fc38ece6ae212b5ea9d5ffd405 > > =23 for go dependencies > USE=5FGITHUB=3D nodefault > diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/disti= nfo > index 045bd570a552..c1124b5a6e22 100644 > --- a/www/gitlab-workhorse/distinfo > +++ b/www/gitlab-workhorse/distinfo > =40=40 -1,4 +1,4 =40=40 > -TIMESTAMP =3D 1635579452 > +TIMESTAMP =3D 1636563263 > SHA256 (Azure-azure-pipeline-go-v0.2.3=5FGH0.tar.gz) =3D 99bd58f4a07dd0= 2d9615e3638b3bb6dbfad80ef678ccdb8e17e3fa2b0fef343e > SIZE (Azure-azure-pipeline-go-v0.2.3=5FGH0.tar.gz) =3D 17102 > SHA256 (Azure-azure-storage-blob-go-v0.13.0=5FGH0.tar.gz) =3D 6bf714521= 0331efa3f0417f6684cf764c22743cf23122048ec136600daebf443 > =40=40 -199,8 +199,8 =40=40 SHA256 (uber-jaeger-client-go-v2.27.0=5FGH0= .tar.gz) =3D 7590acdefcbbf9553bd3415bc7e5 > SIZE (uber-jaeger-client-go-v2.27.0=5FGH0.tar.gz) =3D 210139 > SHA256 (uber-jaeger-lib-v2.4.1=5FGH0.tar.gz) =3D c178bcad325857dba29551= c16f40707701adf6e3a9e01e1ca3e5edfc3c6de8bc > SIZE (uber-jaeger-lib-v2.4.1=5FGH0.tar.gz) =3D 38010 > -SHA256 (gitlab-org-gitlab-foss-1a23d731c9f1149b8be1f16a1d781490df288f1= 8=5FGL0.tar.gz) =3D 5f30bcbbc448b5cd08048131532e0aeff0428d03b7e25331913fa= 3614f2100d0 > -SIZE (gitlab-org-gitlab-foss-1a23d731c9f1149b8be1f16a1d781490df288f18=5F= GL0.tar.gz) =3D 94874743 > +SHA256 (gitlab-org-gitlab-foss-1ce86e92f81869fc38ece6ae212b5ea9d5ffd40= 5=5FGL0.tar.gz) =3D c7c26d75cce1030d6f8a61ae8b81ca6bfc92910eb30b0a1941ab6= ac4f45b45e7 > +SIZE (gitlab-org-gitlab-foss-1ce86e92f81869fc38ece6ae212b5ea9d5ffd405=5F= GL0.tar.gz) =3D 94877267 > SHA256 (gitlab-org-gitaly-df7dadcc3f74276a7176234d4b1475299f46c05c=5FGL= 0.tar.gz) =3D 4c403ee52c1d42d54e9acd14026796782e8272e74c8eb7c3cedf9c92469= 7647e > SIZE (gitlab-org-gitaly-df7dadcc3f74276a7176234d4b1475299f46c05c=5FGL0.= tar.gz) =3D 3703056 > SHA256 (gitlab-org-labkit-9205b46eea68f47a36cefa783a306476f0b2dbfd=5FGL= 0.tar.gz) =3D c957c444298dd0f9ade07cb643d03e455dcc28d24bd203ead8d241bf50c= 6df57 --618fece3_327b23c6_750-- --618fece3_643c9869_750 Content-Type: application/pgp-signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: Canary PGP V3 iQJVBAABCgA/OBxEaW1hIFBhbm92IChGcmVlQlNELk9SRyBDb21taXR0ZXIpIDxm bHVmZnlARnJlZUJTRC5PUkc+BQJhj+zjAAoJEPuLoJ3VOY8prWQP/1OjPwKoK1AF OC0ksGYgNS/dTUfQ9+rXhJcxYos40FwQTObV5RCQ+qzu5Wr6HxuH9DyayhL0J1/P wu1GYF8uQkZHDIlw8qnaobxkHfjfhIHF7zzzqp0nS/tcbNR1TMmZPFTTAtEVFN7K dYDoG+woeIR1h73vE2sSAvFcp+i1g4f9rAvn3uK1kN+xhn1u9aXUMaFKfMeIHOOv +/5+aaJ7Q0cX8cpI4a5BufTDgnl6GSgaRlYEpw3Mi0HVpyTi4NzWUhRHk8s1tMvC tiUPk686D2ZnYTid4l9WQJapWk3609+vBDeM6e1oeNYuDUDXKu9koUg5yKEVIO2P /XWw7yjeSevNHcUbMHYWtqxfpEaJD6hJCYNRQoRxQz0aPpNZffcY2mXqomCZjnss DEsSJ+OY8yQeu/TXy6wEDf7T+FT5QkjGo8LssrfVXDHnzvtpFDVrS4dmJrsiT+t6 g2rXy85eunTgzacq1uiN60Qy3riuT+1sZDcGHw3Yd6J8KLXogR+ErvOB4b1MAvzT cJRM7LFU3yEp60I0j4+u1UH7mkPpZmDR6YYZ70az7S1YIZU8QQfWi4f6V4NWpqLg PiorKhqb6BzXq/sYfUFMB3TKnNpIQ08iLSOGEKtCVOJNez0MXGXDamjd5PfD8ZWe nuxiSauEszxlc1QOfA56sV+sR1HxUMQP =u8f6 -----END PGP SIGNATURE----- --618fece3_643c9869_750--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?35a05f8b-0af3-4066-8850-939387c8e618>