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

(Portage version: 2.1.7.15/cvs/Linux x86_64)

3 files changed, 52 insertions, 7 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/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
+}