From cda21772eac1b0bef07f7caa326cf80b509f0cc4 Mon Sep 17 00:00:00 2001 From: Sreenivasulu Malavathula Date: Mon, 4 Nov 2024 08:14:01 +0000 Subject: [PATCH 1/2] Base Version: upgrade diffstat from 1.63 -> 1.66 - Add "License verified" statement to the changelog. --- SPECS-EXTENDED/diffstat/diffstat.signatures.json | 2 +- SPECS-EXTENDED/diffstat/diffstat.spec | 13 ++++++++++--- cgmanifest.json | 4 ++-- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/SPECS-EXTENDED/diffstat/diffstat.signatures.json b/SPECS-EXTENDED/diffstat/diffstat.signatures.json index 17a6737f82b..0784607f3e1 100644 --- a/SPECS-EXTENDED/diffstat/diffstat.signatures.json +++ b/SPECS-EXTENDED/diffstat/diffstat.signatures.json @@ -1,6 +1,6 @@ { "Signatures": { "COPYING": "4c13a1dd3f79e44679957051db96807506688109cafe11d7c899909119e0481d", - "diffstat-1.63.tgz": "7eddd53401b99b90bac3f7ebf23dd583d7d99c6106e67a4f1161b7a20110dc6f" + "diffstat-1.66.tgz": "f54531bbe32e8e0fa461f018b41e3af516b632080172f361f05e50367ecbb69e" } } diff --git a/SPECS-EXTENDED/diffstat/diffstat.spec b/SPECS-EXTENDED/diffstat/diffstat.spec index 0e5db76025c..c50e8eead44 100644 --- a/SPECS-EXTENDED/diffstat/diffstat.spec +++ b/SPECS-EXTENDED/diffstat/diffstat.spec @@ -1,17 +1,19 @@ Summary: A utility which provides statistics based on the output of diff Name: diffstat -Version: 1.63 -Release: 3%{?dist} +Version: 1.66 +Release: 1%{?dist} License: MIT Vendor: Microsoft Corporation Distribution: Azure Linux +# SPDX-License-Identifier: MIT URL: http://invisible-island.net/diffstat -Source0: ftp://ftp.invisible-island.net/pub/diffstat/%{name}-%{version}.tgz +Source0: https://invisible-island.net/archives/diffstat/%{name}-%{version}.tgz # Taken from diffstat.c. Source1: COPYING BuildRequires: gcc BuildRequires: xz +BuildRequires: make %description The diff command compares files line by line. Diffstat reads the @@ -43,6 +45,11 @@ make check %{_mandir}/*/* %changelog +* Mon Nov 04 2024 Sreenivasulu Malavathula - 1.66-1 +- Updating Azure-Linux import from Fedora 41 (license: MIT). +- Update License to SPDX +- License verified + * Fri Oct 15 2021 Pawel Winogrodzki - 1.63-3 - Initial CBL-Mariner import from Fedora 32 (license: MIT). diff --git a/cgmanifest.json b/cgmanifest.json index 66a68e721c3..d193440663f 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -2608,8 +2608,8 @@ "type": "other", "other": { "name": "diffstat", - "version": "1.63", - "downloadUrl": "ftp://ftp.invisible-island.net/pub/diffstat/diffstat-1.63.tgz" + "version": "1.66", + "downloadUrl": "https://invisible-island.net/archives/diffstat/diffstat-1.66.tgz" } } }, From ab94950bffb9af77dcae057c12ae37855f08bba2 Mon Sep 17 00:00:00 2001 From: Sreenivasulu Malavathula Date: Wed, 4 Dec 2024 05:33:08 +0000 Subject: [PATCH 2/2] - Removing this line as suggested by reviwer --- SPECS-EXTENDED/diffstat/diffstat.spec | 58 +++++++++++++++++++++------ 1 file changed, 46 insertions(+), 12 deletions(-) diff --git a/SPECS-EXTENDED/diffstat/diffstat.spec b/SPECS-EXTENDED/diffstat/diffstat.spec index c50e8eead44..2e3127684c4 100644 --- a/SPECS-EXTENDED/diffstat/diffstat.spec +++ b/SPECS-EXTENDED/diffstat/diffstat.spec @@ -1,13 +1,12 @@ +Vendor: Microsoft Corporation +Distribution: Azure Linux Summary: A utility which provides statistics based on the output of diff Name: diffstat Version: 1.66 -Release: 1%{?dist} -License: MIT -Vendor: Microsoft Corporation -Distribution: Azure Linux -# SPDX-License-Identifier: MIT -URL: http://invisible-island.net/diffstat -Source0: https://invisible-island.net/archives/diffstat/%{name}-%{version}.tgz +Release: 3%{?dist} +License: SMLNJ +URL: https://invisible-island.net/diffstat +Source0: https://invisible-mirror.net/archives/diffstat/%{name}-%{version}.tgz # Taken from diffstat.c. Source1: COPYING @@ -45,13 +44,48 @@ make check %{_mandir}/*/* %changelog -* Mon Nov 04 2024 Sreenivasulu Malavathula - 1.66-1 -- Updating Azure-Linux import from Fedora 41 (license: MIT). -- Update License to SPDX +* Mon Nov 04 2024 Sreenivasulu Malavathula - 1.66-3 +- Initial Azure Linux import from Fedora 41 (license: MIT) - License verified -* Fri Oct 15 2021 Pawel Winogrodzki - 1.63-3 -- Initial CBL-Mariner import from Fedora 32 (license: MIT). +* Wed Jul 17 2024 Fedora Release Engineering - 1.66-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Mon Jan 29 2024 Fedora Release Monitoring - 1.66-1 +- Update to 1.66 (#2260805) + +* Wed Jan 24 2024 Fedora Release Engineering - 1.65-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 1.65-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Jul 19 2023 Fedora Release Engineering - 1.65-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 1.65-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Mon Oct 10 2022 Tim Waugh - 1.65-1 +- Update to 1.65 (bug #2133330). + +* Thu Jul 21 2022 Fedora Release Engineering - 1.64-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jan 20 2022 Fedora Release Engineering - 1.64-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jul 21 2021 Fedora Release Engineering - 1.64-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 1.64-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jan 13 2021 Tim Waugh - 1.64-1 +- Update to 1.64. + +* Mon Jul 27 2020 Fedora Release Engineering - 1.63-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild * Tue Jan 28 2020 Fedora Release Engineering - 1.63-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild