added patch from sourceforge tracker #1479288

Package-Manager: portage-2.1_pre10-r2

7 files changed, 197 insertions, 16 deletions

diff --git a/net-analyzer/nepenthes/ChangeLog b/net-analyzer/nepenthes/ChangeLog
index 09c1c1ed6648..e3d3fa36fef8 100644
--- a/net-analyzer/nepenthes/ChangeLog
+++ b/net-analyzer/nepenthes/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/nepenthes
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nepenthes/ChangeLog,v 1.11 2006/04/26 18:44:15 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nepenthes/ChangeLog,v 1.12 2006/05/03 10:51:27 kaiowas Exp $
+
+*nepenthes-0.1.7-r1 (03 May 2006)
+
+  03 May 2006; petre rodan <kaiowas@gentoo.org>
+  +files/mydoom_bagle_endless_loop.patch, +nepenthes-0.1.7-r1.ebuild:
+  added patch from sourceforge tracker #1479288
 
   26 Apr 2006; Jon Hood <squinky86@gentoo.org> nepenthes-0.1.7.ebuild:
   Add ~amd64, #131064.
diff --git a/net-analyzer/nepenthes/Manifest b/net-analyzer/nepenthes/Manifest
index fe212471f061..c6d646666d87 100644
--- a/net-analyzer/nepenthes/Manifest
+++ b/net-analyzer/nepenthes/Manifest
@@ -1,30 +1,61 @@
-MD5 9812c9f404c6978bf94837152546f72d ChangeLog 2055
-RMD160 3c482fbf80a5bb1ca790183bf05aea085e982e2e ChangeLog 2055
-SHA256 2e181b503acbea0865d889b26e3efbd439cdca6f0db79708893fe74aa7676c74 ChangeLog 2055
-MD5 cbec0db31276274f6101a9ab9cc625b3 files/digest-nepenthes-0.1.5 68
-RMD160 54b09b9f4ae70f27a53d8586a97b70247766288f files/digest-nepenthes-0.1.5 68
-SHA256 916fd8d7e4c9766e279532f3cb17dfd7734d516b29d5d86dcd95a8d23578a20f files/digest-nepenthes-0.1.5 68
-MD5 a3518804809a33a52a1511ddcfafda88 files/digest-nepenthes-0.1.6 68
-RMD160 e96b34d9ad6133d9d8efd7b17c8460ca8c338df2 files/digest-nepenthes-0.1.6 68
-SHA256 c2d69e62b45b8c60225597ab04af8c64d655815148fc69e301cb6b8316cc133d files/digest-nepenthes-0.1.6 68
-MD5 196692f763e0863e752c781cc108f6ce files/digest-nepenthes-0.1.7 250
-RMD160 4ef046f112154cb1c38921829168d9861379c3c2 files/digest-nepenthes-0.1.7 250
-SHA256 9a201f7023855e67ad809f3273214a91c1d69e1907c73cc6e53f89624b2f49b9 files/digest-nepenthes-0.1.7 250
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX mydoom_bagle_endless_loop.patch 1889 RMD160 73a59c2e20b7c7e264fe2c93497dccaa1d5b6ffc SHA1 f5fc19dc725d66720dad0423d6ac77076d2428d2 SHA256 7b8274e9b4983045e3d22e7e1df2d54aa2bb9fa4f5e54011ae31f7700c46cbe7 size 1889
+MD5 7e9a89e4c5486d3b04b4cea4e66d7ca8 files/mydoom_bagle_endless_loop.patch 1889
+RMD160 73a59c2e20b7c7e264fe2c93497dccaa1d5b6ffc files/mydoom_bagle_endless_loop.patch 1889
+SHA256 7b8274e9b4983045e3d22e7e1df2d54aa2bb9fa4f5e54011ae31f7700c46cbe7 files/mydoom_bagle_endless_loop.patch 1889
+AUX nepenthes.confd 123 RMD160 cf0d9d018fddd90a432bcb4be845fb48cd5fd087 SHA1 ced059f312cd571f2c4d1664c51544593f85d436 SHA256 cbad703767de5e5832789dd15c32ee79fc63b188c195f86e481edac1d9fb5ddb size 123
 MD5 9f779f5117afae2b26f1e4fbff55ff4b files/nepenthes.confd 123
 RMD160 cf0d9d018fddd90a432bcb4be845fb48cd5fd087 files/nepenthes.confd 123
 SHA256 cbad703767de5e5832789dd15c32ee79fc63b188c195f86e481edac1d9fb5ddb files/nepenthes.confd 123
