gentoo resync : 02.09.2020

4 files changed, 121 insertions, 0 deletions

diff --git a/net-analyzer/argus/Manifest b/net-analyzer/argus/Manifest
index 189f8da72bb3..fdcd0a740383 100644
--- a/net-analyzer/argus/Manifest
+++ b/net-analyzer/argus/Manifest
@@ -3,8 +3,12 @@ AUX argus-3.0.7.3-DLT_IPNET.patch 538 BLAKE2B b909831f15f56d34281d8001dd525a0e8f
 AUX argus-3.0.8.1-disable-tcp-wrappers-automagic.patch 591 BLAKE2B 2a04cb018d385820e6bf7fcf2bcf20abf92bd3c43e11dadb9a0c4e2727d60dcc90aa1eacdc220ed3ce23ecec811eb1e1f8dc5156104072d965c2459ae1fd82d7 SHA512 325cdc2c18ccf8665db11ab52f500395a0a76660c4c6d2620c8500a966e5f432c77d53b88549825bb90378929c6be47e35db792b59a9e74acec45a8c8ff73037
 AUX argus-3.0.8.2-fno-common.patch 929 BLAKE2B 9fee5b11eb3d0436547e6d26fef654e6c9bfc2929cac2cfb411710ff28fd4110e5a90ebf02f46f6b71f11ba1d46d0164c8e41ac32e4953e5267bc7361e46a357 SHA512 1f5501095f712dc3107753849e91736a15768060b71f18dbe2ef9c0c4015ecc78481fc97d05fe821a4191bb9b04346f91734b75625ef967685f65a94f5859475
 AUX argus-3.0.8.2-rpc.patch 1425 BLAKE2B c71d72db164a343114ac39f754cdd7a9d19bf4338ea809966c5de1de5a71d6c339a11021207c1c20f5029052e6ce7cc43298e227574a96369a9fee1c40adc3e2 SHA512 61136d8d736429a4e291f0a92e47bb02ec5706e0e9e8b68db4e5213baebff064427733edd054d163e582ed0288209d008b38b7f1ab77f54b1968f246b8c6db77
+AUX argus-3.0.8.3-ar.patch 240 BLAKE2B 28cfc93b87a7dbad663f10b1686b51344c1bcec23e2ad83863798b22f56dce1f76e496f864b1d8b815f12ab016e3c161ce234d01cea296437e000761a63f5cf4 SHA512 4aadb3a5c4f65d0a11e7eeecb66bae7dfbbbe9ddf933319788a2b4f109df3971c24b85a6932a9e29f5c8a39c26b854dbe015de84206df36bd91a3c076638eec7
+AUX argus-3.0.8.3-as-needed.patch 385 BLAKE2B 2a3e7b63c4b649a572d64c27268ed0165c1d99b1bc2bdf2e7c94d45f323ef98835ad4a1fd303dbe84006ce0099584c081f2c3f482996e31f5ef4d51ac29860bf SHA512 c8ce35d80e784ca09b46dfcb804cf103b5263e48a0009aa3e7a2a1c6bdf4158c8276136a0086a7b8d3ca5414cf40aa67e86923bf59a7b9398368ba08fbc4d4bd
 AUX argus.initd 365 BLAKE2B 1b7841cd53679b10444a1da1af0f0226bc84c08e9e5427f964622c03f4a8661997cd2b31db35d804f7373ca89ca4eca006662c6d08d26d6b65d13c209ae92aa0 SHA512 54cbc2a0d92e5d0813ff6aecbf5f6d083e7de708a974af8aa90ce112e2d697b53b00e7918405973f487b2d9733bd2326a083ed13b52ee8dbbda4b06b73d95231
 DIST argus-3.0.8.2.tar.gz 524749 BLAKE2B 4d93fd8acd71b198da712961d75f0e813f5ed3fde841e77b8a10c3a9b89571902b7597969a4be12437c97ffc69ba5ebefaee8b684c5d2d4ce4f1309c1cfd1199 SHA512 146795880d8697e065ed23d2fbab226846d55db0b71945c5a4cab2896e48ceb6e1671ccb4e00dc3b0f984525bac4ced3773f3b9e70c3ea5f7c6972fe9bd94313
