From 7db5ccb926035df0b7fa0c809412dc5c197e7264 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= Date: Tue, 15 Nov 2022 12:54:22 +0100 Subject: [PATCH 01/19] new upstream release - 7.0 Resolves: #2142885 --- .gitignore | 4 ++-- bensberg.pgp | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++-- nano.spec | 8 +++++-- sources | 4 ++-- 4 files changed, 72 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 0c14449..1fe7111 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -/nano-[3-6].*.tar.xz -/nano-[3-6].*.tar.xz.asc +/nano-[3-7].*.tar.xz +/nano-[3-7].*.tar.xz.asc diff --git a/bensberg.pgp b/bensberg.pgp index 1438f5b..2ea04ab 100644 --- a/bensberg.pgp +++ b/bensberg.pgp @@ -46,6 +46,66 @@ zlYqJ9rEJHEq3y8Bn2sHGP8+zOSzWRo3iN4afv49+vCDXKwIDMoH+GMKhZXaDRsc GkrAKCyD9BSZmnCkkQ32VIAS6MUaqNujHzmEcNuwN7nUzeD365Nx5qaKVTwqWgmQ g3QWkGdknaYMg7f+ca3fnyekRJwxpZtWmUMZ2ueMTCi1KaLAYA2pg7Yyz5jo6jo9 I6FdNHf0/M8lFzQLx4xbNBasbdVX67sAevLkmqcv8H+gSP1Lv7xLE9Wy1asZfBKf -WVynD/YeN/rgZpx3Jh1ccMw= -=cs04 +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 +=Txhj -----END PGP PUBLIC KEY BLOCK----- diff --git a/nano.spec b/nano.spec index 8ac3917..38cb69b 100644 --- a/nano.spec +++ b/nano.spec @@ -7,14 +7,14 @@ Summary: A small text editor Name: nano -Version: 6.4 +Version: 7.0 Release: 1%{?dist} License: GPLv3+ URL: https://www.nano-editor.org Source0: https://www.nano-editor.org/dist/latest/%{name}-%{version}.tar.xz Source1: https://www.nano-editor.org/dist/latest/%{name}-%{version}.tar.xz.asc -# gpg --keyserver pgp.mit.edu --recv-key BFD009061E535052AD0DF2150D28D4D2A0ACE884 +# gpg --keyserver keyserver.ubuntu.com --recv-key 168E6F4297BFD7A79AFD4496514BBE2EB8E1961F # gpg --output bensberg.pgp --armor --export bensberg@telfort.nl Source2: bensberg.pgp @@ -132,6 +132,10 @@ install -Dpm 0644 %{SOURCE13} %{buildroot}%{_datadir}/fish/vendor_conf.d/%{basen %changelog +* Tue Nov 15 2022 Lukáš Zaoral - 7.0-1 +- new upstream release (#2142885) +- update GPG signature key + * Tue Aug 02 2022 Lukáš Zaoral - 6.4-1 - new upstream release (#2113894) diff --git a/sources b/sources index d3c0f8a..fa81c1c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nano-6.4.tar.xz) = cff2d9d90f1a23ab8905320e651f8bbc9d38046153a4f64bbc21927687d9628135915468b00b28f88a0eb7d395d1bcb0b9b7abcf367e5a46a5f3da01d8d6e72b -SHA512 (nano-6.4.tar.xz.asc) = 65cfd6f879c1b9087b8168d3e646aa733bab230124000129b6d5e4981d22e7aaa745d077d47814f57e4dac026926ff1bb05db36b22ae49ee16ce48f24b66f8b6 +SHA512 (nano-7.0.tar.xz) = 927db4dec1fcde316104a59ab208ffadea52a65c63888187794d4b47c5d49b591c39d490fdc31255b82f04d77a4321b2f6bb150022a5f88dd3c2500df327b983 +SHA512 (nano-7.0.tar.xz.asc) = 0eece0178c25f9f4a438f94f2dbe5bca00d86da3558d5b91c488fba92482cfc327c6788bbe774dde6676a4a0ec1dd98d8ab8cda9f7ce72dce1d9a667d3f9f50a From 6613610c4c126577288cde8f4e9dff2d1a4210da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= Date: Wed, 14 Dec 2022 12:40:46 +0100 Subject: [PATCH 02/19] new upstream release - 7.1 Resolves: rhbz#2153268 --- nano.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nano.spec b/nano.spec index 38cb69b..5e7b88e 100644 --- a/nano.spec +++ b/nano.spec @@ -7,7 +7,7 @@ Summary: A small text editor Name: nano -Version: 7.0 +Version: 7.1 Release: 1%{?dist} License: GPLv3+ URL: https://www.nano-editor.org @@ -132,6 +132,9 @@ install -Dpm 0644 %{SOURCE13} %{buildroot}%{_datadir}/fish/vendor_conf.d/%{basen %changelog +* Wed Dec 14 2022 Lukáš Zaoral - 7.1-1 +- new upstream release (#2153268) + * Tue Nov 15 2022 Lukáš Zaoral - 7.0-1 - new upstream release (#2142885) - update GPG signature key diff --git a/sources b/sources index fa81c1c..5da95ce 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nano-7.0.tar.xz) = 927db4dec1fcde316104a59ab208ffadea52a65c63888187794d4b47c5d49b591c39d490fdc31255b82f04d77a4321b2f6bb150022a5f88dd3c2500df327b983 -SHA512 (nano-7.0.tar.xz.asc) = 0eece0178c25f9f4a438f94f2dbe5bca00d86da3558d5b91c488fba92482cfc327c6788bbe774dde6676a4a0ec1dd98d8ab8cda9f7ce72dce1d9a667d3f9f50a +SHA512 (nano-7.1.tar.xz.asc) = 3bef2276d63db69e33f71fdf4939c9435c5f48c204dbd59b1f591ad7728f9387968a328f03da5b8eb3b7e2f45f0b6f8e2a0d53e0ec9072e2fac7565219b3a92f +SHA512 (nano-7.1.tar.xz) = e3226df636d3ae1d94e2907ce8bbdb8de69eb45afd02fb1c83e275a1dcc288081809041adbfdade35a580bcb9f9632d21a45d764b43d22b3e4cfd87c7757c4e0 From 9f928bcf882d59da39fd46d5dd0d93232f264511 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= Date: Wed, 18 Jan 2023 10:51:39 +0100 Subject: [PATCH 03/19] Update to 7.2 (rhbz#2161916) - Do not use %%{_bindir}/* and %%{_mandir}/* as suggested by the packaging guidelines. Resolves: rhbz#2161916 --- nano.spec | 14 ++++++++++---- sources | 4 ++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/nano.spec b/nano.spec index 5e7b88e..d8f77aa 100644 --- a/nano.spec +++ b/nano.spec @@ -7,7 +7,7 @@ Summary: A small text editor Name: nano -Version: 7.1 +Version: 7.2 Release: 1%{?dist} License: GPLv3+ URL: https://www.nano-editor.org @@ -19,7 +19,7 @@ Source1: https://www.nano-editor.org/dist/latest/%{name}-%{version}.tar. Source2: bensberg.pgp # Additional sources -Source3: nanorc +Source3: nanorc # Shell snippets for default-editor setup Source11: nano-default-editor.sh @@ -114,9 +114,10 @@ install -Dpm 0644 %{SOURCE13} %{buildroot}%{_datadir}/fish/vendor_conf.d/%{basen %doc AUTHORS ChangeLog NEWS README THANKS TODO %doc build/doc/sample.nanorc %doc doc/{faq,nano}.html -%{_bindir}/* +%{_bindir}/{,r}nano %config(noreplace) %{_sysconfdir}/nanorc -%{_mandir}/man*/* +%{_mandir}/man1/{,r}nano.1* +%{_mandir}/man5/nanorc.5* %{_infodir}/nano.info* %{_datadir}/nano @@ -132,6 +133,11 @@ install -Dpm 0644 %{SOURCE13} %{buildroot}%{_datadir}/fish/vendor_conf.d/%{basen %changelog +* Wed Jan 18 2023 Lukáš Zaoral - 7.2-1 +- Update to 7.2 (rhbz#2161916) +- Do not use %%{_bindir}/* and %%{_mandir}/* as suggested by the packaging + guidelines. + * Wed Dec 14 2022 Lukáš Zaoral - 7.1-1 - new upstream release (#2153268) diff --git a/sources b/sources index 5da95ce..2dd8566 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nano-7.1.tar.xz.asc) = 3bef2276d63db69e33f71fdf4939c9435c5f48c204dbd59b1f591ad7728f9387968a328f03da5b8eb3b7e2f45f0b6f8e2a0d53e0ec9072e2fac7565219b3a92f -SHA512 (nano-7.1.tar.xz) = e3226df636d3ae1d94e2907ce8bbdb8de69eb45afd02fb1c83e275a1dcc288081809041adbfdade35a580bcb9f9632d21a45d764b43d22b3e4cfd87c7757c4e0 +SHA512 (nano-7.2.tar.xz.asc) = 3ba3921c892ab3121cfe86ff37ab709c592d49524624c132fa32e22129b988ce5c6cac28f6b2fa7f1967ab3799dbc1652695c92ea91c576c378c2a2302b0f7b8 +SHA512 (nano-7.2.tar.xz) = a6dfa70edab62e439a9a998ca214f2415d57dbdc01766ad2e4b14048836557a32755f8b09de13c6a89023f215b61d2854017b389eae8d097ca6f3ba73ce2f583 From 0b0a8356b365a35a13e1c319681e8e0a0d23707d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 21:13:41 +0000 Subject: [PATCH 04/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- nano.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nano.spec b/nano.spec index d8f77aa..5bf3318 100644 --- a/nano.spec +++ b/nano.spec @@ -8,7 +8,7 @@ Summary: A small text editor Name: nano Version: 7.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ URL: https://www.nano-editor.org @@ -133,6 +133,9 @@ install -Dpm 0644 %{SOURCE13} %{buildroot}%{_datadir}/fish/vendor_conf.d/%{basen %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 7.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Jan 18 2023 Lukáš Zaoral - 7.2-1 - Update to 7.2 (rhbz#2161916) - Do not use %%{_bindir}/* and %%{_mandir}/* as suggested by the packaging From ced6d3ee64066dd3234b959436bc4948b1b25619 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= Date: Tue, 21 Mar 2023 16:11:11 +0100 Subject: [PATCH 05/19] migrate to SPDX license --- nano.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nano.spec b/nano.spec index 5bf3318..bd67670 100644 --- a/nano.spec +++ b/nano.spec @@ -8,8 +8,8 @@ Summary: A small text editor Name: nano Version: 7.2 -Release: 2%{?dist} -License: GPLv3+ +Release: 3%{?dist} +License: GPL-3.0-or-later URL: https://www.nano-editor.org Source0: https://www.nano-editor.org/dist/latest/%{name}-%{version}.tar.xz @@ -133,6 +133,9 @@ install -Dpm 0644 %{SOURCE13} %{buildroot}%{_datadir}/fish/vendor_conf.d/%{basen %changelog +* Tue Mar 21 2023 Lukáš Zaoral - 7.2-3 +- migrated to SPDX license + * Thu Jan 19 2023 Fedora Release Engineering - 7.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From ae84fae0c8c25341a909eedab3ab5cbb95acd504 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 16:17:31 +0000 Subject: [PATCH 06/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- nano.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nano.spec b/nano.spec index bd67670..9297826 100644 --- a/nano.spec +++ b/nano.spec @@ -8,7 +8,7 @@ Summary: A small text editor Name: nano Version: 7.2 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL-3.0-or-later URL: https://www.nano-editor.org @@ -133,6 +133,9 @@ install -Dpm 0644 %{SOURCE13} %{buildroot}%{_datadir}/fish/vendor_conf.d/%{basen %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 7.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Mar 21 2023 Lukáš Zaoral - 7.2-3 - migrated to SPDX license From 21f2aa80fa368ea05588d0d201e3ff21c6981980 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 09:12:09 +0000 Subject: [PATCH 07/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- nano.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nano.spec b/nano.spec index 9297826..dfedc16 100644 --- a/nano.spec +++ b/nano.spec @@ -8,7 +8,7 @@ Summary: A small text editor Name: nano Version: 7.2 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL-3.0-or-later URL: https://www.nano-editor.org @@ -133,6 +133,9 @@ install -Dpm 0644 %{SOURCE13} %{buildroot}%{_datadir}/fish/vendor_conf.d/%{basen %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 7.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Jul 20 2023 Fedora Release Engineering - 7.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 79ad8577efd06cea1136a6aff638e5b6f005d820 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 08:36:22 +0000 Subject: [PATCH 08/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- nano.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nano.spec b/nano.spec index dfedc16..3b3b548 100644 --- a/nano.spec +++ b/nano.spec @@ -8,7 +8,7 @@ Summary: A small text editor Name: nano Version: 7.2 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL-3.0-or-later URL: https://www.nano-editor.org @@ -133,6 +133,9 @@ install -Dpm 0644 %{SOURCE13} %{buildroot}%{_datadir}/fish/vendor_conf.d/%{basen %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 7.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 7.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From af8d44ce1212483795e28797141530ed299a9bb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= Date: Thu, 2 May 2024 10:09:43 +0200 Subject: [PATCH 09/19] rebase to latest upstream version Resolves: rhbz#2278126 --- .gitignore | 4 ++-- nano.spec | 7 +++++-- sources | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 1fe7111..4de06d8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -/nano-[3-7].*.tar.xz -/nano-[3-7].*.tar.xz.asc +/nano-[3-8].*.tar.xz +/nano-[3-8].*.tar.xz.asc diff --git a/nano.spec b/nano.spec index 3b3b548..30fd8ac 100644 --- a/nano.spec +++ b/nano.spec @@ -7,8 +7,8 @@ Summary: A small text editor Name: nano -Version: 7.2 -Release: 6%{?dist} +Version: 8.0 +Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.nano-editor.org @@ -133,6 +133,9 @@ install -Dpm 0644 %{SOURCE13} %{buildroot}%{_datadir}/fish/vendor_conf.d/%{basen %changelog +* Thu May 02 2024 Lukáš Zaoral - 8.0-1 +- rebase to latest upstream version (rhbz#2278126) + * Thu Jan 25 2024 Fedora Release Engineering - 7.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 2dd8566..0401079 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nano-7.2.tar.xz.asc) = 3ba3921c892ab3121cfe86ff37ab709c592d49524624c132fa32e22129b988ce5c6cac28f6b2fa7f1967ab3799dbc1652695c92ea91c576c378c2a2302b0f7b8 -SHA512 (nano-7.2.tar.xz) = a6dfa70edab62e439a9a998ca214f2415d57dbdc01766ad2e4b14048836557a32755f8b09de13c6a89023f215b61d2854017b389eae8d097ca6f3ba73ce2f583 +SHA512 (nano-8.0.tar.xz.asc) = a9208b0e4e5a54c9f13e7dd2ba4cad4b4542aff25230825faafe1e5149c1da7be3e615ab85ab5090ee7d97076e36963c2792ee06a8f10f7f4df46f7e8d2101e5 +SHA512 (nano-8.0.tar.xz) = 86c484428b8805768fd580d0f62aa32ce8f588f4beedcdd35a4014506b562928c7a2fa6487aa0d853b4c9c1639a4d186f46b4e96721568ff81191d5098403ca8 From cdde5d559c99e8c9565a9432db98853e720d10db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= Date: Thu, 18 Jul 2024 10:05:31 +0200 Subject: [PATCH 10/19] rebase to latest upstream release Resolves: rhbz#2297610 --- nano.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nano.spec b/nano.spec index 30fd8ac..0a67f91 100644 --- a/nano.spec +++ b/nano.spec @@ -7,7 +7,7 @@ Summary: A small text editor Name: nano -Version: 8.0 +Version: 8.1 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.nano-editor.org @@ -133,6 +133,9 @@ install -Dpm 0644 %{SOURCE13} %{buildroot}%{_datadir}/fish/vendor_conf.d/%{basen %changelog +* Thu Jul 18 2024 Lukáš Zaoral - 8.1-1 +- rebase to latest upstream release (rhbz#2297610) + * Thu May 02 2024 Lukáš Zaoral - 8.0-1 - rebase to latest upstream version (rhbz#2278126) diff --git a/sources b/sources index 0401079..bfaf66c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nano-8.0.tar.xz.asc) = a9208b0e4e5a54c9f13e7dd2ba4cad4b4542aff25230825faafe1e5149c1da7be3e615ab85ab5090ee7d97076e36963c2792ee06a8f10f7f4df46f7e8d2101e5 -SHA512 (nano-8.0.tar.xz) = 86c484428b8805768fd580d0f62aa32ce8f588f4beedcdd35a4014506b562928c7a2fa6487aa0d853b4c9c1639a4d186f46b4e96721568ff81191d5098403ca8 +SHA512 (nano-8.1.tar.xz.asc) = 257bc2ca26bd46f929be45fbe6fa2dddc75eaf2fe973211e2778a44fd3bea1768b2af855adaa2959e3a982f4715805a8f30262f715b26bbf2ede3e4e50145cac +SHA512 (nano-8.1.tar.xz) = cb7d696bd18322ba1e713282e3156934e2c7f2a8abc17c99b2d5ae91fa40ea1478758853d4ad391f72039f01cfe0db79fd7302f3e67ed2afeff3a447b6f975ec From 0160cdf3b2e0556eb703aa0dcaaf89b477649a71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= Date: Thu, 5 Sep 2024 12:58:49 +0200 Subject: [PATCH 11/19] rebase to latest upstream release Resolves: rhbz#2310179 --- nano.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nano.spec b/nano.spec index 0a67f91..dc98f09 100644 --- a/nano.spec +++ b/nano.spec @@ -7,7 +7,7 @@ Summary: A small text editor Name: nano -Version: 8.1 +Version: 8.2 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.nano-editor.org @@ -133,6 +133,9 @@ install -Dpm 0644 %{SOURCE13} %{buildroot}%{_datadir}/fish/vendor_conf.d/%{basen %changelog +* Thu Sep 05 2024 Lukáš Zaoral - 8.2-1 +- rebase to latest upstream release (rhbz#2310179) + * Thu Jul 18 2024 Lukáš Zaoral - 8.1-1 - rebase to latest upstream release (rhbz#2297610) diff --git a/sources b/sources index bfaf66c..1979191 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nano-8.1.tar.xz.asc) = 257bc2ca26bd46f929be45fbe6fa2dddc75eaf2fe973211e2778a44fd3bea1768b2af855adaa2959e3a982f4715805a8f30262f715b26bbf2ede3e4e50145cac -SHA512 (nano-8.1.tar.xz) = cb7d696bd18322ba1e713282e3156934e2c7f2a8abc17c99b2d5ae91fa40ea1478758853d4ad391f72039f01cfe0db79fd7302f3e67ed2afeff3a447b6f975ec +SHA512 (nano-8.2.tar.xz.asc) = 8525d87c2e636eca166a46b621118d154c3b5c8e13dbab646fb7817d0c8a390b071e23f6ac92f9027916169a7742faacc15fb9e4e61812b719c08d6ac493f96d +SHA512 (nano-8.2.tar.xz) = 07c69d6894f87cb386afa89e984ded7e11fe7575cf3af1c18237e3b2c00de371015c9ea126e505c7c0e7200f7359d5ae7c3779198e188fbbc617154d09c4ba14 From ca2d15a9329666f0e215b81751778b8980b26007 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= Date: Thu, 2 Jan 2025 12:24:26 +0100 Subject: [PATCH 12/19] rebase to latest upstream version Resolves: rhbz#2333643 --- nano.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nano.spec b/nano.spec index dc98f09..543e203 100644 --- a/nano.spec +++ b/nano.spec @@ -7,7 +7,7 @@ Summary: A small text editor Name: nano -Version: 8.2 +Version: 8.3 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.nano-editor.org @@ -133,6 +133,9 @@ install -Dpm 0644 %{SOURCE13} %{buildroot}%{_datadir}/fish/vendor_conf.d/%{basen %changelog +* Thu Jan 02 2025 Lukáš Zaoral - 8.3-1 +- rebase to latest upstream version (rhbz#2333643) + * Thu Sep 05 2024 Lukáš Zaoral - 8.2-1 - rebase to latest upstream release (rhbz#2310179) diff --git a/sources b/sources index 1979191..d5366ac 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nano-8.2.tar.xz.asc) = 8525d87c2e636eca166a46b621118d154c3b5c8e13dbab646fb7817d0c8a390b071e23f6ac92f9027916169a7742faacc15fb9e4e61812b719c08d6ac493f96d -SHA512 (nano-8.2.tar.xz) = 07c69d6894f87cb386afa89e984ded7e11fe7575cf3af1c18237e3b2c00de371015c9ea126e505c7c0e7200f7359d5ae7c3779198e188fbbc617154d09c4ba14 +SHA512 (nano-8.3.tar.xz.asc) = 3af105c0766a1b1bbde22097d1a5b036e025fb1e726792934280d605b24767c73e03b634b91a9ba37eb79a88ab0f1e06a3a3ac8173a17e77d965eef25b213609 +SHA512 (nano-8.3.tar.xz) = 9f57bb16a30240fdfc8fc31f5a55f681b80dd72de66fa143ef36c59ab696cc672d8fa054f5a4a547324db3deb2fe2f777cd7c1c023b571e2bb36c86a783ff1d6 From 31a86c372c17750c4a05cbef8bde31c8ceae0033 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 19:40:44 +0000 Subject: [PATCH 13/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- nano.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nano.spec b/nano.spec index 543e203..3a07c4b 100644 --- a/nano.spec +++ b/nano.spec @@ -8,7 +8,7 @@ Summary: A small text editor Name: nano Version: 8.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL-3.0-or-later URL: https://www.nano-editor.org @@ -133,6 +133,9 @@ install -Dpm 0644 %{SOURCE13} %{buildroot}%{_datadir}/fish/vendor_conf.d/%{basen %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 8.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jan 02 2025 Lukáš Zaoral - 8.3-1 - rebase to latest upstream version (rhbz#2333643) From 7cb431a87d6123106dacbcd72fb78b0cf2920914 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= Date: Thu, 20 Mar 2025 09:13:07 +0100 Subject: [PATCH 14/19] fix nano syntax highlighting in default nanorc Resolves: rhbz#2353508 --- nano.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/nano.spec b/nano.spec index 3a07c4b..c6eb9bf 100644 --- a/nano.spec +++ b/nano.spec @@ -8,7 +8,7 @@ Summary: A small text editor Name: nano Version: 8.3 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL-3.0-or-later URL: https://www.nano-editor.org @@ -80,8 +80,8 @@ cd build # generate default /etc/nanorc # - set hunspell as the default spell-checker # - enable syntax highlighting by default (#1270712) -sed -e 's/^#.*set speller.*$/set speller "hunspell"/' \ - -e 's|^# \(include "/usr/share/nano/\*.nanorc"\)|\1|' \ +sed -E -e 's/^#.*set speller.*$/set speller "hunspell"/' \ + -e 's|^# (include "?/usr/share/nano/\*.nanorc"?)|\1|' \ %{SOURCE3} doc/sample.nanorc > ./nanorc %install @@ -133,6 +133,9 @@ install -Dpm 0644 %{SOURCE13} %{buildroot}%{_datadir}/fish/vendor_conf.d/%{basen %changelog +* Thu Mar 20 2025 Lukáš Zaoral - 8.3-3 +- fix nano syntax highlighting in default nanorc (rhbz#2353508) + * Fri Jan 17 2025 Fedora Release Engineering - 8.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From b5b5b4645bd9e4151f351783186ee2a5baa0a78b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= Date: Mon, 7 Apr 2025 10:25:13 +0200 Subject: [PATCH 15/19] rebase to latest upstream release Resolves: rhbz#2357699 --- nano.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/nano.spec b/nano.spec index c6eb9bf..8e63de9 100644 --- a/nano.spec +++ b/nano.spec @@ -7,8 +7,8 @@ Summary: A small text editor Name: nano -Version: 8.3 -Release: 3%{?dist} +Version: 8.4 +Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.nano-editor.org @@ -133,6 +133,9 @@ install -Dpm 0644 %{SOURCE13} %{buildroot}%{_datadir}/fish/vendor_conf.d/%{basen %changelog +* Mon Apr 07 2025 Lukáš Zaoral - 8.4-1 +- rebase to latest upstream release (rhbz#2357699) + * Thu Mar 20 2025 Lukáš Zaoral - 8.3-3 - fix nano syntax highlighting in default nanorc (rhbz#2353508) diff --git a/sources b/sources index d5366ac..4d62b76 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nano-8.3.tar.xz.asc) = 3af105c0766a1b1bbde22097d1a5b036e025fb1e726792934280d605b24767c73e03b634b91a9ba37eb79a88ab0f1e06a3a3ac8173a17e77d965eef25b213609 -SHA512 (nano-8.3.tar.xz) = 9f57bb16a30240fdfc8fc31f5a55f681b80dd72de66fa143ef36c59ab696cc672d8fa054f5a4a547324db3deb2fe2f777cd7c1c023b571e2bb36c86a783ff1d6 +SHA512 (nano-8.4.tar.xz.asc) = 4b42309bc70c14f4178301f42b290bf60416c51c4ce5eaddaaa2ef503740a38169e8fd1c12b7d2059b9cd35c2b7f44627622d26f89ee203d7223f769732b627f +SHA512 (nano-8.4.tar.xz) = 1b8258e341a8722114b24af9d4676fbd8a91dc3639786a81bcd192a7b4fbca87581ab8ebe49493dfb3599ae90b59f4df8ae2a4ee0c0c7ccec9a49b563c82f44a From ae5af3c760c393135a15f57dee4312cda648b67f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= Date: Thu, 12 Jun 2025 14:52:17 +0200 Subject: [PATCH 16/19] rebase to latest upstream release Resolves: rhbz#2372436 --- nano.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nano.spec b/nano.spec index 8e63de9..b46d7e7 100644 --- a/nano.spec +++ b/nano.spec @@ -7,7 +7,7 @@ Summary: A small text editor Name: nano -Version: 8.4 +Version: 8.5 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.nano-editor.org @@ -133,6 +133,9 @@ install -Dpm 0644 %{SOURCE13} %{buildroot}%{_datadir}/fish/vendor_conf.d/%{basen %changelog +* Thu Jun 12 2025 Lukáš Zaoral - 8.5-1 +- rebase to latest upstream release (rhbz#2372436) + * Mon Apr 07 2025 Lukáš Zaoral - 8.4-1 - rebase to latest upstream release (rhbz#2357699) diff --git a/sources b/sources index 4d62b76..2852afe 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nano-8.4.tar.xz.asc) = 4b42309bc70c14f4178301f42b290bf60416c51c4ce5eaddaaa2ef503740a38169e8fd1c12b7d2059b9cd35c2b7f44627622d26f89ee203d7223f769732b627f -SHA512 (nano-8.4.tar.xz) = 1b8258e341a8722114b24af9d4676fbd8a91dc3639786a81bcd192a7b4fbca87581ab8ebe49493dfb3599ae90b59f4df8ae2a4ee0c0c7ccec9a49b563c82f44a +SHA512 (nano-8.5.tar.xz.asc) = 20901368fc0c1dda61c7fafa9737bcd979a0ffef28709ab8abb7b04f179e37fb3f66b048494d2c1262110d4005e32c8db070e53abd103dee70b2e6afc8ecc747 +SHA512 (nano-8.5.tar.xz) = d79562b2adbfe165e565b80ab4339e24f4a0ea464a97dfb7dce166df851b514c83e5071d89bee97759c0d6ff7d1fab1da97eaa0e742f3913d5c41a5539a3d8a1 From 6731166f7be19680b25133fd69a251dc1ce26ee4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 22:37:27 +0000 Subject: [PATCH 17/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- nano.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nano.spec b/nano.spec index b46d7e7..1334e38 100644 --- a/nano.spec +++ b/nano.spec @@ -8,7 +8,7 @@ Summary: A small text editor Name: nano Version: 8.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL-3.0-or-later URL: https://www.nano-editor.org @@ -133,6 +133,9 @@ install -Dpm 0644 %{SOURCE13} %{buildroot}%{_datadir}/fish/vendor_conf.d/%{basen %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 8.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jun 12 2025 Lukáš Zaoral - 8.5-1 - rebase to latest upstream release (rhbz#2372436) From 614d05d10330084922085fa1d096c8a6679b61fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= Date: Thu, 21 Aug 2025 09:43:04 +0200 Subject: [PATCH 18/19] rebase to the latest upstream release Resolves: rhbz#2390027 --- nano.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/nano.spec b/nano.spec index 1334e38..8f8c284 100644 --- a/nano.spec +++ b/nano.spec @@ -7,8 +7,8 @@ Summary: A small text editor Name: nano -Version: 8.5 -Release: 2%{?dist} +Version: 8.6 +Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.nano-editor.org @@ -133,6 +133,9 @@ install -Dpm 0644 %{SOURCE13} %{buildroot}%{_datadir}/fish/vendor_conf.d/%{basen %changelog +* Thu Aug 21 2025 Lukáš Zaoral - 8.6-1 +- rebase to the latest upstream release (rhbz#2390027) + * Thu Jul 24 2025 Fedora Release Engineering - 8.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/sources b/sources index 2852afe..c053cf7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nano-8.5.tar.xz.asc) = 20901368fc0c1dda61c7fafa9737bcd979a0ffef28709ab8abb7b04f179e37fb3f66b048494d2c1262110d4005e32c8db070e53abd103dee70b2e6afc8ecc747 -SHA512 (nano-8.5.tar.xz) = d79562b2adbfe165e565b80ab4339e24f4a0ea464a97dfb7dce166df851b514c83e5071d89bee97759c0d6ff7d1fab1da97eaa0e742f3913d5c41a5539a3d8a1 +SHA512 (nano-8.6.tar.xz.asc) = 188886835724ec11236228c9be526602d2cb5c4aa5b01efe23451698fe01c2b296a2c6b9521342f77c46c528356cbb2ab82b5f532b8a360b73490b4883b635c0 +SHA512 (nano-8.6.tar.xz) = f783c59d2fb47e121c63779c4ce8c6d5e90c31184ca28449c6c9270933d02e19ee60d29b6c9a1122fe59de1132d56d9e402cc63fc88f847cea2b4af6302524ea From 67f433bce86d9d447da8a289ae6df70bc00e2399 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= Date: Wed, 26 Nov 2025 14:57:03 +0100 Subject: [PATCH 19/19] rebase to latest upstream release Resolves: rhbz#2414527 --- nano-8.7-gnulib-c23.patch | 140 ++++++++++++++++++++++++++++++++++++++ nano.spec | 14 +++- sources | 4 +- 3 files changed, 153 insertions(+), 5 deletions(-) create mode 100644 nano-8.7-gnulib-c23.patch diff --git a/nano-8.7-gnulib-c23.patch b/nano-8.7-gnulib-c23.patch new file mode 100644 index 0000000..8e8380c --- /dev/null +++ b/nano-8.7-gnulib-c23.patch @@ -0,0 +1,140 @@ +From c028b6f1804a8fef398d7642d8ccb7d8f73150fb Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Sun, 23 Nov 2025 00:50:40 -0800 +Subject: [PATCH] Port to C23 qualifier-generic fns like strchr +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This ports Gnulib to strict C23 platforms that reject code +like ‘char *q = strchr (P, 'x');’ when P is a pointer to const, +because in C23 strchr is a qualifier-generic function so +strchr (P, 'x') returns char const *. +This patch does not attempt to do the following two things, +which might be useful in the future: +1. When compiling on non-C23 platforms, check user code for +portability to platforms that define qualifier-generic functions. +2. Port Gnulib to platforms that have qualifier-generic functions +not listed in the C23 standard, e.g., strchrnul. I don’t know +of any such platforms. +* lib/c++defs.h (_GL_FUNCDECL_SYS_NAME): New macro. +* lib/c++defs.h (_GL_FUNCDECL_SYS): +* lib/stdlib.in.h (bsearch): +Use it, to prevent C23 names like strchr from acting like macros. +* lib/string.in.h (memchr, strchr, strpbrk, strrchr): +Do not #undef when GNULIB_POSIXCHECK is defined, as this could +cause conforming C23 code to fail to conform. It’s not clear why +_GL_WARN_ON_USE_CXX; perhaps it was needed but isn’t any more? +But for now, limit the removal of #undef to these four functions +where #undeffing is clearly undesirable in C23. +* lib/wchar.in.h (wmemchr): Parenthesize function name in decl, +to prevent it from acting like a macro. + +Cherry-picked-by: Lukáš Zaoral +Upstream-commit: df17f4f37ed3ca373d23ad42eae51122bdb96626 +--- + lib/c++defs.h | 12 +++++++++++- + lib/stdlib.in.h | 6 +++--- + lib/string.in.h | 4 ---- + lib/wchar.in.h | 2 +- + 4 files changed, 15 insertions(+), 9 deletions(-) + +diff --git a/lib/c++defs.h b/lib/c++defs.h +index b77979a..7384457 100644 +--- a/lib/c++defs.h ++++ b/lib/c++defs.h +@@ -127,6 +127,16 @@ + #define _GL_FUNCDECL_RPL_1(rpl_func,rettype,parameters,...) \ + _GL_EXTERN_C_FUNC __VA_ARGS__ rettype rpl_func parameters + ++/* _GL_FUNCDECL_SYS_NAME (func) expands to plain func if C++, and to ++ parenthsized func otherwise. Parenthesization is needed in C23 if ++ the function is like strchr and so is a qualifier-generic macro ++ that expands to something more complicated. */ ++#ifdef __cplusplus ++# define _GL_FUNCDECL_SYS_NAME(func) func ++#else ++# define _GL_FUNCDECL_SYS_NAME(func) (func) ++#endif ++ + /* _GL_FUNCDECL_SYS (func, rettype, parameters, [attributes]); + declares the system function, named func, with the given prototype, + consisting of return type, parameters, and attributes. +@@ -139,7 +149,7 @@ + _GL_FUNCDECL_SYS (posix_openpt, int, (int flags), _GL_ATTRIBUTE_NODISCARD); + */ + #define _GL_FUNCDECL_SYS(func,rettype,parameters,...) \ +- _GL_EXTERN_C_FUNC __VA_ARGS__ rettype func parameters ++ _GL_EXTERN_C_FUNC __VA_ARGS__ rettype _GL_FUNCDECL_SYS_NAME (func) parameters + + /* _GL_CXXALIAS_RPL (func, rettype, parameters); + declares a C++ alias called GNULIB_NAMESPACE::func +diff --git a/lib/stdlib.in.h b/lib/stdlib.in.h +index bef0aaa..fd0e1e0 100644 +--- a/lib/stdlib.in.h ++++ b/lib/stdlib.in.h +@@ -224,9 +224,9 @@ _GL_INLINE_HEADER_BEGIN + + /* Declarations for ISO C N3322. */ + #if defined __GNUC__ && __GNUC__ >= 15 && !defined __clang__ +-_GL_EXTERN_C void *bsearch (const void *__key, +- const void *__base, size_t __nmemb, size_t __size, +- int (*__compare) (const void *, const void *)) ++_GL_EXTERN_C void *_GL_FUNCDECL_SYS_NAME (bsearch) ++ (const void *__key, const void *__base, size_t __nmemb, size_t __size, ++ int (*__compare) (const void *, const void *)) + _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3) _GL_ARG_NONNULL ((5)); + _GL_EXTERN_C void qsort (void *__base, size_t __nmemb, size_t __size, + int (*__compare) (const void *, const void *)) +diff --git a/lib/string.in.h b/lib/string.in.h +index fdcdd21..8b56acf 100644 +--- a/lib/string.in.h ++++ b/lib/string.in.h +@@ -409,7 +409,6 @@ _GL_CXXALIASWARN1 (memchr, void const *, + _GL_CXXALIASWARN (memchr); + # endif + #elif defined GNULIB_POSIXCHECK +-# undef memchr + /* Assume memchr is always declared. */ + _GL_WARN_ON_USE (memchr, "memchr has platform-specific bugs - " + "use gnulib module memchr for portability" ); +@@ -674,7 +673,6 @@ _GL_WARN_ON_USE (stpncpy, "stpncpy is unportable - " + #if defined GNULIB_POSIXCHECK + /* strchr() does not work with multibyte strings if the locale encoding is + GB18030 and the character to be searched is a digit. */ +-# undef strchr + /* Assume strchr is always declared. */ + _GL_WARN_ON_USE_CXX (strchr, + const char *, char *, (const char *, int), +@@ -981,7 +979,6 @@ _GL_CXXALIASWARN (strpbrk); + Even in this simple case, it does not work with multibyte strings if the + locale encoding is GB18030 and one of the characters to be searched is a + digit. */ +-# undef strpbrk + _GL_WARN_ON_USE_CXX (strpbrk, + const char *, char *, (const char *, const char *), + "strpbrk cannot work correctly on character strings " +@@ -1011,7 +1008,6 @@ _GL_WARN_ON_USE (strspn, "strspn cannot work correctly on character strings " + #if defined GNULIB_POSIXCHECK + /* strrchr() does not work with multibyte strings if the locale encoding is + GB18030 and the character to be searched is a digit. */ +-# undef strrchr + /* Assume strrchr is always declared. */ + _GL_WARN_ON_USE_CXX (strrchr, + const char *, char *, (const char *, int), +diff --git a/lib/wchar.in.h b/lib/wchar.in.h +index ab602a2..6be4515 100644 +--- a/lib/wchar.in.h ++++ b/lib/wchar.in.h +@@ -301,7 +301,7 @@ _GL_EXTERN_C int wcsncmp (const wchar_t *__s1, const wchar_t *__s2, size_t __n) + _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3) + _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3); + # ifndef __cplusplus +-_GL_EXTERN_C wchar_t *wmemchr (const wchar_t *__s, wchar_t __wc, size_t __n) ++_GL_EXTERN_C wchar_t *(wmemchr) (const wchar_t *__s, wchar_t __wc, size_t __n) + _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3); + # endif + _GL_EXTERN_C wchar_t *wmemset (wchar_t *__s, wchar_t __wc, size_t __n) +-- +2.52.0 + diff --git a/nano.spec b/nano.spec index 8f8c284..78276d4 100644 --- a/nano.spec +++ b/nano.spec @@ -7,7 +7,7 @@ Summary: A small text editor Name: nano -Version: 8.6 +Version: 8.7 Release: 1%{?dist} License: GPL-3.0-or-later URL: https://www.nano-editor.org @@ -26,10 +26,14 @@ Source11: nano-default-editor.sh Source12: nano-default-editor.csh Source13: nano-default-editor.fish +# gnulib C23 support +# https://github.com/coreutils/gnulib/commit/df17f4f37ed3ca373d23ad42eae51122bdb96626 +Patch: nano-8.7-gnulib-c23.patch + BuildRequires: file-devel BuildRequires: gettext-devel BuildRequires: gcc -BuildRequires: git +BuildRequires: git-core BuildRequires: gnupg2 BuildRequires: groff BuildRequires: make @@ -68,7 +72,7 @@ who don't have nano as a default editor during upgrade. %prep %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' -%autosetup -S git +%autosetup -S git_am %build mkdir build @@ -133,6 +137,10 @@ install -Dpm 0644 %{SOURCE13} %{buildroot}%{_datadir}/fish/vendor_conf.d/%{basen %changelog +* Wed Nov 26 2025 Lukáš Zaoral - 8.7-1 +- require only git-core which is already sufficient for %%autosetup -S git_am +- rebase to latest upstream release (rhbz#2414527) + * Thu Aug 21 2025 Lukáš Zaoral - 8.6-1 - rebase to the latest upstream release (rhbz#2390027) diff --git a/sources b/sources index c053cf7..3c344f6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nano-8.6.tar.xz.asc) = 188886835724ec11236228c9be526602d2cb5c4aa5b01efe23451698fe01c2b296a2c6b9521342f77c46c528356cbb2ab82b5f532b8a360b73490b4883b635c0 -SHA512 (nano-8.6.tar.xz) = f783c59d2fb47e121c63779c4ce8c6d5e90c31184ca28449c6c9270933d02e19ee60d29b6c9a1122fe59de1132d56d9e402cc63fc88f847cea2b4af6302524ea +SHA512 (nano-8.7.tar.xz.asc) = b525ae9bdd69eae326c364ffd76a03592f4012132fdbff061ec804741857f6cb7428ffa4ebb65ab584a3eb1ce310bf9865d4ad2f73b11d2b156b55bd2ade23c1 +SHA512 (nano-8.7.tar.xz) = 0aac5b1708b05a882cba57f718154e42a6cd8a57f1e1c13c76598fe85645c49703f0c17d2e650da90348eb60c2bdbe349925415b6511c27e5b1bea77d107ab37