git: e8c81d9bc89d - main - www/gitlab-workhorse: Update to 14.8.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 09 Mar 2022 10:09:00 UTC
The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=e8c81d9bc89d1e870b1ca8577d3c2560050f2546 commit e8c81d9bc89d1e870b1ca8577d3c2560050f2546 Author: Matthias Fechner <mfechner@FreeBSD.org> AuthorDate: 2022-03-08 22:34:22 +0000 Commit: Matthias Fechner <mfechner@FreeBSD.org> CommitDate: 2022-03-09 10:07:55 +0000 www/gitlab-workhorse: Update to 14.8.0 Required for gitlab-ce 14.8. --- www/gitlab-workhorse/Makefile | 5 ++--- www/gitlab-workhorse/distinfo | 6 +++--- .../files/patch-__support_make-gnu-build-id.sh | 11 +++++++++++ 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile index 00e8d6c57cb7..684820ce08e4 100644 --- a/www/gitlab-workhorse/Makefile +++ b/www/gitlab-workhorse/Makefile @@ -1,7 +1,7 @@ # Created by: Torsten Zuehlsdorff <tz@FreeBSD.org> PORTNAME= gitlab-workhorse -PORTVERSION= 14.7.3 +PORTVERSION= 14.8.0 PORTREVISION= 0 CATEGORIES= www @@ -25,7 +25,7 @@ USE_GITLAB= yes GL_ACCOUNT= gitlab-org GL_PROJECT= gitlab-foss # Find the commit hash here: https://gitlab.com/gitlab-org/gitlab-foss/-/tags -GL_COMMIT= 293f6bb322ba6f3aba63744cea1cc3c9d648aba0 +GL_COMMIT= 3f274363e9dc9a1be75edfcd3dd5adb64b1e8c29 # for go dependencies USE_GITHUB= nodefault @@ -160,4 +160,3 @@ post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME} .include <bsd.port.mk> - diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo index edc902731d41..e7f2d43e3539 100644 --- a/www/gitlab-workhorse/distinfo +++ b/www/gitlab-workhorse/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1644937627 +TIMESTAMP = 1646778762 SHA256 (Azure-azure-pipeline-go-v0.2.3_GH0.tar.gz) = 99bd58f4a07dd02d9615e3638b3bb6dbfad80ef678ccdb8e17e3fa2b0fef343e SIZE (Azure-azure-pipeline-go-v0.2.3_GH0.tar.gz) = 17102 SHA256 (Azure-azure-storage-blob-go-v0.13.0_GH0.tar.gz) = 6bf7145210331efa3f0417f6684cf764c22743cf23122048ec136600daebf443 @@ -199,8 +199,8 @@ SHA256 (uber-jaeger-client-go-v2.27.0_GH0.tar.gz) = 7590acdefcbbf9553bd3415bc7e5 SIZE (uber-jaeger-client-go-v2.27.0_GH0.tar.gz) = 210139 SHA256 (uber-jaeger-lib-v2.4.1_GH0.tar.gz) = c178bcad325857dba29551c16f40707701adf6e3a9e01e1ca3e5edfc3c6de8bc SIZE (uber-jaeger-lib-v2.4.1_GH0.tar.gz) = 38010 -SHA256 (gitlab-org-gitlab-foss-293f6bb322ba6f3aba63744cea1cc3c9d648aba0_GL0.tar.gz) = bfa8cfa540b47dd665bce7fb2b7d36d686d238b1d10b974d765b4a25715d0406 -SIZE (gitlab-org-gitlab-foss-293f6bb322ba6f3aba63744cea1cc3c9d648aba0_GL0.tar.gz) = 101617590 +SHA256 (gitlab-org-gitlab-foss-3f274363e9dc9a1be75edfcd3dd5adb64b1e8c29_GL0.tar.gz) = 8ac2d2bb30f954cc3caa8b29e648d3136bf29a2aa066fc1ce417b9065d5c5b5a +SIZE (gitlab-org-gitlab-foss-3f274363e9dc9a1be75edfcd3dd5adb64b1e8c29_GL0.tar.gz) = 102523804 SHA256 (gitlab-org-gitaly-df7dadcc3f74276a7176234d4b1475299f46c05c_GL0.tar.gz) = 4c403ee52c1d42d54e9acd14026796782e8272e74c8eb7c3cedf9c924697647e SIZE (gitlab-org-gitaly-df7dadcc3f74276a7176234d4b1475299f46c05c_GL0.tar.gz) = 3703056 SHA256 (gitlab-org-golang-archive-zip-84007c99e03b62ee4dc62a94048d6e59552299d7_GL0.tar.gz) = 103a3e806657de5e2c7844326146c88490089fa8d07784270c359b5f5a8d06be diff --git a/www/gitlab-workhorse/files/patch-__support_make-gnu-build-id.sh b/www/gitlab-workhorse/files/patch-__support_make-gnu-build-id.sh new file mode 100644 index 000000000000..1a161c5e22ed --- /dev/null +++ b/www/gitlab-workhorse/files/patch-__support_make-gnu-build-id.sh @@ -0,0 +1,11 @@ +--- _support/make-gnu-build-id.sh.orig 2022-03-08 22:36:38 UTC ++++ _support/make-gnu-build-id.sh +@@ -13,7 +13,7 @@ main() + fail "ERROR: Could not extract Go build-id or generate a random hex string." + fi + +- GNU_BUILD_ID=$( echo $GO_BUILD_ID | sha1sum | cut -d' ' -f1 ) ++ GNU_BUILD_ID=$( echo $GO_BUILD_ID | sha1 | cut -d' ' -f1 ) + if [ -z "$GNU_BUILD_ID" ] ; then + fail "ERROR: Could not generate a GNU build-id" + fi