[csw-devel] SF.net SVN: gar:[14340] csw/mgar/pkg/rdesktop/trunk

[dmichelsen at users.sourceforge.net]

Revision: 14340
          http://gar.svn.sourceforge.net/gar/?rev=14340&view=rev
Author:   dmichelsen
Date:     2011-04-20 14:26:55 +0000 (Wed, 20 Apr 2011)

Log Message:
-----------
rdesktop: Update to 1.7.0

Modified Paths:
--------------
    csw/mgar/pkg/rdesktop/trunk/Makefile
    csw/mgar/pkg/rdesktop/trunk/checksums

Removed Paths:
-------------
    csw/mgar/pkg/rdesktop/trunk/files/README.CSW
    csw/mgar/pkg/rdesktop/trunk/files/fix-2022945.patch

Modified: csw/mgar/pkg/rdesktop/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rdesktop/trunk/Makefile	2011-04-20 12:58:34 UTC (rev 14339)
+++ csw/mgar/pkg/rdesktop/trunk/Makefile	2011-04-20 14:26:55 UTC (rev 14340)
@@ -1,5 +1,5 @@
 NAME = rdesktop
-VERSION = 1.6.0
+VERSION = 1.7.0
 CATEGORIES = apps
 
 DESCRIPTION = RDP client for Windows NT/2000/2003/XP Terminal Server
@@ -12,31 +12,24 @@
 
 MASTER_SITES = $(SF_MIRROR)
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
-DISTFILES += README.CSW
 
-# Apply patch from
-#   https://sourceforge.net/tracker/?func=detail&aid=2812158&group_id=24366&atid=381349
-# as referenced from
-#   http://csiuo.com/drupal/content/rdesktop-160-and-windows-server-2008-sp2
-PATCHFILES += fix-2022945.patch
-
-# The above is a functionality patch
-VERSION_FLAG_PATCH = 1
-
 PACKAGES = CSWrdesktop
 CATALOGNAME_CSWrdesktop = rdesktop
 
 VENDOR_URL = http://www.rdesktop.org/
 
+BUILD_DEP_PKGS += CSWlibao-dev
+BUILD_DEP_PKGS += CSWlibsamplerate-dev
+BUILD_DEP_PKGS += CSWossldevel
+
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --with-openssl=/opt/csw
 
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
 RUNTIME_DEP_PKGS_CSWrdesktop += CSWiconv
-RUNTIME_DEP_PKGS_CSWrdesktop += CSWosslrt
-RUNTIME_DEP_PKGS_CSWrdesktop += CSWlibao
 RUNTIME_DEP_PKGS_CSWrdesktop += CSWlibsamplerate0
+RUNTIME_DEP_PKGS_CSWrdesktop += CSWosslrt
 
 # No test/check target provided by rdesktop
 TEST_SCRIPTS =

Modified: csw/mgar/pkg/rdesktop/trunk/checksums
===================================================================
--- csw/mgar/pkg/rdesktop/trunk/checksums	2011-04-20 12:58:34 UTC (rev 14339)
+++ csw/mgar/pkg/rdesktop/trunk/checksums	2011-04-20 14:26:55 UTC (rev 14340)
@@ -1 +1 @@
-c6fcbed7f0ad7e60ac5fcb2d324d8b16  download/rdesktop-1.6.0.tar.gz
+77fa93b21aa38837a85e81c00e757228  rdesktop-1.7.0.tar.gz

Deleted: csw/mgar/pkg/rdesktop/trunk/files/README.CSW
===================================================================
--- csw/mgar/pkg/rdesktop/trunk/files/README.CSW	2011-04-20 12:58:34 UTC (rev 14339)
+++ csw/mgar/pkg/rdesktop/trunk/files/README.CSW	2011-04-20 14:26:55 UTC (rev 14340)
@@ -1,12 +0,0 @@
-README.CSW for rdesktop
------------------------
-
-The following functionality patches have been applied:
-
-* Fix IRP Query Volume Information class: 0x07 problem
-
-  The patch was taken from
-    http://sourceforge.net/tracker/?func=detail&aid=2812158&group_id=24366&atid=381349
-  as referenced from
-    http://csiuo.com/drupal/content/rdesktop-160-and-windows-server-2008-sp2
-

Deleted: csw/mgar/pkg/rdesktop/trunk/files/fix-2022945.patch
===================================================================
--- csw/mgar/pkg/rdesktop/trunk/files/fix-2022945.patch	2011-04-20 12:58:34 UTC (rev 14339)
+++ csw/mgar/pkg/rdesktop/trunk/files/fix-2022945.patch	2011-04-20 14:26:55 UTC (rev 14340)
@@ -1,28 +0,0 @@
---- rdesktop-1.6.0.orig/disk.c	2009-06-19 09:06:27.000000000 -0400
-+++ rdesktop-1.6.0/disk.c	2009-06-25 09:40:44.000000000 -0400
-@@ -1096,10 +1101,24 @@
- 			rdp_out_unistr(out, fsinfo->type, 2 * strlen(fsinfo->type) - 2);
- 			break;
- 
-+		/* JMD 20090623: Needed for Windows 2008 support
-+		   http://msdn.microsoft.com/en-us/library/cc232104(PROT.13).aspx
-+		   IRP Query Volume Information class: 0x07 */
-+		case FileFsFullSizeInformation:
-+			printf("Called FileFsFullSizeInformation\n");
-+			out_uint32_le(out, stat_fs.f_blocks);	/* TotalAllocationUnits */
-+			out_uint32_le(out, 0);	
-+			out_uint32_le(out, stat_fs.f_bavail);	/* CallerAvailableAllocationUnits */
-+			out_uint32_le(out, 0);	
-+			out_uint32_le(out, stat_fs.f_bfree);	/* ActualAvailableAllocationUnits */
-+			out_uint32_le(out, 0);	
-+			out_uint32_le(out, stat_fs.f_bsize / 0x200);	/* SectorsPerAllocationUnit */
-+			out_uint32_le(out, 0x200);	/* Bytes per sector */
-+			break;
-+
- 		case FileFsLabelInformation:
- 		case FileFsDeviceInformation:
- 		case FileFsControlInformation:
--		case FileFsFullSizeInformation:
- 		case FileFsObjectIdInformation:
- 		case FileFsMaximumInformation:
- 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.