Bump for #355865, thanks to Jason Wallace

(Portage version: 2.2.0_alpha25/cvs/Linux x86_64)

4 files changed, 412 insertions, 2 deletions

diff --git a/net-analyzer/snort/ChangeLog b/net-analyzer/snort/ChangeLog
index 5a19a80f09f0..03665ba4f8c0 100644
--- a/net-analyzer/snort/ChangeLog
+++ b/net-analyzer/snort/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/snort
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v 1.171 2011/01/14 22:40:28 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v 1.172 2011/02/24 17:31:46 patrick Exp $
+
+*snort-2.9.0.4 (24 Feb 2011)
+
+  24 Feb 2011; Patrick Lauer <patrick@gentoo.org> +snort-2.9.0.4.ebuild,
+  +files/disabledynamic.patch, metadata.xml:
+  Bump for #355865, thanks to Jason Wallace
 
   14 Jan 2011; Markos Chandras <hwoarang@gentoo.org> snort-2.9.0.3.ebuild:
   Stable on amd64 wrt bug #351549
diff --git a/net-analyzer/snort/files/disabledynamic.patch b/net-analyzer/snort/files/disabledynamic.patch
new file mode 100644
index 000000000000..3b9e2f5e4482
--- /dev/null
+++ b/net-analyzer/snort/files/disabledynamic.patch
@@ -0,0 +1,110 @@
+? cflags.out

+? cppflags.out

+? cscope.out

+? disabledynamic.patch

+? http.patch

+? log

+? make.out

+? rules.work

+? snort-build.sh

+? snort.pc

+? ylwrap

+? etc/snort.conf.work

+? src/dynamic-preprocessors/rzb_saac/Makefile

+? tools/u2boat/u2boat

+? tools/u2spewfoo/u2spewfoo

+Index: src/fpcreate.c

+===================================================================

+RCS file: /usr/cvsroot/sfeng/ims/sfsnort/snort/src/fpcreate.c,v

+retrieving revision 1.107.2.2

+diff -u -p -r1.107.2.2 fpcreate.c

+--- src/fpcreate.c	11 Jan 2011 22:54:40 -0000	1.107.2.2

++++ src/fpcreate.c	17 Feb 2011 20:06:49 -0000

+@@ -70,6 +70,8 @@

+ #include "dynamic-plugins/sp_preprocopt.h"

+ #endif

+ 

++#include "dynamic-plugins/sf_dynamic_define.h"

++

+   

+ /*

+  *  Content flag values

+@@ -1810,9 +1812,11 @@ static int fpAddPortGroupRule(PORT_GROUP

+         fpAddAllContents(pg->pgPms[PM_TYPE__CONTENT], otn, id, pmd, fp);

+ #endif

+ 

++#ifdef DYNAMIC_PLUGIN

+     /* No content added */

+     if (pmd == preproc_opt_pmds)

+         FreePmdList(pmd);

++#endif

+ 

+     if (fpFinishPortGroupRule(pg, PM_TYPE__MAX, otn, NULL, fp) != 0)

+         return -1;

+Index: src/dynamic-plugins/sf_dynamic_define.h

+===================================================================

+RCS file: /usr/cvsroot/sfeng/ims/sfsnort/snort/src/dynamic-plugins/sf_dynamic_define.h,v

+retrieving revision 1.15.4.1

+diff -u -p -r1.15.4.1 sf_dynamic_define.h

+--- src/dynamic-plugins/sf_dynamic_define.h	3 Jan 2011 19:58:05 -0000	1.15.4.1

++++ src/dynamic-plugins/sf_dynamic_define.h	17 Feb 2011 20:06:49 -0000

+@@ -96,5 +96,15 @@ typedef enum {

+ #endif

+ #endif

+ 

++/* Parameters are rule info pointer, int to indicate URI or NORM,

++ * and list pointer */

++#define CONTENT_NORMAL            0x01

++#define CONTENT_HTTP_URI          0x02

++#define CONTENT_HTTP_HEADER       0x04

++#define CONTENT_HTTP_CLIENT_BODY  0x08

++#define CONTENT_HTTP_METHOD       0x10

++#define CONTENT_HTTP (CONTENT_HTTP_URI|CONTENT_HTTP_HEADER|\

++                CONTENT_HTTP_CLIENT_BODY|CONTENT_HTTP_METHOD)

