Date: Sat, 13 Oct 2012 20:21:32 GMT From: Barbara <barbara.xxx1975@libero.it> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/172671: net-p2p/amule-devel: update to SVN 10792 Message-ID: <201210132021.q9DKLWb2097214@red.freebsd.org> Resent-Message-ID: <201210132030.q9DKU1aW081140@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 172671 >Category: ports >Synopsis: net-p2p/amule-devel: update to SVN 10792 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Oct 13 20:30:00 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Barbara >Release: RELENG_9 >Organization: >Environment: FreeBSD satanasso.local.net 9.1-PRERELEASE FreeBSD 9.1-PRERELEASE #0 r241309: Sun Oct 7 16:18:52 CEST 2012 root@satanasso.local.net:/usr/obj/usr/src/sys/SATANASSO i386 >Description: Update amule-devel port to SVN revision 10792. Trim headers. Remove quotes from options description. Backport code fixes from upstream up to r10795 as the project has moved from SourceForge to GoogleCode and so SVN tarballs will not be available for a while. >How-To-Repeat: >Fix: Patch attached with submission follows: --- Makefile.orig 2012-08-06 01:19:36.000000000 +0200 +++ Makefile 2012-10-13 12:50:11.000000000 +0200 @@ -1,12 +1,8 @@ -# New ports collection makefile for: amule-devel -# Date created: Wed Nov 05 09:30:00 UTC 2003 -# Whom: Ganael LAPLANCHE <ganael.laplanche@martymac.org> -# -# $FreeBSD: ports/net-p2p/amule-devel/Makefile,v 1.70 2012/08/05 23:19:36 dougb Exp $ -# +# Created by: Ganael LAPLANCHE <ganael.laplanche@martymac.org> +# $FreeBSD$ PORTNAME= amule -PORTVERSION= 10788 +PORTVERSION= 10792 CATEGORIES= net-p2p MASTER_SITES= http://amule.sourceforge.net/tarballs/ PKGNAMESUFFIX= -devel @@ -44,24 +40,24 @@ OPTIONS_DEFINE= ALC ALCC AMULECMD AMULEDAEMON AMULEGUI CAS DEBUG ED2K FILEVIEW \ GEOIP MMAP MONOLITHIC OPTIMIZED_CFLAGS PLASMAMULE UPNP WEBSERVER WXCAS \ WXUNICODE XAS -ALC_DESC= "Compile aMule Link Creator for GUI" -ALCC_DESC= "Compile aMule Link Creator for console" -AMULECMD_DESC= "Compile aMule command line client" -AMULEDAEMON_DESC= "Compile aMule daemon version" -AMULEGUI_DESC= "Compile aMule remote GUI" -CAS_DESC= "Compile aMule Statistics for console" -DEBUG_DESC= "Compile aMule with additional debugging output" -ED2K_DESC= "Compile aMule ed2k links handler" -FILEVIEW_DESC= "Compile file viewer for console (EXPERIMENTAL)" -GEOIP_DESC= "Enable GeoIP IP2Country support" -MMAP_DESC= "Enable using mapped memory" -MONOLITHIC_DESC= "Compile monolithic aMule" -PLASMAMULE_DESC= "Compile aMule plasma applet and engine" -UPNP_DESC= "Enable Universal Plug and Play support" -WEBSERVER_DESC= "Compile aMule WebServer" -WXCAS_DESC= "Compile aMule Statistics for GUI" -WXUNICODE_DESC= "Enable Unicode support" -XAS_DESC= "Install XChat2 plugin" +ALC_DESC= Compile aMule Link Creator for GUI +ALCC_DESC= Compile aMule Link Creator for console +AMULECMD_DESC= Compile aMule command line client +AMULEDAEMON_DESC= Compile aMule daemon version +AMULEGUI_DESC= Compile aMule remote GUI +CAS_DESC= Compile aMule Statistics for console +DEBUG_DESC= Compile aMule with additional debugging output +ED2K_DESC= Compile aMule ed2k links handler +FILEVIEW_DESC= Compile file viewer for console (EXPERIMENTAL) +GEOIP_DESC= Enable GeoIP IP2Country support +MMAP_DESC= Enable using mapped memory +MONOLITHIC_DESC= Compile monolithic aMule +PLASMAMULE_DESC= Compile aMule plasma applet and engine +UPNP_DESC= Enable Universal Plug and Play support +WEBSERVER_DESC= Compile aMule WebServer +WXCAS_DESC= Compile aMule Statistics for GUI +WXUNICODE_DESC= Enable Unicode support +XAS_DESC= Install XChat2 plugin OPTIONS_DEFAULT=ALC ALCC AMULECMD AMULEDAEMON AMULEGUI CAS ED2K FILEVIEW \ MONOLITHIC WEBSERVER WXCAS WXUNICODE XAS --- distinfo.orig 2012-06-04 17:56:35.000000000 +0200 +++ distinfo 2012-10-13 12:17:18.000000000 +0200 @@ -1,2 +1,2 @@ -SHA256 (aMule-SVN-r10788.tar.bz2) = 0eb48fb0575f93d955d3686ee2b966455acfdda1ae1296e75e6739b5185e08d2 -SIZE (aMule-SVN-r10788.tar.bz2) = 4603252 +SHA256 (aMule-SVN-r10792.tar.bz2) = e9b2cd2a8c66de1df9c37c0b1ca05d961d46ec2097e19ae56a0b25b5050fece4 +SIZE (aMule-SVN-r10792.tar.bz2) = 4603469 --- files/patch-src__SHAHashSet.cpp.orig 1970-01-01 01:00:00.000000000 +0100 +++ files/patch-src__SHAHashSet.cpp 2012-10-13 12:30:55.000000000 +0200 @@ -0,0 +1,12 @@ +--- src/SHAHashSet.cpp.orig 2012-05-11 20:38:43.000000000 +0200 ++++ src/SHAHashSet.cpp 2012-10-13 12:29:25.000000000 +0200 +@@ -702,7 +702,8 @@ + return false; + } + +- FreeHashSet(); ++ //Backported from r10793 ++ //FreeHashSet(); + return true; + } + --- files/patch-src__ThreadTasks.cpp.orig 1970-01-01 01:00:00.000000000 +0100 +++ files/patch-src__ThreadTasks.cpp 2012-10-13 12:33:28.000000000 +0200 @@ -0,0 +1,12 @@ +--- src/ThreadTasks.cpp.orig 2011-11-20 19:08:59.000000000 +0100 ++++ src/ThreadTasks.cpp 2012-10-13 12:33:01.000000000 +0200 +@@ -193,6 +193,9 @@ + % m_filename ); + } + } ++ // Backported from r10793 ++ // delete hashset now to free memory ++ AICHHashSet->FreeHashSet(); + } + + if ((m_toHash == EH_AICH) && !TestDestroy()) { --- files/patch-src__PlatformSpecific.h.orig 1970-01-01 01:00:00.000000000 +0100 +++ files/patch-src__PlatformSpecific.h 2012-10-13 12:35:15.000000000 +0200 @@ -0,0 +1,11 @@ +--- src/PlatformSpecific.h.orig 2011-11-20 19:08:59.000000000 +0100 ++++ src/PlatformSpecific.h 2012-10-13 12:34:46.000000000 +0200 +@@ -100,6 +100,8 @@ + { + switch (GetFilesystemType(path)) { + case fsFAT: ++ // Backported from r10794 ++ case fsNTFS: + case fsHFS: + return false; + default: --- files/patch-src__ListenSocket.cpp.orig 1970-01-01 01:00:00.000000000 +0100 +++ files/patch-src__ListenSocket.cpp 2012-10-13 12:37:45.000000000 +0200 @@ -0,0 +1,23 @@ +--- src/ListenSocket.cpp.orig 2012-05-11 20:38:58.000000000 +0200 ++++ src/ListenSocket.cpp 2012-10-13 12:37:21.000000000 +0200 +@@ -88,7 +88,9 @@ + + void CListenSocket::OnAccept() + { +- m_pending = true; ++ // Backported from r10795 ++ //m_pending = true; ++ m_pending = theApp->IsRunning(); // just do nothing if we are shutting down + // If the client is still at maxconnections, + // this will allow it to go above it ... + // But if you don't, you will get a lowID on all servers. +@@ -103,7 +105,8 @@ + newclient->Safe_Delete(); + m_pending = false; + } else { +- wxASSERT(theApp->IsRunning()); ++ // Backported from r10795 ++ //wxASSERT(theApp->IsRunning()); + if (!newclient->InitNetworkData()) { + // IP or port were not returned correctly + // from the accepted address, or filtered. >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210132021.q9DKLWb2097214>