From 1394bb97b77f98577fa4e6d83fce1564f1b5d6ea Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sun, 10 Jun 2012 07:14:25 +0200 Subject: repo reorg --- Makefile | 4 + eaccelerator-0.9.5-rc1-config.patch | 22 +++ php-eaccelerator.cron | 5 + php-eaccelerator.spec | 362 ++++++++++++++++++++++++++++++++++++ 4 files changed, 393 insertions(+) create mode 100644 Makefile create mode 100644 eaccelerator-0.9.5-rc1-config.patch create mode 100644 php-eaccelerator.cron create mode 100644 php-eaccelerator.spec diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..1e65467 --- /dev/null +++ b/Makefile @@ -0,0 +1,4 @@ +SRCDIR := $(shell pwd) +NAME := $(shell basename $(SRCDIR)) +include ../common/Makefile + diff --git a/eaccelerator-0.9.5-rc1-config.patch b/eaccelerator-0.9.5-rc1-config.patch new file mode 100644 index 0000000..bfa77a1 --- /dev/null +++ b/eaccelerator-0.9.5-rc1-config.patch @@ -0,0 +1,22 @@ +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" diff --git a/php-eaccelerator.cron b/php-eaccelerator.cron new file mode 100644 index 0000000..371f519 --- /dev/null +++ b/php-eaccelerator.cron @@ -0,0 +1,5 @@ +#!/bin/sh + +# Remove cache files not accessed during the last 7 days +/usr/sbin/tmpwatch -u -d -f 7d /var/cache/php-eaccelerator + diff --git a/php-eaccelerator.spec b/php-eaccelerator.spec new file mode 100644 index 0000000..daf1de8 --- /dev/null +++ b/php-eaccelerator.spec @@ -0,0 +1,362 @@ +%{!?phpname: %{expand: %%global phpname php}} + +%if %{phpname} == php +%global phpbindir %{_bindir} +%global phpconfdir %{_sysconfdir} +%global phpincldir %{_includedir} +%else +%global phpbindir %{_bindir}/%{phpname} +%global phpconfdir %{_sysconfdir}/%{phpname} +%global phpincldir %{_includedir}/%{phpname} +%endif + +%global php_extdir %(%{phpbindir}/php-config --extension-dir 2>/dev/null || echo "undefined") +%global php_version %((echo 0; %{phpbindir}/php-config --version 2>/dev/null) | tail -1) + +# 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 +%global apache 48 + +Summary: PHP accelerator, optimizer, encoder and dynamic content cacher +Name: %{phpname}-eaccelerator +Version: 0.9.6.1 +Release: 14%{?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/ +Source0: http://bart.eaccelerator.net/source/%{version}/eaccelerator-%{version}.tar.bz2 +Source1: php-eaccelerator.cron + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +# ABI check is not enough for this extension (http://eaccelerator.net/ticket/438) +Requires: %{phpname}-common%{?_isa} = %{php_version} +# Required by our cleanup cron job +Requires: tmpwatch +Provides: %{phpname}-zend_extension +Conflicts: %{phpname}-mmcache +BuildRequires: %{phpname}-devel >= 5.1.0 +# Required by phpize +BuildRequires: autoconf, automake, libtool + +%{?filter_setup} + + +%description +eAccelerator is a further development of the MMCache PHP Accelerator & Encoder. +It increases performance of PHP scripts by caching them in compiled state, so +that the overhead of compiling is almost completely eliminated. + + +%prep +%setup -q -c + +sed -e 's|php-eaccelerator|%{phpname}-eaccelerator|g' \ + %{SOURCE1} >%{phpname}-eaccelerator + +cp -r eaccelerator-%{version} eaccelerator-zts + +cd eaccelerator-%{version} +# Change paths in the example config +sed -i 's|/usr/lib/php/modules/|%{php_extdir}/|g; + s|/tmp/eaccelerator|%{_var}/cache/%{phpname}-eaccelerator|g' \ + eaccelerator.ini + +cd ../eaccelerator-zts +# Change paths in the example config +sed -i 's|/usr/lib/php/modules/|%{php_ztsextdir}/|g; + s|/tmp/eaccelerator|%{_var}/cache/%{phpname}-eaccelerator|g' \ + eaccelerator.ini + + +%build +cd eaccelerator-%{version} +%{phpbindir}/phpize +%configure \ + --with-php-config=%{phpbindir}/php-config \ +%ifnarch %{ix86} x86_64 + --with-eaccelerator-userid="%{apache}" +%endif + +make %{?_smp_mflags} + +cd ../eaccelerator-zts +%{phpbindir}/zts-phpize +%configure \ + --with-php-config=%{phpbindir}/zts-php-config \ +%ifnarch %{ix86} x86_64 + --with-eaccelerator-userid="%{apache}" +%endif + +make %{?_smp_mflags} + + +%install +rm -rf %{buildroot} +make -C eaccelerator-%{version} \ + install INSTALL_ROOT=%{buildroot} + +make -C eaccelerator-zts \ + install INSTALL_ROOT=%{buildroot} + +# The cache directory where pre-compiled files will reside +mkdir -p %{buildroot}%{_var}/cache/%{phpname}-eaccelerator + +# Drop in the bit of configuration +install -D -m 0644 eaccelerator-%{version}/eaccelerator.ini \ + %{buildroot}%{php_inidir}/eaccelerator.ini +install -D -m 0644 eaccelerator-zts/eaccelerator.ini \ + %{buildroot}%{php_ztsinidir}/eaccelerator.ini + +# Cache removal cron job +install -D -m 0755 -p %{phpname}-eaccelerator \ + %{buildroot}%{_sysconfdir}/cron.daily/%{phpname}-eaccelerator + + +%clean +rm -rf %{buildroot} + + +%preun +# Upon last removal (not update), clean all cache files +if [ $1 -eq 0 ]; then + rm -rf %{_var}/cache/%{phpname}-eaccelerator/* &>/dev/null || : +fi + +%post +# We don't want to require "httpd" in case PHP is used with some other web +# server or without any, but we do want the owner of this directory to default +# to apache for a working "out of the box" experience on the most common setup. +# +# We can't store numeric ownerships in %%files and have it work, so "fix" here, +# but only change the ownership if it's the current user (which is root), which +# allows users to manually change ownership and not have it change back. + +# Create the ghost'ed directory with default ownership and mode +if [ ! -d %{_var}/cache/%{phpname}-eaccelerator ]; then + mkdir -p %{_var}/cache/%{phpname}-eaccelerator + chown %{apache}:%{apache} %{_var}/cache/%{phpname}-eaccelerator + chmod 0750 %{_var}/cache/%{phpname}-eaccelerator +fi + + +%check +# Check if the built extension can be loaded +%{__php} \ + -n -q -d extension_dir=eaccelerator-%{version}/modules \ + -d extension=eaccelerator.so \ + --modules | grep eAccelerator + + +%files +%defattr(-,root,root,-) +%doc eaccelerator-%{version}/AUTHORS +%doc eaccelerator-%{version}/ChangeLog +%doc eaccelerator-%{version}/COPYING +%doc eaccelerator-%{version}/NEWS +%doc eaccelerator-%{version}/README* +%doc eaccelerator-%{version}/*.php +%{_sysconfdir}/cron.daily/%{phpname}-eaccelerator +%config(noreplace) %{php_inidir}/eaccelerator.ini +%config(noreplace) %{php_ztsinidir}/eaccelerator.ini +%{php_extdir}/eaccelerator.so +%{php_ztsextdir}/eaccelerator.so +# We need this hack, as otherwise rpm resets ownership upon package upgrade +#attr(0750,apache,apache) %{_var}/cache/php-eaccelerator/ +#attr(0750,root,root) %verify(not user group) %{_var}/cache/php-eaccelerator/ +%ghost %{_var}/cache/%{phpname}-eaccelerator/ + + +%changelog +* Wed May 09 2012 Remi Collet - 1:0.9.6.1-14 +- rebuild against PHP 5.3.13 + +* Thu May 03 2012 Remi Collet - 1:0.9.6.1-13 +- rebuild against PHP 5.3.12 + +* Fri Apr 27 2012 Remi Collet - 1:0.9.6.1-12 +- rebuild against PHP 5.3.11 + +* Fri Feb 03 2012 Remi Collet - 1:0.9.6.1-11 +- rebuild against PHP 5.3.10 + +* Tue Jan 10 2012 Remi Collet - 1:0.9.6.1-10 +- rebuild against PHP 5.3.9 +- add ZTS build + +* Tue Aug 23 2011 Remi Collet - 1:0.9.6.1-9 +- rebuild against PHP 5.3.8 + +* Thu Aug 18 2011 Remi Collet - 1:0.9.6.1-8 +- rebuild against PHP 5.3.7 +- add filter (to avoid private-shared-object-provides) + +* Wed Jul 13 2011 Matthias Saou 1:0.9.6.1-7 +- Add missing tmpwatch requirement (#711236). +- Stop using macros for simple commands, following recent guidelines changes. + +* Thu Mar 17 2011 Remi Collet - 1:0.9.6.1-6 +- rebuild against PHP 5.3.6 + +* Wed Feb 09 2011 Fedora Release Engineering - 1:0.9.6.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sat Jan 08 2011 Remi Collet - 1:0.9.6.1-4 +- allow relocation with %%{phpname} macro + +* Sat Jan 08 2011 Remi Collet - 1:0.9.6.1-4 +- rebuild against PHP 5.3.5 + +* Sun Aug 08 2010 Remi Collet - 1:0.9.6.1-3 +- rebuild against PHP 5.3.4 + +* Sun Aug 08 2010 Remi Collet - 1:0.9.6.1-2 +- strong requires PHP version +- rebuild against php 5.3.3 + +* Sat Jul 03 2010 Remi Collet - 1:0.9.6.1-1 +- update to 0.9.6.1 + +* Sat Feb 06 2010 Remi Collet - 1:0.9.6-1 +- add missing %%dist tag + +* Sat Feb 06 2010 Remi Collet - 1:0.9.6-1 +- update to 0.9.6 +- add minimal %%check (extension loadable) + +* Sun Jul 26 2009 Fedora Release Engineering - 1:0.9.6-0.2.svn358 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Tue Jul 14 2009 Remi Collet - 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 - 1:0.9.5.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Dec 24 2008 Matthias Saou 1:0.9.5.3-2 +- Update default cache dir to be ghosted and take care of creating it and + changing default ownership in the %%post scriplet (fixes #443407). + +* Mon Dec 22 2008 Matthias Saou 1:0.9.5.3-1 +- Update to 0.9.5.3. +- Include daily cleanup cron job (#470460). + +* Tue Feb 19 2008 Fedora Release Engineering +- Autorebuild for GCC 4.3 + +* Mon Nov 26 2007 Matthias Saou 1:0.9.5.2-1 +- Update to 0.9.5.2. + +* Wed Aug 22 2007 Matthias Saou 1:0.9.5.1-7 +- Rebuild for new BuildID feature. + +* Sun Aug 12 2007 Matthias Saou 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 1:0.9.5.1-5 +- Update License field. + +* Wed Jul 25 2007 Jeremy Katz - 1:0.9.5.1-4 +- rebuild for toolchain bug + +* Tue Jul 24 2007 Matthias Saou 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 1:0.9.5.1-2 +- Rebuild for new php + +* Fri Jun 22 2007 Matthias Saou 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 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 5.2.2_0.9.5-1 +- Rebuild against PHP 5.2.2. + +* Mon Feb 19 2007 Matthias Saou 5.2.1_0.9.5-1 +- Rebuild against PHP 5.2.1. + +* Mon Dec 4 2006 Matthias Saou 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 5.2.0_0.9.5-1 +- Rebuild against PHP 5.2.0. + +* Wed Nov 8 2006 Matthias Saou 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 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 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 5.1.4_0.9.5-0.4.rc1 +- FC6 rebuild. + +* Tue Aug 22 2006 Matthias Saou 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 5.1.x_0.9.5-0.2.beta2 +- Rebuild against PHP 5.1.4. + +* Fri May 5 2006 Matthias Saou 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 5.1.x_0.9.5-0.1.beta2 +- Update to 0.9.5-beta2. + +* Tue Mar 14 2006 Matthias Saou 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 5.1.x_0.9.3-0.2 +- Update to latest eaccelerator-svn200603090012 snapshot. + +* Thu Feb 9 2006 Matthias Saou 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 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. + +* Mon Jun 27 2005 Matthias Saou 4.x.x_0.9.3-3 +- Include buffer overflow patch from zoeloelip, this should fix the real + problem that wasn't in fact solved with the removal of _smp_mflags. +- Add explicit shm_and_disk defaults to the ini file. + +* Mon Jun 27 2005 Matthias Saou 4.x.x_0.9.3-2 +- Remove %%{?_smp_mflags}, since the module crashes otherwise (#161189). + +* Tue Jun 21 2005 Matthias Saou 4.x.x_0.9.3-1 +- Update to 0.9.3, bugfix release. + +* Fri Apr 7 2005 Michael Schwendt +- rebuilt + +* Tue Jan 11 2005 Matthias Saou 4.x.x_0.9.2a-0 +- Initial RPM release based on the php-mmcache spec file. + -- cgit