[php-pecl-apc] Version 3.1.14 (beta) - API 3.1.0 (stable)
Remi Collet
remi at fedoraproject.org
Thu Jan 3 08:27:08 UTC 2013
commit bc47dc5c1947340be2bcaff099c6a6defb3ffcd5
Author: Remi Collet <remi at fedoraproject.org>
Date: Thu Jan 3 09:27:00 2013 +0100
Version 3.1.14 (beta) - API 3.1.0 (stable)
.gitignore | 1 +
apc-svn.patch | 260 +++++++++++------------------------------------------
php-pecl-apc.spec | 40 ++++++---
sources | 2 +-
4 files changed, 85 insertions(+), 218 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2255d10..f60e482 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ package*xml
/APC-3.1.11.tgz
/APC-3.1.12.tgz
/APC-3.1.13.tgz
+/APC-3.1.14.tgz
diff --git a/apc-svn.patch b/apc-svn.patch
index b1955f3..14547e2 100644
--- a/apc-svn.patch
+++ b/apc-svn.patch
@@ -1,208 +1,56 @@
---- pecl/apc/trunk/tests/apc54_004.phpt 2012/09/03 17:19:06 327448
-+++ pecl/apc/trunk/tests/apc54_004.phpt 2012/09/03 17:31:18 327449
-@@ -31,63 +31,63 @@
+Index: apc_compile.c
+===================================================================
+--- apc_compile.c (révision 328824)
++++ apc_compile.c (copie de travail)
+@@ -2469,9 +2469,11 @@
+ dst->alias_len = src->alias_len;
+ }
- --EXPECTF--
- <br />
--<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>/home/weltling/dws/src/apc_trunk/tests/index.php</b> on line <b>3</b><br />
-+<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>%s/tests/index.php</b> on line <b>3</b><br />
- <br />
--<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>/home/weltling/dws/src/apc_trunk/tests/index.php</b> on line <b>3</b><br />
-+<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>%s/tests/index.php</b> on line <b>3</b><br />
- <br />
--<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>/home/weltling/dws/src/apc_trunk/tests/index.php</b> on line <b>3</b><br />
-+<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>%s/tests/index.php</b> on line <b>3</b><br />
- <br />
--<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>/home/weltling/dws/src/apc_trunk/tests/index.php</b> on line <b>3</b><br />
-+<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>%s/tests/index.php</b> on line <b>3</b><br />
- <br />
--<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>/home/weltling/dws/src/apc_trunk/tests/index.php</b> on line <b>3</b><br />
-+<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>%s/tests/index.php</b> on line <b>3</b><br />
- <br />
--<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>/home/weltling/dws/src/apc_trunk/tests/index.php</b> on line <b>3</b><br />
-+<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>%s/tests/index.php</b> on line <b>3</b><br />
- <br />
--<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>/home/weltling/dws/src/apc_trunk/tests/index.php</b> on line <b>3</b><br />
-+<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>%s/tests/index.php</b> on line <b>3</b><br />
- <br />
--<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>/home/weltling/dws/src/apc_trunk/tests/index.php</b> on line <b>3</b><br />
-+<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>%s/tests/index.php</b> on line <b>3</b><br />
- <br />
--<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>/home/weltling/dws/src/apc_trunk/tests/index.php</b> on line <b>3</b><br />
-+<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>%s/tests/index.php</b> on line <b>3</b><br />
- <br />
--<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>/home/weltling/dws/src/apc_trunk/tests/index.php</b> on line <b>3</b><br />
-+<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>%s/tests/index.php</b> on line <b>3</b><br />
- <br />
--<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>/home/weltling/dws/src/apc_trunk/tests/index.php</b> on line <b>3</b><br />
-+<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>%s/tests/index.php</b> on line <b>3</b><br />
- <br />
--<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>/home/weltling/dws/src/apc_trunk/tests/index.php</b> on line <b>3</b><br />
-+<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>%s/tests/index.php</b> on line <b>3</b><br />
- <br />
--<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>/home/weltling/dws/src/apc_trunk/tests/index.php</b> on line <b>3</b><br />
-+<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>%s/tests/index.php</b> on line <b>3</b><br />
- <br />
--<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>/home/weltling/dws/src/apc_trunk/tests/index.php</b> on line <b>3</b><br />
-+<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>%s/tests/index.php</b> on line <b>3</b><br />
- <br />
--<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>/home/weltling/dws/src/apc_trunk/tests/index.php</b> on line <b>3</b><br />
-+<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>%s/tests/index.php</b> on line <b>3</b><br />
- <br />
--<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>/home/weltling/dws/src/apc_trunk/tests/index.php</b> on line <b>3</b><br />
-+<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>%s/tests/index.php</b> on line <b>3</b><br />
- <br />
--<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>/home/weltling/dws/src/apc_trunk/tests/index.php</b> on line <b>3</b><br />
-+<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>%s/tests/index.php</b> on line <b>3</b><br />
- <br />
--<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>/home/weltling/dws/src/apc_trunk/tests/index.php</b> on line <b>3</b><br />
-+<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>%s/tests/index.php</b> on line <b>3</b><br />
- <br />
--<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>/home/weltling/dws/src/apc_trunk/tests/index.php</b> on line <b>3</b><br />
-+<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>%s/tests/index.php</b> on line <b>3</b><br />
- <br />
--<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>/home/weltling/dws/src/apc_trunk/tests/index.php</b> on line <b>3</b><br />
-+<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>%s/tests/index.php</b> on line <b>3</b><br />
- <br />
--<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>/home/weltling/dws/src/apc_trunk/tests/index.php</b> on line <b>3</b><br />
-+<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>%s/tests/index.php</b> on line <b>3</b><br />
- <br />
--<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>/home/weltling/dws/src/apc_trunk/tests/index.php</b> on line <b>3</b><br />
-+<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>%s/tests/index.php</b> on line <b>3</b><br />
- <br />
--<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>/home/weltling/dws/src/apc_trunk/tests/index.php</b> on line <b>3</b><br />
-+<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>%s/tests/index.php</b> on line <b>3</b><br />
- <br />
--<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>/home/weltling/dws/src/apc_trunk/tests/index.php</b> on line <b>3</b><br />
-+<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>%s/tests/index.php</b> on line <b>3</b><br />
- <br />
--<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>/home/weltling/dws/src/apc_trunk/tests/index.php</b> on line <b>3</b><br />
-+<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>%s/tests/index.php</b> on line <b>3</b><br />
- <br />
--<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>/home/weltling/dws/src/apc_trunk/tests/index.php</b> on line <b>3</b><br />
-+<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>%s/tests/index.php</b> on line <b>3</b><br />
- <br />
--<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>/home/weltling/dws/src/apc_trunk/tests/index.php</b> on line <b>3</b><br />
-+<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>%s/tests/index.php</b> on line <b>3</b><br />
- <br />
--<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>/home/weltling/dws/src/apc_trunk/tests/index.php</b> on line <b>3</b><br />
-+<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>%s/tests/index.php</b> on line <b>3</b><br />
- <br />
--<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>/home/weltling/dws/src/apc_trunk/tests/index.php</b> on line <b>3</b><br />
-+<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>%s/tests/index.php</b> on line <b>3</b><br />
- <br />
--<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>/home/weltling/dws/src/apc_trunk/tests/index.php</b> on line <b>3</b><br />
-+<b>Notice</b>: Undefined property: stdClass::$qwerty in <b>%s/tests/index.php</b> on line <b>3</b><br />
- done
---- pecl/apc/trunk/tests/apc54_018.phpt 2012/09/03 17:31:18 327449
-+++ pecl/apc/trunk/tests/apc54_018.phpt 2012/09/03 17:37:18 327450
-@@ -42,7 +42,7 @@
- ["type"]=>
- string(4) "user"
- ["key"]=>
-- string(42) "test-niko-asdfasdfasdfkjasdflkasjdfasf5675"
-+ string(42) "test-niko-asdfasdfasdfkjasdflkasjdfasf%d"
- ["value"]=>
- string(%d) "%s"
- ["num_hits"]=>
-@@ -67,7 +67,7 @@
- ["type"]=>
- string(4) "user"
- ["key"]=>
-- string(42) "test-niko-asdfasdfasdfkjasdflkasjdfasf5675"
-+ string(42) "test-niko-asdfasdfasdfkjasdflkasjdfasf%d"
- ["value"]=>
- string(%d) "%s"
- ["num_hits"]=>
-@@ -92,7 +92,7 @@
- ["type"]=>
- string(4) "user"
- ["key"]=>
-- string(42) "test-niko-asdfasdfasdfkjasdflkasjdfasf5675"
-+ string(42) "test-niko-asdfasdfasdfkjasdflkasjdfasf%d"
- ["value"]=>
- string(%d) "%s"
- ["num_hits"]=>
-@@ -117,7 +117,7 @@
- ["type"]=>
- string(4) "user"
- ["key"]=>
-- string(42) "test-niko-asdfasdfasdfkjasdflkasjdfasf5675"
-+ string(42) "test-niko-asdfasdfasdfkjasdflkasjdfasf%d"
- ["value"]=>
- string(%d) "%s"
- ["num_hits"]=>
-@@ -142,7 +142,7 @@
- ["type"]=>
- string(4) "user"
- ["key"]=>
-- string(42) "test-niko-asdfasdfasdfkjasdflkasjdfasf5675"
-+ string(42) "test-niko-asdfasdfasdfkjasdflkasjdfasf%d"
- ["value"]=>
- string(%d) "%s"
- ["num_hits"]=>
-@@ -167,7 +167,7 @@
- ["type"]=>
- string(4) "user"
- ["key"]=>
-- string(42) "test-niko-asdfasdfasdfkjasdflkasjdfasf5675"
-+ string(42) "test-niko-asdfasdfasdfkjasdflkasjdfasf%d"
- ["value"]=>
- string(%d) "%s"
- ["num_hits"]=>
-@@ -192,7 +192,7 @@
- ["type"]=>
- string(4) "user"
- ["key"]=>
-- string(42) "test-niko-asdfasdfasdfkjasdflkasjdfasf5675"
-+ string(42) "test-niko-asdfasdfasdfkjasdflkasjdfasf%d"
- ["value"]=>
- string(%d) "%s"
- ["num_hits"]=>
-@@ -217,7 +217,7 @@
- ["type"]=>
- string(4) "user"
- ["key"]=>
-- string(42) "test-niko-asdfasdfasdfkjasdflkasjdfasf5675"
-+ string(42) "test-niko-asdfasdfasdfkjasdflkasjdfasf%d"
- ["value"]=>
- string(%d) "%s"
- ["num_hits"]=>
-@@ -242,7 +242,7 @@
- ["type"]=>
- string(4) "user"
- ["key"]=>
-- string(42) "test-niko-asdfasdfasdfkjasdflkasjdfasf5675"
-+ string(42) "test-niko-asdfasdfasdfkjasdflkasjdfasf%d"
- ["value"]=>
- string(%d) "%s"
- ["num_hits"]=>
---- pecl/apc/trunk/tests/apc54_020.phpt 2012/09/04 00:04:46 327452
-+++ pecl/apc/trunk/tests/apc54_020.phpt 2012/09/04 05:30:31 327453
-@@ -3,8 +3,8 @@
- --SKIPIF--
- <?php
- require_once(dirname(__FILE__) . '/skipif.inc');
-- if (PHP_MAJOR_VERSION < 5 || (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 4)) {
-- die('skip PHP 5.4+ only');
-+ if (version_compare(PHP_VERSION, '5.4.6', '<')) {
-+ die('skip PHP 5.4.6+ only');
- }
- --FILE--
- <?php
---- pecl/apc/trunk/tests/server_test.inc 2012/09/04 05:30:31 327453
-+++ pecl/apc/trunk/tests/server_test.inc 2012/09/04 05:32:28 327454
-@@ -23,8 +23,11 @@
- 2 => STDERR,
- );
++#ifndef ZEND_ENGINE_2_5
+ if (src->function) {
+ CHECK(dst->function = my_copy_function(NULL, src->function, ctxt TSRMLS_CC));
+ }
++#endif
-- $ext = (substr(PHP_OS, 0, 3) == 'WIN') ? 'php_apc.dll' : 'apc.so';
-- $php_args = "-d extension_dir=$doc_root/../modules -d extension=$ext";
-+ $php_args = getenv('TEST_PHP_ARGS');
-+ if (empty($php_args)) {
-+ $ext = (substr(PHP_OS, 0, 3) == 'WIN') ? 'php_apc.dll' : 'apc.so';
-+ $php_args = "-d extension_dir=$doc_root/../modules -d extension=$ext";
-+ }
- if ($php_opts) {
- $php_args = "$php_args -d " . implode(' -d ', $php_opts);;
- }
+ APC_COPY_TRAIT_METHOD(dst->trait_method, src->trait_method);
+
+@@ -2506,9 +2508,11 @@
+ }
+ memcpy(dst, src, sizeof(zend_trait_precedence));
+
++#ifndef ZEND_ENGINE_2_5
+ if (src->function) {
+ CHECK(dst->function = my_copy_function(NULL, src->function, ctxt TSRMLS_CC));
+ }
++#endif
+
+ if (src->exclude_from_classes && *src->exclude_from_classes) {
+ int i = 0, num_classes = 0;
+Index: tests/apc54_error_010.phpt
+===================================================================
+--- tests/apc54_error_010.phpt (révision 328955)
++++ tests/apc54_error_010.phpt (copie de travail)
+@@ -23,8 +23,8 @@
+ }
+
+ class bar {
+- use foo, c { c::test insteadof foo, b; }
+- use foo, c { c::test insteadof foo, b; }
++ use foo, c { c::test insteadof foo; }
++ use foo, c { c::test insteadof foo; }
+ }
+
+ \$x = new bar;
+Index: tests/apc54_error_010_2.phpt
+===================================================================
+--- tests/apc54_error_010_2.phpt (révision 328955)
++++ tests/apc54_error_010_2.phpt (copie de travail)
+@@ -23,7 +23,7 @@
+ }
+
+ class bar {
+- use foo, c { c::test insteadof foo, b; }
++ use foo, c { c::test insteadof foo; }
+ }
+
+ \$x = new bar;
diff --git a/php-pecl-apc.spec b/php-pecl-apc.spec
index 844fd08..ba9260c 100644
--- a/php-pecl-apc.spec
+++ b/php-pecl-apc.spec
@@ -4,8 +4,8 @@
Summary: APC caches and optimizes PHP intermediate code
Name: php-pecl-apc
-Version: 3.1.13
-Release: 3%{?dist}
+Version: 3.1.14
+Release: 1%{?dist}
License: PHP
Group: Development/Languages
URL: http://pecl.php.net/package/APC
@@ -14,14 +14,16 @@ Source1: apc.ini
Source2: apc-panel.conf
Source3: apc.conf.php
-# Upstream patch from SVN, fixed test suite.
-# http://svn.php.net/viewvc?view=revision&revision=327449
-# http://svn.php.net/viewvc?view=revision&revision=327450
-# http://svn.php.net/viewvc?view=revision&revision=327453
-# http://svn.php.net/viewvc?view=revision&revision=327454
+# Upstream patches from SVN
+# http://svn.php.net/viewvc?view=revision&revision=328955
+# http://svn.php.net/viewvc?view=revision&revision=328956
+# http://svn.php.net/viewvc?view=revision&revision=328957
Patch0: apc-svn.patch
-BuildRequires: php-devel >= 5.1.0, httpd-devel, php-pear, pcre-devel
+BuildRequires: php-devel
+BuildRequires: php-pear
+BuildRequires: httpd-devel
+BuildRequires: pcre-devel
# Only for tests (used by some unit tests)
BuildRequires: php-dom
@@ -30,7 +32,9 @@ Requires(postun): %{__pecl}
Requires: php(zend-abi) = %{php_zend_api}
Requires: php(api) = %{php_core_api}
-Conflicts: php-mmcache php-eaccelerator
+Conflicts: php-mmcache
+Conflicts: php-eaccelerator
+Conflicts: php-xcache
Provides: php-apc = %{version}
Provides: php-apc%{?_isa} = %{version}
Provides: php-pecl(%{pecl_name}) = %{version}
@@ -71,10 +75,11 @@ configuration, available on http://localhost/apc-panel/
%prep
-%setup -q -c
+%setup -q -c -T
+tar xif %{SOURCE0}
cd APC-%{version}
-%patch0 -p3 -b .orig
+%patch0 -p0 -b .php55
%if 0%{?__isa_bits}
# port number to allow 32/64 build at same time
@@ -167,6 +172,16 @@ NO_INTERACTION=1 \
REPORT_EXIT_STATUS=1 \
%{__ztsphp} -n run-tests.php
%endif
+%else
+: minimal load test
+%{_bindir}/php -n \
+ -d extension_dir=%{pecl_name}-%{version}/modules \
+ -d extension=apc.so -m | grep apc
+%if 0%{?__ztsphp:1}
+%{__ztsphp} -n \
+ -d extension_dir=%{pecl_name}-%{version}-zts/modules \
+ -d extension=apc.so -m | grep apc
+%endif
%endif
@@ -209,6 +224,9 @@ fi
%changelog
+* Thu Jan 3 2013 Remi Collet <remi at fedoraproject.org> - 3.1.14-1
+- Version 3.1.14 (beta) - API 3.1.0 (stable)
+
* Mon Nov 19 2012 Remi Collet <remi at fedoraproject.org> - 3.1.13-3
- apc-panel requires php-gd
- also provides php-apc
diff --git a/sources b/sources
index 4081794..775aa14 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c9e47002e3a67ebde3a6f81437c7b6e0 APC-3.1.13.tgz
+39d4a97e4d305b29d7aae13ba5f1804a APC-3.1.14.tgz
More information about the scm-commits
mailing list