From nobody Tue May 21 13:49:08 2024 X-Original-To: dev-commits-ports-all@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 4VkG4h6z3bz5LP2C; Tue, 21 May 2024 13:49:08 +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 4VkG4h6SfYz4Hv1; Tue, 21 May 2024 13:49:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716299348; 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=4G2uFzFKMQ8X9BvFFOc+m8eoFUiL4vKEHdck2K9enX0=; b=PLdJ+gjCfaVBjQ70Ty4671fX6r2jmk0mFNmNeW+TsYo+XMaEVDlefQYQScIpyVCJ5ds8VO frAWaQWGAtWmWjflBUy7Iq5suEI0pmDx97EK5RyEIPQzQBJBEMoZ59VPN862Nv/DDXm82q P4+JadcoW6GN5KFW+fiOjwf0UziXr9eLUdIy5Ff4bcPMVqkHC7F4TKizZ6UPcX7xc4fXIR b+5fVe/vcSWfCm+Xljd6zfoKE+WkqwnddVNWj+IPzlraIGnkTujJ9JoxxOJshbVygXUzrw GvNtRaMGp4iTT6O/5ysQX/TwMlnv/tbHFMALi/t+6BHvPNWjNq+5+cc9VgEH8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716299348; a=rsa-sha256; cv=none; b=UZ0UjcuSV/ArwPXuxm9ohE7hDFG+5qx+AqpaUmpKaq+3qxwxs0vvnog/vNrm+lxN0YaeXu tUvrCPrsDIZepTbhev1XqvnrZD4/qlski9RrUP9f2h6rZYJbHmHCp9xYQRIjInssUSN00M 0m6m9ExGHw3TFrBTcRT5azrl6z0taShOMP+xf7taWiBh84xrfLY5BtuBCm/FCLtlOxryMX tKL5bT7/5GA3hs4sn8UcrpJoQajOAGi9hTo/vhoraw9WprFjxyReIFTpK6LEMkr9QaZ4I1 9ZFtD/zAfSnPdISnyEtAgsti7ya4N1f8t3THGvudaXsErC19Mc+udGdaWJuMtQ== 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=1716299348; 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=4G2uFzFKMQ8X9BvFFOc+m8eoFUiL4vKEHdck2K9enX0=; b=Om2TReGiZrx7xfqb8gB2UxJUlGsP5d3keguXmPZUHoHHAgsCxyMOypegDCN8xgQRgcrbKA CJU7V5mXKzP491x0RL1NJn0de9cLblT78RZqRPSHVTGRBk3tU28IG7asaM7x1GwcYiNSEB bUwh0vX2mtHs+6wIZXCVHNp74CeSyPNKbNPcVPJNR8q4tLfeaakeGmMLup4YmdCV6eXZ1A FyjQWNUxQK/9AcOyjOyssy/D+Ryo69VCbicw1QKfniuVZRJ9855CEUy3nZce71Qpp2G1h6 WBFCl+zxY24G6PRp/WWBBqkcSj7aMsKsWMmL9/A+89OToNeGMamUFzxGawhrMQ== 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 4VkG4h64BNzPQ6; Tue, 21 May 2024 13:49:08 +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 44LDn8ZJ098523; Tue, 21 May 2024 13:49:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44LDn83l098520; Tue, 21 May 2024 13:49:08 GMT (envelope-from git) Date: Tue, 21 May 2024 13:49:08 GMT Message-Id: <202405211349.44LDn83l098520@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: c0d940d81130 - 2024Q2 - devel/gitlab-shell: fix build as non-root user in poudriere List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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: c0d940d81130b3847fb4a997b491c7542c4e4b62 Auto-Submitted: auto-generated The branch 2024Q2 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=c0d940d81130b3847fb4a997b491c7542c4e4b62 commit c0d940d81130b3847fb4a997b491c7542c4e4b62 Author: Yasuhito FUTATSUKI AuthorDate: 2024-05-16 11:19:29 +0000 Commit: Matthias Fechner CommitDate: 2024-05-21 12:59:11 +0000 devel/gitlab-shell: fix build as non-root user in poudriere PR: 278710 (cherry picked from commit 3c8fd2ac242ab03120b5d7eb4a02f84d346a0475) --- devel/gitlab-shell/Makefile | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/devel/gitlab-shell/Makefile b/devel/gitlab-shell/Makefile index 7936f330b809..e58abc4d9107 100644 --- a/devel/gitlab-shell/Makefile +++ b/devel/gitlab-shell/Makefile @@ -39,14 +39,17 @@ 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) + @if [ ! -e ${DISTDIR}/${DIST_SUBDIR}/.go-post-fetch-done ]; then\ + ${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) ;\ + ${TOUCH} ${DISTDIR}/${DIST_SUBDIR}/.go-post-fetch-done;\ + fi; # --------------------------- VARLOGDIR= /var/log/gitlab-shell @@ -82,4 +85,11 @@ post-install: ${SED} -E -e '/sample$$/ s#^#@sample #; \ s#${DATADIR_REL}/bin#@(,,555) ${DATADIR_REL}/bin#; ' >> ${TMPPLIST} -.include +go-pre-delete-distfiles: + @if [ -e ${DISTDIR}/${DIST_SUBDIR}/.go-post-fetch-done ]; then\ + ${RM} ${DISTDIR}/${DIST_SUBDIR}/.go-post-fetch-done || ${TRUE};\ + fi + +.include +delete-distfiles: go-pre-delete-distfiles +.include