2.6.0 version bump for bug 136250. Thanks to Ed Davison <ed.davison at mccombs dot utexas dot edu>, Andrew Ross <aross at westnet dot com dot au>, Jason Wallace <jason.r.wallace at gmail dot com> and Brett Edgar <bedgar at desasecurity dot com>. Currently in package.mask for testing.

Package-Manager: portage-2.1-r1

4 files changed, 211 insertions, 5 deletions

diff --git a/net-analyzer/snort/ChangeLog b/net-analyzer/snort/ChangeLog
index 58f08c91d34a..0d25a55d8cb6 100644
--- a/net-analyzer/snort/ChangeLog
+++ b/net-analyzer/snort/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/snort
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v 1.104 2006/07/08 01:23:26 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v 1.105 2006/07/08 01:40:13 vanquirius Exp $
+
+*snort-2.6.0 (08 Jul 2006)
+
+  08 Jul 2006; Marcelo Goes <vanquirius@gentoo.org> +snort-2.6.0.ebuild:
+  2.6.0 version bump for bug 136250. Thanks to Ed Davison <ed.davison at
+  mccombs dot utexas dot edu>, Andrew Ross <aross at westnet dot com dot au>,
+  Jason Wallace <jason.r.wallace at gmail dot com> and Brett Edgar <bedgar at
+  desasecurity dot com>. Currently in package.mask for testing.
 
   08 Jul 2006; Marcelo Goes <vanquirius@gentoo.org>
   -files/2.3.0-libnet-1.0.patch, -files/snort-2.3.3-log.c.diff,
diff --git a/net-analyzer/snort/Manifest b/net-analyzer/snort/Manifest
index 0c824c7299fd..3c239a5fd7cc 100644
--- a/net-analyzer/snort/Manifest
+++ b/net-analyzer/snort/Manifest
@@ -9,16 +9,21 @@ SHA256 9123a58ab32548355ac6a557cf46baa08c3696725a9a3a4b2f467413006830e4 files/sn
 DIST Community-Rules.tar.gz 11678 RMD160 a65b656e4dbf29f1c807622e865e945f509fe0c5 SHA1 de02fd44c58529795e0ab59b65aa08a608cffd95 SHA256 fd37a897455dcb4bace1f7f0af11747b5360e0e3896cd0b9649e5d19281bb2cf
 DIST snort-2.4.0-genpatches.tar.bz2 6475 RMD160 9ea99c71892a2cbf409ead3514ae792210bdf3d0 SHA1 23d7ac5fb3e3fca5340a4f45ff6d64c4a4214e42 SHA256 8bf51a47b2a0db9ccad83a27105994befd9be381b41aeb02561882308f4c6dff
 DIST snort-2.4.5.tar.gz 2817837 RMD160 1b697ccd84e1c10406ac20ccc0c46f79ea661e11 SHA1 3ba7dae8058aecf4e4eb1c7a816a7c8a4fb7c550 SHA256 84eb84da542d23e9f1c29b8eb319614c509fb19a745f1fa2a88d07c740645184
+DIST snort-2.6.0.tar.gz 3322826 RMD160 862cfd20b866b58dcc5a27cb3f4fcad90c1b7550 SHA1 502b68163ab378ea55e88d588f8a4784a589377d SHA256 0acbfedf728df3d63ed075a56259b81ab5e26099051ceb5808e0c87329fe588d
 DIST snortrules-pr-2.4.tar.gz 789097 RMD160 dd2179b3ce8a55699d2e1b857426e5489191a121 SHA1 b8b59754ccb59b1dcf324d2faa399326117a60e9 SHA256 19d2545a2a150dff8b4dbcbd0def389b6865c4c70f5084172d08a7b151e1a504
 DIST snortsam-20050110.tar.gz 29395 RMD160 ec80ce024ed7a013da35444ef1098ba3faa6cfc3 SHA256 dc428458f3c47684aabb89036ca7e601a6aa92864dbf23b31f33732b76c2a01e
 EBUILD snort-2.4.5.ebuild 4333 RMD160 6b7cd44f075dbf89144b062fe137c756168a1586 SHA1 a7988e9182f4ae8f84476b906725517a13cf4f80 SHA256 5b4ab7e8da9d81ac1816f990f03ffec3653bea3dfa60ebf1517df016f7e452c0
 MD5 983f4dca126e16932fd5f92599684cb5 snort-2.4.5.ebuild 4333
 RMD160 6b7cd44f075dbf89144b062fe137c756168a1586 snort-2.4.5.ebuild 4333
 SHA256 5b4ab7e8da9d81ac1816f990f03ffec3653bea3dfa60ebf1517df016f7e452c0 snort-2.4.5.ebuild 4333
