Update to 1.4.1a:

Version 1.4.1a
--------------
Madcat's contributions:
* FIXED: Crash on GetPeer() call during socket failure.
* FIXED: Crash when trying to send hash of nonexistent knownfile.

Version 1.4.1
-------------
Madcat's contributions:
* FIXED: Various crashes regarding Shared Files Reloading.
* FIXED: Several Search Tab Closing/Global Search related crashes.
* FIXED: Several eMule/xMule typos.
* FIXED: Endless loop if UDP packet sending failed.
* FIXED: Endless loop/memleak at ProcessMuleInfoPacket().
* FIXED: Endless loop at CPartFile::FlushBuffer().
* FIXED: CPU leak in ProcessHelloPacket().
* FIXED: gsocket.c compilation problems with older compilers.
* FIXED: Crash when search results were added to nonexistent search tab.
* FIXED: Endless loop in case UDP packet sending fails.
* FIXED: Sockets are also closed on crash now.
* Revised Search Result packet handling, shouldn't crash/memleak there anymore.
* Removed annoying MAX_RESULTS check from search tab.
* Added log line when ipfilter is loaded.
* All log messages are also written into file ($HOME/.xMule/logfile).
* Shared files list is now resorted after reloading.
* Implemented external ED2K links handling. Use ed2k <link> instead of xmule <link> from now on.
* Changed popup window to log message when shared file is not found.

Kry's contributions:
* FIXED: --version commandline argument.
* FIXED: Bogus 2.1.0.1 servers on serverlist.
* FIXED: Shared folders not shared in some systems.
* FIXED: Shared files not being shared in non-english languages.
* FIXED: Download limit being higher than capacity.
* Made ./xmule statistics more readable.
* Added a notification message in case second xMule is started.

Un-Thesis' contributions:
* FIXED: GTK-only XPM compatibillity problems.
* FIXED: GetTickCount compilation errors.
* FIXED: LOWID problems (AGAIN!).
* Removed pure GTK code from GetColour.
* Added eMule's LOWID icon to main status bar on LOWID connection.

MikaelB's contributions:
* FIXED: Toolbar sizing with i18n

Seneca's contributions:
* FIXED: Clipboard handling (ctrl+v instead of middleclick for pasting).

Closes PR pkg/21940.

5 files changed, 16 insertions, 64 deletions

diff --git a/net/xmule/Makefile b/net/xmule/Makefile
index f0826386e6d..40af0298679 100644
--- a/net/xmule/Makefile
+++ b/net/xmule/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/06/03 09:17:20 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2003/06/28 10:55:46 jmmv Exp $
 #
 
-DISTNAME=	xmule-1.4.0
+DISTNAME=	xmule-1.4.1a
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xmule/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/net/xmule/PLIST b/net/xmule/PLIST
index 68fe27cb04b..e28f1c3db38 100644
--- a/net/xmule/PLIST
+++ b/net/xmule/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/06/03 09:17:20 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/06/28 10:55:46 jmmv Exp $
+bin/ed2k
 bin/xmule
 share/applications/xmule.desktop
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/xmule.mo
@@ -6,8 +7,6 @@ ${PKGLOCALEDIR}/locale/ee/LC_MESSAGES/xmule.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/xmule.mo
 ${PKGLOCALEDIR}/locale/es_MX/LC_MESSAGES/xmule.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/xmule.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/xmule.mo
