Version bump; added snortsam support

5 files changed, 153 insertions, 2 deletions

diff --git a/net-analyzer/snort/ChangeLog b/net-analyzer/snort/ChangeLog
index 97182c642d87..ceb065c86082 100644
--- a/net-analyzer/snort/ChangeLog
+++ b/net-analyzer/snort/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/snort
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v 1.44 2004/06/24 22:18:26 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v 1.45 2004/07/01 00:08:16 eldad Exp $
+
+*snort-2.1.3 (01 Jul 2004)
+
+  01 Jul 2004; Eldad Zack <eldad@gentoo.org> +files/snort-2.1.3-gcc3.patch,
+  +snort-2.1.3.ebuild:
+  Version bump, added snortsam support.
 
   19 Jun 2004; Michael Hanselmann <hansmi@gentoo.org> snort-2.0.6.ebuild:
   Marked snort 2.0.6 as ~ppc
diff --git a/net-analyzer/snort/Manifest b/net-analyzer/snort/Manifest
index 3e872efb78ba..8ecf49befcb8 100644
--- a/net-analyzer/snort/Manifest
+++ b/net-analyzer/snort/Manifest
@@ -1,9 +1,10 @@
 MD5 03b8a6ed4271febbcf83d315801cce79 snort-2.1.2.ebuild 3520
 MD5 731bebc91ef684562782f81c13c3f36c snort-2.0.6.ebuild 3140
 MD5 070b9cee50b14824658660c654a5b3dc snort-2.1.1.ebuild 3514
+MD5 7b9ff19e2ef9047dc587ec72ef34955d snort-2.1.3.ebuild 3774
 MD5 f4483024ceb3c155a956cf533b0911e9 snort-2.1.0-r1.ebuild 3670
 MD5 899f95964a31f8d4af4df35ff8045eba snort-2.1.0.ebuild 3468
-MD5 a2b9693c9a340c06bcebb56aecb3a62c ChangeLog 8892
+MD5 a074e94bf3de96d029aa8be5d4d18bba ChangeLog 9057
 MD5 f629e6b9c8a922659de794d67f0cd115 metadata.xml 928
 MD5 fe6a25fdd3c6d4b527d89c51d78b8f36 files/2.1.0-libnet-1.0.patch 2753
 MD5 b13a978800f443b01a7d8d5efa583637 files/snort.rc6 770
@@ -13,6 +14,7 @@ MD5 202dd3be05b16c852303a04284eba720 files/digest-snort-2.0.6 150
 MD5 7c11e6d5a07263b09e86572d96222d09 files/digest-snort-2.1.0 150
 MD5 a0a2702875fd25016f4e627cf801edb9 files/digest-snort-2.1.1 64
 MD5 cfa70b4b7a18ef0615bd6a8681ace3e2 files/digest-snort-2.1.2 64
+MD5 ca486c6119dbf106f900a3b51e4f3985 files/digest-snort-2.1.3 129
 MD5 fe6a25fdd3c6d4b527d89c51d78b8f36 files/2.1.1-libnet-1.0.patch 2753
 MD5 5379f2b178725088a8757ef25c77775c files/snort-2.1.0-pgsql.patch 645
 MD5 513637a4fadce14177bf85e97e5931f8 files/snort-2.0.6-gcc3.patch 350
@@ -23,3 +25,4 @@ MD5 513637a4fadce14177bf85e97e5931f8 files/snort-2.1.1-gcc3.patch 350
 MD5 fe6a25fdd3c6d4b527d89c51d78b8f36 files/2.1.2-libnet-1.0.patch 2753
 MD5 513637a4fadce14177bf85e97e5931f8 files/snort-2.1.2-gcc3.patch 350
 MD5 37a67a034efff43a090ca4c84bc65251 files/digest-snort-2.1.0-r1 64
