From 0adc608e56e3141df74c7a54abed07812bc5f4a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org>
Date: Sun, 24 Sep 2017 22:16:18 +0200
Subject: [PATCH] net-firewall/conntrack-tools: Add support for libtirpc, bug
 631902

Closes: https://bugs.gentoo.org/631902
Package-Manager: Portage-2.3.10, Repoman-2.3.3
---
 ....4.4.ebuild => conntrack-tools-1.4.4-r1.ebuild} | 11 +++++-
 .../files/conntrack-tools-1.4.4-rpc.patch          | 43 ++++++++++++++++++++++
 net-firewall/conntrack-tools/metadata.xml          |  3 ++
 3 files changed, 56 insertions(+), 1 deletion(-)
 copy net-firewall/conntrack-tools/{conntrack-tools-1.4.4.ebuild => conntrack-tools-1.4.4-r1.ebuild} (90%)
 create mode 100644 net-firewall/conntrack-tools/files/conntrack-tools-1.4.4-rpc.patch

diff --git a/net-firewall/conntrack-tools/conntrack-tools-1.4.4.ebuild b/net-firewall/conntrack-tools/conntrack-tools-1.4.4-r1.ebuild
similarity index 90%
copy from net-firewall/conntrack-tools/conntrack-tools-1.4.4.ebuild
copy to net-firewall/conntrack-tools/conntrack-tools-1.4.4-r1.ebuild
index c004861ea7cb..c5d0f532f96d 100644
--- a/net-firewall/conntrack-tools/conntrack-tools-1.4.4.ebuild
+++ b/net-firewall/conntrack-tools/conntrack-tools-1.4.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.netfilter.org/projects/conntrack-tools/files/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~hppa ~x86"
-IUSE="doc"
+IUSE="doc +libtirpc"
 
 RDEPEND="
 	>=net-libs/libmnl-1.0.3
@@ -20,6 +20,8 @@ RDEPEND="
 	>=net-libs/libnetfilter_cttimeout-1.0.0
 	>=net-libs/libnetfilter_queue-1.0.2
 	>=net-libs/libnfnetlink-1.0.1
+	!libtirpc? ( sys-libs/glibc[rpc(-)] )
+	libtirpc? ( net-libs/libtirpc )
 "
 DEPEND="
 	${RDEPEND}
@@ -63,9 +65,16 @@ src_prepare() {
 	# bug #474858
 	sed -i -e 's:/var/lock:/run/lock:' doc/stats/conntrackd.conf || die
 
+	# bug #631902
+	epatch "${FILESDIR}/${P}-rpc.patch"
+
 	eautoreconf
 }
 
+src_configure() {
+	econf $(use_with libtirpc)
+}
+
 src_compile() {
 	default
 	use doc && emake -C doc/manual
diff --git a/net-firewall/conntrack-tools/files/conntrack-tools-1.4.4-rpc.patch b/net-firewall/conntrack-tools/files/conntrack-tools-1.4.4-rpc.patch
new file mode 100644
index 000000000000..739857790c3d
--- /dev/null
+++ b/net-firewall/conntrack-tools/files/conntrack-tools-1.4.4-rpc.patch
@@ -0,0 +1,43 @@
+diff -ruN conntrack-tools-1.4.4.orig/configure.ac conntrack-tools-1.4.4/configure.ac
+--- conntrack-tools-1.4.4.orig/configure.ac	2016-08-22 10:43:02.954671362 -0000
++++ conntrack-tools-1.4.4/configure.ac	2017-09-24 19:50:37.225517482 -0000
+@@ -50,6 +50,25 @@
+         AS_HELP_STRING([--enable-systemd], [Build systemd support]),
+         [enable_systemd="$enableval"], [enable_systemd="no"])
+ 
++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)
++
+ PKG_CHECK_MODULES([LIBNFNETLINK], [libnfnetlink >= 1.0.1])
+ PKG_CHECK_MODULES([LIBMNL], [libmnl >= 1.0.3])
+ PKG_CHECK_MODULES([LIBNETFILTER_CONNTRACK], [libnetfilter_conntrack >= 1.0.6])
+diff -ruN conntrack-tools-1.4.4.orig/src/helpers/Makefile.am conntrack-tools-1.4.4/src/helpers/Makefile.am
+--- conntrack-tools-1.4.4.orig/src/helpers/Makefile.am	2015-02-11 15:36:00.650610125 -0000
++++ conntrack-tools-1.4.4/src/helpers/Makefile.am	2017-09-24 19:52:11.644990587 -0000
+@@ -22,8 +22,8 @@
+ ct_helper_ftp_la_CFLAGS = $(AM_CFLAGS) $(LIBNETFILTER_CONNTRACK_CFLAGS)
+ 
+ ct_helper_rpc_la_SOURCES = rpc.c
+-ct_helper_rpc_la_LDFLAGS = -avoid-version -module $(LIBNETFILTER_CONNTRACK_LIBS)
+-ct_helper_rpc_la_CFLAGS = $(AM_CFLAGS) $(LIBNETFILTER_CONNTRACK_CFLAGS)
++ct_helper_rpc_la_LDFLAGS = -avoid-version -module $(LIBNETFILTER_CONNTRACK_LIBS) $(RPC_LIBS)
++ct_helper_rpc_la_CFLAGS = $(AM_CFLAGS) $(LIBNETFILTER_CONNTRACK_CFLAGS) $(RPC_CFLAGS)
+ 
+ ct_helper_tftp_la_SOURCES = tftp.c
+ ct_helper_tftp_la_LDFLAGS = -avoid-version -module $(LIBNETFILTER_CONNTRACK_LIBS)
diff --git a/net-firewall/conntrack-tools/metadata.xml b/net-firewall/conntrack-tools/metadata.xml
index 10198984dfc7..cd2eeff6fa91 100644
--- a/net-firewall/conntrack-tools/metadata.xml
+++ b/net-firewall/conntrack-tools/metadata.xml
@@ -10,4 +10,7 @@
 		the userspace command line interface, and conntrackd, the userspace
 		daemon.
 	</longdescription>
+	<use>
+		<flag name="libtirpc">Build against <pkg>net-libs/libtirpc</pkg> for RPC support</flag>
+	</use>
 </pkgmetadata>
-- 
2.14.1