Add security fix. #390769

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

4 files changed, 109 insertions, 16 deletions

diff --git a/app-text/chasen/ChangeLog b/app-text/chasen/ChangeLog
index 4ed9bbfd1d1b..6a10f5de2211 100644
--- a/app-text/chasen/ChangeLog
+++ b/app-text/chasen/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/chasen
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/chasen/ChangeLog,v 1.42 2011/09/02 14:36:51 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/chasen/ChangeLog,v 1.43 2011/12/18 06:30:57 naota Exp $
+
+*chasen-2.4.4-r2 (18 Dec 2011)
+
+  18 Dec 2011; Naohiro Aota <naota@gentoo.org> +chasen-2.4.4-r2.ebuild,
+  +files/chasen-2.4.4-cve-2011-4000.patch:
+  Add security fix. #390769
 
 *chasen-2.4.4-r1 (02 Sep 2011)
 
diff --git a/app-text/chasen/Manifest b/app-text/chasen/Manifest
index 4ee8b5a4f18c..eaaeb9adf126 100644
--- a/app-text/chasen/Manifest
+++ b/app-text/chasen/Manifest
@@ -1,27 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+AUX chasen-2.4.4-cve-2011-4000.patch 559 RMD160 f5ef2a427fd8f1d83be3f8c4df780e4d7a25fccd SHA1 00ba85fa737376b875425a2d87772a2aa3b8dc95 SHA256 7debf023179cb2c47e2a1245288c225a03dec917e9937c0e3547f9a7b5ac447a
 DIST chasen-2.4.0.tar.gz 860011 RMD160 927dd61298ad3d605e39c09bd0d65ac439ab2d22 SHA1 19ba6a350189c4a678bcf66b5a24282e954609c0 SHA256 56f796f9ac8aca31ca2d9d051b7637b2aca6007cefa53da03041995daee5246c
 DIST chasen-2.4.4.tar.gz 845720 RMD160 ceb4a7c064ba5bf0d356d6db0e64b644b88dbc54 SHA1 3328e6667d6b74955b6c4b1b49a7d97805e4de8c SHA256 09e41f681097f87ba6c953d3724c34c1826c3cfa590898a2166fb310a006f932
 EBUILD chasen-2.4.0.ebuild 1049 RMD160 28d1a05358963ef70387d145cd076ea58eb8b716 SHA1 27b36db4a2c8f92db21f4c597983d13c5ed07d65 SHA256 7732687db600550b024b236e5349b79c87681f431af851335ffd1bd41e705fca
 EBUILD chasen-2.4.4-r1.ebuild 1243 RMD160 bd829e85caf0c6991ed80980bac6df84c9c8dd47 SHA1 85d85420d5c86241a77c4c9b54f678f38d312074 SHA256 6573ba4a90e5685152449a2806d3a663f266cb5d8e386d4ecf5af0f79a097af0
+EBUILD chasen-2.4.4-r2.ebuild 1308 RMD160 cc6bca297a3a3144f7c7b702c8d89ea791d0444a SHA1 9d5018705490bd7025f7bd2a030ee2a54498ad4d SHA256 ce32fc67b411ff383691ff1fe8a2bdc95bbede35680ce4fb510341f6a545220f
 EBUILD chasen-2.4.4.ebuild 930 RMD160 5598a99174ce05e1e0ed165a479e0a195088613a SHA1 571edba1937ea840cf90734755451971bfc13249 SHA256 6f0813c8f10952b9a8dcff2e227b9ee0e3c56fc593f7ab001c26b55bdde5be84
