Install basic rules for bug 110103.

Package-Manager: portage-2.0.54

6 files changed, 26 insertions, 168 deletions

diff --git a/net-analyzer/snort/ChangeLog b/net-analyzer/snort/ChangeLog
index 2c52c285237e..8c32a00dd0fb 100644
--- a/net-analyzer/snort/ChangeLog
+++ b/net-analyzer/snort/ChangeLog
@@ -1,6 +1,14 @@
 # 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.88 2005/12/03 19:40:14 tgall Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v 1.89 2006/01/27 18:06:39 vanquirius Exp $
+
+*snort-2.4.3-r1 (27 Jan 2006)
+
+  27 Jan 2006; Marcelo Goes <vanquirius@gentoo.org> -snort-2.4.1.ebuild,
+  -snort-2.4.1-r1.ebuild, +snort-2.4.3-r1.ebuild:
+  Install basic rules for bug 110103. Thanks to Mark Conway <mark dot conway
+  at themobiusprojectdot com> and Donald R. Gray Jr <donaldgray at dslextreme
+  dot com>.
 
   03 Dec 2005; Tom Gall <tgall@gentoo.org> snort-2.3.3-r1.ebuild:
   stable on ppc64
diff --git a/net-analyzer/snort/Manifest b/net-analyzer/snort/Manifest
index a5f1bf76ed43..139d14b6c44e 100644
--- a/net-analyzer/snort/Manifest
+++ b/net-analyzer/snort/Manifest
@@ -1,16 +1,14 @@
-MD5 3db46d33c9c20658b3b3f70d105ba46f ChangeLog 16536
-MD5 53edc4328d9adeaf087c65ea94b1594b metadata.xml 246
-MD5 93a2c9aa40931af85a80c9fddb4261e0 snort-2.3.3-r1.ebuild 4035
-MD5 b360cb079bb12675a615301852e71a7f snort-2.3.3.ebuild 3975
-MD5 4a7bd3135da2aeeeede46de0677bd157 snort-2.4.1-r1.ebuild 4322
-MD5 cdb1487b04506276a6b465ba18e11fcc snort-2.4.1.ebuild 4080
-MD5 fb1657b65226b6ff73c2d0f89081eb04 snort-2.4.3.ebuild 4319
+MD5 0ce111aef69f4e8dc37c55fc2b347f0d ChangeLog 16863
 MD5 564bfdf90fe29f5924c68885ccfcddb8 files/2.3.0-libnet-1.0.patch 5424
 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 3ff2d04cb5adac55b4f35c28326f0fb0 files/digest-snort-2.4.1-r1 271
 MD5 6ac0e71e30f79ee3c5d01349111b58fe files/digest-snort-2.4.3 271
+MD5 5008d92cc4bf98a4c85f0e8eefc5e7de files/digest-snort-2.4.3-r1 340
 MD5 d212aff92317ccfae4c2228de5f9e5cb files/snort-2.3.3-log.c.diff 4781
 MD5 446f8d2b3435b8a6be738da978670605 files/snort.confd 423
 MD5 9c325479975ea9fcb4f62c01407e8194 files/snort.rc6 712
+MD5 53edc4328d9adeaf087c65ea94b1594b metadata.xml 246
+MD5 93a2c9aa40931af85a80c9fddb4261e0 snort-2.3.3-r1.ebuild 4035
+MD5 b360cb079bb12675a615301852e71a7f snort-2.3.3.ebuild 3975
+MD5 31569e35af81eb2cbc3c2e52242bb557 snort-2.4.3-r1.ebuild 4403
+MD5 fb1657b65226b6ff73c2d0f89081eb04 snort-2.4.3.ebuild 4319
diff --git a/net-analyzer/snort/files/digest-snort-2.4.1-r1 b/net-analyzer/snort/files/digest-snort-2.4.1-r1
deleted file mode 100644
index 83b034db1b5e..000000000000
--- a/net-analyzer/snort/files/digest-snort-2.4.1-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 7b7d36e063a674fd9cc324969012f32a snort-2.4.1.tar.gz 2695304
-MD5 316f28cf52efeddfd899552f3b26cd8d snort-2.4.0-genpatches.tar.bz2 6475
-MD5 39d8250f47a33aaec4712e29c0dcd1d0 Community-Rules.tar.gz 11678
-MD5 2eeef1a7a040d67c3afaf9d749905e47 snortsam-20050110.tar.gz 29395
diff --git a/net-analyzer/snort/files/digest-snort-2.4.1 b/net-analyzer/snort/files/digest-snort-2.4.3-r1
index 83b034db1b5e..64958381beae 100644
--- a/net-analyzer/snort/files/digest-snort-2.4.1
+++ b/net-analyzer/snort/files/digest-snort-2.4.3-r1
@@ -1,4 +1,5 @@
-MD5 7b7d36e063a674fd9cc324969012f32a snort-2.4.1.tar.gz 2695304
-MD5 316f28cf52efeddfd899552f3b26cd8d snort-2.4.0-genpatches.tar.bz2 6475
 MD5 39d8250f47a33aaec4712e29c0dcd1d0 Community-Rules.tar.gz 11678
