gentoo resync : 02.11.2017

4 files changed, 139 insertions, 1 deletions

diff --git a/net-analyzer/argus/Manifest b/net-analyzer/argus/Manifest
index 9a7640c7cbfc..34648e92531a 100644
--- a/net-analyzer/argus/Manifest
+++ b/net-analyzer/argus/Manifest
@@ -1,11 +1,13 @@
 AUX argus-3.0.5-Makefile.patch 437 SHA256 ffbdc3e14ffd00c00e82675f47da7ffba824585b81b1cba0d0914ff220bd400d SHA512 cec8fae0027bcd48bf878781ed5b0352a1501cdd6a0470a76b6346aab3587b275d877434e1a3feddeebe3f4e166d42d07fd007a4b60cbef15d29076c188993b7 WHIRLPOOL d0f7d15e90ffe9c1743962120344365d8f4f211bc10e26ded15789abe19fb7e1e9671a40e2906be2756449b4ddcf24fb46f2fae93236025ea72e6bafcf39002c
 AUX argus-3.0.7.3-DLT_IPNET.patch 538 SHA256 5921972d79151e7809e62aabcb264f9edae2ef1a0d023338b0debf4b595c4713 SHA512 3f52c9531675713177cecb208d4b9c11e26ce60c4fa2e932520969dcbf74f37979443c2ad5039e61b803385058ea6a45e19afeed9f4b815a4dbf43ee5628621c WHIRLPOOL fdd17a2c9fd0577326daf92452dc74466e7e58290f3e338bf05296305612f68d11fa7ca037bb150cdf8e20ca1efc650a2fd63142a40ae2a06f024a182058d141
 AUX argus-3.0.8.1-disable-tcp-wrappers-automagic.patch 591 SHA256 0280a1ac020dcdf4c3791e444f44024c2943eddf5bcae0fb24339461462e72c5 SHA512 325cdc2c18ccf8665db11ab52f500395a0a76660c4c6d2620c8500a966e5f432c77d53b88549825bb90378929c6be47e35db792b59a9e74acec45a8c8ff73037 WHIRLPOOL 29ae63eb0f457237ed048f87e913be50c6894a32a7ea2fdd77faf95228b300e1335cace695c9f06998149867d17d9c6b6e86d99fc12d2721dfac958b86cc26fd
+AUX argus-3.0.8.2-rpc.patch 1777 SHA256 1d974aca70e5f11f00e37e50d500db0a15559c9909329650f0e4b151b3f571d2 SHA512 4556b784719b14508d4950c935a2fb9e8a9e195257b609ad85869000072339983b3a293ebe0b03c82b9d9f336b6da1a228d1a4266bc474004fa7882d09aa66d5 WHIRLPOOL e1b03323f23402ec529c74654743ca254515d740b0006035ff2e6d29a846216ebdd3aa8ab410f8a74930c0c76029dc5c47ad196d08dd529e42db44c4510a3efe
 AUX argus.initd 365 SHA256 4216da1c68e2e82e9d0eb23e0dd60459c9203854e1f6d11d78d16e437c8c66ad SHA512 54cbc2a0d92e5d0813ff6aecbf5f6d083e7de708a974af8aa90ce112e2d697b53b00e7918405973f487b2d9733bd2326a083ed13b52ee8dbbda4b06b73d95231 WHIRLPOOL 3ee148d0e2e595cf24ccf6371f9f8a4c1de8bb5cc05738a076e588a0c5e6bb5f5f9f0fed62da20cd8fad8b5c88a80c2860064f364884abc049a6a76c83654354
 DIST argus-3.0.8.1.tar.gz 523375 SHA256 1fb921104c8bd843fb9f5a1c32b57b20bfe8cd8a103b3f1d9bb686b9e6c490a4 SHA512 d96332849df7ce2297aa0d81a9f22c12763d04b2936ffaffc0e4b1942535846cfbc41dadf28791eb88d1ffd0429bdc280d16dff44369c415c713064849b158f7 WHIRLPOOL 2c9495d585c2297b3f9951e74a8fd28840941be6b298c0178d44801242d1abda4bd08f9469e2dd1a4b802735611c9ff82bc028d838628b1ccb184ba80d5dc529
 DIST argus-3.0.8.2.tar.gz 524749 SHA256 ca4e3bd5b9d4a8ff7c01cc96d1bffd46dbd6321237ec94c52f8badd51032eeff SHA512 146795880d8697e065ed23d2fbab226846d55db0b71945c5a4cab2896e48ceb6e1671ccb4e00dc3b0f984525bac4ced3773f3b9e70c3ea5f7c6972fe9bd94313 WHIRLPOOL 4a8fc3ce60df4da4cde87acec5f125d487c478a02a8789296d1f279081f6b8aabd604c3e6aefc0b8e472c4aef11dbef9e034f73a7de371ff18499d0ebb3618e8
 EBUILD argus-3.0.8.1.ebuild 1850 SHA256 d82bb4c464f603ab4e3c59d07a9e2256befa55a8275fdb40298bb846e78a5037 SHA512 7fae97954944c0c5d22f8a688a3ceeae803309c3b0f5d1d2c8144ef6fcc840e8997820d1974b3e1fbd0e72fdda3071d0b9641c59de43c098ce4aff8648448c87 WHIRLPOOL 103f219675531039833b3ea6238a7b80b5b26d5c33daff9751412788cd7e6b491479146893af33d32ddee7d06a50c8bfd1eeca2fe39964a4e5494e28b036a37a
