Fix building of cygnal sshclient, bug #391915.

Package-Manager: portage-2.2.0_alpha77/cvs/Linux x86_64

4 files changed, 103 insertions, 4 deletions

diff --git a/www-plugins/gnash/ChangeLog b/www-plugins/gnash/ChangeLog
index bca9fd865f5d..3a55fd87b074 100644
--- a/www-plugins/gnash/ChangeLog
+++ b/www-plugins/gnash/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-plugins/gnash
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.68 2011/11/25 17:39:19 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.69 2011/11/26 02:24:20 chithanh Exp $
+
+  26 Nov 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  gnash-0.8.9-r2.ebuild, +files/gnash-0.8.9-cygnal-sshclient.patch:
+  Fix building of cygnal sshclient, bug #391915.
 
 *gnash-0.8.9-r2 (25 Nov 2011)
 
diff --git a/www-plugins/gnash/Manifest b/www-plugins/gnash/Manifest
index e3762c386d29..f1a84fd4d7ef 100644
--- a/www-plugins/gnash/Manifest
+++ b/www-plugins/gnash/Manifest
@@ -7,6 +7,7 @@ AUX gnash-0.8.8-external-dejagnu.patch 703 RMD160 971bfb775a4019f27ca0a504867215
 AUX gnash-0.8.8-klash.patch 1127 RMD160 f03e8de0d5bcc3eeea08ca45b96196519b01d362 SHA1 f117f36d8452ee088b80552efdc7eea969324e8f SHA256 b3015cb93b91575d214c17cfbb7f5614c3df047261e184ec9ef84e28641ddc25
 AUX gnash-0.8.8-secure-tempfile-creation.patch 1166 RMD160 0c8d089de4107fc473e8cf765fa6ab809e07051a SHA1 f0037f46314fb2430f61dd8a3f8251b0513dbe01 SHA256 7883b1b94e5cb621d1c7773450dcf0b23bb9a677f72df8b50309ee9747ddc197
 AUX gnash-0.8.9-cve-2011-4328.patch 806 RMD160 d972c13cfc5f15007599ee7617c85a453a026130 SHA1 17dd80afa10b8bd9ea3d96b547f269bb02b78192 SHA256 0fc31bdffedcd4d97e4df78c66c02e9575b5fb055c3c2a79eb43315433a15a77
+AUX gnash-0.8.9-cygnal-sshclient.patch 2757 RMD160 271e6db69d7ae067ffd3369a04f1527d6fa24e6f SHA1 cb336c5e05f4a81144fb0ae938e24f92741a8745 SHA256 bd72016a5364eca765780247864117d20cca0c3596e58916196bc8c20503d999
 AUX gnash-0.8.9-documentation-paths.patch 623 RMD160 cdf0bb4cc4626bd50ab32c5a19183b57917f6e8e SHA1 eae72553893d2150b79ec71d948143ae8a4c5959 SHA256 473fefab01376ef8d9450518dee16ef6057cfd0618629e13f3f3ec8adf8c251f
 AUX gnash-0.8.9-external-dejagnu.patch 700 RMD160 b24901796187f5b9ee2a27b60c0232884302af69 SHA1 5dc178479f5ad2aa1eb0d5314df0bec505708890 SHA256 b838af0304d41165557dff2538031edf8d14d5a221375aff4b9e404ef1cb261d
 AUX gnash-0.8.9-ffmpeg-detection.patch 780 RMD160 a7b02c2472b3bf2b8618e5d6d4203e8f30cc8aea SHA1 e6cfed32780546bc68acce66fb5da5fc64627585 SHA256 09bcb58f61d05a582206c82f789484471565f955e8daa6e852c62bca87624353
