From nobody Thu Sep 19 12:46:56 2024 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 4X8Zz43kwBz5WW93; Thu, 19 Sep 2024 12:46:56 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X8Zz41rqTz4mdN; Thu, 19 Sep 2024 12:46:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726750016; 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=Jv6EtPzoIDFaN0mUoUrzIa6fs6BFm6F9YoF7Q6qzAfY=; b=IBt9Z/qjzfKKXEbQjpSuIKcsVlOvil/Ew6fqZz25dRsT4SMqq2+RtY1Qq7Ego3qgpfIA2U z0calqSpyPgTJz7Tx8G1bZDK58vOwN1UTTkbDr/CFhZT4+ScpxqJjo+MBfyuVZU1Y8HYWn B83E/eOehi3O0pGn9jvOrA1+FpqIOkMTJOsNUX/uzG97d9wtoJB6SMRwes+nDYLkB+rzrm lS2Wtg2YFMU8CkyUVRqiLMcImq2FNitBnO9+aN6ssmehtIw0yBEX+7TlhWhnL5fhxJT/72 trgaykdhrAGrQ6TXKAMROaIzrqJfi0feCcmSbs60O1YI6dkShQ6wJTc88VMxKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726750016; a=rsa-sha256; cv=none; b=aaUuV0kdp9m5gztoC/Rq522VYWh8pf1oz4BePBS4W+Wt+B+uAuihxZJLcQZiRa4+lojckB sKrXRxCuKrPRb4mZYiX5pPC72N6fUm1xuJheGsh1IGUx9MlMC1qh98dSnCTOm9syHcbDrM 33bx/nDJjk8DmozrdU1c6P5Klh19tigsx89jOyg8srFrucXCdZEesUwAIJqa/KzfCQaIdj eunPIES6ZPM+e2cZ3cdKx2KCc21r57qZahoPKWJVE5U2ldvE5ReHwKPKPZCG4Pzul9LhNG GQ2e516WIwQwyRUKc7ZHlQFjC4LLOiq5ynnoEBi69humwyRnvBGzrCJl4RmJkQ== 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=1726750016; 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=Jv6EtPzoIDFaN0mUoUrzIa6fs6BFm6F9YoF7Q6qzAfY=; b=LJZ20/IeqDKM9yzeCpQgEl6Ab83dGwE9Hplhr928uVR4co3d2cF3ClI7SprJQ5JvwslSsY lvZtoowPfrCTbCWYOc/Y1DFiJ4NMptScys9rfFzNmLCrWDAL9TviC7hhjS5EDCdWkxze1r 6Kh3v9Cx6rioGOCr5FCGPjGjigbSBw5+6ph6gk5T5sdqVbIYBnbLmDX7AUfUZc7qKPmKJs 8vcjzzW+DuvB+zv5qHpVTj9vR96Ca1ojciOrqhQCZBp0nq7eYtFPesL7WCUte4ePQ6mK6L DahQm5hr2h+V10Iy8VQTGD9VM3K1mtRalLeISmdph+wkDMqUpcHoXSUzkJ80Dg== 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 4X8Zz41Rprz161X; Thu, 19 Sep 2024 12:46:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48JCkuis064956; Thu, 19 Sep 2024 12:46:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48JCkuU8064953; Thu, 19 Sep 2024 12:46:56 GMT (envelope-from git) Date: Thu, 19 Sep 2024 12:46:56 GMT Message-Id: <202409191246.48JCkuU8064953@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mathieu Arnold Subject: git: 06790548d500 - main - Mk/bsd.sites.mk: don't add GH to MASTER_SITES when USE_GITHUB=nodefault 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mat X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 06790548d50075cc2e2cfff4fe0811a561402cec Auto-Submitted: auto-generated The branch main has been updated by mat: URL: https://cgit.FreeBSD.org/ports/commit/?id=06790548d50075cc2e2cfff4fe0811a561402cec commit 06790548d50075cc2e2cfff4fe0811a561402cec Author: Mathieu Arnold AuthorDate: 2024-09-19 12:26:24 +0000 Commit: Mathieu Arnold CommitDate: 2024-09-19 12:46:35 +0000 Mk/bsd.sites.mk: don't add GH to MASTER_SITES when USE_GITHUB=nodefault When using USE_GITHUB=nodefault, we don't need to add GH to MASTER_SITES, as the github urls that are needed will be added later. Adding GH here means we'll add a generic GitHub URL to the fetch list, in the form of github.com///.../ which will not work. When used with USE_GITLAB the framework will add this bogus URL before the correct gitlab url. It does not prevent the distfile to be fetched from gitlab, but it makes everyone try and fetch from a bogus url before trying the correct url. --- Mk/bsd.sites.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk index e34fbb846144..5fffe2e64865 100644 --- a/Mk/bsd.sites.mk +++ b/Mk/bsd.sites.mk @@ -294,7 +294,7 @@ GH_SUBDIR+= ${GH_TUPLE:C@^([^:]*):([^:]*):([^:]*)((:[^:/]*)?)((/.*)?)@\6\4@:M/*: MASTER_SITE_GITHUB+= https://codeload.github.com/%SUBDIR% MASTER_SITE_GITHUB_CLOUD+= https://cloud.github.com/downloads/%SUBDIR% -. if !defined(MASTER_SITES) || !${MASTER_SITES:MGH} && !${MASTER_SITES:MGHC} && !${USE_GITHUB:Mnodefault} +. if ( !defined(MASTER_SITES) || !${MASTER_SITES:MGH} && !${MASTER_SITES:MGHC} ) && !${USE_GITHUB:Mnodefault} MASTER_SITES+= GH . endif GH_ACCOUNT_DEFAULT= ${PORTNAME}