From nobody Tue Apr 23 15:31:01 2024 X-Original-To: dev-commits-ports-branches@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 4VP5gB24Jjz5HTGS; Tue, 23 Apr 2024 15:31:02 +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 4VP5g95mFRz41WJ; Tue, 23 Apr 2024 15:31:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713886261; 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=9U8BE9mwqGE/tsjErtXZSHpCUkeaSyrVyZWYzQNbtM0=; b=Jwlcs4jYjFOEZB77/mEMlElybVTv/26qclJTnlVLC3tRTWkarHJ95zZpkSjqYbtDiQ3tW8 KK5+XsApQuDIc9d8A+FtP6L1FvxF79qHF8mDsP4d2zoAOS/tsTXH2hBeipa4mQPiH86wda q8+3JgJuKuuoobz4mFmdASYQ0mzo2vidJZimutegapuucb3W1GGUQhdzPFJqyfipLJUxI3 ZKZOj+r4kn9jXdGAi1yHZ+1y//Bd2Xgv6gdjRMfYVt1XmcSCOY2iMt/tMJoXCYY3pKcfE/ k8njer16sZR4QB5GYUZYru3zqsY2TxxyNmUGcQy7A7Tdzg+mTtmFwyjJURPkXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713886261; a=rsa-sha256; cv=none; b=aiT7tu85Yq8tUG0EW5bUHx6GfKzkjnnQBHQUDteq4G06t9uERUd4f2IMhB97ttIQwcyzc+ MivKIXGX4RVtAOH3y19GzdxAdey5gofiXvzbSQqdu2ffI1JIPDM5NUbJYJ+w8THl/Z6tW7 CpG8tBnvVzHJrjd/7dXc7BIDApeteUoMR4l9wDXbfgT3WHmwaR4o0t3FMG3vE1YLFpMe5B XfkR6RMu2M6LWZykQqP9kmNb153iBWbnWzxa+d8RG6ABqWqgEZoTiiNDYfJ9LbSsDUAr+e +2L62+uE2p4U6TL4rC0ynsYD8lDzkDN9ZnZFGiyauBP5sssJtT697ha8Ffzm/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713886261; 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=9U8BE9mwqGE/tsjErtXZSHpCUkeaSyrVyZWYzQNbtM0=; b=OtL9I/h8sbttYA4Pv4uuQWpxlKTFDhh30s253wf3ar5ccP2RbOiXUWCCWqLxh5yaodsyfl +lCl1149mIqQjVQsMWHSqf16y83k0OmUjHH60yabGuhib37Osn/GhoKk8fjnyWYNmHqsdP U7dS2ArsCcmVmcuy6oTFp/p3Y4dpcvlsYn/Sgztek/wsV2vUx5xTSM+Zmz8prys8CYbBnT hFeHzzngklaUaVHU+H9MeSTyrVTbpGZqz52wmMKvvv3pk1lnLr9njfFVvpbRVfXb+VqZYT T8o+BbeB7jnnTA/bvqSOkF9iuqvPgHl58hOfPW2QxYFkmECQO4rQhjbLdPHQVA== 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 4VP5g95FdNzdFg; Tue, 23 Apr 2024 15:31:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43NFV1w1046164; Tue, 23 Apr 2024 15:31:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NFV1cK046161; Tue, 23 Apr 2024 15:31:01 GMT (envelope-from git) Date: Tue, 23 Apr 2024 15:31:01 GMT Message-Id: <202404231531.43NFV1cK046161@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Matthias Fechner Subject: git: 1a4d01d60016 - 2024Q2 - devel/gitlab-shell: fix build errors due to checksum failure List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@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/2024Q2 X-Git-Reftype: branch X-Git-Commit: 1a4d01d60016a459cc2b697e877c1c2d8394ca75 Auto-Submitted: auto-generated The branch 2024Q2 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=1a4d01d60016a459cc2b697e877c1c2d8394ca75 commit 1a4d01d60016a459cc2b697e877c1c2d8394ca75 Author: Matthias Fechner AuthorDate: 2024-04-23 06:33:31 +0000 Commit: Matthias Fechner CommitDate: 2024-04-23 15:30:43 +0000 devel/gitlab-shell: fix build errors due to checksum failure The port will execute `go mod download` to download go modules. This command modifies the go.mod file which causes the checksum check to fail. Backup the go.mod and restore it afterwards. PR: 278520 (cherry picked from commit 30ee39816e4e27529f1f2421820962b961c5fc0e) --- devel/gitlab-shell/Makefile | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/devel/gitlab-shell/Makefile b/devel/gitlab-shell/Makefile index 461e78ca25c1..bc77ddea9f3a 100644 --- a/devel/gitlab-shell/Makefile +++ b/devel/gitlab-shell/Makefile @@ -38,17 +38,15 @@ DIST_SUBDIR= go/${PKGORIGIN:S,/,_,g}/${DISTNAME} EXTRACT_ONLY+= ${DISTFILES:N*.mod\:*:N*.mod:C/:.*//} _USES_fetch+= 800:go-post-fetch go-post-fetch: + @${ECHO_MSG} "Copy go.mod as go mod download will modify it, which breaks checksum check" + @(cd ${DISTDIR}/${DIST_SUBDIR}; ${CP} go.mod go.mod.orig) @${ECHO_MSG} "===> Fetching ${GO_MODNAME} dependencies"; @(cd ${DISTDIR}/${DIST_SUBDIR}; \ [ -e go.mod ] || ${RLN} ${GO_MODFILE} go.mod; \ ${SETENV} ${GO_ENV} GOPROXY=${GO_GOPROXY} ${GO_CMD} mod download -x all) + @${ECHO_MSG} "Restore previous go.mod" + @(cd ${DISTDIR}/${DIST_SUBDIR}; ${MV} go.mod.orig go.mod) # --------------------------- -# WARNING, maybe bug in core ports framework (work fine in the past for very long time -# For an unkown reason, the downloaded go.mod is modified and therefor the distinfo is generated wrongly -# Execute this, to fix it: -# curl -v https://gitlab.com/gitlab-org/gitlab-shell/-/raw/v14.35.0/go.mod 2>&1 | grep content-length -# curl -v https://gitlab.com/gitlab-org/gitlab-shell/-/raw/v14.35.0/go.mod | sha256 -# Correct this in distinfo VARLOGDIR= /var/log/gitlab-shell