[Pkg-mono-svn-commits] rev 3859 - in mono/trunk/debian: . patches

[Jo Shields]

Author: directhex-guest
Date: 2008-11-28 23:17:01 +0000 (Fri, 28 Nov 2008)
New Revision: 3859

Added:
   mono/trunk/debian/patches/fix_wsdl2_duplicate_keys_r117243.dpatch
Modified:
   mono/trunk/debian/changelog
   mono/trunk/debian/patches/00list
Log:
Fix for Muine FTBFS (https://bugzilla.novell.com/show_bug.cgi?id=434892)


Modified: mono/trunk/debian/changelog
===================================================================
--- mono/trunk/debian/changelog	2008-11-27 22:49:23 UTC (rev 3858)
+++ mono/trunk/debian/changelog	2008-11-28 23:17:01 UTC (rev 3859)
@@ -1,3 +1,13 @@
+mono (2.0.1-2) UNRELEASED; urgency=low
+
+  [ Jo Shields ]
+  * debian/patches/fix_wsdl2_duplicate_keys_r117243.dpatch:
+    + Fix bug in wsdl2 preventing parsing of Amazon Web Services 
+      wsdl file (thanks to Iain Lane <laney at ubuntu.com> for help
+      isolating this bug)
+
+ -- Jo Shields <directhex at apebox.org>  Fri, 28 Nov 2008 23:15:00 +0000
+
 mono (2.0.1-1) experimental; urgency=low
 
   [ Mirco Bauer ]

Modified: mono/trunk/debian/patches/00list
===================================================================
--- mono/trunk/debian/patches/00list	2008-11-27 22:49:23 UTC (rev 3858)
+++ mono/trunk/debian/patches/00list	2008-11-28 23:17:01 UTC (rev 3859)
@@ -7,6 +7,7 @@
 fix-mono-nunit.pc.in
 fix_BigInteger_overflow_CVE-2007-5197
 fix_implicit_pointer_conversions
+fix_wsdl2_duplicate_keys_r117243
 armel-glibc-2.8
 build_genxs_2.0
 99_autoreconf

Added: mono/trunk/debian/patches/fix_wsdl2_duplicate_keys_r117243.dpatch
===================================================================
--- mono/trunk/debian/patches/fix_wsdl2_duplicate_keys_r117243.dpatch	                        (rev 0)
+++ mono/trunk/debian/patches/fix_wsdl2_duplicate_keys_r117243.dpatch	2008-11-28 23:17:01 UTC (rev 3859)
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_wsdl2_duplicate_keys_r117243.dpatch by Jo Shields <directhex at apebox.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix glitch in CLI 2.0 version of System.Web.Services which can
+## DP: cause wsdl files to be badly processed, due to key duplication
+
+ at DPATCH@
+Index: mcs/class/System.Web.Services/System.Web.Services.Description/BasicProfileChecker.cs
+===================================================================
+--- mcs/class/System.Web.Services/System.Web.Services.Description/BasicProfileChecker.cs	(revision 117242)
++++ mcs/class/System.Web.Services/System.Web.Services.Description/BasicProfileChecker.cs	(revision 117243)
+@@ -177,7 +177,7 @@
+ 				foreach (OperationMessage om in op.Messages) {
+ 					Message msg = ctx.Services.GetMessage (om.Message);
+ 					foreach (MessagePart part in msg.Parts)
+-						parts.Add (part,part);
++						parts [part] = part; // do not use Add() - there could be the same MessagePart instance.
+ 				}
+ 			}
+