ports/101321: Updated port: nepenthes 0.1.7 to 0.1.7_1

[Michael Josic]

>Number:         101321
>Category:       ports
>Synopsis:       Updated port: nepenthes 0.1.7 to 0.1.7_1
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Aug 03 15:00:33 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Michael Josic
>Release:        
>Organization:
>Environment:
>Description:
Added: Critical patches for modules MyDoom and Bagle
Changed: Maintainership (approved by ryo at aquahill.net via via e-mail)
>How-To-Repeat:

>Fix:
diff -ruN nepenthes.bak/Makefile nepenthes/Makefile
--- nepenthes.bak/Makefile	Fri May 12 17:31:31 2006
+++ nepenthes/Makefile	Thu Aug  3 16:10:10 2006
@@ -7,11 +7,12 @@
 
 PORTNAME=	nepenthes
 PORTVERSION=	0.1.7
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	nepenthes
 
-MAINTAINER=	ryo at aquahill.net
+MAINTAINER=	systemoperator at gmail.com
 COMMENT=	Determine the malware activity on a network
 
 LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl \
diff -ruN nepenthes.bak/files/patch-modules-vuln-bagle-BagleDialogue.cpp nepenthes/files/patch-modules-vuln-bagle-BagleDialogue.cpp
--- nepenthes.bak/files/patch-modules-vuln-bagle-BagleDialogue.cpp	Thu Jan  1 01:00:00 1970
+++ nepenthes/files/patch-modules-vuln-bagle-BagleDialogue.cpp	Sun May  7 16:33:48 2006
@@ -0,0 +1,27 @@
+--- modules/vuln-bagle/BagleDialogue.cpp.old	Sun May  7 16:07:25 2006
++++ modules/vuln-bagle/BagleDialogue.cpp	Sun May  7 16:08:14 2006
+@@ -158,6 +158,7 @@
+ 				m_State = BAGLE_BINARY;
+ 				m_Download = new Download(m_Socket->getRemoteHost(),"bagle://",m_Socket->getRemoteHost(),"bagle://foo/bar");
+ 				m_Download->getDownloadBuffer()->addData(msg->getMsg()+4,msg->getSize()-4);
++				return CL_ASSIGN_AND_DONE;
+ 			}
+ 		}
+ 		break;
+@@ -165,6 +166,7 @@
+ 	case BAGLE_BINARY:
+ 		// FIXME m_MaxFileSize
+ 		m_Download->getDownloadBuffer()->addData(msg->getMsg(),msg->getSize());
++		return CL_ASSIGN_AND_DONE;
+ 		break;
+ 
+ 	}
+@@ -232,8 +234,6 @@
+ 		if ( m_Download->getDownloadBuffer()->getSize() == m_FileSize )
+ 		{
+ 			g_Nepenthes->getSubmitMgr()->addSubmission(m_Download);
+-			// destructor will delete it
+-			return CL_ASSIGN_AND_DONE;
+ 		}
+ 	}
+ 	return CL_DROP;
diff -ruN nepenthes.bak/files/patch-modules-vuln-mydoom-MydoomDialogue.cpp nepenthes/files/patch-modules-vuln-mydoom-MydoomDialogue.cpp
--- nepenthes.bak/files/patch-modules-vuln-mydoom-MydoomDialogue.cpp	Thu Jan  1 01:00:00 1970
+++ nepenthes/files/patch-modules-vuln-mydoom-MydoomDialogue.cpp	Sun May  7 16:34:15 2006
@@ -0,0 +1,27 @@
+--- modules/vuln-mydoom/MydoomDialogue.cpp.old	Sun May  7 16:03:52 2006
++++ modules/vuln-mydoom/MydoomDialogue.cpp	Sun May  7 16:05:33 2006
+@@ -120,7 +120,7 @@
+ 				m_Download = new Download(msg->getRemoteHost(),"mydoom://foo/bar",msg->getRemoteHost(),"some triggerline");
+ 				m_Download->getDownloadBuffer()->addData((char *)m_Buffer->getData(),m_Buffer->getSize());
+ 				m_Buffer->clear();
+-				return CL_ASSIGN;
++				return CL_ASSIGN_AND_DONE;
+ 			}
+ 		}
+ 		if (m_Buffer->getSize() > 128 )
+@@ -130,6 +130,7 @@
+ 	case MYDOOM_FILETRANSFERR:
+ 		{
+ 			m_Download->getDownloadBuffer()->addData((char *)msg->getMsg(),msg->getSize());
++			return CL_ASSIGN_AND_DONE;
+ 		}
+ 		break;
+ 
+@@ -196,7 +197,6 @@
+ 	if (m_Download != NULL)
+ 	{
+     	g_Nepenthes->getSubmitMgr()->addSubmission(m_Download);
+-		return CL_ASSIGN_AND_DONE;
+ 	}
+ 	return CL_DROP;
+ }
>Release-Note:
>Audit-Trail:
>Unformatted: