[arch-commits] Commit in rdesktop/repos (3 files)

[Dan McGee]

    Date: Monday, May 12, 2008 @ 21:08:52
  Author: dan
Revision: 1526

Merged revisions 2-1525 via svnmerge from 
svn+ssh://archlinux.org/home/svn-packages/rdesktop/trunk

........
  r356 | aaron | 2008-04-18 17:56:27 -0500 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r1525 | dan | 2008-05-12 20:08:37 -0500 (Mon, 12 May 2008) | 1 line
  
  upgpkg: rdesktop 1.6.0-1
........

Modified:
  rdesktop/repos/extra-i686/	(properties)
  rdesktop/repos/extra-i686/PKGBUILD
Deleted:
  rdesktop/repos/extra-i686/rdesktop-libx11.patch

-----------------------+
 PKGBUILD              |   17 +++-------
 rdesktop-libx11.patch |   79 ------------------------------------------------
 2 files changed, 5 insertions(+), 91 deletions(-)


Property changes on: rdesktop/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /rdesktop/trunk:1
   + /rdesktop/trunk:1-1525

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-05-13 01:08:37 UTC (rev 1525)
+++ extra-i686/PKGBUILD	2008-05-13 01:08:52 UTC (rev 1526)
@@ -1,27 +1,20 @@
 # $Id$
 # Maintainer: Dan McGee <dan at archlinux.org>
 pkgname=rdesktop
-pkgver=1.5.0
-pkgrel=2
+pkgver=1.6.0
+pkgrel=1
 depends=('libx11' 'openssl')
 pkgdesc="rdesktop is used to connect to windows terminal servers"
 license=('GPL')
 arch=('i686' 'x86_64')
-source=(http://dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz
-        rdesktop-libx11.patch)
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
 url="http://www.rdesktop.org/"
-md5sums=('433546f60fc0f201e99307ba188369ed'
-         'cebef1fdeb485c38fe9320c2f2c0e2d2')
-sha1sums=('e3086bf865191eed41631813125f482e279c7f3d'
-          '01e1344f9bb342b3e5930203af16240d7e2300e9')
 
 build() {
    cd $startdir/src/$pkgname-$pkgver
-
-   # apply (reversed) patch to prevent libx11 segfault
-   patch -R -p0 < ../rdesktop-libx11.patch || return 1
-
    ./configure --prefix=/usr
    make || return 1
    make DESTDIR=$startdir/pkg install
 }
+
+md5sums=('c6fcbed7f0ad7e60ac5fcb2d324d8b16')

Deleted: extra-i686/rdesktop-libx11.patch
===================================================================
--- extra-i686/rdesktop-libx11.patch	2008-05-13 01:08:37 UTC (rev 1525)
+++ extra-i686/rdesktop-libx11.patch	2008-05-13 01:08:52 UTC (rev 1526)
@@ -1,79 +0,0 @@
-*** xwin.c	Wed Apr 11 12:31:43 2007
---- rdesktop-1.5.0/xwin.c	Mon Aug  7 07:45:44 2006
-*************** ui_create_glyph(int width, int height, u
-*** 2413,2427 ****
-  		g_create_glyph_gc = XCreateGC(g_display, bitmap, 0, NULL);
-  
-  	image = XCreateImage(g_display, g_visual, 1, ZPixmap, 0, (char *) data,
-! 			     width, height, 8, 0);
-! 	/* Patch to prevent Seg Faults - based on changes in libx11
-! 	 * to fix a security issue (CVE-2007-1667)
-! 	 * See: http://lists.debian.org/debian-x/2007/04/msg00052.html
-! 	 * See: http://www.nabble.com/Bug-418295:-vice-broken-by-libx11-security-update-t3544947.html
-! 	 * 
-! 	 * ORIGINAL: width, height, 8, scanline); 
-! 	 * NEW	   : width, height, 8, 0); 
-! 	 */
-  	image->byte_order = MSBFirst;
-  	image->bitmap_bit_order = MSBFirst;
-  	XInitImage(image);
---- 2413,2419 ----
-  		g_create_glyph_gc = XCreateGC(g_display, bitmap, 0, NULL);
-  
-  	image = XCreateImage(g_display, g_visual, 1, ZPixmap, 0, (char *) data,
-! 			     width, height, 8, scanline);
-  	image->byte_order = MSBFirst;
-  	image->bitmap_bit_order = MSBFirst;
-  	XInitImage(image);
-*************** ui_desktop_restore(uint32 offset, int x,
-*** 3220,3254 ****
-  {
-  	XImage *image;
-  	uint8 *data;
-- 	int bitmap_pad;
-  
-  	offset *= g_bpp / 8;
-  	data = cache_get_desktop(offset, cx, cy, g_bpp / 8);
-  	if (data == NULL)
-  		return;
-  
-- 	if (g_server_depth == 8)
-- 	{
-- 		bitmap_pad = 8;
-- 	}
-- 	else
-- 	{
-- 		bitmap_pad = g_bpp;
-- 
-- 		if (g_bpp == 24)
-- 			bitmap_pad = 32;
-- 	}
-- 
-  	image = XCreateImage(g_display, g_visual, g_depth, ZPixmap, 0,
-! 			(char *) data, cx, cy, bitmap_pad, 0);
-! 	/* Patch to prevent Seg Faults - based on changes in libx11
-! 	 * to fix a security issue (CVE-2007-1667)
-! 	 * See: http://lists.debian.org/debian-x/2007/04/msg00052.html
-! 	 * See: http://www.nabble.com/Bug-418295:-vice-broken-by-libx11-security-update-t3544947.html
-! 	 * 
-! 	 * ORIGINAL: (char *) data, cx, cy, BitmapPad(g_display), cx * g_bpp / 8); 
-! 	 * NEW	   : (char *) data, cx, cy, BitmapPad(g_display), 0); 
-! 	 */
-  
-  	if (g_ownbackstore)
-  	{
---- 3212,3225 ----
-  {
-  	XImage *image;
-  	uint8 *data;
-  
-  	offset *= g_bpp / 8;
-  	data = cache_get_desktop(offset, cx, cy, g_bpp / 8);
-  	if (data == NULL)
-  		return;
-  
-  	image = XCreateImage(g_display, g_visual, g_depth, ZPixmap, 0,
-! 			     (char *) data, cx, cy, BitmapPad(g_display), cx * g_bpp / 8);
-  
-  	if (g_ownbackstore)
-  	{