[pkgsrc/trunk]: pkgsrc Fix bug in mbstring extension function mb_encode_mimeh...

[jdolecek <jdolecek%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cbe5050769e8
branches:  trunk
changeset: 501043:cbe5050769e8
user:      jdolecek <jdolecek%pkgsrc.org@localhost>
date:      Sun Oct 16 12:17:47 2005 +0000

description:
Fix bug in mbstring extension function mb_encode_mimeheader(), which
misinterpreted some Japanese characters as ASCII.

PR: 31223 by Takahiro Kambe

diffstat:

 lang/php5/distinfo         |   3 ++-
 lang/php5/patches/patch-an |  13 +++++++++++++
 misc/php-mbstring/Makefile |   5 +++--
 www/php4/distinfo          |   3 ++-
 www/php4/patches/patch-an  |  13 +++++++++++++
 5 files changed, 33 insertions(+), 4 deletions(-)

diffs (79 lines):

diff -r bdc7296776f9 -r cbe5050769e8 lang/php5/distinfo
--- a/lang/php5/distinfo        Sun Oct 16 12:16:25 2005 +0000
+++ b/lang/php5/distinfo        Sun Oct 16 12:17:47 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2005/10/07 21:09:28 jdolecek Exp $
+$NetBSD: distinfo,v 1.10 2005/10/16 12:17:47 jdolecek Exp $
 
 SHA1 (php-5.0.5.tar.bz2) = ffcc050f879265eb96f2c8dc79fa895047da9d4a
 RMD160 (php-5.0.5.tar.bz2) = 6a9a892affba229770154407860cd1c2a098eaf9
@@ -7,3 +7,4 @@
 SHA1 (patch-ak) = 0faa523103e0a9a3c01c78c2fe9a64c0a9b2fc43
 SHA1 (patch-al) = 28ad9006b387e2b9984ad49beea21c9d46e63b46
 SHA1 (patch-am) = 0de0be745262c1e986062c7a50261dbe58f97ac9
+SHA1 (patch-an) = dfe696f416ab5deffd38150441a65246a4816cf4
diff -r bdc7296776f9 -r cbe5050769e8 lang/php5/patches/patch-an
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/php5/patches/patch-an        Sun Oct 16 12:17:47 2005 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-an,v 1.1 2005/10/16 12:17:47 jdolecek Exp $
+
+--- ext/mbstring/libmbfl/mbfl/mbfilter.c.orig  2005-10-16 14:09:17.000000000 +0200
++++ ext/mbstring/libmbfl/mbfl/mbfilter.c       2005-10-16 14:09:21.000000000 +0200
+@@ -1990,7 +1990,7 @@
+               break;
+ 
+       default:        /* ASCII */
+-              if (!qp_table[(c & 0xff)]) { /* ordinary characters */
++              if (c >= 0 && c < 0x100 && !qp_table[(c & 0xff)]) { /* ordinary characters */
+                       mbfl_memory_device_output(c, &pe->tmpdev);
+                       pe->status1 = 1;
+               } else if (pe->status1 == 0 && c == 0x20) {     /* repeat SPACE */
diff -r bdc7296776f9 -r cbe5050769e8 misc/php-mbstring/Makefile
--- a/misc/php-mbstring/Makefile        Sun Oct 16 12:16:25 2005 +0000
+++ b/misc/php-mbstring/Makefile        Sun Oct 16 12:17:47 2005 +0000
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:39 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/10/16 12:17:47 jdolecek Exp $
 
 MODNAME=               mbstring
 CATEGORIES+=           misc
-PKGREVISION=           # empty
+PKGREVISION=           1
 COMMENT=               PHP extension for multibyte characters support (currently, Japanese only)
 
+USE_PHP_EXT_PATCHES=   yes
 
 CONFIGURE_ARGS+=       --enable-${MODNAME}=shared,${BUILDLINK_DIR}
 
diff -r bdc7296776f9 -r cbe5050769e8 www/php4/distinfo
--- a/www/php4/distinfo Sun Oct 16 12:16:25 2005 +0000
+++ b/www/php4/distinfo Sun Oct 16 12:17:47 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.45 2005/10/07 21:09:27 jdolecek Exp $
+$NetBSD: distinfo,v 1.46 2005/10/16 12:17:47 jdolecek Exp $
 
 SHA1 (php-4.4.0.tar.bz2) = 5e0afe6e5f8c751f880a50ad4fa1716f0242ef37
 RMD160 (php-4.4.0.tar.bz2) = 4792e78b6f2f3e3347a1ac945b48efaccedf4542
@@ -16,3 +16,4 @@
 SHA1 (patch-ak) = 1f9fbe26c7329e1d18eec053499ee2d574b5b970
 SHA1 (patch-al) = 28ad9006b387e2b9984ad49beea21c9d46e63b46
 SHA1 (patch-am) = 0de0be745262c1e986062c7a50261dbe58f97ac9
+SHA1 (patch-an) = dfe696f416ab5deffd38150441a65246a4816cf4
diff -r bdc7296776f9 -r cbe5050769e8 www/php4/patches/patch-an
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/php4/patches/patch-an Sun Oct 16 12:17:47 2005 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-an,v 1.1 2005/10/16 12:17:47 jdolecek Exp $
+
+--- ext/mbstring/libmbfl/mbfl/mbfilter.c.orig  2005-10-16 14:09:17.000000000 +0200
++++ ext/mbstring/libmbfl/mbfl/mbfilter.c       2005-10-16 14:09:21.000000000 +0200
+@@ -1990,7 +1990,7 @@
+               break;
+ 
+       default:        /* ASCII */
+-              if (!qp_table[(c & 0xff)]) { /* ordinary characters */
++              if (c >= 0 && c < 0x100 && !qp_table[(c & 0xff)]) { /* ordinary characters */
+                       mbfl_memory_device_output(c, &pe->tmpdev);
+                       pe->status1 = 1;
+               } else if (pe->status1 == 0 && c == 0x20) {     /* repeat SPACE */