gentoo resync : 28.04.2021

4 files changed, 39 insertions, 36 deletions

diff --git a/net-analyzer/snort/Manifest b/net-analyzer/snort/Manifest
index cb703d3093a4..5dde368969d5 100644
--- a/net-analyzer/snort/Manifest
+++ b/net-analyzer/snort/Manifest
@@ -6,9 +6,9 @@ AUX snort.confd.2 420 BLAKE2B 984bc3a1b4f9fea044b150d1362950cc2bc0fae07a92351a88
 AUX snort.rc12 1469 BLAKE2B 6238dfc0f9e178fca864ee9485b8cf59c3056d8b047ee5fd62087f55e8a4627a903aff854827175fc80aaa6ecafa924d9ca57cd9fdba5a185d1e31814db69280 SHA512 ec398f06db147bc8ddf98b0d6a200af40c082053062b56a3fe78b1de6629cd7bf0b188e9baf44c1634f5f9f8ce8494a8a71be63c1e3f71838b77de58dbb45c71
 AUX snort.tmpfiles 32 BLAKE2B 39e4f2491f52d2a369b1c4747468ea3a9d5f2c05a85adb4666e733929be16b9cf868ea6878d3d71271dd8ee05ad8e8fac52c4f4ebfd17da873a3dc64c5368810 SHA512 705e49c172ba7bc0afee9910dcbf7b4ee96f05e6d3030c7928bbeb0df658aefb5f61fddd0da078b257ee9a0c86d1750e7b44d6f61d8e56ab799044cd141964b5
 AUX snort_at.service 327 BLAKE2B 36039657ae5a5b7a37585baebc3de15f32f457b3df6313621eea6bafe3e8a34626960bd4adafe110f36f75a15bae8fc045a6e3267b960249536a0f10ac05b88f SHA512 af48018d232eec181eff2f3aa240e11744911874ee08a0311474d73bffcf1e567102ea6d42a26520dd5a1a3c66530d8d3f19fc4b4753b6ac0ae55eb3200747e0
-DIST snort-2.9.15.1.tar.gz 6618999 BLAKE2B d9f661b036afa2130d406f8bcfa8d33fca482983e0e4785218e08899104c9069809b089631940109ee31e8d197783d994c58417d94f4b5282702e51466f828fa SHA512 9940f5bcdcf04823f9cb5c3f8efda72f98f6a47bce9f40399dec9ec41d23a386c7f7e44861d82368de31546123b920f9fc617197bbf9c5e750724bf8b9e19590
 DIST snort-2.9.16.tar.gz 6948498 BLAKE2B b089f1caef44cd5243c38eba44e7449b1111b397e42eb1722f64530206532edb413003e6af06d18bc6051ef1ce8cbcf42955d823a56abe061081e99c6492dea7 SHA512 7e4e772d351890cb6ad6db4210e1f302fbb600b3b25182800ffd7e73061a044c2cf6fa927e542a1d20cea4fa3eed522f022b394a9286ada7694309d0c8c3bb75
-EBUILD snort-2.9.15.1.ebuild 8296 BLAKE2B a85504c132e629fd023de19a6fb95ded3194fe23ce2af9e1fc1284b50cc7a736735a79961bce06ec86ea82072ba2148970ebe28d171218eb1bb40ff7fef37f54 SHA512 caa6697e0725bdfb7d5dc51f3f0cce02fc0dd83af67793a8e7930cd84e7b14535bcb12b09dd8d4e67da178e8e48b7590377d484f1c2bd54e25cbb2346062584b
-EBUILD snort-2.9.16-r100.ebuild 8409 BLAKE2B 8235121f2f81c53aa7b2d58ecb15647062a7cb391ef6aced8351572348b5ef2e9036c9190a29a1ca3e3d2dfc08ed7624de6b15ac03d254b8b748f778c87426ea SHA512 e7ae4bf8fa7b1898c2686664f2993be906ec9e3ccecac34251cc9a8b7099e1633ba20e662d18ab5b4902b595ac491bda5e8c3efc5f546322d3f126d730a2d58d
-EBUILD snort-2.9.16.ebuild 8296 BLAKE2B 11cd245301793f6a4da6d98cb194cac7c2927817eeea81343b86b7f42562cba24950cf9327bb945321c0c21e535f286fe33d09296b6bb3e1c0a00cea7f98e075 SHA512 a75bae48d4aab6f9b3970be191383f575c431459b8b6933ec65ffe01040d75c628f0da191f4593b9140f45f7454e7683a03b3d0a6da0b12c8fc11afc5538c2e4
+DIST snort-2.9.17.tar.gz 6983018 BLAKE2B 8a6d5f4311e304b141f705fdcd3f570e88540dc5ce5882887b6fa52ea16e41daac384012badcbbc087693ee631e30477b8af2a6c49efa8230c71b80937597355 SHA512 c1a69e697298b4e85b8b8898e29077f5e74d8e2a8e42c2164a5597b3739204d856a74f30bc7c30b1907ec7b3bd3c6c6d798ead890656386b0c2a2da2c201d006
+EBUILD snort-2.9.16-r100.ebuild 8400 BLAKE2B 7f4ea0f30d7221171295ae513551543341b5e2f81c01d2694b45fa5c98550a18fa9b63a5c36915f3c0a17a09ac3acb09c58c6cde953f9efa2b81f7854400838d SHA512 e019602b0b6dc6ec5a022286bfe0291d02b8fb2efdfcdb9f28c864661d6475124176905debee553333763119731dcaa109f43abb771b2bd01ada6dda59cb0967
+EBUILD snort-2.9.16.ebuild 8288 BLAKE2B fb37f64c66a6d9487f513fc6b07b380cbafd7fa3d1bf9b984a0344c5c298e9be20e8bb0a9992724c3789254428c61597e61146957c0e4a55b751d0d67d2e436f SHA512 2806d400ab816104fbe41e50056f7463e7cd595611f1d300c8c0287d2206b308062900ac1b57ceb77ac580c24894600218ad39cba874fe2596b95b1976d75305
+EBUILD snort-2.9.17.ebuild 8196 BLAKE2B 4b484d9f4f03ce988795fd17c690611531bc15514838096a1bd055432cdf4860f7a823bbef9701248cb3903170c06f395b3e90ef8cb99cb133b58ade07058ff2 SHA512 9a611e49f6f853f841c6904db1a6c00232aa4ec274c6708ee4bf5604022aa329156edc11f37966a7c5e35903e4a775d5020a371ac00cba99a4057d23a0753092
 MISC metadata.xml 4035 BLAKE2B edf91433724efd997deba7081e0d33247da16fd1f660fc7acf3d37e9f1eef188786a89eb6e8f9ef4ad5f288f71e5ceef2e9bcedc67b17bb74dc9a14f42306b4c SHA512 b0fe8a69ea492a65b89bcc0563a1b88583d8a80d3883944c4a52a0b10b8d9743160667afcb647c92e54eb12d51f8bc5cb8638151f17cb0f06ae74185db83acba
