Attachment #169088 for bug #208616

View | Details | Raw Unified | Return to bug 208616
Collapse All | Expand All




# $FreeBSD: head/net/x2goclient/Makefile 412348 2016-04-01 14:17:44Z mat $

PORTNAME=	x2goclient
PORTVERSION=	4.0.5.1
PORTREVISION=	1
CATEGORIES=	net
MASTER_SITES=	http://code.x2go.org/releases/source/x2goclient/


	(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})


Lines 1-2 Link Here

(-)net/x2goclient/distinfo (-2 / +2 lines)
1	SHA256 (x2goclient-4.0.5.0.tar.gz) = 242e91720c1e5830f64a632c111ac3c4b6f6690d5005454c8e025b00bfbe42a1	1	SHA256 (x2goclient-4.0.5.1.tar.gz) = 844e983fbbddfe8a626506e4140b1ad65591e14f794c735412402bee3163ed11
2	SIZE (x2goclient-4.0.5.0.tar.gz) = 1577271	2	SIZE (x2goclient-4.0.5.1.tar.gz) = 1657361




--- src/sshprocess.cpp.orig	2016-03-24 20:39:27 UTC
+++ src/sshprocess.cpp
@@ -24,6 +24,9 @@
 

 // #endif
     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 + "\";'";
         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 -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 = "";

Return to bug 208616

Lines 2-9 Link Here

(-)net/x2goclient/Makefile (-2 / +3 lines)
2	# $FreeBSD: head/net/x2goclient/Makefile 412348 2016-04-01 14:17:44Z mat $	2	# $FreeBSD: head/net/x2goclient/Makefile 412348 2016-04-01 14:17:44Z mat $
3		3
4	PORTNAME= x2goclient	4	PORTNAME= x2goclient
5	PORTVERSION= 4.0.5.0	5	PORTVERSION= 4.0.5.1
6	PORTREVISION= 1
7	CATEGORIES= net	6	CATEGORIES= net
8	MASTER_SITES= http://code.x2go.org/releases/source/x2goclient/	7	MASTER_SITES= http://code.x2go.org/releases/source/x2goclient/
9		8
Lines 66-71 Link Here
66	(cd ${WRKSRC}/res/img/icons/128x128 && ${INSTALL_DATA} ${i} \	65	(cd ${WRKSRC}/res/img/icons/128x128 && ${INSTALL_DATA} ${i} \
67	${STAGEDIR}${DATADIR}/icons)	66	${STAGEDIR}${DATADIR}/icons)
68	.endfor	67	.endfor
		68
		69	post-install-DOCS-on:
69	@${MKDIR} ${STAGEDIR}${DOCSDIR}	70	@${MKDIR} ${STAGEDIR}${DOCSDIR}
70	(cd ${WRKSRC} && ${INSTALL_DATA} HOWTO.GPGCARD ${STAGEDIR}${DOCSDIR})	71	(cd ${WRKSRC} && ${INSTALL_DATA} HOWTO.GPGCARD ${STAGEDIR}${DOCSDIR})
71		72

Lines 1-4 Link Here

(-)net/x2goclient/files/patch-sshprocess.cpp (-6 / +6 lines)
1	--- src/sshprocess.cpp.orig 2015-07-28 02:50:36 UTC	1	--- src/sshprocess.cpp.orig 2016-03-24 20:39:27 UTC
2	+++ src/sshprocess.cpp	2	+++ src/sshprocess.cpp
3	@@ -24,6 +24,9 @@	3	@@ -24,6 +24,9 @@
4		4
Lines 14-30 Link Here
14	// #endif	14	// #endif
15	if(!masterCon->useKerberos())	15	if(!masterCon->useKerberos())
16	{	16	{
17	- QString shcmd = "bash -c 'echo \"X2GODATABEGIN:" + uuidStr + "\"; export PATH=\"/usr/local/bin:/usr/bin:/bin\"; "+cmd+"; echo \"X2GODATAEND:" + uuidStr + "\";'";	17	- QString shcmd = "bash -l -c 'echo \"X2GODATABEGIN:" + uuidStr + "\"; export PATH=\"/usr/local/bin:/usr/bin:/bin\"; export TERM=\"dumb\"; "+cmd+"; echo \"X2GODATAEND:" + uuidStr + "\";'";
18	+ QString shcmd = "sh -c 'echo \"X2GODATABEGIN:" + uuidStr + "\"; export PATH=\"/usr/bin:/bin:/usr/local/bin\"; "+cmd+"; echo \"X2GODATAEND:" + uuidStr + "\";'";	18	+ QString shcmd = "sh -c 'echo \"X2GODATABEGIN:" + uuidStr + "\"; export PATH=\"/usr/bin:/bin:/usr/local/bin\"; export TERM=\"dumb\"; "+cmd+"; echo \"X2GODATAEND:" + uuidStr + "\";'";
19	x2goDebug << "Running masterCon->addChannelConnection(this, '" << uuidStr << "', '" << shcmd.left (200) << "');";	19	x2goDebug << "this="<<this<<" Running masterCon->addChannelConnection(this, '" << uuidStr << "', '" << shcmd.left (200) << "');";
20	masterCon->addChannelConnection(this, uuidStr, shcmd);	20	masterCon->addChannelConnection(this, uuidStr, shcmd);
21	connect(masterCon,SIGNAL(stdOut(SshProcess,QByteArray)),this,SLOT(slotStdOut(SshProcess,QByteArray)));	21	connect(masterCon,SIGNAL(stdOut(SshProcess,QByteArray)),this,SLOT(slotStdOut(SshProcess,QByteArray)));
22	@@ -222,7 +225,7 @@ void SshProcess::startNormal(const QStri	22	@@ -222,7 +225,7 @@ void SshProcess::startNormal(const QStri
23	* as there is no preceding "outer double quote" the whole argument	23	* as there is no preceding "outer double quote" the whole argument
24	* is wrapped in.	24	* is wrapped in.
25	*/	25	*/
26	- shcmd = "bash -c 'echo \"X2GODATABEGIN:" + uuidStr + "\"; export PATH=\"/usr/local/bin:/usr/bin:/bin\"; "+cmd+"; echo \"X2GODATAEND:" + uuidStr + "\";'";	26	- shcmd = "bash -l -c 'echo \"X2GODATABEGIN:" + uuidStr + "\"; export PATH=\"/usr/local/bin:/usr/bin:/bin\"; export TERM=\"dumb\"; "+cmd+"; echo \"X2GODATAEND:" + uuidStr + "\";'";
27	+ shcmd = "sh -c 'echo \"X2GODATABEGIN:" + uuidStr + "\"; export PATH=\"/usr/bin:/bin:/usr/local/bin\"; "+cmd+"; echo \"X2GODATAEND:" + uuidStr + "\";'";	27	+ shcmd = "sh -c 'echo \"X2GODATABEGIN:" + uuidStr + "\"; export PATH=\"/usr/bin:/bin:/usr/local/bin\"; export TERM=\"dumb\"; "+cmd+"; echo \"X2GODATAEND:" + uuidStr + "\";'";
28		28
29	proc=new QProcess(this);	29	proc=new QProcess(this);
30	QString local_cmd = "";	30	QString local_cmd = "";