diff options
| author | wiz <wiz@pkgsrc.org> | 2020-08-03 11:19:28 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2020-08-03 11:19:28 +0000 |
| commit | d370a109afd2134e93fdf56248be2651fbd522ac (patch) | |
| tree | 4236730b596e8489f40f245917fd56d5c29834dc /textproc/hunspell | |
| parent | a4c74398cff13534d6fee4531d1be2a74ccbb7d3 (diff) | |
| download | pkgsrc-d370a109afd2134e93fdf56248be2651fbd522ac.tar.gz | |
hunspell: fix CVE-2019-16707 using upstream patch
Bump PKGREVISION.
Diffstat (limited to 'textproc/hunspell')
| -rw-r--r-- | textproc/hunspell/Makefile | 4 | ||||
| -rw-r--r-- | textproc/hunspell/distinfo | 3 | ||||
| -rw-r--r-- | textproc/hunspell/patches/patch-src_hunspell_suggestmgr.cxx | 16 |
3 files changed, 20 insertions, 3 deletions
diff --git a/textproc/hunspell/Makefile b/textproc/hunspell/Makefile index c23084992ee..e6f6a049976 100644 --- a/textproc/hunspell/Makefile +++ b/textproc/hunspell/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.31 2019/08/11 13:23:24 wiz Exp $ +# $NetBSD: Makefile,v 1.32 2020/08/03 11:19:28 wiz Exp $ DISTNAME= hunspell-1.7.0 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_GITHUB:=hunspell/} GITHUB_TAG= v${PKGVERSION_NOREV} diff --git a/textproc/hunspell/distinfo b/textproc/hunspell/distinfo index d1b8d2401d1..999d487bb54 100644 --- a/textproc/hunspell/distinfo +++ b/textproc/hunspell/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.12 2018/11/16 13:02:20 bsiegert Exp $ +$NetBSD: distinfo,v 1.13 2020/08/03 11:19:28 wiz Exp $ SHA1 (hunspell-1.7.0.tar.gz) = e42ea8342a191b9cd7da57d0d6ad4ae1566c5dcc RMD160 (hunspell-1.7.0.tar.gz) = 52c7dbf21f460a0b61ea7d0378ef314773887fde @@ -7,4 +7,5 @@ Size (hunspell-1.7.0.tar.gz) = 482156 bytes SHA1 (patch-aa) = 8c6102ddb2e449b6f1abc23f679e0f6f38bfd0b5 SHA1 (patch-ab) = ee127b1d8f55ceefa807c2fa440885b4fa5d029c SHA1 (patch-ac) = c25cdfe80452cb4ca9850354c9fa8581c787c086 +SHA1 (patch-src_hunspell_suggestmgr.cxx) = e1460987dd787720d9783cdf6cd2b060a68d74da SHA1 (patch-src_tools_Makefile.am) = e5f67855c48e04fe12deb90904c9c27e2441a8cf diff --git a/textproc/hunspell/patches/patch-src_hunspell_suggestmgr.cxx b/textproc/hunspell/patches/patch-src_hunspell_suggestmgr.cxx new file mode 100644 index 00000000000..c2e4829e08e --- /dev/null +++ b/textproc/hunspell/patches/patch-src_hunspell_suggestmgr.cxx @@ -0,0 +1,16 @@ +$NetBSD: patch-src_hunspell_suggestmgr.cxx,v 1.1 2020/08/03 11:19:28 wiz Exp $ + +Fix CVE-2019-16707 +https://github.com/hunspell/hunspell/commit/ac938e2ecb48ab4dd21298126c7921689d60571b#diff-783289d6b6330291ec79bf507002106e + +--- src/hunspell/suggestmgr.cxx.orig 2018-11-12 20:38:56.000000000 +0000 ++++ 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; |