diff options
| -rw-r--r-- | lang/php/phpversion.mk | 4 | ||||
| -rw-r--r-- | lang/php55/Makefile | 3 | ||||
| -rw-r--r-- | lang/php55/distinfo | 9 | ||||
| -rw-r--r-- | lang/php55/patches/patch-ext_spl_spl__heap.c | 18 |
4 files changed, 7 insertions, 27 deletions
diff --git a/lang/php/phpversion.mk b/lang/php/phpversion.mk index 43bdf250d78..12bee58fcc0 100644 --- a/lang/php/phpversion.mk +++ b/lang/php/phpversion.mk @@ -1,4 +1,4 @@ -# $NetBSD: phpversion.mk,v 1.103 2015/07/11 00:29:17 taca Exp $ +# $NetBSD: phpversion.mk,v 1.104 2015/07/11 00:30:11 taca Exp $ # # This file selects a PHP version, based on the user's preferences and # the installed packages. It does not add a dependency on the PHP @@ -82,7 +82,7 @@ PHPVERSION_MK= defined # Define each PHP's version. PHP54_VERSION= 5.4.43 -PHP55_VERSION= 5.5.26 +PHP55_VERSION= 5.5.27 PHP56_VERSION= 5.6.10 # Define initial release of major version. diff --git a/lang/php55/Makefile b/lang/php55/Makefile index 07a5bd99306..d325c5f1d15 100644 --- a/lang/php55/Makefile +++ b/lang/php55/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.21 2015/06/28 15:34:50 taca Exp $ +# $NetBSD: Makefile,v 1.22 2015/07/11 00:30:11 taca Exp $ # # We can't omit PKGNAME here to handle PKG_OPTIONS. # PKGNAME= php-${PHP_VERSION} -PKGREVISION= 1 CATEGORIES= lang HOMEPAGE= http://www.php.net/ diff --git a/lang/php55/distinfo b/lang/php55/distinfo index 2cafd629194..6ce98ed8ca4 100644 --- a/lang/php55/distinfo +++ b/lang/php55/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.42 2015/06/28 15:34:50 taca Exp $ +$NetBSD: distinfo,v 1.43 2015/07/11 00:30:11 taca Exp $ -SHA1 (php-5.5.26.tar.bz2) = f2f80ef51d38b39c4ef060942e2ddcfffec9927a -RMD160 (php-5.5.26.tar.bz2) = abfc8d5fa0615e22d4510bd025195cb9e88c2e77 -Size (php-5.5.26.tar.bz2) = 13671379 bytes +SHA1 (php-5.5.27.tar.bz2) = 1bb65c8e66324e16eef5464b0e0fcb5a7378b9ac +RMD160 (php-5.5.27.tar.bz2) = d9e07abb119f4b84343f42e686eefb73a6a30de2 +Size (php-5.5.27.tar.bz2) = 13692811 bytes SHA1 (patch-acinclude.m4) = 9e9c433e4cb96e469f7cf14b2064a0f41fc4568a SHA1 (patch-aclocal.m4) = 46f192351e541453b1e32299acd1b4cfefc93cb2 SHA1 (patch-build_libtool.m4) = 3811edd697fd21eadc4f65cba35c6297141e8ff2 @@ -15,7 +15,6 @@ SHA1 (patch-ext_pdo__mysql_config.m4) = 3526e737da25129710218e7141d5a05ae0a51390 SHA1 (patch-ext_pdo_config.m4) = 26a4ad02e5c6b7a54c3c54a6d026a3ccfed62c59 SHA1 (patch-ext_phar_Makefile.frag) = f465bb5acd4bb87bb403baa98b61ac707800fd30 SHA1 (patch-ext_phar_phar_phar.php) = 011f2d68048dbc63f5efcab4e23062daa9e8e08c -SHA1 (patch-ext_spl_spl__heap.c) = cc30baddf4c935b9d9bdfe304409690a24169db0 SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = b384b9daa466f2a8a3e6cfd4ea6cff81f9342941 SHA1 (patch-ext_standard_basic__functions.c) = f2a44998145306c2cb2d2f3822c0e7cc70c778b4 SHA1 (patch-makedist) = 3f6b0621d30264824f2cb4c2903d15ba95be3937 diff --git a/lang/php55/patches/patch-ext_spl_spl__heap.c b/lang/php55/patches/patch-ext_spl_spl__heap.c deleted file mode 100644 index 56a34f76bde..00000000000 --- a/lang/php55/patches/patch-ext_spl_spl__heap.c +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-ext_spl_spl__heap.c,v 1.1 2015/06/28 15:34:50 taca Exp $ - -Fix Bug #69737 Segfault when SplMinHeap::compare produces fatal error. - ---- ext/spl/spl_heap.c.orig 2015-06-10 12:26:49.000000000 +0000 -+++ ext/spl/spl_heap.c -@@ -249,9 +249,10 @@ static void spl_ptr_heap_insert(spl_ptr_ - heap->ctor(elem TSRMLS_CC); - - /* sifting up */ -- for(i = heap->count++; i > 0 && heap->cmp(heap->elements[(i-1)/2], elem, cmp_userdata TSRMLS_CC) < 0; i = (i-1)/2) { -+ for(i = heap->count; i > 0 && heap->cmp(heap->elements[(i-1)/2], elem, cmp_userdata TSRMLS_CC) < 0; i = (i-1)/2) { - heap->elements[i] = heap->elements[(i-1)/2]; - } -+ heap->count++; - - if (EG(exception)) { - /* exception thrown during comparison */ |