Gentoo Archives: gentoo-commits

From: Akinori Hattori <hattya@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/chasen/files/, app-text/chasen/
Date: Mon, 22 Nov 2021 14:52:30
Message-Id: 1637592115.c9d4876047a753ba4c8310507136e9220c799a1c.hattya@gentoo
1 commit: c9d4876047a753ba4c8310507136e9220c799a1c
2 Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
3 AuthorDate: Mon Nov 22 14:41:55 2021 +0000
4 Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 22 14:41:55 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9d48760
7
8 app-text/chasen: update to version 2.4.5
9
10 This is the same as the version 2.4.4 with the fix for CVE-2011-4000.
11
12 Package-Manager: Portage-3.0.28, Repoman-3.0.3
13 Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>
14
15 app-text/chasen/Manifest | 2 +-
16 .../{chasen-2.4.4-r3.ebuild => chasen-2.4.5.ebuild} | 4 +---
17 .../chasen/files/chasen-2.4.4-cve-2011-4000.patch | 21 ---------------------
18 3 files changed, 2 insertions(+), 25 deletions(-)
19
20 diff --git a/app-text/chasen/Manifest b/app-text/chasen/Manifest
21 index de495ce1cb55..0a4c5e4b144c 100644
22 --- a/app-text/chasen/Manifest
23 +++ b/app-text/chasen/Manifest
24 @@ -1 +1 @@
25 -DIST chasen-2.4.4.tar.gz 845720 BLAKE2B ae18e71d78588c108f747abc6f28835f90d0a2c84616a01d87acea2ae5e0e54ef6ff296ebb9dbdce9047a223bd34203cf2763e9b3d4fb28522a4add7bc823860 SHA512 4551d28be6c0de7a585decf03cf5b56def3d181cfdfd975565ac7236e2c3e8cc0bcf5331f1ae309a914f95c6715e13ba3e9d80ebbd6e86c2316a43b7ed831075
26 +DIST chasen-2.4.5.tar.xz 671064 BLAKE2B 3b9867f794a54c4b0552807c54694e9f52082d9712c9e64aa55840b70f3a3800a514d1cd36260ee7397d1e98f28909e9b3e1f5c14d64f28f666b876e130aeb3e SHA512 7a17fe9d534cdc07c147fd7d9350aba381390943f4cfd899393076efe8e6a80aae029a8d4833e91ffa945b3e52d6598c16db257c9cc8d7792b7a1f90b7a1948e
27
28 diff --git a/app-text/chasen/chasen-2.4.4-r3.ebuild b/app-text/chasen/chasen-2.4.5.ebuild
29 similarity index 89%
30 rename from app-text/chasen/chasen-2.4.4-r3.ebuild
31 rename to app-text/chasen/chasen-2.4.5.ebuild
32 index 2e8a2e5f4013..48d64ea7ef9a 100644
33 --- a/app-text/chasen/chasen-2.4.4-r3.ebuild
34 +++ b/app-text/chasen/chasen-2.4.5.ebuild
35 @@ -7,7 +7,7 @@ inherit perl-module
36
37 DESCRIPTION="Japanese Morphological Analysis System, ChaSen"
38 HOMEPAGE="https://chasen-legacy.osdn.jp/"
39 -SRC_URI="mirror://sourceforge.jp/${PN}-legacy/32224/${P}.tar.gz"
40 +SRC_URI="mirror://sourceforge.jp/${PN}-legacy/56305/${P}.tar.xz"
41
42 LICENSE="BSD"
43 SLOT="0"
44 @@ -18,8 +18,6 @@ RDEPEND="virtual/libiconv"
45 DEPEND=">=dev-libs/darts-0.32"
46 PDEPEND=">=app-dicts/ipadic-2.7.0"
47
48 -PATCHES=( "${FILESDIR}"/${P}-cve-2011-4000.patch )
49 -
50 src_configure() {
51 econf $(use_enable static-libs static)
52
53
54 diff --git a/app-text/chasen/files/chasen-2.4.4-cve-2011-4000.patch b/app-text/chasen/files/chasen-2.4.4-cve-2011-4000.patch
55 deleted file mode 100644
56 index 61480622e40a..000000000000
57 --- a/app-text/chasen/files/chasen-2.4.4-cve-2011-4000.patch
58 +++ /dev/null
59 @@ -1,21 +0,0 @@
60 -diff --git a/lib/chalib.c b/lib/chalib.c
61 -index 5d79e13..cddf51b 100644
62 ---- a/lib/chalib.c
63 -+++ b/lib/chalib.c
64 -@@ -306,9 +306,14 @@ chasen_sparse_main(char *input, FILE *output)
65 - */
66 - while (*input) {
67 - int c = 0, len, cursor;
68 -- if ((crlf = strpbrk(input, "\r\n")) == NULL)
69 -+ if ((crlf = strpbrk(input, "\r\n")) == NULL) {
70 - len = strlen(input);
71 -- else {
72 -+ if (len >= CHA_INPUT_SIZE) {
73 -+ len = CHA_INPUT_SIZE - 1;
74 -+ crlf = input + CHA_INPUT_SIZE - 2;
75 -+ c = 0;
76 -+ }
77 -+ } else {
78 - len = crlf - input;
79 - c = *crlf;
80 - *crlf = '\0';