-MISC ChangeLog 19206 RMD160 aced415ba7b549f0eba38fe8a445b8e5543c56ce SHA1 6bd9ee34442e1042d3106d8e0024bfad58553666 SHA256 a589fd1e8e33e58123721b553b6501d7d772d3bec151ae33ff2fc5e402e4df4b
-MD5 1e991be3251c8ddd58b81b1b5505236e ChangeLog 19206
-RMD160 aced415ba7b549f0eba38fe8a445b8e5543c56ce ChangeLog 19206
-SHA256 a589fd1e8e33e58123721b553b6501d7d772d3bec151ae33ff2fc5e402e4df4b ChangeLog 19206
+EBUILD snort-2.6.0.ebuild 5568 RMD160 2a57a5c670f8e2b8a48bd3b9bb930db12e9a31d4 SHA1 1bc266b783e88bcd71257ffad2012b373d697bf6 SHA256 5a9268f28cffa9e90751950a9146ca48a4c762ea72d4ee23446906c92883b53f
+MD5 400dad342995c95364846d0082985489 snort-2.6.0.ebuild 5568
+RMD160 2a57a5c670f8e2b8a48bd3b9bb930db12e9a31d4 snort-2.6.0.ebuild 5568
+SHA256 5a9268f28cffa9e90751950a9146ca48a4c762ea72d4ee23446906c92883b53f snort-2.6.0.ebuild 5568
+MISC ChangeLog 19601 RMD160 754cb759a77fd1050396113c551ad5c5b025042e SHA1 dccd4b305ad681702ac251ef00e41ffbfae1dd60 SHA256 06593b3290148e7ca15248a3dd73f12f299bd47d7546f6b3ceb1bf97e06b578e
+MD5 7b4432374d719189f4bb44459b630648 ChangeLog 19601
+RMD160 754cb759a77fd1050396113c551ad5c5b025042e ChangeLog 19601
+SHA256 06593b3290148e7ca15248a3dd73f12f299bd47d7546f6b3ceb1bf97e06b578e ChangeLog 19601
 MISC metadata.xml 246 RMD160 427cf3e9767d777650d905a7b4fcad57259908bb SHA1 470a19ab011412f7f219d654304b7a43876082ae SHA256 843ac8d26d6f2f01b254d963268d1b4dc7ec515e5ce16daf47f7c68f2c47584e
 MD5 53edc4328d9adeaf087c65ea94b1594b metadata.xml 246
 RMD160 427cf3e9767d777650d905a7b4fcad57259908bb metadata.xml 246
@@ -26,3 +31,6 @@ SHA256 843ac8d26d6f2f01b254d963268d1b4dc7ec515e5ce16daf47f7c68f2c47584e metadata
 MD5 8ab79a3b3485b8028ffc95ef22f0e4a7 files/digest-snort-2.4.5 1250
 RMD160 9f1bbc6e281b0a46b8dad256d91b2c7898d21d4e files/digest-snort-2.4.5 1250
 SHA256 eca549eac2e372a4307f224ffb2150f9fd940540134ecae1c73621c81f61d826 files/digest-snort-2.4.5 1250
