rpms/php-eaccelerator/FC-3 eaccelerator-0.9.3-buffer-overflow.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 php-eaccelerator.spec, 1.1, 1.2 sources, 1.2, 1.3
Matthias Saou (thias)
fedora-extras-commits at redhat.com
Mon Oct 17 13:38:34 UTC 2005
Author: thias
Update of /cvs/extras/rpms/php-eaccelerator/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10483/FC-3
Modified Files:
.cvsignore php-eaccelerator.spec sources
Added Files:
eaccelerator-0.9.3-buffer-overflow.patch
Log Message:
Update FC-3 branch to 0.9.3 and sync with FC-4 and devel (FC-5).
eaccelerator-0.9.3-buffer-overflow.patch:
--- NEW FILE eaccelerator-0.9.3-buffer-overflow.patch ---
diff -u eaccelerator-old/cache.c eaccelerator-0.9.3/cache.c
--- eaccelerator-old/cache.c 2005-04-26 16:47:58.000000000 +0200
+++ eaccelerator-0.9.3/cache.c 2005-06-27 13:54:13.370695656 +0200
@@ -276,7 +276,7 @@
if (f > 0) {
mm_file_header hdr;
EACCELERATOR_FLOCK (f, LOCK_EX);
- strcpy (hdr.magic, "EACCELERATOR");
+ strncpy (hdr.magic, "EACCELERATOR", 8);
hdr.eaccelerator_version = binary_eaccelerator_version;
hdr.zend_version = binary_zend_version;
hdr.php_version = binary_php_version;
diff -u eaccelerator-old/eaccelerator.c eaccelerator-0.9.3/eaccelerator.c
--- eaccelerator-old/eaccelerator.c 2005-06-23 13:06:47.431329000 +0200
+++ eaccelerator-0.9.3/eaccelerator.c 2005-06-27 13:53:58.575944800 +0200
@@ -921,7 +921,7 @@
f = open(s, O_CREAT | O_WRONLY | O_EXCL | O_BINARY, S_IRUSR | S_IWUSR);
if (f > 0) {
EACCELERATOR_FLOCK(f, LOCK_EX);
- strcpy(hdr.magic,"EACCELERATOR");
+ strncpy(hdr.magic, "EACCELERATOR", 8);
hdr.eaccelerator_version = binary_eaccelerator_version;
hdr.zend_version = binary_zend_version;
hdr.php_version = binary_php_version;
Common subdirectories: eaccelerator-old/eLoader and eaccelerator-0.9.3/eLoader
Common subdirectories: eaccelerator-old/win32 and eaccelerator-0.9.3/win32
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-eaccelerator/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 28 Jan 2005 16:22:52 -0000 1.2
+++ .cvsignore 17 Oct 2005 13:38:32 -0000 1.3
@@ -1 +1 @@
-eaccelerator-0.9.2a.tar.gz
+eaccelerator-0.9.3.tar.gz
Index: php-eaccelerator.spec
===================================================================
RCS file: /cvs/extras/rpms/php-eaccelerator/FC-3/php-eaccelerator.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-eaccelerator.spec 28 Jan 2005 16:22:52 -0000 1.1
+++ php-eaccelerator.spec 17 Oct 2005 13:38:32 -0000 1.2
@@ -1,16 +1,17 @@
-%define php_extdir %(php-config --extension-dir 2>/dev/null || echo /usr/lib/php4)
-%{!?php_version:%define php_version %(php-config --version 2>/dev/null || echo 4.3.10)}
+%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)}
-%define module_version 0.9.2a
+%define module_version 0.9.3
Summary: PHP accelerator, optimizer, encoder and dynamic content cacher
Name: php-eaccelerator
Version: %{php_version}_%{module_version}
-Release: 1
+Release: 4%{?dist}
License: GPL
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
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: php = %{php_version}
Provides: php-zend_extension
@@ -25,13 +26,20 @@
that the overhead of compiling is almost completely eliminated.
-%prep
-%setup -n eaccelerator
+%prep
+%setup -n eaccelerator-%{module_version}
+%patch -p1
%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
+%endif
+# Compile!
%{__make} %{?_smp_mflags}
@@ -60,6 +68,9 @@
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
@@ -78,6 +89,24 @@
%changelog
+* 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.
+
+* Mon Jun 27 2005 Matthias Saou <http://freshrpms.net/> 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 <http://freshrpms.net/> 4.x.x_0.9.3-2
+- Remove %%{?_smp_mflags}, since the module crashes otherwise (#161189).
+
+* Tue Jun 21 2005 Matthias Saou <http://freshrpms.net/> 4.x.x_0.9.3-1
+- Update to 0.9.3, bugfix release.
+
+* Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+- rebuilt
+
* Tue Jan 11 2005 Matthias Saou <http://freshrpms.net/> 4.x.x_0.9.2a-0
- Initial RPM release based on the php-mmcache spec file.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-eaccelerator/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 28 Jan 2005 16:22:52 -0000 1.2
+++ sources 17 Oct 2005 13:38:32 -0000 1.3
@@ -1 +1 @@
-e9059ebd49f14835534a1d96a97ababd eaccelerator-0.9.2a.tar.gz
+b17ddf953f18ee6df5c2c24ffccb37d9 eaccelerator-0.9.3.tar.gz
More information about the fedora-extras-commits
mailing list