[csw-devel] SF.net SVN: gar:[12502] csw/mgar/pkg/rdesktop/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Tue Jan 11 15:56:55 CET 2011
Revision: 12502
http://gar.svn.sourceforge.net/gar/?rev=12502&view=rev
Author: dmichelsen
Date: 2011-01-11 14:56:55 +0000 (Tue, 11 Jan 2011)
Log Message:
-----------
rdeskstop: Apply patch from #4664 and some cleanup
Modified Paths:
--------------
csw/mgar/pkg/rdesktop/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/rdesktop/trunk/files/
csw/mgar/pkg/rdesktop/trunk/files/fix-2022945.patch
Modified: csw/mgar/pkg/rdesktop/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rdesktop/trunk/Makefile 2011-01-11 14:26:48 UTC (rev 12501)
+++ csw/mgar/pkg/rdesktop/trunk/Makefile 2011-01-11 14:56:55 UTC (rev 12502)
@@ -4,25 +4,36 @@
DESCRIPTION = RDP client for Windows NT/2000/2003/XP Terminal Server
define BLURB
- rdesktop is an open source client for Windows Terminal Services, capable of natively speaking Remote Desktop Protocol (RDP) in order to present the user's Windows desktop. Supported servers include Windows 2000 Server, Windows Server 2003, Windows Server 2008, Windows XP, Windows Vista and Windows NT Server 4.0.
+ rdesktop is an open source client for Windows Terminal Services, capable of natively
+ speaking Remote Desktop Protocol (RDP) in order to present the user's Windows desktop.
+ Supported servers include Windows 2000 Server, Windows Server 2003, Windows Server 2008,
+ Windows XP, Windows Vista and Windows NT Server 4.0.
endef
+MASTER_SITES = $(SF_MIRROR)
+DISTFILES = $(NAME)-$(VERSION).tar.gz
+
+# 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
+
PACKAGES = CSWrdesktop
CATALOGNAME_CSWrdesktop = rdesktop
-MASTER_SITES = $(SF_MIRROR)
-SPKG_SOURCEURL = http://www.rdesktop.org/
+VENDOR_URL = http://www.rdesktop.org/
-DISTFILES = $(NAME)-$(VERSION).tar.gz
-
CONFIGURE_ARGS = $(DIRPATHS)
CONFIGURE_ARGS += --with-openssl=/opt/csw
UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
-RUNTIME_DEP_PKGS_CSWrdesktop = CSWiconv CSWosslrt
+RUNTIME_DEP_PKGS_CSWrdesktop += CSWiconv
+RUNTIME_DEP_PKGS_CSWrdesktop += CSWosslrt
+RUNTIME_DEP_PKGS_CSWrdesktop += CSWlibao
-#No test/check target provided by rdesktop
-SKIPTEST=1
+# No test/check target provided by rdesktop
+TEST_SCRIPTS =
include gar/category.mk
Added: csw/mgar/pkg/rdesktop/trunk/files/fix-2022945.patch
===================================================================
--- csw/mgar/pkg/rdesktop/trunk/files/fix-2022945.patch (rev 0)
+++ csw/mgar/pkg/rdesktop/trunk/files/fix-2022945.patch 2011-01-11 14:56:55 UTC (rev 12502)
@@ -0,0 +1,28 @@
+--- 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.
More information about the devel
mailing list