Revision bump for bug 80831; added sguil support. Marked 2.3.0 stable on x86.

(Portage version: 2.0.51-r15)

5 files changed, 180 insertions, 26 deletions

diff --git a/net-analyzer/snort/ChangeLog b/net-analyzer/snort/ChangeLog
index 5678c59b89bd..0252b8557c9c 100644
--- a/net-analyzer/snort/ChangeLog
+++ b/net-analyzer/snort/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/snort
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v 1.59 2005/01/29 05:12:51 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v 1.60 2005/02/06 13:21:24 ka0ttic Exp $
+
+*snort-2.3.0-r1 (06 Feb 2005)
+
+  06 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> +snort-2.3.0-r1.ebuild,
+  snort-2.3.0.ebuild:
+  Revision bump for bug 80831; added sguil support. Marked 2.3.0 stable on x86.
 
   29 Jan 2005; Daniel Black <dragonheart@gentoo.org> snort-2.0.6.ebuild,
   snort-2.1.3.ebuild, snort-2.2.0.ebuild, snort-2.3.0.ebuild,
diff --git a/net-analyzer/snort/Manifest b/net-analyzer/snort/Manifest
index b1cd5daa9fed..d96a3fe69a13 100644
--- a/net-analyzer/snort/Manifest
+++ b/net-analyzer/snort/Manifest
@@ -1,31 +1,23 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 9b71616269b4b05db29b4d6dbbec23f7 ChangeLog 11530
-MD5 53edc4328d9adeaf087c65ea94b1594b metadata.xml 246
-MD5 0d4b980ee35a1f18ce2a75f81098b20f snort-2.1.3.ebuild 4372
 MD5 ea9f93a543ea9a0fe2a2a2618b1d1351 snort-2.2.0.ebuild 4378
-MD5 af4ad0b0af916cd4a7687d7470b3aa05 snort-2.3.0_rc2.ebuild 3977
-MD5 1f64c1c802a2136387359fe41992505d snort-2.3.0.ebuild 4173
 MD5 0ee736821e1141642d8d94cd4d0f4b13 snort-2.0.6.ebuild 3121
-MD5 ca486c6119dbf106f900a3b51e4f3985 files/digest-snort-2.1.3 129
-MD5 513637a4fadce14177bf85e97e5931f8 files/snort-2.1.3-gcc3.patch 350
-MD5 a654db9256f89b77a9ce482c976dc896 files/digest-snort-2.2.0 129
+MD5 ea81ba7c6674fd03bea8b7d69177130e snort-2.3.0-r1.ebuild 4450
+MD5 2c0f65ffae014c0520c9fe7522c3cd31 snort-2.3.0.ebuild 4172
+MD5 0d4b980ee35a1f18ce2a75f81098b20f snort-2.1.3.ebuild 4372
+MD5 af4ad0b0af916cd4a7687d7470b3aa05 snort-2.3.0_rc2.ebuild 3977
+MD5 70e0486e3126f0ecde18f0a020b4a37a ChangeLog 11737
+MD5 53edc4328d9adeaf087c65ea94b1594b metadata.xml 246
 MD5 08107e2e3ce78a19d7df4c78b9461303 files/digest-snort-2.3.0_rc2 221
-MD5 20c2ec2c963cca8c0abe1b6ee2b5b9f7 files/digest-snort-2.3.0 218
+MD5 919058894f4983c35900bc8bb98a96d4 files/snort.rc6 764
+MD5 ea783bd276257a20df5b6537d3ff5d49 files/snort-drop-calculation.diff 4957
 MD5 564bfdf90fe29f5924c68885ccfcddb8 files/2.3.0-libnet-1.0.patch 5424
+MD5 fe6a25fdd3c6d4b527d89c51d78b8f36 files/2.0.6-libnet-1.0.patch 2753
 MD5 202dd3be05b16c852303a04284eba720 files/digest-snort-2.0.6 150
+MD5 ca486c6119dbf106f900a3b51e4f3985 files/digest-snort-2.1.3 129
+MD5 a654db9256f89b77a9ce482c976dc896 files/digest-snort-2.2.0 129
+MD5 20c2ec2c963cca8c0abe1b6ee2b5b9f7 files/digest-snort-2.3.0 218
 MD5 513637a4fadce14177bf85e97e5931f8 files/snort-2.0.6-gcc3.patch 350
-MD5 ea783bd276257a20df5b6537d3ff5d49 files/snort-drop-calculation.diff 4957
 MD5 446f8d2b3435b8a6be738da978670605 files/snort.confd 423