+AUX nepenthes.initd 538 RMD160 337ecc7d8c9dafab1d6c99af1eeb30a2ef2b0133 SHA1 d36d26438ac4d690ce39be7642acfcf3e3738a73 SHA256 8f0c79f9b261f59aa203d5cae3d73856ab1173fcc7f58c98b01fe9c2c864f744 size 538
 MD5 1c20696c1b6d548688b9a9db60ad74c8 files/nepenthes.initd 538
 RMD160 337ecc7d8c9dafab1d6c99af1eeb30a2ef2b0133 files/nepenthes.initd 538
 SHA256 8f0c79f9b261f59aa203d5cae3d73856ab1173fcc7f58c98b01fe9c2c864f744 files/nepenthes.initd 538
-MD5 121e52302b508d741d68a51265135609 metadata.xml 387
-RMD160 838140d846c70051e0548a0f5a19fc590f12352c metadata.xml 387
-SHA256 b3101281ad9a0f6eb49604776442e8ecdef1cd2ec6aa192b19b1935a4f701eed metadata.xml 387
+DIST nepenthes-0.1.5.tar.bz2 468625 RMD160 83fa6be373f4b8b0cfd0b540934ca02ed857e83c SHA256 f9ed63460a2f24cebde56ff3788c76e5f1449abcc5ef2073aed412b0ec81d085 size 468625
+DIST nepenthes-0.1.6.tar.bz2 479685 RMD160 603a531672c457ec7c6b605dad54bad81ef32384 SHA256 da0f5f6c6d6e0059ab75222cfee7077b22d4638a59731329b7ee3b035dfa82b8 size 479685
+DIST nepenthes-0.1.7.tar.bz2 514301 RMD160 1a93ad75940990f1b38bba8326dce341441acec5 SHA256 62f683616636ec09e170d81d15203e1d17c3fba5ba313e76d4c5251116f76168 size 514301
+EBUILD nepenthes-0.1.5.ebuild 2178 RMD160 5c31e49180497c0d6c7adf2447b3506d748cbfd0 SHA1 db800b113ef9482892d975cd4db1ed334aef3428 SHA256 c721ae029c36df28d236acb5ad1ce7dcd7154ba26df2ebfbef0d7599c3d4725b size 2178
 MD5 2981cd0aba9503f8e53e7a02025a3784 nepenthes-0.1.5.ebuild 2178
 RMD160 5c31e49180497c0d6c7adf2447b3506d748cbfd0 nepenthes-0.1.5.ebuild 2178
 SHA256 c721ae029c36df28d236acb5ad1ce7dcd7154ba26df2ebfbef0d7599c3d4725b nepenthes-0.1.5.ebuild 2178
+EBUILD nepenthes-0.1.6.ebuild 2183 RMD160 8038c47ac461856566a60577ee4d5b932e365d1c SHA1 9642bc858fe196729b9d497f2810c05e3aef0cc1 SHA256 390b735216eaf80d1ff7d89e8bb4adba4f5ac2ae2549b4556e39f36b689cc9a7 size 2183
 MD5 51c5ad6327d9c42913f7f8cdacf07a78 nepenthes-0.1.6.ebuild 2183
 RMD160 8038c47ac461856566a60577ee4d5b932e365d1c nepenthes-0.1.6.ebuild 2183
 SHA256 390b735216eaf80d1ff7d89e8bb4adba4f5ac2ae2549b4556e39f36b689cc9a7 nepenthes-0.1.6.ebuild 2183
