initial version

7 files changed, 276 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..2504e133dc28
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,43 @@
+# Generated by mksrcinfo v7
+# Tue Dec  1 01:35:32 UTC 2015
+pkgbase = freerdp-102
+	pkgdesc = Free RDP client
+	pkgver = 1.0.2
+	pkgrel = 7
+	url = http://freerdp.sourceforge.net
+	changelog = freerdp.changelog
+	arch = i686
+	arch = x86_64
+	license = GPL
+	makedepends = krb5
+	makedepends = cmake
+	makedepends = damageproto
+	makedepends = xmlto
+	makedepends = docbook-xsl
+	depends = openssl
+	depends = libxcursor
+	depends = libcups
+	depends = alsa-lib
+	depends = libxext
+	depends = libxdamage
+	depends = ffmpeg
+	depends = libxkbfile
+	depends = libxinerama
+	depends = libxv
+	depends = libpulse
+	provides = freerdp
+	conflicts = freerdp
+	conflicts = freerdp-git
+	source = freerdp-1.0.2.tar.gz::https://github.com/FreeRDP/FreeRDP/archive/1.0.2.tar.gz
+	source = ffmpeg2.0.patch
+	source = patch_numblock.patch
+	source = CVE-2014-0791.patch
+	source = stuck_winkey.patch
+	md5sums = c260051a94caff590def5caa4fcf59d6
+	md5sums = 1260eecf01ea5212e2db8ac9c5e7fa6d
+	md5sums = ac581d445ded7cdbd59082a48d9c28ac
+	md5sums = 62d0ab241c16ee5d85ff89183df9bbc0
+	md5sums = 1c1a8f77ebcaa7256968a9506ed3e772
+
+pkgname = freerdp-102
+
diff --git a/CVE-2014-0791.patch b/CVE-2014-0791.patch
new file mode 100644
index 000000000000..a47d804d1f9c
--- /dev/null
+++ b/CVE-2014-0791.patch
@@ -0,0 +1,79 @@
+--- a/libfreerdp-core/license.h	2013-01-03 05:46:59.000000000 +0800
++++ b/libfreerdp-core/license.h	2014-04-09 19:11:59.593507658 +0800
+@@ -177,9 +177,9 @@
+ 
+ SCOPE_LIST* license_new_scope_list();
+ void license_free_scope_list(SCOPE_LIST* scopeList);
+-void license_read_scope_list(STREAM* s, SCOPE_LIST* scopeList);
++boolean license_read_scope_list(STREAM* s, SCOPE_LIST* scopeList);
+ 
+-void license_read_license_request_packet(rdpLicense* license, STREAM* s);
++boolean license_read_license_request_packet(rdpLicense* license, STREAM* s);
+ void license_read_platform_challenge_packet(rdpLicense* license, STREAM* s);
+ void license_read_new_license_packet(rdpLicense* license, STREAM* s);
+ void license_read_upgrade_license_packet(rdpLicense* license, STREAM* s);
+--- a/libfreerdp-core/license.c	2013-01-03 05:46:59.000000000 +0800
++++ b/libfreerdp-core/license.c	2014-04-09 19:11:59.593507658 +0800
+@@ -199,7 +199,8 @@
+ 	switch (bMsgType)
+ 	{
+ 		case LICENSE_REQUEST:
+-			license_read_license_request_packet(license, s);
++			if(!license_read_license_request_packet(license, s))
++				return false;
+ 			license_send_new_license_request_packet(license);
+ 			break;
+ 
+@@ -533,13 +534,16 @@
+  * @param scopeList scope list
+  */
+ 
+-void license_read_scope_list(STREAM* s, SCOPE_LIST* scopeList)
++boolean license_read_scope_list(STREAM* s, SCOPE_LIST* scopeList)
+ {
+ 	uint32 i;
+ 	uint32 scopeCount;
+ 
+ 	stream_read_uint32(s, scopeCount); /* ScopeCount (4 bytes) */
+ 
++	if (scopeCount > stream_get_length(s) / 4)  /* every blob is at least 4 bytes */
++		return false;
++
+ 	scopeList->count = scopeCount;
+ 	scopeList->array = (LICENSE_BLOB*) xmalloc(sizeof(LICENSE_BLOB) * scopeCount);
+ 
+@@ -549,6 +553,7 @@
+ 		scopeList->array[i].type = BB_SCOPE_BLOB;
+ 		license_read_binary_blob(s, &scopeList->array[i]);
+ 	}
++	return true;
+ }
+ 
+ /**
+@@ -593,7 +598,7 @@
+  * @param s stream
+  */
+ 
+-void license_read_license_request_packet(rdpLicense* license, STREAM* s)
++boolean license_read_license_request_packet(rdpLicense* license, STREAM* s)
+ {
+ 	/* ServerRandom (32 bytes) */
+ 	stream_read(s, license->server_random, 32);
+@@ -608,7 +613,8 @@
+ 	license_read_binary_blob(s, license->server_certificate);
+ 
+ 	/* ScopeList */
+-	license_read_scope_list(s, license->scope_list);
++	if(!license_read_scope_list(s, license->scope_list))
++		return false;
+ 
+ 	/* Parse Server Certificate */
+ 	certificate_read_server_certificate(license->certificate,
+@@ -617,6 +623,7 @@
+ 	license_generate_keys(license);
+ 	license_generate_hwid(license);
+ 	license_encrypt_premaster_secret(license);
++	return true;
+ }
+ 
+ /**
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..2298fadb6b32
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Stijn Segers <francesco dot borromini at gmail dot com>
+
+pkgname=freerdp-102
+_pkgname=freerdp
+pkgver=1.0.2
+pkgrel=7
+pkgdesc="Free RDP client"
+arch=('i686' 'x86_64')
+url="http://freerdp.sourceforge.net"
+license=('GPL')
+depends=('openssl' 'libxcursor' 'libcups' 'alsa-lib' 'libxext' 'libxdamage'
+	 'ffmpeg' 'libxkbfile' 'libxinerama' 'libxv' 'libpulse')
+makedepends=('krb5' 'cmake' 'damageproto' 'xmlto' 'docbook-xsl')
+conflicts=('freerdp' 'freerdp-git')
+provides=('freerdp')
+changelog=${_pkgname}.changelog
+source=($_pkgname-$pkgver.tar.gz::https://github.com/FreeRDP/FreeRDP/archive/$pkgver.tar.gz
+	ffmpeg2.0.patch
+	patch_numblock.patch
+	CVE-2014-0791.patch
+	stuck_winkey.patch)
+md5sums=('c260051a94caff590def5caa4fcf59d6'
+         '1260eecf01ea5212e2db8ac9c5e7fa6d'
+         'ac581d445ded7cdbd59082a48d9c28ac'
+         '62d0ab241c16ee5d85ff89183df9bbc0'
+         '1c1a8f77ebcaa7256968a9506ed3e772')
+
+prepare() {
+  cd $srcdir/FreeRDP-$pkgver
+  patch -Np1 -i ../ffmpeg2.0.patch
+  patch -Np1 -i ../patch_numblock.patch
+  patch -Np1 -i ../CVE-2014-0791.patch
+  patch -Np1 -i ../stuck_winkey.patch
+}
+
+build() {
+  cd $srcdir/FreeRDP-$pkgver
+  cmake \
+	-DCMAKE_INSTALL_PREFIX=/usr \
+	-DCMAKE_INSTALL_LIBDIR=lib \
+	-DWITH_PULSEAUDIO=ON \
+	.
+  make
+}
+
+package() {
+  cd $srcdir/FreeRDP-$pkgver
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/ffmpeg2.0.patch b/ffmpeg2.0.patch
new file mode 100644
index 000000000000..bc9022da478d
--- /dev/null
+++ b/ffmpeg2.0.patch
@@ -0,0 +1,76 @@
+diff -rupN a/channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c b/channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c
+--- a/channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c	2013-01-02 22:46:59.000000000 +0100
++++ b/channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c	2013-07-22 18:12:18.001576713 +0200
+@@ -28,6 +28,8 @@
+ #include "tsmf_constants.h"
+ #include "tsmf_decoder.h"
+ 
++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000
++
+ /* Compatibility with older FFmpeg */
+ #if LIBAVUTIL_VERSION_MAJOR < 50
+ #define AVMEDIA_TYPE_VIDEO 0
+@@ -39,7 +41,7 @@ typedef struct _TSMFFFmpegDecoder
+ 	ITSMFDecoder iface;
+ 
+ 	int media_type;
+-	enum CodecID codec_id;
++	enum AVCodecID codec_id;
+ 	AVCodecContext* codec_context;
+ 	AVCodec* codec;
+ 	AVFrame* frame;
+@@ -54,7 +56,7 @@ static boolean tsmf_ffmpeg_init_context(
+ {
+ 	TSMFFFmpegDecoder* mdecoder = (TSMFFFmpegDecoder*) decoder;
+ 
+-	mdecoder->codec_context = avcodec_alloc_context();
++	mdecoder->codec_context = avcodec_alloc_context3(NULL);
+ 	if (!mdecoder->codec_context)
+ 	{
+ 		DEBUG_WARN("avcodec_alloc_context failed.");
+@@ -88,16 +90,6 @@ static boolean tsmf_ffmpeg_init_audio_st
+ 	mdecoder->codec_context->channels = media_type->Channels;
+ 	mdecoder->codec_context->block_align = media_type->BlockAlign;
+ 
+-#ifdef AV_CPU_FLAG_SSE2
+-	mdecoder->codec_context->dsp_mask = AV_CPU_FLAG_SSE2 | AV_CPU_FLAG_MMX2;
+-#else
+-#if LIBAVCODEC_VERSION_MAJOR < 53
+-	mdecoder->codec_context->dsp_mask = FF_MM_SSE2 | FF_MM_MMXEXT;
+-#else
+-	mdecoder->codec_context->dsp_mask = FF_MM_SSE2 | FF_MM_MMX2;
+-#endif
+-#endif
+-
+ 	return true;
+ }
+ 
+@@ -174,7 +166,7 @@ static boolean tsmf_ffmpeg_prepare(ITSMF
+ {
+ 	TSMFFFmpegDecoder* mdecoder = (TSMFFFmpegDecoder*) decoder;
+ 
+-	if (avcodec_open(mdecoder->codec_context, mdecoder->codec) < 0)
++	if (avcodec_open2(mdecoder->codec_context, mdecoder->codec, NULL) < 0)
+ 	{
+ 		DEBUG_WARN("avcodec_open failed.");
+ 		return false;
+@@ -372,8 +364,9 @@ static boolean tsmf_ffmpeg_decode_audio(
+ 			av_init_packet(&pkt);
+ 			pkt.data = (uint8*) src;
+ 			pkt.size = src_size;
+-			len = avcodec_decode_audio3(mdecoder->codec_context,
+-				(int16_t*) dst, &frame_size, &pkt);
++			AVFrame * frame = avcodec_alloc_frame (); 
++			len = avcodec_decode_audio4(mdecoder->codec_context,
++				frame, &frame_size, &pkt);
+ 		}
+ #endif
+ 		if (len <= 0 || frame_size <= 0)
+@@ -499,7 +492,6 @@ TSMFDecoderEntry(void)
+ 
+ 	if (!initialized)
+ 	{
+-		avcodec_init();
+ 		avcodec_register_all();
+ 		initialized = true;
+ 	}
diff --git a/freerdp.changelog b/freerdp.changelog
new file mode 100644
index 000000000000..d47f165c366e
--- /dev/null
+++ b/freerdp.changelog
@@ -0,0 +1,2 @@
+0.7.1-1 to 0.7.1-2
+* Added x86_64 to supported architectures (tested by figue).
diff --git a/patch_numblock.patch b/patch_numblock.patch
new file mode 100644
index 000000000000..62a23d58283e
--- /dev/null
+++ b/patch_numblock.patch
@@ -0,0 +1,12 @@
+diff -u -r -N old/include/freerdp/kbd/vkcodes.h new/include/freerdp/kbd/vkcodes.h
+--- old/include/freerdp/kbd/vkcodes.h	2013-09-19 12:46:07.124339712 +0200
++++ new/include/freerdp/kbd/vkcodes.h	2013-09-19 12:45:51.621005583 +0200
+@@ -434,7 +434,7 @@
+ 	{ 0x00, 0, "VK_SEPARATOR"        , NULL   },
+ 	{ 0x4A, 0, "VK_SUBTRACT"         , "KPSU" },
+ 	{ 0x53, 0, "VK_DECIMAL"          , "KPDL" },
+-	{ 0x35, 0, "VK_DIVIDE"           , "KPDV" },
++	{ 0x35, 1, "VK_DIVIDE"           , "KPDV" },
+ 	{ 0x3B, 0, "VK_F1"               , "FK01" },
+ 	{ 0x3C, 0, "VK_F2"               , "FK02" },
+ 	{ 0x3D, 0, "VK_F3"               , "FK03" },
diff --git a/stuck_winkey.patch b/stuck_winkey.patch
new file mode 100644
index 000000000000..bb8458934dd7
--- /dev/null
+++ b/stuck_winkey.patch
@@ -0,0 +1,13 @@
+diff -rup FreeRDP-1.0.2-old/client/X11/xf_keyboard.c FreeRDP-1.0.2-new/client/X11/xf_keyboard.c
+--- FreeRDP-1.0.2-old/client/X11/xf_keyboard.c	2013-01-02 22:46:59.000000000 +0100
++++ FreeRDP-1.0.2-new/client/X11/xf_keyboard.c	2014-06-24 17:45:44.062728740 +0200
+@@ -169,6 +169,9 @@ void xf_kbd_focus_in(xfInfo* xfi)
+ 	/* on focus in send a tab up like mstsc.exe */
+ 	input->KeyboardEvent(input, KBD_FLAGS_RELEASE, 0x0F);
+ 
++	/* release windows key */
++	input->KeyboardEvent(input, KBD_FLAGS_EXTENDED|KBD_FLAGS_RELEASE, 0x5B);
++
+ 	/* synchronize toggle keys */
+ 	syncFlags = xf_kbd_get_toggle_keys_state(xfi);
+ 	input->SynchronizeEvent(input, syncFlags);