From nobody Thu Sep 19 12:49:10 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 4X8b1f37Tyz5WWHq; Thu, 19 Sep 2024 12:49:10 +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 4X8b1f1GDHz4n7Q; Thu, 19 Sep 2024 12:49:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726750150; 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=qTi/wXBD7h5Y38d85ULPWk6CfI2mC3iiCJgsqi6AUfY=; b=sJkz+vh414JkOoNSv3XOnQjLEnuZRw/eAxqU9wpiGg5kRAEd9bAMoy60G4VA2kGul0tJWT b+rOz/yEQtQ9jZa41f5KUElmOy0BDBb0hddctO9qQQyZ6mZrewjJAXAVE9iqmNoPpZV28n UcMkibJQ9J5Q2kgoYw+29ZWhPx562bMw8ltoVaSAYEEvHPAwoqR3a/W26BSncIon0A2c6e iY6AwiY/PDhriPXqB7nwpmDeXEOQFidwRfDXhV5ewxu2WKRkJWQSEofMs5Vctdz9Go2/TB jv/uy4UJG0nEE/t39YMwB9ZdJAuT+/CUhZZAeD93Sys57EarEUsB0qdLo3EJhw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726750150; a=rsa-sha256; cv=none; b=azwfk/vhoAr/BIsNNhoLHQHYJxHFiC7hlkxjZl7dzGyREmY7A6wUdypUKx8MM7pWKdyZsk RG2zlGiz9tM/sK/mBrKgh6qA9gr++BY6it+LabXA9d0VHkTnaNYHa4TIWx32nCBGR5Jreq HgOoT7WJB04sBrKOsYhxYCLpOjzZakN7hK9ByShQPJTOv7M+Iq9Ls+TnBVUj08saN8aci7 I+X9MnymuNw+E8jCDPPjm5z/2rFwD0ylqNUxbDV2X2oBGlGwYN37ERwMpYO46CU0gINquT do59fTn0bOq0NQOOiXR/o1a9t8mOGX4ZiOliSDRAHkpVJ4lgHRaoGlVzOuoAzQ== 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=1726750150; 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=qTi/wXBD7h5Y38d85ULPWk6CfI2mC3iiCJgsqi6AUfY=; b=p43N9gvEq+QGqyAAAPdpcMQOSoGrTD0rqkISbT56VYSDuUtxCqBAZlGm2S6QRYU2ZOLkll c9sosMo9du8uh+CyEE35qidrl1HVR9FGYuwMTWDXNp0QtEIvpfgrerfquMnvvA2DfP5c/R 1ILqJiELghhr0SCTVOIPtj9pRbES6at+xFZ000MLTwOItYBy2h9PK/vTZnzet06XfeQUnH 8NaVte77NWzIMU1oPt8JeIHOHT7OkUNKkXbuAvhW//o9CQ7mOUSK50p2AxkQbOYVLQZMaT eR7bIrl1Jw2D+Epf42Tcdd74c0dfJM1lGVYa57lonIiIL/IsbzDInf3BJxeXHw== 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 4X8b1f0tKyz15mH; Thu, 19 Sep 2024 12:49:10 +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 48JCnA89065739; Thu, 19 Sep 2024 12:49:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48JCnAJb065736; Thu, 19 Sep 2024 12:49:10 GMT (envelope-from git) Date: Thu, 19 Sep 2024 12:49:10 GMT Message-Id: <202409191249.48JCnAJb065736@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: 067905614d64 - 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: 067905614d641e8a3fa3af3aa2d02b04a28b7185 Auto-Submitted: auto-generated The branch main has been updated by mat: URL: https://cgit.FreeBSD.org/ports/commit/?id=067905614d641e8a3fa3af3aa2d02b04a28b7185 commit 067905614d641e8a3fa3af3aa2d02b04a28b7185 Author: Brad Davis AuthorDate: 2024-09-19 12:26:24 +0000 Commit: Mathieu Arnold CommitDate: 2024-09-19 12:48:25 +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. PR: 279816 --- 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}