Added patch that fixes an open_basedir issue. Bug 356425

Package-Manager: portage-2.1.9.41/cvs/Linux x86_64

4 files changed, 124 insertions, 3 deletions

diff --git a/dev-php/eaccelerator/ChangeLog b/dev-php/eaccelerator/ChangeLog
index 3c469a84eb22..b41676290a00 100644
--- a/dev-php/eaccelerator/ChangeLog
+++ b/dev-php/eaccelerator/ChangeLog
@@ -1,6 +1,12 @@
-# ChangeLog for dev-php5/eaccelerator
+# ChangeLog for dev-php/eaccelerator
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/eaccelerator/ChangeLog,v 1.20 2011/03/13 08:08:22 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/eaccelerator/ChangeLog,v 1.21 2011/03/13 08:44:57 olemarkus Exp $
+
+*eaccelerator-0.9.6.1-r4 (13 Mar 2011)
+
+  13 Mar 2011; <olemarkus@gentoo.org> +eaccelerator-0.9.6.1-r4.ebuild,
+  +files/eaccelerator-openbasedir.patch:
+  Added patch that fixes an open_basedir issue. Bug 356425
 
 *eaccelerator-0.9.6.1-r3 (05 Jan 2011)
 
diff --git a/dev-php/eaccelerator/Manifest b/dev-php/eaccelerator/Manifest
index e21c3d9b857c..a6e8fc650181 100644
--- a/dev-php/eaccelerator/Manifest
+++ b/dev-php/eaccelerator/Manifest
@@ -1,3 +1,4 @@
+AUX eaccelerator-openbasedir.patch 536 RMD160 09cc7129915ccea897a506894861b8efd4f00cdf SHA1 ef0a43237665577a80d9a067488ca0d133f3151d SHA256 7d9e2fcc264670631d70f30011507eb461d9006546ff61c20cb18b136570ead3
 AUX eaccelerator-remove-encoder.patch 14612 RMD160 553c8681f82d95962e2f94be1083ae5bc7a0eb53 SHA1 c144550a94ddf51675fea631d37272fc711f690b SHA256 ddc22103c0e4bf0d348b14407e95ef566a557a5ad23fa56f35db0b71bc643b61
 DIST eaccelerator-0.9.5.3.tar.bz2 555631 RMD160 9da55beec18e7a36761b5556d3bb4d5292d21650 SHA1 6671a105497f41c4e93e0b84da516b72df159fc5 SHA256 aa4f0e7817e0193d698db71cc858f45461c2820266941ae2034eb1b82c379e45
 DIST eaccelerator-0.9.6.1.tar.bz2 106049 RMD160 6a16ab377ec124a27e26a5fdc1fd6ada845695bd SHA1 c95e87229a6e674b4994d4fc13278e516ea314f9 SHA256 33703ad1678cdb65ef0cd28fbd2e262ef5d9f201f9016de26b7254987deba53c
@@ -5,7 +6,8 @@ DIST eaccelerator-0.9.6.tar.bz2 105833 RMD160 86320cbafa31f4b6db308c55035bbf0573
 EBUILD eaccelerator-0.9.5.3-r1.ebuild 4436 RMD160 bc5cf3d4af2216d38963fa47f58519c568cd9df0 SHA1 0f03c264b86b5103fd48d6227527354762565045 SHA256 ba548d845ca4aceffab82032a39ae7463f8965f97bb41ca6de952d162dc08cbc
 EBUILD eaccelerator-0.9.6.1-r1.ebuild 3421 RMD160 1aff30d4b3ef344d40d27256fed09cb04cf96fe1 SHA1 ce3e70fa2a3c5dac516dd9c761c9fd860159001c SHA256 e73b41cb34654564e58aed4a649e76f4eadfb2c72cd258384e09ba0095fa5ac1
 EBUILD eaccelerator-0.9.6.1-r3.ebuild 3425 RMD160 5a34998c9cb2f65407535f89d2f367541777c15e SHA1 8eddfcb0d1e5743e6df036118e381e1e709dbca1 SHA256 f580f7a06a14c08a736e14027ccc99e9ab1cb0d2b356e1eadfc0675f6656f435
