Attachment 160655 Details for Bug 202853 – net_x2goclient.diff

[patch] net_x2goclient.diff

net_x2goclient.diff (text/plain), 3.44 KB, created by tkato432 on 2015-09-02 18:36:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2015-09-02 18:36:35 UTC

Size: 3.44 KB

patch

obsolete

>diff -urN /usr/ports/net/x2goclient/Makefile net/x2goclient/Makefile
>--- /usr/ports/net/x2goclient/Makefile	2015-08-24 03:57:24.557038000 +0900
>+++ net/x2goclient/Makefile	2015-09-03 00:00:00.000000000 +0900
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/net/x2goclient/Makefile 391073 2015-07-01 15:12:24Z amdmi3 $
> 
> PORTNAME=	x2goclient
>-PORTVERSION=	4.0.4.0
>+PORTVERSION=	4.0.5.0
> CATEGORIES=	net
> MASTER_SITES=	http://code.x2go.org/releases/source/x2goclient/
> 
>@@ -10,6 +10,7 @@
> COMMENT=	Qt client for the X2Go system
> 
> LICENSE=	GPLv2
>+#LICENSE_FILE=	${WRKSRC}/COPYING
> 
> # Avoid clash with libssh from base
> BUILD_DEPENDS=	${LOCALBASE}/lib/libssh.so:${PORTSDIR}/security/libssh
>@@ -38,11 +39,11 @@
> 		${REINPLACE_CMD} -e \
> 		's|Q_OS_LINUX|Q_OS_UNIX| ; \
> 		 /<linux\/fs.h>/s|^|//| ; \
>-		 /#define USELDAP/s|^|//|'
>+		 /#define USELDAP/s|^|//| ; \
>+		 s|/usr/local/bin|${LOCALBASE}/bin|'
> 
> pre-build:
>-	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
>-		${MAKEFILE} compiler_TSQM_make_all)
>+	@(cd ${WRKSRC} && ${DO_MAKE_BUILD} compiler_TSQM_make_all)
> 
> do-install:
> 	(cd ${WRKSRC} && ${INSTALL_PROGRAM} x2goclient \
>diff -urN /usr/ports/net/x2goclient/distinfo net/x2goclient/distinfo
>--- /usr/ports/net/x2goclient/distinfo	2015-08-24 03:57:24.565405000 +0900
>+++ net/x2goclient/distinfo	2015-09-03 00:00:00.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (x2goclient-4.0.4.0.tar.gz) = 86d05ce10039fe0a965cdc55086e00f4f3abc573a96f128b92f87081b7251657
>-SIZE (x2goclient-4.0.4.0.tar.gz) = 1571218
>+SHA256 (x2goclient-4.0.5.0.tar.gz) = 242e91720c1e5830f64a632c111ac3c4b6f6690d5005454c8e025b00bfbe42a1
>+SIZE (x2goclient-4.0.5.0.tar.gz) = 1577271
>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-08-24 03:57:24.533954000 +0900
>+++ net/x2goclient/files/patch-sshprocess.cpp	2015-09-03 00:00:00.000000000 +0900
>@@ -1,4 +1,4 @@
>---- src/sshprocess.cpp.orig	2015-05-26 19:13:12 UTC
>+--- src/sshprocess.cpp.orig	2015-07-28 02:50:36 UTC
> +++ src/sshprocess.cpp
> @@ -24,6 +24,9 @@
>  
>@@ -10,3 +10,21 @@
>  #include <arpa/inet.h>
>  #include <netinet/tcp.h>
>  #endif
>+@@ -200,7 +203,7 @@ void SshProcess::startNormal(const QStri
>+ // #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) << "');";
>+         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 + "\";'";
>+ 
>+         proc=new QProcess(this);
>+         QString local_cmd = "";

Actions: View | Diff

Attachments on bug 202853: 160655