keks-overlay.git

@@ -1,3 +0,0 @@

-AUX pecl-apc-3.0.17-fix-useless-warnings.diff 4325 RMD160 9eaee3a7fdcf6e199a45993da087710cecf0f4b1 SHA1 ddb66d3806e8dbe80a897b77989ac3389cbe0ef6 SHA256 478e9f6483915351af78c11fac8b0805450f09cca00f51de2e4b05a1b6f986b0

-DIST APC-3.1.7.tgz 152735 RMD160 523c3b6aec6b712a89e36243cb7bf2a3297ae7ac SHA1 fd30aa79c7632f3da90193376a91152d157fa91f SHA256 9a526bdaa51ec8e84c2413e0f9c15099b951c39c995439ff2f54a3340a879b76

-EBUILD pecl-apc-3.1.7.ebuild 2639 RMD160 71159ce864b869bad95bb6ad99ce888d4b34c6de SHA1 11e2a495df57b0956925cd67124e453e2632d10c SHA256 9c8fccb3c9a2b312b989ccc57f6bb2c129854cc2c82028024659523258c40748

@@ -1,86 +0,0 @@

-diff -Naur APC-3.1.7/apc_bin.c APC-3.1.7-1//apc_bin.c

---- APC-3.1.7/apc_bin.c	2011-01-11 20:06:38.000000000 +0100

-+++ APC-3.1.7-1//apc_bin.c	2011-04-06 19:28:51.048623272 +0200

-@@ -703,7 +703,7 @@

-     apc_bd_alloc_ex(pool_ptr, sizeof(apc_pool) TSRMLS_CC);

-     ctxt.pool = apc_pool_create(APC_UNPOOL, apc_bd_alloc, apc_bd_free, NULL, NULL TSRMLS_CC);  /* ideally the pool wouldn't be alloc'd as part of this */

-     if (!ctxt.pool) { /* TODO need to cleanup */

--        apc_warning("Unable to allocate memory for pool." TSRMLS_CC);

-+        php_log_err("Unable to allocate memory for pool." TSRMLS_CC);

-         return NULL;

-     }

-     ctxt.copy = APC_COPY_IN_USER;  /* avoid stupid ALLOC_ZVAL calls here, hack */

-@@ -854,7 +854,7 @@

