New upstream version. Closes #44067.

7 files changed, 217 insertions, 2 deletions

diff --git a/net-analyzer/snort/ChangeLog b/net-analyzer/snort/ChangeLog
index 77180101ebed..100f549b8679 100644
--- a/net-analyzer/snort/ChangeLog
+++ b/net-analyzer/snort/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/snort
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v 1.33 2004/03/08 17:23:10 mboman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v 1.34 2004/03/09 00:55:52 mboman Exp $
+
+*snort-2.1.1 (09 Mar 2004)
+
+  09 Mar 2004; Michael Boman <mboman@gentoo.org> snort-2.1.1.ebuild,
+  files/2.1.1-libnet-1.0.patch, files/snort-2.1.1-gcc3.patch,
+  files/snort-2.1.1-pgsql.patch:
+  New upstream version. Closes #44067.
 
   08 Mar 2004; Michael Boman <mboman@gentoo.org> files/2.0.6-libnet-1.0.patch:
   Added missing file. Closing bug #43990.
diff --git a/net-analyzer/snort/Manifest b/net-analyzer/snort/Manifest
index c38fe7866f82..f2e54750d600 100644
--- a/net-analyzer/snort/Manifest
+++ b/net-analyzer/snort/Manifest
@@ -1,4 +1,4 @@
-MD5 1863bf25dc563185e09f5d6dcb7c4c3f ChangeLog 7024
+MD5 135b214128e11b7487bbb853a1a85e74 ChangeLog 7256
 MD5 9c6b611339af7149d67f677a96d398db metadata.xml 930
 MD5 6b8e74b31bd8b33a1abf5099637de1f1 snort-1.9.1-r3.ebuild 2280
 MD5 8d46f6a0e861639987d7340b883c0e9f snort-2.0.0.ebuild 3047
@@ -10,6 +10,7 @@ MD5 98b1c38ace076a3c4ba465a3bfac1693 snort-2.0.5.ebuild 2650
 MD5 6b11ef1508669652a616528841ab6204 snort-2.0.6.ebuild 3141
 MD5 51ee9de48d3300ec9fd8cae6a3a9f254 snort-2.1.0-r1.ebuild 3677
 MD5 014d046c5d18051acd026b58b67807e3 snort-2.1.0.ebuild 3487
+MD5 7414a84d7fa6a516dcdc1926ce05e747 snort-2.1.1.ebuild 3487
 MD5 a45c40b1fd8165ed1e9616808d8f4d41 files/1.9.1-libnet-1.0.patch 2907
 MD5 79f3f73bc2f906d80d46bbb2e5816c81 files/2.0.0-libnet-1.0.patch 2679
 MD5 fe6a25fdd3c6d4b527d89c51d78b8f36 files/2.0.1-libnet-1.0.patch 2753
@@ -39,3 +40,7 @@ MD5 ea783bd276257a20df5b6537d3ff5d49 files/snort-drop-calculation.diff 4957
 MD5 446f8d2b3435b8a6be738da978670605 files/snort.confd 423
 MD5 c74e62bbbd323e3ab1bda711f6d1875f files/snort.rc6 771
 MD5 fe6a25fdd3c6d4b527d89c51d78b8f36 files/2.0.6-libnet-1.0.patch 2753
