summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2017-09-24 22:16:18 +0200
committerAndreas K. Hüttel <dilfridge@gentoo.org>2017-11-01 23:06:20 +0100
commitd94fc3980f778d1d88ec93f83b0b4ebb41a3fe14 (patch)
tree87d9a6d900302a75dabe1ddcbcbbf2c257b598ad /net-firewall/conntrack-tools/files
parentnet-analyzer/argus: Add option to build against libtirpc for RPC support, bug... (diff)
downloadgentoo-d94fc3980f778d1d88ec93f83b0b4ebb41a3fe14.tar.gz
gentoo-d94fc3980f778d1d88ec93f83b0b4ebb41a3fe14.tar.bz2
gentoo-d94fc3980f778d1d88ec93f83b0b4ebb41a3fe14.zip
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
Diffstat (limited to 'net-firewall/conntrack-tools/files')
-rw-r--r--net-firewall/conntrack-tools/files/conntrack-tools-1.4.4-rpc.patch43
1 files changed, 43 insertions, 0 deletions
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)