+EBUILD nepenthes-0.1.7-r1.ebuild 2405 RMD160 65a8dc7ee98b40bd83e6c0761d0d7735d5347e59 SHA1 ab4eda70952b1d52fc7f2b1b2fbd8ed44bc99c4b SHA256 d961af226d4b6fb671abcd2c7032db1f8a54f534152cefa4ad350a7bb4657cc6 size 2405
+MD5 8e278bd9772a660a418b532645495fb6 nepenthes-0.1.7-r1.ebuild 2405
+RMD160 65a8dc7ee98b40bd83e6c0761d0d7735d5347e59 nepenthes-0.1.7-r1.ebuild 2405
+SHA256 d961af226d4b6fb671abcd2c7032db1f8a54f534152cefa4ad350a7bb4657cc6 nepenthes-0.1.7-r1.ebuild 2405
+EBUILD nepenthes-0.1.7.ebuild 1967 RMD160 0c3a38a9ca949201d324d0746a116693e635c97f SHA1 24aa3c1a0d4ced5e8f083ff4c0a9b2796671e40b SHA256 c464f213fe47eac9b0fb1337f678138568f4d48cc2078cca08caffd23762d7d6 size 1967
 MD5 04bede0254d12c63e7cf0b625b6fdec6 nepenthes-0.1.7.ebuild 1967
 RMD160 0c3a38a9ca949201d324d0746a116693e635c97f nepenthes-0.1.7.ebuild 1967
 SHA256 c464f213fe47eac9b0fb1337f678138568f4d48cc2078cca08caffd23762d7d6 nepenthes-0.1.7.ebuild 1967
+MISC ChangeLog 2255 RMD160 abfb5913062037969cab22ce19b422d5a213d14b SHA1 49d3463f61c7997206e6d682d77a3d4ccd11a830 SHA256 5fec5ec696a59ba33bdadab19fe2536339ee4d2e82c1cb9c1b7a7616d8e9882c size 2255
+MD5 c6643b4d065715d355b359bfcf1b10b3 ChangeLog 2255
+RMD160 abfb5913062037969cab22ce19b422d5a213d14b ChangeLog 2255
+SHA256 5fec5ec696a59ba33bdadab19fe2536339ee4d2e82c1cb9c1b7a7616d8e9882c ChangeLog 2255
+MISC metadata.xml 387 RMD160 838140d846c70051e0548a0f5a19fc590f12352c SHA1 1a76f5b93394f6511f9854bcc6f3ae7ccfc5e6c2 SHA256 b3101281ad9a0f6eb49604776442e8ecdef1cd2ec6aa192b19b1935a4f701eed size 387
+MD5 121e52302b508d741d68a51265135609 metadata.xml 387
+RMD160 838140d846c70051e0548a0f5a19fc590f12352c metadata.xml 387
+SHA256 b3101281ad9a0f6eb49604776442e8ecdef1cd2ec6aa192b19b1935a4f701eed metadata.xml 387
+MD5 fefc6ba21ac289c1355a7aca4cde759c files/digest-nepenthes-0.1.5 250
+RMD160 a9c9fa3ae3b3f570d931920a39ea4af37e03eaa0 files/digest-nepenthes-0.1.5 250
+SHA256 646fa74266030f805efb8b0a9e91f15dad622231f33b01a3de6cfb5f1b36947c files/digest-nepenthes-0.1.5 250
+MD5 52f2eaba4b9cdb078a9a2d88b3bd9331 files/digest-nepenthes-0.1.6 250
+RMD160 ac8e3b840837d87b76bc70c765e158b8fbf1e293 files/digest-nepenthes-0.1.6 250
+SHA256 9e7c29c4902f1fc4bb0fd2b08120d29c1d5df0b151acc49428033f6f16692d22 files/digest-nepenthes-0.1.6 250
+MD5 196692f763e0863e752c781cc108f6ce files/digest-nepenthes-0.1.7 250
+RMD160 4ef046f112154cb1c38921829168d9861379c3c2 files/digest-nepenthes-0.1.7 250
+SHA256 9a201f7023855e67ad809f3273214a91c1d69e1907c73cc6e53f89624b2f49b9 files/digest-nepenthes-0.1.7 250
+MD5 196692f763e0863e752c781cc108f6ce files/digest-nepenthes-0.1.7-r1 250
+RMD160 4ef046f112154cb1c38921829168d9861379c3c2 files/digest-nepenthes-0.1.7-r1 250
+SHA256 9a201f7023855e67ad809f3273214a91c1d69e1907c73cc6e53f89624b2f49b9 files/digest-nepenthes-0.1.7-r1 250
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFEWJsxGSBEIeh4AEYRAj5jAJwOmd2W/siz5oK3uYX8TjZf9g1bYACdEtkT
+8+XB/nO4bpjSeR/mEcFHCuw=
+=YnzP
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/nepenthes/files/digest-nepenthes-0.1.5 b/net-analyzer/nepenthes/files/digest-nepenthes-0.1.5
index 40b83b3c0668..8a8581e0ddae 100644
--- a/net-analyzer/nepenthes/files/digest-nepenthes-0.1.5
+++ b/net-analyzer/nepenthes/files/digest-nepenthes-0.1.5
@@ -1 +1,3 @@
 MD5 3279378a2f3f5a2eace79bf2774aab85 nepenthes-0.1.5.tar.bz2 468625
