Update to 1.1.12.1

Project by: BSD# <www.mono-project.com/Mono:FreeBSD>

8 files changed, 51 insertions, 136 deletions

diff --git a/lang/mono/files/patch-mcs_class_FirebirdSql.Data.Firebird_Assembly_AssemblyInfo.cs b/lang/mono/files/patch-mcs_class_FirebirdSql.Data.Firebird_Assembly_AssemblyInfo.cs
deleted file mode 100644
index 24adb8a5..0000000
--- a/lang/mono/files/patch-mcs_class_FirebirdSql.Data.Firebird_Assembly_AssemblyInfo.cs
+++ /dev/null
@@ -1,13 +0,0 @@
---- mcs/class/FirebirdSql.Data.Firebird/Assembly/AssemblyInfo.cs.orig	Thu Jan 20 15:30:07 2005
-+++ mcs/class/FirebirdSql.Data.Firebird/Assembly/AssemblyInfo.cs	Wed Oct 12 23:19:24 2005
-@@ -30,7 +30,7 @@
- [assembly: AssemblyCompany("FirebirdSQL")]
- [assembly: AssemblyProduct("Firebird .NET Data Provider")]
- [assembly: AssemblyCopyright("(c) 2002-2004. Carlos Guzman Alvarez")]
--[assembly: AssemblyVersion("1.7.0.*")]
-+[assembly: AssemblyVersion("1.7.0.0")]
- [assembly: AssemblyDelaySign(false)]
- [assembly: AssemblyKeyFile("FirebirdSql.Data.Firebird.snk")]
--[assembly: AssemblyKeyName("")]
-\ No newline at end of file
-+[assembly: AssemblyKeyName("")]
diff --git a/lang/mono/files/patch-mono_dis_get.h b/lang/mono/files/patch-mono_dis_get.h
deleted file mode 100644
index f5eb2d1..0000000
--- a/lang/mono/files/patch-mono_dis_get.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- mono/dis/get.h.orig	Thu Aug 25 11:12:40 2005
-+++ mono/dis/get.h	Sun Oct  2 16:21:54 2005
-@@ -44,6 +44,7 @@
- char *dis_stringify_method_signature (MonoImage *m, MonoMethodSignature *method, int methoddef_row,
- 				      MonoGenericContext *context, gboolean fully_qualified);
- char *dis_stringify_function_ptr (MonoImage *m, MonoMethodSignature *method);
-+char *dis_stringify_marshal_spec (MonoMarshalSpec *spec);
- 
- guint32 method_dor_to_token (guint32 idx);
- 
diff --git a/lang/mono/files/patch-mono_io-layer_sockets.c b/lang/mono/files/patch-mono_io-layer_sockets.c
deleted file mode 100644
index 9a717a4..0000000
--- a/lang/mono/files/patch-mono_io-layer_sockets.c
+++ /dev/null
@@ -1,57 +0,0 @@
---- mono/io-layer/sockets.c.orig	Sat May  7 14:54:36 2005
-+++ mono/io-layer/sockets.c	Wed Oct 12 22:04:38 2005
-@@ -846,35 +846,32 @@
- 		return(SOCKET_ERROR);
- 	}
- 
--	if (command != FIONBIO &&
--	    command != FIONREAD &&
--	    command != SIOCATMARK) {
--		/* Not listed in the MSDN specs, but ioctl(2) returns
--		 * this if command is invalid
--		 */
--		WSASetLastError (WSAEINVAL);
--		return(SOCKET_ERROR);
--	}
--
-+	switch(command){
-+		case FIONBIO:
- #ifdef O_NONBLOCK
- 	/* This works better than ioctl(...FIONBIO...) on Linux (it causes
- 	 * connect to return EINPROGRESS, but the ioctl doesn't seem to)
- 	 */
--	if (command == FIONBIO) {
--		ret = fcntl (fd, F_GETFL, 0);
--		if (ret != -1) {
--			if (*(gboolean *)arg) {
--				ret |= O_NONBLOCK;
--			} else {
--				ret &= ~O_NONBLOCK;
-+			ret = fcntl(fd, F_GETFL, 0);
-+			if (ret != -1) {
-+				if (*(gboolean *)arg) {
-+					ret |= O_NONBLOCK;
-+				} else {
-+					ret &= ~O_NONBLOCK;
-+				}
-+				ret = fcntl(fd, F_SETFL, ret);
- 			}
--			ret = fcntl (fd, F_SETFL, ret);
--		}
--	} else
- #endif /* O_NONBLOCK */
--	{
--		ret = ioctl (fd, command, arg);
-+			break;
-+		case FIONREAD:
-+		case SIOCATMARK:
-+			ret = ioctl (fd, command, arg);
-+			break;
-+		default:
-+			WSASetLastError (WSAEINVAL);
-+			return(SOCKET_ERROR);
- 	}
-+
- 	if (ret == -1) {
- 		gint errnum = errno;
- #ifdef DEBUG
diff --git a/lang/mono/files/patch-mono_metadata_filewatcher.c b/lang/mono/files/patch-mono_metadata_filewatcher.c
index 3d36d76..b7c1f9e 100644
--- a/lang/mono/files/patch-mono_metadata_filewatcher.c
+++ b/lang/mono/files/patch-mono_metadata_filewatcher.c
@@ -1,6 +1,6 @@
---- mono/metadata/filewatcher.c.orig	Wed Jun  1 06:25:57 2005
-+++ mono/metadata/filewatcher.c	Wed Jun  1 06:27:17 2005
-@@ -97,9 +97,6 @@
+--- mono/metadata/filewatcher.c.orig	Thu Dec  1 18:51:19 2005
++++ mono/metadata/filewatcher.c	Sun Dec 18 01:54:10 2005
+@@ -99,9 +99,6 @@
  gint
  ves_icall_System_IO_FSW_SupportsFSW (void)
  {
@@ -9,10 +9,10 @@
 -#else
  	GModule *fam_module;
  	gchar *filename;
+ 	int lib_used = 4; /* gamin */
+@@ -119,13 +116,19 @@
+ 	}
  
-@@ -109,13 +106,19 @@
- 	fam_module = g_module_open (filename, G_MODULE_BIND_LAZY);
- 	g_free (filename);
  	if (fam_module == NULL)
 -		return 0;
 +		goto nofam;
@@ -22,7 +22,7 @@
 -		return 0;
 +		goto nofam;
  
- 	return 2;
+ 	return lib_used;
 +
 + nofam:
 +#if HAVE_KQUEUE
diff --git a/lang/mono/files/patch-mono_mini_exceptions-amd64.c b/lang/mono/files/patch-mono_mini_exceptions-amd64.c
index 3e7142d..31d86e6 100644
--- a/lang/mono/files/patch-mono_mini_exceptions-amd64.c
+++ b/lang/mono/files/patch-mono_mini_exceptions-amd64.c
@@ -1,11 +1,8 @@
---- mono/mini/exceptions-amd64.c.orig	Tue Aug  2 17:53:06 2005
-+++ mono/mini/exceptions-amd64.c	Tue Aug  2 17:53:20 2005
-@@ -573,11 +573,27 @@
-  * @obj: the exception object
-  */
+--- mono/mini/exceptions-amd64.c.orig	Sat Oct 29 15:34:30 2005
++++ mono/mini/exceptions-amd64.c	Wed Nov 16 21:22:58 2005
+@@ -620,9 +620,25 @@
  gboolean
--mono_arch_handle_exception (void *sigctx, gpointer obj, gboolean test_only)
-+mono_arch_handle_exception (void *sigctx, gpointer obj,	gboolean test_only)
+ mono_arch_handle_exception (void *sigctx, gpointer obj, gboolean test_only)
  {
 -	ucontext_t *ctx = (ucontext_t*)sigctx;
 -	MonoContext mctx;
@@ -31,7 +28,7 @@
  	mctx.rax = ctx->uc_mcontext.gregs [REG_RAX];
  	mctx.rbx = ctx->uc_mcontext.gregs [REG_RBX];
  	mctx.rcx = ctx->uc_mcontext.gregs [REG_RCX];
-@@ -591,9 +607,25 @@
+@@ -636,9 +652,25 @@
  	mctx.r13 = ctx->uc_mcontext.gregs [REG_R13];
  	mctx.r14 = ctx->uc_mcontext.gregs [REG_R14];
  	mctx.r15 = ctx->uc_mcontext.gregs [REG_R15];
@@ -57,7 +54,7 @@
  	ctx->uc_mcontext.gregs [REG_RAX] = mctx.rax;
  	ctx->uc_mcontext.gregs [REG_RBX] = mctx.rbx;
  	ctx->uc_mcontext.gregs [REG_RCX] = mctx.rcx;
-@@ -607,14 +639,20 @@
+@@ -652,6 +684,7 @@
  	ctx->uc_mcontext.gregs [REG_R13] = mctx.r13;
  	ctx->uc_mcontext.gregs [REG_R14] = mctx.r14;
  	ctx->uc_mcontext.gregs [REG_R15] = mctx.r15;
@@ -65,10 +62,9 @@
  
  	return TRUE;
  }
- 
+@@ -659,7 +692,12 @@
  gpointer
--mono_arch_ip_from_context (void *sigctx)
-+mono_arch_ip_from_context (void	*sigctx)
+ mono_arch_ip_from_context (void *sigctx)
  {
 -	ucontext_t *ctx = (ucontext_t*)sigctx;
 -	return (gpointer)ctx->uc_mcontext.gregs [REG_RIP];
diff --git a/lang/mono/files/patch-mono_mini_mini-amd64.c b/lang/mono/files/patch-mono_mini_mini-amd64.c
index da72814..4981363 100644
--- a/lang/mono/files/patch-mono_mini_mini-amd64.c
+++ b/lang/mono/files/patch-mono_mini_mini-amd64.c
@@ -1,16 +1,14 @@
---- mono/mini/mini-amd64.c.orig	Tue Aug  2 17:52:50 2005
-+++ mono/mini/mini-amd64.c	Tue Aug  2 17:53:27 2005
-@@ -15,6 +15,9 @@
+--- mono/mini/mini-amd64.c.orig	Sun Oct 30 14:33:12 2005
++++ mono/mini/mini-amd64.c	Sun Nov 13 18:39:16 2005
+@@ -13,6 +13,7 @@
+ #include "mini.h"
+ #include <string.h>
  #include <math.h>
- #include <unistd.h>
- #include <sys/mman.h>
-+#include <sys/ucontext.h>
-+
-+#include <pthread_np.h>
++#include <ucontext.h>
  
  #include <mono/metadata/appdomain.h>
  #include <mono/metadata/debug-helpers.h>
-@@ -55,6 +58,10 @@
+@@ -49,6 +49,10 @@
  #define ARGS_OFFSET 16
  #define GP_SCRATCH_REG AMD64_R11
  
@@ -21,7 +19,7 @@
  /*
   * AMD64 register usage:
   * - callee saved registers are used for global register allocation
-@@ -5683,6 +5690,7 @@
+@@ -4639,6 +4643,7 @@
  
  #define IS_REX(inst) (((inst) >= 0x40) && ((inst) <= 0x4f))
  
@@ -29,7 +27,7 @@
  static int reg_to_ucontext_reg [] = {
  	REG_RAX, REG_RCX, REG_RDX, REG_RBX, REG_RSP, REG_RBP, REG_RSI, REG_RDI,
  	REG_R8, REG_R9, REG_R10, REG_R11, REG_R12, REG_R13, REG_R14, REG_R15,
-@@ -5694,27 +5702,37 @@
+@@ -4650,27 +4655,37 @@
   * integer overflow.
   */
  gboolean
@@ -73,35 +71,11 @@
 -		if (ctx->uc_mcontext.gregs [reg_to_ucontext_reg [reg]] == -1)
 +#if defined(__FreeBSD__)
 +		if (gregs[reg_to_ucontext_reg[reg]] == -1)
- 			return TRUE;
++			return TRUE;
 +#else
 +		if (ctx->uc_mcontext.gregs [reg_to_ucontext_reg	[reg]] == -1)
-+			return TRUE;
+ 			return TRUE;
 +#endif
  	}
  
  	return FALSE;
-@@ -5888,10 +5906,10 @@
- #ifdef HAVE_PTHREAD_GETATTR_NP
- 	pthread_getattr_np( self, &attr );
- #else
-+	pthread_attr_init( &attr );
- #ifdef HAVE_PTHREAD_ATTR_GET_NP
- 	pthread_attr_get_np( self, &attr );
- #elif defined(sun)
--	pthread_attr_init( &attr );
- 	pthread_attr_getstacksize( &attr, &stsize );
- #else
- #error "Not implemented"
-@@ -5925,6 +5943,11 @@
- 	sa.ss_size = SIGNAL_STACK_SIZE;
- 	sa.ss_flags = SS_ONSTACK;
- 	sigaltstack (&sa, NULL);
-+
-+#if !defined(HAVE_PTHREAD_GETATTR_NP)
-+	pthread_attr_destroy(&attr);
-+#endif
-+
- }
- 
- #endif
diff --git a/lang/mono/files/patch-mono_mini_mini-exceptions.c b/lang/mono/files/patch-mono_mini_mini-exceptions.c
new file mode 100644
index 0000000..c221fbf
--- /dev/null
+++ b/lang/mono/files/patch-mono_mini_mini-exceptions.c
@@ -0,0 +1,14 @@
+--- mono/mini/mini-exceptions.c.orig	Tue Nov  1 09:07:14 2005
++++ mono/mini/mini-exceptions.c	Wed Nov 16 21:17:13 2005
+@@ -915,7 +915,11 @@
+ 	tls->stack_size = stsize + getpagesize ();
+ 
+ 	/* Setup an alternate signal stack */
++#if defined(__FreeBSD__)
++	tls->signal_stack = mmap (0, MONO_ARCH_SIGNAL_STACK_SIZE, PROT_READ|PROT_WRITE|PROT_EXEC, MAP_PRIVATE|MAP_ANON, -1, 0);
++#else
+ 	tls->signal_stack = mmap (0, MONO_ARCH_SIGNAL_STACK_SIZE, PROT_READ|PROT_WRITE|PROT_EXEC, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
++#endif
+ 	tls->signal_stack_size = MONO_ARCH_SIGNAL_STACK_SIZE;
+ 
+ 	g_assert (tls->signal_stack);
diff --git a/lang/mono/files/patch-support_stdio.c b/lang/mono/files/patch-support_stdio.c
new file mode 100644
index 0000000..e9e8bc2
--- /dev/null
+++ b/lang/mono/files/patch-support_stdio.c
@@ -0,0 +1,11 @@
+--- support/stdio.c.orig	Fri Oct 14 07:58:02 2005
++++ support/stdio.c	Mon Nov 14 21:08:53 2005
+@@ -197,7 +197,7 @@
+ Mono_Posix_Stdlib_clearerr (void* stream)
+ {
+ 	errno = 0;
+-	clearerr (stream);
++	clearerr ((FILE *) stream);
+ 	return errno == 0 ? 0 : -1;
+ }
+