-     for(i = 0; i < bd->num_entries; i++) {

-         ctxt.pool = apc_pool_create(APC_SMALL_POOL, apc_sma_malloc, apc_sma_free, apc_sma_protect, apc_sma_unprotect TSRMLS_CC);

-         if (!ctxt.pool) { /* TODO need to cleanup previous pools */

--            apc_warning("Unable to allocate memory for pool." TSRMLS_CC);

-+            php_log_err("Unable to allocate memory for pool." TSRMLS_CC);

-             goto failure;

-         }

-         ep = &bd->entries[i];

-diff -Naur APC-3.1.7/apc_cache.c APC-3.1.7-1//apc_cache.c

---- APC-3.1.7/apc_cache.c	2011-01-11 20:06:38.000000000 +0100

-+++ APC-3.1.7-1//apc_cache.c	2011-04-06 19:29:39.271030454 +0200

-@@ -1270,6 +1270,7 @@

- /* {{{ apc_cache_is_last_key */

- zend_bool apc_cache_is_last_key(apc_cache_t* cache, apc_cache_key_t* key, unsigned int h, time_t t TSRMLS_DC)

- {

-+    char *log_message;

-     apc_keyid_t *lastkey = &cache->header->lastkey;

-     unsigned int keylen = key->data.user.identifier_len;

- #ifdef ZTS

-@@ -1288,7 +1289,10 @@

-         if(lastkey->mtime == t && FROM_DIFFERENT_THREAD(lastkey)) {

-             /* potential cache slam */

-             if(APCG(slam_defense)) {

--                apc_warning("Potential cache slam averted for key '%s'" TSRMLS_CC, key->data.user.identifier);

-+                log_message = emalloc((key->data.user.identifier_len + 40) * sizeof(char));

-+                sprintf(log_message, "Potential cache slam averted for key '%s'", key->data.user.identifier);

-+                php_log_err(log_message TSRMLS_CC);

-+                efree(log_message);

-                 return 1;

-             }

-         }

-diff -Naur APC-3.1.7/apc_main.c APC-3.1.7-1//apc_main.c

---- APC-3.1.7/apc_main.c	2011-01-11 20:06:38.000000000 +0100

-+++ APC-3.1.7-1//apc_main.c	2011-04-06 19:28:51.049623231 +0200

-@@ -414,7 +414,7 @@

-     ctxt.pool = apc_pool_create(APC_MEDIUM_POOL, apc_sma_malloc, apc_sma_free, 

-                                                  apc_sma_protect, apc_sma_unprotect TSRMLS_CC);

-     if (!ctxt.pool) {

--        apc_warning("Unable to allocate memory for pool." TSRMLS_CC);

-+        php_log_err("Unable to allocate memory for pool." TSRMLS_CC);

-         return FAILURE;

-     }

-     ctxt.copy = APC_COPY_IN_OPCODE;

-@@ -539,7 +539,7 @@

-         ctxt.pool = apc_pool_create(APC_UNPOOL, apc_php_malloc, apc_php_free,

-                                                 apc_sma_protect, apc_sma_unprotect TSRMLS_CC);

-         if (!ctxt.pool) {

--            apc_warning("Unable to allocate memory for pool." TSRMLS_CC);

-+            php_log_err("Unable to allocate memory for pool." TSRMLS_CC);

-             return old_compile_file(h, type TSRMLS_CC);

-         }

-         ctxt.copy = APC_COPY_OUT_OPCODE;

-diff -Naur APC-3.1.7/php_apc.c APC-3.1.7-1//php_apc.c

---- APC-3.1.7/php_apc.c	2011-01-11 20:06:38.000000000 +0100

-+++ APC-3.1.7-1//php_apc.c	2011-04-06 19:28:51.049623231 +0200

-@@ -578,7 +578,7 @@

- 

-     ctxt.pool = apc_pool_create(APC_SMALL_POOL, apc_sma_malloc, apc_sma_free, apc_sma_protect, apc_sma_unprotect TSRMLS_CC);

-     if (!ctxt.pool) {

--        apc_warning("Unable to allocate memory for pool." TSRMLS_CC);

-+        php_log_err("Unable to allocate memory for pool." TSRMLS_CC);

-         return 0;

-     }

-     ctxt.copy = APC_COPY_IN_USER;

-@@ -819,7 +819,7 @@

- 

-     ctxt.pool = apc_pool_create(APC_UNPOOL, apc_php_malloc, apc_php_free, NULL, NULL TSRMLS_CC);

-     if (!ctxt.pool) {

--        apc_warning("Unable to allocate memory for pool." TSRMLS_CC);

-+        php_log_err("Unable to allocate memory for pool." TSRMLS_CC);

-         RETURN_FALSE;

-     }

-     ctxt.copy = APC_COPY_OUT_USER;

@@ -1,74 +0,0 @@

-# Copyright 1999-2011 Gentoo Foundation

-# Distributed under the terms of the GNU General Public License v2

-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-apc/pecl-apc-3.1.7.ebuild,v 1.5 2011/03/24 17:49:38 xarthisius Exp $

-

-EAPI=2

-

-PHP_EXT_NAME="apc"

-PHP_EXT_PECL_PKG="APC"

-PHP_EXT_INI="yes"

-PHP_EXT_ZENDEXT="no"

-DOCS="CHANGELOG INSTALL NOTICE TECHNOTES.txt TODO"

-

-inherit php-ext-pecl-r2 confutils eutils

-

-KEYWORDS="amd64 ppc ppc64 x86"

-

-DESCRIPTION="A free, open, and robust framework for caching and optimizing PHP code."

-LICENSE="PHP-3.01"

-SLOT="0"

-IUSE="mmap"

-

-DEPEND="!dev-php/eaccelerator !dev-php5/xcache"

-RDEPEND="${DEPEND}"

-

-src_prepare() {

-	epatch "${FILESDIR}"/pecl-apc-3.0.17-fix-useless-warnings.diff

-	php-ext-source-r2_src_prepare

-}

-

-src_configure() {

-	my_conf="--enable-apc"

-	enable_extension_enable "apc-mmap" "mmap" 0

-

-	php-ext-source-r2_src_configure

-}

-

-src_install() {

-	php-ext-pecl-r2_src_install

-

-	php-ext-source-r2_addtoinifiles "apc.enabled" '"1"'

-	php-ext-source-r2_addtoinifiles "apc.shm_segments" '"1"'

-	php-ext-source-r2_addtoinifiles "apc.shm_size" '"30M"'

-	php-ext-source-r2_addtoinifiles "apc.num_files_hint" '"1024"'

-	php-ext-source-r2_addtoinifiles "apc.ttl" '"7200"'

-	php-ext-source-r2_addtoinifiles "apc.user_ttl" '"7200"'

-	php-ext-source-r2_addtoinifiles "apc.gc_ttl" '"3600"'

-	php-ext-source-r2_addtoinifiles "apc.cache_by_default" '"1"'

-	php-ext-source-r2_addtoinifiles ";apc.filters" '""'

-	php-ext-source-r2_addtoinifiles ";apc.mmap_file_mask" '"/tmp/apcphp5.XXXXXX"'

-	php-ext-source-r2_addtoinifiles "apc.slam_defense" '"0"'

-	php-ext-source-r2_addtoinifiles "apc.file_update_protection" '"2"'

-	php-ext-source-r2_addtoinifiles "apc.enable_cli" '"0"'

-	php-ext-source-r2_addtoinifiles "apc.max_file_size" '"1M"'

-	php-ext-source-r2_addtoinifiles "apc.stat" '"1"'

-	php-ext-source-r2_addtoinifiles "apc.write_lock" '"1"'

-	php-ext-source-r2_addtoinifiles "apc.report_autofilter" '"0"'

-	php-ext-source-r2_addtoinifiles "apc.include_once_override" '"0"'

-	php-ext-source-r2_addtoinifiles "apc.rfc1867" '"0"'

-	php-ext-source-r2_addtoinifiles "apc.rfc1867_prefix" '"upload_"'

-	php-ext-source-r2_addtoinifiles "apc.rfc1867_name" '"APC_UPLOAD_PROGRESS"'

-	php-ext-source-r2_addtoinifiles "apc.rfc1867_freq" '"0"'

-	php-ext-source-r2_addtoinifiles "apc.localcache" '"0"'

-	php-ext-source-r2_addtoinifiles "apc.localcache.size" '"512"'

-	php-ext-source-r2_addtoinifiles "apc.coredump_unmap" '"0"'

-

-	dodir "${PHP_EXT_SHARED_DIR}"

-	insinto "${PHP_EXT_SHARED_DIR}"

-	doins apc.php

-}

-

-pkg_postinst() {

-	elog "The apc.php file shipped with this release of PECL-APC was"

-	elog "installed into ${PHP_EXT_SHARED_DIR}/apc/."

-}