Bump for #351459, dropping x86 stable keyword as libprelude dropped it.

Package-Manager: portage-2.2.0_alpha14/cvs/Linux x86_64

4 files changed, 276 insertions, 7 deletions

diff --git a/net-analyzer/snort/ChangeLog b/net-analyzer/snort/ChangeLog
index 743a1761352c..de6ebe359803 100644
--- a/net-analyzer/snort/ChangeLog
+++ b/net-analyzer/snort/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/snort
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v 1.169 2010/12/03 18:30:41 patrick Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v 1.170 2011/01/13 13:43:37 patrick Exp $
+
+*snort-2.9.0.3 (13 Jan 2011)
+
+  13 Jan 2011; Patrick Lauer <patrick@gentoo.org> snort-2.8.5.1.ebuild,
+  +snort-2.9.0.3.ebuild:
+  Bump for #351459, dropping x86 stable keyword as libprelude dropped it.
 
 *snort-2.9.0.2 (03 Dec 2010)
 
diff --git a/net-analyzer/snort/Manifest b/net-analyzer/snort/Manifest
index a3984b9b74b8..6a9c5c322e17 100644
--- a/net-analyzer/snort/Manifest
+++ b/net-analyzer/snort/Manifest
@@ -10,11 +10,13 @@ DIST snort-2.8.6.1.tar.gz 4939019 RMD160 27925c0df9debc9e60e19a0c989db28c8d1ca7f
 DIST snort-2.8.6.tar.gz 4960740 RMD160 5b549eab39a6e0a0f182f6d2ee46fd60995c822e SHA1 e463c99994e52171439623e1b05b9e1bcf01ac8f SHA256 6064d7bb78d6438b455ff349b93d52f40d3977f1fecb1d7958c87881b0030358
 DIST snort-2.9.0.1.tar.gz 5806264 RMD160 2116d6e65d3d8dc08b3ce9d0eb66aca515b697aa SHA1 fc923c71bc268857ce72fad412076deab3b90d0f SHA256 c77d70680e1b2e320fdf213f5ecfa019e253f16d0b1fae06e7e428e9d1d2638a
 DIST snort-2.9.0.2.tar.gz 5808739 RMD160 9f0291268b24c9cf67f5e6bd40d7a70acac456f1 SHA1 619c4e53923e96a3e4e36bef977643e317543214 SHA256 7649596ab98ebee32518cbac861bd5f156331bbf06ca89d9696c0ccf4c6d913b
-EBUILD snort-2.8.5.1.ebuild 10250 RMD160 9b608cdf3c04ac3099fa9f4825a567e9fcd1f22e SHA1 8da5d7002564121c2a786d98c204022e97ad3ea2 SHA256 fa24db38ba95feb58c67a5a3befc278f0ac19f4beaaa0a0be34bb3289a0500a5
+DIST snort-2.9.0.3.tar.gz 5791144 RMD160 6f9c133c4069728ef5175448341b8bf8a52a7790 SHA1 c6bc422d71ab6b5527029c0d3e5422504d961ad4 SHA256 382768dc7a47bbf4e1a85cd765d8bf4f245643be2acfc740fda1cd3d24e32a48
+EBUILD snort-2.8.5.1.ebuild 10251 RMD160 a6247330c442f1d17b707963157627c1d3147b05 SHA1 84365e66cb4eda0b3c9cfae02a9b4a8ac4736cb5 SHA256 fc3a8dde6c3dd0bc3641a8849d14c700b615ac1e6d4763f84befb3bbc84d76ab
 EBUILD snort-2.8.5.3.ebuild 10252 RMD160 2e2441d222c10a27d273ca38961529035acb48a3 SHA1 27b27bf104c9d42813be1df397653b2e109cedda SHA256 67ff9ad9aa392748361d0ab6da671a5a48e09538024cf1ef01f5d1fcb21de6a7
 EBUILD snort-2.8.6.1.ebuild 10450 RMD160 ba7f868b94cbd20b3c04baf71d5234734474b836 SHA1 b73c0b2aa0544a7d9563b8da2bfc5ba0aa5a1fdf SHA256 54648baae9882f7128ffae83c69d372af1c058773458ae005476218c11f59110
 EBUILD snort-2.8.6.ebuild 10126 RMD160 45bf6958f0b51098bebc54b90cf6660467b044b1 SHA1 2159a71f642ed28a9f1e1651339815b98ed6f2ad SHA256 4426ce97a4def8f6671ec123c900387e8f62711d54f24c0526af6ac20a7532a4
 EBUILD snort-2.9.0.1.ebuild 8854 RMD160 50ed08b0a83ce9f7382265bf050def431b866f98 SHA1 ec0918439929828e6a08c22b6fee1212cc5a6e63 SHA256 91e0bf9bab8d4be45b7718b9f3469b71f032923efc9c0079c8e55f205fcde30f
 EBUILD snort-2.9.0.2.ebuild 8854 RMD160 a44d12f10d923ae8e7c0450e042103907095e630 SHA1 f409b4781d46e0ad46488ef4350785ffed32454d SHA256 4c58910b1764ab7ee568b3729143a5d00cf4604c84a7c767903e06189858e7a0