-${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/xmule.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/xmule.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/xmule.mo
 share/pixmaps/xmule.xpm
diff --git a/net/xmule/distinfo b/net/xmule/distinfo
index 3f08af3950f..6de13494b27 100644
--- a/net/xmule/distinfo
+++ b/net/xmule/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/06/03 09:17:20 jmmv Exp $
+$NetBSD: distinfo,v 1.2 2003/06/28 10:55:46 jmmv Exp $
 
-SHA1 (xmule-1.4.0.tar.bz2) = 2983b0437af6ed5ce4acc934e4bdc6a221271bd0
-Size (xmule-1.4.0.tar.bz2) = 1403388 bytes
+SHA1 (xmule-1.4.1a.tar.bz2) = 93d111b52c88255625905babb3c55f117c64d9d3
+Size (xmule-1.4.1a.tar.bz2) = 1409289 bytes
 SHA1 (patch-aa) = 750edb86b7c1deef6ee3dfabec2168b1cfea6b0f
 SHA1 (patch-ab) = 6d7d08396f873acb67fc9596a310124f4698da5b
 SHA1 (patch-ac) = 170dd665068f8f45cc06bf3afc226eb8c4128c69
-SHA1 (patch-ad) = e359a882b9065c6e9199f58c392702d0b2f8b1d6
+SHA1 (patch-ad) = b0bb4748b5b688b6eca2058a33b951bfb2fe0580
 SHA1 (patch-ae) = a388f39c176cbfa577fa567c527dee0939f4f984
-SHA1 (patch-af) = 3cc3631e7259e759df8d685a473586da82025837
 SHA1 (patch-ag) = 3a14fc689adc2a9f46958bc6d881b8d14163dbc8
 SHA1 (patch-ah) = 81c53bbe3cb585351892f19c64d410a251285fdc
diff --git a/net/xmule/patches/patch-ad b/net/xmule/patches/patch-ad
index 37e18e384f0..e62eadbd111 100644
--- a/net/xmule/patches/patch-ad
+++ b/net/xmule/patches/patch-ad
@@ -1,24 +1,21 @@
-$NetBSD: patch-ad,v 1.1.1.1 2003/06/03 09:17:21 jmmv Exp $
+$NetBSD: patch-ad,v 1.2 2003/06/28 10:55:47 jmmv Exp $
 
---- src/xmule.cpp.orig	2003-06-01 19:33:55.000000000 +0000
-+++ src/xmule.cpp	2003-06-01 19:34:19.000000000 +0000
-@@ -103,8 +103,13 @@
+--- 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) {
++  if (hashing_mut.TryLock() == wxMUTEX_NO_ERROR)
 +    hashing_mut.Unlock();
-+  }
-+
-+  if (pendingMutex.TryLock() == wxMUTEX_NO_ERROR) {
++  if (pendingMutex.TryLock() == wxMUTEX_NO_ERROR)
 +    pendingMutex.Unlock();
-+  }
  
    printf("xMule shutdown completed.\n");
  }
-@@ -207,6 +212,28 @@
+@@ -197,6 +199,28 @@ public:
  
  extern void InitXmlResource();
  
@@ -47,7 +44,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2003/06/03 09:17:21 jmmv Exp $
  bool CxmuleApp::OnInit()
  {
  	// catch fatal exceptions
-@@ -214,6 +241,8 @@
+@@ -204,6 +228,8 @@ bool CxmuleApp::OnInit()
  
  	//putenv("LANG=en_US");
  
@@ -56,26 +53,3 @@ $NetBSD: patch-ad,v 1.1.1.1 2003/06/03 09:17:21 jmmv Exp $
  	// for resources
  	wxFileSystem::AddHandler(new wxZipFSHandler);
  	wxXmlResource::Get()->InitAllHandlers();
-@@ -641,11 +670,13 @@
-     
- } //End Added By Bouc7
- 
--
-+#if defined(linux)
- #include <execinfo.h>
-+#endif
- 
- void CxmuleApp::OnFatalException()
- {
-+#if defined(linux)
-     // (stkn) create backtrace
-     void * bt_array[100]; // 100 should be enough ?!?
-     char ** bt_strings;
-@@ -666,6 +697,7 @@
-        fprintf(stderr, "[%d] %s\n", i, bt_strings[i]);
-        
-     free(bt_strings);
-+#endif
- }
- 
- #define wxGTK_WINDOW 1
diff --git a/net/xmule/patches/patch-af b/net/xmule/patches/patch-af
deleted file mode 100644
index 80821a5cc20..00000000000
--- a/net/xmule/patches/patch-af
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2003/06/03 09:17:20 jmmv Exp $
-
---- src/gsocket.c.orig	2003-05-31 21:53:44.000000000 +0200
-+++ src/gsocket.c	2003-05-31 21:54:24.000000000 +0200
-@@ -363,6 +363,7 @@
- GSocketError GSocket_SetServer(GSocket *sck)
- {
-   int arg = 1;
-+  int intYes = 1;
- 
-   assert(sck != NULL);
- 
-@@ -400,7 +401,6 @@
- /* Added by Un-Thesis 2003-05-15 */
- /* Allows socket reuse */
- /* Code contributed by McCabe and arkanes */
--int intYes = 1;
- if(setsockopt(sck->m_fd, SOL_SOCKET, SO_REUSEADDR, &intYes, sizeof(int))) {
- 	return GSOCK_IOERR;
- }