Made use of 'doc' USE flag to install signature documentation. Patched configure.in to solve bug #37436.

5 files changed, 156 insertions, 3 deletions

diff --git a/net-analyzer/snort/ChangeLog b/net-analyzer/snort/ChangeLog
index 5a2c55812ded..ae880e62e285 100644
--- a/net-analyzer/snort/ChangeLog
+++ b/net-analyzer/snort/ChangeLog
@@ -1,6 +1,13 @@
 # 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.30 2004/01/07 08:23:54 mboman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v 1.31 2004/01/08 12:47:02 mboman Exp $
+
+*snort-2.1.0-r1 (08 Jan 2004)
+
+  08 Jan 2004; Michael Boman <mboman@gentoo.org> snort-2.1.0-r1.ebuild,
+  files/snort-2.1.0-pgsql.patch:
+  Made use of 'doc' USE flag to install signature documentation. Patched
+  configure.in to solve bug #37436.
 
   07 Jan 2004; Michael Boman <mboman@gentoo.org> snort-2.1.0.ebuild:
   Forgot to include the threshold.conf file in the installation process.
diff --git a/net-analyzer/snort/Manifest b/net-analyzer/snort/Manifest
index 3938de451569..d563b204e6a4 100644
--- a/net-analyzer/snort/Manifest
+++ b/net-analyzer/snort/Manifest
@@ -1,4 +1,4 @@
-MD5 83fd5c634c281f971e09db5281e1951e ChangeLog 6501
+MD5 2f8fff0f718892206c8a83fcd76621bd ChangeLog 6747
 MD5 9c6b611339af7149d67f677a96d398db metadata.xml 930
 MD5 f80a28eb514d54c97e9962eebf935123 snort-2.0.5-r2.ebuild 3146
 MD5 79836b130237a48f6a340de4d8892bf2 snort-2.0.6.ebuild 3143
@@ -9,7 +9,7 @@ MD5 02c960da9a74fdb00a4dfbccccb5cdc2 snort-2.0.2.ebuild 2650
 MD5 ab7b8bc6bdd9ab9e2ddec0598f26a9f0 snort-2.0.5-r1.ebuild 3010
 MD5 98b1c38ace076a3c4ba465a3bfac1693 snort-2.0.5.ebuild 2650
 MD5 014d046c5d18051acd026b58b67807e3 snort-2.1.0.ebuild 3487
-MD5 8a328bae1d7e764802a4467a2b33eb63 snort-2.1.0-r1.ebuild 3674
+MD5 51ee9de48d3300ec9fd8cae6a3a9f254 snort-2.1.0-r1.ebuild 3677
 MD5 a45c40b1fd8165ed1e9616808d8f4d41 files/1.9.1-libnet-1.0.patch 2907
 MD5 fe6a25fdd3c6d4b527d89c51d78b8f36 files/2.0.1-libnet-1.0.patch 2753
 MD5 fe6a25fdd3c6d4b527d89c51d78b8f36 files/2.0.2-libnet-1.0.patch 2753
diff --git a/net-analyzer/snort/files/digest-snort-2.1.0-r1 b/net-analyzer/snort/files/digest-snort-2.1.0-r1
new file mode 100644
index 000000000000..fd009597ec05
--- /dev/null
+++ b/net-analyzer/snort/files/digest-snort-2.1.0-r1
@@ -0,0 +1 @@
+MD5 1da6d683d18b39a72a3c277e8deffc69 snort-2.1.0.tar.gz 2244701
diff --git a/net-analyzer/snort/files/snort-2.1.0-pgsql.patch b/net-analyzer/snort/files/snort-2.1.0-pgsql.patch
new file mode 100644
index 000000000000..46d62711ea12
--- /dev/null
+++ b/net-analyzer/snort/files/snort-2.1.0-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.0-r1.ebuild b/net-analyzer/snort/snort-2.1.0-r1.ebuild
new file mode 100644
index 000000000000..48321d707f01
--- /dev/null
+++ b/net-analyzer/snort/snort-2.1.0-r1.ebuild
@@ -0,0 +1,128 @@
+# 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.0-r1.ebuild,v 1.1 2004/01/08 12:47:02 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 doc"
+# 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
+	#)
+
+	use postgres && (
+		epatch ${FILESDIR}/${P}-pgsql.patch
+		aclocal
+		autoheader
+		automake --add-missing
+		autoconf
+	)
+}
+
+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/*
+	use doc && (
+		docinto signatures
+		dodoc doc/signatures/*
+	)
+
+	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
+}