download.lst | 4 - external/hunspell/0001-invalid-read-memory-access-624.patch | 25 ------------ external/hunspell/UnpackedTarball_hunspell.mk | 1 3 files changed, 2 insertions(+), 28 deletions(-)
New commits: commit 46003cb1c4c770a9ba4eb9b2a55561c2ebeb3519 Author: Caolán McNamara <[email protected]> AuthorDate: Mon Aug 22 15:05:40 2022 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Mon Aug 22 17:57:16 2022 +0200 upgrade to hunspell 1.7.1 Change-Id: Ifff2f17d17ab2764f3703b008fcb096ff08c9315 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138690 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/download.lst b/download.lst index d63387a332a3..b40662993dd2 100644 --- a/download.lst +++ b/download.lst @@ -104,8 +104,8 @@ export HARFBUZZ_SHA256SUM := 2edb95db668781aaa8d60959d21be2ff80085f31b12053cdd66 export HARFBUZZ_TARBALL := harfbuzz-5.1.0.tar.xz export HSQLDB_SHA256SUM := d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370 export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip -export HUNSPELL_SHA256SUM := 57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b90435944ff951 -export HUNSPELL_TARBALL := hunspell-1.7.0.tar.gz +export HUNSPELL_SHA256SUM := b2d9c5369c2cc7f321cb5983fda2dbf007dce3d9e17519746840a6f0c4bf7444 +export HUNSPELL_TARBALL := hunspell-1.7.1.tar.gz export HYPHEN_SHA256SUM := 304636d4eccd81a14b6914d07b84c79ebb815288c76fe027b9ebff6ff24d5705 export HYPHEN_TARBALL := 5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz export ICU_SHA256SUM := 67a7e6e51f61faf1306b6935333e13b2c48abd8da6d2f46ce6adca24b1e21ebf diff --git a/external/hunspell/0001-invalid-read-memory-access-624.patch b/external/hunspell/0001-invalid-read-memory-access-624.patch deleted file mode 100644 index 66b55e7555bd..000000000000 --- a/external/hunspell/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?= <[email protected]> -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/external/hunspell/UnpackedTarball_hunspell.mk b/external/hunspell/UnpackedTarball_hunspell.mk index 1cd24e225868..37a2d196fbf5 100644 --- a/external/hunspell/UnpackedTarball_hunspell.mk +++ b/external/hunspell/UnpackedTarball_hunspell.mk @@ -22,7 +22,6 @@ endif $(eval $(call gb_UnpackedTarball_set_patchlevel,hunspell,1)) $(eval $(call gb_UnpackedTarball_add_patches,hunspell, \ - external/hunspell/0001-invalid-read-memory-access-624.patch \ )) # vim: set noet sw=4 ts=4:
