diff options
| author | sbd <sbd> | 2010-12-23 10:28:38 +0000 |
|---|---|---|
| committer | sbd <sbd> | 2010-12-23 10:28:38 +0000 |
| commit | 876c8eac8bb80b053faf28407171477de4a3d771 (patch) | |
| tree | cbf0f5e5d3e841e6daa201ec7d313bc4a9896750 | |
| parent | 74934e6936a8c92f04c243cc18a220d4bbbe081c (diff) | |
| download | pkgsrc-876c8eac8bb80b053faf28407171477de4a3d771.tar.gz | |
Pullup ticket #3309 - requested by taca
Revisions pulled up:
- pkgsrc/textproc/php-intl/Makefile 1.2
- pkgsrc/textproc/php-intl/distinfo 1.2
- pkgsrc/textproc/php-intl/patches/patch-aa 1.2
-------------------------------------------------------------------------
Module Name: pkgsrc
Committed By: taca
Date: Thu Dec 16 03:37:28 UTC 2010
Modified Files:
pkgsrc/textproc/php-intl: Makefile distinfo
pkgsrc/textproc/php-intl/patches: patch-aa
Log Message:
Update php-intl package to 1.1.2.
Changelog says only "* Bugfixes" but it is really fix CVE-2010-4409.
| -rw-r--r-- | textproc/php-intl/Makefile | 4 | ||||
| -rw-r--r-- | textproc/php-intl/distinfo | 10 | ||||
| -rw-r--r-- | textproc/php-intl/patches/patch-aa | 9 |
3 files changed, 12 insertions, 11 deletions
diff --git a/textproc/php-intl/Makefile b/textproc/php-intl/Makefile index 9a8d36583e1..fbcb412af3b 100644 --- a/textproc/php-intl/Makefile +++ b/textproc/php-intl/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.1.1.1 2010/03/21 16:57:13 jdolecek Exp $ +# $NetBSD: Makefile,v 1.1.1.1.6.1 2010/12/23 10:28:38 sbd Exp $ MODNAME= intl -PECL_VERSION= 1.1.1 +PECL_VERSION= 1.1.2 CATEGORIES+= textproc COMMENT= PHP extension for i18n diff --git a/textproc/php-intl/distinfo b/textproc/php-intl/distinfo index a4d8efdd4be..c066384aac9 100644 --- a/textproc/php-intl/distinfo +++ b/textproc/php-intl/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.1.1.1 2010/03/21 16:57:13 jdolecek Exp $ +$NetBSD: distinfo,v 1.1.1.1.6.1 2010/12/23 10:28:38 sbd Exp $ -SHA1 (php-intl/intl-1.1.1.tgz) = 052d43b57fea9a3193fe577c9aaa619f6c7508b0 -RMD160 (php-intl/intl-1.1.1.tgz) = 74abe4582aafe9f9bc3da41936fd0116c271ef8b -Size (php-intl/intl-1.1.1.tgz) = 142269 bytes -SHA1 (patch-aa) = 7a44fab01351f8f810c8b906f5fcb0ea9dd4160c +SHA1 (php-intl/intl-1.1.2.tgz) = c86b3a4734c331ac3e7a56bb50b11766f4c4d5f7 +RMD160 (php-intl/intl-1.1.2.tgz) = 913c9f7fbb0f117e90affbbe5b17c1f881fb2fce +Size (php-intl/intl-1.1.2.tgz) = 142511 bytes +SHA1 (patch-aa) = 213d5c9c99c28e7fce16436df58d9b430745d5b1 SHA1 (patch-ab) = 01b4fa84d71319f29e0869f25e0dd1be869eaad0 SHA1 (patch-ac) = 635ac309125521018a13dbb84d741210e80fe635 SHA1 (patch-ad) = 3e09a48471dcf6fcfdcfca295dac778814fd2bd1 diff --git a/textproc/php-intl/patches/patch-aa b/textproc/php-intl/patches/patch-aa index 6c4b32851fc..1dcc6656d1a 100644 --- a/textproc/php-intl/patches/patch-aa +++ b/textproc/php-intl/patches/patch-aa @@ -1,10 +1,10 @@ -$NetBSD: patch-aa,v 1.1.1.1 2010/03/21 16:57:13 jdolecek Exp $ +$NetBSD: patch-aa,v 1.1.1.1.6.1 2010/12/23 10:28:38 sbd Exp $ ---- php_intl.h.orig 2010-03-15 23:03:31.000000000 +0100 +--- php_intl.h.orig 1970-01-01 09:14:21.000000000 +0000 +++ php_intl.h -@@ -65,6 +65,12 @@ PHP_MINFO_FUNCTION(intl); +@@ -65,6 +65,13 @@ PHP_MINFO_FUNCTION(intl); - #define PHP_INTL_VERSION "1.0.3" + #define PHP_INTL_VERSION "1.1.1" +#if (PHP_VERSION_ID >= 50300) +# define PHP_INTL_ZEND_ARG_STATIC @@ -12,6 +12,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2010/03/21 16:57:13 jdolecek Exp $ +# define PHP_INTL_ZEND_ARG_STATIC static +# define Z_DELREF_P(object) (object)->refcount-- +#endif ++ #endif /* PHP_INTL_H */ /* |