added one patch from sf.net tracker

(Portage version: 2.0.53_rc7)

5 files changed, 90 insertions, 14 deletions

diff --git a/net-analyzer/nepenthes/ChangeLog b/net-analyzer/nepenthes/ChangeLog
index aef66a264a36..b5bbc2aeead7 100644
--- a/net-analyzer/nepenthes/ChangeLog
+++ b/net-analyzer/nepenthes/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/nepenthes
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nepenthes/ChangeLog,v 1.3 2005/11/23 19:26:24 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nepenthes/ChangeLog,v 1.4 2005/11/24 13:12:00 kaiowas Exp $
+
+*nepenthes-0.1.3-r1 (24 Nov 2005)
+
+  24 Nov 2005; petre rodan <kaiowas@gentoo.org>
+  +files/nepenthes-0.1.3_logger_path.diff, -nepenthes-0.1.3.ebuild,
+  +nepenthes-0.1.3-r1.ebuild:
+  added one patch from sf.net tracker
 
 *nepenthes-0.1.3 (23 Nov 2005)
 
diff --git a/net-analyzer/nepenthes/Manifest b/net-analyzer/nepenthes/Manifest
index 3150ad503eef..455dfc37ac50 100644
--- a/net-analyzer/nepenthes/Manifest
+++ b/net-analyzer/nepenthes/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 8c81f86e8ce6a531e35c174b060e3364 ChangeLog 685
 MD5 efe8deb0307daa08f8956fe1f29a61bd files/digest-nepenthes-0.1.2 68
-MD5 e70d90d840e9b0cf5a13a1d89579a12a files/digest-nepenthes-0.1.3 67
+MD5 e70d90d840e9b0cf5a13a1d89579a12a files/digest-nepenthes-0.1.3-r1 67
+MD5 36de348442276c89753ddb1e44349744 files/nepenthes-0.1.3_logger_path.diff 1593
 MD5 9f779f5117afae2b26f1e4fbff55ff4b files/nepenthes.confd 123
 MD5 1c20696c1b6d548688b9a9db60ad74c8 files/nepenthes.initd 538
 MD5 121e52302b508d741d68a51265135609 metadata.xml 387
 MD5 c40f13ca3d1b386950410d60c26d8363 nepenthes-0.1.2.ebuild 1801
-MD5 588f3cd52dfb711649a8952eb2f6c1e4 nepenthes-0.1.3.ebuild 2179
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFDhLT/GSBEIeh4AEYRAllxAJ4wUIABpWhvuxHZjNSlJOcJZkkNQwCgiKAH
-P6WR+ic4/EYc59D87q9Risc=
-=BdxF
------END PGP SIGNATURE-----
+MD5 f01475176281586270c1bcd33b900940 nepenthes-0.1.3-r1.ebuild 2240
diff --git a/net-analyzer/nepenthes/files/digest-nepenthes-0.1.3 b/net-analyzer/nepenthes/files/digest-nepenthes-0.1.3-r1
index 981e53015270..981e53015270 100644
--- a/net-analyzer/nepenthes/files/digest-nepenthes-0.1.3
+++ b/net-analyzer/nepenthes/files/digest-nepenthes-0.1.3-r1
diff --git a/net-analyzer/nepenthes/files/nepenthes-0.1.3_logger_path.diff b/net-analyzer/nepenthes/files/nepenthes-0.1.3_logger_path.diff
new file mode 100644
index 000000000000..6a5388016743
--- /dev/null
+++ b/net-analyzer/nepenthes/files/nepenthes-0.1.3_logger_path.diff
@@ -0,0 +1,76 @@
+Index: nepenthes-core/include/FileLogger.hpp
+===================================================================
+--- nepenthes-core/include/FileLogger.hpp	(Revision 2145)
++++ nepenthes-core/include/FileLogger.hpp	(Arbeitskopie)
+@@ -47,7 +47,7 @@
+ 		virtual void	setLogFile(const char *filename);
+ 
+ 	private:
+-		const char		*m_Filename;
++		char		*m_Filename;
+ 	};
+ 
+ }
+Index: nepenthes-core/src/FileLogger.cpp
+===================================================================
+--- nepenthes-core/src/FileLogger.cpp	(Revision 2145)
++++ nepenthes-core/src/FileLogger.cpp	(Arbeitskopie)
+@@ -51,12 +51,18 @@
+ 
+ FileLogger::~FileLogger()
+ {
++	if( m_Filename != NULL)
++		free(m_Filename);
++	
+ }
+ 
+ 
+ void FileLogger::setLogFile(const char *filename)
+ {
+-	m_Filename = filename;
++	if( m_Filename != NULL)
++		free(m_Filename);
++
++	m_Filename = strdup(filename);
+ }
+ 
+ 
+Index: nepenthes-core/src/RingFileLogger.cpp
+===================================================================
+--- nepenthes-core/src/RingFileLogger.cpp	(Revision 2145)
++++ nepenthes-core/src/RingFileLogger.cpp	(Arbeitskopie)
+@@ -57,14 +57,31 @@
+ 
+ RingFileLogger::~RingFileLogger()
+ {
+-	free(m_FirstFile);
++	if (m_FileFormat != NULL)
++	{
++		free(m_FileFormat);
++	}
++
++	if (m_FirstFile != NULL)
++	{
++    	free(m_FirstFile);
++	}
+ }
+ 
+ 
+ void RingFileLogger::setLogFileFormat(char *fmt)
+ {
+-	m_FileFormat = fmt;
+-	free(m_FirstFile);
++	if (m_FileFormat != NULL)
++	{
++		free(m_FileFormat);
++	}
++	m_FileFormat = strdup(fmt);
++
++
++	if (m_FirstFile != NULL)
++	{
++		free(m_FirstFile);
++	}
+ 	asprintf(&m_FirstFile, m_FileFormat, 0);
+ }
+ 
diff --git a/net-analyzer/nepenthes/nepenthes-0.1.3.ebuild b/net-analyzer/nepenthes/nepenthes-0.1.3-r1.ebuild
index 257da781f96c..fff52fdd5847 100644
--- a/net-analyzer/nepenthes/nepenthes-0.1.3.ebuild
+++ b/net-analyzer/nepenthes/nepenthes-0.1.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nepenthes/nepenthes-0.1.3.ebuild,v 1.1 2005/11/23 19:26:24 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nepenthes/nepenthes-0.1.3-r1.ebuild,v 1.1 2005/11/24 13:12:00 kaiowas Exp $
 
 inherit eutils
 
@@ -35,6 +35,8 @@ src_compile() {
 #		--with-postgre-lib=/usr/$(get_libdir) --with-postgre-include=/usr/include" \
 #		|| myconf="$myconf --without-postgre"
 
+	epatch ${FILESDIR}/nepenthes-0.1.3_logger_path.diff || die
+
 	econf ${myconf} || die
 	emake || die "make failed"
 }