Attachment 169088 Details for Bug 208616 – net_x2goclient.diff

[patch] net_x2goclient.diff

net_x2goclient.diff (text/plain), 3.80 KB, created by tkato432 on 2016-04-07 19:04:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2016-04-07 19:04:08 UTC

Size: 3.80 KB

patch

obsolete

>diff -urN /usr/ports/net/x2goclient/Makefile net/x2goclient/Makefile
>--- /usr/ports/net/x2goclient/Makefile	2016-04-02 02:12:19.099392000 +0900
>+++ net/x2goclient/Makefile	2016-04-08 00:00:00.000000000 +0900
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/net/x2goclient/Makefile 412348 2016-04-01 14:17:44Z mat $
> 
> 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 @@
> 	(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})
> 
>diff -urN /usr/ports/net/x2goclient/distinfo net/x2goclient/distinfo
>--- /usr/ports/net/x2goclient/distinfo	2015-10-03 10:49:46.416162000 +0900
>+++ net/x2goclient/distinfo	2016-04-08 00:00:00.000000000 +0900
>@@ -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
>diff -urN /usr/ports/net/x2goclient/files/patch-sshprocess.cpp net/x2goclient/files/patch-sshprocess.cpp
>--- /usr/ports/net/x2goclient/files/patch-sshprocess.cpp	2015-10-03 10:49:46.416470000 +0900
>+++ net/x2goclient/files/patch-sshprocess.cpp	2016-04-08 00:00:00.000000000 +0900
>@@ -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 = "";

Actions: View | Diff

Attachments on bug 208616: 169088