+MD5 513637a4fadce14177bf85e97e5931f8 files/snort-2.1.3-gcc3.patch 350
diff --git a/net-analyzer/snort/files/digest-snort-2.1.3 b/net-analyzer/snort/files/digest-snort-2.1.3
new file mode 100644
index 000000000000..02f5f6b2ba3a
--- /dev/null
+++ b/net-analyzer/snort/files/digest-snort-2.1.3
@@ -0,0 +1,2 @@
+MD5 76a538d27c23d51dbed43b04c06114e1 snort-2.1.3.tar.gz 2379344
+MD5 b515ee767b9889303e4a9b14dee5b078 snortsam-patch.tar.gz 29496
diff --git a/net-analyzer/snort/files/snort-2.1.3-gcc3.patch b/net-analyzer/snort/files/snort-2.1.3-gcc3.patch
new file mode 100644
index 000000000000..972aee39c74a
--- /dev/null
+++ b/net-analyzer/snort/files/snort-2.1.3-gcc3.patch
@@ -0,0 +1,12 @@
+diff -ur snort-2.0.2/src/util.h snort-2.0.2-gentoo/src/util.h
+--- snort-2.0.2/src/util.h	2003-03-27 09:59:30.000000000 +1200
++++ snort-2.0.2-gentoo/src/util.h	2003-10-10 02:11:41.000000000 +1300
+@@ -39,6 +39,8 @@
+ #include "strlcpyu.h"
+ #endif
+ 
++#include <sys/types.h>
++
+ extern u_long netmasks[33];
+ 
+ /* Self preservation memory control struct */
diff --git a/net-analyzer/snort/snort-2.1.3.ebuild b/net-analyzer/snort/snort-2.1.3.ebuild
new file mode 100644
index 000000000000..ccc0263356e0
--- /dev/null
+++ b/net-analyzer/snort/snort-2.1.3.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.1.3.ebuild,v 1.1 2004/07/01 00:08:16 eldad Exp $
+
+inherit eutils
+
+DESCRIPTION="Libpcap-based packet sniffer/logger/lightweight IDS"
+HOMEPAGE="http://www.snort.org/"
+SRC_URI="http://www.snort.org/dl/${P}.tar.gz
+	snortsam? ( http://www.snortsam.net/files/snort-plugin/snortsam-patch.tar.gz )"
+#	prelude? ( http://www.prelude-ids.org/download/releases/snort-prelude-reporting-patch-0.2.5.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~sparc -alpha ~amd64"
+IUSE="ssl postgres mysql flexresp selinux snortsam"
+
+# Local useflag snortsam: patch snort for use with snortsam package.
+
+# snort 2.1.x does not have prelude patches yet
+# IUSE="${IUSE} prelude"
+# snort 2.1.x has discontinued smb alert output, and no 3rd party have done them yet
+# IUSE="${IUSE} samba"
+# snort 2.0.x does not support snmp yet Bug #26310 (2.1.x doesn't have SNMP either)
+# IUSE="${IUSE} snmp"
+
+
+DEPEND="virtual/glibc
+	>=dev-libs/libpcre-4.2-r1
+	>=net-libs/libpcap-0.6.2-r1
+	flexresp? (	<net-libs/libnet-1.1
+				>=net-libs/libnet-1.0.2a-r3 )
+	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 )
+#	snmp? ( >=net-analyzer/net-snmp-5.0 )
+RDEPEND="virtual/glibc
+	>=dev-libs/libpcre-4.2-r1
+	dev-lang/perl
+	>=net-libs/libpcap-0.6.2-r1
+	postgres? ( >=dev-db/postgresql-7.2 )
+	mysql? ( >=dev-db/mysql-3.23.26 )
+	ssl? ( >=dev-libs/openssl-0.9.6b )
+	selinux? ( sec-policy/selinux-snort )
+	snortsam? ( net-analyzer/snortsam )"
+#	samba? ( net-fs/samba )
+#	prelude? ( >=dev-libs/libprelude-0.8 )
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	#is this needed in 2.0? -Method
+	#epatch ${FILESDIR}/${P}-configure.patch
+	use flexresp && epatch ${FILESDIR}/${PV}-libnet-1.0.patch
+
+	epatch ${FILESDIR}/${P}-gcc3.patch
+
+	#epatch ${FILESDIR}/snort-drop-calculation.diff
+
+	sed -i "s:var RULE_PATH ../rules:var RULE_PATH /etc/snort:" etc/snort.conf
+
+	# Prelude patch currently not compatible with 2.1.0
+	#use prelude && (
+	#	epatch ../${P/.1.0/.0.2}-prelude.diff
+	#	sh ./autogen.sh
+	#)
+
+	use snortsam && (
+		cd ..
+		./patchsnort.sh ${S}
+		cd ${S}
+	)
+}
+
+src_compile() {
+	local myconf
+	use flexresp && myconf="$myconf --enable-flexresp" # There is no --diable-flexresp, can't use use_enable
+#	use samba && myconf="$myconf --enable-smbalerts" # There is no --diable-smbalerts, can't use use_enable
+
+#		`use_with snmp` \
+#		 --enable-pthreads \ # Not supported, never was, and now also removed
+#		`use_with prelude` \
+
+	econf \
+		`use_with postgres postgresql` \
+		`use_with mysql` \
+		`use_with ssl openssl` \
+		--without-odbc \
+		--without-oracle \
+		$myconf || die "bad ./configure"
+
+	emake || die "compile problem"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	dodir /var/log/snort
+	keepdir /var/log/snort/
+
+	insinto /usr/lib/snort/bin
+	doins contrib/{create_mysql,snortlog,*.pl}
+
+	dodoc COPYING LICENSE doc/*
+	docinto contrib ; dodoc contrib/*
+
+	insinto /etc/snort
+	doins etc/reference.config etc/classification.config rules/*.rules etc/*.map etc/threshold.conf
+	#use prelude && doins etc/prelude-classification.config
+	newins etc/snort.conf snort.conf.distrib
+
+	exeinto /etc/init.d ; newexe ${FILESDIR}/snort.rc6 snort
+	insinto /etc/conf.d ; newins ${FILESDIR}/snort.confd snort
+}
+
+pkg_postinst() {
+	enewgroup snort
+	enewuser snort -1 /dev/null /var/log/snort snort
+	usermod -d "/var/log/snort" snort || die "usermod problem"
+	usermod -g "snort" snort || die "usermod problem"
+	usermod -s "/dev/null" snort || die "usermod problem"
+	echo "ignore any message about CREATE_HOME above..."
+
+	chown snort:snort /var/log/snort
+	chmod 0770 /var/log/snort
+}