Remove old ebuilds, depend on >=dev-libs/libprelude-0.9.0

(Portage version: 2.0.52-r1)

8 files changed, 18 insertions, 334 deletions

diff --git a/net-analyzer/snort/ChangeLog b/net-analyzer/snort/ChangeLog
index 54da73830114..2ea041227010 100644
--- a/net-analyzer/snort/ChangeLog
+++ b/net-analyzer/snort/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/snort
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v 1.83 2005/09/21 20:32:26 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v 1.84 2005/09/25 02:28:08 vanquirius Exp $
+
+  25 Sep 2005; Marcelo Goes <vanquirius@gentoo.org> -snort-2.3.0-r1.ebuild,
+  -snort-2.3.2.ebuild, snort-2.3.3-r1.ebuild, snort-2.4.1.ebuild:
+  Remove old ebuilds, depend on >=dev-libs/libprelude-0.9.0.
 
   21 Sep 2005; Mark Loeser <halcy0n@gentoo.org> snort-2.3.3.ebuild:
   Stable on x86
diff --git a/net-analyzer/snort/Manifest b/net-analyzer/snort/Manifest
index 55338626acbe..88e1a4cffcc8 100644
--- a/net-analyzer/snort/Manifest
+++ b/net-analyzer/snort/Manifest
@@ -1,26 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 f020dfc0688c51474b6f470a9c59dbda ChangeLog 15848
-MD5 53edc4328d9adeaf087c65ea94b1594b metadata.xml 246
-MD5 bca601c10581b168c51558fe0ae04ffb snort-2.3.0-r1.ebuild 4199
-MD5 8cca347231e9fe3363163759a3518c0b snort-2.3.2.ebuild 4205
-MD5 71813a2f35fde73dae622dac926c50ab snort-2.3.3-r1.ebuild 4045
 MD5 b360cb079bb12675a615301852e71a7f snort-2.3.3.ebuild 3975
-MD5 ba226a5dc5b2cea5d0df8f36fd265ab3 snort-2.4.1.ebuild 4075
+MD5 6fd0fca56a4e3d66fdd7f8508d2f2528 snort-2.4.1.ebuild 4080
+MD5 d8de6272d337c061ca1cbc23186f0f9b snort-2.3.3-r1.ebuild 4040
+MD5 1de7d85b90770f3965762a419d1de0b6 ChangeLog 16052
+MD5 53edc4328d9adeaf087c65ea94b1594b metadata.xml 246
+MD5 04f9ed946469f7954b6bd27f8f1aca39 files/digest-snort-2.3.3-r1 284
+MD5 919058894f4983c35900bc8bb98a96d4 files/snort.rc6 764
 MD5 564bfdf90fe29f5924c68885ccfcddb8 files/2.3.0-libnet-1.0.patch 5424
-MD5 a9fc70d50c4512c835aa428f4b198fae files/digest-snort-2.3.0-r1 287
-MD5 5d26c971694357c500d666e68622a120 files/digest-snort-2.3.2 287
 MD5 24851ef65be2d80a70ba4bebe3e8c0ff files/digest-snort-2.3.3 287
-MD5 04f9ed946469f7954b6bd27f8f1aca39 files/digest-snort-2.3.3-r1 284
 MD5 3ff2d04cb5adac55b4f35c28326f0fb0 files/digest-snort-2.4.1 271
 MD5 446f8d2b3435b8a6be738da978670605 files/snort.confd 423
