Remove hardenedphp patch (no more hardenedphp now), cleanup.

Package-Manager: portage-2.1.2-r13

diff --git a/dev-php5/xcache/ChangeLog b/dev-php5/xcache/ChangeLog
index 5984b3f9e28c8118cad646844f4c18bc5baf970c..d5252374c0932304733e3343159278c9e12445c2 100644 (file)
--- a/dev-php5/xcache/ChangeLog
+++ b/dev-php5/xcache/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-php5/xcache
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/xcache/ChangeLog,v 1.3 2007/03/04 00:08:24 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/xcache/ChangeLog,v 1.4 2007/03/04 17:32:23 chtekk Exp $
+
+  04 Mar 2007; Luca Longinotti <chtekk@gentoo.org>
+  -files/xcache-hardening-0.4.11.patch, metadata.xml, xcache-1.2.0.ebuild:
+  Remove hardenedphp patch (no more hardenedphp now), cleanup.
 
   04 Mar 2007; Marius Mauch <genone@gentoo.org> xcache-1.2.0.ebuild:
   Replacing einfo with elog

diff --git a/dev-php5/xcache/Manifest b/dev-php5/xcache/Manifest
index 3f6ac4cf360a00ba1283776f22b7ab72415b2039..e351838315dfb27ebfd283253c71bd724be35bd4 100644 (file)
--- a/dev-php5/xcache/Manifest
+++ b/dev-php5/xcache/Manifest
@@ -1,30 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX xcache-hardening-0.4.11.patch 630 RMD160 10ce023f62a2a71b9df9d4e71cba283c71174ac4 SHA1 b953a6eecd4314d798dcf9d59cb3da3447c7b31d SHA256 0f2d1f38b13b7941a65c98bc1736c03cf90a0cc8d196811f39deb6d0b5bd0dcc
-MD5 64eca4c1550fa6d16280c7ea3a4ebb2d files/xcache-hardening-0.4.11.patch 630
-RMD160 10ce023f62a2a71b9df9d4e71cba283c71174ac4 files/xcache-hardening-0.4.11.patch 630
-SHA256 0f2d1f38b13b7941a65c98bc1736c03cf90a0cc8d196811f39deb6d0b5bd0dcc files/xcache-hardening-0.4.11.patch 630
 DIST xcache-1.2.0.tar.bz2 79153 RMD160 1d77af20e117e7bebc939448500e7c7703028178 SHA1 f7f2f4082c41545909793d8e86918e2845cf82f2 SHA256 808d3a99ad584a52590504d26f272cd7235da3acb66bc67ed4e8387d1ab4ff02
