Date: Sat, 31 Aug 2019 16:16:20 +0000 (UTC) From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r510399 - in head/net/x2goclient: . files Message-ID: <201908311616.x7VGGKsh001446@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: yuri Date: Sat Aug 31 16:16:19 2019 New Revision: 510399 URL: https://svnweb.freebsd.org/changeset/ports/510399 Log: net/x2goclient: Update 4.1.0.0 -> 4.1.2.1 Added: head/net/x2goclient/files/patch-x2goclient.pro (contents, props changed) Modified: head/net/x2goclient/Makefile head/net/x2goclient/distinfo head/net/x2goclient/files/patch-src_sshmasterconnection.cpp head/net/x2goclient/files/patch-src_sshprocess.cpp Modified: head/net/x2goclient/Makefile ============================================================================== --- head/net/x2goclient/Makefile Sat Aug 31 15:49:18 2019 (r510398) +++ head/net/x2goclient/Makefile Sat Aug 31 16:16:19 2019 (r510399) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= x2goclient -PORTVERSION= 4.1.0.0 -PORTREVISION= 2 +PORTVERSION= 4.1.2.1 CATEGORIES= net MASTER_SITES= http://code.x2go.org/releases/source/x2goclient/ Modified: head/net/x2goclient/distinfo ============================================================================== --- head/net/x2goclient/distinfo Sat Aug 31 15:49:18 2019 (r510398) +++ head/net/x2goclient/distinfo Sat Aug 31 16:16:19 2019 (r510399) @@ -1,3 +1,3 @@ -TIMESTAMP = 1498741428 -SHA256 (x2goclient-4.1.0.0.tar.gz) = 4b5915bc3666228910342810a34f7a03fb6967c6b9c796633d9cdf8b89cc2b6a -SIZE (x2goclient-4.1.0.0.tar.gz) = 1889861 +TIMESTAMP = 1567267374 +SHA256 (x2goclient-4.1.2.1.tar.gz) = 1c18981f0a39929624de9472b0e6c3fa2ac7842837dd306db318af54c5fff2af +SIZE (x2goclient-4.1.2.1.tar.gz) = 2735905 Modified: head/net/x2goclient/files/patch-src_sshmasterconnection.cpp ============================================================================== --- head/net/x2goclient/files/patch-src_sshmasterconnection.cpp Sat Aug 31 15:49:18 2019 (r510398) +++ head/net/x2goclient/files/patch-src_sshmasterconnection.cpp Sat Aug 31 16:16:19 2019 (r510399) @@ -1,6 +1,6 @@ ---- src/sshmasterconnection.cpp.orig 2016-03-24 20:39:27 UTC +--- src/sshmasterconnection.cpp.orig 2018-06-25 20:21:49 UTC +++ src/sshmasterconnection.cpp -@@ -28,6 +28,9 @@ +@@ -29,6 +29,9 @@ #include <QDir> #include <QTemporaryFile> #ifndef Q_OS_WIN @@ -10,15 +10,3 @@ #include <arpa/inet.h> #endif #include <math.h> -@@ -277,7 +280,11 @@ void SshMasterConnection::addReverseTunn - if(!reverseTunnelRequest[i].listen) - { - reverseTunnelRequest[i].listen=true; -+#if LIBSSH_VERSION_MAJOR == 0 && LIBSSH_VERSION_MINOR <= 6 - int rc=ssh_forward_listen(my_ssh_session, NULL, reverseTunnelRequest[i].forwardPort, NULL); -+#else -+ int rc=ssh_channel_listen_forward(my_ssh_session, NULL, reverseTunnelRequest[i].forwardPort, NULL); -+#endif - if(rc==SSH_OK) - { - emit reverseTunnelOk(reverseTunnelRequest[i].creator); Modified: head/net/x2goclient/files/patch-src_sshprocess.cpp ============================================================================== --- head/net/x2goclient/files/patch-src_sshprocess.cpp Sat Aug 31 15:49:18 2019 (r510398) +++ head/net/x2goclient/files/patch-src_sshprocess.cpp Sat Aug 31 16:16:19 2019 (r510399) @@ -1,4 +1,4 @@ ---- src/sshprocess.cpp.orig 2018-11-04 13:15:51 UTC +--- src/sshprocess.cpp.orig 2018-06-25 20:21:49 UTC +++ src/sshprocess.cpp @@ -24,6 +24,9 @@ @@ -12,28 +12,28 @@ #endif @@ -140,7 +143,7 @@ void SshProcess::tunnelLoop() address.sin_family=AF_INET; - address.sin_addr.s_addr=INADDR_ANY; + address.sin_addr.s_addr=htonl(INADDR_LOOPBACK); address.sin_port=htons(localPort); - if (bind(serverSocket,(struct sockaddr*) &address,sizeof(address))!=0) + if (::bind(serverSocket,(struct sockaddr*) &address,sizeof(address))!=0) { QString err=tr("Error binding ")+localHost+":"+QString::number(localPort); x2goDebug<<err<<endl; -@@ -200,7 +203,7 @@ void SshProcess::startNormal(const QStri - // #endif +@@ -209,7 +212,7 @@ void SshProcess::startNormal(const QString& cmd, bool + } if(!masterCon->useKerberos()) { -- QString shcmd = "bash -l -c 'echo \"X2GODATABEGIN:" + uuidStr + "\"; export PATH=\"/usr/local/bin:/usr/bin:/bin\"; export TERM=\"dumb\"; "+cmd+"; echo \"X2GODATAEND:" + uuidStr + "\";'"; -+ QString shcmd = "sh -c 'echo \"X2GODATABEGIN:" + uuidStr + "\"; export PATH=\"/usr/bin:/bin:/usr/local/bin\"; export TERM=\"dumb\"; "+cmd+"; echo \"X2GODATAEND:" + uuidStr + "\";'"; +- QString shcmd = "bash -l -c 'echo \"X2GODATABEGIN:" + uuidStr + "\"; " + pathString + "export TERM=\"dumb\"; "+cmd+"; echo \"X2GODATAEND:" + uuidStr + "\";'"; ++ QString shcmd = "sh -c 'echo \"X2GODATABEGIN:" + uuidStr + "\"; " + pathString + "export TERM=\"dumb\"; "+cmd+"; echo \"X2GODATAEND:" + uuidStr + "\";'"; x2goDebug << "this="<<this<<" Running masterCon->addChannelConnection(this, '" << uuidStr << "', '" << shcmd.left (200) << "');"; masterCon->addChannelConnection(this, uuidStr, shcmd); connect(masterCon,SIGNAL(stdOut(SshProcess*,QByteArray)),this,SLOT(slotStdOut(SshProcess*,QByteArray))); -@@ -222,7 +225,7 @@ void SshProcess::startNormal(const QStri +@@ -231,7 +234,7 @@ void SshProcess::startNormal(const QString& cmd, bool * as there is no preceding "outer double quote" the whole argument * is wrapped in. */ -- shcmd = "bash -l -c 'echo \"X2GODATABEGIN:" + uuidStr + "\"; export PATH=\"/usr/local/bin:/usr/bin:/bin\"; export TERM=\"dumb\"; "+cmd+"; echo \"X2GODATAEND:" + uuidStr + "\";'"; -+ shcmd = "sh -c 'echo \"X2GODATABEGIN:" + uuidStr + "\"; export PATH=\"/usr/bin:/bin:/usr/local/bin\"; export TERM=\"dumb\"; "+cmd+"; echo \"X2GODATAEND:" + uuidStr + "\";'"; +- shcmd = "bash -l -c 'echo \"X2GODATABEGIN:" + uuidStr + "\";" + pathString + "export TERM=\"dumb\"; "+cmd+"; echo \"X2GODATAEND:" + uuidStr + "\";'"; ++ shcmd = "sh -c 'echo \"X2GODATABEGIN:" + uuidStr + "\";" + pathString + "export TERM=\"dumb\"; "+cmd+"; echo \"X2GODATAEND:" + uuidStr + "\";'"; proc=new QProcess(this); QString local_cmd = ""; Added: head/net/x2goclient/files/patch-x2goclient.pro ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/x2goclient/files/patch-x2goclient.pro Sat Aug 31 16:16:19 2019 (r510399) @@ -0,0 +1,11 @@ +--- x2goclient.pro.orig 2019-08-31 16:08:02 UTC ++++ x2goclient.pro +@@ -132,7 +132,7 @@ SOURCES += src/sharewidget.cpp \ + src/compat.cpp \ + src/pulsemanager.cpp + +-LIBS += -lssh -lssh_threads ++LIBS += -lssh + win32:LIBS += -lAdvAPI32 -lshell32 -lUser32 + + RC_FILE = res/x2goclient.rc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201908311616.x7VGGKsh001446>