+MD5 316f28cf52efeddfd899552f3b26cd8d snort-2.4.0-genpatches.tar.bz2 6475
+MD5 5c3c8c69f2459bbe0c1f2057966c88a7 snort-2.4.3.tar.gz 2733590
+MD5 35d9a2486f8c0280bb493aa03c011927 snortrules-pr-2.4.tar.gz 789097
 MD5 2eeef1a7a040d67c3afaf9d749905e47 snortsam-20050110.tar.gz 29395
diff --git a/net-analyzer/snort/snort-2.4.1.ebuild b/net-analyzer/snort/snort-2.4.1.ebuild
deleted file mode 100644
index 27334ac4710d..000000000000
--- a/net-analyzer/snort/snort-2.4.1.ebuild
+++ /dev/null
@@ -1,146 +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.4.1.ebuild,v 1.2 2005/09/25 02:28:08 vanquirius 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
-	mirror://gentoo/snort-2.4.0-genpatches.tar.bz2
-	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"
-SLOT="0"
-KEYWORDS="-alpha ~amd64 ~ppc ~ppc64 -sparc ~x86"
-IUSE="ssl postgres mysql flexresp selinux snortsam odbc prelude inline sguil"
-
-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.9.0 )
-	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 )"
-
-pkg_setup() {
-	enewgroup snort
-	enewuser snort -1 -1 /dev/null snort
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	gnuconfig_update
-
-	if use flexresp || use inline ; then
-		epatch "${WORKDIR}/2.4.0-libnet-1.0.patch"
-	fi
-
-	sed -i "s:var RULE_PATH ../rules:var RULE_PATH /etc/snort/rules:" \
-		etc/snort.conf || die "sed snort.conf failed"
-
-	if use prelude ; then
-		sed -i -e "s:AC_PROG_RANLIB:AC_PROG_LIBTOOL:" configure.in \
-			|| die "sed configure.in failed"
-	fi
-
-	if use sguil ; then
-		epatch "${WORKDIR}/2.4.0-spp_portscan_sguil.patch"
-		epatch "${WORKDIR}/2.4.0-spp_stream4_sguil.patch"
-	fi
-
-	if use snortsam ; then
-		cd ..
-		einfo "Applying snortsam patch"
-		./patchsnort.sh "${S}" || die "snortsam patch failed"
-		cd "${S}"
-	fi
-
-	einfo "Regenerating autoconf/automake files"
-	aclocal -I m4
-	autoheader
-	automake --add-missing --copy
-	autoconf
-	libtoolize --copy --force
-}
-
-src_compile() {
-	local myconf
-
-	# There is no --disable-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_enable prelude) \
-		$(use_with sguil) \
-		$(use_enable inline) \
-		${myconf} || die "bad ./configure"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	keepdir /var/log/snort/
-
-	dodoc LICENSE doc/*
-	docinto schemas ; dodoc schemas/*
-
-	insinto /etc/snort
-	doins etc/reference.config etc/classification.config \
-		etc/*.map etc/threshold.conf
-	newins etc/snort.conf snort.conf.distrib
-
-	# init script is known to be broken in 2.4.x; bug 101157
-	newinitd "${FILESDIR}/snort.rc6" snort
-	newconfd "${FILESDIR}/snort.confd" snort
-
-	chown snort:snort "${D}/var/log/snort"
-	chmod 0770 "${D}/var/log/snort"
-
-	# install community rules
-	mkdir "${D}/etc/snort/rules"
-	mv "${WORKDIR}/rules/*" "${D}/etc/snort/rules/"
-}
-
-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
-	einfo
-	ewarn "Only a basic set of rules was installed."
-	ewarn "Please add your other sets of rules to /etc/snort/rules."
-	ewarn "For more information on rules, visit ${HOMEPAGE}."
-}
diff --git a/net-analyzer/snort/snort-2.4.1-r1.ebuild b/net-analyzer/snort/snort-2.4.3-r1.ebuild
index 3a891715ebb3..6b53b027f0ff 100644
--- a/net-analyzer/snort/snort-2.4.1-r1.ebuild
+++ b/net-analyzer/snort/snort-2.4.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 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-r1.ebuild,v 1.1 2005/10/08 13:55:12 strerror Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.4.3-r1.ebuild,v 1.1 2006/01/27 18:06:39 vanquirius Exp $
 
 inherit eutils flag-o-matic autotools
 
@@ -9,6 +9,7 @@ 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
 	http://www.snort.org/pub-bin/downloads.cgi/Download/comm_rules/Community-Rules.tar.gz
+	http://www.snort.org/pub-bin/downloads.cgi/Download/vrt_pr/snortrules-pr-2.4.tar.gz
 	snortsam? ( mirror://gentoo/snortsam-20050110.tar.gz )"
 
 LICENSE="GPL-2"
@@ -124,9 +125,9 @@ src_install() {
 	fowners snort:snort /var/log/snort
 	fperms 0770 /var/log/snort
 
-	# install community rules
+	# install rules
 	dodir /etc/snort/rules
-	mv ${WORKDIR}/rules/* "${D}/etc/snort/rules/"
+	mv "${WORKDIR}"/rules/* "${D}/etc/snort/rules/"
 }
 
 pkg_postinst() {
@@ -142,7 +143,7 @@ pkg_postinst() {
 		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'
+		einfo '   http://forums.gentoo.org/viewtopic-t-399801.html'
 	fi
 	einfo
 	ewarn "Only a basic set of rules was installed."