diff options
| -rw-r--r-- | php-5.5.10-leak.patch | 25 | ||||
| -rw-r--r-- | php55.spec | 8 |
2 files changed, 5 insertions, 28 deletions
diff --git a/php-5.5.10-leak.patch b/php-5.5.10-leak.patch deleted file mode 100644 index 5c8e9dc..0000000 --- a/php-5.5.10-leak.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 10eb0070700382f966bf260e44135e1f724a15d2 Mon Sep 17 00:00:00 2001 -From: Anatol Belski <ab@php.net> -Date: Thu, 20 Feb 2014 18:53:53 +0100 -Subject: [PATCH] fixed leak introduced after CVE/upgrade - ---- - ext/fileinfo/libmagic/softmagic.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/ext/fileinfo/libmagic/softmagic.c b/ext/fileinfo/libmagic/softmagic.c -index 7c5f628..33970e5 100644 ---- a/ext/fileinfo/libmagic/softmagic.c -+++ b/ext/fileinfo/libmagic/softmagic.c -@@ -1701,6 +1701,8 @@ mget(struct magic_set *ms, const unsigned char *s, struct magic *m, - return -1; - if (file_printf(ms, "%s", rbuf) == -1) - return -1; -+ } -+ if (rbuf) { - efree(rbuf); - } - return rv; --- -1.8.4.3 - @@ -108,7 +108,7 @@ %endif #global snapdate 201308300430 -%global rcver RC1 +#global rcver RC1 Summary: PHP scripting language for creating dynamic web sites Name: php @@ -177,7 +177,6 @@ Patch47: php-5.4.9-phpinfo.patch Patch91: php-5.3.7-oci8conf.patch # Upstream fixes (100+) -Patch101: php-5.5.10-leak.patch Patch102: php-5.5.10-bug66762.patch # Security fixes (200+) @@ -892,7 +891,6 @@ rm -rf ext/json %patch91 -p1 -b .remi-oci8 # upstream patches -%patch101 -p1 -b .memleak %patch102 -p0 -b .66762 # security patches @@ -1881,6 +1879,10 @@ fi %changelog +* Wed Mar 5 2014 Remi Collet <remi@fedoraproject.org> 5.5.10-1 +- Update to 5.5.10 (security) + http://www.php.net/ChangeLog-5.php#5.5.10 + * Wed Feb 26 2014 Remi Collet <rcollet@redhat.com> 5.5.10-0.4.RC1 - php-fpm should own /var/lib/php/session and wsdlcache |