gentoo resync : 14.12.2020

2 files changed, 251 insertions, 0 deletions

diff --git a/net-analyzer/snort/Manifest b/net-analyzer/snort/Manifest
index 59007e95deb5..48901688e100 100644
--- a/net-analyzer/snort/Manifest
+++ b/net-analyzer/snort/Manifest
@@ -14,6 +14,7 @@ DIST snort-2.9.8.3.tar.gz 6244304 BLAKE2B cb77c80dde0b5b32ba0fe36cd07e1f6f465127
 EBUILD snort-2.9.12.ebuild 8872 BLAKE2B 84895cf9afb5ddf3079773ff50d730c56af2b01fc912c9d1fa74bead53fe30332d4971dde35cd3091057fadb06f32c25971823904c8d00caf185d9547ec32a63 SHA512 26ed8dc6c1d020a1fb73d1f12a81700a3d18103038340d00eb44d9891391eb49b2e8a611a3f46bf4d8423cb0586e8449933e7863e0184030f152b246e6696070
 EBUILD snort-2.9.15.1.ebuild 8290 BLAKE2B a736c8a9d301ffdfca34d9ce0d5b8c7e8ffe07214a9c82a9981699dc40ee5061356b64124a1506b31aca773ff330af25ea6885be166555df349afaacd46e68a7 SHA512 acfef7c2b52430d2965c6d0ebb34b38c3075a291c8c5679d03e01466bde8ffb09a61281ae8c549c4f5fe3577d47af6f581ce45c0820f9c5de63aa0574ba59b12
 EBUILD snort-2.9.15.ebuild 8815 BLAKE2B 884fb9f7275d056092b24695acfe1dec49cd58282be6d4a229f0d15c1354ff5fcdb8d3add6c42669a0484702f2dc8fa64f958ed1f21a641b70a98a1b24930abf SHA512 bad67ba43f442bf74c81f268b59fb7c1eff3028fec0224800bd4a672aad95c01bf33105fe4f0f27c65e9f5214e8228735be4a186498c7b151cd1bf59cebbb575
+EBUILD snort-2.9.16-r100.ebuild 8396 BLAKE2B c9a4e6ba9f52e4b636fae963470a1f5e3eb819c5e07a6559de1a72604d2ba9aa3dc4960d4b432a651784abb12e673dfc8bb1fdcd7c2b1623cc42ecbb52985be9 SHA512 14ea6ae13822af4b9d8e9367605135cd0c318c52643ebe313f16362b49684cfad4e2c589146b6cec399c1ce03330be7b613940cd72ff50276f3b3651957afacb
 EBUILD snort-2.9.16.ebuild 8290 BLAKE2B c79c137cb7bff4c3c0b55f3d73b52e25a10ef61b268e178948f36da4ec70be3d8834cdbe679a6e6c86cdf0f5244e912d25493d0ec1121dd29875a25a82cfa983 SHA512 9211178da2253e549c096f1c553a7a63fb8bea6071079d34c3db709abe1524f39d8f4936703e32802a073bd7407fb3945ea4f0216616ea33cfc312319a7a0a47
 EBUILD snort-2.9.8.3-r2.ebuild 8505 BLAKE2B 82e9e4dbb2527f80ff87f3c95befb2b141e8ca55e1b097581b688c65e990c7cc0206388d98859f47e0f6b0a9ea52d2f6ff566ed67085de4f33c5023e7e4b86dc SHA512 8444c62e53db68fa39a85048b1ce01f30d16d636f4dd5eb3e51a1a5af3e393ca9bf0d4615c44b38bd57de050735b3666222c542c215b08f4f75c49613988a390
 MISC metadata.xml 4042 BLAKE2B 931c99e6b1aee3727e47f32dff6399dc821624fc9cc3be496ba711d480edb04920d2ffcdc9ce4fe6a253be2bbcd4bb45f56a34da530c6dd60140c77b5cc45856 SHA512 2ade0995e40052f3be40a073458a19ea380bb2f75e24905c06b45e88d8956b118db73fbb0a1062e5c0ca837e04d1805a54785a84283e701534ec47c320833b1f
