Bump

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

3 files changed, 260 insertions, 3 deletions

diff --git a/net-analyzer/snort/ChangeLog b/net-analyzer/snort/ChangeLog
index 15c4ddc46d41..cf74771d8f9f 100644
--- a/net-analyzer/snort/ChangeLog
+++ b/net-analyzer/snort/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/snort
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v 1.207 2014/10/27 05:47:33 patrick Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v 1.208 2015/03/16 03:15:21 patrick Exp $
+
+*snort-2.9.7.2 (16 Mar 2015)
+
+  16 Mar 2015; Patrick Lauer <patrick@gentoo.org> +snort-2.9.7.2.ebuild:
+  Bump
 
 *snort-2.9.7.0 (27 Oct 2014)
 
diff --git a/net-analyzer/snort/Manifest b/net-analyzer/snort/Manifest
index 7897508a4277..8fd2000d44d0 100644
--- a/net-analyzer/snort/Manifest
+++ b/net-analyzer/snort/Manifest
@@ -6,11 +6,13 @@ DIST snort-2.9.6.0.tar.gz 5189146 SHA256 3cc6c8a9b52f4c863a5736a73b4012aff340b50
 DIST snort-2.9.6.1.tar.gz 5226869 SHA256 119e4c5df83fe36a8d465e72a0347fe31e7771704da286f04115b0c5baa5f7b8 SHA512 455b92900efa098ca85f81290f2b4bfff756d6db1b7f85352f3d17e24e4139c69bde27b4d250aa1291146773f54b891dc8ed877d1bb82fa354bd3e5b8db572a7 WHIRLPOOL 0803e9c3d19fd731820d8d95c81aabdf409db9300c72c5d94384c0e1066bbdd1a4c05cac8b8fa66455358f76e4de24a30b86d4df3992c0c9336def3f6e67d738
 DIST snort-2.9.6.2.tar.gz 5229232 SHA256 8e1d7fc5e1523a786d845ca0102cc474abfcebfcc7e964a1653680034b5b5d77 SHA512 f7ed5dc7777fb330c048d3b14c6fa4b13988ecb3bea7990e04e496dcca7ba28eae976e60838504198a98b9fd3992e021aece5c3142385efebb05a33014afb1c4 WHIRLPOOL fed94a69c69bf5b0e456c272512f77452247168f0a29d5a4bcec43f9b596fe631df3669cea0b90165e573ac875f3d0e1408449d7c99803ef07b1238f4c5ba5a0
 DIST snort-2.9.7.0.tar.gz 6340553 SHA256 9738afea45d20b7f77997cc00055e7dd70f6aea0101209d87efec4bc4eace49b SHA512 f2cbdd2cf2ad15bd4cf3f8658c2a4880ee2069589db89c11aaea637984dde270ef6242c6dd43d5e12f829ed2464388950ee791dbbfa8df796843942c415fbc2f WHIRLPOOL d018f7f4cc9820057642bc691c0812866083a54f9399421f1b6eedfdb55e8cdfd42b0088c12e15facbfbeccd76a6df6351b0103eac35b5d5ca43900521ee274a
