From nobody Sun Dec 19 23:47:16 2021 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 C167E18E4BBC; Sun, 19 Dec 2021 23:47:16 +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 4JHKBr2lHBz3jV8; Sun, 19 Dec 2021 23:47:16 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 3A27E3E29; Sun, 19 Dec 2021 23:47:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BJNlG9V092148; Sun, 19 Dec 2021 23:47:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BJNlGK7092147; Sun, 19 Dec 2021 23:47:16 GMT (envelope-from git) Date: Sun, 19 Dec 2021 23:47:16 GMT Message-Id: <202112192347.1BJNlGK7092147@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthew Seaman Subject: git: dcd67527ab52 - main - www/grafana8: remove duplicates from distinfo 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: matthew X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dcd67527ab526dcb8683565796f1ac2e8b6bc6a7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639957636; 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=hTh+nB5Ii6fgCrcEP/mLMxWkUEBGdrRiKNbZsmSM5FE=; b=KOuGgLrYR7hNWdzKvdfOBOMR1kFTi0o3sjVms2GYsL2wYeqyPVeQ/1kaPAtjJyhOFCh6vF uHlH1iaWIo1HdEZskarMYRSern0YAU/LJYQ3sFFxS5lXxebNVlUtZ2nUg+H7CBqsQvoSyk jQnY/6Ph2+plaETd4wHleSGsfqUHBV2zL6DqTegmsksEzJdCPgQIWJmfmufJan4sMcpnJS PxQ7MWBfWsxPx28AVX4fCjHcxDh2GHPwhW2c+xQLHXU94Nh0E3cF4QQsKrhaVS7paY7w/X vbpTSRN8okSIVYwQ2Vf3wctX7twr57Ue6tF6A6dEEu+iIeyYzI4nJUuPwEXpYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639957636; a=rsa-sha256; cv=none; b=Cap+h4ea0Ib8qn3ZcLh41RLcf6cyH0Uza4lX3+Fb1IQpOrUQ+dvTcHhjvL7SnCC884IRp0 dpqt5nROi9t6ffKL/VzQnm1D4M/ej9B8W3C8XkA14UoDNbYPjSf4OJ10wu7Dki1fEYpTxo 3Gg4yl60Jaloqqe9bHBlWQBHo/L6Uz7au392ARmparVjyWLEEPWTVPYhw0jCdfN0uFS7mf 06NwxOHdHowpsGFxviDZcDhkgpM3UKS6x2+0jMybdePeTTIyIXZbZWtkR7NTMHpe5G3g5z LbD5gmt/TvPViLhEWxu2HummUS6vgpOqIr4qe5aKzQ7qI6j7jCMhXFxK3ocQ4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by matthew: URL: https://cgit.FreeBSD.org/ports/commit/?id=dcd67527ab526dcb8683565796f1ac2e8b6bc6a7 commit dcd67527ab526dcb8683565796f1ac2e8b6bc6a7 Author: Matthew Seaman AuthorDate: 2021-12-19 23:41:49 +0000 Commit: Matthew Seaman CommitDate: 2021-12-19 23:41:49 +0000 www/grafana8: remove duplicates from distinfo The Azure go-autorest project (https://github.com/Azure/go-autorest) provides several go modules within the same tarball, but the Grafana code requires different commits for several of those modules, hence the same source appearing multiple times at different commmit hashes in distinfo. Unfortunately, with grafana 8.3.3, three of the go-autorest modules required the same commit hash, leading to duplication in the distinfo. This causes a problem when trying to download the distfiles the first time -- a number of the downloads will fail. Repeatedly attempting to download will succeed for one more of the various different versions of the go-autorest distfile, until eventually everything has been successfully downloaded. Remove the duplicate items in distinfo so that first-time download into a virgin distfiles directory does succeed. This means that the result of `make makesum` cannot be used un-edited. PR: 260537 Reported by: John D. --- www/grafana8/distinfo | 4 ---- 1 file changed, 4 deletions(-) diff --git a/www/grafana8/distinfo b/www/grafana8/distinfo index ab17a1890295..45fb1a3b6978 100644 --- a/www/grafana8/distinfo +++ b/www/grafana8/distinfo @@ -25,14 +25,10 @@ SHA256 (Azure-go-autorest-4e2e1bb52ffb_GH0.tar.gz) = f490eae213fa67895cee27f8724 SIZE (Azure-go-autorest-4e2e1bb52ffb_GH0.tar.gz) = 172343 SHA256 (Azure-go-autorest-b3a0b30a7423_GH0.tar.gz) = 51b31571a26a5287eb67251aa69407bb6145f58253bdbb2e610b7eab7b0d762f SIZE (Azure-go-autorest-b3a0b30a7423_GH0.tar.gz) = 167123 -SHA256 (Azure-go-autorest-b3a0b30a7423_GH0.tar.gz) = 51b31571a26a5287eb67251aa69407bb6145f58253bdbb2e610b7eab7b0d762f -SIZE (Azure-go-autorest-b3a0b30a7423_GH0.tar.gz) = 167123 SHA256 (Azure-go-autorest-446f41b7d65b_GH0.tar.gz) = 883e2603529a907a3da25d5e2389ab6473a80e6d79daf0d9ffc6385494e0da0a SIZE (Azure-go-autorest-446f41b7d65b_GH0.tar.gz) = 171840 SHA256 (Azure-go-autorest-820a319d2214_GH0.tar.gz) = c44aa105a0ea462395888b7c3fb50dcb7be5ae07d74906b23ec4484eacecc27a SIZE (Azure-go-autorest-820a319d2214_GH0.tar.gz) = 175097 -SHA256 (Azure-go-autorest-b3a0b30a7423_GH0.tar.gz) = 51b31571a26a5287eb67251aa69407bb6145f58253bdbb2e610b7eab7b0d762f -SIZE (Azure-go-autorest-b3a0b30a7423_GH0.tar.gz) = 167123 SHA256 (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 6593da894578ba510a470735ffbdc88ce88033094dc5a8f4d3957ab87e18803f SIZE (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 42077 SHA256 (FZambia-eagle-v0.0.1_GH0.tar.gz) = dc2dd0e2e582a2c8e8c7fadab6d1456b9ff2d15fe7c5a8e54986c0d961a200f1