Version bump. Closing #29609 and #32950.

6 files changed, 179 insertions, 3 deletions

diff --git a/net-analyzer/snort/ChangeLog b/net-analyzer/snort/ChangeLog
index eb735f781284..b169057f718d 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.22 2003/10/28 14:44:27 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v 1.23 2003/11/24 10:44:39 aliz Exp $
+
+*snort-2.0.5 (24 Nov 2003)
+
+  24 Nov 2003; Daniel Ahlberg <aliz@gentoo.org> snort-2.0.5.ebuild :
+  Version bump. Closing #29609 and #32950.
 
   28 Oct 2003; Martin Holzer <mholzer@gentoo.org> snort-2.0.2.ebuild:
   adding gcc3 patch. Closes #30540.
diff --git a/net-analyzer/snort/Manifest b/net-analyzer/snort/Manifest
index c2ba73ebc1ce..6f251373e35c 100644
--- a/net-analyzer/snort/Manifest
+++ b/net-analyzer/snort/Manifest
@@ -1,11 +1,11 @@
 MD5 1bdc9c99864b80883e3920e9fdb64cec snort-2.0.1-r1.ebuild 2736
 MD5 b88b02813405df5cc5ae3149269cd6b3 snort-1.9.1-r1.ebuild 2811
 MD5 010b32b3eb596ccc7aede84f60aafb28 snort-1.9.1-r3.ebuild 2293
-MD5 f732ce58613242621ceed19e8a96351e snort-2.0.5.ebuild 2651
+MD5 be2468a5345f6662aae552ab8c7d6ac5 snort-2.0.5.ebuild 2648
 MD5 dfd6245d1d9061c2b4f6e55a0e45fe4f snort-2.0.0.ebuild 2987
 MD5 7b6d0a92b8ed5084b0173f1cd1d2905d snort-2.0.2.ebuild 2651
 MD5 65915f2fc42392b23eeaa1fe96f218c9 snort-1.9.1-r2.ebuild 2804
-MD5 d66befb8651c581d460d52ab6b84c19d ChangeLog 4599
+MD5 84e57f2f70688908b8650b5023d966f5 ChangeLog 4737
 MD5 15408a678cbad1f26faa4878550ddbd9 metadata.xml 956
 MD5 9a53009d3e2fabbb1cc15710a91b684d files/snort.rc6 781
 MD5 513637a4fadce14177bf85e97e5931f8 files/snort-2.0.2-gcc3.patch 350
@@ -15,6 +15,7 @@ MD5 fe6a25fdd3c6d4b527d89c51d78b8f36 files/2.0.1-libnet-1.0.patch 2753
 MD5 c57b7870750dc2c7d6e78af937fefc4b files/digest-snort-2.0.0 64
 MD5 108c39f03b69a47daeb6d7d066830f15 files/digest-snort-2.0.2 136
 MD5 72fcf2ac8274916456a4b43269692a69 files/digest-snort-2.0.5 136
+MD5 513637a4fadce14177bf85e97e5931f8 files/snort-2.0.5-gcc3.patch 350
 MD5 4a957dd6316ffe54d0a8c3f5780aac10 files/digest-snort-1.9.1-r1 63
 MD5 4a957dd6316ffe54d0a8c3f5780aac10 files/digest-snort-1.9.1-r2 63
 MD5 4a957dd6316ffe54d0a8c3f5780aac10 files/digest-snort-1.9.1-r3 63
@@ -22,5 +23,6 @@ MD5 891c0d6b2028a15a44c40ba3f131192d files/snort-1.9.0-gentoo.diff 384
 MD5 c9c8c46d1a7e6847025090e76d9a9f64 files/snort-1.9.1-configure.patch 375
 MD5 fe6a25fdd3c6d4b527d89c51d78b8f36 files/2.0.2-libnet-1.0.patch 2753
 MD5 446f8d2b3435b8a6be738da978670605 files/snort.confd 423
+MD5 fe6a25fdd3c6d4b527d89c51d78b8f36 files/2.0.5-libnet-1.0.patch 2753
 MD5 6892a20ff14df4a1de3a08e966d2f106 files/digest-snort-2.0.1-r1 136
 MD5 20eeb720d24e091ead1b128bc4981748 files/snort-1.9.1-alpha-core_vuln.diff 9864
diff --git a/net-analyzer/snort/files/2.0.5-libnet-1.0.patch b/net-analyzer/snort/files/2.0.5-libnet-1.0.patch
new file mode 100644
index 000000000000..c26fa717ba1c
--- /dev/null
+++ b/net-analyzer/snort/files/2.0.5-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.0.5 b/net-analyzer/snort/files/digest-snort-2.0.5
new file mode 100644
index 000000000000..6aa85c0c7191
--- /dev/null
+++ b/net-analyzer/snort/files/digest-snort-2.0.5
@@ -0,0 +1,2 @@
+MD5 f129ee00a3d6e7b7c1ff4a1e1fba3a08 snort-2.0.5.tar.gz 1951308
+MD5 ae55efd9ad3cddaf563a9bdbedae6c4a snort-2.0.1+prelude.patch.gz 94867
diff --git a/net-analyzer/snort/files/snort-2.0.5-gcc3.patch b/net-analyzer/snort/files/snort-2.0.5-gcc3.patch
new file mode 100644
index 000000000000..972aee39c74a
--- /dev/null
+++ b/net-analyzer/snort/files/snort-2.0.5-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.5.ebuild b/net-analyzer/snort/snort-2.0.5.ebuild
new file mode 100644
index 000000000000..6848de313fc3
--- /dev/null
+++ b/net-analyzer/snort/snort-2.0.5.ebuild
@@ -0,0 +1,98 @@
+# 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.5.ebuild,v 1.1 2003/11/24 10:44:39 aliz 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? ( mirror://gentoo/${P/.5/.1}+prelude.patch.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~sparc -alpha"
+IUSE="ssl postgres mysql prelude"
+# snort 2.0.x does not support snmp yet Bug #26310
+# IUSE="${IUSE} snmp"
+
+DEPEND="virtual/glibc
+	>=net-libs/libpcap-0.6.2-r1
+	<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 )
+	prelude? ( >=dev-libs/libprelude-0.8 )"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	#is this needed in 2.0? -Method
+	#epatch ${FILESDIR}/${P}-configure.patch
+	epatch ${FILESDIR}/${PV}-libnet-1.0.patch
+
+	epatch ${FILESDIR}/${P}-gcc3.patch
+
+	sed "s:var RULE_PATH ../rules:var RULE_PATH /etc/snort:" < etc/snort.conf > etc/snort.conf.distrib
+
+	use prelude && epatch ../${P/.5/.1}+prelude.patch
+}
+
+src_compile() {
+#		`use_with snmp` \
+	econf \
+		`use_with postgres postgresql` \
+		`use_with mysql` \
+		`use_with ssl openssl` \
+		`use_with prelude` \
+		--without-odbc \
+		--without-oracle \
+		--enable-pthreads \
+		--enable-flexresp \
+		--enable-smbalerts \
+		|| 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
+	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
+}