purge. bump. repeat.

9 files changed, 47 insertions, 288 deletions

diff --git a/net-analyzer/snort/ChangeLog b/net-analyzer/snort/ChangeLog
index 4928ceb53b39..9da8633a4db4 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.46 2004/07/01 20:18:32 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v 1.47 2004/08/15 12:06:50 eldad Exp $
+
+*snort-2.2.0 (15 Aug 2004)
+
+  15 Aug 2004; Eldad Zack <eldad@gentoo.org> -snort-2.1.0-r1.ebuild,
+  -snort-2.1.0.ebuild, +snort-2.2.0.ebuild:
+  Version bump
 
   01 Jul 2004; Jon Hood <squinky86@gentoo.org> snort-2.0.6.ebuild,
   snort-2.1.0-r1.ebuild, snort-2.1.0.ebuild, snort-2.1.1.ebuild,
diff --git a/net-analyzer/snort/Manifest b/net-analyzer/snort/Manifest
index 367f580932e1..fdcb9e1f50ed 100644
--- a/net-analyzer/snort/Manifest
+++ b/net-analyzer/snort/Manifest
@@ -1,38 +1,24 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 07860ae96776002e9ae119dbde42f92d snort-2.1.2.ebuild 3519
+MD5 13070b052b32f277593fdc28ce39b2d5 snort-2.2.0.ebuild 3802
+MD5 8f89d5403bedc2791b69f44b0813bfef snort-2.0.6.ebuild 3139
+MD5 13070b052b32f277593fdc28ce39b2d5 snort-2.1.3.ebuild 3802
 MD5 927dc6b501ab7f4bf7923c84d1a73705 ChangeLog 9275
 MD5 f629e6b9c8a922659de794d67f0cd115 metadata.xml 928
-MD5 13070b052b32f277593fdc28ce39b2d5 snort-2.1.3.ebuild 3802
-MD5 8f89d5403bedc2791b69f44b0813bfef snort-2.0.6.ebuild 3139
-MD5 1d1e3bbbda9a9f7332dc2ce3bd4d5a68 snort-2.1.0-r1.ebuild 3669
-MD5 74c5b90ce4a7829b9fbe2e22a779f240 snort-2.1.0.ebuild 3467
-MD5 dc75508b8c1befcafb649563b5da53fa snort-2.1.1.ebuild 3513
-MD5 07860ae96776002e9ae119dbde42f92d snort-2.1.2.ebuild 3519
-MD5 ca486c6119dbf106f900a3b51e4f3985 files/digest-snort-2.1.3 129
-MD5 513637a4fadce14177bf85e97e5931f8 files/snort-2.1.3-gcc3.patch 350
-MD5 ea783bd276257a20df5b6537d3ff5d49 files/snort-drop-calculation.diff 4957
-MD5 446f8d2b3435b8a6be738da978670605 files/snort.confd 423
+MD5 fe6a25fdd3c6d4b527d89c51d78b8f36 files/2.1.0-libnet-1.0.patch 2753
 MD5 919058894f4983c35900bc8bb98a96d4 files/snort.rc6 764
+MD5 ea783bd276257a20df5b6537d3ff5d49 files/snort-drop-calculation.diff 4957
+MD5 fe6a25fdd3c6d4b527d89c51d78b8f36 files/2.0.6-libnet-1.0.patch 2753
 MD5 202dd3be05b16c852303a04284eba720 files/digest-snort-2.0.6 150
+MD5 cfa70b4b7a18ef0615bd6a8681ace3e2 files/digest-snort-2.1.2 64
+MD5 ca486c6119dbf106f900a3b51e4f3985 files/digest-snort-2.1.3 129
+MD5 a654db9256f89b77a9ce482c976dc896 files/digest-snort-2.2.0 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
-MD5 fe6a25fdd3c6d4b527d89c51d78b8f36 files/2.1.0-libnet-1.0.patch 2753
-MD5 7c11e6d5a07263b09e86572d96222d09 files/digest-snort-2.1.0 150
-MD5 37a67a034efff43a090ca4c84bc65251 files/digest-snort-2.1.0-r1 64
 MD5 513637a4fadce14177bf85e97e5931f8 files/snort-2.1.0-gcc3.patch 350