+DIST argus-3.0.8.3.tar.gz 524549 BLAKE2B f905784c12d28d4440a7a6954441ce4f0865125a87e3d740edd5785e729f8b5b45967d97aef4f72802d2166b76176e15c6f15ec99b87ae1d14849ae92c65ad76 SHA512 f66db5b3bb1305825b76a7eda413d5805d65182aabef647e27716cfd629327b3aab8c299bc8af419199ac655cef4ac3bfcb83c059080e98b042e09f79f01d82a
 EBUILD argus-3.0.8.2-r1.ebuild 2067 BLAKE2B ef1fe40bc38cc957a3c637313c34d2339f8ef2f1034928fa476ad8a1f92bdf075cf6b4c8d00b289a090a470221747c6841e1c6fa09566d8d584c892df864705f SHA512 7754f0257a9e35729defab6df1aa626a66c8560fdbad211dc60e79c574bcfcef814f39d8530d81ed3329a5385127b4664a39058df755286a1409d009e32ec9dc
 EBUILD argus-3.0.8.2-r2.ebuild 2165 BLAKE2B ccb45a1eedf0d5070bd75ceb28f6d4efb15505cffa2d653a6aabb9669e771e251c31dd3b8445fe667e172b3b86c278ce665da8a8c896379e1ae5b1afbdd7446f SHA512 1439de1ef098d5b0815367e997e7eb9ec93f5c4e3e8bd5262c5707e52e5bbf6ce459bcd5df927841cb629ca15192d05c54cf6ef87966d822c40ed021ef6e7d67
+EBUILD argus-3.0.8.3.ebuild 2088 BLAKE2B 39a3d169cd721baaa9edb4c9f9b9f841c80c2e0f0390c30c065291f879c18abc191f7015ef13a599e0f69b90ed4abf559ecf1de6e4ed256b7e6e4fda6873ffae SHA512 16266e0e61f26467cbab08782b8de8474297988bc0eff342f6a894b2faab3e9d8a3b1d4ea496fc68465f3dcaefa24ca18d3392df234aad4055f7f2e7f5fb2fb2
 MISC metadata.xml 468 BLAKE2B ce716483a5c126030c044618343341e853b367516f0fb6142b5cf7140738a5950eec5fcc514a856dd119310d7a1e05adab9f4ac0e802e01ee873a6c81f14a2e4 SHA512 64c97706da7a48ebaf5d3bd9aecdd11b1eff9516d5e99993ba65217b169c503bb509fdf19ade828925c85a82573b186aab89991b5870161681c42985a244771f
