+diff -ubrN php-5.2.5-orig/ext/apc/package.xml php-5.2.5/ext/apc/package.xml
+--- php-5.2.5-orig/ext/apc/package.xml 1969-12-31 18:00:00.000000000 -0600
++++ php-5.2.5/ext/apc/package.xml 2007-12-26 16:51:32.000000000 -0600
+@@ -0,0 +1,534 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<package packagerversion="1.4.9" version="2.0" xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0 http://pear.php.net/dtd/package-2.0.xsd">
++ <name>APC</name>
++ <channel>pecl.php.net</channel>
++ <summary>Alternative PHP Cache</summary>
++ <description>APC is a free, open, and robust framework for caching and optimizing PHP intermediate code.</description>
++ <lead>
++ <name>Daniel Cowgill</name>
++ <user>dcowgill</user>
++ <email>dan@mail.communityconnect.com</email>
++ <active>no</active>
++ </lead>
++ <lead>
++ <name>George Schlossnagle</name>
++ <user>gschlossnagle</user>
++ <email>george@omniti.com</email>
++ <active>no</active>
++ </lead>
++ <lead>
++ <name>Rasmus Lerdorf</name>
++ <user>rasmus</user>
++ <email>rasmus@php.net</email>
++ <active>yes</active>
++ </lead>
++ <lead>
++ <name>Gopal Vijayaraghavan</name>
++ <user>gopalv</user>
++ <email>gopalv@php.net</email>
++ <active>yes</active>
++ </lead>
++ <developer>
++ <name>Edin Kadribasic</name>
++ <user>edink</user>
++ <email>edink@emini.dk</email>
++ <active>yes</active>
++ </developer>
++ <developer>
++ <name>Ilia Alshanetsky</name>
++ <user>iliaa</user>
++ <email>ilia@prohost.org</email>
++ <active>yes</active>
++ </developer>
++ <developer>
++ <name>Marcus Börger</name>
++ <user>helly</user>
++ <email>helly@php.net</email>
++ <active>yes</active>
++ </developer>
++ <developer>
++ <name>Sara Golemon</name>
++ <user>pollita</user>
++ <email>pollita@php.net</email>
++ <active>yes</active>
++ </developer>
++ <developer>
++ <name>Brian Shire</name>
++ <user>shire</user>
++ <email>shire@php.net</email>
++ <active>yes</active>
++ </developer>
++ <date>2007-12-26</date>
++ <time>14:51:32</time>
++ <version>
++ <release>3.0.16</release>
++ <api>3.0.0</api>
++ </version>
++ <stability>
++ <release>stable</release>
++ <api>stable</api>
++ </stability>
++ <license uri="http://www.php.net/license">PHP License</license>
++ <notes>* Fix for longstanding cache-full crash (Christian Seiler)
++ http://news.php.net/php.pecl.dev/4951 for the details
++* Added optional shm unmap on a fatal signal feature (Lucas Nealan)
++* Added PTHREAD_MUTEX_ADAPTIVE_NP option pthread locks (Paul Saab)
++* Minor cleanups (Lucas Nealan)
++* Added configure option to enable apc_cache_info('filehits') (Shire)</notes>
++ <contents>
++ <dir name="/">
++ <file md5sum="841596cff3b9bd83e79d01ccb591ff55" name="tests/apc_001.phpt" role="test" />
++ <file md5sum="cc1dba4e429ff93dce1ca7dea01c2899" name="tests/apc_002.phpt" role="test" />
++ <file md5sum="411fdc85b170ec696298d38f93132d6b" name="tests/apc_003.phpt" role="test" />
++ <file md5sum="6ecba4154b6bd6f8703000f5198710cc" name="tests/skipif.inc" role="test" />
++ <file md5sum="2a2e8b29dba8df697dbd81b306ccbe73" name="arch/i386/atomic.h" role="src" />
++ <file md5sum="7f01c5cd3a1742c20d6d285f119596a6" name="arch/x86_64/atomic.h" role="src" />
++ <file md5sum="26748a0d6567c5611408eb69fb25c671" name="arch/atomic.h" role="src" />
++ <file md5sum="0714a0039d9ea63cfc26043a7d86f04c" name="CHANGELOG" role="doc" />
++ <file md5sum="3b6ad608e37fb34b24afb90084b4770b" name="INSTALL" role="doc" />
++ <file md5sum="694f49a7e1f276ba75a3dd2c5acd580d" name="LICENSE" role="doc" />
++ <file md5sum="eea150699d3dffb2cdf7d243854189d7" name="NOTICE" role="doc" />
++ <file md5sum="efa40416571fc54aa59912203c0391e6" name="TODO" role="doc" />
++ <file md5sum="b7dd14328e218d3ecc97d85fb83d7ba7" name="TECHNOTES.txt" role="doc" />
++ <file md5sum="c4384f370db6a6112d6c21268bc9a278" name="apc.c" role="src" />
++ <file md5sum="09a525ff9a3850e6de42eee2adf07463" name="apc.dsp" role="src" />
++ <file md5sum="109694ee417962096eb3e962d6bcce8a" name="apc.h" role="src" />
++ <file md5sum="ee19b49ef26dbd491b846a19f9bc9e6a" name="apc_cache.c" role="src" />
++ <file md5sum="e0a4f0c5a49a0beba10f2f831e1b63b6" name="apc_cache.h" role="src" />
++ <file md5sum="7576310688084dd737f7c7bc11c75e22" name="apc_compile.c" role="src" />
++ <file md5sum="a0eea1abcf4ec395ea9a195e98c2cc65" name="apc_compile.h" role="src" />
++ <file md5sum="64bbe1f8cf18261255ef5874039e76e9" name="apc_debug.c" role="src" />
++ <file md5sum="46d182a6122f3c29a1904f62af7cfb51" name="apc_debug.h" role="src" />
++ <file md5sum="3dbdb44d0fc2d45ae15719b4fc5746cd" name="apc_fcntl.c" role="src" />
++ <file md5sum="f4fc86769ce871d42ce0085fa7323d79" name="apc_fcntl.h" role="src" />
++ <file md5sum="9dffe726c9b6cfdd640e07782a0f409b" name="apc_futex.c" role="src" />
++ <file md5sum="ff999238a10bfb6b715e4e8f54ec8326" name="apc_futex.h" role="src" />
++ <file md5sum="33d241202d41095bc1b6fdafc1063cb9" name="apc_globals.h" role="src" />
++ <file md5sum="3e6f98c635b18902aab221f29d8b70ec" name="apc_lock.h" role="src" />
++ <file md5sum="0667187c715fea98569b51a491fb445b" name="apc_main.c" role="src" />
++ <file md5sum="2e8f99d31b4d088eb14859c6e137544a" name="apc_main.h" role="src" />
++ <file md5sum="e9e447ef3994b85d064c9a49f7ed0917" name="apc_mmap.c" role="src" />
++ <file md5sum="a22df1256e20fef8160bbf9529723b50" name="apc_php.h" role="src" />
++ <file md5sum="c285337c2e0b852de9f79ac5015a3fa7" name="apc_pthreadmutex.c" role="src" />
++ <file md5sum="e4e6943b0cfb31facd1148c2dbfc4c93" name="apc_pthreadmutex.h" role="src" />
++ <file md5sum="ea3822772adb45e0046faef855c32aba" name="apc_sem.c" role="src" />
++ <file md5sum="1a7fb689f8d5b01fad537b277c81d59f" name="apc_sem.h" role="src" />
++ <file md5sum="632e60d387e5555f4aa03a8948f52ea7" name="apc_shm.c" role="src" />
++ <file md5sum="6de8e94976f01b2f48ef97020a008774" name="apc_shm.h" role="src" />
++ <file md5sum="25d3e2a3d1c2f9afa8e103492ca7e89e" name="apc_sma.c" role="src" />
++ <file md5sum="fdc0aebc501f2e29389611fa61084da0" name="apc_sma.h" role="src" />
++ <file md5sum="ecd6cc1d56d99dbb7364d40c975fca5e" name="apc_spin.c" role="src" />
++ <file md5sum="c716852258453471a6927f95a617e30f" name="apc_spin.h" role="src" />
++ <file md5sum="17cceda297a61a9185bcafd7d897fad4" name="apc_stack.c" role="src" />
++ <file md5sum="db2f213a3e616313d7864222874197ea" name="apc_stack.h" role="src" />
++ <file md5sum="8cccb8ecfa2d5a893537b2c1a8b6b718" name="apc_zend.c" role="src" />
++ <file md5sum="2ee61624ec5d779d02746ba7254aed14" name="apc_zend.h" role="src" />
++ <file md5sum="113d74a5e70119a63fb86815bf50d03b" name="apc_signal.c" role="src" />
++ <file md5sum="af4c7d0595ce32346f7ee37707d7dada" name="apc_signal.h" role="src" />
++ <file md5sum="5cbb3cbe6477799e7e5fd816eda69937" name="config.m4" role="src" />
++ <file md5sum="b748744f64eb4fbe201cce84cc3d7e33" name="php_apc.c" role="src" />
++ <file md5sum="8c092033ef0cd8a5d207acb4f6ecec11" name="php_apc.h" role="src" />
++ <file md5sum="76fe025ee14897783cee848dc1a77fa6" name="pgsql_s_lock.c" role="src" />
++ <file md5sum="b67725b96ecf0e6851eccce632bab289" name="pgsql_s_lock.h" role="src" />
++ <file md5sum="298e1c6721b21635ef46094c6a175af5" name="apc_fcntl_win32.c" role="src" />
++ <file md5sum="072c127617c90a92331372a3b99494d3" name="apc_rfc1867.c" role="src" />
++ <file md5sum="41fb805e7a151dc6edfe78780b5102d0" name="apc.php" role="php" />
++ </dir>
++ </contents>
++ <dependencies>
++ <required>
++ <php>
++ <min>4.3.0</min>
++ <exclude>5.0.0</exclude>
++ <exclude>5.0.1</exclude>
++ <exclude>5.0.2</exclude>
++ <exclude>5.0.3</exclude>
++ <exclude>5.0.4</exclude>
++ <exclude>5.0.5</exclude>
++ </php>
++ <pearinstaller>
++ <min>1.4.0</min>
++ </pearinstaller>
++ </required>
++ </dependencies>
++ <providesextension>apc</providesextension>
++ <extsrcrelease>
++ <configureoption default="yes" name="with-apxs" prompt="Use apxs to set compile flags (if using APC with Apache)?" />
++ </extsrcrelease>
++ <changelog>
++ <release>
++ <stability>
++ <release>stable</release>
++ <api>stable</api>
++ </stability>
++ <version>
++ <release>2.0.0</release>
++ <api>2.0.0</api>
++ </version>
++ <date>2003-07-01</date>
++ <notes>Complete rework.</notes>
++ </release>
++ <release>
++ <stability>
++ <release>stable</release>
++ <api>stable</api>
++ </stability>
++ <version>
++ <release>2.0.1</release>
++ <api>2.0.0</api>
++ </version>
++ <date>2003-07-01</date>
++ <notes>Win32 support added.</notes>
++ </release>
++ <release>
++ <stability>
++ <release>stable</release>
++ <api>stable</api>
++ </stability>
++ <version>
++ <release>2.0.2</release>
++ <api>2.0.0</api>
++ </version>
++ <date>2004-03-12</date>
++ <notes>Fixed non-existant class bug.</notes>
++ </release>
++ <release>
++ <stability>
++ <release>stable</release>
++ <api>stable</api>
++ </stability>
++ <version>
++ <release>3.0.0</release>
++ <api>3.0.0</api>
++ </version>
++ <date>2005-07-05</date>
++ <notes>PHP-5.1 Support and numerous fixes</notes>
++ </release>
++ <release>
++ <stability>
++ <release>stable</release>
++ <api>stable</api>
++ </stability>
++ <version>
++ <release>3.0.1</release>
++ <api>3.0.0</api>
++ </version>
++ <date>2005-07-05</date>
++ <notes>PHP4 build fix</notes>
++ </release>
++ <release>
++ <stability>
++ <release>stable</release>
++ <api>stable</api>
++ </stability>
++ <version>
++ <release>3.0.2</release>
++ <api>3.0.0</api>
++ </version>
++ <date>2005-07-05</date>
++ <notes>Default to mmap and add a better error message for shmget failures</notes>
++ </release>
++ <release>
++ <stability>
++ <release>stable</release>
++ <api>stable</api>
++ </stability>
++ <version>
++ <release>3.0.3</release>
++ <api>3.0.0</api>
++ </version>
++ <date>2005-07-07</date>
++ <notes>Fix compile problem against PHP 5.0.x</notes>
++ </release>
++ <release>
++ <stability>
++ <release>stable</release>
++ <api>stable</api>
++ </stability>
++ <version>
++ <release>3.0.4</release>
++ <api>3.0.0</api>
++ </version>
++ <date>2005-07-18</date>
++ <notes>Add win32 support from Edin.
++Add --with-apxs switch to work around problem when loading APC into Apache binary compiled with LFS switches
++A couple of other minor fixes.</notes>
++ </release>
++ <release>
++ <stability>
++ <release>stable</release>
++ <api>stable</api>
++ </stability>
++ <version>
++ <release>3.0.5</release>
++ <api>3.0.0</api>
++ </version>
++ <date>2005-07-27</date>
++ <notes>Make it easier for sapis that only populate file_handle->filename to use APC. (Rasmus)
++Support extensions such as bcompiler that need to hook into compile_file. (Val)
++Ralf Becker's apcgui code has now become the default apc.php status page. (Ralf, Rasmus, Ilia)
++Segfault in cache cleanup code (Ilia, Rasmus)</notes>
++ </release>
++ <release>
++ <stability>
++ <release>stable</release>
++ <api>stable</api>
++ </stability>
++ <version>
++ <release>3.0.6</release>
++ <api>3.0.0</api>
++ </version>
++ <date>2005-07-30</date>
++ <notes>Added apc.php to package.xml file.
++Track per-entry memory usage. (Val)
++Various apc.php fixes and enhancements. (Ralf, Ilia, Rasmus)
++fcntl locking robustness fixes. (Rasmus)
++Shared read-locks where possible. (Rasmus)
++Added file_update_protection configuration parameter. (Rasmus)
++Windows ZTS fixes (Frank)</notes>
++ </release>
++ <release>
++ <stability>
++ <release>stable</release>
++ <api>stable</api>
++ </stability>
++ <version>
++ <release>3.0.7</release>
++ <api>3.0.0</api>
++ </version>
++ <date>2005-08-16</date>
++ <notes>Fix to apc.php to show final segment in frag chart. (Ilia)
++A couple of win32 fixes. (Frank)
++Add apc.enable_cli ini directive. (Rasmus)
++Add test cases. (Marcus)
++Fix apc_define_constants() bug - http://pecl.php.net/bugs/5084 (Rasmus)
++Simplify user cache handling by removing the user_cache_stack (Rasmus)
++Fix apc_fetch() memory corruption (Andrei,Rasmus)
++Added apc.max_file_size INI setting that allows exclusion of large files from being cached. Default file size limit, 1 megabyte. (Ilia)</notes>
++ </release>
++ <release>
++ <stability>
++ <release>stable</release>
++ <api>stable</api>
++ </stability>
++ <version>
++ <release>3.0.8</release>
++ <api>3.0.0</api>
++ </version>
++ <date>2005-08-24</date>
++ <notes>Fix invalid free in globals destructor introduced in 3.0.7 (Rasmus)
++Cache corruption fix in cache-full cleanup code (Gopal)</notes>
++ </release>
++ <release>
++ <stability>
++ <release>stable</release>
++ <api>stable</api>
++ </stability>
++ <version>
++ <release>3.0.9</release>
++ <api>3.0.0</api>
++ </version>
++ <date>2006-03-04</date>
++ <notes>Eliminate rand() call when slam_defense is not set (Rasmus)
++Fix for __isset problem (Gopal)
++Rewrite allocator from a "best fit" to a "next fit" algorithm (Rasmus)
++Added a Cache Full counter so we have an idea how many times the segment has filled up causing an expunge (Rasmus)
++Report back the correct number of available bytes in the segment instead of the allocated bytes. (Rasmus)
++Add cache busy flag which is set when an expunge is underway (Rasmus)
++Add automatic serialization of objects in apc_store() (Marcus)
++64-bit .ini flag fix (Rasmus)
++Static members fix (Gopal)
++sma_cleanup() mem leak fix (Rasmus)
++Fix for http://pecl.php.net/bugs/5311 (Rasmus)
++Fix autoglobals JIT bug (Gopal)
++Fix instance bug (Gopal)
++Add a lock cleanup safety net to request shutdown (Rasmus)
++Fix apc.slam_defense edge-case bug (Rasmus)
++User entry memory usage tracking support (Ilia)
++Allow keys used in apc_store/apc_fetch/apc_delete to be binary safe and prevent conflicts between keys that are found at the start of other keys. (Ilia)</notes>
++ </release>
++ <release>
++ <stability>
++ <release>stable</release>
++ <api>stable</api>
++ </stability>
++ <version>
++ <release>3.0.10</release>
++ <api>3.0.0</api>
++ </version>
++ <date>2006-03-11</date>
++ <notes>* Add apc.stat ini flag which defaults to 1. If set to 0, the main script and any fullpath
++ includes will not be stat'ed for any changes. You will have to restart the server if you
++ change anything. This mode increases performance quite a bit, especially if you have a
++ lot of includes.
++
++* Get rid of the lock safety net hack I added in 3.0.9. It seems to cause more problems
++ than it solves. I'll need to revisit locking and signal handling at some point soon.</notes>
++ </release>
++ <release>
++ <stability>
++ <release>stable</release>
++ <api>stable</api>
++ </stability>
++ <version>
++ <release>3.0.11</release>
++ <api>3.0.0</api>
++ </version>
++ <date>2006-08-16</date>
++ <notes>* Made --enable-apc-mmap the default compile option (for real this time)
++
++* Add an optional flag to apc_cache_info() and some apc.php tweaks to make it
++ only fetch header information to make it useful when you have tens of
++ thousands of entries. (Brian Shire)
++
++* 64-bit fixes (George)
++
++* Don't mix Full Path and Inode keys (George)
++
++* Override ZEND_INCLUDE_OR_EVAL opcode (when possible) to speed up use of
++ require_once() and include_once() statements. (Sara)
++
++* Add a non-blocking write_lock for cache inserts. This is a better approach
++ to prevent cache slams and deprecates the slam_defense setting. (Rasmus)
++
++* A bit of work on the optimizer. (Sara)
++
++* Various memory issues resolved. (Gopal)</notes>
++ </release>
++ <release>
++ <stability>
++ <release>stable</release>
++ <api>stable</api>
++ </stability>
++ <version>
++ <release>3.0.12</release>
++ <api>3.0.0</api>
++ </version>
++ <date>2006-09-04</date>
++ <notes>* Fix stray debug message
++
++* Work on the optimizer - still not stable (Gopal, Ilia, Sara)
++
++* Performance boost - Replace multiple loops over the opcode
++ array with a single loop for copying, jump fixups and auto
++ global pre-fetches. (Gopal)
++
++* Perform fetch_global checks only in php5 and only if
++ auto_globals_jit is enabled. (Gopal)
++
++* Fix bug #8579 - scrub php4 classes' function_table and default
++ properties before inserting into cache. (Gopal)
++
++* Fix bug #8606 - ZEND_FETCH_GLOBAL is not an opcode, but is a
++ op1->type. The opcodes applicable are ZEND_FETCH_R and
++ ZEND_FETCH_W. (Gopal)
++
++* PHP 5.2 Compatibility (Gopal)
++
++* Make the include_once override optional - default off (Sara)
++
++* Fixed crash when apc run in CLI, but enable_cli is off. (Ilia)
++
++* Ensure that the apc_globals->cache_stack is cleared before the
++ shm cache is destroyed. Fixes segfault for corner-case i.e request
++ shutdown (apc_deactivate) is not called before module shutdown
++ calls (php_apc_shutdown_globals) (Gopal)
++
++* TSRM fixes (ensure ts_free_id before apc.so is dlclosed) (Gopal)
++
++* Fix memory leak of apc_cache_info_t->deleted_list (Gopal)</notes>
++ </release>
++ <release>
++ <stability>
++ <release>stable</release>
++ <api>stable</api>
++ </stability>
++ <version>
++ <release>3.0.12p1</release>
++ <api>3.0.0</api>
++ </version>
++ <date>2006-09-05</date>
++ <notes>* The only change here is a trivial PHP 4 build fix.</notes>
++ </release>
++ <release>
++ <stability>
++ <release>stable</release>
++ <api>stable</api>
++ </stability>
++ <version>
++ <release>3.0.12p2</release>
++ <api>3.0.0</api>
++ </version>
++ <date>2006-09-05</date>
++ <notes>* Let's get the version number right. 3.0.12p2 now.</notes>
++ </release>
++ <release>
++ <stability>
++ <release>stable</release>
++ <api>stable</api>
++ </stability>
++ <version>
++ <release>3.0.13</release>
++ <api>3.0.0</api>
++ </version>
++ <date>2007-02-24</date>
++ <notes>* PHP 5.2 file upload progress tracking support (Rasmus)
++* Pthread mutex and spin locks (Shire)
++* Recursive zval support for apc_fetch/_store (Shire, Gopal)
++* apc.stat_ctime flag for ctime checks (Rasmus)
++* Multiple key fetches with apc_fetch (Shire)
++* Canary checks for shm memory deallocation (Gopal)
++* Add hooks for external optimizer (Shire)
++* Obsolete and remove apc optimizer (Gopal)
++* APC info changes - cache insert rate, hit and miss rates (Shire)
++* Fix apc_load_constants (Gopal)
++* Rewrite dump opcode code to use vld (Gopal)
++* Use apc_[ewn]print functions for error reporting (Shire)
++* Auto global fixes and refactoring (Gopal, Shire)
++* Fix memory leaks in object serialization (Ilia)
++* Memory cleanup code for destructor order (Gopal)
++* Win32 build fixes (Ilia, Wez)
++* ZTS and Php 4 build fixes (Bjori)
++* Add apc_add() function (Rasmus)
++* Add optional limited flag to apc_sma_info() (Rasmus)</notes>
++ </release>
++ <release>
++ <stability>
++ <release>stable</release>
++ <api>stable</api>
++ </stability>
++ <version>
++ <release>3.0.14</release>
++ <api>3.0.0</api>
++ </version>
++ <date>2007-04-02</date>
++ <notes>* Build fix (Shire)
++* Don't hook the upload hook if APC is disabled (Rasmus)
++* Local shadow cache support (Gopal)
++* Avoid uneccessary loops over op_arrays for "known" auto-globals (Gopal)
++* Fix apc_add() to overwrite timed out user entries (Rasmus)
++* Fix double inclusion of files with conditional classes in php4 (Gopal)
++* Allocator fixes to reduce fragmentation (Gopal)</notes>
++ </release>
++ <release>
++ <stability>
++ <release>stable</release>
++ <api>stable</api>
++ </stability>
++ <version>
++ <release>3.0.15</release>
++ <api>3.0.0</api>
++ </version>
++ <date>2007-10-18</date>
++ <notes>* Eliminate a per-request time() syscall (Rasmus)
++* Added rfc1867 prefix, name, and freq ini options (Shire)
++* Allow deletion of individual user cache entries via apc.php (Sara)
++* Fix overzealous cleanup during RSHUTDOWN (Gopal)
++* Fix memory alignment and locking issues (Gopal)
++* Make apc_compile insert/replace entries (Shire)
++* Make mixed inheritance recompile & cache afresh (Gopal)
++* Make nostat mode search include_path for canonicalization (Gopal)
++* ZTS & other compile fixes (Gopal, Edin, Shire)</notes>
++ </release>
++ </changelog>
++</package>
+diff -ubrN php-5.2.5-orig/ext/apc/pgsql_s_lock.c php-5.2.5/ext/apc/pgsql_s_lock.c
+--- php-5.2.5-orig/ext/apc/pgsql_s_lock.c 1969-12-31 18:00:00.000000000 -0600
++++ php-5.2.5/ext/apc/pgsql_s_lock.c 2007-12-26 16:51:32.000000000 -0600