+MD5 a0a2702875fd25016f4e627cf801edb9 files/digest-snort-2.1.1 64
+MD5 513637a4fadce14177bf85e97e5931f8 files/snort-2.1.1-gcc3.patch 350
+MD5 5379f2b178725088a8757ef25c77775c files/snort-2.1.1-pgsql.patch 645
+MD5 fe6a25fdd3c6d4b527d89c51d78b8f36 files/2.1.1-libnet-1.0.patch 2753
diff --git a/net-analyzer/snort/files/2.1.1-libnet-1.0.patch b/net-analyzer/snort/files/2.1.1-libnet-1.0.patch
new file mode 100644
index 000000000000..c26fa717ba1c
--- /dev/null
+++ b/net-analyzer/snort/files/2.1.1-libnet-1.0.patch
@@ -0,0 +1,57 @@
+--- configure.orig	2003-08-19 01:19:05.948824752 -0400
++++ configure	2003-08-19 01:19:06.212784624 -0400
+@@ -6376 +6376 @@
+-   CPPFLAGS="${CPPFLAGS} -DENABLE_RESPONSE `libnet-config --defines --cflags`" LDFLAGS="${LDFLAGS} `libnet-config --libs`"
++   CPPFLAGS="${CPPFLAGS} -DENABLE_RESPONSE `libnet-1.0-config --defines --cflags`" LDFLAGS="${LDFLAGS} `libnet-1.0-config --libs`"
+@@ -6382 +6382 @@
+-  if test `libnet-config --cflags | wc -c` = "1"; then
++  if test `libnet-1.0-config --cflags | wc -c` = "1"; then
+@@ -6387,3 +6387,3 @@
+-  if test `libnet-config --libs | wc -c` = "1"; then
+-    { echo "$as_me:$LINENO: WARNING: libnet-config --libs is broken on your system.  If you" >&5
+-echo "$as_me: WARNING: libnet-config --libs is broken on your system.  If you" >&2;}
++  if test `libnet-1.0-config --libs | wc -c` = "1"; then
++    { echo "$as_me:$LINENO: WARNING: libnet-1.0-config --libs is broken on your system.  If you" >&5
++echo "$as_me: WARNING: libnet-1.0-config --libs is broken on your system.  If you" >&2;}
+@@ -6395 +6395 @@
+-    LIBS="${LIBS} -lnet"
++    LIBS="${LIBS} -lnet-1.0"
+@@ -6400 +6400 @@
+-for ac_header in libnet.h
++for ac_header in libnet-1.0.h
+@@ -6533 +6533 @@
+-    libnet_dir=`libnet-config --cflags | cut -dI -f2`
++    libnet_dir=`libnet-1.0-config --cflags | cut -dI -f2`
+@@ -6538 +6538 @@
+-    if test -r $i/libnet.h; then
++    if test -r $i/libnet-1.0.h; then
+@@ -6544 +6544 @@
+-    if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet.h | grep -v 1.0.2a >/dev/null"; then
++    if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet-1.0.h | grep -v 1.0.2a >/dev/null"; then
+@@ -6555 +6555 @@
+-   echo "  ERROR: unable to find" "libnet 1.0.2a (libnet.h)"
++   echo "  ERROR: unable to find" "libnet 1.0.2a (libnet-1.0.h)"
+@@ -6574 +6574 @@
+-   echo "  ERROR: unable to find" "libnet 1.0.2a (libnet.h)"
++   echo "  ERROR: unable to find" "libnet 1.0.2a (libnet-1.0.h)"
+@@ -6587,2 +6587,2 @@
+-echo "$as_me:$LINENO: checking for libnet_build_ip in -lnet" >&5
+-echo $ECHO_N "checking for libnet_build_ip in -lnet... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking for libnet_build_ip in -lnet-1.0" >&5
++echo $ECHO_N "checking for libnet_build_ip in -lnet-1.0... $ECHO_C" >&6
+@@ -6593 +6593 @@
+-LIBS="-lnet  $LIBS"
++LIBS="-lnet-1.0  $LIBS"
+@@ -6647 +6647 @@
+-  LIBS="-lnet $LIBS"
++  LIBS="-lnet-1.0 $LIBS"
+--- src/detection-plugins/sp_react.c.orig	2003-08-19 01:19:06.106800736 -0400
++++ src/detection-plugins/sp_react.c	2003-08-19 01:19:06.220783408 -0400
+@@ -56 +56 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+--- src/detection-plugins/sp_respond.c.orig	2003-08-19 01:19:06.111799976 -0400
++++ src/detection-plugins/sp_respond.c	2003-08-19 01:19:06.225782648 -0400
+@@ -33 +33 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
diff --git a/net-analyzer/snort/files/digest-snort-2.1.1 b/net-analyzer/snort/files/digest-snort-2.1.1
new file mode 100644
index 000000000000..a0eae381c199
--- /dev/null
+++ b/net-analyzer/snort/files/digest-snort-2.1.1
@@ -0,0 +1 @@
+MD5 f53ce230616c1f6aafedf546a7cc0f0f snort-2.1.1.tar.gz 2309735
diff --git a/net-analyzer/snort/files/snort-2.1.1-gcc3.patch b/net-analyzer/snort/files/snort-2.1.1-gcc3.patch
new file mode 100644
index 000000000000..972aee39c74a
--- /dev/null
+++ b/net-analyzer/snort/files/snort-2.1.1-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/files/snort-2.1.1-pgsql.patch b/net-analyzer/snort/files/snort-2.1.1-pgsql.patch
new file mode 100644
index 000000000000..46d62711ea12
--- /dev/null
+++ b/net-analyzer/snort/files/snort-2.1.1-pgsql.patch
@@ -0,0 +1,17 @@
+Index: configure.in
+===================================================================
+RCS file: /cvsroot/snort/snort/configure.in,v
+retrieving revision 1.129
+diff -u -b -B -w -p -r1.129 configure.in
+--- configure.in	17 Dec 2003 21:25:13 -0000	1.129
++++ configure.in	8 Jan 2004 11:50:34 -0000
+@@ -511,6 +511,9 @@ if test "$with_postgresql" != "no"; then
+     elif test -r $i/include/postgresql/libpq-fe.h; then
+       POSTGRESQL_DIR=$i
+       POSTGRESQL_INC_DIR=$i/include/postgresql
++    elif test -r $i/include/postgresql/pgsql/libpq-fe.h; then
++      POSTGRESQL_DIR=$i
++      POSTGRESQL_INC_DIR=$i/include/postgresql/pgsql
+     fi
+   done
+ 
diff --git a/net-analyzer/snort/snort-2.1.1.ebuild b/net-analyzer/snort/snort-2.1.1.ebuild
new file mode 100644
index 000000000000..d1436f8de111
--- /dev/null
+++ b/net-analyzer/snort/snort-2.1.1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.1.1.ebuild,v 1.1 2004/03/09 00:55:52 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 flexresp"
+# 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 )"
+#	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
+
+	# Prelude patch currently not compatible with 2.1.0
+	#use prelude && (
+	#	epatch ../${P/.1.0/.0.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
+#		`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
+	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
+}