++

+ #endif /* _SF_DYNAMIC_DEFINE_H_ */

+ 

+Index: src/dynamic-plugins/sf_dynamic_engine.h

+===================================================================

+RCS file: /usr/cvsroot/sfeng/ims/sfsnort/snort/src/dynamic-plugins/sf_dynamic_engine.h,v

+retrieving revision 1.54.2.1

+diff -u -p -r1.54.2.1 sf_dynamic_engine.h

+--- src/dynamic-plugins/sf_dynamic_engine.h	3 Jan 2011 19:58:06 -0000	1.54.2.1

++++ src/dynamic-plugins/sf_dynamic_engine.h	17 Feb 2011 20:06:49 -0000

+@@ -77,15 +77,6 @@ typedef struct _FPContentInfo

+ 

+ } FPContentInfo;

+ 

+-/* Parameters are rule info pointer, int to indicate URI or NORM,

+- * and list pointer */

+-#define CONTENT_NORMAL            0x01

+-#define CONTENT_HTTP_URI          0x02

+-#define CONTENT_HTTP_HEADER       0x04

+-#define CONTENT_HTTP_CLIENT_BODY  0x08

+-#define CONTENT_HTTP_METHOD       0x10

+-#define CONTENT_HTTP (CONTENT_HTTP_URI|CONTENT_HTTP_HEADER|\

+-        CONTENT_HTTP_CLIENT_BODY|CONTENT_HTTP_METHOD)

+ typedef int (*GetDynamicContentsFunction)(void *, int, FPContentInfo **);

+ typedef int (*GetDynamicPreprocOptFpContentsFunc)(void *, FPContentInfo **);

+ typedef void (*RuleFreeFunc)(void *);

+Index: src/preprocessors/Stream5/snort_stream5_tcp.c

+===================================================================

+RCS file: /usr/cvsroot/sfeng/ims/sfsnort/snort/src/preprocessors/Stream5/snort_stream5_tcp.c,v

+retrieving revision 1.296.2.5

+diff -u -p -r1.296.2.5 snort_stream5_tcp.c

+--- src/preprocessors/Stream5/snort_stream5_tcp.c	7 Jan 2011 20:06:05 -0000	1.296.2.5

++++ src/preprocessors/Stream5/snort_stream5_tcp.c	17 Feb 2011 20:06:49 -0000

+@@ -816,12 +816,12 @@ void Stream5TcpRegisterRuleOptions(void)

+     RegisterPreprocessorRuleOption("stream_reassemble", &s5TcpStreamReassembleRuleOptionInit,

+                                    &s5TcpStreamReassembleRuleOptionEval, &s5TcpStreamReassembleRuleOptionCleanup,

+                                    NULL, NULL, NULL, NULL);

+-#endif

+ 

+ #ifdef PERF_PROFILING

+     RegisterPreprocessorProfile("stream_size", &streamSizePerfStats, 4, &preprocRuleOptionPerfStats);

+     RegisterPreprocessorProfile("reassemble", &streamReassembleRuleOptionPerfStats, 4, &preprocRuleOptionPerfStats);

+ #endif

++#endif

+ 

+ }

+ 

diff --git a/net-analyzer/snort/metadata.xml b/net-analyzer/snort/metadata.xml
index 06ff17c4ca8b..c4b73b613d32 100644
--- a/net-analyzer/snort/metadata.xml
+++ b/net-analyzer/snort/metadata.xml
@@ -5,14 +5,30 @@
 	<maintainer>

 		<email>patrick@gentoo.org</email>

 		<name>Patrick Lauer</name>

+		<description>Maintainer</description>

 	</maintainer>

 	<maintainer>

 		<email>jason.r.wallace@gmail.com</email>

 		<name>Jason Wallace</name>

+		<description>Proxy maintainer. CC him on bugs</description>

 	</maintainer>

 	<longdescription>

-		The de facto standard for intrusion detection and prevention

+		Snort is an open source network intrusion prevention and detection

+		system (IDS/IPS) developed by Sourcefire. Combining the benefits of

+		signature, protocol, and anomaly-based inspection, Snort is the most

+		widely deployed IDS/IPS technology worldwide. With millions of downloads

+		and approximately 300,000 registered users, Snort has become the de facto 

+		standard for IPS.

 	</longdescription>

+	<upstream>