-MISC ChangeLog 29565 RMD160 890df55e7dfb546ccf724c4bb8251de0f9a1cd41 SHA1 d66e96502cafb59bcef15eb4ea9b90011658fe23 SHA256 1f548776d4dc94379b279c124cd44d4d2f8d81fa7bee88d67c9ba134983d2399
+EBUILD snort-2.9.0.3.ebuild 8859 RMD160 e589add959ea4153a683082926633e51f32b7d8b SHA1 4af8df9e6b45ff229d4700b3d775365d122ece44 SHA256 384c2b9a36536226942bf9b68716db17ed13bfa840956ae5075d345a6de1fec9
+MISC ChangeLog 29767 RMD160 7a51ffa05c91a53980d6daa05fdaef023ae925a1 SHA1 149064d7ded4de29feca58251738a3ccfdec7be3 SHA256 2ef8e15fc5caa571d5e66032f73f75921060270ae1fa5ecd4f3abe5be8564f1c
 MISC metadata.xml 4680 RMD160 44cc33521d8fd47729cf4fc4f995720a83363019 SHA1 533d62565c9e790af601f157b6636df8768c83d7 SHA256 efaa573a99b929774440fad2d24d8fcb2b67ff69db883445a6895ba2cc3e4a24
diff --git a/net-analyzer/snort/snort-2.8.5.1.ebuild b/net-analyzer/snort/snort-2.8.5.1.ebuild
index c044fc388590..2f641c7a3c1f 100644
--- a/net-analyzer/snort/snort-2.8.5.1.ebuild
+++ b/net-analyzer/snort/snort-2.8.5.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.8.5.1.ebuild,v 1.8 2010/06/17 20:41:53 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.8.5.1.ebuild,v 1.9 2011/01/13 13:43:37 patrick Exp $
 
 inherit eutils autotools multilib
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.snort.org/"
 SRC_URI="http://dl.snort.org/snort-current/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ppc ppc64 ~sparc ~x86"
 IUSE="static dynamicplugin ipv6 gre mpls targetbased decoder-preprocessor-rules ppm timestats perfprofiling linux-smp-stats inline inline-init-failopen prelude threads debug reload reload-error-restart flexresp flexresp2 react aruba mysql odbc postgres selinux"
 
 #flexresp, react, and inline _ONLY_ work with net-libs/libnet-1.0.2a
diff --git a/net-analyzer/snort/snort-2.9.0.3.ebuild b/net-analyzer/snort/snort-2.9.0.3.ebuild
new file mode 100644
index 000000000000..07c48d4d1e85
--- /dev/null
+++ b/net-analyzer/snort/snort-2.9.0.3.ebuild
@@ -0,0 +1,261 @@
+# 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.3.ebuild,v 1.1 2011/01/13 13:43:37 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/637 -> ${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}
+	dev-lang/perl
+	selinux? ( sec-policy/selinux-snort )"
+
+pkg_setup() {
+
+	if use zlib && ! use dynamicplugin; then
+		eerror
+		eerror "You have enabled the 'zlib' USE flag but not the 'dynamicplugin' USE flag."
+		eerror "'zlib' requires 'dynamicplugin' be enabled."
+		eerror
+		eerror
+		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 prevent the docs Makefile from being used.
+	# Fixes #297190.
+	einfo "Applying documentation fix."
+	sed -i -e 's:src doc etc:src etc:g' \
+		"${WORKDIR}/${P}/Makefile.am" || die "Doc fix Failed"
+
+	#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
+	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 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-dlclose \
+		--disable-intel-soft-cpm \
+		--disable-static-daq \
+		--without-oracle
+
+}
+
+src_install() {
+
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	keepdir /var/log/snort/
+	fowners snort:snort /var/log/snort
+
+	keepdir /var/run/snort/
+	fowners snort:snort /var/run/snort/
+
+	dodoc ./doc/* ./RELEASE.NOTES ./tools/u2boat/README.u2boat ./schemas/*
+	rm -rf "${D}"usr/share/doc/snort/
+	rm "${D}"usr/share/doc/"${P}"/Makefile*
+
+	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 add files in /etc/snort"
+
+	# 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 \
+		|| die "Failed to add files in /etc/snort/preproc_rules"
+
+	keepdir /etc/snort/rules/
+	fowners -R snort:snort /etc/snort/
+
+	keepdir /usr/$(get_libdir)/snort_dynamicrules
+
+	newinitd "${FILESDIR}/snort.rc10" snort || die "Failed to add snort.rc10"
+
+	newconfd "${FILESDIR}/snort.confd" snort || die "Failed to add snort.confd"
+
+	# 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"
+
+}
+
+pkg_postinst() {
+	elog
+	elog "${P} 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) < 20110111 ]]; then
+
+		ewarn
+		ewarn "Please note, you can not use ${PF} 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 Jan. 11, 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
+
+}