From c1da243e3a8d53b180218d891bd13fc8d1e94ef9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Mon, 22 Aug 2022 15:02:38 +0100 Subject: [PATCH] latest release --- .gitignore | 2 +- 0001-invalid-read-memory-access-624.patch | 25 ----------------------- Werror-format-security.patch | 11 ---------- hunspell.spec | 14 ++++++------- sources | 2 +- 5 files changed, 8 insertions(+), 46 deletions(-) delete mode 100644 0001-invalid-read-memory-access-624.patch delete mode 100644 Werror-format-security.patch diff --git a/.gitignore b/.gitignore index eb11a9d..fa61aab 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/v1.7.0.tar.gz +/hunspell-1.7.1.tar.gz diff --git a/0001-invalid-read-memory-access-624.patch b/0001-invalid-read-memory-access-624.patch deleted file mode 100644 index 66b55e7..0000000 --- a/0001-invalid-read-memory-access-624.patch +++ /dev/null @@ -1,25 +0,0 @@ -From ac938e2ecb48ab4dd21298126c7921689d60571b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Tue, 12 Nov 2019 20:03:15 +0000 -Subject: [PATCH] invalid read memory access #624 - ---- - src/hunspell/suggestmgr.cxx | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/hunspell/suggestmgr.cxx b/src/hunspell/suggestmgr.cxx -index dba084e..c23f165 100644 ---- a/src/hunspell/suggestmgr.cxx -+++ b/src/hunspell/suggestmgr.cxx -@@ -2040,7 +2040,7 @@ int SuggestMgr::leftcommonsubstring( - int l2 = su2.size(); - // decapitalize dictionary word - if (complexprefixes) { -- if (su1[l1 - 1] == su2[l2 - 1]) -+ if (l1 && l2 && su1[l1 - 1] == su2[l2 - 1]) - return 1; - } else { - unsigned short idx = su2.empty() ? 0 : (su2[0].h << 8) + su2[0].l; --- -2.23.0 - diff --git a/Werror-format-security.patch b/Werror-format-security.patch deleted file mode 100644 index 56b06a5..0000000 --- a/Werror-format-security.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/tools/hunspell.cxx 2022-08-02 09:18:13.525748669 +0100 -+++ b/src/tools/hunspell.cxx 2022-08-02 09:18:38.598006933 +0100 -@@ -581,7 +581,7 @@ - #ifdef HAVE_CURSES_H - char* scanline(char* message) { - char input[INPUTLEN]; -- printw(message); -+ printw("%s", message); - echo(); - getnstr(input, INPUTLEN); - noecho(); diff --git a/hunspell.spec b/hunspell.spec index 234f2dd..57ea1c0 100644 --- a/hunspell.spec +++ b/hunspell.spec @@ -2,9 +2,9 @@ Name: hunspell Summary: A spell checker and morphological analyzer library -Version: 1.7.0 -Release: 21%{?dist} -Source: https://github.com/hunspell/hunspell/archive/v%{version}.tar.gz +Version: 1.7.1 +Release: 1%{?dist} +Source: https://github.com/hunspell/hunspell/releases/download/v%{version}/hunspell-%{version}.tar.gz URL: https://github.com/hunspell/hunspell License: LGPLv2+ or GPLv2+ or MPLv1.1 BuildRequires: gcc-c++ @@ -20,9 +20,6 @@ BuildRequires: make Requires: hunspell-en-US Requires: hunspell-filesystem = %{version}-%{release} -Patch0: 0001-invalid-read-memory-access-624.patch -Patch1: Werror-format-security.patch - %description Hunspell is a spell checker and morphological analyzer library and program designed for languages with rich morphology and complex word compounding or @@ -45,8 +42,6 @@ packages. %prep %setup -q -%patch0 -p1 -b .CVE-2019-16707 -%patch1 -p1 -b .Werror-format-security %build autoreconf -vfi @@ -132,6 +127,9 @@ mkdir $RPM_BUILD_ROOT/%{_datadir}/myspell %{_datadir}/myspell %changelog +* Mon Aug 22 2022 Caolán McNamara - 1.7.1-1 +- latest release + * Tue Aug 02 2022 Caolán McNamara - 1.7.0-21 - Resolves: rhbz#2113444 FTBFS diff --git a/sources b/sources index 07935b9..4990421 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.7.0.tar.gz) = 8149b2e8b703a0610c9ca5160c2dfad3cf3b85b16b3f0f5cfcb7ebb802473b2d499e8e2d0a637a97a37a24d62424e82d3880809210d3f043fa17a4970d47c903 +SHA512 (hunspell-1.7.1.tar.gz) = e177fadd39e89abf47c6cec7d12d1976d21af5c924fb62402433af202c07db50156cd9f60ceae44952b05740e76a98548afb7ac12b666a9fa170ef52e6f8e808