-EBUILD xcache-1.2.0.ebuild 2617 RMD160 42a18efc36923cff104f066ddddeb0cc9fdbc631 SHA1 a25c64aac6c8ce7bb21fcec7098768229fcf0406 SHA256 b6443dec3b253891bca179cf75f4d9f88ae60f5f54ff571b3832343669e19157
-MD5 4b79eccd33a43bbd74f87d0178c7ad78 xcache-1.2.0.ebuild 2617
-RMD160 42a18efc36923cff104f066ddddeb0cc9fdbc631 xcache-1.2.0.ebuild 2617
-SHA256 b6443dec3b253891bca179cf75f4d9f88ae60f5f54ff571b3832343669e19157 xcache-1.2.0.ebuild 2617
-MISC ChangeLog 748 RMD160 e086f33278840fff15dad4c07e079331c3bf8f83 SHA1 d3bbe46bff55ad81cfc58aafd97656e59d278276 SHA256 ac1467f5de4353a1ef523c4b3dc3895fa134e8535c8af8db7f14d68f00e1e881
-MD5 cba157a666c7974d81b1b2267052db61 ChangeLog 748
-RMD160 e086f33278840fff15dad4c07e079331c3bf8f83 ChangeLog 748
-SHA256 ac1467f5de4353a1ef523c4b3dc3895fa134e8535c8af8db7f14d68f00e1e881 ChangeLog 748
-MISC metadata.xml 333 RMD160 8eb8bcb02e8ff8f9267ec9362f0fb365e9c82d78 SHA1 ef1b6fd4453ec76f217bcd07410ff655c77fab4e SHA256 7f2cefebabc6ecf714ffaf3d69657c9d452bc9df152473da35a9a730631f254a
-MD5 2d9869109c39503b683ca8e9b2cb08b8 metadata.xml 333
-RMD160 8eb8bcb02e8ff8f9267ec9362f0fb365e9c82d78 metadata.xml 333
-SHA256 7f2cefebabc6ecf714ffaf3d69657c9d452bc9df152473da35a9a730631f254a metadata.xml 333
+EBUILD xcache-1.2.0.ebuild 2500 RMD160 630046a7d2993824c6e5af36f0c1c9d3ac934814 SHA1 af0fa9840b511cc33be18c6b8c285ec55235f8cd SHA256 c34b131c0f8f4613637304c1a6ca4ec933bb20be1225ee79130117c6efd1d134
+MD5 99a1a02e2748563cd639ec2154bd44ef xcache-1.2.0.ebuild 2500
+RMD160 630046a7d2993824c6e5af36f0c1c9d3ac934814 xcache-1.2.0.ebuild 2500
+SHA256 c34b131c0f8f4613637304c1a6ca4ec933bb20be1225ee79130117c6efd1d134 xcache-1.2.0.ebuild 2500
+MISC ChangeLog 938 RMD160 a796a76e61f0554509e834cdf9c8a93e22321377 SHA1 dcc59537dd0367b264cfa76221f9a1b7767902d6 SHA256 64fc9fa99929c8f899d6c3ffdc52fbc4ba38711261f889f7fb83fd4934479b62
+MD5 ede56aa5a48879f1a83ae66c7df5fdd1 ChangeLog 938
+RMD160 a796a76e61f0554509e834cdf9c8a93e22321377 ChangeLog 938
+SHA256 64fc9fa99929c8f899d6c3ffdc52fbc4ba38711261f889f7fb83fd4934479b62 ChangeLog 938
+MISC metadata.xml 352 RMD160 ff3f21c39b31a05abfd966604029a9a061bf0242 SHA1 3e4e27ceadfa1eaca7ef463ceecda1f1039ff7e3 SHA256 b1a80a2c4138ef0ed1a66ce04aa5e1e89961bd5500babefe63f850099a6cd9b5
+MD5 900d0c809069637069e9839d3b15e6df metadata.xml 352
+RMD160 ff3f21c39b31a05abfd966604029a9a061bf0242 metadata.xml 352
+SHA256 b1a80a2c4138ef0ed1a66ce04aa5e1e89961bd5500babefe63f850099a6cd9b5 metadata.xml 352
 MD5 6a5890ac030be8fadd4c8942daf29bb1 files/digest-xcache-1.2.0 238
 RMD160 da5d7354390c4b03b798ab49254b01b6146a9304 files/digest-xcache-1.2.0 238
 SHA256 d4dc06e38dd654a82ad831acfce3e440d828eb2164e57c50eca9fd2f946b8645 files/digest-xcache-1.2.0 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFF6g7v6J2i8a8J4okRAmyuAKC83vFwfszDL4M0y1fWNHCQS84LLACgm9j4
-vMbz+HwWGBLQ2P5hxMVTukc=
-=+UW1
------END PGP SIGNATURE-----

diff --git a/dev-php5/xcache/files/xcache-hardening-0.4.11.patch b/dev-php5/xcache/files/xcache-hardening-0.4.11.patch
deleted file mode 100644 (file)
index ad85122..0000000
--- a/dev-php5/xcache/files/xcache-hardening-0.4.11.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Nur xcache/processor/processor.m4 xcache-hardened/processor/processor.m4
---- xcache/processor/processor.m4      2006-07-10 19:19:26.000000000 +0200
-+++ xcache-hardened/processor/processor.m4     2006-07-10 19:03:00.000000000 +0200
-@@ -70,6 +70,9 @@
-               ZVAL_REFCOUNT(dst) = 1;
-               DONE(value)
-               DONE(refcount)
-+#ifdef HARDENING_PATCH 
-+              DISPATCH(zend_ushort, flags); 
-+#endif
-               DONE(type)
-               DONE(is_ref)
-       } while(0);
-@@ -136,6 +139,9 @@
-               DISPATCH(zval_data_type, type)
-               DISPATCH(zend_uchar, is_ref)
-               DISPATCH(zend_ushort, refcount)
-+#ifdef HARDENING_PATCH
-+      DISPATCH(zend_ushort, flags);
-+#endif
-       ')dnl IFDASM
- ')
- dnl }}}