+EBUILD argus-3.0.8.2-r1.ebuild 2035 SHA256 642c490163a64b8187ef1f8a0ac20ce1b55c9d375d5feaf0a9dbdf77fc6c5198 SHA512 4b92db365f92a5a2aaff6060e30b5335df241cadd077775ddc6b79c3744d651fc3115b0cca28049703aa01b7efcd4396c829f43ac73d5eb70ae6b8112a52721e WHIRLPOOL d9fd82eb9706dd93545b6c379c7a49672a83042e5a8498d5fcb6e28d2044ab19c78c29d5ed542735b9c72ce9109ecb7b9b0f33a3429ca69dbe10a502bec1c1d8
 EBUILD argus-3.0.8.2.ebuild 1876 SHA256 8ca7018449d29f654e032e7d48912bf39e0b3e4e18486e46a377716e5462c5fd SHA512 70832f5bc42829924d7667e79018eb859e381b4cc0811e8147fe9e87b9170ff4f5250c18f020af9fe376da7cce98afca031b4550217608e3e8ee0a29cb8e8ce9 WHIRLPOOL 87c974c68e6b97756269afd808f83ceee85e354a2fabae398f12dc5d9afa30c72a5417fd01cdcdd83d987040d66208e9ca0fcd6fc7f2c8dff473d5dc97e669cf
 MISC ChangeLog 4135 SHA256 ae94681577b4a6299e5c39ba0d93aa1333589f6a3fe4ebc699368d4954864a1e SHA512 547f9de80d1db70f26925b4d8093c8f7cb20e8c70e178d6b32555e8de2d23bd5a7e4eea9e66f156c8a2133c5e7baa3a31fe1a2483c384bb14f9d8477e93b0c91 WHIRLPOOL 7693fdc92a138d845987e78152ec84141810e18988baf13e61ae7692959bde32178b91c8943884a061f0d338c83883abca4e736a846901d58cc09a2e5f0c4c5d
 MISC ChangeLog-2015 9185 SHA256 fe6b50e15a5ac84cc4c1b3d0067402edf5944b3d5caf30a147eeaf05da0b2ed9 SHA512 ff4e8208341eafca681ce21db1a2d58aa59f7ae59eb48419d898b0199d700ce1a08614851f0145727f779f0ebee18cb0d8c6dcbf3e018246533e7bf7d244f962 WHIRLPOOL adf0adea7876f811a529ab22c6072114e258ad15a6c697e6618849cdc42344768630337cd160b8d2e39648ce5b662113690b354da7ac8d9ce84475521cbcb285
