5 files changed, 84 insertions, 18 deletions
diff --git a/net-analyzer/honeyd/ChangeLog b/net-analyzer/honeyd/ChangeLog
index 1101d5f43163..3dad7d590de2 100644
--- a/net-analyzer/honeyd/ChangeLog
+++ b/net-analyzer/honeyd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/honeyd
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/honeyd/ChangeLog,v 1.18 2005/05/29 02:34:02 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/honeyd/ChangeLog,v 1.19 2005/06/30 14:45:51 ka0ttic Exp $
+
+*honeyd-1.0-r1 (30 Jun 2005)
+
+  30 Jun 2005; Aaron Walker <ka0ttic@gentoo.org> files/honeyd.initd,
+  +honeyd-1.0-r1.ebuild:
+  Revision bump; fixed init script so that the webserver will start, bug 89348.
 
   29 May 2005; Aaron Walker <ka0ttic@gentoo.org>
   +files/honeyd-1.0-gcc4.diff, honeyd-1.0.ebuild:
diff --git a/net-analyzer/honeyd/Manifest b/net-analyzer/honeyd/Manifest
index ea8f1a46485f..7d8de21cf5d3 100644
--- a/net-analyzer/honeyd/Manifest
+++ b/net-analyzer/honeyd/Manifest
@@ -1,19 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 f14a4d480a0e027ac820f59f90c529a0 honeyd-0.8.ebuild 1954
-MD5 96ca2c83a4d5e0cb6fa60329c92783af ChangeLog 2835
+MD5 f4c1d13cc545b81ee8e06842eaa46500 honeyd-1.0-r1.ebuild 1871
+MD5 4b018aa4182f011595165707dd7b9f94 ChangeLog 3040
 MD5 fef2fd2afe9a195bdc62e5628a5fd501 metadata.xml 259
 MD5 f4c1d13cc545b81ee8e06842eaa46500 honeyd-1.0.ebuild 1871
+MD5 857b8d8953a80aae5035664b1bc984a7 files/digest-honeyd-1.0-r1 129
 MD5 0f51773734c0ac0e902fc0eea15f9647 files/honeyd-1.0-gcc4.diff 674
 MD5 05aa030ef5d390514cee9da3fa910690 files/honeyd.confd 429
