Fix #356905, upstream released a patch to address a bug with partial HTTP URI decoding and incremented the internal build number, but did not bump the version number on the available tarball. Build is now 111 from 110.

Package-Manager: portage-2.1.9.41/cvs/Linux x86_64

3 files changed, 286 insertions, 2 deletions

diff --git a/net-analyzer/snort/ChangeLog b/net-analyzer/snort/ChangeLog
index 3a3001b2c1fb..05f4b40ea852 100644
--- a/net-analyzer/snort/ChangeLog
+++ b/net-analyzer/snort/ChangeLog
@@ -1,6 +1,13 @@
 # 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.175 2011/02/28 20:54:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v 1.176 2011/03/01 07:52:53 kumba Exp $
+
+*snort-2.9.0.4-r1 (01 Mar 2011)
+
+  01 Mar 2011; Joshua Kinard <kumba@gentoo.org>  +snort-2.9.0.4-r1.ebuild:
+  Fix #356905, upstream released a patch to address a bug with partial HTTP URI
+  decoding and incremented the internal build number, but did not bump the
+  version number on the available tarball. Build is now 111 from 110.
 
   28 Feb 2011; Jeroen Roovers <jer@gentoo.org> snort-2.9.0.4.ebuild:
   Do not install temporary log files (bug #356547).
diff --git a/net-analyzer/snort/Manifest b/net-analyzer/snort/Manifest
index aab4e82c5b75..7822ffde0642 100644
--- a/net-analyzer/snort/Manifest
+++ b/net-analyzer/snort/Manifest
@@ -12,6 +12,7 @@ DIST snort-2.8.6.tar.gz 4960740 RMD160 5b549eab39a6e0a0f182f6d2ee46fd60995c822e
 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
 DIST snort-2.9.0.3.tar.gz 5791144 RMD160 6f9c133c4069728ef5175448341b8bf8a52a7790 SHA1 c6bc422d71ab6b5527029c0d3e5422504d961ad4 SHA256 382768dc7a47bbf4e1a85cd765d8bf4f245643be2acfc740fda1cd3d24e32a48
+DIST snort-2.9.0.4-r1.tar.gz 5812096 RMD160 e33ff54d72334413cf7970c418370e4f8a953c9e SHA1 a803fae561f829c2dad7e61f0a9b8f75f72356de SHA256 053d1562f4ffc1793188f0d2475c043ddae42b33f8b93be45d7e67dbc7424b8d
 DIST snort-2.9.0.4.tar.gz 5818104 RMD160 299de5367386af2ac13d1d5fc6e55a38378a882a SHA1 88dc943733295468153e0f0ff8b7f782d7ff259a SHA256 be7e31c5a828d1c43a70e97fd4493323898215211260c145288fdb582c7625c3
 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
@@ -20,6 +21,7 @@ EBUILD snort-2.8.6.ebuild 10126 RMD160 45bf6958f0b51098bebc54b90cf6660467b044b1
 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
 EBUILD snort-2.9.0.3.ebuild 8858 RMD160 c8809f720892546e2024435d1527dfb9a05976a4 SHA1 1eadfe437b261a010735590ab64b9c42371fcfaf SHA256 682048f16695c1fd467f20cc6770ca80c949505b9795e7c33c850dc99f4fbc22
+EBUILD snort-2.9.0.4-r1.ebuild 9873 RMD160 6d2d594f6d4779c9b23a75efd2787e7292bac098 SHA1 564fb734eeca6ac55874d88e95820e2a10b392e2 SHA256 8c075a020563176e949d9591c33b135e4f88f5bd8e83583bfd2c9e0a28f22e18
 EBUILD snort-2.9.0.4.ebuild 9864 RMD160 121665d385416899a76572de8738834c0c680c62 SHA1 819726a77b484a2962d9e5eb66625a739d871285 SHA256 529fb546a20b5fa041774c1656540afbc3a9a975c094c3e87689aa499391bd67
-MISC ChangeLog 30483 RMD160 8c9816996783a5e6d05e5b964a56018a8a3fa484 SHA1 59430df568d4bd10d1ea77276365b2d39d6dd111 SHA256 d85ad3ebf7cd086433358a4a5d124ab8fe04063cbd0e5d193fbaa381d0d7c2e7
+MISC ChangeLog 30819 RMD160 f1c40a378f7c1fca329a316c7794d8214441770f SHA1 b59031711bf9092593b91caca6e73290335b2364 SHA256 421636f2aca5107dde0a9b49d39d218fe0addf78a1f41b4fef6e7ca545ff741f
 MISC metadata.xml 5174 RMD160 3de62ad1395938c61f8ea10bf91b816687fd2fc2 SHA1 83c1ced9279fcd14b378bcafc316b255b7932667 SHA256 5e2577560aaf444e1699aa796a8126276222ddd413289d72aea3c35dfdfbb2cb
diff --git a/net-analyzer/snort/snort-2.9.0.4-r1.ebuild b/net-analyzer/snort/snort-2.9.0.4-r1.ebuild
new file mode 100644
index 000000000000..1ad876f2ec4b
--- /dev/null
+++ b/net-analyzer/snort/snort-2.9.0.4-r1.ebuild
@@ -0,0 +1,275 @@
+# 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-r1.ebuild,v 1.1 2011/03/01 07:52:53 kumba 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/808 -> ${P}-r1.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"
+
+	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
+
+}