diff --git a/net-analyzer/snort/snort-2.9.16-r100.ebuild b/net-analyzer/snort/snort-2.9.16-r100.ebuild
new file mode 100644
index 000000000000..f538da3c59d8
--- /dev/null
+++ b/net-analyzer/snort/snort-2.9.16-r100.ebuild
@@ -0,0 +1,250 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( luajit )
+
+inherit autotools lua-single user systemd tmpfiles multilib
+
+DESCRIPTION="The de facto standard for intrusion detection/prevention"
+HOMEPAGE="https://www.snort.org"
+SRC_URI="https://www.snort.org/downloads/archive/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+active-response control-socket debug file-inspect +flexresp3 +gre
+high-availability inline-init-failopen large-pcap-64bit +libtirpc
+linux-smp-stats +non-ether-decoders open-appid +perfprofiling +ppm +react
+reload-error-restart selinux shared-rep side-channel sourcefire static
++threads"
+
+DEPEND=">=net-libs/libpcap-1.3.0
+	>=net-libs/daq-2.0.2
+	>=dev-libs/libpcre-8.33
+	dev-libs/libdnet
+	net-libs/libnsl:0=
+	sys-libs/zlib
+	!libtirpc? ( sys-libs/glibc[rpc(-)] )
+	libtirpc? ( net-libs/libtirpc )
+	open-appid? ( ${LUA_DEPS} )
+"
+
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-snort )"
+
+REQUIRED_USE="!kernel_linux? ( !shared-rep )
+	open-appid? ( ${LUA_REQUIRED_USE} )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.9.8.3-no-implicit.patch
+	"${FILESDIR}"/${PN}-2.9.8.3-rpc.patch
+	"${FILESDIR}"/${PN}-2.9.12-snort.pc.patch
+	"${FILESDIR}"/${PN}-2.9.15.1-fno-common.patch
+)
+
+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
+
+	use open-appid && lua-single_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	mv configure.{in,ac} || die
+
+	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 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 open-appid) \
+		$(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 reload-error-restart) \
+		$(use_enable react) \
+		$(use_enable flexresp3) \
+		$(use_enable large-pcap-64bit large-pcap) \
+		$(use_with libtirpc) \
+		--enable-mpls \
+		--enable-normalizer \
+		--enable-reload \
+		--enable-targetbased \
+		--disable-build-dynamic-examples \
+		--disable-profile \
+		--disable-ppm-test \
+		--disable-intel-soft-cpm \
+		--disable-static-daq
+}
+
+src_install() {
+	default
+
+	keepdir /var/log/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 \
+		/etc/snort
+
+	newinitd "${FILESDIR}/snort.rc12" snort
+	newconfd "${FILESDIR}/snort.confd.2" snort
+	systemd_newunit "${FILESDIR}/snort_at.service" "snort@.service"
+
+	newtmpfiles "${FILESDIR}"/snort.tmpfiles snort.conf
+
+	# Sourcefire uses Makefiles to install docs causing Bug #297190.
+	# This removes the unwanted doc directory and rogue Makefiles.
+	rm -rf "${ED}"/usr/share/doc/snort || die "Failed to remove SF doc directories"
+	rm "${ED}"/usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files"
+
+	# Remove unneeded .la files (Bug #382863)
+	rm "${ED}"/usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
+	rm "${ED}"/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' \
+		"${ED}/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' \
+		"${ED}/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' \
+		"${ED}/etc/snort/snort.conf.distrib" || die
+
+	# Enable the preprocessor/decoder rules
+	sed -i -e 's|^# include $PREPROC_RULE_PATH|include $PREPROC_RULE_PATH|g' \
+		"${ED}/etc/snort/snort.conf.distrib" || die
+
+	sed -i -e 's|^# dynamicdetection directory|dynamicdetection directory|g' \
+		"${ED}/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' \
+		"${ED}/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' \
+		"${ED}/etc/snort/snort.conf.distrib" || die
+
+	sed -i -e 's|^include reference.config|include /etc/snort/reference.config|g' \
+		"${ED}/etc/snort/snort.conf.distrib" || die
+
+	# Disable all rule files by default.
+	sed -i -e 's|^include $RULE_PATH|# include $RULE_PATH|g' \
+		"${ED%}/etc/snort/snort.conf.distrib" || die
+
+	# Set the configured DAQ to afpacket
+	sed -i -e 's|^# config daq: <type>|config daq: afpacket|g' \
+		"${ED%}/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' \
+		"${ED%}/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' \
+		"${ED%}/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' \
+		"${ED}/etc/snort/snort.conf.distrib" || die
+	sed -i -e 's|^# config set_uid:|config set_uid: snort|g' \
+		"${ED}/etc/snort/snort.conf.distrib" || die
+
+	# Set the default log dir
+	sed -i -e 's|^# config logdir:|config logdir: /var/log/snort/|g' \
+		"${ED}/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' \
+		"${ED}/etc/snort/snort.conf.distrib" || die
+}
+
+pkg_postinst() {
+	tmpfiles_process snort.conf
+
+	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
+}