Version bump; added init.d/conf.d scripts based on the ones written by Thomas Preissler in bug 30223.

(Portage version: 2.0.51-r14)

7 files changed, 166 insertions, 34 deletions

diff --git a/net-analyzer/honeyd/ChangeLog b/net-analyzer/honeyd/ChangeLog
index c6e8cfbf2f41..f5dd0c21e52c 100644
--- a/net-analyzer/honeyd/ChangeLog
+++ b/net-analyzer/honeyd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/honeyd
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/honeyd/ChangeLog,v 1.14 2004/08/03 11:59:25 dholm Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/honeyd/ChangeLog,v 1.15 2005/01/21 22:13:24 ka0ttic Exp $
+
+*honeyd-1.0 (21 Jan 2005)
+
+  21 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> +files/honeyd.confd,
+  +files/honeyd.initd, honeyd-0.8.ebuild, +honeyd-1.0.ebuild:
+  Version bump; added init.d/conf.d scripts based on the ones written by
+  Thomas Preissler in bug 30223.
 
   03 Aug 2004; David Holm <dholm@gentoo.org> honeyd-0.8.ebuild:
   Added to ~ppc.
diff --git a/net-analyzer/honeyd/Manifest b/net-analyzer/honeyd/Manifest
index e224d347ad63..7fb49bfc0f61 100644
--- a/net-analyzer/honeyd/Manifest
+++ b/net-analyzer/honeyd/Manifest
@@ -1,14 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 e9384027ae6b2aed4a61a34a6d32eb9f honeyd-0.8.ebuild 1893
-MD5 6021f525b1a49600a2f2476d3be45c4c ChangeLog 2181
+MD5 04fe8aa284c9e3de6ac5b9abb6994e0a honeyd-0.8.ebuild 1957
+MD5 15b93d47711df4677767f80b94e7bac3 ChangeLog 2447
 MD5 fef2fd2afe9a195bdc62e5628a5fd501 metadata.xml 259
