svn commit: r412740 - in head/net/x2goclient: . files
Mathieu Arnold
mat at FreeBSD.org
Fri Apr 8 12:38:18 UTC 2016
Author: mat
Date: Fri Apr 8 12:38:16 2016
New Revision: 412740
URL: https://svnweb.freebsd.org/changeset/ports/412740
Log:
Update to 4.0.5.1.
PR: 208616
Submitted by: tkato432 yahoo com
Sponsored by: Absolight
Added:
head/net/x2goclient/files/patch-src_sshmasterconnection.cpp (contents, props changed)
- copied, changed from r412739, head/net/x2goclient/files/patch-sshmasterconnection.cpp
head/net/x2goclient/files/patch-src_sshprocess.cpp (contents, props changed)
- copied, changed from r412739, head/net/x2goclient/files/patch-sshprocess.cpp
head/net/x2goclient/files/patch-src_sshprocess.h (contents, props changed)
- copied, changed from r412739, head/net/x2goclient/files/patch-sshprocess.h
Deleted:
head/net/x2goclient/files/patch-sshmasterconnection.cpp
head/net/x2goclient/files/patch-sshprocess.cpp
head/net/x2goclient/files/patch-sshprocess.h
Modified:
head/net/x2goclient/Makefile (contents, props changed)
head/net/x2goclient/distinfo (contents, props changed)
Modified: head/net/x2goclient/Makefile
==============================================================================
--- head/net/x2goclient/Makefile Fri Apr 8 12:38:10 2016 (r412739)
+++ head/net/x2goclient/Makefile Fri Apr 8 12:38:16 2016 (r412740)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= x2goclient
-PORTVERSION= 4.0.5.0
-PORTREVISION= 1
+PORTVERSION= 4.0.5.1
CATEGORIES= net
MASTER_SITES= http://code.x2go.org/releases/source/x2goclient/
@@ -66,6 +65,8 @@ do-install:
(cd ${WRKSRC}/res/img/icons/128x128 && ${INSTALL_DATA} ${i} \
${STAGEDIR}${DATADIR}/icons)
.endfor
+
+post-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
(cd ${WRKSRC} && ${INSTALL_DATA} HOWTO.GPGCARD ${STAGEDIR}${DOCSDIR})
Modified: head/net/x2goclient/distinfo
==============================================================================
--- head/net/x2goclient/distinfo Fri Apr 8 12:38:10 2016 (r412739)
+++ head/net/x2goclient/distinfo Fri Apr 8 12:38:16 2016 (r412740)
@@ -1,2 +1,2 @@
-SHA256 (x2goclient-4.0.5.0.tar.gz) = 242e91720c1e5830f64a632c111ac3c4b6f6690d5005454c8e025b00bfbe42a1
-SIZE (x2goclient-4.0.5.0.tar.gz) = 1577271
+SHA256 (x2goclient-4.0.5.1.tar.gz) = 844e983fbbddfe8a626506e4140b1ad65591e14f794c735412402bee3163ed11
+SIZE (x2goclient-4.0.5.1.tar.gz) = 1657361
Copied and modified: head/net/x2goclient/files/patch-src_sshmasterconnection.cpp (from r412739, head/net/x2goclient/files/patch-sshmasterconnection.cpp)
==============================================================================
--- head/net/x2goclient/files/patch-sshmasterconnection.cpp Fri Apr 8 12:38:10 2016 (r412739, copy source)
+++ head/net/x2goclient/files/patch-src_sshmasterconnection.cpp Fri Apr 8 12:38:16 2016 (r412740)
@@ -1,4 +1,4 @@
---- src/sshmasterconnection.cpp.orig 2015-05-26 19:13:12 UTC
+--- src/sshmasterconnection.cpp.orig 2016-03-24 20:39:27 UTC
+++ src/sshmasterconnection.cpp
@@ -28,6 +28,9 @@
#include <QDir>
@@ -10,7 +10,7 @@
#include <arpa/inet.h>
#endif
#include <math.h>
-@@ -272,7 +275,11 @@ void SshMasterConnection::addReverseTunn
+@@ -277,7 +280,11 @@ void SshMasterConnection::addReverseTunn
if(!reverseTunnelRequest[i].listen)
{
reverseTunnelRequest[i].listen=true;
Copied and modified: head/net/x2goclient/files/patch-src_sshprocess.cpp (from r412739, head/net/x2goclient/files/patch-sshprocess.cpp)
==============================================================================
--- head/net/x2goclient/files/patch-sshprocess.cpp Fri Apr 8 12:38:10 2016 (r412739, copy source)
+++ head/net/x2goclient/files/patch-src_sshprocess.cpp Fri Apr 8 12:38:16 2016 (r412740)
@@ -1,4 +1,4 @@
---- src/sshprocess.cpp.orig 2015-07-28 02:50:36 UTC
+--- src/sshprocess.cpp.orig 2016-03-24 20:39:27 UTC
+++ src/sshprocess.cpp
@@ -24,6 +24,9 @@
@@ -14,17 +14,17 @@
// #endif
if(!masterCon->useKerberos())
{
-- QString shcmd = "bash -c 'echo \"X2GODATABEGIN:" + uuidStr + "\"; export PATH=\"/usr/local/bin:/usr/bin:/bin\"; "+cmd+"; echo \"X2GODATAEND:" + uuidStr + "\";'";
-+ QString shcmd = "sh -c 'echo \"X2GODATABEGIN:" + uuidStr + "\"; export PATH=\"/usr/bin:/bin:/usr/local/bin\"; "+cmd+"; echo \"X2GODATAEND:" + uuidStr + "\";'";
- x2goDebug << "Running masterCon->addChannelConnection(this, '" << uuidStr << "', '" << shcmd.left (200) << "');";
+- 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 + "\";'";
+ 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
* as there is no preceding "outer double quote" the whole argument
* is wrapped in.
*/
-- shcmd = "bash -c 'echo \"X2GODATABEGIN:" + uuidStr + "\"; export PATH=\"/usr/local/bin:/usr/bin:/bin\"; "+cmd+"; echo \"X2GODATAEND:" + uuidStr + "\";'";
-+ shcmd = "sh -c 'echo \"X2GODATABEGIN:" + uuidStr + "\"; export PATH=\"/usr/bin:/bin:/usr/local/bin\"; "+cmd+"; echo \"X2GODATAEND:" + uuidStr + "\";'";
+- 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 + "\";'";
proc=new QProcess(this);
QString local_cmd = "";
Copied and modified: head/net/x2goclient/files/patch-src_sshprocess.h (from r412739, head/net/x2goclient/files/patch-sshprocess.h)
==============================================================================
--- head/net/x2goclient/files/patch-sshprocess.h Fri Apr 8 12:38:10 2016 (r412739, copy source)
+++ head/net/x2goclient/files/patch-src_sshprocess.h Fri Apr 8 12:38:16 2016 (r412740)
@@ -1,4 +1,4 @@
---- src/sshprocess.h.orig 2015-05-26 19:13:12 UTC
+--- src/sshprocess.h.orig 2016-03-24 20:39:27 UTC
+++ src/sshprocess.h
@@ -18,6 +18,12 @@
#ifndef SSHPROCESS_H
More information about the svn-ports-head
mailing list