[arch-commits] Commit in freerdp/repos (14 files)
Date: Tuesday, October 14, 2014 @ 11:54:52
Author: spupykin
Revision: 120634
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
freerdp/repos/community-staging-i686/
freerdp/repos/community-staging-i686/CVE-2014-0791.patch
(from rev 120633, freerdp/trunk/CVE-2014-0791.patch)
freerdp/repos/community-staging-i686/PKGBUILD
(from rev 120633, freerdp/trunk/PKGBUILD)
freerdp/repos/community-staging-i686/ffmpeg2.0.patch
(from rev 120633, freerdp/trunk/ffmpeg2.0.patch)
freerdp/repos/community-staging-i686/freerdp.changelog
(from rev 120633, freerdp/trunk/freerdp.changelog)
freerdp/repos/community-staging-i686/patch_numblock.patch
(from rev 120633, freerdp/trunk/patch_numblock.patch)
freerdp/repos/community-staging-i686/stuck_winkey.patch
(from rev 120633, freerdp/trunk/stuck_winkey.patch)
freerdp/repos/community-staging-x86_64/
freerdp/repos/community-staging-x86_64/CVE-2014-0791.patch
(from rev 120633, freerdp/trunk/CVE-2014-0791.patch)
freerdp/repos/community-staging-x86_64/PKGBUILD
(from rev 120633, freerdp/trunk/PKGBUILD)
freerdp/repos/community-staging-x86_64/ffmpeg2.0.patch
(from rev 120633, freerdp/trunk/ffmpeg2.0.patch)
freerdp/repos/community-staging-x86_64/freerdp.changelog
(from rev 120633, freerdp/trunk/freerdp.changelog)
freerdp/repos/community-staging-x86_64/patch_numblock.patch
(from rev 120633, freerdp/trunk/patch_numblock.patch)
freerdp/repos/community-staging-x86_64/stuck_winkey.patch
(from rev 120633, freerdp/trunk/stuck_winkey.patch)
---+
community-staging-i686/CVE-2014-0791.patch| 79
community-staging-i686/PKGBUILD | 51 +++
community-staging-i686/ffmpeg2.0.patch| 38 +++
community-staging-i686/freerdp.changelog |2
community-staging-i686/patch_numblock.patch | 12 +++
community-staging-i686/stuck_winkey.patch | 13 +++
community-staging-x86_64/CVE-2014-0791.patch | 79
community-staging-x86_64/PKGBUILD | 51 +++
community-staging-x86_64/ffmpeg2.0.patch | 38 +++
community-staging-x86_64/freerdp.changelog|2
community-staging-x86_64/patch_numblock.patch | 12 +++
community-staging-x86_64/stuck_winkey.patch | 13 +++
12 files changed, 390 insertions(+)
Copied: freerdp/repos/community-staging-i686/CVE-2014-0791.patch (from rev
120633, freerdp/trunk/CVE-2014-0791.patch)
===
--- community-staging-i686/CVE-2014-0791.patch (rev 0)
+++ community-staging-i686/CVE-2014-0791.patch 2014-10-14 09:54:52 UTC (rev
120634)
@@ -0,0 +1,79 @@
+--- a/libfreerdp-core/license.h2013-01-03 05:46:59.0 +0800
b/libfreerdp-core/license.h2014-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.c2013-01-03 05:46:59.0 +0800
b/libfreerdp-core/license.c2014-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
[arch-commits] Commit in freerdp/repos (14 files)
Date: Monday, September 15, 2014 @ 23:53:53
Author: bpiotrowski
Revision: 119039
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
freerdp/repos/community-staging-i686/
freerdp/repos/community-staging-i686/CVE-2014-0791.patch
(from rev 119038, freerdp/trunk/CVE-2014-0791.patch)
freerdp/repos/community-staging-i686/PKGBUILD
(from rev 119038, freerdp/trunk/PKGBUILD)
freerdp/repos/community-staging-i686/ffmpeg2.0.patch
(from rev 119038, freerdp/trunk/ffmpeg2.0.patch)
freerdp/repos/community-staging-i686/freerdp.changelog
(from rev 119038, freerdp/trunk/freerdp.changelog)
freerdp/repos/community-staging-i686/patch_numblock.patch
(from rev 119038, freerdp/trunk/patch_numblock.patch)
freerdp/repos/community-staging-i686/stuck_winkey.patch
(from rev 119038, freerdp/trunk/stuck_winkey.patch)
freerdp/repos/community-staging-x86_64/
freerdp/repos/community-staging-x86_64/CVE-2014-0791.patch
(from rev 119038, freerdp/trunk/CVE-2014-0791.patch)
freerdp/repos/community-staging-x86_64/PKGBUILD
(from rev 119038, freerdp/trunk/PKGBUILD)
freerdp/repos/community-staging-x86_64/ffmpeg2.0.patch
(from rev 119038, freerdp/trunk/ffmpeg2.0.patch)
freerdp/repos/community-staging-x86_64/freerdp.changelog
(from rev 119038, freerdp/trunk/freerdp.changelog)
freerdp/repos/community-staging-x86_64/patch_numblock.patch
(from rev 119038, freerdp/trunk/patch_numblock.patch)
freerdp/repos/community-staging-x86_64/stuck_winkey.patch
(from rev 119038, freerdp/trunk/stuck_winkey.patch)
---+
community-staging-i686/CVE-2014-0791.patch| 79
community-staging-i686/PKGBUILD | 49 ++
community-staging-i686/ffmpeg2.0.patch| 76 +++
community-staging-i686/freerdp.changelog |2
community-staging-i686/patch_numblock.patch | 12 +++
community-staging-i686/stuck_winkey.patch | 13 +++
community-staging-x86_64/CVE-2014-0791.patch | 79
community-staging-x86_64/PKGBUILD | 49 ++
community-staging-x86_64/ffmpeg2.0.patch | 76 +++
community-staging-x86_64/freerdp.changelog|2
community-staging-x86_64/patch_numblock.patch | 12 +++
community-staging-x86_64/stuck_winkey.patch | 13 +++
12 files changed, 462 insertions(+)
Copied: freerdp/repos/community-staging-i686/CVE-2014-0791.patch (from rev
119038, freerdp/trunk/CVE-2014-0791.patch)
===
--- community-staging-i686/CVE-2014-0791.patch (rev 0)
+++ community-staging-i686/CVE-2014-0791.patch 2014-09-15 21:53:53 UTC (rev
119039)
@@ -0,0 +1,79 @@
+--- a/libfreerdp-core/license.h2013-01-03 05:46:59.0 +0800
b/libfreerdp-core/license.h2014-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.c2013-01-03 05:46:59.0 +0800
b/libfreerdp-core/license.c2014-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
+ */
+
[arch-commits] Commit in freerdp/repos (14 files)
Date: Wednesday, September 25, 2013 @ 15:56:48
Author: spupykin
Revision: 97610
archrelease: copy trunk to community-i686, community-x86_64
Added:
freerdp/repos/community-i686/PKGBUILD
(from rev 97609, freerdp/trunk/PKGBUILD)
freerdp/repos/community-i686/ffmpeg2.0.patch
(from rev 97609, freerdp/trunk/ffmpeg2.0.patch)
freerdp/repos/community-i686/freerdp.changelog
(from rev 97609, freerdp/trunk/freerdp.changelog)
freerdp/repos/community-i686/patch_numblock.patch
(from rev 97609, freerdp/trunk/patch_numblock.patch)
freerdp/repos/community-x86_64/PKGBUILD
(from rev 97609, freerdp/trunk/PKGBUILD)
freerdp/repos/community-x86_64/ffmpeg2.0.patch
(from rev 97609, freerdp/trunk/ffmpeg2.0.patch)
freerdp/repos/community-x86_64/freerdp.changelog
(from rev 97609, freerdp/trunk/freerdp.changelog)
freerdp/repos/community-x86_64/patch_numblock.patch
(from rev 97609, freerdp/trunk/patch_numblock.patch)
Deleted:
freerdp/repos/community-i686/PKGBUILD
freerdp/repos/community-i686/ffmpeg2.0.patch
freerdp/repos/community-i686/freerdp.changelog
freerdp/repos/community-x86_64/PKGBUILD
freerdp/repos/community-x86_64/ffmpeg2.0.patch
freerdp/repos/community-x86_64/freerdp.changelog
---+
/PKGBUILD | 88 ++
/ffmpeg2.0.patch | 152
/freerdp.changelog|4
community-i686/PKGBUILD | 41
community-i686/ffmpeg2.0.patch| 76
community-i686/freerdp.changelog |2
community-i686/patch_numblock.patch | 12 ++
community-x86_64/PKGBUILD | 41
community-x86_64/ffmpeg2.0.patch | 76
community-x86_64/freerdp.changelog|2
community-x86_64/patch_numblock.patch | 12 ++
11 files changed, 268 insertions(+), 238 deletions(-)
Deleted: community-i686/PKGBUILD
===
--- community-i686/PKGBUILD 2013-09-25 13:56:29 UTC (rev 97609)
+++ community-i686/PKGBUILD 2013-09-25 13:56:48 UTC (rev 97610)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin pupykin.s+a...@gmail.com
-# Contributor: Stijn Segers francesco dot borromini at gmail dot com
-
-pkgname=freerdp
-pkgver=1.0.2
-pkgrel=3
-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-git')
-changelog=${pkgname}.changelog
-options=('!libtool')
-source=($pkgname-$pkgver.tar.gz::https://github.com/FreeRDP/FreeRDP/archive/$pkgver.tar.gz
-ffmpeg2.0.patch)
-md5sums=('c260051a94caff590def5caa4fcf59d6'
- '1260eecf01ea5212e2db8ac9c5e7fa6d')
-
-prepare() {
- cd $srcdir/FreeRDP-$pkgver
- patch -Np1 -i ../ffmpeg2.0.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
-}
Copied: freerdp/repos/community-i686/PKGBUILD (from rev 97609,
freerdp/trunk/PKGBUILD)
===
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-09-25 13:56:48 UTC (rev 97610)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Sergej Pupykin pupykin.s+a...@gmail.com
+# Contributor: Stijn Segers francesco dot borromini at gmail dot com
+
+pkgname=freerdp
+pkgver=1.0.2
+pkgrel=4
+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-git')
+changelog=${pkgname}.changelog
+options=('!libtool')
+source=($pkgname-$pkgver.tar.gz::https://github.com/FreeRDP/FreeRDP/archive/$pkgver.tar.gz
+ffmpeg2.0.patch
+patch_numblock.patch)
+md5sums=('c260051a94caff590def5caa4fcf59d6'
+ '1260eecf01ea5212e2db8ac9c5e7fa6d'
+ 'ac581d445ded7cdbd59082a48d9c28ac')
+
+prepare() {
+ cd $srcdir/FreeRDP-$pkgver
+ patch -Np1 -i ../ffmpeg2.0.patch
+ patch -Np1 -i ../patch_numblock.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
+}
Deleted: community-i686/ffmpeg2.0.patch
===
---
