From owner-svn-ports-all@freebsd.org Tue Nov 6 07:16:29 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B1D091107B42; Tue, 6 Nov 2018 07:16:29 +0000 (UTC) (envelope-from meta@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3E75A69E29; Tue, 6 Nov 2018 07:16:29 +0000 (UTC) (envelope-from meta@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 20F1D2364A; Tue, 6 Nov 2018 07:16:29 +0000 (UTC) (envelope-from meta@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA67GTsJ050315; Tue, 6 Nov 2018 07:16:29 GMT (envelope-from meta@FreeBSD.org) Received: (from meta@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA67GSit050313; Tue, 6 Nov 2018 07:16:28 GMT (envelope-from meta@FreeBSD.org) Message-Id: <201811060716.wA67GSit050313@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: meta set sender to meta@FreeBSD.org using -f From: Koichiro Iwao Date: Tue, 6 Nov 2018 07:16:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r484278 - in branches/2018Q4/net/x2goclient: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: meta X-SVN-Commit-Paths: in branches/2018Q4/net/x2goclient: . files X-SVN-Commit-Revision: 484278 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 3E75A69E29 X-Spamd-Result: default: False [-103.10 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-0.99)[-0.995,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-1.000,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Nov 2018 07:16:29 -0000 Author: meta Date: Tue Nov 6 07:16:28 2018 New Revision: 484278 URL: https://svnweb.freebsd.org/changeset/ports/484278 Log: MFH: r484262 net/x2goclient: unbreak the build While here, adjust USES. PR: 232962 Submitted by: w.schwarzenfeld@utanet.at Approved by: mentors (implicit) Approved by: ports-secteam (miwi) Modified: branches/2018Q4/net/x2goclient/Makefile branches/2018Q4/net/x2goclient/files/patch-src_sshprocess.cpp Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/net/x2goclient/Makefile ============================================================================== --- branches/2018Q4/net/x2goclient/Makefile Tue Nov 6 06:02:27 2018 (r484277) +++ branches/2018Q4/net/x2goclient/Makefile Tue Nov 6 07:16:28 2018 (r484278) @@ -12,8 +12,6 @@ COMMENT= Qt client for the X2Go system LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN= fails to build - # Avoid clash with libssh from base BUILD_DEPENDS= ${LOCALBASE}/lib/libssh.so:security/libssh LIB_DEPENDS= libcups.so:print/cups \ @@ -22,8 +20,8 @@ RUN_DEPENDS= nxproxy:net/nxproxy \ x2goclient-cli:net/x2goclient-cli USES= qmake qt:4 -USE_XORG= xpm -USE_QT= gui network svg \ +USE_XORG= x11 xpm +USE_QT= corelib gui network svg \ linguisttools_build moc_build rcc_build uic_build QMAKE_ARGS= QMAKE_LRELEASE="${LRELEASE}" Modified: branches/2018Q4/net/x2goclient/files/patch-src_sshprocess.cpp ============================================================================== --- branches/2018Q4/net/x2goclient/files/patch-src_sshprocess.cpp Tue Nov 6 06:02:27 2018 (r484277) +++ branches/2018Q4/net/x2goclient/files/patch-src_sshprocess.cpp Tue Nov 6 07:16:28 2018 (r484278) @@ -1,4 +1,4 @@ ---- src/sshprocess.cpp.orig 2016-03-24 20:39:27 UTC +--- src/sshprocess.cpp.orig 2018-11-04 13:15:51 UTC +++ src/sshprocess.cpp @@ -24,6 +24,9 @@ @@ -10,6 +10,15 @@ #include #include #endif +@@ -140,7 +143,7 @@ void SshProcess::tunnelLoop() + address.sin_family=AF_INET; + address.sin_addr.s_addr=INADDR_ANY; + address.sin_port=htons(localPort); +- if (bind(serverSocket,(struct sockaddr*) &address,sizeof(address))!=0) ++ if (::bind(serverSocket,(struct sockaddr*) &address,sizeof(address))!=0) + { + QString err=tr("Error binding ")+localHost+":"+QString::number(localPort); + x2goDebug<useKerberos())