From 824c75ef627fd2186afc09735e227f5507120c42 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 11:19:17 +0000 Subject: [PATCH 01/19] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- aha.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aha.spec b/aha.spec index d542d9c..454e5f1 100644 --- a/aha.spec +++ b/aha.spec @@ -1,6 +1,6 @@ Name: aha Version: 0.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Convert terminal output to HTML License: MPLv1.1 or LGPLv2+ @@ -38,6 +38,9 @@ cat aha.c | awk '1;/\*\//{exit}' > LICENSE %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 0.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Wed Jul 24 2019 Fedora Release Engineering - 0.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 52fc12271766a191d9447b07adebabde28876a82 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 11:50:15 +0000 Subject: [PATCH 02/19] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- aha.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aha.spec b/aha.spec index 454e5f1..cce19fe 100644 --- a/aha.spec +++ b/aha.spec @@ -1,6 +1,6 @@ Name: aha Version: 0.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Convert terminal output to HTML License: MPLv1.1 or LGPLv2+ @@ -38,6 +38,9 @@ cat aha.c | awk '1;/\*\//{exit}' > LICENSE %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 0.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jan 28 2020 Fedora Release Engineering - 0.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 345a8dc5e1e56847a36089e8271ee0d5e1750138 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jul 2020 23:51:36 +0000 Subject: [PATCH 03/19] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- aha.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/aha.spec b/aha.spec index cce19fe..f6714d1 100644 --- a/aha.spec +++ b/aha.spec @@ -1,6 +1,6 @@ Name: aha Version: 0.5 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Convert terminal output to HTML License: MPLv1.1 or LGPLv2+ @@ -38,6 +38,10 @@ cat aha.c | awk '1;/\*\//{exit}' > LICENSE %changelog +* Fri Jul 31 2020 Fedora Release Engineering - 0.5-6 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 0.5-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From cd0975a6d84875308fa639a698036af39ece1723 Mon Sep 17 00:00:00 2001 From: Artur Frenszek-Iwicki Date: Thu, 10 Sep 2020 10:22:31 +0200 Subject: [PATCH 04/19] Update to latest upstream release (v0.5.1) --- .gitignore | 1 + aha.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c324909..8dcdd79 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /aha-0.4.10.6.tar.gz /aha-0.5.tar.gz +/aha-0.5.1.tar.gz diff --git a/aha.spec b/aha.spec index f6714d1..fee1786 100644 --- a/aha.spec +++ b/aha.spec @@ -1,6 +1,6 @@ Name: aha -Version: 0.5 -Release: 6%{?dist} +Version: 0.5.1 +Release: 1%{?dist} Summary: Convert terminal output to HTML License: MPLv1.1 or LGPLv2+ @@ -38,6 +38,9 @@ cat aha.c | awk '1;/\*\//{exit}' > LICENSE %changelog +* Thu Sep 10 2020 Artur Frenszek-Iwicki - 0.5.1-1 +- Update to latest upstream release + * Fri Jul 31 2020 Fedora Release Engineering - 0.5-6 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 97ad0fa..3141ff5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (aha-0.5.tar.gz) = 2fbf0be928d8ea0491f6710d96eddd135253cadce6cc8c00f342e03e030ee16a3ff1eb6a559740cdd642b074c9e4e3fd9a76412272ffeb0b7bb419b0dcb6dbc1 +SHA512 (aha-0.5.1.tar.gz) = 0eb88e681208c0956e344d6574f9d7ba155d38bfb386d0a9f17022c5e925fb16d0efb6aa04804191b4cac1697a87a0f16ba51bcd97b6135cc7606046eaf89288 From 036fbd281d89e009f2319990cdaf353ee0364367 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 25 Jan 2021 23:53:55 +0000 Subject: [PATCH 05/19] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- aha.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aha.spec b/aha.spec index fee1786..0ad73e3 100644 --- a/aha.spec +++ b/aha.spec @@ -1,6 +1,6 @@ Name: aha Version: 0.5.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Convert terminal output to HTML License: MPLv1.1 or LGPLv2+ @@ -38,6 +38,9 @@ cat aha.c | awk '1;/\*\//{exit}' > LICENSE %changelog +* Mon Jan 25 2021 Fedora Release Engineering - 0.5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Thu Sep 10 2020 Artur Frenszek-Iwicki - 0.5.1-1 - Update to latest upstream release From dfbf0b95d06b8abe413ef2403381b6a0399cb12f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 12:26:02 +0000 Subject: [PATCH 06/19] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 9fc1a04b3f782849d2f8569c71a8486551f38f86 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 17:21:23 +0000 Subject: [PATCH 07/19] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- aha.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aha.spec b/aha.spec index 0ad73e3..d5c3147 100644 --- a/aha.spec +++ b/aha.spec @@ -1,6 +1,6 @@ Name: aha Version: 0.5.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Convert terminal output to HTML License: MPLv1.1 or LGPLv2+ @@ -38,6 +38,9 @@ cat aha.c | awk '1;/\*\//{exit}' > LICENSE %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 0.5.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon Jan 25 2021 Fedora Release Engineering - 0.5.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 22693fd26d532ed6e9386c6c1e31b67118f82025 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 21:01:40 +0000 Subject: [PATCH 08/19] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- aha.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aha.spec b/aha.spec index d5c3147..43ee68e 100644 --- a/aha.spec +++ b/aha.spec @@ -1,6 +1,6 @@ Name: aha Version: 0.5.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Convert terminal output to HTML License: MPLv1.1 or LGPLv2+ @@ -38,6 +38,9 @@ cat aha.c | awk '1;/\*\//{exit}' > LICENSE %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 0.5.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jul 21 2021 Fedora Release Engineering - 0.5.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 4655efcc9d39d3c322e912a3fa6a98dcd4924e9a Mon Sep 17 00:00:00 2001 From: Artur Frenszek-Iwicki Date: Mon, 11 Jul 2022 12:12:12 +0200 Subject: [PATCH 09/19] Add a patch to fix null pointer dereference --- 0000-fix-null-pointer-dereference.patch | 151 ++++++++++++++++++++++++ aha.spec | 21 +++- 2 files changed, 167 insertions(+), 5 deletions(-) create mode 100644 0000-fix-null-pointer-dereference.patch diff --git a/0000-fix-null-pointer-dereference.patch b/0000-fix-null-pointer-dereference.patch new file mode 100644 index 0000000..ef4206e --- /dev/null +++ b/0000-fix-null-pointer-dereference.patch @@ -0,0 +1,151 @@ +From a340963e0c40f3ea85fea911c79fbaaa5af93e27 Mon Sep 17 00:00:00 2001 +From: suve +Date: Thu, 9 Jun 2022 15:46:20 +0200 +Subject: [PATCH 1/2] Check if 24-bit colour codes contain 3 arguments + +--- + aha.c | 64 ++++++++++++++++++++++++++--------------------------------- + 1 file changed, 28 insertions(+), 36 deletions(-) + +diff --git a/aha.c b/aha.c +index 46e43c0..bf22373 100644 +--- a/aha.c ++++ b/aha.c +@@ -833,25 +833,21 @@ int main(int argc,char* args[]) + if (momelem->value == 38 && + momelem->next && + momelem->next->value == 2 && +- momelem->next->next)// 38;2; -> 24 Bit ++ momelem->next->next && ++ momelem->next->next->next && ++ momelem->next->next->next->next)// 38;2;;; -> 24 Bit + { +- momelem = momelem->next->next; +- pelem r,g,b; +- r = momelem; +- momelem = momelem->next; +- g = momelem; +- if ( momelem ) +- momelem = momelem->next; +- b = momelem; +- if ( r && g && b ) +- { +- state.highlighted = 0; +- state.fc_colormode = MODE_24BIT; +- *dest = +- (r->value & 255) * 65536 + +- (g->value & 255) * 256 + +- (b->value & 255); +- } ++ pelem r = momelem->next->next; ++ pelem g = r->next; ++ pelem b = g->next; ++ momelem = b; ++ ++ state.highlighted = 0; ++ state.fc_colormode = MODE_24BIT; ++ *dest = ++ (r->value & 255) * 65536 + ++ (g->value & 255) * 256 + ++ (b->value & 255); + } + else + { +@@ -901,25 +897,21 @@ int main(int argc,char* args[]) + if (momelem->value == 48 && + momelem->next && + momelem->next->value == 2 && +- momelem->next->next)// 48;2; -> 24 Bit ++ momelem->next->next && ++ momelem->next->next->next && ++ momelem->next->next->next->next)// 48;2;;; -> 24 Bit + { +- momelem = momelem->next->next; +- pelem r,g,b; +- r = momelem; +- momelem = momelem->next; +- g = momelem; +- if ( momelem ) +- momelem = momelem->next; +- b = momelem; +- if ( r && g && b ) +- { +- state.bc_colormode = MODE_24BIT; +- state.highlighted = 0; +- *dest = +- (r->value & 255) * 65536 + +- (g->value & 255) * 256 + +- (b->value & 255); +- } ++ pelem r = momelem->next->next; ++ pelem g = r->next; ++ pelem b = g->next; ++ momelem = b; ++ ++ state.bc_colormode = MODE_24BIT; ++ state.highlighted = 0; ++ *dest = ++ (r->value & 255) * 65536 + ++ (g->value & 255) * 256 + ++ (b->value & 255); + } + else + { + +From 1b8b994b058920cdc2fe144dca3243bacf1d49b2 Mon Sep 17 00:00:00 2001 +From: suve +Date: Thu, 9 Jun 2022 15:55:29 +0200 +Subject: [PATCH 2/2] Add a helper function to avoid ->next checks + +--- + aha.c | 23 +++++++++++++---------- + 1 file changed, 13 insertions(+), 10 deletions(-) + +diff --git a/aha.c b/aha.c +index bf22373..2bfebb7 100644 +--- a/aha.c ++++ b/aha.c +@@ -138,6 +138,15 @@ pelem parseInsert(char* s) + return firstelem; + } + ++int parseDepthAtLeast(pelem elem, unsigned int wanted) { ++ while (elem != NULL) { ++ if (wanted == 0) return 1; ++ elem = elem->next; ++ --wanted; ++ } ++ return 0; ++} ++ + void deleteParse(pelem elem) + { + while (elem!=NULL) +@@ -831,11 +840,8 @@ int main(int argc,char* args[]) + } + else + if (momelem->value == 38 && +- momelem->next && +- momelem->next->value == 2 && +- momelem->next->next && +- momelem->next->next->next && +- momelem->next->next->next->next)// 38;2;;; -> 24 Bit ++ parseDepthAtLeast(momelem, 4) && ++ momelem->next->value == 2)// 38;2;;; -> 24 Bit + { + pelem r = momelem->next->next; + pelem g = r->next; +@@ -895,11 +901,8 @@ int main(int argc,char* args[]) + } + else + if (momelem->value == 48 && +- momelem->next && +- momelem->next->value == 2 && +- momelem->next->next && +- momelem->next->next->next && +- momelem->next->next->next->next)// 48;2;;; -> 24 Bit ++ parseDepthAtLeast(momelem, 4) && ++ momelem->next->value == 2)// 48;2;;; -> 24 Bit + { + pelem r = momelem->next->next; + pelem g = r->next; diff --git a/aha.spec b/aha.spec index 43ee68e..8ecb113 100644 --- a/aha.spec +++ b/aha.spec @@ -1,13 +1,21 @@ Name: aha -Version: 0.5.1 -Release: 4%{?dist} Summary: Convert terminal output to HTML - License: MPLv1.1 or LGPLv2+ + +Version: 0.5.1 +Release: 5%{?dist} + URL: https://github.com/theZiz/aha Source0: %{URL}/archive/%{version}/%{name}-%{version}.tar.gz -BuildRequires: gcc make +# Fix a null pointer dereference when interpreting +# invalid 24-bit color code escape sequences. +# +# Submitted upstream: https://github.com/theZiz/aha/pull/97 +Patch0: 0000-fix-null-pointer-dereference.patch + +BuildRequires: gcc +BuildRequires: make %description @@ -17,7 +25,7 @@ and produces an HTML rendition of the original text. %prep -%setup -q +%autosetup -p1 # Extract license header from source code cat aha.c | awk '1;/\*\//{exit}' > LICENSE @@ -38,6 +46,9 @@ cat aha.c | awk '1;/\*\//{exit}' > LICENSE %changelog +* Mon Jul 11 2022 Artur Frenszek-Iwicki - 0.5.1-5 +- Add a patch to fix segfault because of null pointer dereference + * Wed Jan 19 2022 Fedora Release Engineering - 0.5.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From db7570da278dd92590b1da95aa657593f10d3c54 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 20:32:48 +0000 Subject: [PATCH 10/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- aha.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aha.spec b/aha.spec index 8ecb113..52812a4 100644 --- a/aha.spec +++ b/aha.spec @@ -3,7 +3,7 @@ Summary: Convert terminal output to HTML License: MPLv1.1 or LGPLv2+ Version: 0.5.1 -Release: 5%{?dist} +Release: 6%{?dist} URL: https://github.com/theZiz/aha Source0: %{URL}/archive/%{version}/%{name}-%{version}.tar.gz @@ -46,6 +46,9 @@ cat aha.c | awk '1;/\*\//{exit}' > LICENSE %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 0.5.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon Jul 11 2022 Artur Frenszek-Iwicki - 0.5.1-5 - Add a patch to fix segfault because of null pointer dereference From ab199b9e2c5b0e32cece940fa4c73a00a2c300c4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 21:30:11 +0000 Subject: [PATCH 11/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- aha.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aha.spec b/aha.spec index 52812a4..ecaa12c 100644 --- a/aha.spec +++ b/aha.spec @@ -3,7 +3,7 @@ Summary: Convert terminal output to HTML License: MPLv1.1 or LGPLv2+ Version: 0.5.1 -Release: 6%{?dist} +Release: 7%{?dist} URL: https://github.com/theZiz/aha Source0: %{URL}/archive/%{version}/%{name}-%{version}.tar.gz @@ -46,6 +46,9 @@ cat aha.c | awk '1;/\*\//{exit}' > LICENSE %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 0.5.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Jul 20 2022 Fedora Release Engineering - 0.5.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 11a97c581bf6ba0102dbc8c8853c21ee66f67d8d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 13:01:22 +0000 Subject: [PATCH 12/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- aha.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aha.spec b/aha.spec index ecaa12c..4ea2fe6 100644 --- a/aha.spec +++ b/aha.spec @@ -3,7 +3,7 @@ Summary: Convert terminal output to HTML License: MPLv1.1 or LGPLv2+ Version: 0.5.1 -Release: 7%{?dist} +Release: 8%{?dist} URL: https://github.com/theZiz/aha Source0: %{URL}/archive/%{version}/%{name}-%{version}.tar.gz @@ -46,6 +46,9 @@ cat aha.c | awk '1;/\*\//{exit}' > LICENSE %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 0.5.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Jan 18 2023 Fedora Release Engineering - 0.5.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 8efc880db6f80e1d445932f5f173495ab3fd2cd2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 12:25:54 +0000 Subject: [PATCH 13/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- aha.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aha.spec b/aha.spec index 4ea2fe6..8840603 100644 --- a/aha.spec +++ b/aha.spec @@ -3,7 +3,7 @@ Summary: Convert terminal output to HTML License: MPLv1.1 or LGPLv2+ Version: 0.5.1 -Release: 8%{?dist} +Release: 9%{?dist} URL: https://github.com/theZiz/aha Source0: %{URL}/archive/%{version}/%{name}-%{version}.tar.gz @@ -46,6 +46,9 @@ cat aha.c | awk '1;/\*\//{exit}' > LICENSE %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 0.5.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 0.5.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 23ccc090bc8a8b8274b532e84716ce9053b6e6d2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 22:47:28 +0000 Subject: [PATCH 14/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- aha.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aha.spec b/aha.spec index 8840603..69ab213 100644 --- a/aha.spec +++ b/aha.spec @@ -3,7 +3,7 @@ Summary: Convert terminal output to HTML License: MPLv1.1 or LGPLv2+ Version: 0.5.1 -Release: 9%{?dist} +Release: 10%{?dist} URL: https://github.com/theZiz/aha Source0: %{URL}/archive/%{version}/%{name}-%{version}.tar.gz @@ -46,6 +46,9 @@ cat aha.c | awk '1;/\*\//{exit}' > LICENSE %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 0.5.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 0.5.1-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From f0904abeab3cecef6e6d40bf4643e94f61f1508c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 16:43:48 +0000 Subject: [PATCH 15/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- aha.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aha.spec b/aha.spec index 69ab213..593b7b7 100644 --- a/aha.spec +++ b/aha.spec @@ -3,7 +3,7 @@ Summary: Convert terminal output to HTML License: MPLv1.1 or LGPLv2+ Version: 0.5.1 -Release: 10%{?dist} +Release: 11%{?dist} URL: https://github.com/theZiz/aha Source0: %{URL}/archive/%{version}/%{name}-%{version}.tar.gz @@ -46,6 +46,9 @@ cat aha.c | awk '1;/\*\//{exit}' > LICENSE %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 0.5.1-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Jan 22 2024 Fedora Release Engineering - 0.5.1-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From d60c312f66331eefdbd47162134212537f7b5f4e Mon Sep 17 00:00:00 2001 From: Artur Frenszek-Iwicki Date: Thu, 8 Aug 2024 14:42:07 +0200 Subject: [PATCH 16/19] Convert License tag to SPDX --- aha.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/aha.spec b/aha.spec index 593b7b7..04bc22a 100644 --- a/aha.spec +++ b/aha.spec @@ -1,9 +1,9 @@ Name: aha Summary: Convert terminal output to HTML -License: MPLv1.1 or LGPLv2+ +License: MPL-1.1 OR LGPL-2.0-or-later Version: 0.5.1 -Release: 11%{?dist} +Release: 12%{?dist} URL: https://github.com/theZiz/aha Source0: %{URL}/archive/%{version}/%{name}-%{version}.tar.gz @@ -41,11 +41,16 @@ cat aha.c | awk '1;/\*\//{exit}' > LICENSE %files %license LICENSE +%license LICENSE.MPL1.1 LICENSE.LGPLv2+ %{_bindir}/%{name} %{_mandir}/man1/%{name}.* %changelog +* Thu Aug 08 2024 Artur Frenszek-Iwicki - 0.5.1-12 +- Convert License tag to SPDX +- Include full license texts in the package + * Wed Jul 17 2024 Fedora Release Engineering - 0.5.1-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From eb456048196b41e023a879c0170c2fc9ec00e002 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 10:43:45 +0000 Subject: [PATCH 17/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- aha.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aha.spec b/aha.spec index 04bc22a..c372b67 100644 --- a/aha.spec +++ b/aha.spec @@ -3,7 +3,7 @@ Summary: Convert terminal output to HTML License: MPL-1.1 OR LGPL-2.0-or-later Version: 0.5.1 -Release: 12%{?dist} +Release: 13%{?dist} URL: https://github.com/theZiz/aha Source0: %{URL}/archive/%{version}/%{name}-%{version}.tar.gz @@ -47,6 +47,9 @@ cat aha.c | awk '1;/\*\//{exit}' > LICENSE %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 0.5.1-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Aug 08 2024 Artur Frenszek-Iwicki - 0.5.1-12 - Convert License tag to SPDX - Include full license texts in the package From 487f3e032cadfd40893104b583e069f4df1b9bae Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 16:50:02 +0000 Subject: [PATCH 18/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- aha.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aha.spec b/aha.spec index c372b67..da11810 100644 --- a/aha.spec +++ b/aha.spec @@ -3,7 +3,7 @@ Summary: Convert terminal output to HTML License: MPL-1.1 OR LGPL-2.0-or-later Version: 0.5.1 -Release: 13%{?dist} +Release: 14%{?dist} URL: https://github.com/theZiz/aha Source0: %{URL}/archive/%{version}/%{name}-%{version}.tar.gz @@ -47,6 +47,9 @@ cat aha.c | awk '1;/\*\//{exit}' > LICENSE %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 0.5.1-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jan 16 2025 Fedora Release Engineering - 0.5.1-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From b7daf4f2dbf018dba54aa42e8348c99d07393ef9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:31:20 +0000 Subject: [PATCH 19/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- aha.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aha.spec b/aha.spec index da11810..e5c3e7e 100644 --- a/aha.spec +++ b/aha.spec @@ -3,7 +3,7 @@ Summary: Convert terminal output to HTML License: MPL-1.1 OR LGPL-2.0-or-later Version: 0.5.1 -Release: 14%{?dist} +Release: 15%{?dist} URL: https://github.com/theZiz/aha Source0: %{URL}/archive/%{version}/%{name}-%{version}.tar.gz @@ -47,6 +47,9 @@ cat aha.c | awk '1;/\*\//{exit}' > LICENSE %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 0.5.1-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Wed Jul 23 2025 Fedora Release Engineering - 0.5.1-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild