Replace g_memmove with the real thing.

6 files changed, 71 insertions, 1 deletions

diff --git a/net/ed2k-gtk-gui/distinfo b/net/ed2k-gtk-gui/distinfo
index a8701ca49ce..234401bade9 100644
--- a/net/ed2k-gtk-gui/distinfo
+++ b/net/ed2k-gtk-gui/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2006/10/14 01:21:48 rillig Exp $
+$NetBSD: distinfo,v 1.7 2014/09/10 12:22:44 joerg Exp $
 
 SHA1 (ed2k-gtk-gui-0.6.3.tar.gz) = b5474717b1b9cdeddae8cc707fe9809608138dc1
 RMD160 (ed2k-gtk-gui-0.6.3.tar.gz) = 98f69190e76b58b79aa3dd9a6d20b7abcb080208
@@ -6,3 +6,8 @@ Size (ed2k-gtk-gui-0.6.3.tar.gz) = 1993079 bytes
 SHA1 (patch-aa) = d47d9302cd13a8ca3d9488f7e2563e0c33265e1d
 SHA1 (patch-ab) = 89dfaa0f27af6b8920e286b70e31ea97b9f68599
 SHA1 (patch-ac) = 2a16726d954f4ceb82e40f2e6993864aed79d0f2
+SHA1 (patch-ed2k__gui_blacklist.c) = 1dba6d0a177778b627aeafca8d6cecfebe1b409c
+SHA1 (patch-ed2k__gui_http__get.c) = 8a8f03d800c983415c79f4e60bcfd291b9d17165
+SHA1 (patch-ed2k__gui_misc.c) = 78aaee83863356557bdf83e6e79303b0596b3b87
+SHA1 (patch-ed2k__gui_misc__strings.c) = e304379a02ce3719f4496a80d7d1d7ccd108f915
+SHA1 (patch-gnet_inetaddr.c) = 8ffe0a7a8e05d673ff30f254cf4d1f16bd059176
diff --git a/net/ed2k-gtk-gui/patches/patch-ed2k__gui_blacklist.c b/net/ed2k-gtk-gui/patches/patch-ed2k__gui_blacklist.c
new file mode 100644
index 00000000000..eccae7a6db1
--- /dev/null
+++ b/net/ed2k-gtk-gui/patches/patch-ed2k__gui_blacklist.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-ed2k__gui_blacklist.c,v 1.1 2014/09/10 12:22:44 joerg Exp $
+
+--- ed2k_gui/blacklist.c.orig	2014-09-09 18:26:47.000000000 +0000
++++ ed2k_gui/blacklist.c
+@@ -294,7 +294,7 @@ add_to_blacklist (const guint8 *evilhash
+ 
+ 	g_return_if_fail (bli!=NULL);
+ 
+-	g_memmove (bli->hash, evilhash, 16);
++	memmove (bli->hash, evilhash, 16);
+ 
+ 	bli->filesize = size;
+ 
diff --git a/net/ed2k-gtk-gui/patches/patch-ed2k__gui_http__get.c b/net/ed2k-gtk-gui/patches/patch-ed2k__gui_http__get.c
new file mode 100644
index 00000000000..e7c6cbb3077
--- /dev/null
+++ b/net/ed2k-gtk-gui/patches/patch-ed2k__gui_http__get.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-ed2k__gui_http__get.c,v 1.1 2014/09/10 12:22:44 joerg Exp $
+
+--- ed2k_gui/http_get.c.orig	2014-09-09 18:26:42.000000000 +0000
++++ ed2k_gui/http_get.c
+@@ -695,7 +695,7 @@ http_get_connection_callback (GConn *con
+ 
+ 			data->buf = g_realloc (data->buf, ( data->bufsize + event->length + 1 ) );
+ 			g_return_if_fail ( data->buf != NULL );
+-			g_memmove (data->buf + data->bufsize, event->buffer, event->length);
++			memmove (data->buf + data->bufsize, event->buffer, event->length);
+ 			data->buf[data->bufsize + event->length]=0x00;		// remember: we allocated +1 for terminating 0
+ 			data->bufsize += event->length;
+ //			g_print ("read %u bytes (total = %8u)\n", length, data->bufsize);
diff --git a/net/ed2k-gtk-gui/patches/patch-ed2k__gui_misc.c b/net/ed2k-gtk-gui/patches/patch-ed2k__gui_misc.c
new file mode 100644
index 00000000000..fb92bb2520e
--- /dev/null
+++ b/net/ed2k-gtk-gui/patches/patch-ed2k__gui_misc.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-ed2k__gui_misc.c,v 1.1 2014/09/10 12:22:44 joerg Exp $
+
+--- ed2k_gui/misc.c.orig	2014-09-09 18:26:33.000000000 +0000
++++ ed2k_gui/misc.c
+@@ -1655,7 +1655,7 @@ misc_remove_junk_from_servername (const 
+ 			gchar *nospace = pos+2;
+ 			while (*nospace == ' ')
+ 				nospace++;
+-			g_memmove(pos+1, nospace, strlen(nospace) + 1);
++			memmove(pos+1, nospace, strlen(nospace) + 1);
+ 		}
+ 		pos++;
+ 	}
diff --git a/net/ed2k-gtk-gui/patches/patch-ed2k__gui_misc__strings.c b/net/ed2k-gtk-gui/patches/patch-ed2k__gui_misc__strings.c
new file mode 100644
index 00000000000..3eee3184d69
--- /dev/null
+++ b/net/ed2k-gtk-gui/patches/patch-ed2k__gui_misc__strings.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-ed2k__gui_misc__strings.c,v 1.1 2014/09/10 12:22:44 joerg Exp $
+
+--- ed2k_gui/misc_strings.c.orig	2014-09-09 18:26:23.000000000 +0000
++++ ed2k_gui/misc_strings.c
+@@ -50,7 +50,7 @@ misc_strings_unescape_url (gchar *s)
+ 		if (sscanf(found+1, "%2x", &hexval) == 1)
+ 		{
+ 			*found = (gchar)hexval;
+-			g_memmove(found+1, found+3, strlen(found+3)+1);
++			memmove(found+1, found+3, strlen(found+3)+1);
+ 		}
+ 
+ 		pos++;
diff --git a/net/ed2k-gtk-gui/patches/patch-gnet_inetaddr.c b/net/ed2k-gtk-gui/patches/patch-gnet_inetaddr.c
new file mode 100644
index 00000000000..cfa39ea2ca5
--- /dev/null
+++ b/net/ed2k-gtk-gui/patches/patch-gnet_inetaddr.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-gnet_inetaddr.c,v 1.1 2014/09/10 12:22:44 joerg Exp $
+
+--- gnet/inetaddr.c.orig	2014-09-09 18:35:40.000000000 +0000
++++ gnet/inetaddr.c
+@@ -1344,7 +1344,7 @@ gnet_inetaddr_new_list_async_cb (GIOChan
+ 	      int bytes_parsed;
+ 
+ 	      bytes_parsed = buf - state->buffer;
+-	      g_memmove (state->buffer, buf, bytes_parsed);
++	      memmove (state->buffer, buf, bytes_parsed);
+ 	      state->len -= bytes_parsed;
+ 	      
+ 	      return TRUE;