rpms/php-eaccelerator/devel eaccelerator-0.9.5.1-nophpversioncheck.patch, NONE, 1.1 php-eaccelerator.spec, 1.31, 1.32
Matthias Saou (thias)
fedora-extras-commits at redhat.com
Tue Jul 24 11:12:40 UTC 2007
Author: thias
Update of /cvs/extras/rpms/php-eaccelerator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28105/devel
Modified Files:
php-eaccelerator.spec
Added Files:
eaccelerator-0.9.5.1-nophpversioncheck.patch
Log Message:
Include patch to skip the exact PHP version check.
eaccelerator-0.9.5.1-nophpversioncheck.patch:
--- NEW FILE eaccelerator-0.9.5.1-nophpversioncheck.patch ---
diff -Naupr eaccelerator-0.9.5.1.orig/eaccelerator.c eaccelerator-0.9.5.1/eaccelerator.c
--- eaccelerator-0.9.5.1.orig/eaccelerator.c 2006-09-15 17:46:10.000000000 +0200
+++ eaccelerator-0.9.5.1/eaccelerator.c 2007-07-24 13:02:51.000000000 +0200
@@ -1937,24 +1937,6 @@ static void eaccelerator_globals_dtor(ze
static void register_eaccelerator_as_zend_extension();
-static int eaccelerator_check_php_version(TSRMLS_D) {
- zval v;
- int ret = 0;
- if (zend_get_constant("PHP_VERSION", sizeof("PHP_VERSION")-1, &v TSRMLS_CC)) {
- if (Z_TYPE(v) == IS_STRING &&
- Z_STRLEN(v) == sizeof(PHP_VERSION)-1 &&
- strcmp(Z_STRVAL(v),PHP_VERSION) == 0) {
- ret = 1;
- } else {
- zend_error(E_CORE_WARNING,"[%s] This build of \"%s\" was compiled for PHP version %s. Rebuild it for your PHP version (%s) or download precompiled binaries.\n", EACCELERATOR_EXTENSION_NAME,EACCELERATOR_EXTENSION_NAME,PHP_VERSION,Z_STRVAL(v));
- }
- zval_dtor(&v);
- } else {
- zend_error(E_CORE_WARNING,"[%s] This build of \"%s\" was compiled for PHP version %s. Rebuild it for your PHP version.\n", EACCELERATOR_EXTENSION_NAME,EACCELERATOR_EXTENSION_NAME,PHP_VERSION);
- }
- return ret;
-}
-
static void make_hash_dirs(char *fullpath, int lvl) {
int j;
int n = strlen(fullpath);
@@ -1997,9 +1979,6 @@ PHP_MINIT_FUNCTION(eaccelerator) {
}
#endif
}
- if (!eaccelerator_check_php_version(TSRMLS_C)) {
- return FAILURE;
- }
ZEND_INIT_MODULE_GLOBALS(eaccelerator, eaccelerator_init_globals, NULL);
REGISTER_INI_ENTRIES();
REGISTER_STRING_CONSTANT("EACCELERATOR_VERSION", EACCELERATOR_VERSION, CONST_CS | CONST_PERSISTENT);
Index: php-eaccelerator.spec
===================================================================
RCS file: /cvs/extras/rpms/php-eaccelerator/devel/php-eaccelerator.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- php-eaccelerator.spec 20 Jul 2007 00:40:45 -0000 1.31
+++ php-eaccelerator.spec 24 Jul 2007 11:12:08 -0000 1.32
@@ -7,13 +7,14 @@
Summary: PHP accelerator, optimizer, encoder and dynamic content cacher
Name: php-eaccelerator
Version: 0.9.5.1
-Release: 2
+Release: 3
Epoch: 1
License: GPL
Group: Development/Languages
URL: http://eaccelerator.net/
Source: http://bart.eaccelerator.net/source/%{version}/eaccelerator-%{version}.tar.bz2
Patch0: eaccelerator-0.9.5-rc1-config.patch
+Patch1: eaccelerator-0.9.5.1-nophpversioncheck.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: php(zend-abi) = %{php_zend_api}
Requires: php(api) = %{php_core_api}
@@ -32,6 +33,7 @@
%prep
%setup -q -n eaccelerator-%{version}
%patch0 -p1 -b .config
+%patch1 -p1 -b .nophpversioncheck
# Change paths in the example config, other values are changed by a patch
%{__sed} -i 's|/usr/lib/php4/|%{php_extdir}/|g;
s|/tmp/eaccelerator|%{_var}/cache/php-eaccelerator|g' \
@@ -83,6 +85,10 @@
%changelog
+* Tue Jul 24 2007 Matthias Saou <http://freshrpms.net/> 1:0.9.5.1-3
+- Include patch to skip the exact PHP version check, we'll rely on our
+ package's php_zend_api version requirement to "get it right".
+
* Thu Jul 19 2007 Jesse Keating <jkeating at redhat.com> 1:0.9.5.1-2
- Rebuild for new php
More information about the fedora-extras-commits
mailing list