Compare commits
10 Commits
92771d3c43
...
a5c36f4542
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a5c36f4542 | ||
|
|
a30a8f1b49 | ||
|
|
6677540e2f | ||
|
|
757298e725 | ||
|
|
20fe3c140a | ||
|
|
cec7564878 | ||
|
|
3063f943f9 | ||
|
|
dce68415f4 | ||
|
|
57dc556c8d | ||
|
|
6825db51a4 |
@ -0,0 +1,29 @@
|
||||
From 52f16d2654a891e72ceb34d34870ec543a62ca68 Mon Sep 17 00:00:00 2001
|
||||
From: Qiang Wei <qiang.wei@suse.com>
|
||||
Date: Tue, 8 Mar 2022 10:43:26 +0800
|
||||
Subject: [PATCH] Add format literal string to resolve g++ issue for
|
||||
format-security.
|
||||
|
||||
In ncruses 6.3 version, if there is no format string in function
|
||||
printw, g++ complaints it with option -Werr=format-security on.
|
||||
|
||||
Signed-off-by: Qiang Wei <qiang.wei@suse.com>
|
||||
---
|
||||
src/tools/hunspell.cxx | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/tools/hunspell.cxx b/src/tools/hunspell.cxx
|
||||
index 690e34a..b165634 100644
|
||||
--- a/src/tools/hunspell.cxx
|
||||
+++ b/src/tools/hunspell.cxx
|
||||
@@ -581,7 +581,7 @@ const char* basename(const char* s, char c) {
|
||||
#ifdef HAVE_CURSES_H
|
||||
char* scanline(char* message) {
|
||||
char input[INPUTLEN];
|
||||
- printw(message);
|
||||
+ printw("%s", message);
|
||||
echo();
|
||||
getnstr(input, INPUTLEN);
|
||||
noecho();
|
||||
--
|
||||
2.26.2
|
||||
22
backport-CVE-2019-16707.patch
Normal file
22
backport-CVE-2019-16707.patch
Normal file
@ -0,0 +1,22 @@
|
||||
From ac938e2ecb48ab4dd21298126c7921689d60571b Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
||||
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 dba084e9..c23f165a 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;
|
||||
@ -1,12 +1,16 @@
|
||||
Name: hunspell
|
||||
Summary: A spell checker and morphological analyzer library
|
||||
Version: 1.7.0
|
||||
Release: 6
|
||||
Release: 11
|
||||
URL: https://github.com/hunspell/hunspell
|
||||
Source: https://github.com/hunspell/hunspell/archive/v%{version}.tar.gz
|
||||
|
||||
Patch1: backport-CVE-2019-16707.patch
|
||||
Patch2: 0001-Add-format-literal-string-to-resolve-g-issue-for-for.patch
|
||||
|
||||
License: LGPLv2+ or GPLv2+ or MPLv1.1
|
||||
BuildRequires: gcc-c++ autoconf automake libtool ncurses-devel gettext
|
||||
BuildRequires: perl-generators words hunspell hunspell-devel gdb
|
||||
BuildRequires: gcc-c++ autoconf automake libtool ncurses-devel gettext-devel
|
||||
BuildRequires: perl-generators words
|
||||
%ifarch %{ix86} x86_64
|
||||
BuildRequires: valgrind
|
||||
%endif
|
||||
@ -55,9 +59,6 @@ make check
|
||||
mkdir $RPM_BUILD_ROOT/%{_datadir}/myspell
|
||||
%find_lang %{name}
|
||||
|
||||
#Include previous ABI version for temporary binary compatibility
|
||||
cp -a %{_libdir}/libhunspell-1.6.so* %{buildroot}%{_libdir}
|
||||
|
||||
%ldconfig_scriptlets
|
||||
|
||||
%files -f %{name}.lang
|
||||
@ -83,6 +84,21 @@ cp -a %{_libdir}/libhunspell-1.6.so* %{buildroot}%{_libdir}
|
||||
%lang(hu) %{_mandir}/hu/man1/hunspell.1.gz
|
||||
|
||||
%changelog
|
||||
* Sat Jul 30 2022 yaoxin <yaoxin30@h-partners.com> - 1.7.0-11
|
||||
- Remove self dependency which is temporary used to resolve compatiable during upgrade.
|
||||
|
||||
* Mon Apr 25 2022 caodongxia<caodongxia@h-partners.com> -1.7.0-10
|
||||
- Add format literal string to resolve g++ issue for format-security.
|
||||
|
||||
* Fri Jan 07 2022 xingxing <xingxing9@huawei.com> - 1.7.0-9
|
||||
- resolve compile fail
|
||||
|
||||
* Wed Jul 21 2021 yushaogui <yushaogui@huawei.com> - 1.7.0-8
|
||||
- delete a buildrequires for gdb
|
||||
|
||||
* Wed Jan 13 2021 jinzhimin <jinzhimin2@huawei.com> - 1.7.0-7
|
||||
- fix CVE-2019-16707
|
||||
|
||||
* Tue Sep 08 2020 zhanzhimin <zhanzhimin@huawei.com> - 1.7.0-6
|
||||
- update source
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user