Version bump.

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

4 files changed, 34 insertions, 132 deletions

diff --git a/net-analyzer/sguil-sensor/ChangeLog b/net-analyzer/sguil-sensor/ChangeLog
index b7a0fcc65b9a..d393a92fd36c 100644
--- a/net-analyzer/sguil-sensor/ChangeLog
+++ b/net-analyzer/sguil-sensor/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/sguil-sensor
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sguil-sensor/ChangeLog,v 1.13 2008/08/16 17:35:15 tove Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sguil-sensor/ChangeLog,v 1.14 2012/05/03 15:21:07 jer Exp $
+
+*sguil-sensor-0.8.0 (03 May 2012)
+
+  03 May 2012; Jeroen Roovers <jer@gentoo.org> -sguil-sensor-0.5.3-r2.ebuild,
+  -sguil-sensor-0.6.0_p1.ebuild, +sguil-sensor-0.8.0.ebuild:
+  Version bump.
 
   16 Aug 2008; Torsten Veller <tove@gentoo.org> metadata.xml:
   Remove strerror from metadata.xml (#89719)
diff --git a/net-analyzer/sguil-sensor/Manifest b/net-analyzer/sguil-sensor/Manifest
index da457fb90ead..ca6030389d50 100644
--- a/net-analyzer/sguil-sensor/Manifest
+++ b/net-analyzer/sguil-sensor/Manifest
@@ -4,18 +4,16 @@ Hash: SHA1
 AUX log_packets.confd 424 RMD160 d02d89a4997d0d796b44a1f0ac1df2cf411ee9fd SHA1 6d41979ac80fb78829e8fa70557391ec6ca5e5fd SHA256 d06ca10f5015dbdbcc5df7928352c010290b407bf8565d2c1ee1ecbb1cc8ea54
 AUX log_packets.initd 2215 RMD160 8a519d36f34080e69af4c57ecce176ea8714e144 SHA1 aa963b109b70e68774d48a947a40fd6de8086624 SHA256 59563a8606d5f1780412eb1c18640fdd597847b2db96677923be2cfdbad3c771
 AUX sensor_agent.initd 872 RMD160 bd42cb378b0855bf4534aad2d896300dfd584cac SHA1 76e7cda79fe004e3b8503311a2617154a8a57018 SHA256 46b20614d734c60c3a317c5e4fad1a6b2539b3fa394f34d0243d79722e855b88
-DIST sguil-sensor-0.5.3.tar.gz 89816 RMD160 b7732f05e55c1c88d033d0eed42384060a860baf SHA1 19fbf7390d1b9a51c099298e408f8982f26bbd83 SHA256 6f53acbbe01e753b8f744f831f77c03524876cd22e15219a34ca7461e636f68f
-DIST sguil-sensor-0.6.0p1.tar.gz 105374 RMD160 27d53e6788f66b4a0af540546f69febd32d7fb66 SHA1 594f2393b68f844e634dff4d58dd74bc9fc893c8 SHA256 73bd32d9d663f875337ad043d09b7c360c2a6846f7d924cd0ea9a2ae3ef5ce53
 DIST sguil-sensor-0.6.1.tar.gz 103441 RMD160 8a4d5bb0a2b49d523540022fe29586004666af44 SHA1 2f80f531d22b322d02606ef8735acf0fa8c76569 SHA256 b1da0fffeaecd69b9d8eeeb27025fdc3493a2eabfec8ed4153f688f11ee226eb
-EBUILD sguil-sensor-0.5.3-r2.ebuild 2710 RMD160 ca2569e6aea629e705a80103bde8d83a01a3e3b2 SHA1 73f117dbdcadf144331ca760fbff85651b933ac6 SHA256 9b53b8383a961bc00b61767795e8184a48fc3de19854f91001697e175f38764a
-EBUILD sguil-sensor-0.6.0_p1.ebuild 2737 RMD160 f3e51129921b46df31bdd66cb0f90ecb658b8a00 SHA1 1da649b8cc84b0979e0d43bde8d4acc8b52c417d SHA256 f444f353949f6c9b1b9ee910355cee2a1460462b216ed2cf5aaabd8b82265449
+DIST sguil-sensor-0.8.0.tar.gz 142829 RMD160 37b5670af61cd83f991557208327165330fb50a4 SHA1 cef556b81219a86c149fbe8603a88a6f59c2bb05 SHA256 aa4617c4f9cf1d598c6d728afed50cd6f90dc5d1516a6eda8126401b7bba4be5
 EBUILD sguil-sensor-0.6.1.ebuild 2734 RMD160 c65b89e2235847ec46951cf558d53af8c4359cbd SHA1 cc6fbe11f05af581b2eb536ee737900a7d2b9c8a SHA256 29b69b159251d303ec88dc377d99184cc051a40dc699f3bf70a1cf73463aae61
-MISC ChangeLog 2046 RMD160 6da3a74753d0c5fdc19aeccf33d8e222e0a7f8cb SHA1 efeac77f164ec5c21ba13defe706c24dfcf06fed SHA256 e4c26b6d387298ce56dbfb9ddcdc4cadc1ebf1d7340aee2830a376d44fb2b9fa
+EBUILD sguil-sensor-0.8.0.ebuild 2327 RMD160 b74c192d46d8324f37f0a3b4168866d9856ca752 SHA1 dd678513e9fa4985ecd49d865682ff9875c96bb1 SHA256 229fe9043455dd67c88ba6247897269846ccc661c84224b56a1b5816c7c3a63b
+MISC ChangeLog 2236 RMD160 cad1482e91e10ff191af5b250d01d76e3da87db5 SHA1 80d8f1473467211c565030e28c627dd8cf0e5c9e SHA256 d7eeb96931dce32cd2538b831ea47bf390ee1ec40f1e1c3fa869f11772bbd2f8
 MISC metadata.xml 161 RMD160 404fe32f194325ecc180c31feaed3b71cff5e438 SHA1 aa4aff2479db4b6a96f99889365cb17375ba8c4d SHA256 442ce683981a7e51854e06ffdc2bdbbd956decf0d7a1f0c1ca056439a7230ebd
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAkinD8cACgkQV3J2n04EauzQ6gCgpYqXweNzuzzNgbjQE9bggX9C
-fVgAoJE2yoV8GMmFYes1A7ABnXqREMQv
-=A7w/
+iEYEARECAAYFAk+iomgACgkQVWmRsqeSphPcqwCeKrGC3PN++DO7cEmaHiX7Es1C
+KikAnRJ+ueVATZPYszc4/RztiI2FIHYf
+=vp+l
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/sguil-sensor/sguil-sensor-0.5.3-r2.ebuild b/net-analyzer/sguil-sensor/sguil-sensor-0.5.3-r2.ebuild
deleted file mode 100644
index dbac81af2033..000000000000
--- a/net-analyzer/sguil-sensor/sguil-sensor-0.5.3-r2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sguil-sensor/sguil-sensor-0.5.3-r2.ebuild,v 1.4 2007/07/11 23:49:24 mr_bones_ Exp $
-
-inherit eutils
-
-DESCRIPTION="Sensor part of sguil Network Security Monitoring"
-HOMEPAGE="http://sguil.sourceforge.net"
-SRC_URI="mirror://sourceforge/sguil/sguil-sensor-${PV}.tar.gz"
-
-LICENSE="QPL"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND=">=dev-lang/tcl-8.3"
-RDEPEND="${DEPEND}
-	>=dev-tcltk/tclx-8.3
-	>=net-analyzer/snort-2.4.1-r1
-	>=net-analyzer/barnyard-0.2.0-r1
-	net-analyzer/sancp
-	dev-ml/pcre-ocaml"
-
-S=${WORKDIR}/sguil-${PV}
-
-pkg_setup() {
-	if built_with_use dev-lang/tcl threads ; then
-		eerror
-		eerror "Sguil does not run when tcl was built with threading enabled."
-		eerror "Please rebuild tcl without threads and reemerge this ebuild."
-		eerror
-		die
-	fi
-
-	if ! built_with_use net-analyzer/snort sguil ; then
-		eerror
-		eerror "You need to emerge snort with 'sguil' USE flag to get"
-		eerror "the full sguil functionality"
-		eerror
-		die
-	fi
-	enewgroup sguil
-	enewuser sguil -1 -1 /var/lib/sguil sguil
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/sensor
-	sed -i -e 's:192.168.8.1:127.0.0.1:' -e "s:gateway:${HOSTNAME}:" \
-		-e 's:/snort_data:/var/lib/sguil:' -e 's:DAEMON 0:DAEMON 1:' \
-		-e 's:DEBUG 1:DEBUG 0:g' sensor_agent.conf || die "sed failed"
-	sed -i -e 's:/var/run/sensor_agent.pid:/var/run/sguil/sensor.pid:' \
-		sensor_agent.tcl || die "sed failed"
-}
-
-src_install() {
-
-	dodoc doc/*
-
-	dobin sensor/sensor_agent.tcl
-
-	newinitd "${FILESDIR}/log_packets.initd" log_packets
-	newinitd "${FILESDIR}/sensor_agent.initd" sensor_agent
-	newconfd "${FILESDIR}/log_packets.confd" log_packets
-	insinto /etc/sguil
-	doins sensor/sensor_agent.conf
-
-	# Create the directory structure
-	diropts -g sguil -o sguil
-	keepdir /var/lib/sguil /var/run/sguil /var/run/sguil/archive \
-		"/var/lib/sguil/${HOSTNAME}" \
-		"/var/lib/sguil/${HOSTNAME}/portscans" \
-		"/var/lib/sguil/${HOSTNAME}/ssn_logs" \
-		"/var/lib/sguil/${HOSTNAME}/dailylogs" \
-		"/var/lib/sguil/${HOSTNAME}/sancp"
-
-}
-
-pkg_postinst() {
-	elog
-	elog "You should check /etc/sguil/sensor_agent.conf and"
-	elog "/etc/init.d/logpackets and ensure that they are accurate"
-	elog "for your environment. They should work providing that you"
-	elog "are running the sensor on the same machine as the server."
-	elog "This ebuild assumes that you are running a single sensor"
-	elog "environment, if this is not the case then you must make sure"
-	elog "to modify /etc/sguil/sensor_agent.conf and change the HOSTNAME variable."
-	elog "You should crontab the /etc/init.d/log_packets script to restart"
-	elog "each hour."
-	elog
-}
diff --git a/net-analyzer/sguil-sensor/sguil-sensor-0.6.0_p1.ebuild b/net-analyzer/sguil-sensor/sguil-sensor-0.8.0.ebuild
index fe00ac4f3252..b1978db58f3b 100644
--- a/net-analyzer/sguil-sensor/sguil-sensor-0.6.0_p1.ebuild
+++ b/net-analyzer/sguil-sensor/sguil-sensor-0.8.0.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sguil-sensor/sguil-sensor-0.6.0_p1.ebuild,v 1.3 2007/07/11 23:49:24 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sguil-sensor/sguil-sensor-0.8.0.ebuild,v 1.1 2012/05/03 15:21:07 jer Exp $
 
+EAPI=4
 inherit eutils
 
 MY_PV="${PV/_p/p}"
@@ -14,48 +15,36 @@ SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
 
-DEPEND=">=dev-lang/tcl-8.3"
-RDEPEND="${DEPEND}
+RDEPEND="
+	>=dev-lang/tcl-8.3[-threads]
 	>=dev-tcltk/tclx-8.3
-	>=net-analyzer/snort-2.4.1-r1
 	>=net-analyzer/barnyard-0.2.0-r1
+	>=net-analyzer/snort-2.4.1-r1
+	dev-ml/pcre-ocaml
 	net-analyzer/sancp
-	dev-ml/pcre-ocaml"
+"
 
 S="${WORKDIR}/sguil-${MY_PV}"
 
 pkg_setup() {
-	if built_with_use dev-lang/tcl threads ; then
-		eerror
-		eerror "Sguil does not run when tcl was built with threading enabled."
-		eerror "Please rebuild tcl without threads and reemerge this ebuild."
-		eerror
-		die
-	fi
-
-	if ! built_with_use net-analyzer/snort sguil ; then
-		eerror
-		eerror "You need to emerge snort with 'sguil' USE flag to get"
-		eerror "the full sguil functionality"
-		eerror
-		die
-	fi
 	enewgroup sguil
 	enewuser sguil -1 -1 /var/lib/sguil sguil
 }
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}/sensor
-	sed -i -e 's:192.168.8.1:127.0.0.1:' -e "s:gateway:${HOSTNAME}:" \
-		-e 's:/snort_data:/var/lib/sguil:' -e 's:DAEMON 0:DAEMON 1:' \
-		-e 's:DEBUG 1:DEBUG 0:g' sensor_agent.conf || die "sed failed"
-	sed -i -e 's:/var/run/sensor_agent.pid:/var/run/sguil/sensor.pid:' \
-		sensor_agent.tcl || die "sed failed"
+src_prepare() {
+	sed -i sensor/sensor_agent.conf \
+		-e 's:192.168.8.1:127.0.0.1:' \
+		-e "s:gateway:${HOSTNAME}:" \
+		-e 's:/snort_data:/var/lib/sguil:' \
+		-e 's:DAEMON 0:DAEMON 1:' \
+		-e 's:DEBUG 1:DEBUG 0:g' \
+		|| die "sed failed"
+	sed -i sensor/sensor_agent.tcl \
+		-e 's:/var/run/sensor_agent.pid:/var/run/sguil/sensor.pid:' \
+		|| die "sed failed"
 }
 
 src_install() {
-
 	dodoc doc/*
 
 	dobin sensor/sensor_agent.tcl