+EBUILD eaccelerator-0.9.6.1-r4.ebuild 3528 RMD160 66fdff509701d453f0ea396f8c8759945f7ebe28 SHA1 cafaf051214ebb04e857409e169761d92b461a29 SHA256 d070e89f474f38b8c2098ff2527e994cbf04e111e23d706eaeffd37928a48828
 EBUILD eaccelerator-0.9.6.1.ebuild 3457 RMD160 def5840fe4b12281b34af2471c50f0b3f4e264c1 SHA1 7e00a47ef19fb6d46b089d26e7208a568116fc3e SHA256 5d584d6813a9943c1eaa8c85f8a37ccca80e023dec731510c150a887886320a8
 EBUILD eaccelerator-0.9.6.ebuild 3509 RMD160 877c06fe879351b854f35f446896e83f6c79768c SHA1 a37e88031ddfbad3940bb5805a71a02a34958c72 SHA256 8b01bc7abd356ea368a14be9c155624984b57431d4b2865f31215e0d167e4572
-MISC ChangeLog 5689 RMD160 db6534a646aad9bc8cbfd3b45f31782243f4d6af SHA1 e4afad0c03994b47e31d17fc8e9dc9591c078899 SHA256 aaaca538a928375cf3cab95d34f138bbbc6291d4894f88cc80b804c0dc7fde6d
+MISC ChangeLog 5900 RMD160 954fd53da6af447c1335a8bfee5d87134f2c0c59 SHA1 adae5db9976920c12d89bf63609cc8855d64d232 SHA256 4c6c432c0144910165ac6612450d35e45d23820c37e883b414670c55559053c7
 MISC metadata.xml 482 RMD160 3f0e4bf32cf90bbaebc348aa734c2fbabf065b0c SHA1 6cdfaa3d1e838e8c058d360fa1c6de52bfa9e9da SHA256 3e049a6d7ac92b1aef6095e29064ffce5aa56eaac36bf60c64e42e3da46fb07c
