5 files changed, 15 insertions, 179 deletions

diff --git a/lang/mono/files/patch-configure b/lang/mono/files/patch-configure
new file mode 100644
index 000000000000..ab55b91f0be2
--- /dev/null
+++ b/lang/mono/files/patch-configure
@@ -0,0 +1,13 @@
+--- configure.orig	Sun Aug 26 00:12:42 2007
++++ configure	Sun Aug 26 00:12:59 2007
+@@ -39673,8 +39673,8 @@
+ INTERP_SUPPORTED=no
+ LIBC="libc.so.6"
+ INTL="libc.so.6"
+-SQLITE="libsqlite.so.0"
+-SQLITE3="libsqlite3.so.0"
++SQLITE="libsqlite.so.8"
++SQLITE3="libsqlite3.so.8"
+ X11="libX11.so"
+ 
+ jit_wanted=false
diff --git a/lang/mono/files/patch-mcs_class_MWF_build-csproj b/lang/mono/files/patch-mcs_class_MWF_build-csproj
index 33bf2f8e2ff2..9d069f58fa87 100644
--- a/lang/mono/files/patch-mcs_class_MWF_build-csproj
+++ b/lang/mono/files/patch-mcs_class_MWF_build-csproj
@@ -1,5 +1,5 @@
---- mcs/class/Managed.Windows.Forms/build-csproj.orig	Thu Jan 25 01:19:43 2007
-+++ mcs/class/Managed.Windows.Forms/build-csproj	Sun Jun 10 15:27:31 2007
+--- mcs/class/Managed.Windows.Forms/build-csproj.orig	Thu Apr 19 21:32:15 2007
++++ mcs/class/Managed.Windows.Forms/build-csproj	Mon Apr 23 20:21:51 2007
 @@ -177,7 +177,7 @@
  {
  cat $Resource | while read SRC; do
diff --git a/lang/mono/files/patch-mono_io-layer_shared.c b/lang/mono/files/patch-mono_io-layer_shared.c
deleted file mode 100644
index 140d0c10fa7c..000000000000
--- a/lang/mono/files/patch-mono_io-layer_shared.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- mono/io-layer/shared.c.orig	Fri Dec  1 01:57:46 2006
-+++ mono/io-layer/shared.c	Wed Feb 21 13:28:07 2007
-@@ -330,10 +330,10 @@
- 		while ((_wapi_sem_id = semget (key, _WAPI_SHARED_SEM_COUNT,
- 					       IPC_CREAT | IPC_EXCL | 0600)) == -1) {
- 			if (errno == ENOMEM) {
--				g_critical ("%s: semget error: %s", __func__,
-+				g_error ("%s: semget error: %s", __func__,
- 					    g_strerror (errno));
- 			} else if (errno == ENOSPC) {
--				g_critical ("%s: semget error: %s.  Try deleting some semaphores with ipcs and ipcrm", __func__, g_strerror (errno));
-+				g_error ("%s: semget error: %s.  Try deleting some semaphores with ipcs and ipcrm\nor increase the maximum number of semaphore in the system.", __func__, g_strerror (errno));
- 			} else if (errno != EEXIST) {
- 				if (retries > 3)
- 					g_warning ("%s: semget error: %s key 0x%x - trying again", __func__,
diff --git a/lang/mono/files/patch-mono_io-layer_socket-private.h b/lang/mono/files/patch-mono_io-layer_socket-private.h
deleted file mode 100644
index f5e8eb0120ba..000000000000
--- a/lang/mono/files/patch-mono_io-layer_socket-private.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- mono/io-layer/socket-private.h.orig	Thu Jan 25 01:11:18 2007
-+++ mono/io-layer/socket-private.h	Sat Mar 24 16:49:54 2007
-@@ -20,6 +20,7 @@
- 	int domain;
- 	int type;
- 	int protocol;
-+	int saved_error;
- };
- 
- #endif /* _WAPI_SOCKET_PRIVATE_H_ */
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 4da7536457b9..000000000000
--- a/lang/mono/files/patch-mono_io-layer_sockets.c
+++ /dev/null
@@ -1,152 +0,0 @@
---- mono/io-layer/sockets.c	2007/01/11 13:28:29	70852
-+++ mono/io-layer/sockets.c	2007/03/22 14:59:57	74811
-@@ -15,6 +15,7 @@
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/ioctl.h>
-+#include <sys/poll.h>
- #ifdef HAVE_SYS_FILIO_H
- #include <sys/filio.h>     /* defines FIONBIO and FIONREAD */
- #endif
-@@ -272,7 +273,8 @@
- 		  socklen_t addrlen)
- {
- 	gpointer handle = GUINT_TO_POINTER (fd);
--	int ret;
-+	struct _WapiHandle_socket *socket_handle;
-+	gboolean ok;
- 	gint errnum;
- 	
- 	if (startup_count == 0) {
-@@ -285,26 +287,82 @@
- 		return(SOCKET_ERROR);
- 	}
- 	
--	do {
--		ret = connect (fd, serv_addr, addrlen);
--	} while (ret==-1 && errno==EINTR && !_wapi_thread_cur_apc_pending());
--
--	if (ret == -1) {
-+	if (connect (fd, serv_addr, addrlen) == -1) {
-+		struct pollfd fds;
-+		int so_error;
-+		socklen_t len;
-+		
- 		errnum = errno;
- 		
-+		if (errno != EINTR) {
- #ifdef DEBUG
--		g_message ("%s: connect error: %s", __func__,
--			   strerror (errnum));
-+			g_message ("%s: connect error: %s", __func__,
-+				   strerror (errnum));
- #endif
--		errnum = errno_to_WSA (errnum, __func__);
--		if (errnum == WSAEINPROGRESS)
--			errnum = WSAEWOULDBLOCK; /* see bug #73053 */
- 
--		WSASetLastError (errnum);
-+			errnum = errno_to_WSA (errnum, __func__);
-+			if (errnum == WSAEINPROGRESS)
-+				errnum = WSAEWOULDBLOCK; /* see bug #73053 */
-+
-+			WSASetLastError (errnum);
- 		
--		return(SOCKET_ERROR);
-+			return(SOCKET_ERROR);
-+		}
-+
-+		fds.fd = fd;
-+		fds.events = POLLOUT;
-+		while (poll (&fds, 1, -1) == -1 &&
-+		       !_wapi_thread_cur_apc_pending ()) {
-+			if (errno != EINTR) {
-+				errnum = errno_to_WSA (errno, __func__);
-+
-+#ifdef DEBUG
-+				g_message ("%s: connect poll error: %s",
-+					   __func__, strerror (errno));
-+#endif
-+
-+				WSASetLastError (errnum);
-+				return(SOCKET_ERROR);
-+			}
-+		}
-+
-+		len = sizeof(so_error);
-+		if (getsockopt (fd, SOL_SOCKET, SO_ERROR, &so_error,
-+				&len) == -1) {
-+			errnum = errno_to_WSA (errno, __func__);
-+
-+#ifdef DEBUG
-+			g_message ("%s: connect getsockopt error: %s",
-+				   __func__, strerror (errno));
-+#endif
-+
-+			WSASetLastError (errnum);
-+			return(SOCKET_ERROR);
-+		}
-+		
-+		if (so_error != 0) {
-+			errnum = errno_to_WSA (so_error, __func__);
-+
-+			/* Need to save this socket error */
-+			ok = _wapi_lookup_handle (handle, WAPI_HANDLE_SOCKET,
-+						  (gpointer *)&socket_handle);
-+			if (ok == FALSE) {
-+				g_warning ("%s: error looking up socket handle %p", __func__, handle);
-+			} else {
-+				socket_handle->saved_error = errnum;
-+			}
-+			
-+#ifdef DEBUG
-+			g_message ("%s: connect getsockopt returned error: %s",
-+				   __func__, strerror (so_error));
-+#endif
-+
-+			WSASetLastError (errnum);
-+			return(SOCKET_ERROR);
-+		}
- 	}
--	return(ret);
-+		
-+	return(0);
- }
- 
- int _wapi_getpeername(guint32 fd, struct sockaddr *name, socklen_t *namelen)
-@@ -378,7 +436,9 @@
- 	int ret;
- 	struct timeval tv;
- 	void *tmp_val;
--
-+	struct _WapiHandle_socket *socket_handle;
-+	gboolean ok;
-+	
- 	if (startup_count == 0) {
- 		WSASetLastError (WSANOTINITIALISED);
- 		return(SOCKET_ERROR);
-@@ -415,9 +475,23 @@
- 	}
- 
- 	if (optname == SO_ERROR) {
--		if (*((int *)optval) != 0) {
-+		ok = _wapi_lookup_handle (handle, WAPI_HANDLE_SOCKET,
-+					  (gpointer *)&socket_handle);
-+		if (ok == FALSE) {
-+			g_warning ("%s: error looking up socket handle %p",
-+				   __func__, handle);
-+
-+			/* can't extract the last error */
- 			*((int *) optval) = errno_to_WSA (*((int *)optval),
- 							  __func__);
-+		} else {
-+			if (*((int *)optval) != 0) {
-+				*((int *) optval) = errno_to_WSA (*((int *)optval),
-+								  __func__);
-+				socket_handle->saved_error = *((int *)optval);
-+			} else {
-+				*((int *)optval) = socket_handle->saved_error;
-+			}
- 		}
- 	}
-