+DIST snort-2.9.7.2.tar.gz 6352738 SHA256 db57c532919d9ababac127f29dbdc05ed832394880e46cad81a5dde713ccb4be SHA512 4732014d0049671b1a81857e25a5ffbc3cbccb698be2b3406f69a45603a6b9f34343469ee14fa513199cf9b890a278cc777b42493850cff6fcb3493bb9b73dce WHIRLPOOL 2eec2345e0b945ff504025b2e552729bb5542d351bf1d92e2806be0f1e8d251283d4f984d89058731f5a0150bb1c2a7dd012e9bfbfbd0a3596bfc50321a93cb9
 EBUILD snort-2.9.4.6-r1.ebuild 8684 SHA256 7a6bc0033e52d5a4d1c3b0a5c2eeca1e3751232af46bf2773f54e94a61cb73e4 SHA512 098a90677def25487a9a2b786fc2e3fb1c12cd988fc77306a4ddc194851e844c54b2bcf8df906e3e6231df53234a3bb300283896e53a9d3cb21a5619cbb36ee5 WHIRLPOOL 37f7857fbfe6602e8b313739b459af802af858fd2d1a3c6340799b3ae7e9f622a150bbac093d1baab0bf2a486eddad6126676d72555f1d2caa09fab4e0a25d2c
 EBUILD snort-2.9.5.6.ebuild 8678 SHA256 9f87362e0a6985cee737d78b00e5b70e03831afa1e6b2fb33792f145f80c3b05 SHA512 8ebac2a153f6d342a286c44d77037bd4c438bbb592521f6add0d536fae77a76cce1ff3276f9b3f6347ecb2f6bfce9f5f0d065bbd047bbd15006202f0e4d0e44c WHIRLPOOL fb9ff629611151cc3a3a85fecb31f2a373584fbf78db72866ebcfb1e0d99072de23d8d6e84b7e1e8ea4d9a2a5efe19dff0f48495f52074cc6dc16a5162b7669d
 EBUILD snort-2.9.6.0.ebuild 8727 SHA256 96d77ecb89534df0cc87381375c8a438b979aa749c7c2d6e0e26d58bee466ba3 SHA512 b0b7a645392625314a46a5ae672570fcd06e84849b879b5325ac6fe67ae6d79ac0b208575d3ac6bc4f2d50318382fe694c21400fbf0ef67290b37d8f26f427e0 WHIRLPOOL 340dfbafcfa5fe175ba46c897f09be18237bb0ead4ef2802ea34ed9d08bdea02483df26dffe44dba675553a5106e0781facfb316c0c427805f654cd1e9d24ab2
 EBUILD snort-2.9.6.1.ebuild 8729 SHA256 c7c8ba3951779562574f9d100b0c5845a75d4347ce3a2b92bf262ca32c65a61e SHA512 efffcd4dc8b990057f0ca7df6dc973b231dcc18ab4095c7ce7f9e794936899f5046ee44a28f45b7880953bfc18596e84af1d56dd8ac0fb48a8bc18e6a6793955 WHIRLPOOL afcfa3bfb9d0ed904247ff33448947959cf6bee80bfc20105d9311e681ff98bc2472da19095cc4b8ee4cfc2936cc0e25b63d2e339d432c6612839f0ac4c8315e
 EBUILD snort-2.9.6.2.ebuild 8732 SHA256 51597405d909df309c75cb0d79a2a7d6e7d9280585027399686e7731f05ce0a4 SHA512 171397b0db7f86490e972a14fc0a9fde8f028519d1108cf571fca7d9d3395c2b4148c10ee7ac865b07f0750a97ca5faaccec9078344f3de7babf458c970fbe5a WHIRLPOOL 71078fc3874d96cafecad4f7f6900a1269ec965de574f53412206306827d6ec29c7f5152b7a26f241ae5095182920c6d521cfcfb44de235f0b802b0e66755dce
 EBUILD snort-2.9.7.0.ebuild 8661 SHA256 a8efb6438e153ab637eb60af200f294f4d354b5754a033853072bdf151070902 SHA512 ab1bb5cad0312d5a77adb360c75c85452e4ee32f3a17779d8ec50afc4c8116bab74639ba82d0a9da75a70f4d94b2ba8a7acc343e44c2d5e605061bfe07193783 WHIRLPOOL bad75ff24a1851dc755cef1a346be49b1d4a0a3d43e0de0bcc70cb7b8e67acefad4920e62d355ee67b8f416a4d05ba9fedc707ad8ec3cfd1fb0b39edbc704bec