diff --git a/dev-php/eaccelerator/eaccelerator-0.9.6.1-r4.ebuild b/dev-php/eaccelerator/eaccelerator-0.9.6.1-r4.ebuild
new file mode 100644
index 000000000000..ecfdcedb4df9
--- /dev/null
+++ b/dev-php/eaccelerator/eaccelerator-0.9.6.1-r4.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/eaccelerator/eaccelerator-0.9.6.1-r4.ebuild,v 1.1 2011/03/13 08:44:57 olemarkus Exp $
+
+PHP_EXT_NAME="eaccelerator"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+EAPI="2"
+
+[[ -z "${EACCELERATOR_CACHEDIR}" ]] && EACCELERATOR_CACHEDIR="/var/cache/eaccelerator-php5/"
+
+inherit php-ext-source-r2 eutils depend.apache
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="A PHP Accelerator & Encoder."
+HOMEPAGE="http://www.eaccelerator.net/"
+SRC_URI="http://bart.eaccelerator.net/source/${PV}/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug disassembler inode doccommentinclusion session"
+
+DEPEND="!dev-php5/pecl-apc !dev-php5/xcache"
+RDEPEND="${DEPEND}
+	>=dev-lang/php-5.1[zlib,session?]
+	virtual/httpd-php
+"
+
+# Webserver user and group, here for Apache by default
+HTTPD_USER="${HTTPD_USER:-apache}"
+HTTPD_GROUP="${HTTPD_GROUP:-apache}"
+
+want_apache
+
+pkg_setup() {
+	depend.apache_pkg_setup
+
+	if ! use apache2 ; then
+		if [[ ${HTTPD_USER} == "apache" ]] || [[ ${HTTPD_GROUP} == "apache" ]] ; then
+			eerror "You did not enable apache2 USE flag, so you need to define"
+			eerror "the user and group that will be used for ${PN} yourself."
+			eerror
+			eerror "This should (generally) match the user and group that your webserver uses, e.g.:"
+			eerror "HTTPD_USER=\"lighttpd\" HTTPD_GROUP=\"lighttpd\" if using www-servers/lighttpd"
+			eerror
+			die "Either enable USE=\"apache2\" or re-emerge this with HTTPD_USER and HTTPD_GROUP set"
+		else
+			enewgroup ${HTTPD_GROUP}
+			enewuser ${HTTPD_USER} -1 -1 /var/www ${HTTPD_GROUP}
+		fi
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/eaccelerator-openbasedir.patch"
+	php-ext-source-r2_src_prepare
+}
+
+src_configure() {
+	my_conf="--enable-eaccelerator=shared --with-eaccelerator-userid=`id -u ${HTTPD_USER}`"
+	use debug && my_conf="${my_conf} --with-eaccelerator-debug"
+	use disassembler && my_conf="${my_conf} --with-eaccelerator-disassembler"
+	! use inode && my_conf="${my_conf} --without-eaccelerator-use-inode"
+	use doccommentinclusion && my_conf="${my_conf} --with-eaccelerator-doc-comment-inclusion"
+	php-ext-source-r2_src_configure
+}
+
+src_install() {
+	php-ext-source-r2_src_install
+
+	keepdir "${EACCELERATOR_CACHEDIR}"
+	fowners ${HTTPD_USER}:${HTTPD_GROUP} "${EACCELERATOR_CACHEDIR}"
+	fperms 750 "${EACCELERATOR_CACHEDIR}"
+
+	insinto "/usr/share/${PF}"
+	doins -r doc/php/
+	dodoc AUTHORS ChangeLog NEWS README
+
+	php-ext-source-r2_addtoinifiles "eaccelerator.shm_size" '"28"'
+	php-ext-source-r2_addtoinifiles "eaccelerator.cache_dir" "\"${EACCELERATOR_CACHEDIR}\""
+	php-ext-source-r2_addtoinifiles "eaccelerator.enable" '"1"'
+	php-ext-source-r2_addtoinifiles "eaccelerator.optimizer" '"1"'
+	php-ext-source-r2_addtoinifiles "eaccelerator.debug" '"0"'
+	php-ext-source-r2_addtoinifiles ";eaccelerator.log_file" '"/var/log/eaccelerator_log"'
+	php-ext-source-r2_addtoinifiles "eaccelerator.check_mtime" '"1"'
+	php-ext-source-r2_addtoinifiles "eaccelerator.filter" '""'
+	php-ext-source-r2_addtoinifiles "eaccelerator.shm_ttl" '"0"'
+	php-ext-source-r2_addtoinifiles "eaccelerator.shm_prune_period" '"0"'
+	php-ext-source-r2_addtoinifiles "eaccelerator.shm_only" '"0"'
+	php-ext-source-r2_addtoinifiles ";eaccelerator.allowed_admin_path" '"/path/where/admin/files/shall/be/allowed"'
+}
+
+pkg_postinst() {
+	elog "Please see the files in ${ROOT}usr/share/${PF}/ for some"
+	elog "examples and informations on how to use the functions that"
+	elog "eAccelerator adds to PHP."
+}
diff --git a/dev-php/eaccelerator/files/eaccelerator-openbasedir.patch b/dev-php/eaccelerator/files/eaccelerator-openbasedir.patch
new file mode 100644
index 000000000000..27f2c484fbe4
--- /dev/null
+++ b/dev-php/eaccelerator/files/eaccelerator-openbasedir.patch
@@ -0,0 +1,15 @@
+Fixes issue with open_basedir
+Gentoo bug: 356425
+Upstream bug: http://eaccelerator.net/ticket/396
+
+--- eaccelerator.c.old	2010-05-31 23:21:14.000000000 +0300
++++ eaccelerator.c	2010-09-23 10:42:11.218144970 +0300
+@@ -864,7 +864,7 @@
+   EACCELERATOR_PROTECT();
+   if (p != NULL && p->op_array != NULL) {
+     /* only restore file when open_basedir allows it */
+-    if (php_check_open_basedir(realname TSRMLS_CC)) {
++    if (php_check_open_basedir(p->realfilename TSRMLS_CC)) {
+       return NULL;
+     }		
+     EAG(class_entry) = NULL;