[Pkg-mono-svn-commits] rev 2585 - in mono/trunk/debian: . patches
Sebastian Dröge
slomo-guest at costa.debian.org
Tue Jun 27 13:12:54 UTC 2006
Author: slomo-guest
Date: 2006-06-27 13:12:51 +0000 (Tue, 27 Jun 2006)
New Revision: 2585
Added:
mono/trunk/debian/patches/ppc_missing_lock.dpatch
mono/trunk/debian/patches/sqliteclient-ppc.dpatch
Removed:
mono/trunk/debian/patches/resource-manager-boo.dpatch
Modified:
mono/trunk/debian/changelog
mono/trunk/debian/patches/00list
Log:
* updated mono to 1.1.13.8
Modified: mono/trunk/debian/changelog
===================================================================
--- mono/trunk/debian/changelog 2006-06-25 06:55:50 UTC (rev 2584)
+++ mono/trunk/debian/changelog 2006-06-27 13:12:51 UTC (rev 2585)
@@ -1,3 +1,19 @@
+mono (1.1.13.8-1) unstable; urgency=low
+
+ * Sebastian 'slomo' Dröge:
+ + New upstream release
+ + debian/patches/ppc_missing_lock.dpatch:
+ - Add a missing lock and make some memory executable to fix
+ various segfaults on PPC64 SMP machines with 32 bit userland.
+ Patch from mono SVN, thanks to Johannes Berg (Closes: #371134)
+ + debian/patches/sqliteclient-ppc.dpatch:
+ - LastInsertRowID() returns long, not int for sqlite3.
+ Fixes it to not return always 0 on PPC. Patch from mono SVN.
+ + debian/patches/resource-manager-boo.dpatch:
+ - dropped, upstream now
+
+ -- Debian Mono Group <pkg-mono-group at lists.alioth.debian.org> Tue, 27 Jun 2006 15:11:24 +0200
+
mono (1.1.13.6-4) unstable; urgency=low
* Mirco 'meebey' Bauer:
Modified: mono/trunk/debian/patches/00list
===================================================================
--- mono/trunk/debian/patches/00list 2006-06-25 06:55:50 UTC (rev 2584)
+++ mono/trunk/debian/patches/00list 2006-06-27 13:12:51 UTC (rev 2585)
@@ -1,5 +1,6 @@
remove_broken_dllmap_from_mono-shlib-cop.dpatch
unix-end-point-serialize.dpatch
unix-end-point-equals.dpatch
-resource-manager-boo.dpatch
fix-mono-cairo-image-surface-constructor-signature.dpatch
+ppc_missing_lock.dpatch
+sqliteclient-ppc.dpatch
Added: mono/trunk/debian/patches/ppc_missing_lock.dpatch
===================================================================
--- mono/trunk/debian/patches/ppc_missing_lock.dpatch 2006-06-25 06:55:50 UTC (rev 2584)
+++ mono/trunk/debian/patches/ppc_missing_lock.dpatch 2006-06-27 13:12:51 UTC (rev 2585)
@@ -0,0 +1,40 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+ at DPATCH@
+
+--- mono/mono/mini/tramp-ppc.c 2006/06/02 14:41:59 61407
++++ mono/mono/mini/tramp-ppc.c 2006/06/15 14:56:09 61756
+@@ -34,11 +34,14 @@
+ {
+ guint8 *code, *start;
+ int this_pos = 3;
++ MonoDomain *domain = mono_domain_get ();
+
+ if (!mono_method_signature (m)->ret->byref && MONO_TYPE_ISSTRUCT (mono_method_signature (m)->ret))
+ this_pos = 4;
+
+- start = code = g_malloc (20);
++ mono_domain_lock (domain);
++ start = code = mono_code_manager_reserve (domain->code_mp, 20);
++ mono_domain_unlock (domain);
+
+ ppc_load (code, ppc_r0, addr);
+ ppc_mtctr (code, ppc_r0);
+@@ -235,7 +238,7 @@
+ /* Now we'll create in 'buf' the PowerPC trampoline code. This
+ is the trampoline code common to all methods */
+
+- code = buf = g_malloc(512);
++ code = buf = mono_global_codeman_reserve (512);
+
+ ppc_stwu (buf, ppc_r1, -STACK, ppc_r1);
+
+@@ -492,7 +495,6 @@
+ use r11 to keep that value, for instance. However, the generic part of
+ the trampoline relies on r11 having the same value it had before coming
+ here, so we must save it before. */
+- //code = buf = g_malloc(METHOD_TRAMPOLINE_SIZE);
+ mono_domain_lock (vtable->domain);
+ code = buf = mono_code_manager_reserve (vtable->domain->code_mp, METHOD_TRAMPOLINE_SIZE);
+ mono_domain_unlock (vtable->domain);
+
Property changes on: mono/trunk/debian/patches/ppc_missing_lock.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Deleted: mono/trunk/debian/patches/resource-manager-boo.dpatch
===================================================================
--- mono/trunk/debian/patches/resource-manager-boo.dpatch 2006-06-25 06:55:50 UTC (rev 2584)
+++ mono/trunk/debian/patches/resource-manager-boo.dpatch 2006-06-27 13:12:51 UTC (rev 2585)
@@ -1,17 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-
- at DPATCH@
-
-Index: mcs/class/corlib/System.Resources/ResourceManager.cs
-===================================================================
---- mono/mcs/class/corlib/System.Resources/ResourceManager.cs (revision 57936)
-+++ mono/mcs/class/corlib/System.Resources/ResourceManager.cs (revision 57937)
-@@ -357,7 +357,7 @@
-
- if(set==null && tryParents==true) {
- // avoid endless recursion
-- if (!culture.Equals (neutral_culture) && !culture.Equals(CultureInfo.InvariantCulture))
-+ if (!culture.Equals(CultureInfo.InvariantCulture))
- set = InternalGetResourceSet (culture.Parent, Createifnotexists, tryParents);
- }
-
Added: mono/trunk/debian/patches/sqliteclient-ppc.dpatch
===================================================================
--- mono/trunk/debian/patches/sqliteclient-ppc.dpatch 2006-06-25 06:55:50 UTC (rev 2584)
+++ mono/trunk/debian/patches/sqliteclient-ppc.dpatch 2006-06-27 13:12:51 UTC (rev 2585)
@@ -0,0 +1,41 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+ at DPATCH@
+
+--- mono/mcs/class/Mono.Data.SqliteClient/Mono.Data.SqliteClient/SqliteCommand.cs (Revision 60675)
++++ mono/mcs/class/Mono.Data.SqliteClient/Mono.Data.SqliteClient/SqliteCommand.cs (Revision 60676)
+@@ -517,10 +517,7 @@
+
+ public int LastInsertRowID ()
+ {
+- if (parent_conn.Version == 3)
+- return Sqlite.sqlite3_last_insert_rowid(parent_conn.Handle);
+- else
+- return Sqlite.sqlite_last_insert_rowid(parent_conn.Handle);
++ return parent_conn.LastInsertRowId;
+ }
+
+ private string GetError3() {
+--- mono/mcs/class/Mono.Data.SqliteClient/Mono.Data.SqliteClient/Sqlite.cs (Revision 60675)
++++ mono/mcs/class/Mono.Data.SqliteClient/Mono.Data.SqliteClient/Sqlite.cs (Revision 60676)
+@@ -151,7 +151,7 @@
+ internal static extern int sqlite3_changes (IntPtr handle);
+
+ [DllImport("sqlite3")]
+- internal static extern int sqlite3_last_insert_rowid (IntPtr sqlite_handle);
++ internal static extern long sqlite3_last_insert_rowid (IntPtr sqlite_handle);
+
+ [DllImport ("sqlite3")]
+ internal static extern SqliteError sqlite3_prepare16 (IntPtr sqlite_handle, IntPtr zSql, int zSqllen, out IntPtr pVm, out IntPtr pzTail);
+--- mono/mcs/class/Mono.Data.SqliteClient/Mono.Data.SqliteClient/SqliteConnection.cs (Revision 60675)
++++ mono/mcs/class/Mono.Data.SqliteClient/Mono.Data.SqliteClient/SqliteConnection.cs (Revision 60676)
+@@ -110,7 +110,7 @@
+ public int LastInsertRowId {
+ get {
+ if (Version == 3)
+- return Sqlite.sqlite3_last_insert_rowid (Handle);
++ return (int)Sqlite.sqlite3_last_insert_rowid (Handle);
+ else
+ return Sqlite.sqlite_last_insert_rowid (Handle);
+ }
+
Property changes on: mono/trunk/debian/patches/sqliteclient-ppc.dpatch
___________________________________________________________________
Name: svn:executable
+ *
More information about the Pkg-mono-svn-commits
mailing list