[Pkg-mono-svn-commits] [SCM] mono branch, master, updated. c1ff7dfcb81c64a10ae41b281a2927c6711fc587

[Sebastian Dröge]

The following commit has been merged in the master branch:
commit c1ff7dfcb81c64a10ae41b281a2927c6711fc587
Author: Sebastian Dröge <sebastian.droege at collabora.co.uk>
Date:   Fri May 1 13:40:02 2009 +0200

    debian/patches/fix_null_funcptr_marshalling_r127347.dpatch:
    
    * debian/patches/fix_null_funcptr_marshalling_r127347.dpatch:
      + Fix marshalling for NULL function pointers, they should be mapped
        to managed null delegates and vice versa. Patch from upstream SVN.

diff --git a/debian/changelog b/debian/changelog
index e4294d8..7f0a8ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mono (2.0.1-6) UNRELEASED; urgency=low
+mono (2.0.1-6) unstable; urgency=low
 
   [ Jo Shields ]
   * debian/control:
@@ -6,7 +6,12 @@ mono (2.0.1-6) UNRELEASED; urgency=low
       avoid multiple packages with identical short descriptions
       (Closes: #519404)
 
- -- Jo Shields <directhex at apebox.org>  Thu, 12 Mar 2009 11:11:22 +0000
+  [ Sebastian Dröge ]
+  * debian/patches/fix_null_funcptr_marshalling_r127347.dpatch:
+    + Fix marshalling for NULL function pointers, they should be mapped
+      to managed null delegates and vice versa. Patch from upstream SVN.
+
+ -- Sebastian Dröge <slomo at debian.org>  Fri, 01 May 2009 13:37:07 +0200
 
 mono (2.0.1-5) unstable; urgency=low
 
diff --git a/debian/patches/00list b/debian/patches/00list
index f80c449..74dc6a2 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -10,6 +10,7 @@ fix_implicit_pointer_conversions
 fix_wsdl2_duplicate_keys_r117243
 fix_NetworkInterface_exception_r120282
 fix_TcpClient_IPv6_r122598
+fix_null_funcptr_marshalling_r127347.dpatch
 armel-glibc-2.8
 build_genxs_2.0
 99_autoreconf
diff --git a/debian/patches/armel-glibc-2.8.dpatch b/debian/patches/armel-glibc-2.8.dpatch
old mode 100644
new mode 100755
diff --git a/debian/patches/firebird-fbclient.dpatch b/debian/patches/firebird-fbclient.dpatch
old mode 100644
new mode 100755
diff --git a/debian/patches/fix_NetworkInterface_exception_r120282.dpatch b/debian/patches/fix_NetworkInterface_exception_r120282.dpatch
old mode 100644
new mode 100755
diff --git a/debian/patches/fix_TcpClient_IPv6_r122598.dpatch b/debian/patches/fix_TcpClient_IPv6_r122598.dpatch
old mode 100644
new mode 100755
diff --git a/debian/patches/fix_null_funcptr_marshalling_r127347.dpatch b/debian/patches/fix_null_funcptr_marshalling_r127347.dpatch
new file mode 100755
index 0000000..f6781fc
--- /dev/null
+++ b/debian/patches/fix_null_funcptr_marshalling_r127347.dpatch
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+ at DPATCH@
+
+--- mono/mono/metadata/marshal.c	2009-02-18 23:10:16 UTC (rev 127346)
++++ mono/mono/metadata/marshal.c	2009-02-18 23:12:09 UTC (rev 127347)
+@@ -383,6 +383,9 @@
+ #endif
+ 	MonoDelegate *d;
+ 
++	if (ftn == NULL)
++		return NULL;
++
+ 	mono_marshal_lock ();
+ 	if (delegate_hash_table == NULL)
+ 		delegate_hash_table = delegate_hash_table_new ();
+
+
diff --git a/debian/patches/fix_wsdl2_duplicate_keys_r117243.dpatch b/debian/patches/fix_wsdl2_duplicate_keys_r117243.dpatch
old mode 100644
new mode 100755

-- 
mono