+MD5 2f9a1287ed8f1232c7b5eb58142e97f1 files/digest-snort-2.6.0 985
+RMD160 1ffee6de223e8608f77c9cb592cb93c80f31680b files/digest-snort-2.6.0 985
+SHA256 eaf927c4c17b7e2ecf529a6cc28ad697600962f607caaf6e7b755003f9fd7cb7 files/digest-snort-2.6.0 985
diff --git a/net-analyzer/snort/files/digest-snort-2.6.0 b/net-analyzer/snort/files/digest-snort-2.6.0
new file mode 100644
index 000000000000..3d477d1d625e
--- /dev/null
+++ b/net-analyzer/snort/files/digest-snort-2.6.0
@@ -0,0 +1,12 @@
+MD5 39d8250f47a33aaec4712e29c0dcd1d0 Community-Rules.tar.gz 11678
+RMD160 a65b656e4dbf29f1c807622e865e945f509fe0c5 Community-Rules.tar.gz 11678
+SHA256 fd37a897455dcb4bace1f7f0af11747b5360e0e3896cd0b9649e5d19281bb2cf Community-Rules.tar.gz 11678
+MD5 88bb7f628e5bf1edc6409fbb126eaed0 snort-2.6.0.tar.gz 3322826
+RMD160 862cfd20b866b58dcc5a27cb3f4fcad90c1b7550 snort-2.6.0.tar.gz 3322826
+SHA256 0acbfedf728df3d63ed075a56259b81ab5e26099051ceb5808e0c87329fe588d snort-2.6.0.tar.gz 3322826
+MD5 35d9a2486f8c0280bb493aa03c011927 snortrules-pr-2.4.tar.gz 789097
+RMD160 dd2179b3ce8a55699d2e1b857426e5489191a121 snortrules-pr-2.4.tar.gz 789097
+SHA256 19d2545a2a150dff8b4dbcbd0def389b6865c4c70f5084172d08a7b151e1a504 snortrules-pr-2.4.tar.gz 789097
+MD5 2eeef1a7a040d67c3afaf9d749905e47 snortsam-20050110.tar.gz 29395
+RMD160 ec80ce024ed7a013da35444ef1098ba3faa6cfc3 snortsam-20050110.tar.gz 29395
+SHA256 dc428458f3c47684aabb89036ca7e601a6aa92864dbf23b31f33732b76c2a01e snortsam-20050110.tar.gz 29395
diff --git a/net-analyzer/snort/snort-2.6.0.ebuild b/net-analyzer/snort/snort-2.6.0.ebuild
new file mode 100644
index 000000000000..b9e2948c6078
--- /dev/null
+++ b/net-analyzer/snort/snort-2.6.0.ebuild
@@ -0,0 +1,178 @@
+# 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.6.0.ebuild,v 1.1 2006/07/08 01:40:13 vanquirius Exp $
+
+inherit eutils flag-o-matic autotools
+
+DESCRIPTION="Libpcap-based packet sniffer/logger/lightweight IDS"
+HOMEPAGE="http://www.snort.org/"
+SRC_URI="http://www.snort.org/dl/current/${P}.tar.gz
+	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"
+SLOT="0"
+KEYWORDS="-alpha ~amd64 ~ppc ~ppc64 -sparc ~x86"
+IUSE="ssl postgres mysql flexresp selinux snortsam odbc prelude inline sguil dynamicplugin timestats perfprofiling linux-smp-stats"
+
+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 )
+	>=sys-devel/libtool-1.4
+	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}"
+
+	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"
+	AT_M4DIR=m4 eautoreconf
+}
+
+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) \
+		$(use_enable dynamicplugin) \
+		$(use_enable timestats) \
+		$(use_enable perfprofiling) \
+		$(use_enable linux-smp-stats) \
+		${myconf} || die "bad ./configure"
+
+	emake || die "compile problem"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	keepdir /var/log/snort/
+
+	dodoc doc/*
+	dodoc ./RELEASE.NOTES
+	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
+	if use sguil ; then
+		sed -i -e "/^# output log_unified/s:# ::" \
+			-e "s:snort.log:snort_unified.log:" \
+		"${D}/etc/snort/snort.conf" || die "sed failed"
+	fi
+
+	newinitd "${FILESDIR}/snort.rc7" snort
+	newconfd "${FILESDIR}/snort.confd" snort
+	if use sguil ; then
+		sed -i -e "s:/var/log/snort:/var/lib/sguil/$(hostname):" \
+		-e "/^SNORT_OPTS/s%-u snort%-m 122 -u sguil -g sguil -A none%" \
+			"${D}/etc/conf.d/snort" || die "sed failed"
+	fi
+
+	fowners snort:snort /var/log/snort
+	fperms 0770 /var/log/snort
+
+	# install rules
+	dodir /etc/snort/rules
+	mv "${WORKDIR}"/rules/* "${D}/etc/snort/rules/"
+}
+
+pkg_postinst() {
+	ewarn
+	ewarn "Users upgrading from snort 2.4.x should take care when updating"
+	ewarn "their snort.conf. A number of significant changes have been"
+	ewarn "have been added to snort 2.6 including the addition of"
+	ewarn "dynamically loadable preprocessors, detection engine and rules."
+	ewarn "Snort 2.6 also includes the addition of performance profiling"
+	ewarn "for rules & preprocessors and uses a new default pattern matcher"
+	ewarn "which provides faster matching at the expense of being very"
+	ewarn "memory intensive."
+	ewarn
+	ewarn "If you find that snort is using too much memory, your system"
+	ewarn "freezes, or snort crashes after a few minutes try adding the"
+	ewarn "following to your snort.conf..."
+	ewarn
+	ewarn "'config detection: search-method ac-sparsebands'"
+	ewarn
+	ewarn "This will provide high pattern matching performance at a much"
+	ewarn "lower cost to memory. For more information on the new features"
+	ewarn "in snort 2.6, please take a look at the release notes located in..."
+	ewarn
+	ewarn "  /usr/share/doc/${PF}/RELEASE.NOTES.gz"
+	ewarn
+	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 before doing the"
+	einfo "following..."
+	einfo
+	einfo "  MySQL: zcat /usr/share/doc/${PF}/schemas/create_mysql.gz | mysql -p snort"
+	einfo
+	einfo "  PostgreSQL: import /usr/share/doc/${PF}/schemas/create_postgresql.gz"
+	einfo
+	einfo "  ODBC: look at /usr/share/doc/${PF}/schemas/"
+	einfo
+	einfo "Users using the unified output plugin and barnyard do not need to"
+	einfo "compile database support into snort, but still need to set up their"
+	einfo "database as shown above."
+	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}."
+}