From nobody Wed Mar 09 10:09:00 2022 X-Original-To: dev-commits-ports-main@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 AF13E1A08A26; Wed, 9 Mar 2022 10:09:01 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KD7Fm4KF1z4qMT; Wed, 9 Mar 2022 10:09:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646820540; 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=9VTZYmtI+hR2S/tEhm1lZA1hJoDX7dzIz4/CcQ6f25k=; b=aO9BdEWc3ZfjP60EaPP79e4cZgEunAQiXIgb6KeJ/7ZOmOFHD3RMvczIUBKRgwvIDwEnhD qbSbAxvJYz4wXg+LWIToKE3kKEncpSHqRGnXHaOQ8tdzg7dLxkwABwkZeZ6pU3nBYjg+Z9 SeEao2ln2bmaMkEa3FgPz1iUyAUItUi95G7Ccl91JLXjo90sSFXgK1EhWFyy4dO+9Pd7sK RBjhp3l9MiwGSVm0agqGZzhUF7EODrHxWcFN3jBLR36s52AoKo7iL0J5L2gZRSTn3+VfGv 5KiNpipjsggHGRgujRHAYunKKaJyr03CIffjJlhyPNa2QTCzeriy+56BONN5MA== 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 46B4B6B7C; Wed, 9 Mar 2022 10:09:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 229A90cZ090598; Wed, 9 Mar 2022 10:09:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 229A90BI090597; Wed, 9 Mar 2022 10:09:00 GMT (envelope-from git) Date: Wed, 9 Mar 2022 10:09:00 GMT Message-Id: <202203091009.229A90BI090597@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: e8c81d9bc89d - main - www/gitlab-workhorse: Update to 14.8.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: e8c81d9bc89d1e870b1ca8577d3c2560050f2546 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646820540; 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=9VTZYmtI+hR2S/tEhm1lZA1hJoDX7dzIz4/CcQ6f25k=; b=PtDVuOLy+14aHoqGl64iGZ2LU8VNUEP8wbL3GF9v2T0/C0IzBnaPtJ6abLySF19mVz2lbC uMFIvhGkzliryz409gJE59ngl+nR5YuZGvWUrtUNaFywkqYYlPdHB4mNi1KPf6+m4jtdFj S6JIRPMcNTv0oQ+Qo5t5CKz0Q/hHjAhlWznL8JDeP3x5ftrta0/BfYyUp6DLzwD2IpKUPB imGIjNd0cTPRAq+tsvdBV9dRn2Gmx0Rl8jIbndXpeIMeiET9K+gc76yb39fWhJ7dO9Ir0u yn5R7G5Bk25vUgwAkEJtEWHRx60iwcPfY/sSQJqiF9cpnJOl0PE7PqamA0sJ9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646820540; a=rsa-sha256; cv=none; b=pZVz/evOjMAPtM0eXOVvKTqvo3/JqHoTN6QaiP3H3abuGBlM67eafaBmlUSJeVTyUDmljD hHbLW9+gog65Xtum+QRCup9ncHnT2mpXARiJldXnhssjAf5HN8v2xmx34I5/XYfpVe/avK RFsmLpAJE87ijZTCRLjsb5Rv4oARjI1MC1+9+JSkMmo47NyGSGWszLr6rxE+6eoDXXHOuS za07i9mKluthkFRFOMMqwIOxvgF5ziogF5POAa2PNToh5ee9OJ3o2mLf3Dl7UxVBicAwQF iBAv9BLy1LbVJTpU0N3OdfisPXXJYHLc6XLH2OPv+T6A5tZDer5/JA7q0lQLgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=e8c81d9bc89d1e870b1ca8577d3c2560050f2546 commit e8c81d9bc89d1e870b1ca8577d3c2560050f2546 Author: Matthias Fechner AuthorDate: 2022-03-08 22:34:22 +0000 Commit: Matthias Fechner 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 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 - 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