@@ -23,7 +24,7 @@ AUX gnash-0.8.9-no-deprecated-avformat-metadata.patch 1299 RMD160 a88e744b8886ad
 DIST gnash-0.8.8.tar.bz2 3850383 RMD160 621afbd14180ce770f60a6e158f9fda0b4d5ec02 SHA1 d349e0321e7fe9abcd265d63ce282cd2a7ce59d3 SHA256 dcac4b81f81ecd6cc7c5422d7c731fc5c2a7be7fb18b5570a7e6f8fb5fc6e220
 DIST gnash-0.8.9.tar.bz2 3777140 RMD160 34bb51cfe5b8593dc14bc2c21c0085277dbb23f1 SHA1 585c320c98b3304fcbba230f2c4b1fdf2a52aee0 SHA256 f90dbdc6f03d787b239b9edacbea077b46d69ae9d85f08af23f256af389c48bd
 EBUILD gnash-0.8.8.ebuild 9006 RMD160 cd9a10d9b7b121b638bac179c97de26771e66542 SHA1 f6b0ae7862286aabbbd34e99a318021136ae33bc SHA256 594842337ae216fa7a89112298f00e2a1c74609af4a4b48f3e39b4b2dc82b380
-EBUILD gnash-0.8.9-r2.ebuild 9015 RMD160 1cf36f01e3b3772b8e31b090c0e69430185d81e5 SHA1 c13b75f4bbabda3410db9b845adae4eafbd6b741 SHA256 847e31d3afd8d07b788993a8fd5f59e1904744cef5c030e08ad505b1b786b2ab
+EBUILD gnash-0.8.9-r2.ebuild 9122 RMD160 830641f9e727c650766c4a4958fa070d53325493 SHA1 da561ae56c7b699f767f06f3638df17bb6d6abeb SHA256 7c34085607931ee019723546d035d30af8dae4a22b4afcdc5763e30c75216918
 EBUILD gnash-0.8.9.ebuild 8830 RMD160 b3e6ab1a6a6ce84c502af1647e4e58b65e110809 SHA1 f6fd90d100132b8658428cf3cafc8cbe6bec1c8d SHA256 8a3c33a3a82619f22863e32fb83e264193cfe94132491535fb919a9ed863478a
-MISC ChangeLog 25386 RMD160 1926178629d8069a833f128b8e74452c4233ae24 SHA1 8818e665256c31bd4a830b939c2f9abf74011cf1 SHA256 448597ef4f5d5b05c35a43e111b6dab6ba9e0814183f186e504705a4e2b3bf0b
+MISC ChangeLog 25573 RMD160 06dc89626c29b5ddb1bcb1027659d612ec980c4a SHA1 294c71aca402c5620ed1b46dcd57acc978bcf8e4 SHA256 213bf4e07da5bc2e0f095eaa8cfdf3e4f8eceb9423b40631f60cf027d981bfd7
 MISC metadata.xml 876 RMD160 c66baf8ded1d751eda1c55992f39a189931f1a9f SHA1 bc490cb83a3ed47c561f2975c61400c8bc867be4 SHA256 b087a4196095d60ce0949b9374c4077322aca887bd6e0019c5dc34762d199152
