net-analyzer/honeytrap: Move lots of stuff to pkg_setup; use linux-info eclass instead of ewarns, default to iptables if no monitor backend is selected, cosmetics

svn path=/sunrise/; revision=4047

3 files changed, 33 insertions, 23 deletions

diff --git a/net-analyzer/honeytrap/ChangeLog b/net-analyzer/honeytrap/ChangeLog
index 2e60c6cc5..a7a8f7336 100644
--- a/net-analyzer/honeytrap/ChangeLog
+++ b/net-analyzer/honeytrap/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  24 Jun 2007; Jakub Moc <jakub@gentoo.org> honeytrap-0.6.4.ebuild:
+  Move lots of stuff to pkg_setup; use linux-info eclass instead of ewarns,
+  default to iptables if no monitor backend is selected, cosmetics
+
   06 Jun 2007; Ali Polatel (hawking) <polatel@gmail.com>
   honeytrap-0.6.4.ebuild:
   Fix trailing whitespace, add trailing slash to HOMEPAGE, shorten DESCRIPTION
diff --git a/net-analyzer/honeytrap/Manifest b/net-analyzer/honeytrap/Manifest
index 42c575c31..bb22190ab 100644
--- a/net-analyzer/honeytrap/Manifest
+++ b/net-analyzer/honeytrap/Manifest
@@ -2,6 +2,6 @@ AUX honeytrap.conf 2018 RMD160 d12898a960f2c6bdcd24b8efdf233e850fd8da6c SHA1 4e8
 AUX honeytrap.confd 614 RMD160 07a1eee2c255be2cdea329bc272e4d0eb08e4fc4 SHA1 35a55b503f934d8f911aa696ae220192b2d40720 SHA256 ba34016ec19f670dc679060e33eb79ca89927f67a2d8c1adf459b0486ed67974
 AUX honeytrap.initd 709 RMD160 e9e34b24b829476a337b3acc0f91408211bc074c SHA1 d86cd0d4dac74c65ec93527276b05230f086b04d SHA256 376addc165212da0db7b6887027e19f36f3846da5ae3928d4ff29aaa6418a327
 DIST honeytrap-0.6.4.tar.bz2 253145 RMD160 00af82f6018a0d124636164fa68b14548231097e SHA1 d0a76c559d94ca97ca97a7a6b101738f0f0611c0 SHA256 e693c50dad5745e2fac594ee4e1234e9bbcd80b757b8b6d1a126d6d9381bdac4
-EBUILD honeytrap-0.6.4.ebuild 2946 RMD160 6dcedaf4094d617fbbaca694f8f26a6a84f8ac19 SHA1 79cfe630f13b54aed3f88aeb6fe36515e8988979 SHA256 02e896c55e6acc2955422f45c35f509f6e033d4d42ecb3c1b6a5fe1db303348d
-MISC ChangeLog 436 RMD160 73c2ebd28b2a8a54fa19c937c83d41c019f0dcf1 SHA1 ea477558e212c3d5794b30d3699ce57b0089d72a SHA256 b654f271a63af6ff1fc00cf807bd28384a1ab20a5e22e3acb1383a43747ff849
+EBUILD honeytrap-0.6.4.ebuild 3172 RMD160 75c368d9f27980a5dceedd6f5a2945f2b412cdf7 SHA1 8e734c74b3e651d6ca390e46efd85f4b9ea826a9 SHA256 ee1136c4e494dfaf6e5e8df0a0d1b17160f2fd72da681222a14bfc61155fa2f9
+MISC ChangeLog 648 RMD160 dda03d9e1d6416e76d1cded2e56f42064dfe6062 SHA1 b737500200d95e7dc049c100bb0a42fcddd4ac23 SHA256 16d1e79541954410f997da151711bf6336d21b94306b6146bfd09a370a1d222e
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/net-analyzer/honeytrap/honeytrap-0.6.4.ebuild b/net-analyzer/honeytrap/honeytrap-0.6.4.ebuild
index 13860c41e..0bf2f72c4 100644
--- a/net-analyzer/honeytrap/honeytrap-0.6.4.ebuild
+++ b/net-analyzer/honeytrap/honeytrap-0.6.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils
+inherit eutils linux-info
 
 DESCRIPTION="Network security tool for observing network services via low-interactive honeypot"
 HOMEPAGE="http://honeytrap.mwcollect.org/"
