diff --git a/aspell-0.60.7-mp.patch b/aspell-0.60.7-mp.patch index 4f4e94dc23abb1f7be61d55d7fc80899b8fb8aed..2303ed9154446a9eb2f7aec17e71ed9faa0f4266 100644 --- a/aspell-0.60.7-mp.patch +++ b/aspell-0.60.7-mp.patch @@ -2,10 +2,9 @@ diff --git a/manual/aspell.1 b/manual/aspell.1 index 854debf..b1106ca 100644 --- a/manual/aspell.1 +++ b/manual/aspell.1 -@@ -328,7 +328,6 @@ are also allowed. The \fI/etc/aspell.conf\fR file is a good example of +@@ -328,6 +328,5 @@ are also allowed. The \fI/etc/aspell.conf\fR file is a good example of how to set these options and the Aspell Manual has more detailed info. .SH SEE ALSO - .PP -.BR aspell\-import (1), .BR prezip\-bin (1), .BR run\-with\-aspell (1), @@ -26,9 +25,8 @@ diff --git a/manual/run-with-aspell.1 b/manual/run-with-aspell.1 index 8dea131..67f3117 100644 --- a/manual/run-with-aspell.1 +++ b/manual/run-with-aspell.1 -@@ -28,7 +28,6 @@ such as ispell's own scripts. +@@ -28,6 +28,5 @@ such as ispell's own scripts. .SH SEE ALSO - .PP .BR aspell (1), -.BR aspell\-import (1), .BR word\-list\-compress (1) diff --git a/aspell-0.60.8-CVE-2019-25051.patch b/aspell-0.60.8-CVE-2019-25051.patch deleted file mode 100644 index 043f9e8c6f4d5942ec8be030c99940270ab96c47..0000000000000000000000000000000000000000 --- a/aspell-0.60.8-CVE-2019-25051.patch +++ /dev/null @@ -1,99 +0,0 @@ -From d60fc73a370c64209bd0ae6fc6d002f55be6eac9 Mon Sep 17 00:00:00 2001 -From: Kevin Atkinson -Date: Sat, 21 Dec 2019 20:32:47 +0000 -Subject: [PATCH] objstack: assert that the alloc size will fit within a chunk - to prevent a buffer overflow - -Bug found using OSS-Fuze. ---- - common/objstack.hpp | 18 ++++++++++++++---- - 1 file changed, 14 insertions(+), 4 deletions(-) - -diff --git a/common/objstack.hpp b/common/objstack.hpp -index 3997bf7..bd97ccd 100644 ---- a/common/objstack.hpp -+++ b/common/objstack.hpp -@@ -5,6 +5,7 @@ - #include "parm_string.hpp" - #include - #include -+#include - - namespace acommon { - -@@ -26,6 +27,12 @@ class ObjStack - byte * temp_end; - void setup_chunk(); - void new_chunk(); -+ bool will_overflow(size_t sz) const { -+ return offsetof(Node,data) + sz > chunk_size; -+ } -+ void check_size(size_t sz) { -+ assert(!will_overflow(sz)); -+ } - - ObjStack(const ObjStack &); - void operator=(const ObjStack &); -@@ -56,7 +63,7 @@ public: - void * alloc_bottom(size_t size) { - byte * tmp = bottom; - bottom += size; -- if (bottom > top) {new_chunk(); tmp = bottom; bottom += size;} -+ if (bottom > top) {check_size(size); new_chunk(); tmp = bottom; bottom += size;} - return tmp; - } - // This alloc_bottom will insure that the object is aligned based on the -@@ -66,7 +73,7 @@ public: - align_bottom(align); - byte * tmp = bottom; - bottom += size; -- if (bottom > top) {new_chunk(); goto loop;} -+ if (bottom > top) {check_size(size); new_chunk(); goto loop;} - return tmp; - } - char * dup_bottom(ParmString str) { -@@ -79,7 +86,7 @@ public: - // always be aligned as such. - void * alloc_top(size_t size) { - top -= size; -- if (top < bottom) {new_chunk(); top -= size;} -+ if (top < bottom) {check_size(size); new_chunk(); top -= size;} - return top; - } - // This alloc_top will insure that the object is aligned based on -@@ -88,7 +95,7 @@ public: - {loop: - top -= size; - align_top(align); -- if (top < bottom) {new_chunk(); goto loop;} -+ if (top < bottom) {check_size(size); new_chunk(); goto loop;} - return top; - } - char * dup_top(ParmString str) { -@@ -117,6 +124,7 @@ public: - void * alloc_temp(size_t size) { - temp_end = bottom + size; - if (temp_end > top) { -+ check_size(size); - new_chunk(); - temp_end = bottom + size; - } -@@ -131,6 +139,7 @@ public: - } else { - size_t s = temp_end - bottom; - byte * p = bottom; -+ check_size(size); - new_chunk(); - memcpy(bottom, p, s); - temp_end = bottom + size; -@@ -150,6 +159,7 @@ public: - } else { - size_t s = temp_end - bottom; - byte * p = bottom; -+ check_size(size); - new_chunk(); - memcpy(bottom, p, s); - temp_end = bottom + size; --- -2.31.1 - diff --git a/aspell-0.60.8.tar.gz b/aspell-0.60.8.1.tar.gz similarity index 36% rename from aspell-0.60.8.tar.gz rename to aspell-0.60.8.1.tar.gz index 7e4b7664c20017f471dd66a7730d2812c0a880d8..757d6c563be94a3bd8b98060035e6af1018cc1a0 100644 Binary files a/aspell-0.60.8.tar.gz and b/aspell-0.60.8.1.tar.gz differ diff --git a/aspell.spec b/aspell.spec index b7d8c73ee08ecc434feb7fb8b1d81fc55b9e496d..531381c80bb5976ca119b27976b75a83b5f46102 100644 --- a/aspell.spec +++ b/aspell.spec @@ -1,7 +1,7 @@ -%define anolis_release 3 +%define anolis_release 1 Summary: Spell checker Name: aspell -Version: 0.60.8 +Version: 0.60.8.1 Release: %{anolis_release}%{?dist} Epoch: 12 # LGPLv2+ .. common/gettext.h @@ -10,14 +10,20 @@ Epoch: 12 # modules/speller/default/affix.cpp # GPLv2+ .. ltmain.sh, misc/po-filter.c # BSD .. myspell/munch.c -License: LGPLv2+ and LGPLv2 and GPLv2+ and BSD +License: LGPL-2.0-or-later AND LGPL-2.1-only AND GPL-2.0-or-later AND BSD-2-Clause URL: http://aspell.net/ Source: https://ftp.gnu.org/gnu/aspell/aspell-%{version}.tar.gz Patch0: aspell-0.60.7-fileconflict.patch Patch1: aspell-0.60.7-pspell_conf.patch Patch2: aspell-0.60.7-mp.patch -Patch3: aspell-0.60.8-CVE-2019-25051.patch + +# IMPORTANT +# The reason behind this was that there were no upstream releases for 4 years +# and there are other variants like hunspell or enchant which had active upstream +# FESCo approval is located here: https://pagure.io/fesco/issue/3009 +# Change proposal is located here: https://fedoraproject.org/wiki/Changes/AspellDeprecation +Provides: deprecated() BuildRequires: gcc-c++ BuildRequires: chrpath, gettext, ncurses-devel, pkgconfig, perl-interpreter @@ -37,6 +43,9 @@ dictionaries when more than one Aspell process is open at once. Summary: Libraries and header files for Aspell development Requires: %{name} = %{EVR} +# For details, see above +Provides: deprecated() + %description devel The aspell-devel package includes libraries and header files needed for Aspell development. @@ -131,7 +140,13 @@ rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/aspell-import.1 %{_mandir}/man1/pspell-config.1* %changelog -* Wed Sep 27 2023 Funda Wang - 0.60.9-3 +* Fri Feb 21 2025 Zhao Hang - 0.60.8.1-1 +- Update to 0.60.8.1-1 from 0.60.8-3 +- Remove patch which is already exist in upstream +- Add deprecated description because there were no upstream releases for a long time +- Migrated to SPDX license + +* Wed Sep 27 2023 Funda Wang - 0.60.8-3 - Cleanup spec for loongarch * Mon Jan 09 2023 Kaihao Bai - 0.60.8-2