version bump

Package-Manager: portage-2.0.53_rc7

7 files changed, 92 insertions, 93 deletions

diff --git a/net-analyzer/nepenthes/ChangeLog b/net-analyzer/nepenthes/ChangeLog
index 95e900a9f688..aef66a264a36 100644
--- a/net-analyzer/nepenthes/ChangeLog
+++ b/net-analyzer/nepenthes/ChangeLog
@@ -1,6 +1,12 @@
 # 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.2 2005/09/14 13:46:54 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nepenthes/ChangeLog,v 1.3 2005/11/23 19:26:24 kaiowas Exp $
+
+*nepenthes-0.1.3 (23 Nov 2005)
+
+  23 Nov 2005; petre rodan <kaiowas@gentoo.org> -files/magic.patch,
+  -nepenthes-0.1.1.ebuild, +nepenthes-0.1.3.ebuild:
+  version bump
 
   14 Sep 2005; petre rodan <kaiowas@gentoo.org> +nepenthes-0.1.2.ebuild:
   version bump
diff --git a/net-analyzer/nepenthes/Manifest b/net-analyzer/nepenthes/Manifest
index 405385004690..3150ad503eef 100644
--- a/net-analyzer/nepenthes/Manifest
+++ b/net-analyzer/nepenthes/Manifest
@@ -1,19 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 121e52302b508d741d68a51265135609 metadata.xml 387
-MD5 23d1c961a078cc0b2be409b957490a3a ChangeLog 517
-MD5 5c937dbc7f597effd30fdba0983e668d nepenthes-0.1.1.ebuild 1947
-MD5 c40f13ca3d1b386950410d60c26d8363 nepenthes-0.1.2.ebuild 1801
-MD5 1f59aae5e0641b494e1ce286b9f2a341 files/digest-nepenthes-0.1.1 68
+MD5 8c81f86e8ce6a531e35c174b060e3364 ChangeLog 685
+MD5 efe8deb0307daa08f8956fe1f29a61bd files/digest-nepenthes-0.1.2 68
+MD5 e70d90d840e9b0cf5a13a1d89579a12a files/digest-nepenthes-0.1.3 67
 MD5 9f779f5117afae2b26f1e4fbff55ff4b files/nepenthes.confd 123
 MD5 1c20696c1b6d548688b9a9db60ad74c8 files/nepenthes.initd 538
-MD5 a8d80c4c2501a34c72e31e2a5315c014 files/magic.patch 694
-MD5 efe8deb0307daa08f8956fe1f29a61bd files/digest-nepenthes-0.1.2 68
+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)
 
-iD8DBQFDKFGyGSBEIeh4AEYRAqSoAJ4nIYVRK7S0Dw7y4+jhkbALJRyiOwCgjdxS
-4eAEZBzYs7Ga27iinjBg0Eo=
-=vXPP
+iD8DBQFDhLT/GSBEIeh4AEYRAllxAJ4wUIABpWhvuxHZjNSlJOcJZkkNQwCgiKAH
+P6WR+ic4/EYc59D87q9Risc=
+=BdxF
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nepenthes/files/digest-nepenthes-0.1.1 b/net-analyzer/nepenthes/files/digest-nepenthes-0.1.1
deleted file mode 100644
index 48435ff5ad9e..000000000000
--- a/net-analyzer/nepenthes/files/digest-nepenthes-0.1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bcbdc00daf0f304ba2f0df1d32f0d8d0 nepenthes-0.1.1.tar.bz2 431092
diff --git a/net-analyzer/nepenthes/files/digest-nepenthes-0.1.3 b/net-analyzer/nepenthes/files/digest-nepenthes-0.1.3
new file mode 100644
index 000000000000..981e53015270
--- /dev/null
+++ b/net-analyzer/nepenthes/files/digest-nepenthes-0.1.3
@@ -0,0 +1 @@
+MD5 19ea7bb0f300d89ead1f3ce35728e53e nepenthes-0.1.3.tar.gz 774548
diff --git a/net-analyzer/nepenthes/files/magic.patch b/net-analyzer/nepenthes/files/magic.patch
deleted file mode 100644
index 956d93cdf1e0..000000000000
--- a/net-analyzer/nepenthes/files/magic.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur nepenthes-0.1.1.orig/nepenthes-core/src/SubmitManager.cpp nepenthes-0.1.1/nepenthes-core/src/SubmitManager.cpp
---- nepenthes-0.1.1.orig/nepenthes-core/src/SubmitManager.cpp	2005-08-27 23:57:40.000000000 +0200
-+++ nepenthes-0.1.1/nepenthes-core/src/SubmitManager.cpp	2005-09-07 12:43:00.000000000 +0200
-@@ -170,7 +170,7 @@
- 	logInfo("File %s has type %s \n",down->getMD5Sum().c_str(),filetype);
- 	if ( filetype != NULL )
- 	{
--		if (strstr(filetype,"MS-DOS executable") == NULL && m_StrictFileType == true )
-+		if (strstr(filetype,"executable") == NULL && m_StrictFileType == true )
- 		{
- 			logWarn("dropping file %s as it is not executable\n",down->getMD5Sum().c_str());
- 			return;
diff --git a/net-analyzer/nepenthes/nepenthes-0.1.1.ebuild b/net-analyzer/nepenthes/nepenthes-0.1.1.ebuild
deleted file mode 100644
index 065f7f019f49..000000000000
--- a/net-analyzer/nepenthes/nepenthes-0.1.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# 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.1.ebuild,v 1.1 2005/09/09 20:27:25 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_unpack() {
-	unpack ${P}.tar.bz2
-
-	# patched as per sf tracker
-	epatch ${FILESDIR}/magic.patch || die
-
-	sed -i 's|var/log/nepenthes.log|/var/log/nepenthes/nepenthes.log|' "${S}/nepenthes-core/src/Nepenthes.cpp"
-	sed -i 's|var/log/hexdumps/|/var/lib/nepenthes/hexdumps/|' "${S}/nepenthes-core/src/Utilities.cpp"
-}
-
-src_compile() {
-	econf --sysconfdir=/etc/nepenthes --localstatedir=/var/lib/nepenthes || die
-	emake || die "make failed"
-}
-
-src_install() {
-	dodoc doc/README doc/README.VFS AUTHORS
-	dosbin nepenthes-core/src/nepenthes || die "dosbin failed"
-
-	make DESTDIR="${D}" install || die "make install failed"
-
-	for i in ${D}/etc/nepenthes/*; do
-		sed -i 's|"var/binaries|"/var/lib/nepenthes/binaries|;s|"var/log|"/var/log/nepenthes|;s|"lib/nepenthes|"/usr/lib/nepenthes|;s|"etc|"/etc/nepenthes|' $i
-	done
-
-	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} || die
-	newconfd ${FILESDIR}/${PN}.confd ${PN} || die
-
-	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
-
-}
-
diff --git a/net-analyzer/nepenthes/nepenthes-0.1.3.ebuild b/net-analyzer/nepenthes/nepenthes-0.1.3.ebuild
new file mode 100644
index 000000000000..257da781f96c
--- /dev/null
+++ b/net-analyzer/nepenthes/nepenthes-0.1.3.ebuild
@@ -0,0 +1,75 @@
+# 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 $
+
+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.gz"
+
+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"
+#	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"
+
+	econf ${myconf} || die
+	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
+
+}
+