diff options
| author | pawel <pawel@FreeBSD.org> | 2015-10-02 21:00:00 +0000 |
|---|---|---|
| committer | pawel <pawel@FreeBSD.org> | 2015-10-02 21:00:00 +0000 |
| commit | e8886d9148997d9637950d4b7aab725f1a3356e2 (patch) | |
| tree | a79c9b72300e6cfa1fd0676c839ef0a107149664 | |
| parent | 3a13066176339ddda0f5c526c21ffd70c0e358e6 (diff) | |
| download | FreeBSD-ports-e8886d9148997d9637950d4b7aab725f1a3356e2.zip FreeBSD-ports-e8886d9148997d9637950d4b7aab725f1a3356e2.tar.gz | |
- Update to version 4.0.5.0
- Add LICENSE_FILE
PR: 202853
Submitted by: tkato432@yahoo.com
| -rw-r--r-- | net/x2goclient/Makefile | 9 | ||||
| -rw-r--r-- | net/x2goclient/distinfo | 4 | ||||
| -rw-r--r-- | net/x2goclient/files/patch-sshprocess.cpp | 20 |
3 files changed, 26 insertions, 7 deletions
diff --git a/net/x2goclient/Makefile b/net/x2goclient/Makefile index d54da7f..4f4ebea 100644 --- a/net/x2goclient/Makefile +++ b/net/x2goclient/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ 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 @@ MAINTAINER= ports@FreeBSD.org 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 @@ post-patch: ${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 --git a/net/x2goclient/distinfo b/net/x2goclient/distinfo index 1236321..1e871f8 100644 --- a/net/x2goclient/distinfo +++ b/net/x2goclient/distinfo @@ -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 --git a/net/x2goclient/files/patch-sshprocess.cpp b/net/x2goclient/files/patch-sshprocess.cpp index 63a1889..9f72447 100644 --- a/net/x2goclient/files/patch-sshprocess.cpp +++ b/net/x2goclient/files/patch-sshprocess.cpp @@ -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 = ""; |
