update x11/rdesktop to 1.8.1
a bunch of fixes and new features like smartcard support.
NOTE: smartcard support disable for now. I haven't one to test.
If someone is able to give a test, let me know that I will provide a diff.
OK to update?
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/rdesktop/Makefile,v
retrieving revision 1.40
diff -u -p -u -p -r1.40 Makefile
--- Makefile 7 Aug 2013 19:13:11 -0000 1.40
+++ Makefile 7 Jan 2014 19:28:42 -0000
@@ -1,8 +1,7 @@
# $OpenBSD: Makefile,v 1.40 2013/08/07 19:13:11 gsoares Exp $
COMMENT= open source client for Windows Terminal Server
-DISTNAME= rdesktop-1.7.1
-REVISION= 2
+DISTNAME= rdesktop-1.8.1
CATEGORIES= x11 net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rdesktop/}
@@ -13,7 +12,7 @@ MAINTAINER= Gleydson Soares <gsoares@ope
# GPLv3+
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB= X11 Xrandr c crypto ao
+WANTLIB= X11 Xrandr c crypto ssl ao
MODULES= converters/libiconv
@@ -23,6 +22,8 @@ NO_TEST= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --with-x=${X11BASE} \
- --with-sound=libao
+ --with-sound=libao \
+ --disable-credssp \
+ --disable-smartcard
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/rdesktop/distinfo,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 distinfo
--- distinfo 14 Mar 2012 18:36:04 -0000 1.16
+++ distinfo 7 Jan 2014 19:28:42 -0000
@@ -1,5 +1,2 @@
-MD5 (rdesktop-1.7.1.tar.gz) = xLORFZUcSm109RHJmxj8+Q==
-RMD160 (rdesktop-1.7.1.tar.gz) = 2fOct1qxPXvoRvYepAJ2zdy8tVA=
-SHA1 (rdesktop-1.7.1.tar.gz) = xxjQ9JlIqWTH74QkuK3nPszjq6M=
-SHA256 (rdesktop-1.7.1.tar.gz) = 0epDresj7xukJZg2cDcqh811YLr4yUujQhUQXtLvhHk=
-SIZE (rdesktop-1.7.1.tar.gz) = 298808
+SHA256 (rdesktop-1.8.1.tar.gz) = dsyDS4nDTYMy88s4iUg7KuTU6BGO60Wolnx33RgigkY=
+SIZE (rdesktop-1.8.1.tar.gz) = 314198
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/x11/rdesktop/patches/patch-configure,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 patch-configure
--- patches/patch-configure 14 Mar 2012 18:36:04 -0000 1.8
+++ patches/patch-configure 7 Jan 2014 19:28:42 -0000
@@ -2,9 +2,9 @@ $OpenBSD: patch-configure,v 1.8 2012/03/
Don't pickup libsamplerate if that's installed.
---- configure.orig Mon Jan 9 11:11:57 2012
-+++ configure Tue Mar 13 13:53:08 2012
-@@ -5757,6 +5757,7 @@ $as_echo "yes" >&6; }
+--- configure.orig Mon Nov 18 05:10:00 2013
++++ configure Sat Jan 4 05:19:15 2014
+@@ -5928,6 +5928,7 @@ $as_echo "yes" >&6; }
HAVE_ALSA=1
fi
@@ -12,7 +12,7 @@ Don't pickup libsamplerate if that's ins
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBSAMPLERATE" >&5
$as_echo_n "checking for LIBSAMPLERATE... " >&6; }
-@@ -5834,6 +5835,8 @@ fi
+@@ -6007,6 +6008,8 @@ fi
LIBSAMPLERATE_LIBS="$LIBSAMPLERATE_LIBS -lm"
fi
fi
Index: patches/patch-rdpdr_c
===================================================================
RCS file: /cvs/ports/x11/rdesktop/patches/patch-rdpdr_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-rdpdr_c
--- patches/patch-rdpdr_c 4 Jul 2013 15:12:34 -0000 1.1
+++ patches/patch-rdpdr_c 7 Jan 2014 19:28:42 -0000
@@ -4,11 +4,11 @@ Fix crash when a invalid device is recei
patch from upstream
http://sourceforge.net/p/rdesktop/code/1701/
---- rdpdr.c.orig Wed Apr 13 08:13:04 2011
-+++ rdpdr.c Tue Jun 18 20:51:34 2013
-@@ -379,6 +379,15 @@ rdpdr_process_irp(STREAM s)
- buffer = (uint8 *) xmalloc(1024);
- buffer[0] = 0;
+--- rdpdr.c.orig Sat Aug 10 13:15:25 2013
++++ rdpdr.c Sat Jan 4 05:19:15 2014
+@@ -387,6 +387,15 @@ rdpdr_process_irp(STREAM s)
+ return;
+ }
+ if(device >= RDPDR_MAX_DEVICES)
+ {
Index: patches/patch-rdpsnd_libao_c
===================================================================
RCS file: patches/patch-rdpsnd_libao_c
diff -N patches/patch-rdpsnd_libao_c
--- patches/patch-rdpsnd_libao_c 21 Apr 2011 11:07:33 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-$OpenBSD: patch-rdpsnd_libao_c,v 1.2 2011/04/21 11:07:33 jasper Exp $
---- rdpsnd_libao.c.orig Mon Apr 18 08:21:57 2011
-+++ rdpsnd_libao.c Tue Apr 19 12:25:08 2011
-@@ -71,6 +71,7 @@ libao_open(void)
- default_driver = ao_default_driver_id();
- }
-
-+ memset(&format, 0, sizeof(format));
- format.bits = 16;
- format.channels = 2;
- format.rate = 44100;
-@@ -110,6 +111,7 @@ libao_set_format(RD_WAVEFORMATEX * pwfx)
- {
- ao_sample_format format;
-
-+ memset(&format, 0, sizeof(format));
- format.bits = pwfx->wBitsPerSample;
- format.channels = pwfx->nChannels;
- format.rate = 44100;
