Update to 1.4.3:

malware's contributions:
   * SECURITY: Removed possible format string exploits.
   * FIXED: statistics color saving/loading.
   * FIXED: a possibly exploitable bug as noticed by S. Esser from e-matters.
   * FIXED: exception handling for CString/wxString.
   * FIXED: endless loop in CClientUDPSocket::OnSend().
   * FIXED: fatal exception handler not to fail in early stages.
   * FIXED: endless loop in CListenSocket::KillAllSockets().
   * FIXED: Lagloose's Shift+Doubleclick to show really only transfering
     sources. Update still does not work.
   * Decode %-escaped characters in URL within the ed2k application as
     suggested by __JusSx__.

NetBSD team's contributions:
   * Work-around not to unlock mutexes not locked.
   * Try to increase some resource limits to the permitted maximum.
   * FIXED: bug with the mutex protecting calls to gethostbyname.

Un-Thesis' contributions:
   * Added support for adding multiple ED2K links.
   * Added ED2K link support for GTK2.

FooMan's contributions:
   * FIXED: for failing file access during download completion.

9 files changed, 5 insertions, 225 deletions

diff --git a/net/xmule/Makefile b/net/xmule/Makefile
index 6f6411a91ec..11a5eece9e3 100644
--- a/net/xmule/Makefile
+++ b/net/xmule/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2003/07/25 09:09:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2003/08/26 09:53:38 jmmv Exp $
 #
 
-DISTNAME=	xmule-1.4.2
+DISTNAME=	xmule-1.4.3
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xmule/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/net/xmule/distinfo b/net/xmule/distinfo
index 3b4d24d0651..59d6c6cfc7b 100644
--- a/net/xmule/distinfo
+++ b/net/xmule/distinfo
@@ -1,11 +1,4 @@
-$NetBSD: distinfo,v 1.3 2003/07/25 09:09:02 jmmv Exp $
+$NetBSD: distinfo,v 1.4 2003/08/26 09:53:38 jmmv Exp $
 
