A couple of fixes from upstream:
Fix memory leak when AICH hashing already known files (upstream git commit 9e62350fae9f24de64987a0cb002fdc15b5fa9af) Like FAT, NTFS doesn't like special characters either (upstream git commit 41113ecf15019301afea6cb35d9c35a7b8a0bdd1)
This commit is contained in:
parent
6d3535362a
commit
393a10fbcf
@ -1,4 +1,4 @@
|
|||||||
# $OpenBSD: Makefile,v 1.35 2012/06/05 08:42:31 dcoppa Exp $
|
# $OpenBSD: Makefile,v 1.36 2012/10/25 07:59:45 dcoppa Exp $
|
||||||
|
|
||||||
COMMENT-main = another eDonkey P2P file sharing client
|
COMMENT-main = another eDonkey P2P file sharing client
|
||||||
COMMENT-web = webserver interface to amuled
|
COMMENT-web = webserver interface to amuled
|
||||||
@ -6,7 +6,7 @@ COMMENT-daemon =stand-alone daemon/cmdline for amule
|
|||||||
|
|
||||||
V = 2.3.1
|
V = 2.3.1
|
||||||
DISTNAME = aMule-$V
|
DISTNAME = aMule-$V
|
||||||
REVISION = 8
|
REVISION = 9
|
||||||
CATEGORIES = net
|
CATEGORIES = net
|
||||||
|
|
||||||
HOMEPAGE = http://www.amule.org/
|
HOMEPAGE = http://www.amule.org/
|
||||||
|
15
net/amule/patches/patch-src_PlatformSpecific_h
Normal file
15
net/amule/patches/patch-src_PlatformSpecific_h
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
$OpenBSD: patch-src_PlatformSpecific_h,v 1.1 2012/10/25 07:59:45 dcoppa Exp $
|
||||||
|
|
||||||
|
Like FAT, NTFS doesn't like special characters either
|
||||||
|
(upstream git commit 41113ecf15019301afea6cb35d9c35a7b8a0bdd1)
|
||||||
|
|
||||||
|
--- src/PlatformSpecific.h.orig Thu Oct 25 11:09:56 2012
|
||||||
|
+++ src/PlatformSpecific.h Thu Oct 25 11:10:54 2012
|
||||||
|
@@ -100,6 +100,7 @@ inline bool CanFSHandleSpecialChars(const CPath& path)
|
||||||
|
{
|
||||||
|
switch (GetFilesystemType(path)) {
|
||||||
|
case fsFAT:
|
||||||
|
+ case fsNTFS:
|
||||||
|
case fsHFS:
|
||||||
|
return false;
|
||||||
|
default:
|
23
net/amule/patches/patch-src_SHAHashSet_cpp
Normal file
23
net/amule/patches/patch-src_SHAHashSet_cpp
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
$OpenBSD: patch-src_SHAHashSet_cpp,v 1.1 2012/10/25 07:59:45 dcoppa Exp $
|
||||||
|
|
||||||
|
Fix memory leak when AICH hashing already known files
|
||||||
|
(upstream git commit 9e62350fae9f24de64987a0cb002fdc15b5fa9af)
|
||||||
|
|
||||||
|
--- src/SHAHashSet.cpp.orig Thu Oct 25 11:20:28 2012
|
||||||
|
+++ src/SHAHashSet.cpp Thu Oct 25 11:21:07 2012
|
||||||
|
@@ -622,7 +622,6 @@ bool CAICHHashSet::ReadRecoveryData(uint64 nPartStartP
|
||||||
|
}
|
||||||
|
|
||||||
|
// this function is only allowed to be called right after successfully calculating the hashset (!)
|
||||||
|
-// will delete the hashset, after saving to free the memory
|
||||||
|
bool CAICHHashSet::SaveHashSet()
|
||||||
|
{
|
||||||
|
if (m_eStatus != AICH_HASHSETCOMPLETE) {
|
||||||
|
@@ -702,7 +701,6 @@ bool CAICHHashSet::SaveHashSet()
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
- FreeHashSet();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
16
net/amule/patches/patch-src_ThreadTasks_cpp
Normal file
16
net/amule/patches/patch-src_ThreadTasks_cpp
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
$OpenBSD: patch-src_ThreadTasks_cpp,v 1.1 2012/10/25 07:59:45 dcoppa Exp $
|
||||||
|
|
||||||
|
Fix memory leak when AICH hashing already known files
|
||||||
|
(upstream git commit 9e62350fae9f24de64987a0cb002fdc15b5fa9af)
|
||||||
|
|
||||||
|
--- src/ThreadTasks.cpp.orig Sat Aug 27 22:28:32 2011
|
||||||
|
+++ src/ThreadTasks.cpp Thu Oct 25 11:09:25 2012
|
||||||
|
@@ -189,6 +189,8 @@ void CHashingTask::Entry()
|
||||||
|
CFormat(wxT("Warning, failed to save AICH hashset for file: %s"))
|
||||||
|
% m_filename );
|
||||||
|
}
|
||||||
|
+ // delete hashset now to free memory
|
||||||
|
+ AICHHashSet->FreeHashSet();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user