git: 1e810df64354 - 2021Q4 - www/grafana8: remove duplicates from distinfo

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Matthew Seaman <matthew_at_FreeBSD.org>
Date: Sun, 19 Dec 2021 23:59:35 UTC
The branch 2021Q4 has been updated by matthew:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1e810df64354af61e3f48f45229f93c2d24e236a

commit 1e810df64354af61e3f48f45229f93c2d24e236a
Author:     Matthew Seaman <matthew@FreeBSD.org>
AuthorDate: 2021-12-19 23:41:49 +0000
Commit:     Matthew Seaman <matthew@FreeBSD.org>
CommitDate: 2021-12-19 23:59:02 +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.
    
    (cherry picked from commit dcd67527ab526dcb8683565796f1ac2e8b6bc6a7)
---
 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