-SHA1 (xmule-1.4.2.tar.bz2) = 2f9057f708d04ca0de37c80430662458f35e1802
-Size (xmule-1.4.2.tar.bz2) = 1269761 bytes
-SHA1 (patch-aa) = 750edb86b7c1deef6ee3dfabec2168b1cfea6b0f
-SHA1 (patch-ab) = 6d7d08396f873acb67fc9596a310124f4698da5b
-SHA1 (patch-ac) = 170dd665068f8f45cc06bf3afc226eb8c4128c69
-SHA1 (patch-ad) = b0bb4748b5b688b6eca2058a33b951bfb2fe0580
-SHA1 (patch-ae) = a388f39c176cbfa577fa567c527dee0939f4f984
-SHA1 (patch-ag) = 3a14fc689adc2a9f46958bc6d881b8d14163dbc8
-SHA1 (patch-ah) = 81c53bbe3cb585351892f19c64d410a251285fdc
+SHA1 (xmule-1.4.3.tar.bz2) = 95adb480f361d86a61068b40972c030a636e7f80
+Size (xmule-1.4.3.tar.bz2) = 1263047 bytes
diff --git a/net/xmule/patches/patch-aa b/net/xmule/patches/patch-aa
deleted file mode 100644
index 867f89018a0..00000000000
--- a/net/xmule/patches/patch-aa
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/06/03 09:17:21 jmmv Exp $
-
---- configure.orig	2003-05-31 13:13:06.000000000 +0000
-+++ configure	2003-05-31 13:25:06.000000000 +0000
-@@ -5714,7 +5714,7 @@
- 
- 
- for ac_header in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
--stdlib.h string.h unistd.h sys/param.h
-+stdlib.h string.h unistd.h sys/param.h sys/utsname.h sys/resource.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-@@ -5878,7 +5878,8 @@
- 
- for ac_func in feof_unlocked fgets_unlocked getc_unlocked getcwd getegid \
- geteuid getgid getuid mempcpy munmap putenv setenv setlocale stpcpy \
--strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_next
-+strcasecmp strdup strtoul uname getrlimit setrlimit tsearch __argz_count \
-+__argz_stringify __argz_next
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
- echo "$as_me:$LINENO: checking for $ac_func" >&5
diff --git a/net/xmule/patches/patch-ab b/net/xmule/patches/patch-ab
deleted file mode 100644
index 27573c47807..00000000000
--- a/net/xmule/patches/patch-ab
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/06/03 09:17:20 jmmv Exp $
-
---- config.h.in.orig	2003-05-31 13:41:29.000000000 +0000
-+++ config.h.in	2003-05-31 13:44:15.000000000 +0000
-@@ -295,3 +295,15 @@
- 
- /* Define to `unsigned' if <sys/types.h> does not define. */
- #undef size_t
-+
-+/* Define to 1 if you have the <sys/utsname.h> header file. */
-+#undef HAVE_SYS_UTSNAME_H
-+
-+/* Define to 1 if you have the <sys/resource.h> header file. */
-+#undef HAVE_SYS_RESOURCE_H
-+
-+/* Define to 1 if you have the `getrlimit' function. */
-+#undef HAVE_GETRLIMIT
-+
-+/* Define to 1 if you have the `setrlimit' function. */
-+#undef HAVE_SETRLIMIT
diff --git a/net/xmule/patches/patch-ac b/net/xmule/patches/patch-ac
deleted file mode 100644
index ab98d156104..00000000000
--- a/net/xmule/patches/patch-ac
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2003/06/03 09:17:20 jmmv Exp $
-
---- src/SysTray.cpp.orig	2003-05-31 13:26:20.000000000 +0000
-+++ src/SysTray.cpp	2003-05-31 13:28:42.000000000 +0000
-@@ -37,6 +37,8 @@
- #include <config.h>
- #define _(String) gettext(String)
- 
-+const char * GetAppTitle();
-+
- CSysTray::CSysTray(wxWindow* _parent,int _desktopMode)
- {
-   gdk_rgb_init();
-@@ -71,11 +73,11 @@
- 
-   if(use_legacy) {
-     status_docklet=gtk_window_new(GTK_WINDOW_TOPLEVEL);
--    gtk_window_set_title(GTK_WINDOW(status_docklet),_("xMule for Linux"));
-+    gtk_window_set_title(GTK_WINDOW(status_docklet),GetAppTitle());
-     gtk_window_set_wmclass(GTK_WINDOW(status_docklet),"xmule_StatusDocklet","xmule");
-     gtk_widget_set_usize(status_docklet,22,22);
-   } else {
--    status_docklet=GTK_WIDGET(egg_tray_icon_new(_("xMule for Linux")));
-+    status_docklet=GTK_WIDGET(egg_tray_icon_new(GetAppTitle()));
-     if(status_docklet==NULL) {
-       printf("**** WARNING: Can't create status docklet. Systray will not be created.\n");
-       desktopMode=4;
diff --git a/net/xmule/patches/patch-ad b/net/xmule/patches/patch-ad
deleted file mode 100644
index e62eadbd111..00000000000
--- a/net/xmule/patches/patch-ad
+++ /dev/null
@@ -1,55 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2003/06/28 10:55:47 jmmv Exp $
-
---- src/xmule.cpp.orig	2003-06-19 12:04:38.000000000 +0200
-+++ src/xmule.cpp
-@@ -93,8 +93,10 @@ int CxmuleApp::OnExit() {
-   delete clientlist; 
- #endif
- 
--  hashing_mut.Unlock();
--  pendingMutex.Unlock();
-+  if (hashing_mut.TryLock() == wxMUTEX_NO_ERROR)
-+    hashing_mut.Unlock();
-+  if (pendingMutex.TryLock() == wxMUTEX_NO_ERROR)
-+    pendingMutex.Unlock();
- 
-   printf("xMule shutdown completed.\n");
- }
-@@ -197,6 +199,28 @@ public:
- 
- extern void InitXmlResource();
- 
-+#ifdef HAVE_SYS_RESOURCE_H
-+#include <sys/resource.h>
-+#endif
-+
-+static void UnlimitResource(int resType)
-+{
-+#if defined(HAVE_GETRLIMIT) && defined(HAVE_SETRLIMIT)
-+  struct rlimit rl;
-+  getrlimit(resType, &rl);
-+  rl.rlim_cur = rl.rlim_max;
-+  setrlimit(resType, &rl);
-+#endif
-+}
-+
-+static void SetResourceLimits()
-+{
-+  UnlimitResource(RLIMIT_DATA);
-+  UnlimitResource(RLIMIT_FSIZE);
-+  UnlimitResource(RLIMIT_NOFILE);
-+  UnlimitResource(RLIMIT_RSS);
-+}
-+
- bool CxmuleApp::OnInit()
- {
- 	// catch fatal exceptions
-@@ -204,6 +228,8 @@ bool CxmuleApp::OnInit()
- 
- 	//putenv("LANG=en_US");
- 
-+	SetResourceLimits();
-+
- 	// for resources
- 	wxFileSystem::AddHandler(new wxZipFSHandler);
- 	wxXmlResource::Get()->InitAllHandlers();
diff --git a/net/xmule/patches/patch-ae b/net/xmule/patches/patch-ae
deleted file mode 100644
index e0a332c2247..00000000000
--- a/net/xmule/patches/patch-ae
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2003/06/03 09:17:21 jmmv Exp $
-
---- src/xmuleDlg.cpp.orig	2003-05-31 13:32:39.000000000 +0000
-+++ src/xmuleDlg.cpp	2003-05-31 13:40:38.000000000 +0000
-@@ -20,6 +20,7 @@
- //
- 
- //#include "stdafx.h"
-+#include "config.h"
- #include "xmule.h"
- #include "xmuleDlg.h"
- #include "sockets.h"
-@@ -131,6 +132,9 @@
- 
- // CxmuleDlg Dialog
- #include <signal.h>
-+#ifdef HAVE_SYS_UTSNAME_H
-+#include <sys/utsname.h>
-+#endif
- 
- #if wxMINOR_VERSION > 4
- #define CLOSEBOX wxCLOSE_BOX
-@@ -138,8 +142,19 @@
- #define CLOSEBOX 0
- #endif
- 
-+const char * GetAppTitle()
-+{
-+#if defined(HAVE_UNAME) && defined(HAVE_SYS_UTSNAME_H)
-+  struct utsname un;
-+  uname(&un);
-+  return CString("xMule for ") + un.sysname;
-+#else
-+  return CString("xMule for *NIX");
-+#endif
-+}
-+
- CxmuleDlg::CxmuleDlg(wxWindow* pParent, wxString title) 
--  : wxFrame(pParent,CxmuleDlg::IDD,title,wxDefaultPosition,wxSize(800,520),
-+  : wxFrame(pParent,CxmuleDlg::IDD,GetAppTitle(),wxDefaultPosition,wxSize(800,520),
- 	    wxCAPTION|wxRESIZE_BORDER|wxSYSTEM_MENU|wxDIALOG_NO_PARENT|wxTHICK_FRAME|wxMINIMIZE_BOX|wxMAXIMIZE_BOX|CLOSEBOX)
- {
-   m_app_state=APP_STATE_STARTING;
diff --git a/net/xmule/patches/patch-ag b/net/xmule/patches/patch-ag
deleted file mode 100644
index 89f96fa159f..00000000000
--- a/net/xmule/patches/patch-ag
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2003/06/03 09:17:21 jmmv Exp $
-
---- src/UDPSocket.cpp.orig	2003-05-26 05:30:05.000000000 +0200
-+++ src/UDPSocket.cpp	2003-06-01 11:36:08.000000000 +0200
-@@ -25,7 +25,7 @@
- static pthread_attr_t attr;//=PTHREAD_CREATE_DETACHED;
- 
- #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) 
--	static wxMutex *s_mutexProtectingGetHostByName;
-+	static wxMutex s_mutexProtectingGetHostByName;
- 
- static int
- convert (struct hostent *host, struct hostent *result,
-@@ -131,7 +131,7 @@
- {
-   struct hostent *host;
- 
--  s_mutexProtectingGetHostByName->Lock();
-+  s_mutexProtectingGetHostByName.Lock();
- 
-   host = gethostbyname (name);
-   if (!host ||
-@@ -140,7 +140,7 @@
-     result = NULL;
-   }
- 
--  s_mutexProtectingGetHostByName->Unlock();
-+  s_mutexProtectingGetHostByName.Unlock();
-   return result;
- }
- 
diff --git a/net/xmule/patches/patch-ah b/net/xmule/patches/patch-ah
deleted file mode 100644
index 08a43280daf..00000000000
--- a/net/xmule/patches/patch-ah
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ah,v 1.1.1.1 2003/06/03 09:17:21 jmmv Exp $
-
---- src/KnownFileList.cpp.orig	2003-05-25 16:00:07.000000000 +0200
-+++ src/KnownFileList.cpp	2003-06-01 01:55:06.000000000 +0200
-@@ -34,7 +34,9 @@
- }
- 
- CKnownFileList::~CKnownFileList() {
-+        if (list_mut.TryLock() == wxMUTEX_NO_ERROR) {
- 	list_mut.Unlock();
-+        }
- 	Clear();
- }
-