diff options
| author | tnn <tnn> | 2015-09-29 02:15:54 +0000 |
|---|---|---|
| committer | tnn <tnn> | 2015-09-29 02:15:54 +0000 |
| commit | 894bdf257c78ad3210861a673bbfa17224d151cd (patch) | |
| tree | 9b4123123efe9eef2b2f3404dc372808645565ff /textproc | |
| parent | 42c02ead2173cfaab9bdab0a6b9764f571bc492a (diff) | |
| download | pkgsrc-894bdf257c78ad3210861a673bbfa17224d151cd.tar.gz | |
Patch CVE-2015-1270. Via Debian.
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/icu/Makefile | 3 | ||||
| -rw-r--r-- | textproc/icu/distinfo | 3 | ||||
| -rw-r--r-- | textproc/icu/patches/patch-common_ucnv__io.cpp | 15 |
3 files changed, 19 insertions, 2 deletions
diff --git a/textproc/icu/Makefile b/textproc/icu/Makefile index a5eeada452f..901db617d07 100644 --- a/textproc/icu/Makefile +++ b/textproc/icu/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.99 2015/09/07 12:02:06 jperkin Exp $ +# $NetBSD: Makefile,v 1.100 2015/09/29 02:15:54 tnn Exp $ DISTNAME= icu4c-55_1-src +PKGREVISION= 1 PKGNAME= ${DISTNAME:S/4c//:S/-src//:S/_/./g} CATEGORIES= textproc MASTER_SITES= http://download.icu-project.org/files/icu4c/${PKGVERSION_NOREV}/ diff --git a/textproc/icu/distinfo b/textproc/icu/distinfo index 14df3360f2c..58fb3ef1a6f 100644 --- a/textproc/icu/distinfo +++ b/textproc/icu/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.54 2015/08/31 15:26:18 sevan Exp $ +$NetBSD: distinfo,v 1.55 2015/09/29 02:15:54 tnn Exp $ SHA1 (icu4c-55_1-src.tgz) = 3bb301c11be0e239c653e8aa2925c53f6f4dc88d RMD160 (icu4c-55_1-src.tgz) = 94dcaaac13b41de3588b01f39febe1b1cbd5765d @@ -11,6 +11,7 @@ SHA1 (patch-ad) = c2a9469bf896b5f0702d5795c3b1c2b394893663 SHA1 (patch-af) = 07421b669780e5eea5dc455cc39ca9737c0f728a SHA1 (patch-common_putil.cpp) = 3d35bdea709ded1ae5926729fb23995ca8734687 SHA1 (patch-common_putilimp.h) = a68faa97c2bffeecaca1586e26f5bbe48e71b262 +SHA1 (patch-common_ucnv__io.cpp) = d521ac029edece65de06d5e1e8a8814269b0489e SHA1 (patch-common_umutex.h) = 096d3e15ef7b84533456af4570ed70747a4ef70c SHA1 (patch-common_unicode_platform.h) = 82786dff790782eb07cdc527061de33e771ec63c SHA1 (patch-common_uposixdefs.h) = 02dedd10282961dec66673069796122b447dac33 diff --git a/textproc/icu/patches/patch-common_ucnv__io.cpp b/textproc/icu/patches/patch-common_ucnv__io.cpp new file mode 100644 index 00000000000..933d782a170 --- /dev/null +++ b/textproc/icu/patches/patch-common_ucnv__io.cpp @@ -0,0 +1,15 @@ +$NetBSD: patch-common_ucnv__io.cpp,v 1.1 2015/09/29 02:15:54 tnn Exp $ + +Debian CVE-2015-1270.patch + +--- common/ucnv_io.cpp.orig 2015-03-27 21:10:42.000000000 +0000 ++++ common/ucnv_io.cpp +@@ -744,7 +744,7 @@ ucnv_io_getConverterName(const char *ali + * the name begins with 'x-'. If it does, strip it off and try + * again. This behaviour is similar to how ICU4J does it. + */ +- if (aliasTmp[0] == 'x' || aliasTmp[1] == '-') { ++ if (aliasTmp[0] == 'x' && aliasTmp[1] == '-') { + aliasTmp = aliasTmp+2; + } else { + break; |