new attempt at getting a version which works with 5.2 and 5.3

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

4 files changed, 58 insertions, 12 deletions

diff --git a/dev-php5/pecl-ssh2/ChangeLog b/dev-php5/pecl-ssh2/ChangeLog
index e3daaebfb0e5..a3a6332cb98c 100644
--- a/dev-php5/pecl-ssh2/ChangeLog
+++ b/dev-php5/pecl-ssh2/ChangeLog
@@ -1,6 +1,12 @@
 # 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.4 2009/12/27 23:19:42 hoffie Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-ssh2/ChangeLog,v 1.5 2009/12/29 21:16:55 hoffie Exp $
+
+*pecl-ssh2-0.11.0-r1 (29 Dec 2009)
+
+  29 Dec 2009; Christian Hoffmann <hoffie@gentoo.org>
+  +pecl-ssh2-0.11.0-r1.ebuild, files/pecl-ssh2-0.11.0-php-5.3-compat.patch:
+  new attempt at getting a version which works with 5.2 and 5.3
 
   27 Dec 2009; Christian Hoffmann <hoffie@gentoo.org>
   pecl-ssh2-0.11.0.ebuild:
diff --git a/dev-php5/pecl-ssh2/Manifest b/dev-php5/pecl-ssh2/Manifest
index 082909ab4f36..106b375f6489 100644
--- a/dev-php5/pecl-ssh2/Manifest
+++ b/dev-php5/pecl-ssh2/Manifest
@@ -1,15 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX pecl-ssh2-0.11.0-php-5.3-compat.patch 985 RMD160 8930edd97f9fc2cd6fd36209d0e623a47565f4ed SHA1 4500c429c8364e9d605576cf2255984aabbdebb5 SHA256 635e854de885cc127c8ace37ddd49b21e907dc3b08231aa442b6eb8d06a56848
+AUX pecl-ssh2-0.11.0-php-5.3-compat.patch 1505 RMD160 5acc6195b1887e7622f083c1a3b50d9169c8f633 SHA1 d37cfcc957e77e850679fc1170f5dc1d3bbb5f10 SHA256 0d026022b6a019396db431ec579fa89907518608230d4c13626d0cc70fbfb586
 DIST ssh2-0.11.0.tgz 22884 RMD160 c0e156928450b9f41a8363a5730fba99e3956ca2 SHA1 4c8d1af81046e69db7b0d45de894b0f73a2d83c6 SHA256 3350adf6fc182ca871ddacfb75048015366c828bf54665dbbcb090b9229551c9
+EBUILD pecl-ssh2-0.11.0-r1.ebuild 660 RMD160 d62395b583d3d393d1ed0929e2f26fa677b07fb7 SHA1 06b3388a0a2b0e3a974ce9b98c039e1249fb68ae SHA256 fd3f16a4d252d1024fafa888638847bf36fc47feb5dd56572ffbe1a3ec0f6977
 EBUILD pecl-ssh2-0.11.0.ebuild 559 RMD160 3e52503cc66a086617ee077d8710fe6a463c5cc0 SHA1 00f92f460d16b20beb215e23d5b04696ebc3d3c6 SHA256 9dffc31760a4e0b040a202139d726298fd7a1ee86cf718e56cb89b23a1898871
-MISC ChangeLog 950 RMD160 1d6d6ac606dd6ad702a01f28d5f4af5c41e3efb6 SHA1 f0c832efd9044b9424323e4d6c9e3e746fbb5af3 SHA256 b30698f9aa18745623c2e3ca048d026cae8a669eb5f65531548250ecd877d6fb
+MISC ChangeLog 1181 RMD160 32adff1c38b0bc916d9347987ac88fded3964fd6 SHA1 724dadc274ed9d1aa7d7bbf108422c3050960c0a SHA256 b87279f4731b20b74066c6338283cca74d98a85b6ee5c754f6e35ee8643bfc37
 MISC metadata.xml 156 RMD160 a3a59cdc3ac33d711123b2d7e2b1deb2984aa101 SHA1 1f452f476317b4634c684eabfd8840d06d35b414 SHA256 f6d70434415ff7294f2a64e7870f32318c5fab9153fe63a58841b12d897da6ba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAks3650ACgkQSamB34AN3N5l0ACgsgq6w8kAV9JtzoU5iz+hJRVn
-ie8AoNTqfhsyOX1y3Sx6UQxsXetVQwq4
-=reEc
+iEYEARECAAYFAks6cc0ACgkQSamB34AN3N4ftQCg0fuqzq1hzNBaW7Gcr82T1ywn
+g+YAoICxcbc/5gx9uyVjMQriqmUJHxcb
+=9DXP
 -----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
index da1221287c17..9e47bcd94136 100644
--- 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
@@ -3,10 +3,11 @@ 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 @@
+Index: ssh2-0.11.0/ssh2.c
+===================================================================
+--- ssh2-0.11.0.orig/ssh2.c
++++ ssh2-0.11.0/ssh2.c
+@@ -48,7 +48,6 @@ int le_ssh2_pkey_subsys;
  #endif
  
  #ifdef ZEND_ENGINE_2
@@ -14,7 +15,20 @@ diff -Naur ssh2-0.11.0.orig/ssh2.c ssh2-0.11.0/ssh2.c
      ZEND_BEGIN_ARG_INFO(php_ssh2_first_arg_force_ref, 0)
          ZEND_ARG_PASS_INFO(1)
      ZEND_END_ARG_INFO()
-@@ -252,12 +251,13 @@
+@@ -56,6 +55,12 @@ static
+ static unsigned char php_ssh2_first_arg_force_ref[] = { 1, BYREF_FORCE };
+ #endif
+ 
++#if (PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION < 3)
++#   define SSH2_IS_CALLABLE(callable, check_flags, callable_name) zend_is_callable(callable, check_flags, callable_name)
++#else
++#   define SSH2_IS_CALLABLE(callable, check_flags, callable_name) zend_is_callable(callable, check_flags, callable_name TSRMLS_CC)
++#endif
++
+ /* *************
+    * Callbacks *
+    ************* */
+@@ -252,12 +257,13 @@ static int php_ssh2_set_callback(LIBSSH2
  {
  	zval **handler, *copyval;
  	void *internal_handler;
@@ -25,7 +39,7 @@ diff -Naur ssh2-0.11.0.orig/ssh2.c ssh2-0.11.0/ssh2.c
  	}
  
 -	if (!handler || !*handler || !zend_is_callable(*handler, 0, NULL)) {
-+	if (!handler || !*handler || !zend_is_callable(*handler, 0, NULL TSRMLS_CC)) {
++	if (!handler || !*handler || !SSH2_IS_CALLABLE(*handler, 0, NULL)) {
  		return -1;
  	}
  
diff --git a/dev-php5/pecl-ssh2/pecl-ssh2-0.11.0-r1.ebuild b/dev-php5/pecl-ssh2/pecl-ssh2-0.11.0-r1.ebuild
new file mode 100644
index 000000000000..8927752e9915
--- /dev/null
+++ b/dev-php5/pecl-ssh2/pecl-ssh2-0.11.0-r1.ebuild
@@ -0,0 +1,25 @@
+# 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-r1.ebuild,v 1.1 2009/12/29 21:16:55 hoffie Exp $
+
+PHP_EXT_NAME="ssh2"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS="README ChangeLog"
+
+inherit php-ext-pecl-r1
+
+DESCRIPTION="Provides bindings to the functions of libssh2 which implements the SSH2 protocol."
+LICENSE="PHP-3"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+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
+}