-MISC ChangeLog 5633 RMD160 9e555dbb2712416d2eeb05dfc4d9725e8f439e8b SHA1 086717332a7d3bc4573cfd63a58a4add550ddcb0 SHA256 b58151d448ee580f8d60e020ebc5a55ac725d9168bb130716cb12d240d7be85a
+MISC ChangeLog 5808 RMD160 5f5caf06840d38f586989d920afd5634b8b52678 SHA1 bd7e4414c6a45f4c117edea26423c2cc4e417700 SHA256 52af1d9300c6843d764d81ad1f884d6a4212ef1e0b2852a6f73f79a72fa15466
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOYOoJAAoJECaGw+YFKA1pbp0QAJaFXtuRfFewSPVqYTThrx+Y
-gzzHkHLUW/uWYhkx4HvC/705cx6RujNFcinJKc84VScjVRL5FP/3izAvAbOFNcig
-h2q/GncYXdq9xWNbwD7lxSXYecj004ukB1znoHKDJKECwiujn6VwAp/gAha3Y9no
-wNwIlFuOWAEJ+4WZh2V0K5/AoVd2dbfGi3Wdq5rTlucGzNtC1AbaNNw2/RZKfkW8
-yVG2eBJMJ6aMwxLY3u49r5l17c2L1Lms29210YuaLX1wStS3TXMXYeavGpd2MFNj
-/PynxcM26V+d0OqlN4uRLogFhtF9ckO6o7jzFcX4ihSnAC5SAo0fyACssyYty3+u
-LZrWshSS5fWb8C6fmnz1FHItclAEGu3OncpCZKYvK2GyW6nF+wKRcoHoaICR+Lgc
-i0CYKGx3xlWa6nzxgR8RVL+amTKbN5k0nTWlkCXowPd1xko1D5+S1ZsaEJIiBazB
-pi6ElK6SC2WzyGS/zri8YdUZSA4AXBbORDOfNv7SOp/sSmKl0dQ8PinmO88HnJ33
-7qcJEJc/cR5VFnxrSW8sHxzUslj+g/op5Jpw+nnhEruoP8R9WOwQY3dbnpECdBB1
-bEeLkbHmNdGZlIbakC7rWp4/8wrjCucRlz/Qt2Qn3wGpTDR2+otqRj7XsjI7wD4h
-/VNzCtUXzGeIL5x4S7YV
-=y5c/
+iQIcBAEBCAAGBQJO7YijAAoJEDYO1FT4VRUU9AoP/1uN71tvOC6EaFsZi3wAuFi3
+xee1/nsIrhW8ig4/bukPp4A5UckVXMzrYXPb1c8A6m/wyDxcnHHQTRbXIQ0Wha4t
+tIGfAEvPbbZY7kXqjdY2L/6ylokEiayMKK9BrXCMA74K/+EHRl9uMHgON5DHkDU6
+ug8UGRaKtJeYvYOJTZHRyM5srX08OexaPggaw6BCpfNpNq+9pmbQ4+sSxhyyJyK/
+t6aHRdHhvPsgdhwnc/aHusBRHWKtJkLYoqWWeFLm/AoKQQpUJ3Do2VaB1Fwjbi+3
+li2Nx6w/ahHPQLWzulGwRt+dyz8rhYlkKWKv/hlZWNI5Cp/OJSH4bFhA8jacrLoj
+O6D9aQNjRLUBdsoODw9O/wIS+uAIbb1exCtsgHF2MIgqjLlFai7oWsYOtDtbl8Zp
+8ZSMnuAO94hmSLVYslQH3mkvExxEWChMUT8mjmkE0tq18MA7rQoA7qLvB2wW8KtW
+at0BqwpOx09MWs9RpPzR+gm0KzUI9jn3grVqlpOQNyCX6rOjEr0H84uqk4Wcm9Og
+cNfffw9kxNQ4Lcp8WljyCF/aqACd3XbH9U3e1UW8WLNB9KrvZK88n4DFZyk1ywEZ
+VtXyfOi2IB7pFgxlDuJ4NK/LOzkAmyfFrkxKvzNo/brTT76CJm8wlz7sKhapdMTa
+pqc+GZqROsPKjjHG0LsR
+=ZqN4
 -----END PGP SIGNATURE-----
diff --git a/app-text/chasen/chasen-2.4.4-r2.ebuild b/app-text/chasen/chasen-2.4.4-r2.ebuild
new file mode 100644
index 000000000000..f7ad6612f5ca
--- /dev/null
+++ b/app-text/chasen/chasen-2.4.4-r2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/chasen/chasen-2.4.4-r2.ebuild,v 1.1 2011/12/18 06:30:57 naota Exp $
+
+EAPI="4"
+inherit perl-module
+
+DESCRIPTION="Japanese Morphological Analysis System, ChaSen"
+HOMEPAGE="http://chasen-legacy.sourceforge.jp/"
+SRC_URI="mirror://sourceforge.jp//chasen-legacy/32224/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~sparc-solaris"
+IUSE="perl static-libs"
+
+DEPEND=">=dev-libs/darts-0.32"
+RDEPEND="${DEPEND}
+	perl? ( !dev-perl/Text-ChaSen )"
+PDEPEND=">=app-dicts/ipadic-2.7.0"
+
+src_preapre() {
+	epatch "${FILESDIR}"/${P}-cve-2011-4000.patch
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+	if use perl ; then
+		cd "${S}"/perl
+		perl-module_src_configure
+	fi
+}
+
+src_compile() {
+	emake || die
+	if use perl ; then
+		cd "${S}"/perl
+		perl-module_src_compile
+	fi
+}
+
+src_test() {
+	emake check || die
+	if use perl ; then
+		cd "${S}"/perl
+		perl-module_src_test
+	fi
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die
+
+	dodoc AUTHORS ChangeLog NEWS README
+
+	if use perl ; then
+		cd "${S}"/perl
+		perl-module_src_install
+		newdoc README README.perl
+	fi
+
+	if ! use static-libs ; then
+		find "${ED}" -name '*.la' -delete
+	fi
+}
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
new file mode 100644
index 000000000000..61480622e40a
--- /dev/null
+++ b/app-text/chasen/files/chasen-2.4.4-cve-2011-4000.patch
@@ -0,0 +1,21 @@
+diff --git a/lib/chalib.c b/lib/chalib.c
+index 5d79e13..cddf51b 100644
+--- a/lib/chalib.c
++++ b/lib/chalib.c
+@@ -306,9 +306,14 @@ chasen_sparse_main(char *input, FILE *output)
+      */
+     while (*input) {
+ 	int c = 0, len, cursor;
+-	if ((crlf = strpbrk(input, "\r\n")) == NULL)
++	if ((crlf = strpbrk(input, "\r\n")) == NULL) {
+ 	    len = strlen(input);
+-	else {
++	    if (len >= CHA_INPUT_SIZE) {
++		len = CHA_INPUT_SIZE - 1;
++		crlf = input + CHA_INPUT_SIZE - 2;
++		c = 0;
++	    }
++	} else {
+ 	    len = crlf - input;
+ 	    c = *crlf;
+ 	    *crlf = '\0';