New upstream version. This is the last version in the 2.0.x series.

5 files changed, 131 insertions, 3 deletions

diff --git a/net-analyzer/snort/ChangeLog b/net-analyzer/snort/ChangeLog
index 76d6b348a2ff..a17f8cb4c319 100644
--- a/net-analyzer/snort/ChangeLog
+++ b/net-analyzer/snort/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/snort
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v 1.27 2003/12/20 16:48:53 mboman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v 1.28 2003/12/21 03:53:11 mboman Exp $
+
+*snort-2.0.6 (21 Dec 2003)
+
+  21 Dec 2003; Michael Boman <mboman@gentoo.org> snort-2.0.6.ebuild:
+  New upstream version
 
   20 Dec 2003; Michael Boman <mboman@gentoo.org> snort-2.0.5-r2.ebuild:
   Bump to stable on x86
diff --git a/net-analyzer/snort/Manifest b/net-analyzer/snort/Manifest
index f2d38e87d1d2..6c6bd2ae1abe 100644
--- a/net-analyzer/snort/Manifest
+++ b/net-analyzer/snort/Manifest
@@ -1,7 +1,7 @@
-MD5 7c88ec79d1f2d48c48df59ccbdaf3c07 ChangeLog 5902
+MD5 d41e65840935bc7acd88bbf61e15d8e8 ChangeLog 6023
 MD5 9c6b611339af7149d67f677a96d398db metadata.xml 930
 MD5 f80a28eb514d54c97e9962eebf935123 snort-2.0.5-r2.ebuild 3146
-MD5 e1144542473f559b33cdeca5f85022e0 snort-2.0.6.ebuild 3147
+MD5 5cf6cb439a158c243eb718af43bd2ce5 snort-2.0.6.ebuild 3144
 MD5 6b8e74b31bd8b33a1abf5099637de1f1 snort-1.9.1-r3.ebuild 2280
 MD5 8d46f6a0e861639987d7340b883c0e9f snort-2.0.0.ebuild 3047
 MD5 0c4f28771a4096a1dc044f13ea500bff snort-2.0.1-r1.ebuild 2734
@@ -30,3 +30,4 @@ MD5 513637a4fadce14177bf85e97e5931f8 files/snort-2.0.5-gcc3.patch 350
 MD5 f0da97d8f9acc787973aa956caebb66c files/digest-snort-2.0.5-r1 150
 MD5 ea783bd276257a20df5b6537d3ff5d49 files/snort-drop-calculation.diff 4957
 MD5 202dd3be05b16c852303a04284eba720 files/digest-snort-2.0.6 150
+MD5 513637a4fadce14177bf85e97e5931f8 files/snort-2.0.6-gcc3.patch 350
diff --git a/net-analyzer/snort/files/digest-snort-2.0.6 b/net-analyzer/snort/files/digest-snort-2.0.6
new file mode 100644
index 000000000000..8667ace13fcd
--- /dev/null
+++ b/net-analyzer/snort/files/digest-snort-2.0.6
@@ -0,0 +1,2 @@
+MD5 51123744b4e5952e2bb4156c912adacc snort-2.0.6.tar.gz 1960326
+MD5 7fd78d7bb755227c5acec7bfecdb94f7 snort-prelude-reporting-patch-0.2.5.tar.gz 39277
diff --git a/net-analyzer/snort/files/snort-2.0.6-gcc3.patch b/net-analyzer/snort/files/snort-2.0.6-gcc3.patch
new file mode 100644
index 000000000000..972aee39c74a
--- /dev/null
+++ b/net-analyzer/snort/files/snort-2.0.6-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.0.6.ebuild b/net-analyzer/snort/snort-2.0.6.ebuild
new file mode 100644
index 000000000000..2053ec25d48f
--- /dev/null
+++ b/net-analyzer/snort/snort-2.0.6.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.0.6.ebuild,v 1.1 2003/12/21 03:53:11 mboman 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
+	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 prelude flexresp samba"
+# snort 2.0.x does not support snmp yet Bug #26310
+# IUSE="${IUSE} snmp"
+
+DEPEND="virtual/glibc
+	>=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-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 )
+	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 "s:var RULE_PATH ../rules:var RULE_PATH /etc/snort:" < etc/snort.conf > etc/snort.conf.distrib
+
+	use prelude && (
+		epatch ../${P/.6/.2}-prelude.diff
+		sh ./autogen.sh
+	)
+}
+
+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
+
+	econf \
+		`use_with postgres postgresql` \
+		`use_with mysql` \
+		`use_with ssl openssl` \
+		`use_with prelude` \
+		--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
+	use prelude && doins etc/prelude-classification.config
+	doins etc/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
+}