[patch] patch, use "git am" to apply

0001-net-analyzer-argus-Add-option-to-build-against-libti.patch (text/plain), 4.75 KB, created by Andreas K. Hüttel on 2017-09-25 10:42:50 UTC

From d655227e8f3a62fb14707a85ca15007625d35158 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <[e-mail]>
Date: Mon, 25 Sep 2017 12:38:37 +0200
Subject: [PATCH] net-analyzer/argus: Add option to build against libtirpc for
 RPC support, bug 631474

Closes: https://bugs.gentoo.org/631474
Package-Manager: Portage-2.3.10, Repoman-2.3.3
---
 ...rgus-3.0.8.2.ebuild => argus-3.0.8.2-r1.ebuild} | 13 ++++--
 net-analyzer/argus/files/argus-3.0.8.2-rpc.patch   | 47 ++++++++++++++++++++++
 net-analyzer/argus/metadata.xml                    |  3 ++
 3 files changed, 59 insertions(+), 4 deletions(-)
 copy net-analyzer/argus/{argus-3.0.8.2.ebuild => argus-3.0.8.2-r1.ebuild} (84%)
 create mode 100644 net-analyzer/argus/files/argus-3.0.8.2-rpc.patch

diff --git a/net-analyzer/argus/argus-3.0.8.2.ebuild b/net-analyzer/argus/argus-3.0.8.2-r1.ebuild
similarity index 84%
copy from net-analyzer/argus/argus-3.0.8.2.ebuild
copy to net-analyzer/argus/argus-3.0.8.2-r1.ebuild
index 927bbe427308..4484cf276e72 100644
--- a/net-analyzer/argus/argus-3.0.8.2.ebuild
+++ b/net-analyzer/argus/argus-3.0.8.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,11 +11,13 @@ 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 sasl tcpd"
+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 )
 "
@@ -43,13 +45,16 @@ src_prepare() {
 	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.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 tcpd wrappers) $(use_with sasl)
+	econf $(use_with libtirpc) $(use_with tcpd wrappers) $(use_with sasl)
 }
 
 src_compile() {
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>
-- 
2.14.1