-MD5 919058894f4983c35900bc8bb98a96d4 files/snort.rc6 764
-MD5 fe6a25fdd3c6d4b527d89c51d78b8f36 files/2.0.6-libnet-1.0.patch 2753
-MD5 513637a4fadce14177bf85e97e5931f8 files/snort-2.1.2-gcc3.patch 350
 MD5 fe6a25fdd3c6d4b527d89c51d78b8f36 files/2.1.2-libnet-1.0.patch 2753
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFB+xtamdTrptrqvGERAkFoAJ0fXoCNp7JNHKVaOs4AQtZhfDsT1ACeMzrC
-z9eNY+34MubuNtdyJz0U+Nc=
-=whQA
------END PGP SIGNATURE-----
+MD5 513637a4fadce14177bf85e97e5931f8 files/snort-2.1.2-gcc3.patch 350
+MD5 513637a4fadce14177bf85e97e5931f8 files/snort-2.1.3-gcc3.patch 350
+MD5 a9fc70d50c4512c835aa428f4b198fae files/digest-snort-2.3.0-r1 287
diff --git a/net-analyzer/snort/files/digest-snort-2.3.0-r1 b/net-analyzer/snort/files/digest-snort-2.3.0-r1
new file mode 100644
index 000000000000..06f1783d4394
--- /dev/null
+++ b/net-analyzer/snort/files/digest-snort-2.3.0-r1
@@ -0,0 +1,4 @@
+MD5 89cdc22af9516cbafc359b452819947e snort-2.3.0.tar.gz 2633245
+MD5 2eeef1a7a040d67c3afaf9d749905e47 snortsam-20050110.tar.gz 29395
+MD5 323ab2956a59de113aa13099917f0d3a snort-prelude-reporting-patch-0.3.6.tar.gz 21964
+MD5 681fa7e99aa674c0e2be4788ef503d69 sguil-sensor-0.5.3.tar.gz 89816
diff --git a/net-analyzer/snort/snort-2.3.0-r1.ebuild b/net-analyzer/snort/snort-2.3.0-r1.ebuild
new file mode 100644
index 000000000000..12ec5d1e7511
--- /dev/null
+++ b/net-analyzer/snort/snort-2.3.0-r1.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.3.0-r1.ebuild,v 1.1 2005/02/06 13:21:24 ka0ttic Exp $
+
+inherit eutils gnuconfig flag-o-matic
+
+DESCRIPTION="Libpcap-based packet sniffer/logger/lightweight IDS"
+HOMEPAGE="http://www.snort.org/"
+SRC_URI="http://www.snort.org/dl/${P}.tar.gz
+	snortsam? ( mirror://gentoo/snortsam-20050110.tar.gz )
+	prelude? ( http://www.prelude-ids.org/download/releases/snort-prelude-reporting-patch-0.3.6.tar.gz )
+	sguil? ( mirror://sourceforge/sguil/sguil-sensor-0.5.3.tar.gz )"
+
+#	snortsam? ( http://www.snortsam.net/files/snort-plugin/snortsam-patch.tar.gz )
+# Gentoo mirrored because of naming conflict with previous version
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 -sparc -alpha ~amd64 ~ppc"
+IUSE="ssl postgres mysql flexresp selinux snortsam odbc prelude inline sguil"
+
+# Local useflag snortsam: patch snort for use with snortsam package.
+
+
+DEPEND="virtual/libc
+	>=dev-libs/libpcre-4.2-r1
+	virtual/libpcap
+	flexresp? ( ~net-libs/libnet-1.0.2a )
+	postgres? ( >=dev-db/postgresql-7.2 )
+	mysql? ( >=dev-db/mysql-3.23.26 )
+	ssl? ( >=dev-libs/openssl-0.9.6b )
+	prelude? ( >=dev-libs/libprelude-0.8 )
+	odbc? ( dev-db/unixODBC )
+	inline? (
+				~net-libs/libnet-1.0.2a
+				net-firewall/iptables
+			)"
+
+RDEPEND="${DEPEND}
+	dev-lang/perl
+	selinux? ( sec-policy/selinux-snort )
+	snortsam? ( net-analyzer/snortsam )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	gnuconfig_update
+
+	if use flexresp || use inline ; then
+		epatch ${FILESDIR}/${PV}-libnet-1.0.patch
+	fi
+
+	einfo "Patching /etc/snort.conf"
+	sed -i "s:var RULE_PATH ../rules:var RULE_PATH /etc/snort:" \
+		etc/snort.conf || die "sed snort.conf failed"
+
+	if use prelude ; then
+		epatch ../snort-2.2.0-prelude-0.3.6.diff
+		sed -i -e "s:AC_PROG_RANLIB:AC_PROG_LIBTOOL:" configure.in \
+			|| die "sed configure.in failed"
+	fi
+
+	if use sguil ; then
+		cd ${S}/src/preprocessors
+		epatch ${WORKDIR}/sguil-0.5.3/sensor/snort_mods/2_1/spp_portscan_sguil.patch || die
+		epatch ${WORKDIR}/sguil-0.5.3/sensor/snort_mods/2_1/spp_stream4_sguil.patch || die
+		cd ${S}
+	fi
+
+	# need to pick up prelude and or flexresp patches
+	einfo "Regenerating autoconf/automake files"
+	autoreconf -f -i || die "autoreconf failed"
+
+	if use snortsam
+	then
+		cd ..
+		einfo "Applying snortsam patch"
+		./patchsnort.sh ${S} || die "snortsam patch failed"
+		cd ${S}
+	fi
+}
+
+src_compile() {
+	local myconf
+
+	# There is no --diable-flexresp, cannot use use_enable
+	use flexresp && myconf="${myconf} --enable-flexresp"
+
+	use inline && append-flags -I/usr/include/libipq
+
+	econf \
+		$(use_with postgres postgresql) \
+		$(use_with mysql) \
+		$(use_with ssl openssl) \
+		$(use_with odbc) \
+		--without-oracle \
+		$(use_with prelude) \
+		$(use_with sguil) \
+		$(use_enable inline) \
+		${myconf} || die "bad ./configure"
+
+	emake || die "compile problem"
+}
+
+pkg_preinst() {
+	enewgroup snort
+	enewuser snort -1 /bin/false /var/log/snort snort
+	usermod -d "/var/log/snort" snort || die "usermod problem"
+	usermod -g "snort" snort || die "usermod problem"
+	usermod -s "/bin/false" snort || die "usermod problem"
+	echo "ignore any message about CREATE_HOME above..."
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	keepdir /var/log/snort/
+
+	dodoc COPYING LICENSE doc/*
+	docinto schemas ; dodoc schemas/*
+
+	insinto /etc/snort
+	doins etc/reference.config etc/classification.config rules/*.rules \
+		etc/*.map etc/threshold.conf
+	newins etc/snort.conf snort.conf.distrib
+
+	use prelude && doins etc/prelude-classification.config
+
+	newinitd ${FILESDIR}/snort.rc6 snort
+	newconfd ${FILESDIR}/snort.confd snort
+
+	chown snort:snort ${D}/var/log/snort
+	chmod 0770 ${D}/var/log/snort
+}
+
+pkg_postinst() {
+	if use mysql || use postgres || use odbc
+	then
+		einfo "To use a database as a backend for snort you will have to"
+		einfo "import the correct tables to the database."
+		einfo "You will have to setup a database called snort first."
+		einfo ""
+		use mysql && \
+			einfo "  MySQL: zcat /usr/share/doc/${PF}/schema/create_mysql.gz | mysql -p snort"
+		use postgres && \
+			einfo "  PostgreSQL: import /usr/share/doc/${PF}/schemas/create_postgresql.gz"
+		use odbc && einfo "SQL tables need to be created - look at /usr/share/doc/${PF}/schemas/"
+		einfo ""
+		einfo "Also, read the following Gentoo forums article:"
+		einfo '   http://forums.gentoo.org/viewtopic.php?t=78718'
+	fi
+}
diff --git a/net-analyzer/snort/snort-2.3.0.ebuild b/net-analyzer/snort/snort-2.3.0.ebuild
index 5e179d8db022..a0fb6521b0a7 100644
--- a/net-analyzer/snort/snort-2.3.0.ebuild
+++ b/net-analyzer/snort/snort-2.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.3.0.ebuild,v 1.2 2005/01/29 05:12:51 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.3.0.ebuild,v 1.3 2005/02/06 13:21:24 ka0ttic Exp $
 
 inherit eutils gnuconfig flag-o-matic
 
@@ -15,7 +15,7 @@ SRC_URI="http://www.snort.org/dl/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 -sparc -alpha ~amd64 ~ppc"
+KEYWORDS="x86 -sparc -alpha ~amd64 ~ppc"
 IUSE="ssl postgres mysql flexresp selinux snortsam odbc prelude inline"
 
 # Local useflag snortsam: patch snort for use with snortsam package.