diff --git a/.gitignore b/.gitignore index f4f6f63..64fa975 100644 --- a/.gitignore +++ b/.gitignore @@ -1,21 +1,8 @@ clog php.spec~ -php-5.3*.bz2 -/php-5.4.4.tar.bz2 -/php-5.4.5.tar.bz2 -/php-5.4.6.tar.bz2 -/php-5.4.7.tar.bz2 -/php-5.4.8.tar.bz2 -/php-5.4.9RC1.tar.bz2 -/php-5.4.9.tar.bz2 -/php-5.4.10.tar.bz2 -/php-5.4.11RC1.tar.bz2 -/php-5.4.11.tar.bz2 -/php-5.4.12RC1.tar.bz2 -/php-5.4.12RC2.tar.bz2 -/php-5.4.12.tar.bz2 -/php-5.4.13RC1.tar.bz2 -/php-5.4.13.tar.bz2 +php-5.3.*.bz2 +php-5.4.*.bz2 /php-5.5.0beta1.tar.xz /php-5.5.0beta2.tar.xz /php-5.5.0beta3.tar.xz +/php-5.5.0beta4.tar.xz diff --git a/opcache.ini b/opcache.ini index ef6e0e0..0b85b67 100644 --- a/opcache.ini +++ b/opcache.ini @@ -1,5 +1,5 @@ ; Enable Zend OPcache extension module -zend_extension=@EXTPATH@/opcache.so +zend_extension=opcache.so ; Determines if Zend OPCache is enabled opcache.enable=1 diff --git a/php-5.5.0-opcache.patch b/php-5.5.0-opcache.patch deleted file mode 100644 index 8ef74e9..0000000 --- a/php-5.5.0-opcache.patch +++ /dev/null @@ -1,149 +0,0 @@ -From af967de2afc584c602c0b6d4d6731e411323d94e Mon Sep 17 00:00:00 2001 -From: Dmitry Stogov -Date: Wed, 10 Apr 2013 21:41:30 +0400 -Subject: [PATCH] Allow wilcards in opcache.blacklist_filename - ---- - ext/opcache/README | 8 +++---- - ext/opcache/tests/blacklist.phpt | 20 ++++++++++++++++++ - ext/opcache/tests/opcache-1.blacklist | 5 +++++ - ext/opcache/tests/opcache-2.blacklist | 1 + - ext/opcache/zend_accelerator_blacklist.c | 36 ++++++++++++++++++++++++++++++++ - 5 files changed, 66 insertions(+), 4 deletions(-) - create mode 100644 ext/opcache/tests/blacklist.phpt - create mode 100644 ext/opcache/tests/opcache-1.blacklist - create mode 100644 ext/opcache/tests/opcache-2.blacklist - -diff --git a/ext/opcache/README b/ext/opcache/README -index 03386a0..3110012 100644 ---- a/ext/opcache/README -+++ b/ext/opcache/README -@@ -151,13 +151,13 @@ opcache.dups_fix (default "0") - Enable this hack as a workaround for "Cannot redeclare class" errors. - - opcache.blacklist_filename -- The location of the OPcache blacklist file. -- The OPcache blacklist file is a text file that holds the names of files -+ The location of the OPcache blacklist file (wildcards allowed). -+ Each OPcache blacklist file is a text file that holds the names of files - that should not be accelerated. The file format is to add each filename - to a new line. The filename may be a full path or just a file prefix - (i.e., /var/www/x blacklists all the files and directories in /var/www -- that start with 'x'). Files are usually triggered by one of the following -- three reasons: -+ that start with 'x'). Line starting with a ; are ignored (comments). -+ Files are usually triggered by one of the following three reasons: - 1) Directories that contain auto generated code, like Smarty or ZFW cache. - 2) Code that does not work well when accelerated, due to some delayed - compile time evaluation. -diff --git a/ext/opcache/tests/blacklist.phpt b/ext/opcache/tests/blacklist.phpt -new file mode 100644 -index 0000000..f4a3472 ---- /dev/null -+++ b/ext/opcache/tests/blacklist.phpt -@@ -0,0 +1,20 @@ -+--TEST-- -+Blacklist (with glob, quote and comments) -+--INI-- -+opcache.enable=1 -+opcache.enable_cli=1 -+opcache.blacklist_filename={PWD}/opcache-*.blacklist -+--SKIPIF-- -+ -+--FILE-- -+ -+--EXPECT-- -+Array -+( -+ [0] => /path/to/foo -+ [1] => /path/to/foo2 -+ [2] => /path/to/bar -+) -\ No newline at end of file -diff --git a/ext/opcache/tests/opcache-1.blacklist b/ext/opcache/tests/opcache-1.blacklist -new file mode 100644 -index 0000000..5f498d6 ---- /dev/null -+++ b/ext/opcache/tests/opcache-1.blacklist -@@ -0,0 +1,5 @@ -+; comments are allowed in blacklist file -+; and empty line are ignored -+ -+/path/to/foo -+"/path/to/foo2" -\ No newline at end of file -diff --git a/ext/opcache/tests/opcache-2.blacklist b/ext/opcache/tests/opcache-2.blacklist -new file mode 100644 -index 0000000..4f6580a ---- /dev/null -+++ b/ext/opcache/tests/opcache-2.blacklist -@@ -0,0 +1 @@ -+/path/to/bar -diff --git a/ext/opcache/zend_accelerator_blacklist.c b/ext/opcache/zend_accelerator_blacklist.c -index 764c950..b09d0e5 100644 ---- a/ext/opcache/zend_accelerator_blacklist.c -+++ b/ext/opcache/zend_accelerator_blacklist.c -@@ -36,6 +36,14 @@ - # define REGEX_MODE (REG_EXTENDED|REG_NOSUB) - #endif - -+#ifdef HAVE_GLOB -+#ifdef PHP_WIN32 -+#include "win32/glob.h" -+#else -+#include -+#endif -+#endif -+ - #define ZEND_BLACKLIST_BLOCK_SIZE 32 - - struct _zend_regexp_list { -@@ -168,7 +176,11 @@ static inline void zend_accel_blacklist_allocate(zend_blacklist *blacklist) - } - } - -+#ifdef HAVE_GLOB -+static void zend_accel_blacklist_loadone(zend_blacklist *blacklist, char *filename) -+#else - void zend_accel_blacklist_load(zend_blacklist *blacklist, char *filename) -+#endif - { - char buf[MAXPATHLEN + 1], real_path[MAXPATHLEN + 1]; - FILE *fp; -@@ -238,6 +250,30 @@ void zend_accel_blacklist_load(zend_blacklist *blacklist, char *filename) - zend_accel_blacklist_update_regexp(blacklist); - } - -+#ifdef HAVE_GLOB -+void zend_accel_blacklist_load(zend_blacklist *blacklist, char *filename) -+{ -+ glob_t globbuf; -+ int ret, i; -+ -+ memset(&globbuf, 0, sizeof(glob_t)); -+ -+ ret = glob(filename, 0, NULL, &globbuf); -+#ifdef GLOB_NOMATCH -+ if (ret == GLOB_NOMATCH || !globbuf.gl_pathc) { -+#else -+ if (!globbuf.gl_pathc) { -+#endif -+ zend_accel_error(ACCEL_LOG_WARNING, "No blacklist file found matching: %s\n", filename); -+ } else { -+ for(i=0 ; i + @@ -278,7 +278,7 @@ diff -up php-5.4.5RC1/ext/zip/php_zip.c.systzip php-5.4.5RC1/ext/zip/php_zip.c +struct zip_source { + struct zip_source *src; + union { -+ zip_source_callback f; ++ zip_source_callback f; + zip_source_layered_callback l; + } cb; + void *ud; @@ -363,7 +363,7 @@ diff -up php-5.4.5RC1/ext/zip/php_zip.c.systzip php-5.4.5RC1/ext/zip/php_zip.c +_zip_error_set(struct zip_error *err, int ze, int se) +{ + if (err) { -+ err->zip_err = ze; ++ err->zip_err = ze; + err->sys_err = se; + } +} @@ -412,7 +412,7 @@ diff -up php-5.4.5RC1/ext/zip/php_zip.c.systzip php-5.4.5RC1/ext/zip/php_zip.c /* zip_open is a macro for renaming libzip zipopen, so we need to use PHP_NAMED_FUNCTION */ static PHP_NAMED_FUNCTION(zif_zip_open); -@@ -1624,6 +1848,10 @@ static ZIPARCHIVE_METHOD(addEmptyDir) +@@ -1631,6 +1856,10 @@ static ZIPARCHIVE_METHOD(addEmptyDir) } idx = zip_stat(intern, s, 0, &sb); @@ -423,7 +423,7 @@ diff -up php-5.4.5RC1/ext/zip/php_zip.c.systzip php-5.4.5RC1/ext/zip/php_zip.c if (idx >= 0) { RETVAL_FALSE; } else { -@@ -1846,6 +2074,10 @@ static ZIPARCHIVE_METHOD(addFromString) +@@ -1853,6 +2082,10 @@ static ZIPARCHIVE_METHOD(addFromString) } cur_idx = zip_name_locate(intern, (const char *)name, 0); @@ -434,7 +434,7 @@ diff -up php-5.4.5RC1/ext/zip/php_zip.c.systzip php-5.4.5RC1/ext/zip/php_zip.c /* TODO: fix _zip_replace */ if (cur_idx >= 0) { if (zip_delete(intern, cur_idx) == -1) { -@@ -2870,5 +3098,9 @@ static PHP_MINFO_FUNCTION(zip) +@@ -2877,5 +3110,9 @@ static PHP_MINFO_FUNCTION(zip)9 php_info_print_table_row(2, "Zip version", PHP_ZIP_VERSION_STRING); - php_info_print_table_row(2, "Libzip version", LIBZIP_VERSION); +#if defined(HAVE_LIBZIP) @@ -445,9 +445,9 @@ diff -up php-5.4.5RC1/ext/zip/php_zip.c.systzip php-5.4.5RC1/ext/zip/php_zip.c php_info_print_table_end(); } -diff -up php-5.4.5RC1/ext/zip/php_zip.h.systzip php-5.4.5RC1/ext/zip/php_zip.h ---- php-5.4.5RC1/ext/zip/php_zip.h.systzip 2012-07-04 07:43:14.000000000 +0200 -+++ php-5.4.5RC1/ext/zip/php_zip.h 2012-07-07 15:57:34.845319432 +0200 +diff -up php5.5-201304181030/ext/zip/php_zip.h.systzip php5.5-201304181030/ext/zip/php_zip.h +--- php5.5-201304181030/ext/zip/php_zip.h.systzip 2013-01-01 11:36:17.000000000 +0100 ++++ php5.5-201304181030/ext/zip/php_zip.h 2013-04-18 13:17:32.147550046 +0200 @@ -28,7 +28,11 @@ extern zend_module_entry zip_module_entr #include "TSRM.h" #endif @@ -460,9 +460,9 @@ diff -up php-5.4.5RC1/ext/zip/php_zip.h.systzip php-5.4.5RC1/ext/zip/php_zip.h #define PHP_ZIP_VERSION_STRING "1.11.0" -diff -up php-5.4.5RC1/ext/zip/tests/bug38943.phpt.systzip php-5.4.5RC1/ext/zip/tests/bug38943.phpt ---- php-5.4.5RC1/ext/zip/tests/bug38943.phpt.systzip 2012-07-04 07:43:14.000000000 +0200 -+++ php-5.4.5RC1/ext/zip/tests/bug38943.phpt 2012-07-07 15:56:41.422171242 +0200 +diff -up php5.5-201304181030/ext/zip/tests/bug38943.phpt.systzip php5.5-201304181030/ext/zip/tests/bug38943.phpt +--- php5.5-201304181030/ext/zip/tests/bug38943.phpt.systzip 2012-12-05 11:40:39.000000000 +0100 ++++ php5.5-201304181030/ext/zip/tests/bug38943.phpt 2013-04-18 13:17:32.147550046 +0200 @@ -27,7 +27,7 @@ array(1) { [0]=> int(1) @@ -472,9 +472,9 @@ diff -up php-5.4.5RC1/ext/zip/tests/bug38943.phpt.systzip php-5.4.5RC1/ext/zip/t ["test":"myZip":private]=> int(0) ["testp"]=> -diff -up php-5.4.5RC1/ext/zip/tests/pecl12414.phpt.systzip php-5.4.5RC1/ext/zip/tests/pecl12414.phpt ---- php-5.4.5RC1/ext/zip/tests/pecl12414.phpt.systzip 2012-07-04 07:43:14.000000000 +0200 -+++ php-5.4.5RC1/ext/zip/tests/pecl12414.phpt 2012-07-07 15:56:41.422171242 +0200 +diff -up php5.5-201304181030/ext/zip/tests/pecl12414.phpt.systzip php5.5-201304181030/ext/zip/tests/pecl12414.phpt +--- php5.5-201304181030/ext/zip/tests/pecl12414.phpt.systzip 2012-12-05 11:40:39.000000000 +0100 ++++ php5.5-201304181030/ext/zip/tests/pecl12414.phpt 2013-04-18 13:17:32.148550050 +0200 @@ -5,6 +5,8 @@ Bug #12414 ( extracting files from damag /*$ */ if(!extension_loaded('zip')) die('skip'); @@ -484,9 +484,9 @@ diff -up php-5.4.5RC1/ext/zip/tests/pecl12414.phpt.systzip php-5.4.5RC1/ext/zip/ --FILE-- $RPM_BUILD_ROOT%{_sysconfdir}/php.d/${ini} - sed -e 's:@EXTPATH@:%{_libdir}/php-zts/modules:' \ - ${ini} >$RPM_BUILD_ROOT%{_sysconfdir}/php-zts.d/${ini} + cp -p ${ini} $RPM_BUILD_ROOT%{_sysconfdir}/php.d/${ini} + cp -p ${ini} $RPM_BUILD_ROOT%{_sysconfdir}/php-zts.d/${ini} else cat > $RPM_BUILD_ROOT%{_sysconfdir}/php.d/${ini} < 5.5.0-0.5.beta4 +- update to 5.5.0beta4 +- zend_extension doesn't requires full path +- refresh patch for system libzip +- drop opcache patch merged upstream +- add BuildRequires libvpx-devel for WebP support in php-gd +- php-fpm own /usr/share/fpm + * Thu Apr 11 2013 Remi Collet 5.5.0-0.4.beta3 - update to 5.5.0beta3 - allow wildcard in opcache.blacklist_filename and provide diff --git a/sources b/sources index 5c3444e..5e9fea8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7cf9b81a8e9a28b9431f3741d8916a9c php-5.5.0beta3.tar.xz +cba102154280dd16462150232dad9487 php-5.5.0beta4.tar.xz