Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=40102e4671a58d032f77709bbaea9011df80aa75
commit 40102e4671a58d032f77709bbaea9011df80aa75 Author: kikadf <[email protected]> Date: Thu Sep 11 10:52:07 2014 +0200 php-5.5.16-1-x86_64 * Version bump diff --git a/source/devel/php/CVE-2014-3587.patch b/source/devel/php/CVE-2014-3587.patch deleted file mode 100644 index 40ee64e..0000000 --- a/source/devel/php/CVE-2014-3587.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 9217c8d8e3760a9747311727f49150af84f189a4 Mon Sep 17 00:00:00 2001 -From: Remi Collet <[email protected]> -Date: Tue, 29 Jul 2014 13:06:17 +0200 -Subject: [PATCH] fix possible pointer overflow - -Signed-off-by: Remi Collet <[email protected]> ---- - src/cdf.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- php5.orig/ext/fileinfo/libmagic/cdf.c -+++ php5/ext/fileinfo/libmagic/cdf.c -@@ -820,7 +820,7 @@ cdf_read_property_info(const cdf_stream_ - q = (const uint8_t *)(const void *) - ((const char *)(const void *)p + ofs - - 2 * sizeof(uint32_t)); -- if (q > e) { -+ if (q < p || q > e) { - DPRINTF(("Ran of the end %p > %p\n", q, e)); - goto out; - } diff --git a/source/devel/php/FrugalBuild b/source/devel/php/FrugalBuild index 2904110..a525f8f 100644 --- a/source/devel/php/FrugalBuild +++ b/source/devel/php/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Miklos Vajna <[email protected]> pkgname=php -pkgver=5.5.15 +pkgver=5.5.16 pkgrel=1 pkgdesc="A widely-used general-purpose scripting language" url="http://www.php.net"; @@ -18,7 +18,7 @@ archs=('i686' 'x86_64') up2date="lynx -dump $url | sed -n 's/.*downloads.php#v\(.*\)/\1/p' | head -1" source=(http://www.php.net/distributions/$pkgname-$pkgver.tar.gz \ php.ini php.conf README.Frugalware phpize.in.patch) -sha1sums=('d9df11b97a9f1c686194e91165602f47e3bd74e6' \ +sha1sums=('4360e07c1d46fa5464023fb3c0f22c5488f92159' \ '9249ca52e57a3069befe20311fd02fc8bee7aeef' \ '0850ef23512a02e8460dc36f08f453d148dcd9df' \ '40ae88f0721e02a2c75de76be342c51c85bf734d' \ @@ -36,8 +36,8 @@ conflicts=('php-pecl-fileinfo') provides=('php-pecl-fileinfo') # FSA fix *** -source=(${source[@]} CVE-2014-3587.patch) -sha1sums=(${sha1sums[@]} '4739e1eab6f4522d91ecb05492e0430fbd28f42e') +#source=(${source[@]} ) +#sha1sums=(${sha1sums[@]} '') # *********** build() _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
