Attachment #158136 for bug #201177

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




# $FreeBSD: head/net/x2goclient/Makefile 386942 2015-05-21 16:09:50Z amdmi3 $

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



LICENSE=	GPLv2

# http://bugs.x2go.org/cgi-bin/bugreport.cgi?bug=870
BROKEN=		does not build with new libssh: undefined reference to `ssh_forward_listen'

# Avoid clash with libssh from base
BUILD_DEPENDS=	${LOCALBASE}/lib/libssh.so:${PORTSDIR}/security/libssh
LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups-client \

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| ; \
		 /<linux\/fs.h>/s|^|//| ; \

		${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
	@${MKDIR} ${STAGEDIR}${DOCSDIR}

Lines 1-2 Link Here

(-)net/x2goclient/distinfo (-2 / +2 lines)
1	SHA256 (x2goclient-4.0.3.2.tar.gz) = f65a70463eae3d6d9fe6e4379f4ffacda50080a11f196d2792742f5b67fa0c6f	1	SHA256 (x2goclient-4.0.4.0.tar.gz) = 86d05ce10039fe0a965cdc55086e00f4f3abc573a96f128b92f87081b7251657
2	SIZE (x2goclient-4.0.3.2.tar.gz) = 1560536	2	SIZE (x2goclient-4.0.4.0.tar.gz) = 1571218




--- src/sshmasterconnection.cpp.orig	2015-05-26 19:13:12 UTC
+++ src/sshmasterconnection.cpp
@@ -28,6 +28,9 @@
 #include <QDir>
 #include <QTemporaryFile>
 #ifndef Q_OS_WIN

+#include <netinet/in.h>
 #include <arpa/inet.h>
 #endif
 #include <math.h>
@@ -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);

Lines 1-8 Link Here

(-)net/x2goclient/files/patch-sshprocess.cpp (-4 / +4 lines)
1	--- sshprocess.cpp.orig 2011-11-25 21:08:10.000000000 +0900	1	--- src/sshprocess.cpp.orig 2015-05-26 19:13:12 UTC
2	+++ sshprocess.cpp 2011-12-20 01:53:47.000000000 +0900	2	+++ src/sshprocess.cpp
3	@@ -21,6 +21,9 @@	3	@@ -24,6 +24,9 @@
4	#include <QTimer>
5		4
		5	#include <QProcess>
6	#ifndef Q_OS_WIN	6	#ifndef Q_OS_WIN
7	+#include <sys/types.h>	7	+#include <sys/types.h>
8	+#include <sys/socket.h>	8	+#include <sys/socket.h>

Lines 1-6 Link Here

(-)net/x2goclient/files/patch-sshprocess.h (-4 / +4 lines)
1	--- sshprocess.h.orig 2011-11-25 21:08:10.000000000 +0900	1	--- src/sshprocess.h.orig 2015-05-26 19:13:12 UTC
2	+++ sshprocess.h 2011-12-20 01:56:29.000000000 +0900	2	+++ src/sshprocess.h
3	@@ -17,6 +17,12 @@	3	@@ -18,6 +18,12 @@
4	#ifndef SSHPROCESS_H	4	#ifndef SSHPROCESS_H
5	#define SSHPROCESS_H	5	#define SSHPROCESS_H
6		6
Lines 12-15 Link Here
12	+#endif	12	+#endif
13	#include <libssh/libssh.h>	13	#include <libssh/libssh.h>
14	#include <QObject>	14	#include <QObject>
15		15	#include <QProcess>

Return to bug 201177

Lines 2-8 Link Here

(-)net/x2goclient/Makefile (-8 / +5 lines)
2	# $FreeBSD: head/net/x2goclient/Makefile 386942 2015-05-21 16:09:50Z amdmi3 $	2	# $FreeBSD: head/net/x2goclient/Makefile 386942 2015-05-21 16:09:50Z amdmi3 $
3		3
4	PORTNAME= x2goclient	4	PORTNAME= x2goclient
5	PORTVERSION= 4.0.3.2	5	PORTVERSION= 4.0.4.0
6	CATEGORIES= net	6	CATEGORIES= net
7	MASTER_SITES= http://code.x2go.org/releases/source/x2goclient/	7	MASTER_SITES= http://code.x2go.org/releases/source/x2goclient/
8		8
Lines 11-19 Link Here
11		11
12	LICENSE= GPLv2	12	LICENSE= GPLv2
13		13
14	# http://bugs.x2go.org/cgi-bin/bugreport.cgi?bug=870
15	BROKEN= does not build with new libssh: undefined reference to `ssh_forward_listen'
16
17	# Avoid clash with libssh from base	14	# Avoid clash with libssh from base
18	BUILD_DEPENDS= ${LOCALBASE}/lib/libssh.so:${PORTSDIR}/security/libssh	15	BUILD_DEPENDS= ${LOCALBASE}/lib/libssh.so:${PORTSDIR}/security/libssh
19	LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups-client \	16	LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups-client \
Lines 37-43 Link Here
37	LDAP_QMAKE_OFF= LIBS+="-lX11 -lXpm -lcups"	34	LDAP_QMAKE_OFF= LIBS+="-lX11 -lXpm -lcups"
38		35
39	post-patch:	36	post-patch:
40	@${FIND} ${WRKSRC} -name ".cpp" -or -name ".h" \| ${XARGS} \	37	@${FIND} ${WRKSRC}/src -name ".cpp" -or -name ".h" \| ${XARGS} \
41	${REINPLACE_CMD} -e \	38	${REINPLACE_CMD} -e \
42	's\|Q_OS_LINUX\|Q_OS_UNIX\| ; \	39	's\|Q_OS_LINUX\|Q_OS_UNIX\| ; \
43	/<linux\/fs.h>/s\|^\|//\| ; \	40	/<linux\/fs.h>/s\|^\|//\| ; \
Lines 57-70 Link Here
57	${STAGEDIR}${DESKTOPDIR})	54	${STAGEDIR}${DESKTOPDIR})
58	.for i in 16x16 32x32 48x48 64x64 128x128	55	.for i in 16x16 32x32 48x48 64x64 128x128
59	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}/apps	56	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}/apps
60	(cd ${WRKSRC}/icons/${i} && ${INSTALL_DATA} x2goclient.png \	57	(cd ${WRKSRC}/res/img/icons/${i} && ${INSTALL_DATA} x2goclient.png \
61	${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}/apps)	58	${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}/apps)
62	.endfor	59	.endfor
63	@${MKDIR} ${STAGEDIR}${DATADIR}/icons	60	@${MKDIR} ${STAGEDIR}${DATADIR}/icons
64	(cd ${WRKSRC}/icons && ${INSTALL_DATA} x2goclient.xpm \	61	(cd ${WRKSRC}/res/img/icons && ${INSTALL_DATA} x2goclient.xpm \
65	${STAGEDIR}${DATADIR}/icons)	62	${STAGEDIR}${DATADIR}/icons)
66	.for i in x2goclient.png x2gosession.png	63	.for i in x2goclient.png x2gosession.png
67	(cd ${WRKSRC}/icons/128x128 && ${INSTALL_DATA} ${i} \	64	(cd ${WRKSRC}/res/img/icons/128x128 && ${INSTALL_DATA} ${i} \
68	${STAGEDIR}${DATADIR}/icons)	65	${STAGEDIR}${DATADIR}/icons)
69	.endfor	66	.endfor
70	@${MKDIR} ${STAGEDIR}${DOCSDIR}	67	@${MKDIR} ${STAGEDIR}${DOCSDIR}