-MD5 919058894f4983c35900bc8bb98a96d4 files/snort.rc6 764
 MD5 d212aff92317ccfae4c2228de5f9e5cb files/snort-2.3.3-log.c.diff 4781
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDMcN5CRZPokWLroQRAiOMAKCVQACZLg+mwZy25jMvg2/Zgor3+gCgqKyD
-StoXYQHpLGEf1+XMNuJJDoA=
-=YZEN
------END PGP SIGNATURE-----
diff --git a/net-analyzer/snort/files/digest-snort-2.3.0-r1 b/net-analyzer/snort/files/digest-snort-2.3.0-r1
deleted file mode 100644
index 06f1783d4394..000000000000
--- a/net-analyzer/snort/files/digest-snort-2.3.0-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 89cdc22af9516cbafc359b452819947e snort-2.3.0.tar.gz 2633245
-MD5 2eeef1a7a040d67c3afaf9d749905e47 snortsam-20050110.tar.gz 29395
-MD5 323ab2956a59de113aa13099917f0d3a snort-prelude-reporting-patch-0.3.6.tar.gz 21964
-MD5 681fa7e99aa674c0e2be4788ef503d69 sguil-sensor-0.5.3.tar.gz 89816
diff --git a/net-analyzer/snort/files/digest-snort-2.3.2 b/net-analyzer/snort/files/digest-snort-2.3.2
deleted file mode 100644
index ff86961e7a5a..000000000000
--- a/net-analyzer/snort/files/digest-snort-2.3.2
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 692602827ce9d1a611630149f8e50ec8 snort-2.3.2.tar.gz 2620487
-MD5 2eeef1a7a040d67c3afaf9d749905e47 snortsam-20050110.tar.gz 29395
-MD5 323ab2956a59de113aa13099917f0d3a snort-prelude-reporting-patch-0.3.6.tar.gz 21964
-MD5 681fa7e99aa674c0e2be4788ef503d69 sguil-sensor-0.5.3.tar.gz 89816
diff --git a/net-analyzer/snort/snort-2.3.0-r1.ebuild b/net-analyzer/snort/snort-2.3.0-r1.ebuild
deleted file mode 100644
index a620e1100679..000000000000
--- a/net-analyzer/snort/snort-2.3.0-r1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.3.0-r1.ebuild,v 1.7 2005/08/23 13:50:11 ka0ttic Exp $
-
-inherit eutils gnuconfig flag-o-matic
-
-DESCRIPTION="Libpcap-based packet sniffer/logger/lightweight IDS"
-HOMEPAGE="http://www.snort.org/"
-SRC_URI="http://www.snort.org/dl/${P}.tar.gz
-	snortsam? ( mirror://gentoo/snortsam-20050110.tar.gz )
-	prelude? ( http://www.prelude-ids.org/download/releases/snort-prelude-reporting-patch-0.3.6.tar.gz )
-	sguil? ( mirror://sourceforge/sguil/sguil-sensor-0.5.3.tar.gz )"
-
-#	snortsam? ( http://www.snortsam.net/files/snort-plugin/snortsam-patch.tar.gz )
-# Gentoo mirrored because of naming conflict with previous version
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 -sparc -alpha ~amd64 ppc"
-IUSE="ssl postgres mysql flexresp selinux snortsam odbc prelude inline sguil"
-
-# Local useflag snortsam: patch snort for use with snortsam package.
-
-
-DEPEND="virtual/libc
-	>=dev-libs/libpcre-4.2-r1
-	virtual/libpcap
-	flexresp? ( ~net-libs/libnet-1.0.2a )
-	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 )
-	odbc? ( dev-db/unixODBC )
-	inline? (
-				~net-libs/libnet-1.0.2a
-				net-firewall/iptables
-			)"
-
-RDEPEND="${DEPEND}
-	dev-lang/perl
-	selinux? ( sec-policy/selinux-snort )
-	snortsam? ( net-analyzer/snortsam )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	gnuconfig_update
-
-	if use flexresp || use inline ; then
-		epatch ${FILESDIR}/${PV}-libnet-1.0.patch
-	fi
-
-	einfo "Patching /etc/snort.conf"
-	sed -i "s:var RULE_PATH ../rules:var RULE_PATH /etc/snort:" \
-		etc/snort.conf || die "sed snort.conf failed"
-
-	if use prelude ; then
-		epatch ../snort-2.2.0-prelude-0.3.6.diff
-		sed -i -e "s:AC_PROG_RANLIB:AC_PROG_LIBTOOL:" configure.in \
-			|| die "sed configure.in failed"
-	fi
-
-	if use sguil ; then
-		cd ${S}/src/preprocessors
-		epatch ${WORKDIR}/sguil-0.5.3/sensor/snort_mods/2_1/spp_portscan_sguil.patch
-		epatch ${WORKDIR}/sguil-0.5.3/sensor/snort_mods/2_1/spp_stream4_sguil.patch
-		cd ${S}
-	fi
-
-	# need to pick up prelude and or flexresp patches
-	einfo "Regenerating autoconf/automake files"
-	autoreconf -f -i || die "autoreconf failed"
-
-	if use snortsam
-	then
-		cd ..
-		einfo "Applying snortsam patch"
-		./patchsnort.sh ${S} || die "snortsam patch failed"
-		cd ${S}
-	fi
-}
-
-src_compile() {
-	local myconf
-
-	# There is no --diable-flexresp, cannot use use_enable
-	use flexresp && myconf="${myconf} --enable-flexresp"
-
-	use inline && append-flags -I/usr/include/libipq
-
-	econf \
-		$(use_with postgres postgresql) \
-		$(use_with mysql) \
-		$(use_with ssl openssl) \
-		$(use_with odbc) \
-		--without-oracle \
-		$(use_with prelude) \
-		$(use_with sguil) \
-		$(use_enable inline) \
-		${myconf} || die "bad ./configure"
-
-	emake || die "compile problem"
-}
-
-pkg_preinst() {
-	enewgroup snort
-	enewuser snort -1 -1 /var/log/snort snort
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	keepdir /var/log/snort/
-
-	dodoc COPYING LICENSE doc/*
-	docinto schemas ; dodoc schemas/*
-
-	insinto /etc/snort
-	doins etc/reference.config etc/classification.config rules/*.rules \
-		etc/*.map etc/threshold.conf
-	newins etc/snort.conf snort.conf.distrib
-
-	use prelude && doins etc/prelude-classification.config
-
-	newinitd ${FILESDIR}/snort.rc6 snort
-	newconfd ${FILESDIR}/snort.confd snort
-
-	chown snort:snort ${D}/var/log/snort
-	chmod 0770 ${D}/var/log/snort
-}
-
-pkg_postinst() {
-	if use mysql || use postgres || use odbc
-	then
-		einfo "To use a database as a backend for snort you will have to"
-		einfo "import the correct tables to the database."
-		einfo "You will have to setup a database called snort first."
-		einfo
-		use mysql && \
-			einfo "  MySQL: zcat /usr/share/doc/${PF}/schemas/create_mysql.gz | mysql -p snort"
-		use postgres && \
-			einfo "  PostgreSQL: import /usr/share/doc/${PF}/schemas/create_postgresql.gz"
-		use odbc && einfo "SQL tables need to be created - look at /usr/share/doc/${PF}/schemas/"
-		einfo
-		einfo "Also, read the following Gentoo forums article:"
-		einfo '   http://forums.gentoo.org/viewtopic.php?t=78718'
-	fi
-}
diff --git a/net-analyzer/snort/snort-2.3.2.ebuild b/net-analyzer/snort/snort-2.3.2.ebuild
deleted file mode 100644
index e245e322d5cc..000000000000
--- a/net-analyzer/snort/snort-2.3.2.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.3.2.ebuild,v 1.6 2005/08/23 13:50:11 ka0ttic Exp $
-
-inherit eutils gnuconfig flag-o-matic
-
-DESCRIPTION="Libpcap-based packet sniffer/logger/lightweight IDS"
-HOMEPAGE="http://www.snort.org/"
-SRC_URI="http://www.snort.org/dl/current/${P}.tar.gz
-	snortsam? ( mirror://gentoo/snortsam-20050110.tar.gz )
-	prelude? ( http://www.prelude-ids.org/download/releases/snort-prelude-reporting-patch-0.3.6.tar.gz )
-	sguil? ( mirror://sourceforge/sguil/sguil-sensor-0.5.3.tar.gz )"
-
-#	snortsam? ( http://www.snortsam.net/files/snort-plugin/snortsam-patch.tar.gz )
-# Gentoo mirrored because of naming conflict with previous version
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 -sparc -alpha ~amd64 ~ppc"
-IUSE="ssl postgres mysql flexresp selinux snortsam odbc prelude inline sguil"
-
-# Local useflag snortsam: patch snort for use with snortsam package.
-
-
-DEPEND="virtual/libc
-	>=dev-libs/libpcre-4.2-r1
-	virtual/libpcap
-	flexresp? ( ~net-libs/libnet-1.0.2a )
-	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 )
-	odbc? ( dev-db/unixODBC )
-	inline? (
-				~net-libs/libnet-1.0.2a
-				net-firewall/iptables
-			)"
-
-RDEPEND="${DEPEND}
-	dev-lang/perl
-	selinux? ( sec-policy/selinux-snort )
-	snortsam? ( net-analyzer/snortsam )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	gnuconfig_update
-
-	if use flexresp || use inline ; then
-		epatch ${FILESDIR}/2.3.0-libnet-1.0.patch
-	fi
-
-	einfo "Patching /etc/snort.conf"
-	sed -i "s:var RULE_PATH ../rules:var RULE_PATH /etc/snort:" \
-		etc/snort.conf || die "sed snort.conf failed"
-
-	if use prelude ; then
-		epatch ../snort-2.2.0-prelude-0.3.6.diff
-		sed -i -e "s:AC_PROG_RANLIB:AC_PROG_LIBTOOL:" configure.in \
-			|| die "sed configure.in failed"
-	fi
-
-	if use sguil ; then
-		cd ${S}/src/preprocessors
-		epatch ${WORKDIR}/sguil-0.5.3/sensor/snort_mods/2_1/spp_portscan_sguil.patch
-		epatch ${WORKDIR}/sguil-0.5.3/sensor/snort_mods/2_1/spp_stream4_sguil.patch
-		cd ${S}
-	fi
-
-	# need to pick up prelude and or flexresp patches
-	einfo "Regenerating autoconf/automake files"
-	autoreconf -f -i || die "autoreconf failed"
-
-	if use snortsam
-	then
-		cd ..
-		einfo "Applying snortsam patch"
-		./patchsnort.sh ${S} || die "snortsam patch failed"
-		cd ${S}
-	fi
-}
-
-src_compile() {
-	local myconf
-
-	# There is no --diable-flexresp, cannot use use_enable
-	use flexresp && myconf="${myconf} --enable-flexresp"
-
-	use inline && append-flags -I/usr/include/libipq
-
-	econf \
-		$(use_with postgres postgresql) \
-		$(use_with mysql) \
-		$(use_with ssl openssl) \
-		$(use_with odbc) \
-		--without-oracle \
-		$(use_with prelude) \
-		$(use_with sguil) \
-		$(use_enable inline) \
-		${myconf} || die "bad ./configure"
-
-	emake || die "compile problem"
-}
-
-pkg_preinst() {
-	enewgroup snort
-	enewuser snort -1 -1 /var/log/snort snort
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	keepdir /var/log/snort/
-
-	dodoc COPYING LICENSE doc/*
-	docinto schemas ; dodoc schemas/*
-
-	insinto /etc/snort
-	doins etc/reference.config etc/classification.config rules/*.rules \
-		etc/*.map etc/threshold.conf
-	newins etc/snort.conf snort.conf.distrib
-
-	use prelude && doins etc/prelude-classification.config
-
-	newinitd ${FILESDIR}/snort.rc6 snort
-	newconfd ${FILESDIR}/snort.confd snort
-
-	chown snort:snort ${D}/var/log/snort
-	chmod 0770 ${D}/var/log/snort
-}
-
-pkg_postinst() {
-	if use mysql || use postgres || use odbc
-	then
-		einfo "To use a database as a backend for snort you will have to"
-		einfo "import the correct tables to the database."
-		einfo "You will have to setup a database called snort first."
-		einfo
-		use mysql && \
-			einfo "  MySQL: zcat /usr/share/doc/${PF}/schemas/create_mysql.gz | mysql -p snort"
-		use postgres && \
-			einfo "  PostgreSQL: import /usr/share/doc/${PF}/schemas/create_postgresql.gz"
-		use odbc && einfo "SQL tables need to be created - look at /usr/share/doc/${PF}/schemas/"
-		einfo
-		einfo "Also, read the following Gentoo forums article:"
-		einfo '   http://forums.gentoo.org/viewtopic.php?t=78718'
-	fi
-}
diff --git a/net-analyzer/snort/snort-2.3.3-r1.ebuild b/net-analyzer/snort/snort-2.3.3-r1.ebuild
index 354da74001f8..d38e0cbaaef0 100644
--- a/net-analyzer/snort/snort-2.3.3-r1.ebuild
+++ b/net-analyzer/snort/snort-2.3.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.3.3-r1.ebuild,v 1.9 2005/09/17 04:11:28 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.3.3-r1.ebuild,v 1.10 2005/09/25 02:28:08 vanquirius Exp $
 
 inherit eutils gnuconfig flag-o-matic
 
@@ -23,7 +23,7 @@ DEPEND="virtual/libc
 	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.9.0_rc1 )
+	prelude? ( >=dev-libs/libprelude-0.9.0 )
 	odbc? ( dev-db/unixODBC )
 	inline? (
 				~net-libs/libnet-1.0.2a
@@ -75,7 +75,6 @@ src_unpack() {
 	# bug 105852
 	epatch "${FILESDIR}/${P}-log.c.diff"
 
-
 	einfo "Regenerating autoconf/automake files"
 	autoreconf -f -i || die "autoreconf failed"
 }
diff --git a/net-analyzer/snort/snort-2.4.1.ebuild b/net-analyzer/snort/snort-2.4.1.ebuild
index 666e651a883f..27334ac4710d 100644
--- a/net-analyzer/snort/snort-2.4.1.ebuild
+++ b/net-analyzer/snort/snort-2.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.4.1.ebuild,v 1.1 2005/09/17 04:11:28 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.4.1.ebuild,v 1.2 2005/09/25 02:28:08 vanquirius Exp $
 
 inherit eutils gnuconfig flag-o-matic
 
@@ -8,7 +8,7 @@ DESCRIPTION="Libpcap-based packet sniffer/logger/lightweight IDS"
 HOMEPAGE="http://www.snort.org/"
 SRC_URI="http://www.snort.org/dl/current/${P}.tar.gz
 	mirror://gentoo/snort-2.4.0-genpatches.tar.bz2
-	${HOMEPAGE}/pub-bin/downloads.cgi/Download/comm_rules/Community-Rules.tar.gz
+	http://www.snort.org/pub-bin/downloads.cgi/Download/comm_rules/Community-Rules.tar.gz
 	snortsam? ( mirror://gentoo/snortsam-20050110.tar.gz )"
 
 LICENSE="GPL-2"
@@ -23,7 +23,7 @@ DEPEND="virtual/libc
 	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.9.0_rc1 )
+	prelude? ( >=dev-libs/libprelude-0.9.0 )
 	odbc? ( dev-db/unixODBC )
 	inline? (
 		~net-libs/libnet-1.0.2a
@@ -80,7 +80,7 @@ src_unpack() {
 src_compile() {
 	local myconf
 
-	# There is no --diable-flexresp, cannot use use_enable
+	# There is no --disable-flexresp, cannot use use_enable
 	use flexresp && myconf="${myconf} --enable-flexresp"
 
 	use inline && append-flags -I/usr/include/libipq
@@ -112,8 +112,7 @@ src_install() {
 		etc/*.map etc/threshold.conf
 	newins etc/snort.conf snort.conf.distrib
 
-	# use prelude && doins etc/prelude-classification.config
-
+	# init script is known to be broken in 2.4.x; bug 101157
 	newinitd "${FILESDIR}/snort.rc6" snort
 	newconfd "${FILESDIR}/snort.confd" snort