-MD5 1f9cce4545bcf9f1e0b47486617da5a0 files/honeyd.initd 1459
+MD5 aa486f7becbf9784687e237039efdc1d files/honeyd.initd 1464
 MD5 96be4ce17e233507825dbc39127ee9f3 files/digest-honeyd-0.8 129
 MD5 857b8d8953a80aae5035664b1bc984a7 files/digest-honeyd-1.0 129
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCmSovEZCkKN40op4RAopJAJ9kvM8cSFOxJaUXVhN9GrfthPlQwACgnHCp
-mFDzL0x1XrNsNZgE5JHTtQ0=
-=Yeak
------END PGP SIGNATURE-----
diff --git a/net-analyzer/honeyd/files/digest-honeyd-1.0-r1 b/net-analyzer/honeyd/files/digest-honeyd-1.0-r1
new file mode 100644
index 000000000000..89ed92d4411b
--- /dev/null
+++ b/net-analyzer/honeyd/files/digest-honeyd-1.0-r1
@@ -0,0 +1,2 @@
+MD5 5c5c6cc62d135075d021a6c1bc5c9a5b honeyd-1.0.tar.gz 600339
+MD5 98f56c64ca76f52de42c5a0342cdd009 honeyd-0.7a-beta2.tgz 2027537
diff --git a/net-analyzer/honeyd/files/honeyd.initd b/net-analyzer/honeyd/files/honeyd.initd
index a0b1fa573711..97d21c43c957 100644
--- a/net-analyzer/honeyd/files/honeyd.initd
+++ b/net-analyzer/honeyd/files/honeyd.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/honeyd/files/honeyd.initd,v 1.1 2005/01/21 22:13:24 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/honeyd/files/honeyd.initd,v 1.2 2005/06/30 14:45:51 ka0ttic Exp $
 
 depend() {
 	need net
@@ -30,17 +30,18 @@ start() {
 	fi
 
 	# supports webserver feature?
-	if [[ "$(/usr/sbin/honeyd --help 2>1 | grep webserver)" != "" ]] ; then
+	if [[ "$(/usr/sbin/honeyd --help 2>&1 | grep webserver)" != "" ]] ; then
 		# run webserver?
-		if [[ ${HONEY_HTTPD} -eq 1 ]] ; then
-			options="${options} --webserver-port ${HONEY_HTTPD_PORT} \
-				--webserver-root ${HONEY_HTTPD_ROOT} --fix-webserver-permissions"
+		if [[ ${HONEYD_HTTPD} -eq 1 ]] ; then
+			options="${options} --webserver-port ${HONEYD_HTTPD_PORT} \
+				--webserver-root ${HONEYD_HTTPD_ROOT} --fix-webserver-permissions"
 		else
 			options="${options} --disable-webserver"
 		fi
 	fi
 
 	options="${options} -i ${HONEYD_IF:-lo} ${HONEYD_OPTS}"
+
     start-stop-daemon --start --quiet --exec /usr/sbin/honeyd \
 		-- ${options} ${HONEYD_NET} >/dev/null 2>&1
     eend $?
diff --git a/net-analyzer/honeyd/honeyd-1.0-r1.ebuild b/net-analyzer/honeyd/honeyd-1.0-r1.ebuild
new file mode 100644
index 000000000000..b330d64bd3eb
--- /dev/null
+++ b/net-analyzer/honeyd/honeyd-1.0-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/honeyd/honeyd-1.0-r1.ebuild,v 1.1 2005/06/30 14:45:51 ka0ttic Exp $
+
+inherit eutils
+
+DESCRIPTION="Honeyd is a small daemon that creates virtual hosts on a network"
+HOMEPAGE="http://www.citi.umich.edu/u/provos/honeyd/"
+SRC_URI="http://www.citi.umich.edu/u/provos/honeyd/${P}.tar.gz
+	http://www.tracking-hackers.com/solutions/honeyd/honeyd-0.7a-beta2.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ~sparc ~ppc"
+IUSE="doc"
+
+DEPEND=">=dev-libs/libdnet-1.7
+	>=dev-libs/libevent-1.0
+	virtual/libpcap"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -i "s:^CFLAGS = -O2:CFLAGS = ${CFLAGS}:g" Makefile.in || die "sed failed"
+	epatch ${FILESDIR}/${P}-gcc4.diff
+}
+
+src_compile() {
+	econf --with-libdnet=/usr || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	dodoc README TODO
+	dosbin honeyd || die "dosbin failed"
+
+	einstall || die "make install failed"
+
+	rm ${D}/usr/bin/honeyd
+	rm ${D}/usr/share/honeyd/README
+
+	insinto /etc
+	newins config.sample honeyd.conf || die "failed to install honeyd.conf"
+
+	newinitd ${FILESDIR}/${PN}.initd ${PN} || die
+	newconfd ${FILESDIR}/${PN}.confd ${PN} || die
+
+	# This adds all the services and example configurations collected
+	# by Lance Spitzer
+
+	# Install the white-papers if 'doc' USE flags are specified
+	use doc && dodoc ${WORKDIR}/honeyd-0.7a-beta2/contrib/*
+
+	# Install the example configurations
+	cd ${WORKDIR}/honeyd-0.7a-beta2
+	dodoc honeyd.conf nmap.prints nmap.assoc pf.os xprobe2.conf
+	dodoc honeyd.conf.simple honeyd.conf.bloat nmap.prints.new
+	dodoc xprobe2.conf.new honeyd.conf.networks
+
+	# Install all the example scripts
+	cp -R scripts ${D}/usr/share/honeyd/
+	find ${D}/usr/share/honeyd/scripts \
+		-type f -name '*.sh' -o -name '*.pl' -exec chmod +x {} \;
+}
+