rpms/php-eaccelerator/devel eaccelerator-nophpversioncheck.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 php-eaccelerator.spec, 1.42, 1.43 sources, 1.11, 1.12 eaccelerator-0.9.5.1-nophpversioncheck.patch, 1.1, NONE
Remi Collet
remi at fedoraproject.org
Tue Jul 14 17:45:03 UTC 2009
Author: remi
Update of /cvs/extras/rpms/php-eaccelerator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10892
Modified Files:
.cvsignore php-eaccelerator.spec sources
Added Files:
eaccelerator-nophpversioncheck.patch
Removed Files:
eaccelerator-0.9.5.1-nophpversioncheck.patch
Log Message:
update to 0.9.6 SVN snapshot, PHP 5.3.0 build, fix broken dep, Bug #511127
eaccelerator-nophpversioncheck.patch:
--- NEW FILE eaccelerator-nophpversioncheck.patch ---
--- eaccelerator-svn355/eaccelerator.c.nophpversioncheck 2008-06-20 19:35:26.000000000 +0200
+++ eaccelerator-svn355/eaccelerator.c 2009-07-13 22:06:44.000000000 +0200
@@ -1722,26 +1722,6 @@
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 {
- ea_debug_error("[%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 {
- ea_debug_error("[%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);
@@ -1775,13 +1755,6 @@
}
#endif
}
- if (!eaccelerator_check_php_version(TSRMLS_C)) {
- /*
- * do not return FAILURE, because it causes PHP to completely fail.
- * Just disable eAccelerator instead of making eA fail starting php
- */
- return SUCCESS;
- }
ZEND_INIT_MODULE_GLOBALS(eaccelerator, eaccelerator_init_globals, NULL);
REGISTER_INI_ENTRIES();
REGISTER_STRING_CONSTANT("EACCELERATOR_VERSION", EACCELERATOR_VERSION, CONST_CS | CONST_PERSISTENT);
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-eaccelerator/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore 22 Dec 2008 18:43:18 -0000 1.11
+++ .cvsignore 14 Jul 2009 17:45:02 -0000 1.12
@@ -1 +1 @@
-eaccelerator-0.9.5.3.tar.bz2
+eaccelerator-svn358.tar.gz
Index: php-eaccelerator.spec
===================================================================
RCS file: /cvs/extras/rpms/php-eaccelerator/devel/php-eaccelerator.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- php-eaccelerator.spec 26 Feb 2009 20:32:09 -0000 1.42
+++ php-eaccelerator.spec 14 Jul 2009 17:45:02 -0000 1.43
@@ -3,22 +3,28 @@
# This is the apache userid, used for sysvipc semaphores which is the default
# on ppc since spinlock is not detected (not supported?)
# We also use it for the default ownership of the cache directory
-%define apache 48
+%global apache 48
+%global svn 358
Summary: PHP accelerator, optimizer, encoder and dynamic content cacher
Name: php-eaccelerator
-Version: 0.9.5.3
-Release: 3%{?dist}
+Version: 0.9.6
+Release: 0.1%{?svn:.svn%{svn}}%{?dist}
Epoch: 1
# The eaccelerator module itself is GPLv2+
# The PHP control panel is under the Zend license (control.php and dasm.php)
License: GPLv2+ and Zend
Group: Development/Languages
URL: http://eaccelerator.net/
+%if 0%{svn}
+Source0: http://snapshots.eaccelerator.net/eaccelerator-svn%{svn}.tar.gz
+%else
Source0: http://bart.eaccelerator.net/source/%{version}/eaccelerator-%{version}.tar.bz2
+%endif
Source1: php-eaccelerator.cron
Patch0: eaccelerator-0.9.5-rc1-config.patch
-Patch1: eaccelerator-0.9.5.1-nophpversioncheck.patch
+Patch1: eaccelerator-nophpversioncheck.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: php(zend-abi) = %{php_zend_api}
Requires: php(api) = %{php_core_api}
@@ -35,9 +41,15 @@ that the overhead of compiling is almost
%prep
+%if 0%{svn}
+%setup -q -n eaccelerator-svn%{svn}
+%else
%setup -q -n eaccelerator-%{version}
-%patch0 -p1 -b .config
+%endif
+
+#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' \
@@ -48,11 +60,9 @@ that the overhead of compiling is almost
phpize
%configure \
%ifnarch %{ix86} x86_64
- --with-eaccelerator-userid="%{apache}" \
+ --with-eaccelerator-userid="%{apache}"
%endif
- --with-eaccelerator-shared-memory \
- --with-eaccelerator-sessions \
- --with-eaccelerator-content-caching
+
%{__make} %{?_smp_mflags}
@@ -113,6 +123,11 @@ fi
%changelog
+* Tue Jul 14 2009 Remi Collet <Fedora at FamilleCollet.com> - 1:0.9.6-0.1.svn358
+- rebuild for new PHP 5.3.0 ABI (20090626)
+- update to latest SVN snapshot
+- remove shared-memory, sessions and content-caching options
+
* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.9.5.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-eaccelerator/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources 22 Dec 2008 18:43:18 -0000 1.11
+++ sources 14 Jul 2009 17:45:02 -0000 1.12
@@ -1 +1 @@
-caf797223739516882f870342f74b935 eaccelerator-0.9.5.3.tar.bz2
+ebae9587e9ecdd3537b8e78d4f58fce5 eaccelerator-svn358.tar.gz
--- eaccelerator-0.9.5.1-nophpversioncheck.patch DELETED ---
More information about the fedora-extras-commits
mailing list