Date: Mon, 11 Aug 2003 16:50:20 +0200 (CEST) From: Morten Rodal <morten@rodal.no> To: FreeBSD-gnats-submit@FreeBSD.org Cc: lioux@FreeBSD.org Subject: ports/55471: [PATCH] net/xmule upgrade to 1.4.3 Message-ID: <200308111450.h7BEoKJw015050@slurp.rodal.no> Resent-Message-ID: <200308111500.h7BF0ToV063121@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 55471 >Category: ports >Synopsis: [PATCH] net/xmule upgrade to 1.4.3 >Confidential: no >Severity: critical >Priority: high >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Aug 11 08:00:29 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Morten Rodal >Release: FreeBSD 5.1-BETA i386 >Organization: >Environment: System: FreeBSD slurp.rodal.no 5.1-BETA FreeBSD 5.1-BETA #3: Wed May 21 17:43:20 CEST 2003 root@slurp.rodal.no:/usr/obj/usr/src/sys/slurp i386 >Description: Upgrades the net/xmule port from 1.4.0 to 1.4.3. This fixes the string format bug. >How-To-Repeat: >Fix: Also available at http://slurp.rodal.no/~morten/xmule.diff diff -udrN xmule.orig/Makefile xmule/Makefile --- xmule.orig/Makefile Mon Aug 11 16:28:08 2003 +++ xmule/Makefile Mon Aug 11 16:28:58 2003 @@ -6,7 +6,7 @@ # PORTNAME= xmule -PORTVERSION= 1.4.0 +PORTVERSION= 1.4.3 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= xmule @@ -18,9 +18,6 @@ expat.4:${PORTSDIR}/textproc/expat2 \ wx_gtk.2:${PORTSDIR}/x11-toolkits/wxgtk-devel RUN_DEPENDS= wget:${PORTSDIR}/ftp/wget - -FORBIDDEN= "Format string bug: \ - http://www.xmule.org/geeklog/article.php?story=20030810160606604" USE_X_PREFIX= yes USE_BZIP2= yes diff -udrN xmule.orig/distinfo xmule/distinfo --- xmule.orig/distinfo Mon Aug 11 16:28:08 2003 +++ xmule/distinfo Mon Aug 11 16:28:16 2003 @@ -1 +1 @@ -MD5 (xmule-1.4.0.tar.bz2) = f63d4f84479c4e0ef625c054e6cbed10 +MD5 (xmule-1.4.3.tar.bz2) = 419b5a764f1d9fd676daa6819e1cf537 diff -udrN xmule.orig/files/patch-src::gsocket.c xmule/files/patch-src::gsocket.c --- xmule.orig/files/patch-src::gsocket.c Mon Aug 11 16:28:08 2003 +++ xmule/files/patch-src::gsocket.c Mon Aug 11 16:28:16 2003 @@ -1,22 +0,0 @@ ---- src/gsocket.c.orig Tue May 27 14:11:08 2003 -+++ src/gsocket.c Tue May 27 14:11:58 2003 -@@ -127,6 +127,11 @@ - # define GSocket_Debug(args) - #endif /* __GSOCKET_DEBUG__ */ - -+/* Added by Un-Thesis 2003-05-15 */ -+/* Allows socket reuse */ -+/* Code contributed by McCabe and arkanes */ -+int intYes = 1; -+ - /* Global initialisers */ - - int GSocket_Init(void) -@@ -400,7 +405,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; - } diff -udrN xmule.orig/files/patch-src::updownclient.h xmule/files/patch-src::updownclient.h --- xmule.orig/files/patch-src::updownclient.h Mon Aug 11 16:28:08 2003 +++ xmule/files/patch-src::updownclient.h Mon Aug 11 16:28:16 2003 @@ -1,24 +0,0 @@ ---- src/updownclient.h.orig Sun May 25 18:27:59 2003 -+++ src/updownclient.h Tue May 27 21:14:31 2003 -@@ -26,12 +26,20 @@ - #include "SafeFile.h" - #include "BarShader.h" - #include "otherfunctions.h" -+#include <sys/time.h> - - class CPartFile; - class CKnownFile; - typedef unsigned char byte; --extern inline long GetTickCount(); - -+inline long GetTickCount() -+{ -+ struct timeval aika; -+ gettimeofday(&aika,NULL); -+ unsigned long secs=aika.tv_sec*1000; -+ secs+=(aika.tv_usec/1000); -+ return secs; -+} - - // uploadstate - #define US_UPLOADING 0 diff -udrN xmule.orig/files/patch-src::xmule.cpp xmule/files/patch-src::xmule.cpp --- xmule.orig/files/patch-src::xmule.cpp Mon Aug 11 16:28:08 2003 +++ xmule/files/patch-src::xmule.cpp Mon Aug 11 16:28:16 2003 @@ -1,42 +1,20 @@ ---- src/xmule.cpp.orig Tue May 27 00:02:47 2003 -+++ src/xmule.cpp Tue May 27 21:31:38 2003 -@@ -55,16 +55,6 @@ - // ON_COMMAND(ID_HELP, CWinApp::OnHelp) - //END_MESSAGE_MAP() - --#include <sys/time.h> --inline long GetTickCount() --{ -- struct timeval aika; -- gettimeofday(&aika,NULL); -- unsigned long secs=aika.tv_sec*1000; -- secs+=(aika.tv_usec/1000); -- return secs; --} -- - CxmuleApp::CxmuleApp() { - splashBmp=new wxBitmap((const char**)About_jpg); +--- src/xmule.cpp.orig Mon Aug 11 14:38:14 2003 ++++ src/xmule.cpp Mon Aug 11 14:38:27 2003 +@@ -763,7 +763,7 @@ + delete[] xmulesig_path; } -@@ -641,11 +631,13 @@ - - } //End Added By Bouc7 -- +-#if defined(__Linux__) +#if 0 #include <execinfo.h> -+#endif + #endif + +@@ -776,7 +776,7 @@ + theApp.clientudp->Destroy(); - void CxmuleApp::OnFatalException() - { -+#if 0 // (stkn) create backtrace +-#if defined(__Linux__) ++#if 0 void * bt_array[100]; // 100 should be enough ?!? char ** bt_strings; -@@ -666,6 +658,7 @@ - fprintf(stderr, "[%d] %s\n", i, bt_strings[i]); - - free(bt_strings); -+#endif - } - - #define wxGTK_WINDOW 1 + int num_entries; diff -udrN xmule.orig/pkg-plist xmule/pkg-plist --- xmule.orig/pkg-plist Mon Aug 11 16:28:08 2003 +++ xmule/pkg-plist Mon Aug 11 16:28:16 2003 @@ -6,8 +6,6 @@ share/locale/es/LC_MESSAGES/xmule.mo share/locale/es_MX/LC_MESSAGES/xmule.mo share/locale/fr/LC_MESSAGES/xmule.mo -share/locale/it/LC_MESSAGES/xmule.mo -share/locale/ko/LC_MESSAGES/xmule.mo share/locale/pl/LC_MESSAGES/xmule.mo share/locale/tr/LC_MESSAGES/xmule.mo @unexec rmdir %D/share/locale/tr/LC_MESSAGES 2>/dev/null || true >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200308111450.h7BEoKJw015050>