-MD5 5379f2b178725088a8757ef25c77775c files/snort-2.1.0-pgsql.patch 645
-MD5 fe6a25fdd3c6d4b527d89c51d78b8f36 files/2.0.6-libnet-1.0.patch 2753
-MD5 fe6a25fdd3c6d4b527d89c51d78b8f36 files/2.1.1-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 cfa70b4b7a18ef0615bd6a8681ace3e2 files/digest-snort-2.1.2 64
-MD5 513637a4fadce14177bf85e97e5931f8 files/snort-2.1.2-gcc3.patch 350
+MD5 446f8d2b3435b8a6be738da978670605 files/snort.confd 423
+MD5 513637a4fadce14177bf85e97e5931f8 files/snort-2.1.1-gcc3.patch 350
 MD5 fe6a25fdd3c6d4b527d89c51d78b8f36 files/2.1.2-libnet-1.0.patch 2753
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.8 (GNU/Linux)
-
-iD8DBQFBCqzuHTu7gpaalycRAjmQAKDeS4QklbXXSV8LEKUA4CavYzgExwCeIgbK
-bdIQBFLwLsQEVWFaUEWbPCs=
-=8gfQ
------END PGP SIGNATURE-----
+MD5 513637a4fadce14177bf85e97e5931f8 files/snort-2.1.2-gcc3.patch 350
+MD5 513637a4fadce14177bf85e97e5931f8 files/snort-2.1.3-gcc3.patch 350
diff --git a/net-analyzer/snort/files/digest-snort-2.1.0 b/net-analyzer/snort/files/digest-snort-2.1.0
deleted file mode 100644
index 0eab5dafe236..000000000000
--- a/net-analyzer/snort/files/digest-snort-2.1.0
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 1da6d683d18b39a72a3c277e8deffc69 snort-2.1.0.tar.gz 2244701
-MD5 7fd78d7bb755227c5acec7bfecdb94f7 snort-prelude-reporting-patch-0.2.5.tar.gz 39277
diff --git a/net-analyzer/snort/files/digest-snort-2.1.0-r1 b/net-analyzer/snort/files/digest-snort-2.1.0-r1
deleted file mode 100644
index fd009597ec05..000000000000
--- a/net-analyzer/snort/files/digest-snort-2.1.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1da6d683d18b39a72a3c277e8deffc69 snort-2.1.0.tar.gz 2244701
diff --git a/net-analyzer/snort/files/digest-snort-2.1.1 b/net-analyzer/snort/files/digest-snort-2.1.1
deleted file mode 100644
index a0eae381c199..000000000000
--- a/net-analyzer/snort/files/digest-snort-2.1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f53ce230616c1f6aafedf546a7cc0f0f snort-2.1.1.tar.gz 2309735
diff --git a/net-analyzer/snort/files/digest-snort-2.2.0 b/net-analyzer/snort/files/digest-snort-2.2.0
new file mode 100644
index 000000000000..da125d9c3643
--- /dev/null
+++ b/net-analyzer/snort/files/digest-snort-2.2.0
@@ -0,0 +1,2 @@
+MD5 6194278217e4e3f733b046256a31f0e6 snort-2.2.0.tar.gz 2498466
+MD5 b515ee767b9889303e4a9b14dee5b078 snortsam-patch.tar.gz 29496
diff --git a/net-analyzer/snort/snort-2.1.0-r1.ebuild b/net-analyzer/snort/snort-2.1.0-r1.ebuild
deleted file mode 100644
index 6183e8212509..000000000000
--- a/net-analyzer/snort/snort-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# 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.0-r1.ebuild,v 1.3 2004/07/01 20:18:32 squinky86 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/libc
-	>=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/libc
-	>=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
-}
diff --git a/net-analyzer/snort/snort-2.1.1.ebuild b/net-analyzer/snort/snort-2.1.1.ebuild
deleted file mode 100644
index c7c053d72058..000000000000
--- a/net-analyzer/snort/snort-2.1.1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# 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.1.ebuild,v 1.6 2004/07/01 20:18:32 squinky86 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 selinux"
-# 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/libc
-	>=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/libc
-	>=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 )"
-#	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
-	#)
-}
-
-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
-}
diff --git a/net-analyzer/snort/snort-2.1.0.ebuild b/net-analyzer/snort/snort-2.2.0.ebuild
index 2f5fda01e85f..2fdec86e4b25 100644
--- a/net-analyzer/snort/snort-2.1.0.ebuild
+++ b/net-analyzer/snort/snort-2.2.0.ebuild
@@ -1,18 +1,22 @@
 # 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.0.ebuild,v 1.5 2004/07/01 20:18:32 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.2.0.ebuild,v 1.1 2004/08/15 12:06:50 eldad Exp $
 
-inherit eutils
+inherit eutils gnuconfig
 
 DESCRIPTION="Libpcap-based packet sniffer/logger/lightweight IDS"
 HOMEPAGE="http://www.snort.org/"
-SRC_URI="http://www.snort.org/dl/${P}.tar.gz"
+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"
+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
@@ -37,7 +41,9 @@ RDEPEND="virtual/libc
 	>=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 )"
+	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 )
 
@@ -45,13 +51,15 @@ src_unpack() {
 	unpack ${A}
 
 	cd ${S}
+	gnuconfig_update
+
 	#is this needed in 2.0? -Method
 	#epatch ${FILESDIR}/${P}-configure.patch
-	use flexresp && epatch ${FILESDIR}/${PV}-libnet-1.0.patch
+	use flexresp && epatch ${FILESDIR}/2.1.2-libnet-1.0.patch
 
-	epatch ${FILESDIR}/${P}-gcc3.patch
+	epatch ${FILESDIR}/snort-2.1.3-gcc3.patch
 
-	epatch ${FILESDIR}/snort-drop-calculation.diff
+	#epatch ${FILESDIR}/snort-drop-calculation.diff
 
 	sed -i "s:var RULE_PATH ../rules:var RULE_PATH /etc/snort:" etc/snort.conf
 
@@ -60,6 +68,12 @@ src_unpack() {
 	#	epatch ../${P/.1.0/.0.2}-prelude.diff
 	#	sh ./autogen.sh
 	#)
+
+	use snortsam && (
+		cd ..
+		./patchsnort.sh ${S}
+		cd ${S}
+	)
 }
 
 src_compile() {