diff --git a/net-analyzer/argus/argus-3.0.8.3.ebuild b/net-analyzer/argus/argus-3.0.8.3.ebuild
new file mode 100644
index 000000000000..8092871dded2
--- /dev/null
+++ b/net-analyzer/argus/argus-3.0.8.3.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools user
+
+DESCRIPTION="network Audit Record Generation and Utilization System"
+HOMEPAGE="https://openargus.org/"
+SRC_URI="https://www.qosient.com/argus/dev/${P/_rc/.rc.}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="debug sasl tcpd"
+
+RDEPEND="
+	net-libs/libnsl:=
+	net-libs/libpcap
+	net-libs/libtirpc
+	sys-libs/zlib
+	sasl? ( dev-libs/cyrus-sasl )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+"
+
+DEPEND="
+	${RDEPEND}
+	>=sys-devel/bison-1.28
+	>=sys-devel/flex-2.4.6
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.8.1-disable-tcp-wrappers-automagic.patch
+	"${FILESDIR}"/${PN}-3.0.5-Makefile.patch
+	"${FILESDIR}"/${PN}-3.0.7.3-DLT_IPNET.patch
+	"${FILESDIR}"/${PN}-3.0.8.3-ar.patch
+	"${FILESDIR}"/${PN}-3.0.8.3-as-needed.patch
+)
+S=${WORKDIR}/${P/_rc/.rc.}
+
+pkg_setup() {
+	enewgroup argus
+	enewuser argus -1 -1 /var/lib/argus argus
+}
+
+src_prepare() {
+	find . -type f -execdir chmod +w {} \; #561360
+	sed -e 's:/etc/argus.conf:/etc/argus/argus.conf:' \
+		-i argus/argus.c \
+		-i support/Config/argus.conf \
+		-i man/man8/argus.8 \
+		-i man/man5/argus.conf.5 || die
+
+	sed -e 's:#\(ARGUS_SETUSER_ID=\).*:\1argus:' \
+		-e 's:#\(ARGUS_SETGROUP_ID=\).*:\1argus:' \
+		-e 's:\(#ARGUS_CHROOT_DIR=\).*:\1/var/lib/argus:' \
+			-i support/Config/argus.conf || die
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	use debug && touch .debug # enable debugging
+
+	econf \
+		$(use_with sasl) \
+		$(use_with tcpd wrappers)
+}
+
+src_compile() {
+	emake CCOPT="${CFLAGS} ${LDFLAGS}"
+}
+
+src_install() {
+	doman man/man5/*.5 man/man8/*.8
+
+	dosbin bin/argus{,bug}
+
+	dodoc ChangeLog CREDITS README
+
+	insinto /etc/argus
+	doins support/Config/argus.conf
+
+	newinitd "${FILESDIR}/argus.initd" argus
+	keepdir /var/lib/argus
+}
+
+pkg_preinst() {
+	enewgroup argus
+	enewuser argus -1 -1 /var/lib/argus argus
+}
+
+pkg_postinst() {
+	elog "Note, if you modify ARGUS_DAEMON value in argus.conf it's quite"
+	elog "possible that the init script will fail to work."
+}
diff --git a/net-analyzer/argus/files/argus-3.0.8.3-ar.patch b/net-analyzer/argus/files/argus-3.0.8.3-ar.patch
new file mode 100644
index 000000000000..d17a1d3ff06f
--- /dev/null
+++ b/net-analyzer/argus/files/argus-3.0.8.3-ar.patch
@@ -0,0 +1,11 @@
+--- a/common/Makefile.in
++++ b/common/Makefile.in
+@@ -87,7 +87,7 @@
+ all: $(LIBS)
+ 
+ @INSTALL_LIB@/argus_common.a: $(COMMONOBJ)
+-	rm -f $@; ar qc $@ $(COMMONOBJ)
++	rm -f $@; $(AR) qc $@ $(COMMONOBJ)
+ 	-$(RANLIB) $@
+ 
+ scanner.c: scanner.l 
diff --git a/net-analyzer/argus/files/argus-3.0.8.3-as-needed.patch b/net-analyzer/argus/files/argus-3.0.8.3-as-needed.patch
new file mode 100644
index 000000000000..b9616d305e01
--- /dev/null
+++ b/net-analyzer/argus/files/argus-3.0.8.3-as-needed.patch
@@ -0,0 +1,11 @@
+--- a/argus/Makefile.in
++++ b/argus/Makefile.in
+@@ -85,7 +85,7 @@
+ 
+ OBJ =	$(SRC:.c=.o)
+ 
+-LIB = @LIBS@ @V_THREADS@ $(WRAPLIBS) $(SASLLIBS) $(XDRLIBS) $(COMPATLIB) ../lib/argus_common.a -lm
++LIB = ../lib/argus_common.a @LIBS@ @V_THREADS@ $(WRAPLIBS) $(SASLLIBS) $(XDRLIBS) $(COMPATLIB) -lm
+ 
+ HDR =	pcap.h pcap-int.h pcap-namedb.h pcap-nit.h pcap-pf.h \
+ 	ethertype.h gencode.h gnuc.h