[packages/horde/HORDE_3_3] - updated to 3.3.13 - fix ssh2 vfs upload functionality (ssh2_sftp_realpath returns empty string fo

[baggins]

commit 72f132dd02c03f8128548460416ff1137e483f52
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Jan 24 14:15:30 2013 +0100

    - updated to 3.3.13
    - fix ssh2 vfs upload functionality (ssh2_sftp_realpath returns empty
    	string for non-existing files)

 horde-ssh2-vfs-realpath.patch | 17 +++++++++++++++++
 horde.spec                    |  8 +++++---
 2 files changed, 22 insertions(+), 3 deletions(-)
---
diff --git a/horde.spec b/horde.spec
index 9d428bf..3d5361e 100644
--- a/horde.spec
+++ b/horde.spec
@@ -13,12 +13,12 @@ Summary(es.UTF-8):	Elementos básicos do Horde Web Application Suite
 Summary(pl.UTF-8):	Wspólny szkielet Horde do wszystkich modułów Horde
 Summary(pt_BR.UTF-8):	Componentes comuns do Horde usados por todos os módulos
 Name:		%{hordeapp}
-Version:	3.3.12
-Release:	4
+Version:	3.3.13
+Release:	1
 License:	LGPL
 Group:		Applications/WWW
 Source0:	http://ftp.horde.org/pub/horde/%{hordeapp}-%{version}.tar.gz
-# Source0-md5:	4e99757cf1a584682316cba0ada28c48
+# Source0-md5:	5a0486a5f6f96a9957e770ddabe71b38
 Source1:	%{name}.conf
 Source2:	%{name}-lighttpd.conf
 Source3:	README.PLD
@@ -30,6 +30,7 @@ Patch5:		%{name}-mime_drivers.patch
 Patch6:		%{name}-webroot.patch
 Patch7:		%{name}-geoip.patch
 Patch8:		%{name}-crypt-detect.patch
+Patch9:		%{name}-ssh2-vfs-realpath.patch
 URL:		http://www.horde.org/
 BuildRequires:	rpm-php-pearprov >= 4.0.2-98
 BuildRequires:	rpmbuild(macros) >= 1.595
@@ -155,6 +156,7 @@ Narzędzia deweloperskie horde.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 cp -p %{SOURCE3} .
 
diff --git a/horde-ssh2-vfs-realpath.patch b/horde-ssh2-vfs-realpath.patch
new file mode 100644
index 0000000..e934ab5
--- /dev/null
+++ b/horde-ssh2-vfs-realpath.patch
@@ -0,0 +1,17 @@
+--- horde-3.3.13/lib/VFS/ssh2.php~	2012-02-07 15:53:48.000000000 +0100
++++ horde-3.3.13/lib/VFS/ssh2.php	2013-01-24 14:14:23.120039169 +0100
+@@ -1018,8 +1018,12 @@
+      */
+     function _wrap($remote)
+     {
+-        return 'ssh2.sftp://' . $this->_params['username'] . ':' . $this->_params['password']
+-            . '@' . $this->_params['hostspec'] . ':' . $this->_params['port'] . ssh2_sftp_realpath($this->_sftp, $remote);
++	if (ssh2_sftp_stat($this->_sftp, $remote))
++	    $realpath = ssh2_sftp_realpath($this->_sftp, $remote);
++	else
++	    $realpath = $remote;
++	return 'ssh2.sftp://' . $this->_params['username'] . ':' . $this->_params['password']
++	    . '@' . $this->_params['hostspec'] . ':' . $this->_params['port'] . $realpath;
+     }
+ 
+ }
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/horde.git/commitdiff/72f132dd02c03f8128548460416ff1137e483f52