From nobody Thu Jul 13 20:54:49 2023 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 4R26LL094Nz4nFvh; Thu, 13 Jul 2023 20:54:50 +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 4R26LK3CsMz3lQ1; Thu, 13 Jul 2023 20:54:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689281689; 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=ch6ZXB45QFMWb/k4X3wBf3jBHqLvkZCU5Ap2+D2lzrw=; b=wEVnbJfDGGJAj8omonZcKNbyWk/pXsDJA10r4asBJxpAnVln6eUKW6ii91itQoMxywrmzf QPPV6vJRfQXurwv7a16s9JC/Bw9Ws6dNFvUvAvMUfjwFOWkNdbEV6+fiihJlI4TSgZZSRV hUWhFU1RAPyDupU3SapaEDuFmjNJNYoEdgpNljjE1jz6jbsu1WV4hg2sR+WBfs9P2shuY0 1TALDWYPO4JUMwf5QWOkdvPxWj1Kp/hq9eWKRCXDmsUJvGPAsgojVnWzYuDNK8HDgtzp0R azwHsbGj+JLTEMqYu/FWNp2a/H0hNpUVs6kmFLyX4Dvn5BKQ0hgvova9OO9KCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689281689; 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=ch6ZXB45QFMWb/k4X3wBf3jBHqLvkZCU5Ap2+D2lzrw=; b=Ex9KCEwLRHXspPcNwc1KIvXvZ7g6ZFuPjmzmqmcFckaYmVV0nj2YHdZkWNpbZZXVZaBXDr ntodq6Vba+bSzQsVv5vxWSciUgJ9QIIxaAyMXYgMrDCfYEexNpk72hwKVQBHzzuYfOrJ5L cBdqxtRDTZ44TveXjv0ZBulohWn4tIgna1r1fMJ/rMjRYILoQVwbDf38fEcaa5I45hYZv3 geoDvt2lXLYM6mgTuHxe/76CAoBvD4icVzhRsa4mQUcguhH/K87PSFr55Oe/7K+Laqg307 HleuGKoMacZtmOgsm6NPPEqVRVQgL24vuH0qJNe+is26ykgXy/KsGZMcBLSYvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689281689; a=rsa-sha256; cv=none; b=QFZIuvaGYm1WAgsqJE4oeEP/SV5R8e/W5sdaTcqhnyRggtxtJsOZTyJIc1+12pLR6VtGKj Bzs1ewcYgUxxYZwq13jOh4K6bm0eifBgS3zFj319ABDU3ewyw/kWBfhbRf1n5Z0svla3ol psfr/yDAh3XE+EZtJV70LHAR3uN4APDihS7VLxk2oTJD8iMoMYsMIi798q9qguhzFgIdN7 sVwFrbM7pj3CysfqNg0xDCRvpquhNk3+Eal60RtzGUoMw6kLAdKx7bZsesuqIPYg7WpIMa S6O7ivtZwNYMWqnNugxrrbvozdlIu/NHKeL2awD02GWPJtNPYWJDpP4IqmZaJQ== 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 4R26LK2BBtz15Mg; Thu, 13 Jul 2023 20:54:49 +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 36DKsnnp056015; Thu, 13 Jul 2023 20:54:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36DKsnFa056014; Thu, 13 Jul 2023 20:54:49 GMT (envelope-from git) Date: Thu, 13 Jul 2023 20:54:49 GMT Message-Id: <202307132054.36DKsnFa056014@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Felix Palmen Subject: git: f59f844b65a1 - main - bsd.sites.mk: Avoid bogus dev-warning from makesum 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zirias X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f59f844b65a1f7ce32ec214879cec0b710172006 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zirias: URL: https://cgit.FreeBSD.org/ports/commit/?id=f59f844b65a1f7ce32ec214879cec0b710172006 commit f59f844b65a1f7ce32ec214879cec0b710172006 Author: Felix Palmen AuthorDate: 2023-07-13 07:15:05 +0000 Commit: Felix Palmen CommitDate: 2023-07-13 20:54:00 +0000 bsd.sites.mk: Avoid bogus dev-warning from makesum makesum calls make fetch and passes MASTER_SITES, so the dev warning about it is triggered by the value USE_GITLAB computes. Avoid this by disabling the warning in make fetch when NO_CHECKSUM and DISABLE_SIZE are set. Approved by: portmgr (tcberner, mentor) Differential Revision: https://reviews.freebsd.org/D41014 --- Mk/bsd.sites.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk index c6bee3798d56..2832c818a751 100644 --- a/Mk/bsd.sites.mk +++ b/Mk/bsd.sites.mk @@ -406,8 +406,12 @@ WWW?= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/ .endif # !defined(IGNORE_MASTER_SITE_GITHUB) # Keep this before USE_GITLAB -.if !empty(MASTER_SITES:M*//*/*/*/-/archive/${DISTVERSIONFULL}/) +# first try to detect when fetch was called by makesum, which passes +# MASTER_SITES and would cause a bogus warning here. +.if !(make(fetch) && !empty(NO_CHECKSUM) && !empty(DISABLE_SIZE)) +. if !empty(MASTER_SITES:M*//*/*/*/-/archive/${DISTVERSIONFULL}/) DEV_WARNING+= "MASTER_SITES contains ${MASTER_SITES:M*//*/*/*/-/archive/${DISTVERSIONFULL}/}, please use USE_GITLAB instead." +. endif .endif .if !defined(IGNORE_MASTER_SITE_GITLAB)