-MISC ChangeLog 36221 SHA256 299b001ad9e44ce425322a2c147c0cf3721d3bd8754ef9ef0ea3a21262deb946 SHA512 75e5c4f0e24b9ea96b99a67e11bd2f5006c8c65c729041d4e22da815b7c3beb2f34cce2d5c85aa8fbfee1252d45c8478b0ee802ab337e760c31cb90d0538ca94 WHIRLPOOL ad1711e81eb92aa7967bb8ad3c0147d8da8ac92070ca35a7e9514d5123ecf24d4f205b5ece8d4e38d0239b368903c18460d2a005e34e3c56ec7073eb8a0e97d5
+EBUILD snort-2.9.7.2.ebuild 8661 SHA256 b2f87036378a771885431dbd4f04a10bdf384ded9f7f1e32c906618b03c55dcb SHA512 1f5f69c2bd7f17d11cdcc3520fe85c4a9a6b829a26e0bbabeb4576d8f382756de2c098a8f446ce79745397de8dacbdec67202ae77cfb605e205b2be2078d44a4 WHIRLPOOL 91d36f27e5f130cdefe3eb47e4a9bea1ea7d363dade151553c5eeac57f14b886c815bfa8294226a398b0f42dbfc8339ee146ff8f1d2d7f20a77a5078c16dc694
+MISC ChangeLog 36332 SHA256 60df84e88a724314dbb6a3efb4e73446e841a3d638af8e5688e8e109f8871e47 SHA512 99e077788be4c661868dfb25411e6d20b33a6f7b2c71f0125e76046226e587b51189a9e9b507094654a7c3340cc9b591d4ea0d5333b17198f0bd9772488233cf WHIRLPOOL d7bbee17dc51b46f65bdb064f67cd5f7052d20f6f3dad55c4b35698a61ba312f443887baeb0694dcc909279f4058f56e6706544b6418f0098e39e19a167f1f71
 MISC metadata.xml 5163 SHA256 1cba429bc6c631439913bdb2cd5ac6d1c8ea73330d6e034f3f43143e6f37dd4a SHA512 0a741ee8ac244ab387e1a8e783cc62da07c595e9e78dfc0fd14a099327b4de2234b0d30d05853db8acc0386275f60314eb682104b6bef900d3183d6d1004f3ec WHIRLPOOL 0dddc308a4e42c0b1cb724aa366e6d83987fdee3db06271ce2f95de5ef9f04df5ee3ffb35b4a5114dc68c781fc7caea8fc3a3415ac94687dccdf2be458245946