-MISC metadata.xml 366 SHA256 93d538a9e291d67e36025f5ee48d8b50966778e3f3f6978cb9bd104a673e1ef4 SHA512 52ae5aab1db1228559c6c5851f3b5ceee14573c40b59c90500d574a351483c761c0d517e2918cc3b57c59b8e0350643bba3b0060f5acbb0cca6b3a22e60225cc WHIRLPOOL 9ed8849333455e9e87b3c5cf36f2cc14ca2190e40b965b5e67ce411f64d1a4e62ac4f2928458e7bda523c7e097e2e1c9e4d170dd155df2460d346fbcdf9933e1
+MISC metadata.xml 468 SHA256 00ec9a83f7236016192841d3929c74a74b22da94dee27717b7421c32d4b526fc SHA512 64c97706da7a48ebaf5d3bd9aecdd11b1eff9516d5e99993ba65217b169c503bb509fdf19ade828925c85a82573b186aab89991b5870161681c42985a244771f WHIRLPOOL f23f73b39710a08eb04cc90457a70dd861b9ac82f8a0bf678ea912f04615a215bae124e27242428601bf223e1e8b96f918be638408cbbad316e160355ffbd713
diff --git a/net-analyzer/argus/argus-3.0.8.2-r1.ebuild b/net-analyzer/argus/argus-3.0.8.2-r1.ebuild
new file mode 100644
index 000000000000..4484cf276e72
--- /dev/null
+++ b/net-analyzer/argus/argus-3.0.8.2-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils user
+
+DESCRIPTION="network Audit Record Generation and Utilization System"
+HOMEPAGE="http://www.qosient.com/argus/"
+SRC_URI="${HOMEPAGE}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 +libtirpc sasl tcpd"
+
+RDEPEND="
+	net-libs/libpcap
+	sys-libs/zlib
+	!libtirpc? ( sys-libs/glibc[rpc(-)] )
+	libtirpc? ( net-libs/libtirpc )
+	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
+"
+
+S=${WORKDIR}/${P/_rc/.rc.}
+
+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
+	epatch \
+		"${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.2-rpc.patch
+
+	epatch_user
+	eautoreconf
+}
+
+src_configure() {
+	use debug && touch .debug # enable debugging
+	econf $(use_with libtirpc) $(use_with tcpd wrappers) $(use_with sasl)
+}
+
+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.2-rpc.patch b/net-analyzer/argus/files/argus-3.0.8.2-rpc.patch
new file mode 100644
index 000000000000..462d465609f1
--- /dev/null
+++ b/net-analyzer/argus/files/argus-3.0.8.2-rpc.patch
@@ -0,0 +1,47 @@
+diff -ruN argus-3.0.8.2.orig/common/Makefile.in argus-3.0.8.2/common/Makefile.in
+--- argus-3.0.8.2.orig/common/Makefile.in	2015-04-14 14:32:33.000000000 -0000
++++ argus-3.0.8.2/common/Makefile.in	2017-09-25 10:27:16.272856331 -0000
+@@ -35,12 +35,12 @@
+ 
+ CC = @CC@
+ CCOPT = @V_CCOPT@
+-INCLS = -I$(srcdir) @V_INCLS@ -I$(srcdir)/../include  -I$(srcdir)/../argus
++INCLS = -I$(srcdir) @V_INCLS@ @RPC_CFLAGS@ -I$(srcdir)/../include  -I$(srcdir)/../argus
+ DEFS = @DEFS@
+ 
+ # Standard CFLAGS
+ CFLAGS = $(CCOPT) $(INCLS) $(DEFS)
+-LDFLAGS = @LDFLAGS@
++LDFLAGS = @LDFLAGS@ @RPC_LIBS@
+ 
+ INSTALL = @INSTALL@
+ RANLIB = @V_RANLIB@
+diff -ruN argus-3.0.8.2.orig/configure.ac argus-3.0.8.2/configure.ac
+--- argus-3.0.8.2.orig/configure.ac	2017-09-25 10:20:04.155174606 -0000
++++ argus-3.0.8.2/configure.ac	2017-09-25 10:24:39.151904377 -0000
+@@ -120,6 +120,25 @@
+ AC_CHECK_FUNCS(floorf remainderf)
+ AC_CHECK_FUNCS(timegm)
+ 
++AC_ARG_WITH([libtirpc],
++           AS_HELP_STRING([--with-libtirpc], [Use libtirpc as RPC implementation (instead of sunrpc)]),
++           [], [ with_libtirpc=no ])
++
++AS_IF([test "x$with_libtirpc" != xno], 
++      [PKG_CHECK_MODULES([TIRPC], 
++                         [libtirpc], 
++                         [RPC_CFLAGS=$TIRPC_CFLAGS; RPC_LIBS=$TIRPC_LIBS;],
++                        [AC_MSG_ERROR([libtirpc requested, but library not found.])]
++                       )], 
++      [AC_CHECK_HEADER(rpc/rpc.h, 
++                      [RPC_CFLAGS=""; RPC_LIBS="";],
++                      [AC_MSG_ERROR([sunrpc requested, but headers are not present.])]
++                     )]
++)
++
++AC_SUBST(RPC_CFLAGS)
++AC_SUBST(RPC_LIBS)
++
+ AC_CHECK_FUNCS(xdrmem_create)
+ if test "$ac_cv_func_xdrmem_create" = yes ; then
+    AC_DEFINE([HAVE_XDR], [], [Using system XDR library])
diff --git a/net-analyzer/argus/metadata.xml b/net-analyzer/argus/metadata.xml
index 90955da4b592..e7da258d5266 100644
--- a/net-analyzer/argus/metadata.xml
+++ b/net-analyzer/argus/metadata.xml
@@ -6,4 +6,7 @@
 	<name>Gentoo network monitoring and analysis project</name>
 </maintainer>
 <longdescription>network Audit Record Generation and Utilization System</longdescription>
+<use>
+	<flag name="libtirpc">Build against <pkg>net-libs/libtirpc</pkg> for RPC support</flag>
+</use>
 </pkgmetadata>