summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Ullmann <jokey@gentoo.org>2008-01-05 18:04:08 +0000
committerMarkus Ullmann <jokey@gentoo.org>2008-01-05 18:04:08 +0000
commit75f8da8de2fd9ecd52ffbe038275e670c97e08f3 (patch)
treee8403cda89e3e151795823a44085eef1a8bd91fd /dev-php5
parentVersion bump, bug 177377 (diff)
downloadgentoo-2-75f8da8de2fd9ecd52ffbe038275e670c97e08f3.tar.gz
gentoo-2-75f8da8de2fd9ecd52ffbe038275e670c97e08f3.tar.bz2
gentoo-2-75f8da8de2fd9ecd52ffbe038275e670c97e08f3.zip
Fix from project overlay
(Portage version: 2.1.4_rc14)
Diffstat (limited to 'dev-php5')
-rw-r--r--dev-php5/pecl-apc/ChangeLog12
-rw-r--r--dev-php5/pecl-apc/files/pecl-apc-3.0.16-apc_set_signals.patch11
-rw-r--r--dev-php5/pecl-apc/pecl-apc-3.0.16.ebuild13
3 files changed, 31 insertions, 5 deletions
diff --git a/dev-php5/pecl-apc/ChangeLog b/dev-php5/pecl-apc/ChangeLog
index 8b43b5026191..d85d9a503d82 100644
--- a/dev-php5/pecl-apc/ChangeLog
+++ b/dev-php5/pecl-apc/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for dev-php5/pecl-apc
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-apc/ChangeLog,v 1.32 2007/12/27 19:55:41 jokey Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-apc/ChangeLog,v 1.33 2008/01/05 18:04:07 jokey Exp $
+
+ 05 Jan 2008; Markus Ullmann <jokey@gentoo.org>
+ +files/pecl-apc-3.0.16-apc_set_signals.patch, pecl-apc-3.0.16.ebuild:
+ Fix from project overlay
+
+ 04 Jan 2008; Jakub Moc <jakub@gentoo.org>
+ +files/pecl-apc-3.0.16-apc_set_signals.patch, pecl-apc-3.0.16.ebuild:
+ Add patch for Bug 204224
*pecl-apc-3.0.16 (27 Dec 2007)
diff --git a/dev-php5/pecl-apc/files/pecl-apc-3.0.16-apc_set_signals.patch b/dev-php5/pecl-apc/files/pecl-apc-3.0.16-apc_set_signals.patch
new file mode 100644
index 000000000000..0e12918a24ff
--- /dev/null
+++ b/dev-php5/pecl-apc/files/pecl-apc-3.0.16-apc_set_signals.patch
@@ -0,0 +1,11 @@
+--- APC-3.0.16/php_apc.c.orig 2007-12-26 23:51:32.000000000 +0100
++++ APC-3.0.16/php_apc.c 2008-01-04 23:34:30.000000000 +0100
+@@ -300,7 +300,7 @@
+ apc_request_init(TSRMLS_C);
+
+ #if HAVE_SIGACTION
+- apc_set_signals();
++ apc_set_signals(TSRMLS_C);
+ #endif
+ }
+ return SUCCESS;
diff --git a/dev-php5/pecl-apc/pecl-apc-3.0.16.ebuild b/dev-php5/pecl-apc/pecl-apc-3.0.16.ebuild
index c83956846081..88364891d3b6 100644
--- a/dev-php5/pecl-apc/pecl-apc-3.0.16.ebuild
+++ b/dev-php5/pecl-apc/pecl-apc-3.0.16.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.0.16.ebuild,v 1.1 2007/12/27 19:55:41 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-apc/pecl-apc-3.0.16.ebuild,v 1.2 2008/01/05 18:04:07 jokey Exp $
PHP_EXT_NAME="apc"
PHP_EXT_PECL_PKG="APC"
@@ -8,7 +8,7 @@ PHP_EXT_INI="yes"
PHP_EXT_ZENDEXT="no"
DOCS="CHANGELOG INSTALL NOTICE TECHNOTES.txt TODO"
-inherit php-ext-pecl-r1 confutils
+inherit php-ext-pecl-r1 confutils eutils
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
@@ -27,6 +27,13 @@ pkg_setup() {
require_php_sapi_from cgi apache2
}
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ # http://pecl.php.net/bugs/bug.php?id=12777, Bug 204224
+ epatch "${FILESDIR}"/${P}-apc_set_signals.patch
+}
+
src_compile() {
has_php