diff --git a/net-analyzer/snort/snort-2.9.16-r100.ebuild b/net-analyzer/snort/snort-2.9.16-r100.ebuild
index 66b2b845e872..91f49430d6f0 100644
--- a/net-analyzer/snort/snort-2.9.16-r100.ebuild
+++ b/net-analyzer/snort/snort-2.9.16-r100.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 LUA_COMPAT=( luajit )
 
-inherit autotools lua-single user systemd tmpfiles multilib
+inherit autotools lua-single user systemd tmpfiles
 
 DESCRIPTION="The de facto standard for intrusion detection/prevention"
 HOMEPAGE="https://www.snort.org"
diff --git a/net-analyzer/snort/snort-2.9.16.ebuild b/net-analyzer/snort/snort-2.9.16.ebuild
index 4a3f0392b5c1..328947af8555 100644
--- a/net-analyzer/snort/snort-2.9.16.ebuild
+++ b/net-analyzer/snort/snort-2.9.16.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools user systemd tmpfiles multilib
+
+inherit autotools user systemd tmpfiles
 
 DESCRIPTION="The de facto standard for intrusion detection/prevention"
 HOMEPAGE="https://www.snort.org"
diff --git a/net-analyzer/snort/snort-2.9.15.1.ebuild b/net-analyzer/snort/snort-2.9.17.ebuild
index 440d87d8359a..ba2c56393269 100644
--- a/net-analyzer/snort/snort-2.9.15.1.ebuild
+++ b/net-analyzer/snort/snort-2.9.17.ebuild
@@ -2,49 +2,49 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools user systemd tmpfiles multilib
+
+LUA_COMPAT=( luajit )
+
+inherit autotools lua-single systemd tmpfiles
 
 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="static +gre +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 reload-error-restart open-appid
-+react +flexresp3 large-pcap-64bit selinux +libtirpc"
-
-DEPEND=">=net-libs/libpcap-1.3.0
-	>=net-libs/daq-2.0.2
-	>=dev-libs/libpcre-8.33
+
+KEYWORDS="~amd64 ~arm ~arm64 ~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 +threads"
+
+DEPEND="acct-user/snort
+	acct-group/snort
 	dev-libs/libdnet
+	>=dev-libs/libpcre-8.33
 	net-libs/libnsl:0=
+	>=net-libs/libpcap-1.3.0
 	sys-libs/zlib
 	!libtirpc? ( sys-libs/glibc[rpc(-)] )
 	libtirpc? ( net-libs/libtirpc )
-	open-appid? ( dev-lang/luajit:= )
-"
-
+	open-appid? ( ${LUA_DEPS} )"
+BDEPEND=">=net-libs/daq-2.0.2"
 RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-snort )"
 
-REQUIRED_USE="!kernel_linux? ( !shared-rep )"
+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
+	"${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"
 )
 
 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() {
@@ -52,14 +52,15 @@ src_prepare() {
 
 	mv configure.{in,ac} || die
 
+	# USE=debug exposes a macro whose name apparently wasn't changed
+	sed -i -e 's/BEFORE_SRV_FAIL/BEFORE_SERVICE_FAIL/' \
+		src/dynamic-preprocessors/appid/appInfoTable.c || 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) \
@@ -92,7 +93,9 @@ src_configure() {
 		--disable-profile \
 		--disable-ppm-test \
 		--disable-intel-soft-cpm \
-		--disable-static-daq
+		--disable-static-daq \
+		--disable-static \
+		--disable-so-with-static-lib
 }
 
 src_install() {
@@ -154,8 +157,7 @@ src_install() {
 	rm "${ED}"/usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files"
 
 	# Remove unneeded .la files (Bug #382863)
-	rm -f "${ED}"/usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
-	rm -f "${ED}"/usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la"
+	find "${ED}" -name '*.la' -type f -delete || die
 
 	# Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection
 	sed -i -e 's|/usr/local/lib|/usr/'$(get_libdir)'|g' \