+MD5 3b17149d9970e2b3249b01b1dba562eb honeyd-1.0.ebuild 1787
+MD5 05aa030ef5d390514cee9da3fa910690 files/honeyd.confd 429
+MD5 350fd8c3f8f14fa05642f9eab59c4a18 files/honeyd.initd 1358
 MD5 96be4ce17e233507825dbc39127ee9f3 files/digest-honeyd-0.8 129
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBjM/CT+MN7JbqCpMRAuExAJ9casnvQ4vft3wOhGvQUC1pZX8N5gCeOf7k
-GczVp2cPuRSuZk7KktSBZsk=
-=VEEd
------END PGP SIGNATURE-----
+MD5 857b8d8953a80aae5035664b1bc984a7 files/digest-honeyd-1.0 129
diff --git a/net-analyzer/honeyd/files/digest-honeyd-1.0 b/net-analyzer/honeyd/files/digest-honeyd-1.0
new file mode 100644
index 000000000000..89ed92d4411b
--- /dev/null
+++ b/net-analyzer/honeyd/files/digest-honeyd-1.0
@@ -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.confd b/net-analyzer/honeyd/files/honeyd.confd
new file mode 100644
index 000000000000..b36825e21bfa
--- /dev/null
+++ b/net-analyzer/honeyd/files/honeyd.confd
@@ -0,0 +1,17 @@
+# Config file for /etc/init.d/honeyd
+
+# Set Network address
+#HONEYD_NET="10.0.0.0/8"
+
+HONEYD_IF="lo"
+
+HONEYD_LOG="/var/log/honeyd.log"
+
+# Set to 1 to enable (>=honeyd-1.0)
+HONEYD_HTTPD=0
+HONEYD_HTTPD_PORT=80
+HONEYD_HTTPD_ROOT="/usr/share/honeyd/webserver/htdocs"
+
+# Set preferred options here
+HONEYD_OPTS="-f /etc/honeyd.conf -p /usr/share/honeyd/nmap.prints \
+	-x /usr/share/honeyd/xprobe2.conf -a /usr/share/honeyd/nmap.assoc"
diff --git a/net-analyzer/honeyd/files/honeyd.initd b/net-analyzer/honeyd/files/honeyd.initd
new file mode 100644
index 000000000000..a0b1fa573711
--- /dev/null
+++ b/net-analyzer/honeyd/files/honeyd.initd
@@ -0,0 +1,55 @@
+#!/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 $
+
+depend() {
+	need net
+}
+
+start() {
+	local options
+
+    ebegin "Starting honeyd"
+
+	if [[ -z "${HONEYD_NET}" ]] ; then
+		eerror "HONEYD_NET variable must be set in /etc/conf.d/honeyd"
+		eend 1
+		return 1
+	fi
+	
+	# add route
+	if ! netstat -arn | egrep "^${HONEYD_NET}[[:space:]]*127.0.0.1" ; then
+		route add -net ${HONEYD_NET} gw 127.0.0.1
+	fi
+
+	if [[ -n "${HONEYD_LOG}" ]] ; then
+		options="${options} -l ${HONEYD_LOG}"
+		# create logdir if it doesn't exist
+		[[ ! -d "${HONEYD_LOG%/*}" ]] && mkdir ${HONEYD_LOG%/*}
+	fi
+
+	# supports webserver feature?
+	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"
+		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 $?
+}
+
+stop() {
+    ebegin "Stopping honeyd"
+    start-stop-daemon --stop --quiet --retry 5 --exec /usr/sbin/honeyd
+	route del -net ${HONEYD_NET} gw 127.0.0.1
+	eend $?
+}
+
diff --git a/net-analyzer/honeyd/honeyd-0.8.ebuild b/net-analyzer/honeyd/honeyd-0.8.ebuild
index 1a05ca0f2181..9e7497c1b6e6 100644
--- a/net-analyzer/honeyd/honeyd-0.8.ebuild
+++ b/net-analyzer/honeyd/honeyd-0.8.ebuild
@@ -1,8 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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-0.8.ebuild,v 1.7 2004/08/03 11:59:25 dholm Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/honeyd/honeyd-0.8.ebuild,v 1.8 2005/01/21 22:13:24 ka0ttic Exp $
 
 DESCRIPTION="Honeyd is a small daemon that creates virtual hosts on a network"
 HOMEPAGE="http://www.citi.umich.edu/u/provos/honeyd/"
@@ -12,28 +10,28 @@ SRC_URI="http://www.citi.umich.edu/u/provos/honeyd/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~sparc ~ppc"
-
 IUSE="doc"
+
 DEPEND=">=dev-libs/libdnet-1.7
 	>=dev-libs/libevent-0.6
 	>=net-libs/libpcap-0.7.1"
 
 src_unpack() {
-	unpack ${A} ; cd ${S}
-
-	sed -i "s:^CFLAGS = -O2:CFLAGS = ${CFLAGS}:g" Makefile.in
+	unpack ${A}
+	cd ${S}
+	sed -i "s:^CFLAGS = -O2:CFLAGS = ${CFLAGS}:g" Makefile.in || die "sed failed"
 }
 
 src_compile() {
 	econf --with-libdnet=/usr || die "econf failed"
-	emake || die
+	emake || die "emake failed"
 }
 
 src_install() {
 	dodoc README
 	dosbin honeyd
 
-	einstall
+	einstall || die "make install failed"
 
 	rm ${D}/usr/bin/honeyd
 	rm ${D}/usr/share/honeyd/README
@@ -42,14 +40,17 @@ src_install() {
 	exeinto /usr/share/honeyd/scripts
 	doexe scripts/web.sh scripts/router-telnet.pl scripts/test.sh
 
+	insinto /etc
+	newins config.sample honeyd.conf || die "failed to install honeyd.conf"
+
+	newinitd ${FILESDIR}/${PN}.initd ${PN}
+	newconfd ${FILESDIR}/${PN}.confd ${PN}
+
 	# This adds all the services and example configurations collected
 	# by Lance Spitzer
 
 	# Install the white-papers if 'doc' USE flags are specified
-	use doc && (
-		cd ${WORKDIR}/honeyd-0.7a-beta2/contrib
-		dodoc *
-	)
+	use doc && dodoc ${WORKDIR}/honeyd-0.7a-beta2/contrib/*
 
 	# Install the example configurations
 	cd ${WORKDIR}/honeyd-0.7a-beta2
@@ -57,16 +58,10 @@ src_install() {
 	dodoc honeyd.conf.simple honeyd.conf.bloat nmap.prints.new
 	dodoc xprobe2.conf.new honeyd.conf.networks
 
-	# Install example start/stop scripts.. Those should _really_
-	# be re-written to gentoo instead..
-	dodoc start-arpd.sh start-honeyd.sh
-
 	# Install all the example scripts
 	cd ${WORKDIR}/honeyd-0.7a-beta2/scripts
 	cp -R * ${D}/usr/share/honeyd/scripts/
 	cd ${D}/usr/share/honeyd/scripts/
 	find -type f -name "*.sh" -o -name "*.pl" | xargs chmod +x
-
-
 }
 
diff --git a/net-analyzer/honeyd/honeyd-1.0.ebuild b/net-analyzer/honeyd/honeyd-1.0.ebuild
new file mode 100644
index 000000000000..fcccadf61186
--- /dev/null
+++ b/net-analyzer/honeyd/honeyd-1.0.ebuild
@@ -0,0 +1,62 @@
+# 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.ebuild,v 1.1 2005/01/21 22:13:24 ka0ttic Exp $
+
+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
+	>=net-libs/libpcap-0.7.1"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -i "s:^CFLAGS = -O2:CFLAGS = ${CFLAGS}:g" Makefile.in || die "sed failed"
+}
+
+src_compile() {
+	econf --with-libdnet=/usr || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	dodoc README TODO
+	dosbin honeyd
+
+	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}
+	newconfd ${FILESDIR}/${PN}.confd ${PN}
+
+	# 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" | xargs chmod +x
+}
+