+RMD160 83fa6be373f4b8b0cfd0b540934ca02ed857e83c nepenthes-0.1.5.tar.bz2 468625
+SHA256 f9ed63460a2f24cebde56ff3788c76e5f1449abcc5ef2073aed412b0ec81d085 nepenthes-0.1.5.tar.bz2 468625
diff --git a/net-analyzer/nepenthes/files/digest-nepenthes-0.1.6 b/net-analyzer/nepenthes/files/digest-nepenthes-0.1.6
index fac31a288ecb..6363ab5cfa3e 100644
--- a/net-analyzer/nepenthes/files/digest-nepenthes-0.1.6
+++ b/net-analyzer/nepenthes/files/digest-nepenthes-0.1.6
@@ -1 +1,3 @@
 MD5 053b5dd99f027d16aa1c5fd9ad0b4319 nepenthes-0.1.6.tar.bz2 479685
+RMD160 603a531672c457ec7c6b605dad54bad81ef32384 nepenthes-0.1.6.tar.bz2 479685
+SHA256 da0f5f6c6d6e0059ab75222cfee7077b22d4638a59731329b7ee3b035dfa82b8 nepenthes-0.1.6.tar.bz2 479685
diff --git a/net-analyzer/nepenthes/files/digest-nepenthes-0.1.7-r1 b/net-analyzer/nepenthes/files/digest-nepenthes-0.1.7-r1
new file mode 100644
index 000000000000..c0d1bc1c8dd2
--- /dev/null
+++ b/net-analyzer/nepenthes/files/digest-nepenthes-0.1.7-r1
@@ -0,0 +1,3 @@
+MD5 7eb9fa1e3f819d5aa3c9ac81a572a724 nepenthes-0.1.7.tar.bz2 514301
+RMD160 1a93ad75940990f1b38bba8326dce341441acec5 nepenthes-0.1.7.tar.bz2 514301
+SHA256 62f683616636ec09e170d81d15203e1d17c3fba5ba313e76d4c5251116f76168 nepenthes-0.1.7.tar.bz2 514301
diff --git a/net-analyzer/nepenthes/files/mydoom_bagle_endless_loop.patch b/net-analyzer/nepenthes/files/mydoom_bagle_endless_loop.patch
new file mode 100644
index 000000000000..7659615afa27
--- /dev/null
+++ b/net-analyzer/nepenthes/files/mydoom_bagle_endless_loop.patch
@@ -0,0 +1,58 @@
+Index: modules/vuln-mydoom/MydoomDialogue.cpp
+===================================================================
+--- modules/vuln-mydoom/MydoomDialogue.cpp	(Revision 515)
++++ modules/vuln-mydoom/MydoomDialogue.cpp	(Arbeitskopie)
+@@ -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;
+ }
+Index: modules/vuln-bagle/BagleDialogue.cpp
+===================================================================
+--- modules/vuln-bagle/BagleDialogue.cpp	(Revision 515)
++++ modules/vuln-bagle/BagleDialogue.cpp	(Arbeitskopie)
+@@ -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 --git a/net-analyzer/nepenthes/nepenthes-0.1.7-r1.ebuild b/net-analyzer/nepenthes/nepenthes-0.1.7-r1.ebuild
new file mode 100644
index 000000000000..5b23e296a5fc
--- /dev/null
+++ b/net-analyzer/nepenthes/nepenthes-0.1.7-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nepenthes/nepenthes-0.1.7-r1.ebuild,v 1.1 2006/05/03 10:51:27 kaiowas Exp $
+
+inherit eutils
+
+DESCRIPTION="Nepenthes is a low interaction honeypot that captures worms by emulating known vulnerabilities"
+HOMEPAGE="http://nepenthes.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="selinux"
+
+DEPEND="net-misc/curl
+	sys-apps/file
+	dev-libs/libpcre
+	net-libs/adns"
+
+RDEPEND=""
+#RDEPEND=" selinux? ( sec-policy/selinux-nepenthes )"
+
+pkg_setup() {
+	enewgroup nepenthes
+	enewuser nepenthes -1 -1 /dev/null nepenthes
+}
+
+src_compile() {
+	local myconf="--sysconfdir=/etc --localstatedir=/var/lib/nepenthes --enable-capabilities"
+#	use mysql && myconf="$myconf --with-mysql \
+#		--with-mysql-lib=/usr/$(get_libdir)/mysql --with-mysql-include=/usr/include/mysql" \
+#		|| myconf="$myconf --without-mysql"
+#	use postgres && myconf="$myconf --with-postgre \
+#		--with-postgre-lib=/usr/$(get_libdir) --with-postgre-include=/usr/include" \
+#		|| myconf="$myconf --without-postgre"
+
+	# patch from sourceforge tracker #1479288
+	epatch ${FILESDIR}/mydoom_bagle_endless_loop.patch || die
+
+	econf ${myconf} || die
+	sed -i 's|var/cache|/var/lib/cache|' ${S}/modules/shellcode-signatures/shellcode-signatures.cpp
+	emake || die "make failed"
+}
+
+src_install() {
+
+	einstall || die "make install failed"
+
+	for i in ${D}/etc/nepenthes/*; do
+		sed -i \
+			-e 's|"var/binaries|"/var/lib/nepenthes/binaries|' \
+			-e 's|"var/hexdumps|"/var/lib/nepenthes/hexdumps|' \
+			-e 's|"var/cache/nepenthes|"/var/lib/nepenthes/cache|' \
+			-e 's|"var/log|"/var/log/nepenthes|' \
+			-e 's|"lib/nepenthes|"/usr/lib/nepenthes|' \
+			-e 's|"etc|"/etc|' $i
+	done
+
+	dodoc doc/README doc/README.VFS AUTHORS
+	dosbin nepenthes-core/src/nepenthes || die "dosbin failed"
+	rm ${D}/usr/bin/nepenthes
+	rm ${D}/usr/share/doc/README
+	rm ${D}/usr/share/doc/README.VFS
+	rm ${D}/usr/share/doc/logo-shaded.svg
+
+	newinitd ${FILESDIR}/${PN}.initd ${PN}
+	newconfd ${FILESDIR}/${PN}.confd ${PN}
+
+	diropts -m 755 -o nepenthes -g nepenthes
+	keepdir /var/log/nepenthes
+	keepdir /var/lib/nepenthes
+	keepdir /var/lib/nepenthes/binaries
+	keepdir /var/lib/nepenthes/hexdumps
+	keepdir /var/lib/nepenthes/cache
+	keepdir /var/lib/nepenthes/cache/geolocation
+
+}
+