Lines 1-6 Link Here

(-)net/x2goclient/files/patch-sshmasterconnection.cpp (-4 / +16 lines)
1	--- sshmasterconnection.cpp.orig 2011-11-25 21:08:10.000000000 +0900	1	--- src/sshmasterconnection.cpp.orig 2015-05-26 19:13:12 UTC
2	+++ sshmasterconnection.cpp 2011-12-20 01:50:14.000000000 +0900	2	+++ src/sshmasterconnection.cpp
3	@@ -25,6 +25,9 @@	3	@@ -28,6 +28,9 @@
4	#include <QDir>	4	#include <QDir>
5	#include <QTemporaryFile>	5	#include <QTemporaryFile>
6	#ifndef Q_OS_WIN	6	#ifndef Q_OS_WIN
Lines 9-12 Link Here
9	+#include <netinet/in.h>	9	+#include <netinet/in.h>
10	#include <arpa/inet.h>	10	#include <arpa/inet.h>
11	#endif	11	#endif
12		12	#include <math.h>
		13	@@ -272,7 +275,11 @@ void SshMasterConnection::addReverseTunn
		14	if(!reverseTunnelRequest[i].listen)
		15	{
		16	reverseTunnelRequest[i].listen=true;
		17	+#if LIBSSH_VERSION_MAJOR == 0 && LIBSSH_VERSION_MINOR <= 6
		18	int rc=ssh_forward_listen(my_ssh_session, NULL, reverseTunnelRequest[i].forwardPort, NULL);
		19	+#else
		20	+ int rc=ssh_channel_listen_forward(my_ssh_session, NULL, reverseTunnelRequest[i].forwardPort, NULL);
		21	+#endif
		22	if(rc==SSH_OK)
		23	{
		24	emit reverseTunnelOk(reverseTunnelRequest[i].creator);