rpms/php-eaccelerator/EL-4 eaccelerator-0.9.5-rc1-config.patch, NONE, 1.1 eaccelerator-0.9.5.1-nophpversioncheck.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 php-eaccelerator.spec, 1.2, 1.3 sources, 1.3, 1.4 eaccelerator-0.9.3-buffer-overflow.patch, 1.1, NONE
Matthias Saou (thias)
fedora-extras-commits at redhat.com
Mon Nov 26 12:39:50 UTC 2007
Author: thias
Update of /cvs/extras/rpms/php-eaccelerator/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11410
Modified Files:
.cvsignore php-eaccelerator.spec sources
Added Files:
eaccelerator-0.9.5-rc1-config.patch
eaccelerator-0.9.5.1-nophpversioncheck.patch
Removed Files:
eaccelerator-0.9.3-buffer-overflow.patch
Log Message:
Update to 0.9.5.2.
eaccelerator-0.9.5-rc1-config.patch:
--- NEW FILE eaccelerator-0.9.5-rc1-config.patch ---
diff -Naupr eaccelerator-0.9.5-rc1.orig/eaccelerator.ini eaccelerator-0.9.5-rc1/eaccelerator.ini
--- eaccelerator-0.9.5-rc1.orig/eaccelerator.ini 2006-07-25 15:00:00.000000000 +0200
+++ eaccelerator-0.9.5-rc1/eaccelerator.ini 2006-08-22 14:29:08.000000000 +0200
@@ -15,9 +15,6 @@
;extension="eaccelerator.so"
zend_extension="/usr/lib/php4/eaccelerator.so"
;zend_extension_ts="/usr/lib/php4/eaccelerator.so"
-;extension="eaccelerator.dll"
-;zend_extension_ts="c:\php4\eaccelerator.dll"
-;zend_extension="c:\php4\eaccelerator.dll"
; The amount of shared memory (in megabytes) that eAccelerator will use.
; "0" means OS default. Default value is "0".
@@ -73,7 +70,7 @@ eaccelerator.shm_max = "0"
; all scripts which were not accessed at last "shm_ttl" seconds from shared
; memory. Default value is "0" that means - don't remove any files from
; shared memory.
-eaccelerator.shm_ttl = "0"
+eaccelerator.shm_ttl = "3600"
; When eAccelerator fails to get shared memory for new script it tryes to
; remove old script if the previous try was made more then "shm_prune_period"
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: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-eaccelerator/EL-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 17 Oct 2005 13:38:32 -0000 1.3
+++ .cvsignore 26 Nov 2007 12:39:16 -0000 1.4
@@ -1 +1 @@
-eaccelerator-0.9.3.tar.gz
+eaccelerator-0.9.5.2.tar.bz2
Index: php-eaccelerator.spec
===================================================================
RCS file: /cvs/extras/rpms/php-eaccelerator/EL-4/php-eaccelerator.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-eaccelerator.spec 17 Oct 2005 13:38:32 -0000 1.2
+++ php-eaccelerator.spec 26 Nov 2007 12:39:16 -0000 1.3
@@ -1,24 +1,32 @@
-%define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4)
-%{!?php_version:%define php_version %(php-config --version 2>/dev/null || echo 4.3.11)}
+%global php_extdir %(php-config --extension-dir 2>/dev/null || echo "undefined")
+%global php_version %(php-config --version 2>/dev/null || echo "4.3.9")
-%define module_version 0.9.3
+# This is the apache userid, only used for sysvipc semaphores which is the
+# default on ppc since spinlock is not detected (not supported?)
+%define userid 48
Summary: PHP accelerator, optimizer, encoder and dynamic content cacher
Name: php-eaccelerator
-Version: %{php_version}_%{module_version}
-Release: 4%{?dist}
-License: GPL
+Version: 0.9.5.2
+Release: 1%{?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.sourceforge.net/
-Source: http://dl.sf.net/eaccelerator/eaccelerator-%{module_version}.tar.gz
-Patch: eaccelerator-0.9.3-buffer-overflow.patch
+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}
Requires: php = %{php_version}
Provides: php-zend_extension
Conflicts: php-mmcache
BuildRequires: php, php-devel
# Required by phpize
-BuildRequires: autoconf, automake, libtool, gcc-c++
+BuildRequires: autoconf, automake, libtool
%description
eAccelerator is a further development of the MMCache PHP Accelerator & Encoder.
@@ -27,19 +35,24 @@
%prep
-%setup -n eaccelerator-%{module_version}
-%patch -p1
+%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' \
+ eaccelerator.ini
%build
phpize
-%configure
-# Set fcntl based semaphores to avoid ipc based locking issues on x86_64
-%ifarch x86_64
-%{__perl} -pi -e 's|.*(MM_SEM_[A-Z]+).*|/* #undef $1 */|g' config.h
-%{__perl} -pi -e 's|.*(MM_SEM_FCNTL).*|#define $1 1|g' config.h
+%configure \
+%ifnarch %{ix86} x86_64
+ --with-eaccelerator-userid="%{userid}" \
%endif
-# Compile!
+ --with-eaccelerator-shared-memory \
+ --with-eaccelerator-sessions \
+ --with-eaccelerator-content-caching
%{__make} %{?_smp_mflags}
@@ -48,47 +61,124 @@
%{__make} install INSTALL_ROOT=%{buildroot}
# The cache directory where pre-compiled files will reside
-%{__mkdir_p} %{buildroot}%{_localstatedir}/cache/php-eaccelerator
+%{__mkdir_p} %{buildroot}%{_var}/cache/php-eaccelerator
# Drop in the bit of configuration
-%{__mkdir_p} %{buildroot}%{_sysconfdir}/php.d
-%{__cat} > %{buildroot}%{_sysconfdir}/php.d/eaccelerator.ini << 'EOF'
-; Enable eAccelerator extension module
-zend_extension = %{php_extdir}/eaccelerator.so
-; Options for the eAccelerator module
-eaccelerator.cache_dir = %{_localstatedir}/cache/php-eaccelerator
-eaccelerator.shm_size = 0
-eaccelerator.enable = 1
-eaccelerator.optimizer = 1
-eaccelerator.check_mtime = 1
-eaccelerator.filter = ""
-eaccelerator.shm_max = 0
-eaccelerator.shm_ttl = 3600
-eaccelerator.shm_prune_period = 0
-eaccelerator.shm_only = 0
-eaccelerator.compress = 1
-eaccelerator.compress_level = 9
-eaccelerator.keys = "shm_and_disk"
-eaccelerator.sessions = "shm_and_disk"
-eaccelerator.content = "shm_and_disk"
-eaccelerator.debug = 0
-EOF
+%{__install} -D -m 0644 eaccelerator.ini \
+ %{buildroot}%{_sysconfdir}/php.d/eaccelerator.ini
%clean
%{__rm} -rf %{buildroot}
+%preun
+# Upon last removal (not update), clean all cache files
+if [ $1 -eq 0 ]; then
+ %{__rm} -rf %{_var}/cache/php-eaccelerator/* &>/dev/null || :
+fi
+
+
%files
-%defattr(-, root, root, 0755)
+%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README*
%doc eaccelerator.ini *.php
%config(noreplace) %{_sysconfdir}/php.d/eaccelerator.ini
%{php_extdir}/eaccelerator.so
-%attr(0750, apache, apache) %{_localstatedir}/cache/php-eaccelerator
+%attr(0750,apache,apache) %{_var}/cache/php-eaccelerator/
%changelog
+* Mon Nov 26 2007 Matthias Saou <http://freshrpms.net/> 1:0.9.5.2-1
+- Update to 0.9.5.2.
+
+* Wed Aug 22 2007 Matthias Saou <http://freshrpms.net/> 1:0.9.5.1-7
+- Rebuild for new BuildID feature.
+
+* Sun Aug 12 2007 Matthias Saou <http://freshrpms.net/> 1:0.9.5.1-6
+- Change the ifarch ppc* to ifnarch x86(_64) since alpha also needs to be
+ excluded (#251302).
+
+* Mon Aug 6 2007 Matthias Saou <http://freshrpms.net/> 1:0.9.5.1-5
+- Update License field.
+
+* Wed Jul 25 2007 Jeremy Katz <katzj at redhat.com> - 1:0.9.5.1-4
+- rebuild for toolchain bug
+
+* 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
+
+* Fri Jun 22 2007 Matthias Saou <http://freshrpms.net/> 1:0.9.5.1-1
+- Update to 0.9.5.1.
+- Major spec file cleanup, based on current PHP packaging guidelines.
+- Set Epoch to 1, since the proper versionning is lower than previously :-(
+- Remove two upstreamed patches (php52fix and trac187).
+- Use sed instead of perl for the config file changes.
+- No longer use dist because we want to use the same package on F-n and n+1.
+
+* Wed May 16 2007 Matthias Saou <http://freshrpms.net/> 5.2.2_0.9.5-2
+- Include ppc64 %%ifarch, since it's now a Fedora target.
+- Include patch to fix trac bug #187.
+
+* Wed May 16 2007 Matthias Saou <http://freshrpms.net/> 5.2.2_0.9.5-1
+- Rebuild against PHP 5.2.2.
+
+* Mon Feb 19 2007 Matthias Saou <http://freshrpms.net/> 5.2.1_0.9.5-1
+- Rebuild against PHP 5.2.1.
+
+* Mon Dec 4 2006 Matthias Saou <http://freshrpms.net/> 5.2.0_0.9.5-2
+- Include patch to fix use of PHP 5.2 (ea #204, rh #218166).
+
+* Wed Nov 29 2006 Matthias Saou <http://freshrpms.net/> 5.2.0_0.9.5-1
+- Rebuild against PHP 5.2.0.
+
+* Wed Nov 8 2006 Matthias Saou <http://freshrpms.net/> 5.1.6_0.9.5-2
+- Change to require php-common instead of php, for fastcgi without apache.
+
+* Mon Oct 16 2006 Matthias Saou <http://freshrpms.net/> 5.1.6_0.9.5-1
+- Update to 0.9.5 final.
+- Add cleanup of the cache directory upon package removal.
+
+* Thu Sep 7 2006 Matthias Saou <http://freshrpms.net/> 5.1.6_0.9.5-0.4.rc1
+- Rebuild for PHP 5.1.6, eA still checks the exact PHP version it seems :-(
+- Put "Requires: php = %%{php_version}" back to avoid broken setups if/when
+ PHP gets updated.
+
+* Mon Aug 28 2006 Matthias Saou <http://freshrpms.net/> 5.1.4_0.9.5-0.4.rc1
+- FC6 rebuild.
+
+* Tue Aug 22 2006 Matthias Saou <http://freshrpms.net/> 5.1.4_0.9.5-0.3.rc1
+- Update to 0.9.5-rc1.
+- Enable shared-memory, sessions and content-caching (#201319).
+- Remove both patches of fixes, merged upstream.
+- Change from creating a full eaccelerator.ini to using the included one with
+ path substitutions and a patch to change default values.
+
+* Tue May 23 2006 Matthias Saou <http://freshrpms.net/> 5.1.x_0.9.5-0.2.beta2
+- Rebuild against PHP 5.1.4.
+
+* Fri May 5 2006 Matthias Saou <http://freshrpms.net/> 5.1.x_0.9.5-0.2.beta2
+- Rework heavily the API version requirement detection, should work with
+ chroots builds where PHP isn't installed outside.
+- Replace the CC way of getting the API version with php -i output.
+
+* Tue Apr 11 2006 Matthias Saou <http://freshrpms.net/> 5.1.x_0.9.5-0.1.beta2
+- Update to 0.9.5-beta2.
+
+* Tue Mar 14 2006 Matthias Saou <http://freshrpms.net/> 5.1.x_0.9.3-0.3
+- Pass userid 48 to configure script on PPC for sysvipc semaphores.
+
+* Tue Mar 14 2006 Matthias Saou <http://freshrpms.net/> 5.1.x_0.9.3-0.2
+- Update to latest eaccelerator-svn200603090012 snapshot.
+
+* Thu Feb 9 2006 Matthias Saou <http://freshrpms.net/> 5.1.x_0.9.3-0.1
+- Update to 5.1.x compatible snapshot.
+- Will try to make re2c available in Extras in order to build require it.
+
* Mon Oct 17 2005 Matthias Saou <http://freshrpms.net/> 4.x.x_0.9.3-4
- Re-add %%{?_smp_mflags}, as this was a false alarm.
- Force SEM to FCNTL as the IPC version is buggy on x86_64 SMP at least.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-eaccelerator/EL-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 17 Oct 2005 13:38:32 -0000 1.3
+++ sources 26 Nov 2007 12:39:16 -0000 1.4
@@ -1 +1 @@
-b17ddf953f18ee6df5c2c24ffccb37d9 eaccelerator-0.9.3.tar.gz
+7c44ee0bc5e7f74b7cb7f6360e015128 eaccelerator-0.9.5.2.tar.bz2
--- eaccelerator-0.9.3-buffer-overflow.patch DELETED ---
More information about the fedora-extras-commits
mailing list