Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 3 Nov 2013 13:22:33 GMT
From:      Pavel Gubin <pg@2lazy.ru>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/183616: net/rdesktop update 1.7.1 to 1.8.0
Message-ID:  <201311031322.rA3DMXJh079958@oldred.freebsd.org>
Resent-Message-ID: <201311031330.rA3DU10i038998@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         183616
>Category:       ports
>Synopsis:       net/rdesktop update 1.7.1 to 1.8.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Nov 03 13:30:01 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Pavel Gubin
>Release:        9.1-RELEASE
>Organization:
Lazy
>Environment:
FreeBSD hammer.2lazy.ru 9.1-RELEASE FreeBSD 9.1-RELEASE #0 r243825: Tue Dec 4 09:23:10 UTC 2012 root@farrell.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
Currently there is version 1.7.1 or rdesktop, which does not work in seamless mode with latest cendio.com's seamlessrdpshell, while 1.8.0 does work.

1.8.0 needs a small patch to be build with base openssl 0.9.8, which does not have definition of SSL_OP_NO_COMPRESSION in /usr/include/openssl/ssl.h
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -urN rdesktop.orig/Makefile rdesktop/Makefile
--- rdesktop.orig/Makefile	2013-10-24 20:41:28.000000000 +0400
+++ rdesktop/Makefile	2013-11-03 16:54:55.000000000 +0400
@@ -2,8 +2,7 @@
 # $FreeBSD: net/rdesktop/Makefile 331499 2013-10-24 16:41:28Z madpilot $
 
 PORTNAME=	rdesktop
-PORTVERSION=	1.7.1
-PORTREVISION?=	1
+PORTVERSION=	1.8.0
 CATEGORIES=	net comms ipv6
 MASTER_SITES=	SF
 
@@ -32,6 +31,8 @@
 LIB_DEPENDS+=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate
 .endif
 
+CONFIGURE_ARGS+=	 --disable-credssp --disable-smartcard
+
 .if ${PORT_OPTIONS:MIPV6}
 CONFIGURE_ARGS+=	--with-ipv6
 .endif
diff -urN rdesktop.orig/distinfo rdesktop/distinfo
--- rdesktop.orig/distinfo	2012-07-14 18:29:18.000000000 +0400
+++ rdesktop/distinfo	2013-11-03 16:55:17.000000000 +0400
@@ -1,2 +1,2 @@
-SHA256 (rdesktop-1.7.1.tar.gz) = d1ea43adeb23ef1ba425983670372a87cd7560baf8c94ba34215105ed2ef8479
-SIZE (rdesktop-1.7.1.tar.gz) = 298808
+SHA256 (rdesktop-1.8.0.tar.gz) = 1f12562c0dc1c599d1c3d2ac4829d229763744fe7aef879c8eaaa5abae8edcb3
+SIZE (rdesktop-1.8.0.tar.gz) = 313312
diff -urN rdesktop.orig/files/patch-configure rdesktop/files/patch-configure
--- rdesktop.orig/files/patch-configure	2012-07-14 18:29:18.000000000 +0400
+++ rdesktop/files/patch-configure	1970-01-01 03:00:00.000000000 +0300
@@ -1,5 +0,0 @@
---- configure.orig	Wed Mar  2 09:35:03 2005
-+++ configure	Mon Mar  7 16:54:07 2005
-@@ -1983 +1983 @@
--    CFLAGS="-g -O2"
-+    #CFLAGS="-g -O2"
diff -urN rdesktop.orig/files/patch-tcp.c rdesktop/files/patch-tcp.c
--- rdesktop.orig/files/patch-tcp.c	1970-01-01 03:00:00.000000000 +0300
+++ rdesktop/files/patch-tcp.c	2013-11-03 16:57:43.000000000 +0400
@@ -0,0 +1,11 @@
+--- tcp.c.orig	2013-06-28 15:20:08.000000000 +0400
++++ tcp.c	2013-11-03 15:23:45.000000000 +0400
+@@ -318,7 +318,7 @@
+ 		}
+ 
+ 		options = 0;
+-		options |= SSL_OP_NO_COMPRESSION;
++/*		options |= SSL_OP_NO_COMPRESSION;*/
+ 		options |= SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS;
+ 		SSL_CTX_set_options(g_ssl_ctx, options);
+ 	}
diff -urN rdesktop.orig/files/patch-xwin.c rdesktop/files/patch-xwin.c
--- rdesktop.orig/files/patch-xwin.c	2012-10-09 06:11:46.000000000 +0400
+++ rdesktop/files/patch-xwin.c	1970-01-01 03:00:00.000000000 +0300
@@ -1,11 +0,0 @@
-$FreeBSD: net/rdesktop/files/patch-xwin.c 305566 2012-10-09 02:11:46Z obrien $
-
---- xwin.c.orig	2011-04-13 04:13:04.000000000 -0700
-+++ xwin.c	2012-10-08 19:06:06.000000000 -0700
-@@ -2150,4 +2150,6 @@ ui_resize_window()
- 		g_backstore = bs;
- 	}
-+
-+	ui_reset_clip();
- }
- 


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311031322.rA3DMXJh079958>