Index: head/net/x2goclient/Makefile =================================================================== --- head/net/x2goclient/Makefile (revision 412739) +++ head/net/x2goclient/Makefile (revision 412740) @@ -1,72 +1,73 @@ # Created by: arved # $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/ 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:security/libssh LIB_DEPENDS= libcups.so:print/cups \ libssh.so:security/libssh RUN_DEPENDS= nxproxy:net/nxproxy \ x2goclient-cli:net/x2goclient-cli USES= qmake USE_XORG= xpm USE_QT4= gui network svg \ linguisttools_build moc_build rcc_build uic_build QMAKE_ARGS= QMAKE_LRELEASE="${LRELEASE}" INSTALLS_ICONS= yes OPTIONS_DEFINE= DOCS LDAP OPTIONS_DEFAULT= LDAP LDAP_USE= OPENLDAP=yes LDAP_CFLAGS= -DUSELDAP LDAP_QMAKE_ON= LIBS+="-lX11 -lXpm -lcups -lldap" LDAP_QMAKE_OFF= LIBS+="-lX11 -lXpm -lcups" post-patch: @${FIND} ${WRKSRC}/src -name "*.cpp" -or -name "*.h" | ${XARGS} \ ${REINPLACE_CMD} -e \ 's|Q_OS_LINUX|Q_OS_UNIX| ; \ //s|^|//| ; \ /#define USELDAP/s|^|//| ; \ s|/usr/local/bin|${LOCALBASE}/bin|' pre-build: @(cd ${WRKSRC} && ${DO_MAKE_BUILD} compiler_TSQM_make_all) do-install: (cd ${WRKSRC} && ${INSTALL_PROGRAM} x2goclient \ ${STAGEDIR}${PREFIX}/bin) (cd ${WRKSRC}/man/man1 && ${INSTALL_MAN} x2goclient.1 \ ${STAGEDIR}${MANPREFIX}/man/man1) @${MKDIR} ${STAGEDIR}${DESKTOPDIR} (cd ${WRKSRC}/desktop && ${INSTALL_DATA} x2goclient.desktop \ ${STAGEDIR}${DESKTOPDIR}) .for i in 16x16 32x32 48x48 64x64 128x128 @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}/apps (cd ${WRKSRC}/res/img/icons/${i} && ${INSTALL_DATA} x2goclient.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}/apps) .endfor @${MKDIR} ${STAGEDIR}${DATADIR}/icons (cd ${WRKSRC}/res/img/icons && ${INSTALL_DATA} x2goclient.xpm \ ${STAGEDIR}${DATADIR}/icons) .for i in x2goclient.png x2gosession.png (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}) .include Index: head/net/x2goclient/distinfo =================================================================== --- head/net/x2goclient/distinfo (revision 412739) +++ head/net/x2goclient/distinfo (revision 412740) @@ -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 Index: head/net/x2goclient/files/patch-sshmasterconnection.cpp =================================================================== --- head/net/x2goclient/files/patch-sshmasterconnection.cpp (revision 412739) +++ head/net/x2goclient/files/patch-sshmasterconnection.cpp (nonexistent) @@ -1,24 +0,0 @@ ---- src/sshmasterconnection.cpp.orig 2015-05-26 19:13:12 UTC -+++ src/sshmasterconnection.cpp -@@ -28,6 +28,9 @@ - #include - #include - #ifndef Q_OS_WIN -+#include -+#include -+#include - #include - #endif - #include -@@ -272,7 +275,11 @@ void SshMasterConnection::addReverseTunn - if(!reverseTunnelRequest[i].listen) - { - reverseTunnelRequest[i].listen=true; -+#if LIBSSH_VERSION_MAJOR == 0 && LIBSSH_VERSION_MINOR <= 6 - int rc=ssh_forward_listen(my_ssh_session, NULL, reverseTunnelRequest[i].forwardPort, NULL); -+#else -+ int rc=ssh_channel_listen_forward(my_ssh_session, NULL, reverseTunnelRequest[i].forwardPort, NULL); -+#endif - if(rc==SSH_OK) - { - emit reverseTunnelOk(reverseTunnelRequest[i].creator); Property changes on: head/net/x2goclient/files/patch-sshmasterconnection.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/x2goclient/files/patch-sshprocess.cpp =================================================================== --- head/net/x2goclient/files/patch-sshprocess.cpp (revision 412739) +++ head/net/x2goclient/files/patch-sshprocess.cpp (nonexistent) @@ -1,30 +0,0 @@ ---- src/sshprocess.cpp.orig 2015-07-28 02:50:36 UTC -+++ src/sshprocess.cpp -@@ -24,6 +24,9 @@ - - #include - #ifndef Q_OS_WIN -+#include -+#include -+#include - #include - #include - #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 = ""; Property changes on: head/net/x2goclient/files/patch-sshprocess.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/x2goclient/files/patch-sshprocess.h =================================================================== --- head/net/x2goclient/files/patch-sshprocess.h (revision 412739) +++ head/net/x2goclient/files/patch-sshprocess.h (nonexistent) @@ -1,15 +0,0 @@ ---- src/sshprocess.h.orig 2015-05-26 19:13:12 UTC -+++ src/sshprocess.h -@@ -18,6 +18,12 @@ - #ifndef SSHPROCESS_H - #define SSHPROCESS_H - -+#ifndef Q_OS_WIN -+#include -+#include -+#include -+#include -+#endif - #include - #include - #include Property changes on: head/net/x2goclient/files/patch-sshprocess.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/x2goclient/files/patch-src_sshmasterconnection.cpp =================================================================== --- head/net/x2goclient/files/patch-src_sshmasterconnection.cpp (nonexistent) +++ head/net/x2goclient/files/patch-src_sshmasterconnection.cpp (revision 412740) @@ -0,0 +1,24 @@ +--- src/sshmasterconnection.cpp.orig 2016-03-24 20:39:27 UTC ++++ src/sshmasterconnection.cpp +@@ -28,6 +28,9 @@ + #include + #include + #ifndef Q_OS_WIN ++#include ++#include ++#include + #include + #endif + #include +@@ -277,7 +280,11 @@ void SshMasterConnection::addReverseTunn + if(!reverseTunnelRequest[i].listen) + { + reverseTunnelRequest[i].listen=true; ++#if LIBSSH_VERSION_MAJOR == 0 && LIBSSH_VERSION_MINOR <= 6 + int rc=ssh_forward_listen(my_ssh_session, NULL, reverseTunnelRequest[i].forwardPort, NULL); ++#else ++ int rc=ssh_channel_listen_forward(my_ssh_session, NULL, reverseTunnelRequest[i].forwardPort, NULL); ++#endif + if(rc==SSH_OK) + { + emit reverseTunnelOk(reverseTunnelRequest[i].creator); Property changes on: head/net/x2goclient/files/patch-src_sshmasterconnection.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/x2goclient/files/patch-src_sshprocess.cpp =================================================================== --- head/net/x2goclient/files/patch-src_sshprocess.cpp (nonexistent) +++ head/net/x2goclient/files/patch-src_sshprocess.cpp (revision 412740) @@ -0,0 +1,30 @@ +--- src/sshprocess.cpp.orig 2016-03-24 20:39:27 UTC ++++ src/sshprocess.cpp +@@ -24,6 +24,9 @@ + + #include + #ifndef Q_OS_WIN ++#include ++#include ++#include + #include + #include + #endif +@@ -200,7 +203,7 @@ void SshProcess::startNormal(const QStri + // #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="<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 = ""; Property changes on: head/net/x2goclient/files/patch-src_sshprocess.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/x2goclient/files/patch-src_sshprocess.h =================================================================== --- head/net/x2goclient/files/patch-src_sshprocess.h (nonexistent) +++ head/net/x2goclient/files/patch-src_sshprocess.h (revision 412740) @@ -0,0 +1,15 @@ +--- src/sshprocess.h.orig 2016-03-24 20:39:27 UTC ++++ src/sshprocess.h +@@ -18,6 +18,12 @@ + #ifndef SSHPROCESS_H + #define SSHPROCESS_H + ++#ifndef Q_OS_WIN ++#include ++#include ++#include ++#include ++#endif + #include + #include + #include Property changes on: head/net/x2goclient/files/patch-src_sshprocess.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property