[Pkg-mono-svn-commits] rev 2044 - in mono/trunk/debian: . patches
Mirco Bauer
meebey-guest at costa.debian.org
Tue Sep 27 09:59:15 UTC 2005
Author: meebey-guest
Date: 2005-09-27 09:59:14 +0000 (Tue, 27 Sep 2005)
New Revision: 2044
Added:
mono/trunk/debian/patches/io_layer_fix_r50689.dpatch
mono/trunk/debian/patches/s390_compile_fix.dpatch
Modified:
mono/trunk/debian/changelog
mono/trunk/debian/patches/00list
mono/trunk/debian/rules
Log:
- Mono 1.1.9.1-2 release
Modified: mono/trunk/debian/changelog
===================================================================
--- mono/trunk/debian/changelog 2005-09-26 09:01:15 UTC (rev 2043)
+++ mono/trunk/debian/changelog 2005-09-27 09:59:14 UTC (rev 2044)
@@ -1,9 +1,18 @@
mono (1.1.9.1-2) unstable; urgency=medium
* Mirco 'meebey' Bauer
- + Added dc to build-deps, required for full bootstrap (solves FTBFS).
+ + debian/control:
+ - Added dc to build-deps, required for full bootstrap (solves FTBFS).
+ (Closes: #330280)
+ + debian/rules:
+ - Making debian/dh_makeclilibs and debian/dh_clideps now executable.
+ (Closes: #330283)
+ + debian/patches/io_layer_fix_r50689.dpatch:
+ - Backport from upstream's SVN, fixes process signalling bug.
+ + debian/patches/s390_compile_fix.dpatch:
+ - Backport from upstream's SVN, should fix s390 build.
- -- Debian Mono Group <pkg-mono-group at lists.alioth.debian.org> Mon, 26 Sep 2005 11:00:37 +0200
+ -- Debian Mono Group <pkg-mono-group at lists.alioth.debian.org> Tue, 27 Sep 2005 11:58:34 +0200
mono (1.1.9.1-1) unstable; urgency=low
Modified: mono/trunk/debian/patches/00list
===================================================================
--- mono/trunk/debian/patches/00list 2005-09-26 09:01:15 UTC (rev 2043)
+++ mono/trunk/debian/patches/00list 2005-09-27 09:59:14 UTC (rev 2044)
@@ -1,2 +1,4 @@
remove_broken_dllmap_from_mono-shlib-cop
datetime_doparse_fix
+s390_compile_fix
+io_layer_fix_r50689
Added: mono/trunk/debian/patches/io_layer_fix_r50689.dpatch
===================================================================
--- mono/trunk/debian/patches/io_layer_fix_r50689.dpatch 2005-09-26 09:01:15 UTC (rev 2043)
+++ mono/trunk/debian/patches/io_layer_fix_r50689.dpatch 2005-09-27 09:59:14 UTC (rev 2044)
@@ -0,0 +1,226 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## io_layer_fix_r50689.dpatch by Mirco Bauer <meebey at meebey.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad mono-1.1.9.1~/mono/io-layer/ChangeLog mono-1.1.9.1/mono/io-layer/ChangeLog
+--- mono-1.1.9.1~/mono/io-layer/ChangeLog 2005-09-20 23:32:39.000000000 +0200
++++ mono-1.1.9.1/mono/io-layer/ChangeLog 2005-09-27 11:36:28.000000000 +0200
+@@ -1,3 +1,11 @@
++2005-09-23 Dick Porter <dick at ximian.com>
++
++ * processes.c: Don't wait for processes that have already been
++ signalled; also fix typo.
++
++ * handles.c: Improve locking inside new handle and handle
++ searching functions.
++
+ 2005-09-20 Dick Porter <dick at ximian.com>
+
+ * collection.c:
+diff -urNad mono-1.1.9.1~/mono/io-layer/handles.c mono-1.1.9.1/mono/io-layer/handles.c
+--- mono-1.1.9.1~/mono/io-layer/handles.c 2005-06-21 15:53:09.000000000 +0200
++++ mono-1.1.9.1/mono/io-layer/handles.c 2005-09-27 11:34:37.000000000 +0200
+@@ -351,10 +351,6 @@
+ _wapi_private_handle_count += _WAPI_HANDLE_INITIAL_COUNT;
+ }
+
+- thr_ret = mono_mutex_unlock (&scan_mutex);
+- g_assert (thr_ret == 0);
+- pthread_cleanup_pop (0);
+-
+ /* Make sure we left the space for fd mappings */
+ g_assert (handle_idx >= _wapi_fd_reserve);
+
+@@ -375,7 +371,8 @@
+ handle_specific);
+ if (offset == 0) {
+ /* FIXME: grow the arrays */
+- return (_WAPI_HANDLE_INVALID);
++ handle = _WAPI_HANDLE_INVALID;
++ goto done;
+ }
+ }
+
+@@ -386,7 +383,8 @@
+
+ if (ref == 0) {
+ /* FIXME: grow the arrays */
+- return (_WAPI_HANDLE_INVALID);
++ handle = _WAPI_HANDLE_INVALID;
++ goto done;
+ }
+ }
+
+@@ -396,6 +394,11 @@
+ ref);
+ #endif
+ }
++
++done:
++ thr_ret = mono_mutex_unlock (&scan_mutex);
++ g_assert (thr_ret == 0);
++ pthread_cleanup_pop (0);
+
+ return(handle);
+ }
+@@ -403,7 +406,7 @@
+ gpointer _wapi_handle_new_from_offset (WapiHandleType type, guint32 offset)
+ {
+ guint32 handle_idx = 0;
+- gpointer handle;
++ gpointer handle = INVALID_HANDLE_VALUE;
+ int thr_ret, i, k;
+
+ mono_once (&shared_init_once, shared_init);
+@@ -417,6 +420,11 @@
+ g_assert(_WAPI_SHARED_HANDLE(type));
+ g_assert(offset != 0);
+
++ pthread_cleanup_push ((void(*)(void *))mono_mutex_unlock_in_cleanup,
++ (void *)&scan_mutex);
++ thr_ret = mono_mutex_lock (&scan_mutex);
++ g_assert (thr_ret == 0);
++
+ for (i = SLOT_INDEX (0); _wapi_private_handles [i] != NULL; i++) {
+ for (k = SLOT_OFFSET (0); k < _WAPI_HANDLE_INITIAL_COUNT; k++) {
+ struct _WapiHandleUnshared *handle_data = &_wapi_private_handles [i][k];
+@@ -424,14 +432,24 @@
+ if (handle_data->type == type &&
+ handle_data->u.shared.offset == offset) {
+ handle = GUINT_TO_POINTER (i * _WAPI_HANDLE_INITIAL_COUNT + k);
+- _wapi_handle_ref (handle);
++ goto first_pass_done;
++ }
++ }
++ }
++
++first_pass_done:
++ thr_ret = mono_mutex_unlock (&scan_mutex);
++ g_assert (thr_ret == 0);
++ pthread_cleanup_pop (0);
++
++ if (handle != INVALID_HANDLE_VALUE) {
++ _wapi_handle_ref (handle);
+
+ #ifdef DEBUG
+- g_message ("%s: Returning old handle %p referencing 0x%x", __func__, handle, offset);
++ g_message ("%s: Returning old handle %p referencing 0x%x",
++ __func__, handle, offset);
+ #endif
+- return (handle);
+- }
+- }
++ return (handle);
+ }
+
+ pthread_cleanup_push ((void(*)(void *))mono_mutex_unlock_in_cleanup,
+@@ -713,8 +731,13 @@
+ gpointer ret = NULL;
+ guint32 i, k;
+ gboolean found = FALSE;
++ int thr_ret;
+
+-
++ pthread_cleanup_push ((void(*)(void *))mono_mutex_unlock_in_cleanup,
++ (void *)&scan_mutex);
++ thr_ret = mono_mutex_lock (&scan_mutex);
++ g_assert (thr_ret == 0);
++
+ for (i = SLOT_INDEX (0); !found && _wapi_private_handles [i] != NULL; i++) {
+ for (k = SLOT_OFFSET (0); k < _WAPI_HANDLE_INITIAL_COUNT; k++) {
+ handle_data = &_wapi_private_handles [i][k];
+@@ -729,6 +752,10 @@
+ }
+ }
+
++ thr_ret = mono_mutex_unlock (&scan_mutex);
++ g_assert (thr_ret == 0);
++ pthread_cleanup_pop (0);
++
+ if (!found && _WAPI_SHARED_HANDLE (type)) {
+ /* Not found yet, so search the shared memory too */
+ #ifdef DEBUG
+@@ -1564,7 +1591,13 @@
+ {
+ struct _WapiHandleUnshared *handle_data;
+ guint32 i, k;
+-
++ int thr_ret;
++
++ pthread_cleanup_push ((void(*)(void *))mono_mutex_unlock_in_cleanup,
++ (void *)&scan_mutex);
++ thr_ret = mono_mutex_lock (&scan_mutex);
++ g_assert (thr_ret == 0);
++
+ for(i = SLOT_INDEX (0); _wapi_private_handles [i] != NULL; i++) {
+ for (k = SLOT_OFFSET (0); k < _WAPI_HANDLE_INITIAL_COUNT; k++) {
+ handle_data = &_wapi_private_handles [i][k];
+@@ -1582,6 +1615,10 @@
+ g_print ("\n");
+ }
+ }
++
++ thr_ret = mono_mutex_unlock (&scan_mutex);
++ g_assert (thr_ret == 0);
++ pthread_cleanup_pop (0);
+ }
+
+ static void _wapi_shared_details (gpointer handle_info)
+@@ -1602,6 +1639,10 @@
+ thr_ret = _wapi_shm_sem_lock (_WAPI_SHARED_SEM_SHARE);
+ g_assert(thr_ret == 0);
+
++ pthread_cleanup_push ((void(*)(void *))mono_mutex_unlock_in_cleanup,
++ (void *)&scan_mutex);
++ thr_ret = mono_mutex_lock (&scan_mutex);
++
+ for(i = SLOT_INDEX (0); _wapi_private_handles [i] != NULL; i++) {
+ for (k = SLOT_OFFSET (0); k < _WAPI_HANDLE_INITIAL_COUNT; k++) {
+ struct _WapiHandleUnshared *handle = &_wapi_private_handles [i][k];
+@@ -1644,6 +1685,10 @@
+ }
+ }
+ }
++
++ thr_ret = mono_mutex_unlock (&scan_mutex);
++ g_assert (thr_ret == 0);
++ pthread_cleanup_pop (0);
+
+ thr_ret = _wapi_shm_sem_unlock (_WAPI_SHARED_SEM_SHARE);
+
+diff -urNad mono-1.1.9.1~/mono/io-layer/processes.c mono-1.1.9.1/mono/io-layer/processes.c
+--- mono-1.1.9.1~/mono/io-layer/processes.c 2005-09-20 23:32:39.000000000 +0200
++++ mono-1.1.9.1/mono/io-layer/processes.c 2005-09-27 11:34:37.000000000 +0200
+@@ -97,6 +97,11 @@
+ int status;
+ pid_t ret;
+
++ if (_wapi_handle_issignalled (test)) {
++ /* We've already done this one */
++ return (FALSE);
++ }
++
+ ok = _wapi_lookup_handle (test, WAPI_HANDLE_PROCESS,
+ (gpointer *)&process);
+ if (ok == FALSE) {
+@@ -104,14 +109,14 @@
+ }
+
+ do {
+- ret == waitpid (process->id, &status, WNOHANG);
++ ret = waitpid (process->id, &status, WNOHANG);
+ } while (errno == EINTR);
+
+ if (ret <= 0) {
+ /* Process not ready for wait */
+ #ifdef DEBUG
+- g_message ("%s: Process %d not ready for waiting for",
+- __func__, ret);
++ g_message ("%s: Process %d not ready for waiting for: %s",
++ __func__, process->id, g_strerror (errno));
+ #endif
+
+ return (FALSE);
Property changes on: mono/trunk/debian/patches/io_layer_fix_r50689.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: mono/trunk/debian/patches/s390_compile_fix.dpatch
===================================================================
--- mono/trunk/debian/patches/s390_compile_fix.dpatch 2005-09-26 09:01:15 UTC (rev 2043)
+++ mono/trunk/debian/patches/s390_compile_fix.dpatch 2005-09-27 09:59:14 UTC (rev 2044)
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## s390_compile_fix.dpatch by Mirco Bauer <meebey at meebey.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad mono-1.1.9.1~/mono/arch/s390/tramp.c mono-1.1.9.1/mono/arch/s390/tramp.c
+--- mono-1.1.9.1~/mono/arch/s390/tramp.c 2004-06-18 22:03:01.000000000 +0200
++++ mono-1.1.9.1/mono/arch/s390/tramp.c 2005-09-26 23:18:26.000000000 +0200
+@@ -1117,6 +1117,7 @@
+ /*-------------------------------------------------*/
+ /* stackval_to_data has placed data in result area */
+ /*-------------------------------------------------*/
++ break;
+ }
+ break;
+ default:
Property changes on: mono/trunk/debian/patches/s390_compile_fix.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: mono/trunk/debian/rules
===================================================================
--- mono/trunk/debian/rules 2005-09-26 09:01:15 UTC (rev 2043)
+++ mono/trunk/debian/rules 2005-09-27 09:59:14 UTC (rev 2044)
@@ -39,6 +39,7 @@
--with-sigaltstack=no --with-gc=included \
--with-jit=yes --with-ikvm-native=no --with-preview=yes
$(MAKE)
+ chmod +x debian/dh_makeclilibs debian/dh_clideps
touch build-stamp
clean: unpatch
More information about the Pkg-mono-svn-commits
mailing list