Hello community,
here is the log from the commit of package freenx-client for openSUSE:Factory
checked in at Mon Dec 7 16:07:16 CET 2009.
--------
--- freenx-client/libnxcl.changes 2008-04-28 23:05:52.000000000 +0200
+++ /mounts/work_src_done/STABLE/freenx-client/libnxcl.changes 2009-12-07 11:49:25.000000000 +0100
@@ -1,0 +2,5 @@
+Fri Dec 4 22:02:21 CET 2009 - dmueller@suse.de
+
+- refresh patches
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ freenx-client.spec ++++++
--- /var/tmp/diff_new_pack.oHPbma/_old 2009-12-07 16:06:51.000000000 +0100
+++ /var/tmp/diff_new_pack.oHPbma/_new 2009-12-07 16:06:51.000000000 +0100
@@ -20,11 +20,11 @@
Name: freenx-client
BuildRequires: doxygen libnxcl-devel libqt4-devel
-License: GPL v2 or later
+License: GPLv2+
Group: System/X11/Utilities
Summary: a Free NoMachine (NX) client
Version: 0.9
-Release: 63
+Release: 64
Url: http://www.krename.net
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: freenx-client-%{version}.tar.bz2
++++++ libnxcl.spec ++++++
--- /var/tmp/diff_new_pack.oHPbma/_old 2009-12-07 16:06:51.000000000 +0100
+++ /var/tmp/diff_new_pack.oHPbma/_new 2009-12-07 16:06:51.000000000 +0100
@@ -20,11 +20,11 @@
Name: libnxcl
BuildRequires: doxygen libqt4-devel
-License: GPL v2 or later
+License: GPLv2+
Group: Development/Libraries/C and C++
Summary: A Library for building NoMachine (NX) clients
Version: 0.9
-Release: 66
+Release: 67
Url: http://www.krename.net
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: freenx-client-%{version}.tar.bz2
@@ -45,7 +45,7 @@
Seb James
%package -n libnxcl1
-License: GPL v2 or later
+License: GPLv2+
Summary: A Library for building NoMachine (NX) clients
Group: Development/Libraries/C and C++
@@ -60,7 +60,7 @@
Seb James
%package -n libnxcl-devel
-License: GPL v2 or later
+License: GPLv2+
Summary: A Library for building NoMachine (NX) clients
Group: Development/Libraries/C and C++
Requires: libnxcl1 = %version
++++++ obsoletes-nxssh.diff ++++++
--- /var/tmp/diff_new_pack.oHPbma/_old 2009-12-07 16:06:51.000000000 +0100
+++ /var/tmp/diff_new_pack.oHPbma/_new 2009-12-07 16:06:51.000000000 +0100
@@ -1,14 +1,16 @@
---- nxcl/lib/notQt.cpp
+Index: nxcl/lib/notQt.cpp
+===================================================================
+--- nxcl/lib/notQt.cpp.orig
+++ nxcl/lib/notQt.cpp
-@@ -26,6 +26,7 @@
+@@ -26,6 +26,7 @@ extern "C" {
#include
#include
#include
+#include
#include
}
-
-@@ -52,7 +53,8 @@
+ #include
+@@ -53,7 +54,8 @@ notQProcess::notQProcess () :
progName("unknown"),
error (NOTQPROCNOERROR),
pid(0),
@@ -18,7 +20,7 @@
{
// Set up the polling structs
this->p = static_cast(malloc (2*sizeof (struct pollfd)));
-@@ -62,6 +64,15 @@
+@@ -63,6 +65,15 @@ notQProcess::notQProcess () :
notQProcess::~notQProcess ()
{
free (this->p);
@@ -34,7 +36,7 @@
}
void
-@@ -84,10 +95,18 @@
+@@ -85,10 +96,18 @@ notQProcess::start (const string& progra
// NB: The first item in the args list should be the program name.
this->progName = program;
@@ -53,9 +55,11 @@
this->pid = fork();
---- nxcl/lib/nxsession.cpp
+Index: nxcl/lib/nxsession.cpp
+===================================================================
+--- nxcl/lib/nxsession.cpp.orig
+++ nxcl/lib/nxsession.cpp
-@@ -69,6 +69,7 @@
+@@ -69,6 +69,7 @@ string NXSession::parseSSH(string messag
int response = parseResponse (message);
string returnMessage;
@@ -63,7 +67,7 @@
if (response == 211) {
if (doSSH == true) {
returnMessage = "yes";
-@@ -80,6 +81,7 @@
+@@ -80,6 +81,7 @@ string NXSession::parseSSH(string messag
if (response == 204) { // Authentication failed
returnMessage = "204";
}
@@ -71,7 +75,7 @@
if (response == 147) { // Server capacity reached
returnMessage = "147";
-@@ -90,6 +92,17 @@
+@@ -90,6 +92,17 @@ string NXSession::parseSSH(string messag
case HELLO_NXCLIENT:
dbgln ("HELLO_NXCLIENT stage");
@@ -89,9 +93,11 @@
if (message.find("HELLO NXSERVER - Version") != string::npos) {
this->callbacks->authenticatedSignal();
returnMessage = "hello NXCLIENT - Version ";
---- nxcl/lib/notQt.h
+Index: nxcl/lib/notQt.h
+===================================================================
+--- nxcl/lib/notQt.h.orig
+++ nxcl/lib/notQt.h
-@@ -117,7 +117,19 @@
+@@ -117,6 +117,18 @@ namespace nxcl {
pid_t getPid (void) { return this->pid; }
int getError (void) { return this->error; }
void setError (int e) { this->error = e; }
@@ -100,18 +106,17 @@
+ {
+ this->parentFD = this->parentToChild[1];
+ close(this->childToParent[0]);
-
++
+ // Create new pipes
+ pipe(this->parentToChild);
+ pipe(this->childToParent);
+
+ return this->parentFD;
+ }
-+
+
/*!
* Setter for the callbacks.
- */
-@@ -180,6 +192,11 @@
+@@ -180,6 +192,11 @@ namespace nxcl {
* Pointer to a callback object
*/
notQProcessCallbacks * callbacks;
@@ -123,7 +128,9 @@
};
/*!
---- nxcl/lib/nxclientlib.cpp
+Index: nxcl/lib/nxclientlib.cpp
+===================================================================
+--- nxcl/lib/nxclientlib.cpp.orig
+++ nxcl/lib/nxclientlib.cpp
@@ -8,7 +8,8 @@
: Author: Sebastian James
@@ -150,7 +157,7 @@
extern "C" {
#include
#include
-@@ -186,10 +195,14 @@
+@@ -188,10 +197,14 @@ void NXClientLib::invokeNXSSH (string pu
// Start to build the arguments for the nxssh command.
// notQProcess requires that argv[0] contains the program name
@@ -165,7 +172,7 @@
argtmp.str("");
argtmp << "-p" << port;
-@@ -215,6 +228,7 @@
+@@ -217,6 +230,7 @@ void NXClientLib::invokeNXSSH (string pu
}
argtmp.str("");
@@ -173,7 +180,7 @@
argtmp << "nx@" << serverHost;
arguments.push_back (argtmp.str());
-@@ -227,9 +241,13 @@
+@@ -229,9 +243,13 @@ void NXClientLib::invokeNXSSH (string pu
arguments.push_back ("-oRSAAuthentication no");
arguments.push_back ("-oRhostsRSAAuthentication no");
arguments.push_back ("-oPubkeyAuthentication yes");
@@ -187,7 +194,7 @@
session.setEncryption (true);
} else {
session.setEncryption (false);
-@@ -240,10 +258,16 @@
+@@ -242,10 +260,16 @@ void NXClientLib::invokeNXSSH (string pu
// nxssh -E gives this message when called:
// NX> 285 Enabling skip of SSH config files
// ...so there you have the meaning.
@@ -204,7 +211,7 @@
this->nxsshProcess->start(nxsshPath, arguments);
-@@ -365,8 +389,9 @@
+@@ -367,8 +391,9 @@ void NXClientLib::processParseStdout()
// On some connections this is sent via stdout instead of stderr?
if (proxyData.encrypted && readyForProxy &&
@@ -216,7 +223,7 @@
// This is "NX> 299 Switching connection to: " in
// version 1.5.0. This was changed in nxssh version
// 2.0.0-8 (see the nxssh CHANGELOG).
-@@ -388,6 +413,11 @@
+@@ -390,6 +415,11 @@ void NXClientLib::processParseStdout()
this->externalCallbacks->connectedSuccessfullySignal();
this->sessionRunning = true;
}
@@ -228,7 +235,7 @@
if ((*msgiter).find("Password") != string::npos) {
this->externalCallbacks->write
-@@ -402,6 +432,9 @@
+@@ -404,6 +434,9 @@ void NXClientLib::processParseStdout()
dbgln ("NXClientLib::processParseStdout: Got auth failed"
" or capacity reached, calling this->parseSSH.");
msg = this->parseSSH (*msgiter);
@@ -238,7 +245,7 @@
}
if (msg.size() > 0) {
this->write (msg);
-@@ -436,7 +469,9 @@
+@@ -438,7 +471,9 @@ void NXClientLib::processParseStderr()
+ (*msgiter) + "'(end msg)");
if (proxyData.encrypted && readyForProxy &&
@@ -249,7 +256,7 @@
string switchCommand = "NX> 299 Switch connection to: ";
stringstream ss;
-@@ -478,6 +513,11 @@
+@@ -480,6 +515,11 @@ void NXClientLib::processParseStderr()
_("SSH host key verification failed"));
this->isFinished = true;
}
@@ -261,7 +268,7 @@
}
}
-@@ -580,21 +620,41 @@
+@@ -582,21 +622,41 @@ string NXClientLib::parseSSH (string mes
this->externalCallbacks->serverCapacitySignal();
this->isFinished = true;
@@ -305,7 +312,7 @@
}
return rMessage;
-@@ -700,18 +760,24 @@
+@@ -702,18 +762,24 @@ void NXClientLib::invokeProxy()
stringstream data;
if (proxyData.encrypted) {
@@ -334,7 +341,7 @@
<< "\n";
}
-@@ -726,11 +792,24 @@
+@@ -728,10 +794,23 @@ void NXClientLib::invokeProxy()
list<string> arguments;
arguments.push_back("nxproxy"); // argv[0] has to be the program name
arguments.push_back("-S");
@@ -344,7 +351,7 @@
- ss << ":" << proxyData.display;
- arguments.push_back(ss.str());
+ ss << "nx/nx,options=" << nxdir << ":" << proxyData.display;
-
++
+ setenv("NX_DISPLAY", ss.str().c_str(), 1);
+
+#ifndef NXCL_USE_NXSSH
@@ -358,7 +365,6 @@
+ sleep(2);
+ }
+#endif
-+
+
// Find a path for the nxproxy process using getPath()
string nxproxyPath = this->getPath ("nxproxy");
- this->nxproxyProcess->start(nxproxyPath, arguments);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org