diff options
| author |   Christian Hoffmann <hoffie@gentoo.org> | 2009-12-24 12:13:12 +0000 |
|---|---|---|
| committer | Christian Hoffmann <hoffie@gentoo.org> | 2009-12-24 12:13:12 +0000 |
| commit | c26b83dc95ec8bf96d04d785f14ccec8b9211ce8 (patch) | |
| tree | 98448c17bf56fdd97ed7be0c92ab28448ec373ea /dev-php5 | |
| parent | Initial commit. (diff) | |
| download | historical-c26b83dc95ec8bf96d04d785f14ccec8b9211ce8.tar.gz historical-c26b83dc95ec8bf96d04d785f14ccec8b9211ce8.tar.bz2 historical-c26b83dc95ec8bf96d04d785f14ccec8b9211ce8.zip | |
php-5.3 compatibility, bug 274512
Package-Manager: portage-2.1.7.15/cvs/Linux x86_64
Diffstat (limited to 'dev-php5')
| -rw-r--r-- | dev-php5/pecl-ssh2/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-php5/pecl-ssh2/Manifest | 13 | ||||
| -rw-r--r-- | dev-php5/pecl-ssh2/files/pecl-ssh2-0.11.0-php-5.3-compat.patch | 31 | ||||
| -rw-r--r-- | dev-php5/pecl-ssh2/pecl-ssh2-0.11.0.ebuild | 7 |
4 files changed, 49 insertions, 8 deletions
diff --git a/dev-php5/pecl-ssh2/ChangeLog b/dev-php5/pecl-ssh2/ChangeLog index 7ef6f5487a12..5816a17f57f1 100644 --- a/dev-php5/pecl-ssh2/ChangeLog +++ b/dev-php5/pecl-ssh2/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-php5/pecl-ssh2 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-ssh2/ChangeLog,v 1.2 2009/10/15 11:56:51 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-ssh2/ChangeLog,v 1.3 2009/12/24 12:13:12 hoffie Exp $ + + 24 Dec 2009; Christian Hoffmann <hoffie@gentoo.org> + pecl-ssh2-0.11.0.ebuild, +files/pecl-ssh2-0.11.0-php-5.3-compat.patch: + php-5.3 compatibility, bug 274512 15 Oct 2009; Markus Meier <maekke@gentoo.org> pecl-ssh2-0.11.0.ebuild: amd64/x86 stable, bug #288070 diff --git a/dev-php5/pecl-ssh2/Manifest b/dev-php5/pecl-ssh2/Manifest index dc01299504c1..795b5f25b98e 100644 --- a/dev-php5/pecl-ssh2/Manifest +++ b/dev-php5/pecl-ssh2/Manifest @@ -1,14 +1,15 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX pecl-ssh2-0.11.0-php-5.3-compat.patch 985 RMD160 8930edd97f9fc2cd6fd36209d0e623a47565f4ed SHA1 4500c429c8364e9d605576cf2255984aabbdebb5 SHA256 635e854de885cc127c8ace37ddd49b21e907dc3b08231aa442b6eb8d06a56848 DIST ssh2-0.11.0.tgz 22884 RMD160 c0e156928450b9f41a8363a5730fba99e3956ca2 SHA1 4c8d1af81046e69db7b0d45de894b0f73a2d83c6 SHA256 3350adf6fc182ca871ddacfb75048015366c828bf54665dbbcb090b9229551c9 -EBUILD pecl-ssh2-0.11.0.ebuild 559 RMD160 b3f49f51fa5ae83fcd909abe6395056e4a11671b SHA1 45f06341b9010eec366876bc35eeb5bd24a16348 SHA256 26fbd09b3fc275fb08c11ebae3f288e0e30ef41098a75ea445a48f4d9589096d -MISC ChangeLog 484 RMD160 c6bbffa15f9e97060db696fb2e830c4390683529 SHA1 e273bfbfdf01abef368ee3417944767e6fa55bb8 SHA256 cdde02b119483d38b597016275af6e5fd58719b188f4af110b82b226d1c0a2c2 +EBUILD pecl-ssh2-0.11.0.ebuild 655 RMD160 93a54d9c98509cd6c3447e4e75f634e9026b82ab SHA1 7db606def98b4b17bd00dca0866d41a0f1553251 SHA256 198260918af5cd7b9c7e7ed44311cf0bb3f30878987d9cf8c8aa14a86188c924 +MISC ChangeLog 648 RMD160 c404808a7ce47a41e1963c83d685ee681854644c SHA1 e4cb6068fd5737b486d84763bb61fb955b719bf7 SHA256 3b1d319e43f5f8582fb32d2d171f92e49bbb15c128b676fab59569aa084c6fd2 MISC metadata.xml 156 RMD160 a3a59cdc3ac33d711123b2d7e2b1deb2984aa101 SHA1 1f452f476317b4634c684eabfd8840d06d35b414 SHA256 f6d70434415ff7294f2a64e7870f32318c5fab9153fe63a58841b12d897da6ba -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) +Version: GnuPG v2.0.13 (GNU/Linux) -iEYEARECAAYFAkrXDiIACgkQkKaRLQcq0GLrHACgsNBQyRsjU/N1XKVFBgpoMDIE -k4oAn2vaz1QOVd9kbAq5GQlLaONpu/tw -=cuv3 +iEYEARECAAYFAkszWuEACgkQSamB34AN3N6bGACgjIAW19n4eFBVqgC8znYjjC4T +secAnR4D3FR4y1ufuujp6+y21Wu7GPyX +=eJyM -----END PGP SIGNATURE----- diff --git a/dev-php5/pecl-ssh2/files/pecl-ssh2-0.11.0-php-5.3-compat.patch b/dev-php5/pecl-ssh2/files/pecl-ssh2-0.11.0-php-5.3-compat.patch new file mode 100644 index 000000000000..da1221287c17 --- /dev/null +++ b/dev-php5/pecl-ssh2/files/pecl-ssh2-0.11.0-php-5.3-compat.patch @@ -0,0 +1,31 @@ +Fixes compile failures due to behavior changes of php-5.3 +Christian Hoffmann <hoffie@gentoo.org> +Inspired by http://osdir.com/ml/fedora-extras-commits/2009-07/msg03478.html +and http://github.com/php/pecl-gearman/commit/e8e4579406d6b324caf0e0d4c0fcfffa0b68e8be + +diff -Naur ssh2-0.11.0.orig/ssh2.c ssh2-0.11.0/ssh2.c +--- ssh2-0.11.0.orig/ssh2.c 2008-12-02 22:50:10.000000000 +0100 ++++ ssh2-0.11.0/ssh2.c 2009-12-24 13:03:13.000000000 +0100 +@@ -48,7 +48,6 @@ + #endif + + #ifdef ZEND_ENGINE_2 +-static + ZEND_BEGIN_ARG_INFO(php_ssh2_first_arg_force_ref, 0) + ZEND_ARG_PASS_INFO(1) + ZEND_END_ARG_INFO() +@@ -252,12 +251,13 @@ + { + zval **handler, *copyval; + void *internal_handler; ++ TSRMLS_FETCH(); + + if (zend_hash_find(ht, callback, callback_len + 1, (void**)&handler) == FAILURE) { + return 0; + } + +- if (!handler || !*handler || !zend_is_callable(*handler, 0, NULL)) { ++ if (!handler || !*handler || !zend_is_callable(*handler, 0, NULL TSRMLS_CC)) { + return -1; + } + diff --git a/dev-php5/pecl-ssh2/pecl-ssh2-0.11.0.ebuild b/dev-php5/pecl-ssh2/pecl-ssh2-0.11.0.ebuild index 2604745a9555..c6547732d848 100644 --- a/dev-php5/pecl-ssh2/pecl-ssh2-0.11.0.ebuild +++ b/dev-php5/pecl-ssh2/pecl-ssh2-0.11.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-ssh2/pecl-ssh2-0.11.0.ebuild,v 1.2 2009/10/15 11:56:51 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-ssh2/pecl-ssh2-0.11.0.ebuild,v 1.3 2009/12/24 12:13:12 hoffie Exp $ PHP_EXT_NAME="ssh2" PHP_EXT_INI="yes" @@ -18,3 +18,8 @@ DEPEND=">=net-libs/libssh2-0.18" RDEPEND="${DEPEND}" need_php_by_category + +src_unpack() { + php-ext-source-r1_src_unpack + epatch "${FILESDIR}"/${P}-php-5.3-compat.patch +} |