diff --git a/dev-php5/xcache/metadata.xml b/dev-php5/xcache/metadata.xml
index 5aa7aba330816025d5a2c0c5344885aae6f6285d..13e5bd886464ed0b2d30dd8ba7b7f17866cf32c5 100644 (file)
--- a/dev-php5/xcache/metadata.xml
+++ b/dev-php5/xcache/metadata.xml
@@ -1,7 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
-<maintainer><email>jokey@gentoo.org</email><name>Markus Ullmann</name></maintainer>
-<maintainer><email>christian@hoffie.info</email><name>Christian Hoffmann</name></maintainer>
+       <herd>php</herd>
+       <maintainer>
+               <email>jokey@gentoo.org</email>
+               <name>Markus Ullmann</name>
+       </maintainer>
+       <maintainer>
+               <email>christian@hoffie.info</email>
+               <name>Christian Hoffmann</name>
+       </maintainer>
 </pkgmetadata>

diff --git a/dev-php5/xcache/xcache-1.2.0.ebuild b/dev-php5/xcache/xcache-1.2.0.ebuild
index cbed28762cdf79cd3f1cc835a440d332141865d8..32395b3ebda2ca836748ff57c6b14a3013c3f70d 100644 (file)
--- a/dev-php5/xcache/xcache-1.2.0.ebuild
+++ b/dev-php5/xcache/xcache-1.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/xcache/xcache-1.2.0.ebuild,v 1.3 2007/03/04 00:08:24 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/xcache/xcache-1.2.0.ebuild,v 1.4 2007/03/04 17:32:23 chtekk Exp $
 
 PHP_EXT_NAME="xcache"
 PHP_EXT_INI="yes"
@@ -8,18 +8,19 @@ PHP_EXT_ZENDEXT="yes"
 
 inherit php-ext-source-r1 confutils
 
-DESCRIPTION="Another PHP opcode cache and encoder"
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Another PHP opcode cache and encoder."
 HOMEPAGE="http://trac.lighttpd.net/xcache/"
 SRC_URI="http://210.51.190.228/pub/XCache/Releases/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="${DEPEND}
-       !dev-php5/pecl-apc
-       !dev-php5/eaccelerator"
+DEPEND="!dev-php5/pecl-apc
+               !dev-php5/eaccelerator"
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}"
 
@@ -30,21 +31,15 @@ pkg_setup() {
        require_php_sapi_from cgi apache apache2
 }
 
-src_unpack() {
-       unpack ${A}
-       cd ${S}
-       has_hardenedphp && epatch "${FILESDIR}"/${PN}-hardening-0.4.11.patch
-}
-
 src_compile() {
        has_php
 
        my_conf="--enable-xcache=shared \
-               --enable-xcache-constant      \
-               --enable-xcache-optimizer     \
-               --enable-xcache-coverager     \
-               --enable-xcache-assembler     \
-               --enable-xcache-encoder       \
+               --enable-xcache-constant    \
+               --enable-xcache-optimizer   \
+               --enable-xcache-coverager   \
+               --enable-xcache-assembler   \
+               --enable-xcache-encoder     \
                --enable-xcache-decoder"
 
        enable_extension_with_built_with =${PHP_PKG} apache2 apxs2 /usr/sbin/apxs2 "optimisation for apache2"
@@ -83,7 +78,6 @@ pkg_postinst() {
        elog "release were installed into /usr/share/php5/xcache/."
 
        if built_with_use =${PHP_PKG} apache || built_with_use =${PHP_PKG} apache2 ; then
-               echo
-               elog "You need to restart your Apache webserver to activate xcache."
+               elog "You need to restart your Apache webserver to enable xcache."
        fi
 }