diff --git a/www-plugins/gnash/files/gnash-0.8.9-cygnal-sshclient.patch b/www-plugins/gnash/files/gnash-0.8.9-cygnal-sshclient.patch
new file mode 100644
index 000000000000..52793e576ce9
--- /dev/null
+++ b/www-plugins/gnash/files/gnash-0.8.9-cygnal-sshclient.patch
@@ -0,0 +1,91 @@
+diff -ur a/cygnal/libnet/sshclient.cpp b/cygnal/libnet/sshclient.cpp
+--- a/cygnal/libnet/sshclient.cpp	2011-02-26 19:11:07.000000000 +0100
++++ b/cygnal/libnet/sshclient.cpp	2011-11-26 02:58:31.314227874 +0100
+@@ -103,7 +103,7 @@
+ 
+ // Read bytes from the already opened SSH connection
+ int
+-SSHClient::sshRead(amf::Buffer &buf)
++SSHClient::sshRead(cygnal::Buffer &buf)
+ {
+     GNASH_REPORT_FUNCTION;
+ 
+@@ -125,7 +125,7 @@
+ 
+ // Write bytes to the already opened SSH connection
+ int
+-SSHClient::sshWrite(amf::Buffer &buf)
++SSHClient::sshWrite(cygnal::Buffer &buf)
+ {
+     GNASH_REPORT_FUNCTION;
+ 
+@@ -401,7 +401,7 @@
+ }
+ 
+ int 
+-SSHClient::readChannel(ssh_channel channel, amf::Buffer &buf)
++SSHClient::readChannel(ssh_channel channel, cygnal::Buffer &buf)
+ {
+ //    GNASH_REPORT_FUNCTION;
+     int ret = -1;
+@@ -416,7 +416,7 @@
+ }
+ 
+ int 
+-SSHClient::writeChannel(ssh_channel channel, amf::Buffer &buf)
++SSHClient::writeChannel(ssh_channel channel, cygnal::Buffer &buf)
+ {
+ //    GNASH_REPORT_FUNCTION;
+     int ret = -1;
+diff -ur a/cygnal/libnet/sshclient.h b/cygnal/libnet/sshclient.h
+--- a/cygnal/libnet/sshclient.h	2011-02-26 19:11:07.000000000 +0100
++++ b/cygnal/libnet/sshclient.h	2011-11-26 02:58:57.203229777 +0100
+@@ -32,6 +32,7 @@
+ #include <libssh/sftp.h>
+ }
+ 
++#include "dsodefs.h"
+ #include "cque.h"
+ #include "network.h"
+ #include "buffer.h"
+@@ -56,12 +57,12 @@
+     ~SSHClient();
+ 
+     // Read bytes from the already opened SSH connection
+-    int sshRead(amf::Buffer &buf);
++    int sshRead(cygnal::Buffer &buf);
+     int sshRead(boost::uint8_t *buf, size_t length);
+     int sshRead(std::string &buf);
+ 
+     // Write bytes to the already opened SSH connection
+-    int sshWrite(amf::Buffer &buf);
++    int sshWrite(cygnal::Buffer &buf);
+     int sshWrite(const boost::uint8_t *buf, size_t length);
+     int sshWrite(std::string &buf);
+ 
+@@ -104,13 +105,13 @@
+     // Accessors
+     ssh_channel getChannel() { return _channel; };
+     ssh_session getSession() { return _session; };
+-    boost::shared_ptr<amf::Buffer> &getBuffer()  { return _buffer; };
++    boost::shared_ptr<cygnal::Buffer> &getBuffer()  { return _buffer; };
+ 
+     // Dump internal data to the screen for debugging
+     void dump();
+  protected:
+-    int readChannel (ssh_channel channel, amf::Buffer &buf);
+-    int writeChannel(ssh_channel channel, amf::Buffer &buf);
++    int readChannel (ssh_channel channel, cygnal::Buffer &buf);
++    int writeChannel(ssh_channel channel, cygnal::Buffer &buf);
+ 
+     std::string		_hostname;
+     std::string		_user;
+@@ -126,7 +127,7 @@
+     ssh_session _session;
+     ssh_channel	_channel;
+ #endif
+-    boost::shared_ptr<amf::Buffer> _buffer;
++    boost::shared_ptr<cygnal::Buffer> _buffer;
+ };
+     
+ } // end of gnash namespace
diff --git a/www-plugins/gnash/gnash-0.8.9-r2.ebuild b/www-plugins/gnash/gnash-0.8.9-r2.ebuild
index e0cb2a913916..b55a140d4234 100644
--- a/www-plugins/gnash/gnash-0.8.9-r2.ebuild
+++ b/www-plugins/gnash/gnash-0.8.9-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.9-r2.ebuild,v 1.1 2011/11/25 17:39:19 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.9-r2.ebuild,v 1.2 2011/11/26 02:24:20 chithanh Exp $
 
 EAPI=3
 CMAKE_REQUIRED="never"
@@ -171,6 +171,9 @@ src_prepare() {
 	# Fix building on ppc64, bug #342535
 	use ppc64 && append-flags -mminimal-toc
 
+	# Fix building of cygnal sshclient, bug #391915
+	epatch "${FILESDIR}"/${PN}-0.8.9-cygnal-sshclient.patch
+
 	# Fix kde multilib library path, bug #391283
 	epatch "${FILESDIR}"/${PN}-0.8.9-kde4-libdir.patch