diff --git a/net-analyzer/snort/snort-2.9.7.2.ebuild b/net-analyzer/snort/snort-2.9.7.2.ebuild
new file mode 100644
index 000000000000..1b1318836471
--- /dev/null
+++ b/net-analyzer/snort/snort-2.9.7.2.ebuild
@@ -0,0 +1,250 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.9.7.2.ebuild,v 1.1 2015/03/16 03:15:21 patrick Exp $
+
+EAPI="5"
+inherit autotools multilib user
+
+DESCRIPTION="The de facto standard for intrusion detection/prevention"
+HOMEPAGE="http://www.snort.org/"
+SRC_URI="https://www.snort.org/downloads/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static +gre +mpls +targetbased +ppm +perfprofiling
++non-ether-decoders control-socket file-inspect high-availability
+shared-rep side-channel sourcefire linux-smp-stats inline-init-failopen
++threads debug +active-response +normalizer reload-error-restart
++react +flexresp3 large-pcap-64bit selinux"
+
+DEPEND=">=net-libs/libpcap-1.3.0
+	>=net-libs/daq-2.0.2
+	>=dev-libs/libpcre-8.33
+	dev-libs/libdnet
+	sys-libs/zlib"
+
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-snort )"
+
+REQUIRED_USE="!kernel_linux? ( !shared-rep )"
+
+pkg_setup() {
+
+	# 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() {
+
+	# Multilib fix for the sf_engine
+	ebegin "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 file ftptelnet smtp ssh dns ssl dcerpc2 sdf imap pop sip reputation gtp modbus dnp3; 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
+	eend
+
+	AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+
+	econf \
+		$(use_enable !static shared) \
+		$(use_enable static) \
+		$(use_enable static so-with-static-lib) \
+		$(use_enable gre) \
+		$(use_enable mpls) \
+		$(use_enable targetbased) \
+		$(use_enable control-socket) \
+		$(use_enable file-inspect) \
+		$(use_enable high-availability ha) \
+		$(use_enable non-ether-decoders) \
+		$(use_enable shared-rep) \
+		$(use_enable side-channel) \
+		$(use_enable sourcefire) \
+		$(use_enable ppm) \
+		$(use_enable perfprofiling) \
+		$(use_enable linux-smp-stats) \
+		$(use_enable inline-init-failopen) \
+		$(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 large-pcap-64bit large-pcap) \
+		--enable-reload \
+		--disable-build-dynamic-examples \
+		--disable-profile \
+		--disable-ppm-test \
+		--disable-intel-soft-cpm \
+		--disable-static-daq
+}
+
+src_install() {
+
+	emake DESTDIR="${D}" install
+
+	dodir /var/log/snort \
+		/var/run/snort \
+		/etc/snort/rules \
+		/etc/snort/so_rules \
+		/usr/$(get_libdir)/snort_dynamicrules
+
+	# 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
+
+	insinto /etc/snort
+	doins etc/attribute_table.dtd \
+		etc/classification.config \
+		etc/gen-msg.map \
+		etc/reference.config \
+		etc/threshold.conf \
+		etc/unicode.map
+
+	# 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
+
+	# config.log and build.log are needed by Sourcefire
+	# to troubleshoot build problems and bug reports so we are
+	# preserving them incase the user needs upstream support.
+	if [ -f "${WORKDIR}/${PF}/config.log" ]; then
+		dodoc "${WORKDIR}/${PF}/config.log"
+	fi
+	if [ -f "${T}/build.log" ]; then
+		dodoc "${T}/build.log"
+	fi
+
+	insinto /etc/snort/preproc_rules
+	doins preproc_rules/decoder.rules \
+		preproc_rules/preprocessor.rules \
+		preproc_rules/sensitive-data.rules
+
+	fowners -R snort:snort \
+		/var/log/snort \
+		/var/run/snort \
+		/etc/snort
+
+	newinitd "${FILESDIR}/snort.rc12" snort
+	newconfd "${FILESDIR}/snort.confd.2" snort
+
+	# 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"
+
+	# Remove unneeded .la files (Bug #382863)
+	rm "${D}"usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
+	rm "${D}"usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la"
+
+	# 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
+
+	# 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
+
+	# 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
+
+	# 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
+
+	sed -i -e 's|^# dynamicdetection directory|dynamicdetection directory|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# 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
+
+	# 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
+
+	sed -i -e 's|^include reference.config|include /etc/snort/reference.config|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Disable all rule files by default.
+	sed -i -e 's|^include $RULE_PATH|# include $RULE_PATH|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# 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
+	fi
+
+	# Set the configured DAQ to afpacket
+	sed -i -e 's|^# config daq: <type>|config daq: afpacket|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the location of the DAQ modules
+	sed -i -e 's|^# config daq_dir: <dir>|config daq_dir: /usr/'$(get_libdir)'/daq|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the DAQ mode to passive
+	sed -i -e 's|^# config daq_mode: <mode>|config daq_mode: passive|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set snort to run as snort:snort
+	sed -i -e 's|^# config set_gid:|config set_gid: snort|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+	sed -i -e 's|^# config set_uid:|config set_uid: snort|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the default log dir
+	sed -i -e 's|^# config logdir:|config logdir: /var/log/snort/|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the correct so_rule location in the config
+	 sed -i -e 's|SO_RULE_PATH ../so_rules|SO_RULE_PATH /etc/snort/so_rules|g' \
+		 "${D}etc/snort/snort.conf.distrib" || die
+}
+
+pkg_postinst() {
+
+	einfo "There have been a number of improvements and new features"
+	einfo "added to ${P}. Please review the RELEASE.NOTES and"
+	einfo "ChangLog located in /usr/share/doc/${PF}."
+	einfo
+	elog "The Sourcefire Vulnerability Research Team (VRT) recommends that"
+	elog "users migrate their snort.conf customizations to the latest config"
+	elog "file released by the VRT. You can find the latest version of the"
+	elog "Snort config file in /etc/snort/snort.conf.distrib."
+	elog
+	elog "!! It is important that you migrate to this new snort.conf file !!"
+	elog
+	elog "This version of the ebuild includes an updated init.d file and"
+	elog "conf.d file that rely on options found in the latest Snort"
+	elog "config file provided by the VRT."
+
+	if use debug; then
+		elog "You have the 'debug' USE flag enabled. If this has been done to"
+		elog "troubleshoot an issue by producing a core dump or a back trace,"
+		elog "then you need to also ensure the FEATURES variable in make.conf"
+		elog "contains the 'nostrip' option."
+	fi
+}