sablink/sablink-distro
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[www-plugins/gnash] bye bye

Browse Source
This commit is contained in:
Fabio Erculiani
2010-07-15 10:57:33 +02:00
parent 0734dbea87
commit 2e5c330cdd
12 changed files with 0 additions and 942 deletions
Download Patch File Download Diff File Expand all files Collapse all files
www-plugins/gnash/Manifest
-12
View File
@@ -1,12 +0,0 @@
AUX gnash-0.8.3-boost-dynamic-link.patch 1474 RMD160 0ce418d9e7a0f4d5b3bc724c65dedc3c675b69ef SHA1 df6ae427a0efda13da822ca65700aebcb25ef504 SHA256 d3ada2ca33083b0b233051f66041eb57c402783b2cc177b126e4dccab2e32b76
AUX gnash-0.8.5-klash.patch 4219 RMD160 f7d49ca32cf18d3d160ce8f0653fd12e5a278511 SHA1 fc44e119975ecc49d2d64450e0eeb92f6a84f893 SHA256 e1ad6b241bc28892ff9758d55851439b2b61b496dc2e73d96d9a13fdd44a4a08
AUX gnash-0.8.5-moc-qt4.patch 622 RMD160 7143ab1170f536ed35b618740723ff823859e2bd SHA1 24ee33fa3aaed598e48ed6dcdadf94dcdeace588 SHA256 a10cce240d2b241f90523042cd464b81cda0b4e00fd4408f7b421e9a12e18702
AUX gnash-0.8.5-xpcom-idldir.patch 740 RMD160 2e01374e5ae5a69218160fb3abbbceff67f2445b SHA1 b6b357d66eb0fb554a0b2933eac79e2a1a43f42e SHA256 d7d8919681cda058bccbd165f652b06a70681ed424a43b347e1a13f59172f460
AUX gnash-0.8.5-xpidl-sdkdir.patch 1014 RMD160 21b49bccc13af7159d3b81a72b3c82f0daf98eb8 SHA1 c9092cde8baff0c184c961d3b2434740c1dc0a7d SHA256 d7682af2cc466e571fc9d59d0fbd305f087d8e4676f489977ca17c2ad306d6b3
AUX gnash-0.8.6-libcore-as3-headers.patch 612 RMD160 31ae6528c526f575c2bee58f108a7bc168910aba SHA1 0ca78a130ee6c822e18ffe2b3acc89f28204f6b5 SHA256 83029564cbb2313e99ba7e2947b774c146d732caa2ceb5ce312248692a1505a5
AUX gnash-0.8.6-libssh-0.4.patch 9679 RMD160 42430640559c0441d906fb731723ba9ac0acc1df SHA1 2a3755c2eac2a3e9ca42ecb14007c7be18ad72e8 SHA256 1f22f7373df925cc9b5c1c7cc1e40f5e8f2d46d3a6d12298a2b27cf89f75fef1
AUX gnash-0.8.7-klash.patch 3817 RMD160 bb11321f8d3a6c469239fa88482c3233c1219e9d SHA1 aabc9608b73fb1d20cb16469b2027eb57bec4abf SHA256 c5f77dbe6454fa83e5f719ecd619c113d4b5f5a8f39c82beea521b72ace224a0
AUX gnash-0.8.7-xpcom-idldir.patch 731 RMD160 5c79c44dd90ce3555e7a32694c2adbf01d8e5493 SHA1 a6230e75ee301831fc24311d41a4691e509f2bc3 SHA256 1b9bcd8c731e8ae49e2f22fa8e1d5da05b50822d77c3758900bb251cfbd3d32c
DIST gnash-0.8.7.tar.bz2 3617298 RMD160 809e5dcf6f11567f7463d1e772053aa54f7170ed SHA1 bba6245ce251730fd58a59b37609ca4b8898ae01 SHA256 73b8a7c788511e453add26fd68cebd5818b39f9da21cc7c78e9cef8bc837e896
EBUILD gnash-0.8.7.ebuild 7377 RMD160 24e594a299df26dc7573e6664eab9696f47338b6 SHA1 071fef4d67c9da49388092c775180b760343c973 SHA256 fda4ea5b268821d11ba833aa44be9b0c59b5561eab6594413a8e3669e8668aef
MISC Reasons 77 RMD160 3b2fb5226c3ca574d86a97db68a10b400f8c8962 SHA1 7aaf89834e5da03fb9caddf367e2afc08a2f2e2f SHA256 2483a92f8c0c83948bba9c8f20585fdf0717d19a89f140a5f05a190ff6f165aa
www-plugins/gnash/Reasons
-2
View File
@@ -1,2 +0,0 @@
# Fabio Erculiani <lxnay@sabayon.org>
- fix compilation with xulrunner 1.9.x
www-plugins/gnash/files/gnash-0.8.3-boost-dynamic-link.patch
-31
View File
@@ -1,31 +0,0 @@
Index: boost.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/boost.m4,v
retrieving revision 1.74
diff -u -r1.74 boost.m4
--- macros/boost.m4 16 Jan 2008 00:42:55 -0000 1.74
+++ macros/boost.m4 19 Jan 2008 18:35:14 -0000
@@ -127,9 +127,9 @@
missing_libs=""
fi
for j in ${boost_libs}; do
- dirs="`ls -dr $i/libboost_${j}*.${shlibext} $i/libboost_${j}*.a 2>/dev/null`"
+ dirs="`ls -dr $i/libboost_${j}*.so 2>/dev/null`"
if test -n "${dirs}"; then
- libname="`echo ${dirs} | sed -e 's:^.*/lib::' -e "s:\.${shlibext}::" -e "s:\.a::"`"
+ libname="`echo ${dirs} | sed -e 's:^.*/lib::' -e "s:\.so::"`"
if test x$dirname = x; then
dirname="`echo ${dirs} | sed -e 's:/libboost.*$::'`"
if test x"${dirname}" != "x/usr/lib"; then
@@ -143,9 +143,9 @@
done
done
for j in ${extra_boost_libs}; do
- dirs="`ls -dr ${dirname}/libboost_${j}*.${shlibext} ${dirname}/libboost_${j}*.a 2>/dev/null`"
+ dirs="`ls -dr ${dirname}/libboost_${j}*.so 2>/dev/null`"
if test -n "${dirs}"; then
- libname="`echo ${dirs} | sed -e 's:^.*/lib::' -e "s:\.${shlibext}::" -e "s:\.a::"`"
+ libname="`echo ${dirs} | sed -e 's:^.*/lib::' -e "s:\.so::"`"
ac_cv_path_boost_extra_lib="${ac_cv_path_boost_extra_lib} -l${libname}"
else
extra_missing_libs="${extra_missing_libs} $j"
www-plugins/gnash/files/gnash-0.8.5-klash.patch
-96
View File
@@ -1,96 +0,0 @@
--- gnash-0.8.5/macros/kde4.m4.alt-kde4 2009-02-28 15:27:53 +0300
+++ gnash-0.8.5/macros/kde4.m4 2009-07-15 16:02:13 +0400
@@ -24,7 +24,7 @@ AC_DEFUN([GNASH_PATH_KDE4],
with_kde4_incl=${withval})
dnl make sure the path is a useable one
if test x"${with_kde4_incl}" != x ; then
- if test ! -f ${with_kde4_incl}/kapp.h ; then
+ if test ! -f ${with_kde4_incl}/kapplication.h ; then
AC_MSG_ERROR([${with_kde4_incl} directory doesn't contain any KDE 4.x headers])
fi
fi
@@ -38,7 +38,7 @@ AC_DEFUN([GNASH_PATH_KDE4],
with_kde4_lib=${withval})
dnl make sure the path is a useable one
if test x"${with_kde4_lib}" != x ; then
- if test ! -f ${with_kde4_lib}/libkdeui.la; then
+ if test ! -f ${with_kde4_lib}/libkdeui.so; then
AC_MSG_ERROR([${with_kde4_lib} directory doesn't contain any KDE 4.x libraries!])
fi
fi
@@ -134,7 +134,7 @@ AC_DEFUN([GNASH_PATH_KDE4],
dnl Look for the libraries
AC_CACHE_VAL(ac_cv_path_kde4_lib, [
if test x"${with_kde4_lib}" != x ; then
- if test -f ${with_kde4_lib}/libkdeui.la; then
+ if test -f ${with_kde4_lib}/libkdeui.so; then
ac_cv_path_kde4_lib="-L`(cd ${with_kde4_lib}; pwd)`"
else
AC_MSG_ERROR([${with_kde4_lib} directory doesn't contain KDE 4.x libraries.])
@@ -144,7 +144,7 @@ AC_DEFUN([GNASH_PATH_KDE4],
AC_MSG_CHECKING([for kdeui library])
kde4_topdir=
for i in ${kde4_prefix}/lib64 ${kde4_prefix}/lib $libslist ; do
- if test -f $i/libkdeui.${shlibext} -o -f $i/libkdeui.la; then
+ if test -f $i/libkdeui.${shlibext} -o -f $i/libkdeui.so; then
kde4_topdir=$i
AC_MSG_RESULT(${kde4_topdir}/libkdeui)
if test ! x"$i" = x"/usr/lib" -a ! x"$i" = x"/usr/lib64"; then
@@ -160,26 +160,13 @@ AC_DEFUN([GNASH_PATH_KDE4],
dnl Look for the kdecore library, which is required
if test x"${ac_cv_path_kde4_lib}" != x; then
AC_MSG_CHECKING([for kdecore library])
- if test -f ${kde4_topdir}/libkdecore.la; then
+ if test -f ${kde4_topdir}/libkdecore.so; then
ac_cv_path_kde4_lib="${ac_cv_path_kde4_lib} -lkdecore"
AC_MSG_RESULT(${kde4_topdir}/libkdecore)
else
AC_MSG_RESULT(no)
fi
fi
- dnl Look for the kdeprint library, which is required
- AC_MSG_CHECKING([for kdeprint library])
- if test x"${libkdeprint}" = x; then
- if test -f ${kde4_topdir}/libkdeprint.la -o -f ${kde4_topdir}/libkdeprint.${shlibext}; then
- ac_cv_path_kde4_lib="${ac_cv_path_kde4_lib} -lkdeprint"
- AC_MSG_RESULT(${kde4_topdir}/libkdeprint)
- else
- AC_MSG_RESULT(no)
- fi
- else
- AC_MSG_RESULT(${libkdeprint})
- ac_cv_path_kde4_lib="${ac_cv_path_kde4_lib} ${libkdeprint}"
- fi
]) dnl end of cache ac_cv_path_kde4_lib
fi dnl end of build_kde4
@@ -216,7 +203,7 @@ AC_DEFUN([GNASH_PATH_KDE4],
fi dnl end of build_kparts4
if test x"${ac_cv_path_kde4_incl}" != x ; then
- if test x"${ac_cv_path_kde3_incl}" != x"-I/usr/include"; then
+ if test x"${ac_cv_path_kde4_incl}" != x"-I/usr/include"; then
KDE4_CFLAGS="${ac_cv_path_kde4_incl}"
else
KDE4_CFLAGS=""
--- gnash-0.8.5/plugin/klash4/Makefile.am.alt-kde4 2009-06-15 11:53:31 +0400
+++ gnash-0.8.5/plugin/klash4/Makefile.am 2009-07-15 16:02:58 +0400
@@ -42,6 +39,7 @@ libklashpart_la_LDFLAGS = -avoid-version
else
libklashpart_la_LDFLAGS = -module -avoid-version -L$(plugindir) $(KDE4_LIBS) $(QT4_LIBS)
endif
+libklashpart_la_LIBADD = $(KDE4_LIBS) $(QT4_LIBS) $(X11_LIBS) -lkparts
dist_kde_services_DATA = klash_part.desktop
dist_kde_rc_DATA = klashpartui.rc
--- gnash-0.8.5/plugin/klash4/pluginsinfo.alt-kde4 2008-12-28 13:13:38 +0300
+++ gnash-0.8.5/plugin/klash4/pluginsinfo 2009-07-15 16:02:13 +0400
@@ -1,7 +1,7 @@
number=1
[0]
-description=Shockwave Flash 7.0
+description=Shockwave Flash 10.1 r999
file=libklashpart.so
mime=application/x-shockwave-flash:swf:Shockwave Flash;application/futuresplash:spl:FutureSplash Player
name=Shockwave Flash
www-plugins/gnash/files/gnash-0.8.5-moc-qt4.patch
-13
View File
@@ -1,13 +0,0 @@
--- a/macros/qt4.m4 2009-03-02 16:29:42.000000000 +0100
+++ b/macros/qt4.m4 2009-09-08 14:53:31.355928666 +0200
@@ -165,8 +165,8 @@
has_qt4="no"
fi
- AC_PATH_PROG(MOC4, moc-qt4, ,[${QTDIR}/bin /usr/lib/qt4/bin /usr/share/qt4/bin/ ${pathlist}])
- AC_PATH_PROG(UIC4, uic-qt4, ,[${QTDIR}/bin /usr/lib/qt4/bin /usr/share/qt4/bin/ ${pathlist}])
+ AC_PATH_PROGS(MOC4, [moc-qt4 moc], ,[/usr/bin ${QTDIR}/bin /usr/lib/qt4/bin /usr/share/qt4/bin/ ${pathlist}])
+ AC_PATH_PROGS(UIC4, [uic-qt4 uic], ,[/usr/bin ${QTDIR}/bin /usr/lib/qt4/bin /usr/share/qt4/bin/ ${pathlist}])
AC_SUBST([QT4_CFLAGS])
www-plugins/gnash/files/gnash-0.8.5-xpcom-idldir.patch
-18
View File
@@ -1,18 +0,0 @@
Author: Chi-Thanh Christopher Nguyen <chithanh@cs.tu-berlin.de>
Subject: Use pkg-config to determine XPCOM_IDL_DIR instead of non-portable construct.
Bug: #284073
---
diff -ur a/macros/xpcom.m4 b/macros/xpcom.m4
--- a/macros/xpcom.m4 2009-03-02 16:29:48.000000000 +0100
+++ b/macros/xpcom.m4 2009-09-08 22:02:21.548228034 +0200
@@ -102,7 +102,7 @@
if test x"${ac_cv_path_xpcom_incl}" != x; then
XPCOM_CFLAGS="${ac_cv_path_xpcom_incl}"
- XPCOM_IDL_CFLAGS=`echo $XPCOM_CFLAGS | sed -e 's:include:share/idl:'`
+ XPCOM_IDL_CFLAGS="-I`$PKG_CONFIG --variable=idldir libxul`/unstable"
XPIDL=$(pkg-config libxul --variable=sdkdir)
XPIDL="${XPIDL}xpidl"
AC_DEFINE([HAVE_XPCOM], [1], [Use XPCOM in the NPAPI plugin])
www-plugins/gnash/files/gnash-0.8.5-xpidl-sdkdir.patch
-29
View File
@@ -1,29 +0,0 @@
From e462e38c02b4b1a7d5fe76df3f9bcb1c5a9e8940 Mon Sep 17 00:00:00 2001
From: Romain Perier <mrpouet@gentoo.org>
Date: Sat, 5 Sep 2009 12:46:21 +0200
Subject: [PATCH] Fix xpidl binary path in XPIDL
Which didn't lookup into sdkdir variable from libxul.pc
---
macros/xpcom.m4 | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/macros/xpcom.m4 b/macros/xpcom.m4
index 8a5be6b..37e32a9 100644
--- a/macros/xpcom.m4
+++ b/macros/xpcom.m4
@@ -103,8 +103,8 @@ AC_DEFUN([GNASH_PATH_XPCOM],
if test x"${ac_cv_path_xpcom_incl}" != x; then
XPCOM_CFLAGS="${ac_cv_path_xpcom_incl}"
XPCOM_IDL_CFLAGS=`echo $XPCOM_CFLAGS | sed -e 's:include:share/idl:'`
- XPIDL=`echo ${ac_cv_path_xpidl} | sed -e 's:-L::' -e 's:sdk-::' -e 's:sdk/lib::' -e 's:-devel::' -e 's:lib$::'`
- XPIDL="${XPIDL}xpidl"
+ XPIDL=$(pkg-config libxul --variable=sdkdir)
+ XPIDL="${XPIDL}/bin/xpidl"
AC_DEFINE([HAVE_XPCOM], [1], [Use XPCOM in the NPAPI plugin])
else
XPCOM_CFLAGS=""
--
1.6.4.2
www-plugins/gnash/files/gnash-0.8.6-libcore-as3-headers.patch
-25
View File
@@ -1,25 +0,0 @@
From ff5404812aaf33b64ce8d4d2efedee3c8099ce9e Mon Sep 17 00:00:00 2001
From: Romain Perier <mrpouet@gentoo.org>
Date: Fri, 25 Sep 2009 17:12:53 +0200
Subject: [PATCH] Fix missing headers sub-directory for libcore when AS3 is enabled
---
libcore/asClass.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/libcore/asClass.h b/libcore/asClass.h
index 0fe0e17..4f67c9c 100644
--- a/libcore/asClass.h
+++ b/libcore/asClass.h
@@ -33,7 +33,7 @@
#ifdef ENABLE_AVM2
# include "CodeStream.h"
-# include "AbcBlock.h"
+# include "parser/AbcBlock.h"
#endif
namespace gnash {
--
1.6.5.rc1
www-plugins/gnash/files/gnash-0.8.6-libssh-0.4.patch
-354
View File
@@ -1,354 +0,0 @@
Upstream patch from trunk r11722.
https://savannah.gnu.org/bugs/?28354
=== modified file 'libnet/sshclient.cpp'
--- libnet/sshclient.cpp 2009-07-17 19:35:07 +0000
+++ libnet/sshclient.cpp 2009-12-20 16:54:06 +0000
@@ -79,7 +79,6 @@
_need_server_auth(true),
_state(0),
_session(0),
- _options(0),
_channel(0)
{
// GNASH_REPORT_FUNCTION;
@@ -173,37 +172,29 @@
}
bool
-SSHClient::sshConnect(int fd, std::string &hostname)
+SSHClient::sshConnect(int /* fd */, std::string &hostname)
{
// GNASH_REPORT_FUNCTION;
char *password;
char *banner;
char *hexa;
- char buf[10];
-
-// _options.reset(ssh_options_new());
- // Setup the options to for this SSH session
- _options = ssh_options_new();
// We always need a hostname to connect to
- if (ssh_options_set_host(_options, hostname.c_str()) < 0) {
+ if (ssh_options_set(_session, SSH_OPTIONS_HOST, hostname.c_str()) < 0) {
log_error("Couldn't set hostname option");
- ssh_options_free(_options);
return false;
}
// We always need a user name for the connection
if (_user.empty()) {
- if (ssh_options_set_username(_options, _user.c_str()) < 0) {
+ if (ssh_options_set(_session, SSH_OPTIONS_USER, _user.c_str()) < 0) {
log_error("Couldn't set user name option");
- ssh_options_free(_options);
return false;
}
}
// Start a new session
_session = ssh_new();
- ssh_set_options(_session, _options);
if(ssh_connect(_session)){
log_error("Connection failed : %s\n", ssh_get_error(_session));
sshShutdown();
@@ -345,7 +336,7 @@
}
int
-SSHClient::authKbdint(SSH_SESSION *session)
+SSHClient::authKbdint(ssh_session session)
{
// GNASH_REPORT_FUNCTION;
int err = ssh_userauth_kbdint(session, NULL, NULL);
@@ -354,15 +345,15 @@
int i,n;
char echo;
while (err == SSH_AUTH_INFO){
- name = ssh_userauth_kbdint_getname(session);
- instruction = ssh_userauth_kbdint_getinstruction(session);
+ name = const_cast<char *>(ssh_userauth_kbdint_getname(session));
+ instruction = const_cast<char *>(ssh_userauth_kbdint_getinstruction(session));
n=ssh_userauth_kbdint_getnprompts(session);
if(strlen(name)>0)
log_debug("%s", name);
if(strlen(instruction)>0)
log_debug("%s", instruction);
for(i=0; i<n; ++i){
- prompt = ssh_userauth_kbdint_getprompt(session, i, &echo);
+ prompt = const_cast<char *>(ssh_userauth_kbdint_getprompt(session, i, &echo));
if(echo){
log_debug("%s", prompt);
fgets(buffer,sizeof(buffer),stdin);
@@ -387,7 +378,7 @@
}
// Channel operations
-CHANNEL *
+ssh_channel
SSHClient::openChannel()
{
// GNASH_REPORT_FUNCTION;
@@ -395,8 +386,8 @@
}
-CHANNEL *
-SSHClient::openChannel(SSH_SESSION *session)
+ssh_channel
+SSHClient::openChannel(ssh_session session)
{
// GNASH_REPORT_FUNCTION;
if (session) {
@@ -414,7 +405,7 @@
}
int
-SSHClient::readChannel(CHANNEL *channel, amf::Buffer &buf)
+SSHClient::readChannel(ssh_channel channel, amf::Buffer &buf)
{
// GNASH_REPORT_FUNCTION;
int ret = -1;
@@ -429,7 +420,7 @@
}
int
-SSHClient::writeChannel(CHANNEL *channel, amf::Buffer &buf)
+SSHClient::writeChannel(ssh_channel channel, amf::Buffer &buf)
{
// GNASH_REPORT_FUNCTION;
int ret = -1;
@@ -439,6 +430,8 @@
} else {
log_error("Can't write to a non-existant channel!");
}
+
+ return ret;
}
void
@@ -449,7 +442,7 @@
}
void
-SSHClient::closeChannel(CHANNEL *channel)
+SSHClient::closeChannel(ssh_channel channel)
{
// GNASH_REPORT_FUNCTION;
=== modified file 'libnet/sshclient.h'
--- libnet/sshclient.h 2009-07-15 21:44:51 +0000
+++ libnet/sshclient.h 2009-12-20 16:54:06 +0000
@@ -98,25 +98,25 @@
transport_type_t getTransportType() { return _transporttype; };
int authKbdint();
- int authKbdint(SSH_SESSION *);
+ int authKbdint(ssh_session);
// Channel operations
- CHANNEL *openChannel();
- CHANNEL *openChannel(SSH_SESSION *session);
+ ssh_channel openChannel();
+ ssh_channel openChannel(ssh_session session);
void closeChannel();
- void closeChannel(CHANNEL *channel);
+ void closeChannel(ssh_channel channel);
// Accessors
- CHANNEL *getChannel() { return _channel; };
- SSH_SESSION *getSession() { return _session; };
+ ssh_channel getChannel() { return _channel; };
+ ssh_session getSession() { return _session; };
boost::shared_ptr<amf::Buffer> &getBuffer() { return _buffer; };
// Dump internal data to the screen for debugging
void dump();
protected:
- int readChannel(CHANNEL *channel, amf::Buffer &buf);
- int writeChannel(CHANNEL *channel, amf::Buffer &buf);
+ int readChannel (ssh_channel channel, amf::Buffer &buf);
+ int writeChannel(ssh_channel channel, amf::Buffer &buf);
std::string _hostname;
std::string _user;
@@ -126,12 +126,11 @@
transport_type_t _transporttype;
int _state;
#if 0
- boost::shared_ptr<SSH_SESSION> _session;
+ boost::shared_ptr<ssh_session> _session;
boost::shared_ptr<SSH_OPTIONS> _options;
#else
- SSH_SESSION *_session;
- SSH_OPTIONS *_options;
- CHANNEL *_channel;
+ ssh_session _session;
+ ssh_channel _channel;
#endif
boost::shared_ptr<amf::Buffer> _buffer;
};
=== modified file 'libnet/sshserver.cpp'
--- libnet/sshserver.cpp 2009-07-20 20:57:44 +0000
+++ libnet/sshserver.cpp 2009-12-20 16:54:06 +0000
@@ -95,50 +95,56 @@
// Authenticate the password from the user
bool
-SSHServer::authPassword(string &user, string &passwd)
+SSHServer::authPassword(string & /* user */, string & /* passwd */)
{
+ return false;
}
bool
-SSHServer::authPassword(SSH_SESSION *session, string &user, string &passwd)
+SSHServer::authPassword(ssh_session /* session */, string &/* user */, string & /* passwd */)
{
+ return false;
}
// Wait for an incoming network connection
bool
SSHServer::acceptConnections()
{
-}
-
-bool
-SSHServer::acceptConnections(short port)
-{
-}
-
-bool
-SSHServer::acceptConnections(SSH_SESSION *session)
-{
-}
-
-bool
-SSHServer::acceptConnections(SSH_SESSION *session, short port)
-{
+ return false;
+}
+
+bool
+SSHServer::acceptConnections(short /* port */)
+{
+ return false;
+}
+
+bool
+SSHServer::acceptConnections(ssh_session /* session */)
+{
+ return false;
+}
+
+bool
+SSHServer::acceptConnections(ssh_session /* session */, short /* port */)
+{
+ return false;
}
// Parse an SSH command message and do something
bool
-SSHServer::processSSHMessage(SSH_MESSAGE *message)
+SSHServer::processSSHMessage(ssh_message message)
{
if (!message) {
return false;
}
switch(ssh_message_type(message)){
- case SSH_AUTH_REQUEST:
+ case SSH_REQUEST_AUTH:
switch(ssh_message_subtype(message)) {
// not authenticated, send default message
- case SSH_AUTH_NONE:
+ case SSH_AUTH_METHOD_NONE:
break;
- case SSH_AUTH_PASSWORD:
+ case SSH_AUTH_METHOD_PASSWORD:
{
log_debug("User %s wants to auth with pass %s\n",
ssh_message_auth_user(message),
@@ -152,20 +158,20 @@
}
break;
}
- case SSH_AUTH_HOSTBASED:
- break;
- case SSH_AUTH_PUBLICKEY:
- break;
- case SSH_AUTH_KEYBINT:
- break;
- case SSH_AUTH_UNKNOWN:
+ case SSH_AUTH_METHOD_HOSTBASED:
+ break;
+ case SSH_AUTH_METHOD_PUBLICKEY:
+ break;
+ case SSH_AUTH_METHOD_INTERACTIVE:
+ break;
+ case SSH_AUTH_METHOD_UNKNOWN:
break;
default:
- ssh_message_auth_set_methods(message,SSH_AUTH_PASSWORD);
+ ssh_message_auth_set_methods(message,SSH_AUTH_METHOD_PASSWORD);
ssh_message_reply_default(message);
break;
}
- case SSH_CHANNEL_REQUEST_OPEN:
+ case SSH_REQUEST_CHANNEL_OPEN:
if(ssh_message_subtype(message)==SSH_CHANNEL_SESSION){
_channel = ssh_message_channel_request_open_reply_accept(message);
break;
@@ -185,6 +191,8 @@
ssh_message_reply_default(message);
}
ssh_message_free(message);
+
+ return false;
}
void
=== modified file 'libnet/sshserver.h'
--- libnet/sshserver.h 2009-07-17 19:35:07 +0000
+++ libnet/sshserver.h 2009-12-20 16:54:06 +0000
@@ -64,26 +64,25 @@
// Authenticate the password from the user
bool authPassword(std::string &user, std::string &passwd);
- bool authPassword(SSH_SESSION *session, std::string &user, std::string &passwd);
+ bool authPassword(ssh_session session, std::string &user, std::string &passwd);
// Wait for an incoming network connection
bool acceptConnections();
bool acceptConnections(short port);
- bool acceptConnections(SSH_SESSION *session);
- bool acceptConnections(SSH_SESSION *session, short port);
+ bool acceptConnections(ssh_session session);
+ bool acceptConnections(ssh_session session, short port);
// Parse an SSH command message and do something
- bool processSSHMessage(SSH_MESSAGE *message);
+ bool processSSHMessage(ssh_message message);
void dump();
protected:
// Get the SSH command message
- SSH_MESSAGE *getSSHMessage();
- SSH_MESSAGE *getSSHMessage(SSH_SESSION *session);
+ ssh_message getSSHMessage();
+ ssh_message getSSHMessage(ssh_session session);
- SSH_SESSION *_session; // the current session
- SSH_OPTIONS *_options; // the current list of options
- SSH_MESSAGE *_message; // the current SSH command message
+ ssh_session _session; // the current session
+ ssh_message _message; // the current SSH command message
};
} // end of gnash namespace
www-plugins/gnash/files/gnash-0.8.7-klash.patch
-88
View File
@@ -1,88 +0,0 @@
--- gnash-0.8.5/macros/kde4.m4.alt-kde4 2009-02-28 15:27:53 +0300
+++ gnash-0.8.5/macros/kde4.m4 2009-07-15 16:02:13 +0400
@@ -24,7 +24,7 @@ AC_DEFUN([GNASH_PATH_KDE4],
with_kde4_incl=${withval})
dnl make sure the path is a useable one
if test x"${with_kde4_incl}" != x ; then
- if test ! -f ${with_kde4_incl}/kapp.h ; then
+ if test ! -f ${with_kde4_incl}/kapplication.h ; then
AC_MSG_ERROR([${with_kde4_incl} directory doesn't contain any KDE 4.x headers])
fi
fi
@@ -38,7 +38,7 @@ AC_DEFUN([GNASH_PATH_KDE4],
with_kde4_lib=${withval})
dnl make sure the path is a useable one
if test x"${with_kde4_lib}" != x ; then
- if test ! -f ${with_kde4_lib}/libkdeui.la; then
+ if test ! -f ${with_kde4_lib}/libkdeui.so; then
AC_MSG_ERROR([${with_kde4_lib} directory doesn't contain any KDE 4.x libraries!])
fi
fi
@@ -136,7 +136,7 @@ AC_DEFUN([GNASH_PATH_KDE4],
dnl Look for the libraries
AC_CACHE_VAL(ac_cv_path_kde4_lib, [
if test x"${with_kde4_lib}" != x ; then
- if test -f ${with_kde4_lib}/libkdeui.la; then
+ if test -f ${with_kde4_lib}/libkdeui.so; then
ac_cv_path_kde4_lib="-L`(cd ${with_kde4_lib}; pwd)`"
else
AC_MSG_ERROR([${with_kde4_lib} directory doesn't contain KDE 4.x libraries.])
@@ -146,7 +146,7 @@ AC_DEFUN([GNASH_PATH_KDE4],
AC_MSG_CHECKING([for kdeui library])
kde4_topdir=
for i in ${kde4_prefix}/lib64 ${kde4_prefix}/lib $libslist ; do
- if test -f $i/libkdeui.${shlibext} -o -f $i/libkdeui.la; then
+ if test -f $i/libkdeui.${shlibext} -o -f $i/libkdeui.so; then
kde4_topdir=$i
AC_MSG_RESULT(${kde4_topdir}/libkdeui)
if test ! x"$i" = x"/usr/lib" -a ! x"$i" = x"/usr/lib64"; then
@@ -169,19 +169,6 @@ AC_DEFUN([GNASH_PATH_KDE4],
AC_MSG_RESULT(no)
fi
fi
- dnl Look for the kdeprint library, which is required
- AC_MSG_CHECKING([for kdeprint library])
- if test x"${libkdeprint}" = x; then
- if test -f ${kde4_topdir}/libkdeprint.la -o -f ${kde4_topdir}/libkdeprint.${shlibext}; then
- ac_cv_path_kde4_lib="${ac_cv_path_kde4_lib} -lkdeprint"
- AC_MSG_RESULT(${kde4_topdir}/libkdeprint)
- else
- AC_MSG_RESULT(no)
- fi
- else
- AC_MSG_RESULT(${libkdeprint})
- ac_cv_path_kde4_lib="${ac_cv_path_kde4_lib} ${libkdeprint}"
- fi
]) dnl end of cache ac_cv_path_kde4_lib
fi dnl end of build_kde4
@@ -218,7 +205,7 @@ AC_DEFUN([GNASH_PATH_KDE4],
fi dnl end of build_kparts4
if test x"${ac_cv_path_kde4_incl}" != x ; then
- if test x"${ac_cv_path_kde3_incl}" != x"-I/usr/include"; then
+ if test x"${ac_cv_path_kde4_incl}" != x"-I/usr/include"; then
KDE4_CFLAGS="${ac_cv_path_kde4_incl}"
else
KDE4_CFLAGS=""
--- gnash-0.8.5/plugin/klash4/Makefile.am.alt-kde4 2009-06-15 11:53:31 +0400
+++ gnash-0.8.5/plugin/klash4/Makefile.am 2009-07-15 16:02:58 +0400
@@ -42,6 +39,7 @@ libklashpart_la_LDFLAGS = -avoid-version
else
libklashpart_la_LDFLAGS = -module -avoid-version -L$(plugindir) $(KDE4_LIBS) $(QT4_LIBS)
endif
+libklashpart_la_LIBADD = $(KDE4_LIBS) $(QT4_LIBS) $(X11_LIBS) -lkparts
dist_kde_services_DATA = klash_part.desktop
dist_kde_rc_DATA = klashpartui.rc
--- gnash-0.8.5/plugin/klash4/pluginsinfo.alt-kde4 2008-12-28 13:13:38 +0300
+++ gnash-0.8.5/plugin/klash4/pluginsinfo 2009-07-15 16:02:13 +0400
@@ -1,7 +1,7 @@
number=1
[0]
-description=Shockwave Flash 7.0
+description=Shockwave Flash 10.1 r999
file=libklashpart.so
mime=application/x-shockwave-flash:swf:Shockwave Flash;application/futuresplash:spl:FutureSplash Player
name=Shockwave Flash
www-plugins/gnash/files/gnash-0.8.7-xpcom-idldir.patch
-18
View File
@@ -1,18 +0,0 @@
Author: Chi-Thanh Christopher Nguyen <chithanh@cs.tu-berlin.de>
Subject: Use pkg-config to determine XPCOM_IDL_DIR instead of non-portable construct.
Bug: #284073
---
diff -ur a/macros/xpcom.m4 b/macros/xpcom.m4
--- a/macros/xpcom.m4 2009-03-02 16:29:48.000000000 +0100
+++ b/macros/xpcom.m4 2009-09-08 22:02:21.548228034 +0200
@@ -102,7 +102,7 @@
if test x"${ac_cv_path_xpcom_incl}" != x; then
XPCOM_CFLAGS="${ac_cv_path_xpcom_incl}"
- XPCOM_IDL_CFLAGS=`echo $XPCOM_CFLAGS | sed -e 's:include:share/idl:'`
+ XPCOM_IDL_CFLAGS="-I`$PKG_CONFIG --variable=idldir libxul`"
XPIDL=$(pkg-config libxul --variable=sdkdir)
XPIDL="${XPIDL}xpidl"
AC_DEFINE([HAVE_XPCOM], [1], [Use XPCOM in the NPAPI plugin])
www-plugins/gnash/gnash-0.8.7.ebuild
-256
View File
@@ -1,256 +0,0 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.6.ebuild,v 1.8 2010/01/10 15:46:07 scarabeus Exp $
EAPI="2"
CMAKE_REQUIRED="false"
KDE_REQUIRED="optional"
KDE_MINIMAL="4.2"
AT_M4DIR="cygnal"
inherit autotools eutils kde4-base multilib nsplugins
DESCRIPTION="GNU Flash movie player that supports many SWF v7,8,9 features"
HOMEPAGE="http://www.gnu.org/software/gnash/"
SRC_URI="mirror://gnu/${PN}/${PV}/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
IUSE="agg cairo cygnal dbus doc +ffmpeg gnome gstreamer gtk kde lirc mysql +nls nsplugin +opengl python +sdl ssh ssl test video_cards_intel"
RDEPEND=">=dev-libs/boost-1.35.0
dev-libs/expat
dev-libs/libxml2
media-libs/jpeg
media-libs/libpng
net-misc/curl
x11-libs/libX11
x11-libs/libXi
x11-libs/libXmu
x11-libs/libXt
x11-libs/libXv
media-libs/giflib
x11-proto/xproto
agg? ( x11-libs/agg )
cairo? ( x11-libs/cairo )
doc? (
>=app-text/docbook2X-0.8.8
app-text/docbook-sgml-utils
)
ffmpeg? (
media-libs/libsdl[X]
>=media-video/ffmpeg-0.5
)
gstreamer? (
media-plugins/gst-plugins-ffmpeg
media-plugins/gst-plugins-mad
media-plugins/gst-plugins-meta
)
gtk? (
x11-libs/gtk+:2
>=net-libs/xulrunner-1.9.2:1.9
python? ( dev-python/pygtk:2 )
)
kde? ( >=kde-base/kdebase-startkde-${KDE_MINIMAL} )
opengl? (
virtual/opengl
gtk? ( x11-libs/gtkglext )
)
sdl? ( media-libs/libsdl[X] )
nsplugin? ( net-libs/xulrunner:1.9 )
media-libs/speex[ogg]
sys-libs/zlib
>=sys-devel/libtool-2.2
mysql? ( dev-db/mysql )
lirc? ( app-misc/lirc )
dbus? ( sys-apps/dbus )
ssh? ( >=net-libs/libssh-0.4[server] )
ssl? ( dev-libs/openssl )"
DEPEND="${RDEPEND}
dev-util/pkgconfig
nls? ( sys-devel/gettext )
gnome? ( app-text/rarian )"
pkg_setup() {
if ! ( use agg || use cairo || use opengl ); then
ewarn "You are trying to build Gnash without choosing a renderer [agg|cairo|opengl]."
has_version x11-libs/cairo && ewarn "cairo enabled as default" \
|| die "Please enable a renderer"
elif use agg && use cairo && use opengl; then
ewarn "You enabled 3 renderers, agg was chosen as default."
fi
if use cairo && use !agg && use !opengl && use kde; then
eerror "The cairo renderer and kde gui are not compatible."
die "Cairo renderer incompatible with kde gui !"
fi
if ! ( use kde || use gtk || use sdl ); then
ewarn "You are trying to build Gnash without choosing a gui frontend [gtk,kde,sdl]."
has_version media-libs/libsdl[X] && ewarn "sdl enabled as default" \
|| die "Please enable at least one of these USE flags."
fi
if use nsplugin && use !gtk; then
eerror "Building gnash with nsplugin requires the gtk gui."
die "Nsplugin requires the gtk gui."
fi
if use sdl; then
ewarn "Enable SDL as gui frontend and sound handler"
fi
if use lirc; then
ewarn "Enable LIRC daemon support and lirc extension"
fi
kde4-base_pkg_setup
}
src_prepare() {
local mozsdk_incdir=${S}/plugin/mozilla-sdk/include
# Defines $(XPIDL) correctly using sdkdir variable from libxul.pc
epatch "${FILESDIR}"/${PN}-0.8.5-xpidl-sdkdir.patch
# Use pkgconfig to determine XPCOM_IDL_DIR instead of non-portable construct.
# Fixes building against xulrunner-1.9.0, bug #284073.
# Patch for 0.8.7 fixes building against xulrunner-1.9.2
epatch "${FILESDIR}"/${PN}-0.8.7-xpcom-idldir.patch
# Resurect patch from bug #230287
epatch "${FILESDIR}"/${PN}-0.8.3-boost-dynamic-link.patch
# Conflict headers with npapi.h from mozilla-sdk embedded stuffs and libxul-unstable header
# in case where xpcom (implicitly added with gtk) is enabled, we use the system header
if use gtk; then
rm -f ${mozsdk_incdir}/npapi.h
ln -s $(pkg-config libxul --variable=includedir)/npapi.h \
${mozsdk_incdir}/npapi.h || die "symlink failed"
fi
eautoreconf
}
src_configure() {
local myconf myext gui
# Set nsplugin install directory.
use nsplugin && myconf="${myconf} --with-npapi-plugindir=/opt/netscape/plugins"
# Set rendering engine.
if use agg; then
myconf="${myconf} --enable-renderer=agg"
elif use opengl; then
myconf="${myconf} --enable-renderer=ogl"
else
myconf="${myconf} --enable-renderer=cairo"
fi
# Set kde and konqueror plugin directories.
if use kde; then
myconf="${myconf}
--with-plugins-install=system
--with-kde4-incl=${KDEDIR}/include
--with-kde4-configdir=${KDEDIR}/share/config
--with-kde4-prefix=${KDEDIR}
--with-kde4-lib=${KDEDIR}/$(get_libdir)
--with-kde-appsdatadir=${KDEDIR}/share/apps/klash
--with-kde4-servicesdir=${KDEDIR}/share/kde4/services
--with-kde4-plugindir=${KDEDIR}/$(get_libdir)/kde4/plugins"
fi
# Set media handler.
if use ffmpeg; then
myconf="${myconf} --enable-media=ffmpeg"
elif use gstreamer; then
myconf="${myconf} --enable-media=gst"
else
myconf="${myconf} --enable-media=none"
fi
# Set gui.
use gtk && gui=",gtk"
use kde && gui="${gui},kde4"
if use sdl; then
gui="${gui},sdl"
myconf="${myconf} --enable-sound=sdl"
fi
# Set extensions
use mysql && myext=",mysql"
use gtk && myext="${myext},gtk"
use lirc && myext="${myext},lirc"
use dbus && myext="${myext},dbus"
if [ -z "$gui" ]; then
gui="sdl"
fi
# Strip extra comma from gui and myext.
gui=$( echo $gui | sed -e 's/,//' )
myext=$( echo $myext | sed -e 's/,//' )
econf \
--disable-dependency-tracking \
--disable-kparts3 \
--enable-avm2 \
$(use_enable cygnal) \
$(use_enable cygnal cgibins) \
$(use_enable doc docbook) \
$(use_enable gnome ghelp) \
$(use_enable gtk xpcom) \
$(use_enable gtk npapi) \
$(use_enable kde kparts4) \
$(use_enable lirc) \
$(use_enable nls) \
$(use_enable nsplugin npapi) \
$(use_enable python) \
$(use_enable ssh) \
$(use_enable ssl) \
$(use_enable test testsuite) \
$(use_enable video_cards_intel i810-lod-bias) \
--enable-gui=${gui} \
--enable-extensions=${myext} \
${myconf}
}
src_test() {
local log=testsuite-results.txt
cd testsuite
emake check || die "make check failed"
./anaylse-results.sh > $log || die "results analyze failed"
cat $log
}
src_install() {
emake DESTDIR="${D}" install || die "emake install failed"
# Install nsplugin in directory set by --with-npapi-plugindir.
if use nsplugin; then
emake DESTDIR="${D}" install-plugin || die "install plugins failed"
fi
# Install kde konqueror plugin.
if use kde; then
pushd "${S}/plugin/klash4" >& /dev/null
emake DESTDIR="${D}" install-plugin || die "install kde plugins failed"
popd >& /dev/null
fi
# Create a symlink in /usr/$(get_libdir)/nsbrowser/plugins to the nsplugin install directory.
use nsplugin && inst_plugin /opt/netscape/plugins/libgnashplugin.so \
|| rm -rf "${D}/opt"
dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
}
pkg_postinst() {
if use !ffmpeg && use !gstreamer || use gstreamer && ( ! use gnome ); then
ewarn ""
ewarn "Gnash was built without a media handler and or http handler !"
ewarn ""
ewarn "If you want Gnash to support video then you will need to"
ewarn "rebuild Gnash with either the ffmpeg or gstreamer use flags set."
ewarn ""
fi
ewarn "${PN} is still in heavy development"
ewarn "Please first report bugs on upstream gnashdevs and deal with them"
ewarn "And then report a Gentoo bug to the maintainer"
use kde && kde4-base_pkg_postinst
}