@@ -14,34 +14,39 @@ KEYWORDS="~amd64 ~x86"
 IUSE="pcap-mon ipq-mon efence debug"
 
 RDEPEND="pcap-mon? ( virtual/libpcap )
-	ipq-mon? ( net-firewall/iptables )"
+	ipq-mon? ( net-firewall/iptables )
+	!pcap-mon? ( !ipq-mon? ( net-firewall/iptables ) )"
 DEPEND="${RDEPEND}
 	efence? ( dev-util/efence )"
 
 pkg_setup() {
 	enewgroup honeytrap
 	enewuser honeytrap -1 -1 /sbin/nologin honeytrap
-}
-
-src_compile() {
-	local myconf
 
 	if ! use pcap-mon && ! use ipq-mon ; then
-		eerror "You must choose one connection monitor."
-		eerror "Currently only pcap-based and ip_queue-based monitors are supported."
-		die
-	fi
-
-	if use ipq-mon ; then
-		myconf="${myconf} --with-libipq-includes=/usr/include/libipq"
+		ewarn "You didn't choose any connection monitor."
+		ewarn "Currently pcap-based and ip_queue-based monitors are supported."
+		ewarn "Defaulting to iptables; if this is not what you want,"
+		ewarn "you should add pcap-mon to your USE and re-emerge this ebuild."
 		epause 3
-		einfo "You need to have IP_NF_QUEUE enabled in your kernel for this to work."
 	fi
 
 	if use efence; then
-		epause 3
 		ewarn "You have enabled a link with Electric Fence malloc debugger."
 		ewarn "It is known that Honeytrap will not work with efence and xen-sources."
+		epause 3
+	fi
+
+	use ipq-mon && CONFIG_CHECK="IP_NF_QUEUE"
+	linux-info_pkg_setup
+}
+
+src_compile() {
+	local myconf
+	if use ipq-mon ; then 
+		myconf="${myconf} --with-libipq-includes=/usr/include/libipq"
+	elif ! use pcap-mon && ! use ipq-mon ; then
+		myconf="${myconf} --with-libipq-includes=/usr/include/libipq"
 	fi
 
 	econf \
@@ -63,17 +68,18 @@ src_install() {
 
 	# B. Unfortunately the dynamic shared plugins are installed into /etc/honeytrap/plugins by default.
 	# The easiest way is to just move them and put them into /usr/src/honeytrap_dynamicsrc (cf. Snort).
-	mkdir "${D}"/usr/src
+	dodir /usr/src
 	mv "${D}"/etc/honeytrap/plugins "${D}"/usr/src/honeytrap_dynamicsrc || die
 
 	# As the ebuild includes a modified version of this file, no need to copy this into the live system.
-	rm "${D}"/etc/honeytrap/honeytrap.conf*
+	rm -f "${D}"/etc/honeytrap/honeytrap.conf*
 
 	mv "${D}"/etc/honeytrap/ports.conf.dist "${D}"/etc/honeytrap/ports.conf
+
 	dodoc README NEWS TODO ChangeLog
 
-	newinitd "${FILESDIR}"/${PN}.initd ${PN} || die "newinitd failed"
-	newconfd "${FILESDIR}"/${PN}.confd ${PN} || die "newconfd failed"
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
 	cp "${FILESDIR}"/honeytrap.conf "${D}"/etc/honeytrap/
 
 	keepdir /var/log/honeytrap
@@ -85,12 +91,12 @@ src_install() {
 }
 
 pkg_postinst() {
-	ewarn ""
+	ewarn
 	ewarn "WARNING (from the README):"
 	ewarn "Honeytrap is a low-interactive honeypot and therefore detectable."
 	ewarn "It  is  written  in  C  and thus potentially vulnerable to buffer"
 	ewarn "overflow attacks. Take care. Running in mirror mode is dangerous."
 	ewarn "Attacks  may  be directed to the attacker, appearing to come from"
 	ewarn "your system. Use with caution."
-	ewarn ""
+	ewarn
 }