+		<maintainer>

+			<email>snort-team@sourcefire.com</email>

+			<name>Snort Team</name>

+		</maintainer>

+		<changelog>http://www.snort.org/snort-downloads</changelog>

+		<doc>http://www.snort.org/docs</doc>

+		<bugs-to>http://www.snort.org/snort-downloads/submit-a-bug/</bugs-to>

+	</upstream>

 	<use>

 		<flag name='aruba'>

 			Adds support for monitoring wireless traffic using a Aruba Mobility

diff --git a/net-analyzer/snort/snort-2.9.0.4.ebuild b/net-analyzer/snort/snort-2.9.0.4.ebuild
new file mode 100644
index 000000000000..bcaeecfffafc
--- /dev/null
+++ b/net-analyzer/snort/snort-2.9.0.4.ebuild
@@ -0,0 +1,278 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.9.0.4.ebuild,v 1.1 2011/02/24 17:31:46 patrick Exp $
+
+EAPI="2"
+inherit eutils autotools multilib
+
+DESCRIPTION="The de facto standard for intrusion detection/prevention"
+HOMEPAGE="http://www.snort.org/"
+SRC_URI="http://www.snort.org/downloads/752 -> ${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static +dynamicplugin +ipv6 +zlib gre mpls targetbased +decoder-preprocessor-rules
+ppm perfprofiling linux-smp-stats inline-init-failopen prelude +threads debug
+active-response normalizer reload-error-restart react flexresp3
+aruba mysql odbc postgres selinux"
+
+DEPEND=">=net-libs/libpcap-1.0.0
+	>=net-libs/daq-0.5
+	>=dev-libs/libpcre-6.0
+	dev-libs/libdnet
+	postgres? ( dev-db/postgresql-base )
+	mysql? ( virtual/mysql )
+	odbc? ( dev-db/unixODBC )
+	prelude? ( >=dev-libs/libprelude-0.9.0 )
+	zlib? ( sys-libs/zlib )"
+
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-snort )"
+
+pkg_setup() {
+
+	if use zlib && ! use dynamicplugin; then
+		eerror "You have enabled the 'zlib' USE flag but not the 'dynamicplugin' USE flag."
+		eerror "'zlib' requires 'dynamicplugin' be enabled."
+		die
+	fi
+
+	# pre_inst() is a better place to put this
+	# but we need it here for the 'fowners' statements in src_install()
+	enewgroup snort
+	enewuser snort -1 -1 /dev/null snort
+
+}
+
+src_prepare() {
+
+	# Fix to ensure that the package builds if USE flag -dynamicplugin is used.
+	epatch "${FILESDIR}/disabledynamic.patch"
+
+	#Multilib fix for the sf_engine
+	einfo "Applying multilib fix."
+	sed -i -e 's:${exec_prefix}/lib:${exec_prefix}/'$(get_libdir)':g' \
+		"${WORKDIR}/${P}/src/dynamic-plugins/sf_engine/Makefile.am" \
+		|| die "sed for sf_engine failed"
+
+	#Multilib fix for the curent set of dynamic-preprocessors
+	for i in ftptelnet smtp ssh dns ssl dcerpc2 sdf; do
+		sed -i -e 's:${exec_prefix}/lib:${exec_prefix}/'$(get_libdir)':g' \
+			"${WORKDIR}/${P}/src/dynamic-preprocessors/$i/Makefile.am" \
+			|| die "sed for $i failed."
+	done
+
+	if use prelude; then
+		einfo "Applying prelude fix."
+		sed -i -e "s:AC_PROG_RANLIB:AC_PROG_LIBTOOL:" configure.in \
+			|| die "sed	for perlude failed"
+	fi
+
+	AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+
+	econf \
+		$(use_enable !static shared) \
+		$(use_enable static) \
+		$(use_enable dynamicplugin) \
+		$(use_enable ipv6) \
+		$(use_enable zlib) \
+		$(use_enable gre) \
+		$(use_enable mpls) \
+		$(use_enable targetbased) \
+		$(use_enable decoder-preprocessor-rules) \
+		$(use_enable ppm) \
+		$(use_enable perfprofiling) \
+		$(use_enable linux-smp-stats) \
+		$(use_enable inline-init-failopen) \
+		$(use_enable prelude) \
+		$(use_enable threads pthread) \
+		$(use_enable debug) \
+		$(use_enable debug debug-msgs) \
+		$(use_enable debug corefiles) \
+		$(use_enable !debug dlclose) \
+		$(use_enable active-response) \
+		$(use_enable normalizer) \
+		$(use_enable reload-error-restart) \
+		$(use_enable react) \
+		$(use_enable flexresp3) \
+		$(use_enable aruba) \
+		$(use_with mysql) \
+		$(use_with odbc) \
+		$(use_with postgres postgresql) \
+		--enable-reload \
+		--disable-build-dynamic-examples \
+		--disable-profile \
+		--disable-ppm-test \
+		--disable-intel-soft-cpm \
+		--disable-static-daq \
+		--disable-rzb-saac \
+		--without-oracle
+
+}
+
+src_install() {
+
+	emake DESTDIR="${D}" install || die "emake failed"
+
+	dodir /var/log/snort \
+		/var/run/snort \
+		/etc/snort/rules \
+		/usr/$(get_libdir)/snort_dynamicrules \
+			|| die "Failed to create core directories"
+
+	# config.log and build.log are needed by Sourcefire
+	# to trouble shoot build problems and bug reports so we are 
+	# perserving them incase the user needs upstream support.
+	dodoc RELEASE.NOTES ChangeLog \
+		doc/* \
+		tools/u2boat/README.u2boat \
+		schemas/* || die "Failed to install snort docs"
+	docinto support
+	dodoc "${WORKDIR}/${PF}/config.log" \
+		"${T}/build.log" || die "Failed to install support files"
+
+	insinto /etc/snort
+	doins etc/attribute_table.dtd \
+		etc/classification.config \
+		etc/gen-msg.map \
+		etc/reference.config \
+		etc/threshold.conf \
+		etc/unicode.map || die "Failed to install docs in etc"
+
+	# We use snort.conf.distrib because the config file is complicated
+	# and the one shipped with snort can change drastically between versions.
+	# Users should migrate setting by hand and not with etc-update.
+	newins etc/snort.conf snort.conf.distrib \
+		|| die "Failed to add snort.conf.distrib"
+
+	insinto /etc/snort/preproc_rules
+	doins preproc_rules/decoder.rules \
+		preproc_rules/preprocessor.rules \
+		preproc_rules/sensitive-data.rules || die "Failed to install preproc rule files"
+
+	chown -R snort:snort \
+		"${D}"/var/log/snort \
+		"${D}"/var/run/snort \
+		"${D}"/etc/snort \
+		"${D}"/etc/snort/preproc_rules || die "Failed to set ownership of dirs"
+
+	newinitd "${FILESDIR}/snort.rc10" snort || die "Failed to install snort init script"
+	newconfd "${FILESDIR}/snort.confd" snort || die "Failed to install snort confd file"
+
+	# Sourcefire uses Makefiles to install docs causing Bug #297190.
+	# This removes the unwanted doc directory and rogue Makefiles. 
+	rm -rf "${D}"usr/share/doc/snort || die "Failed to remove SF doc directories"
+	rm "${D}"usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files"
+
+	# Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection
+	sed -i -e 's:/usr/local/lib:/usr/'$(get_libdir)':g' \
+		"${D}etc/snort/snort.conf.distrib" \
+		|| die "Failed to update snort.conf.distrib lib paths"
+
+	# Set the correct rule location in the config
+	sed -i -e 's:RULE_PATH ../rules:RULE_PATH /etc/snort/rules:g' \
+		"${D}etc/snort/snort.conf.distrib" \
+		|| die "Failed to update snort.conf.distrib rule path"
+
+	# Set the correct preprocessor/decoder rule location in the config
+	sed -i -e 's:PREPROC_RULE_PATH ../preproc_rules:PREPROC_RULE_PATH /etc/snort/preproc_rules:g' \
+		"${D}etc/snort/snort.conf.distrib" \
+		|| die "Failed to update snort.conf.distrib preproc rule path"
+
+	# Enable the preprocessor/decoder rules
+	sed -i -e 's:^# include $PREPROC_RULE_PATH:include $PREPROC_RULE_PATH:g' \
+		"${D}etc/snort/snort.conf.distrib" \
+		|| die "Failed to uncomment snort.conf.distrib preproc rule path"
+
+	sed -i -e 's:^# dynamicdetection directory:dynamicdetection directory:g' \
+		"${D}etc/snort/snort.conf.distrib" \
+		|| die "Failed to uncomment snort.conf.distrib dynamicdetection directory"
+
+	# Just some clean up of trailing /'s in the config
+	sed -i -e 's:snort_dynamicpreprocessor/$:snort_dynamicpreprocessor:g' \
+		"${D}etc/snort/snort.conf.distrib" \
+		|| die "Failed to clean up snort.conf.distrib trailing slashes"
+
+	# Make it clear in the config where these are...
+	sed -i -e 's:^include classification.config:include /etc/snort/classification.config:g' \
+		"${D}etc/snort/snort.conf.distrib" \
+		|| die "Failed to update snort.conf.distrib classification.config path"
+
+	sed -i -e 's:^include reference.config:include /etc/snort/reference.config:g' \
+		"${D}etc/snort/snort.conf.distrib" \
+		|| die "Failed to update snort.conf.distrib /etc/snort/reference.config path"
+
+	# Disable all rule files by default. Users need to choose what they want enabled.
+	sed -i -e 's:^include $RULE_PATH:# include $RULE_PATH:g' \
+		"${D}etc/snort/snort.conf.distrib" \
+		|| die "Failed to disable rules in snort.conf.distrib"
+
+	# Disable preproc rule files by default.
+	sed -i -e 's:^include $PREPROC_RULE_PATH:# include $PREPROC_RULE_PATH:g' \
+		"${D}etc/snort/snort.conf.distrib" \
+		|| die "Failed to disable rules in snort.conf.distrib"
+
+	# Disable normalizer preprocessor config if normalizer USE flag not set.
+	if ! use normalizer; then
+		sed -i -e 's:^preprocessor normalize:#preprocessor normalize:g' \
+			"${D}etc/snort/snort.conf.distrib" \
+			|| die "Failed to disable normalizer config in snort.conf.distrib"
+	fi
+
+}
+
+pkg_postinst() {
+	elog
+	elog "Snort-2.9 introduces the DAQ, or Data Acquisition library, for"
+	elog "packet I/O. The DAQ replaces direct calls to PCAP functions with"
+	elog "an abstraction layer that	facilitates operation on a variety of"
+	elog "hardware and software interfaces without requiring changes to Snort."
+	elog
+	elog "The only DAQ modules supported with this ebuild are AFpacket, PCAP,"
+	elog "and Dump. IPQ nad NFQ will be supported in future versions of this"
+	elog "package."
+	elog
+	elog "For passive (non-inline) Snort deployments you will want to use"
+	elog "either PCAP or AFpacket. For inline deployments you will need"
+	elog "to use AFpacket. The Dump DAQ is used for testing the various inline"
+	elog "features available in ${P}."
+	elog
+	elog "The core DQA libraries are installed in /usr/$(get_libdir)/. The libraries"
+	elog "for the individual DAQ modules (afpacket,pcap,dump) are installed in"
+	elog "/usr/$(get_libdir)/daq. To use these you will need to add the following"
+	elog "lines to your snort.conf:"
+	elog
+	elog "config daq: <DAQ module>"
+	elog "config daq_mode: <mode>"
+	elog "config daq_dir: /usr/$(get_libdir)/daq"
+	elog
+	elog "Please see the README file for DAQ for information about specific"
+	elog "DAQ modules and README.daq from the Snort 2.9 documentation"
+	elog "reguarding Snort and DAQ configuration information."
+	elog
+	elog "See /usr/share/doc/${PF} and /etc/snort/snort.conf.distrib for"
+	elog "information on configuring snort."
+	elog
+
+	if [[ $(date +%Y%m%d) < 20110312 ]]; then
+
+		ewarn
+		ewarn "Please note, you can not use ${P} with the SO rules from"
+		ewarn "previous versions of Snort!"
+		ewarn
+		ewarn "If you do not have a subscription to the VRT rule set and you"
+		ewarn "wish to continue using the shared object (SO) rules, you will"
+		ewarn "need to downgrade Snort. The SO rules will be made available"
+		ewarn "to registered (non-subscription) users on March 12, 2011"
+		ewarn "(30 days after being released to subscription users)."
+		ewarn
+		ewarn "Please see http://www.snort.org/snort-rules/#rules for more"
+		ewarn "details."
+		ewarn
+
+	fi
+
+}