Version bump wrt bug #135112

(Portage version: 2.1_rc4-r3)

10 files changed, 186 insertions, 1 deletions

diff --git a/net-analyzer/snort/ChangeLog b/net-analyzer/snort/ChangeLog
index 57d23fbefc19..b6a9b8fc4fbd 100644
--- a/net-analyzer/snort/ChangeLog
+++ b/net-analyzer/snort/ChangeLog
@@ -1,6 +1,11 @@
 # 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.97 2006/06/01 20:14:57 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v 1.98 2006/06/06 15:54:51 jokey Exp $
+
+*snort-2.4.5 (06 Jun 2006)
+
+  06 Jun 2006; Markus Ullmann <jokey@gentoo.org> +snort-2.4.5.ebuild:
+  Version bump wrt bug #135112
 
 *snort-2.4.4-r1 (01 Jun 2006)
 
diff --git a/net-analyzer/snort/files/digest-snort-2.3.3 b/net-analyzer/snort/files/digest-snort-2.3.3
index c467f6d9427c..9a3883a9ec8e 100644
--- a/net-analyzer/snort/files/digest-snort-2.3.3
+++ b/net-analyzer/snort/files/digest-snort-2.3.3
@@ -4,3 +4,5 @@ RMD160 6bb635df1c62d293d8dd4b2fec55cfa486916908 snort-2.3.3.tar.gz 2631270
 SHA256 25b25b4c4028288945b968173d692ae2b72d811aaeea3715ae6a77945d9af2e9 snort-2.3.3.tar.gz 2631270
 MD5 323ab2956a59de113aa13099917f0d3a snort-prelude-reporting-patch-0.3.6.tar.gz 21964
 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/files/digest-snort-2.3.3-r1 b/net-analyzer/snort/files/digest-snort-2.3.3-r1
index dadadad25eea..563db8f40c76 100644
--- a/net-analyzer/snort/files/digest-snort-2.3.3-r1
+++ b/net-analyzer/snort/files/digest-snort-2.3.3-r1
@@ -4,3 +4,5 @@ MD5 06bf140893e7cb120aaa9372d10a0100 snort-2.3.3.tar.gz 2631270
 RMD160 6bb635df1c62d293d8dd4b2fec55cfa486916908 snort-2.3.3.tar.gz 2631270
 SHA256 25b25b4c4028288945b968173d692ae2b72d811aaeea3715ae6a77945d9af2e9 snort-2.3.3.tar.gz 2631270
 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/files/digest-snort-2.4.3 b/net-analyzer/snort/files/digest-snort-2.4.3
index eee1d975629b..3e3044f63ca5 100644
--- a/net-analyzer/snort/files/digest-snort-2.4.3
+++ b/net-analyzer/snort/files/digest-snort-2.4.3
@@ -8,3 +8,5 @@ MD5 5c3c8c69f2459bbe0c1f2057966c88a7 snort-2.4.3.tar.gz 2733590
 RMD160 1cba0a9d843da1cfa8c8dbaae5b18a16574cb7d2 snort-2.4.3.tar.gz 2733590
 SHA256 4f3aa911234a9fc4beb5ba9b0fe88f1e3af0fcbfe84d4448415f049b9791bc65 snort-2.4.3.tar.gz 2733590
 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/files/digest-snort-2.4.3-r1 b/net-analyzer/snort/files/digest-snort-2.4.3-r1
index fc157c14bd87..67fb32dbdbdc 100644
--- a/net-analyzer/snort/files/digest-snort-2.4.3-r1
+++ b/net-analyzer/snort/files/digest-snort-2.4.3-r1
@@ -11,3 +11,5 @@ 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/files/digest-snort-2.4.3-r2 b/net-analyzer/snort/files/digest-snort-2.4.3-r2
index fc157c14bd87..67fb32dbdbdc 100644
--- a/net-analyzer/snort/files/digest-snort-2.4.3-r2
+++ b/net-analyzer/snort/files/digest-snort-2.4.3-r2
@@ -11,3 +11,5 @@ 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/files/digest-snort-2.4.4 b/net-analyzer/snort/files/digest-snort-2.4.4
index e44f0aa9aec6..1ba9a6396076 100644
--- a/net-analyzer/snort/files/digest-snort-2.4.4
+++ b/net-analyzer/snort/files/digest-snort-2.4.4
@@ -11,3 +11,5 @@ 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/files/digest-snort-2.4.4-r1 b/net-analyzer/snort/files/digest-snort-2.4.4-r1
index e44f0aa9aec6..1ba9a6396076 100644
--- a/net-analyzer/snort/files/digest-snort-2.4.4-r1
+++ b/net-analyzer/snort/files/digest-snort-2.4.4-r1
@@ -11,3 +11,5 @@ 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/files/digest-snort-2.4.5 b/net-analyzer/snort/files/digest-snort-2.4.5
new file mode 100644
index 000000000000..24ce062cfcbd
--- /dev/null
+++ b/net-analyzer/snort/files/digest-snort-2.4.5
@@ -0,0 +1,15 @@
+MD5 39d8250f47a33aaec4712e29c0dcd1d0 Community-Rules.tar.gz 11678
+RMD160 a65b656e4dbf29f1c807622e865e945f509fe0c5 Community-Rules.tar.gz 11678
+SHA256 fd37a897455dcb4bace1f7f0af11747b5360e0e3896cd0b9649e5d19281bb2cf Community-Rules.tar.gz 11678
+MD5 316f28cf52efeddfd899552f3b26cd8d snort-2.4.0-genpatches.tar.bz2 6475
+RMD160 9ea99c71892a2cbf409ead3514ae792210bdf3d0 snort-2.4.0-genpatches.tar.bz2 6475
+SHA256 8bf51a47b2a0db9ccad83a27105994befd9be381b41aeb02561882308f4c6dff snort-2.4.0-genpatches.tar.bz2 6475
+MD5 108b3c20dcbaf3cdb17ea9203342eaaa snort-2.4.5.tar.gz 2817837
+RMD160 1b697ccd84e1c10406ac20ccc0c46f79ea661e11 snort-2.4.5.tar.gz 2817837
+SHA256 84eb84da542d23e9f1c29b8eb319614c509fb19a745f1fa2a88d07c740645184 snort-2.4.5.tar.gz 2817837
+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.4.5.ebuild b/net-analyzer/snort/snort-2.4.5.ebuild
new file mode 100644
index 000000000000..249c18c526f0
--- /dev/null
+++ b/net-analyzer/snort/snort-2.4.5.ebuild
@@ -0,0 +1,151 @@
+# 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.5.ebuild,v 1.1 2006/06/06 15:54:51 jokey 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
+	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"
+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
+	net-libs/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}"
+
+	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) \
+		${myconf} || die "bad ./configure"
+
+	emake || die "compile problem"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	keepdir /var/log/snort/
+
+	dodoc 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
+	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() {
+	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-t-399801.html'
+	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}."
+}