new file mode 100644

@@ -0,0 +1,110 @@

+From patchwork Tue Feb 12 23:38:28 2019

+Content-Type: text/plain; charset="utf-8"

+MIME-Version: 1.0

+Content-Transfer-Encoding: 7bit

+Subject: [conntrack-tools,v2] Support compiling against libtirpc

+X-Patchwork-Submitter: Phil Sutter <phil@nwl.cc>

+X-Patchwork-Id: 1040906

+X-Patchwork-Delegate: pablo@netfilter.org

+Message-Id: <20190212233828.6455-1-phil@nwl.cc>

+To: Pablo Neira Ayuso <pablo@netfilter.org>

+Cc: netfilter-devel@vger.kernel.org, Jan Engelhardt <jengelh@inai.de>

+Date: Wed, 13 Feb 2019 00:38:28 +0100

+From: Phil Sutter <phil@nwl.cc>

+List-Id: <netfilter-devel.vger.kernel.org>

+

+Try compiling against libtirpc on systems where RPC headers are not

+provided by Glibc.

+

+Due to naming conflicts, rpc_call() has had to be renamed.

+

+Cc: Jan Engelhardt <jengelh@inai.de>

+Signed-off-by: Phil Sutter <phil@nwl.cc>

+---

+Note that I didn't do real functional testing apart from running

+conntrack and nfct testsuites. OTOH, in Fedora Rawhide the package is

+linked against libtirpc as well and seems to work.

+

+Changes since v1:

+- Fix @VAR@ into ${VAR} in Makefile.am as suggested by Jan Engelhardt.

+---

+ Make_global.am    | 3 ++-

+ Makefile.am       | 2 +-

+ configure.ac      | 6 ++++++

+ src/helpers/rpc.c | 7 ++++---

+ 4 files changed, 13 insertions(+), 5 deletions(-)

+

+diff --git a/Make_global.am b/Make_global.am

+index 80842493a4ad0..554bb3ccc6951 100644

+--- a/Make_global.am

+@@ -6,4 +6,5 @@ AM_CFLAGS = -std=gnu99 -W -Wall \

+ 	${LIBNETFILTER_CONNTRACK_CFLAGS} \

+ 	${LIBNETFILTER_CTTIMEOUT_CFLAGS} \

+ 	${LIBNETFILTER_QUEUE_CFLAGS} \

+-	${LIBNETFILTER_CTHELPER_CFLAGS}

++	${LIBNETFILTER_CTHELPER_CFLAGS} \

++	${LIBTIRPC_CFLAGS}

+diff --git a/Makefile.am b/Makefile.am

+index f64d60438d411..d73d7f4c54ff2 100644

+--- a/Makefile.am

+@@ -7,7 +7,7 @@ EXTRA_DIST = $(man_MANS) Make_global.am doc m4 tests

+ 

+ SUBDIRS   = extensions src

+ DIST_SUBDIRS = include src extensions

+-LIBS = @LIBNETFILTER_CONNTRACK_LIBS@

++LIBS = ${LIBNETFILTER_CONNTRACK_LIBS} ${LIBTIRPC_LIBS}

+ 

+ dist-hook:

+ 	rm -rf `find $(distdir)/doc -name *.orig`

+diff --git a/configure.ac b/configure.ac

+index 048d261ac1088..5384d3c80962c 100644

+--- a/configure.ac

+@@ -73,6 +73,12 @@ AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$enable_systemd" = "xyes"])

+ 

+ AC_CHECK_HEADERS([linux/capability.h],, [AC_MSG_ERROR([Cannot find linux/capabibility.h])])

+ 

++# check for rpc_msg.h existence

++AC_CHECK_HEADER([rpc/rpc_msg.h], [have_rpc_msg_h=yes], [have_rpc_msg_h=no])

++AS_IF([test "x$have_rpc_msg_h" = "xno"],

++      [PKG_CHECK_MODULES([LIBTIRPC], [libtirpc], [],

++                         [AC_MSG_ERROR([No provider for rpc/rpc_msg.h found])])])

++

+ # Checks for libraries.

+ # FIXME: Replace `main' with a function in `-lc':

+ dnl AC_CHECK_LIB([c], [main])

+diff --git a/src/helpers/rpc.c b/src/helpers/rpc.c

+index 3a7b337135f04..bd24dd3269c8e 100644

+--- a/src/helpers/rpc.c

+@@ -26,6 +26,7 @@

+ 

+ #include <errno.h>

+ 

++#include <rpc/clnt.h>

+ #include <rpc/rpc_msg.h>

+ #include <rpc/pmap_prot.h>

+ #define _GNU_SOURCE

+@@ -114,8 +115,8 @@ nf_nat_rpc(struct pkt_buff *pkt, int dir, struct nf_expect *exp,

+ #define ROUNDUP(n)	((((n) + 3)/4)*4)

+ 

+ static int

+-rpc_call(const uint32_t *data, uint32_t offset, uint32_t datalen,

+-	 struct rpc_info *rpc_info)

++rpc_parse_call(const uint32_t *data, uint32_t offset, uint32_t datalen,

++	       struct rpc_info *rpc_info)

+ {

+ 	uint32_t p, r;

+ 

+@@ -393,7 +394,7 @@ rpc_helper_cb(struct pkt_buff *pkt, uint32_t protoff,

+ 	}

+ 

+ 	if (rm_dir == CALL) {

+-		if (rpc_call(data, offset, datalen, rpc_info) < 0)

++		if (rpc_parse_call(data, offset, datalen, rpc_info) < 0)

+ 			goto out;

+ 

+ 		rpc_info->xid = xid;

+

new file mode 100644

@@ -0,0 +1,117 @@

+Summary:        The conntrack-tools are a set of userspace tools for Linux

+Name:           conntrack-tools

+Version:        1.4.5

+Release:        1%{?dist}

+License:        GPLv2

+URL:            http://conntrack-tools.netfilter.org

+Group:          System Environment/Base

+Vendor:         VMware, Inc.

+Distribution:   Photon

+Source0:        https://netfilter.org/projects/%{name}/files/%{name}-%{version}.tar.bz2

+%define sha1    %{name}=7d03a8d6d9ef56a9980ebfe25a282123807f8dcb

+Source1:        conntrackd.service

+Patch0:         conntrack-tools-compiling-support-libtirpc.patch

+BuildRequires:  libnetfilter_conntrack-devel

+BuildRequires:  libnfnetlink-devel

+BuildRequires:  libmnl-devel

+BuildRequires:  libtirpc-devel

+BuildRequires:  libnetfilter_cttimeout-devel

+BuildRequires:  libnetfilter_cthelper-devel

+BuildRequires:  libnetfilter_queue-devel

+BuildRequires:  systemd-devel

+Requires:       libmnl

+Requires:       libnetfilter_conntrack

+Requires:       libnfnetlink

+Requires:       libnetfilter_cttimeout

+Requires:       libnetfilter_cthelper

+Requires:       libnetfilter_queue

+Requires:       systemd

+

+%description

+The conntrack-tools are a set of free software userspace tools for Linux that allow system administrators interact with the Connection Tracking System, which is the module that provides stateful packet inspection for iptables. The conntrack-tools are the userspace daemon conntrackd and the command line interface conntrack.

+The conntrack-tools package contains two programs:

+

+  - conntrack:  the command line interface to interact with the connection

+                tracking system.

+

+  - conntrackd: the connection tracking userspace daemon that can be used to

+                deploy highly available GNU/Linux firewalls and collect

+                statistics of the firewall use.

+

+%prep

+%setup -q

+%patch0 -p1

+

+aclocal

+autoconf

+

+%build

+%configure \

+        --enable-systemd \

+        --disable-static \

+        --disable-silent-rules

+make %{?_smp_mflags}

+

+%install

+make DESTDIR=%{buildroot} install

+find %{buildroot} -type f -name '*.la' -exec rm -f {} ';'

+install -vdm 755 %{buildroot}%{_sysconfdir}/conntrackd

+install -m 0644 doc/stats/conntrackd.conf %{buildroot}%{_sysconfdir}/conntrackd

+install -p -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/conntrackd.service

+install -vdm 755 %{buildroot}%{_datadir}/conntrackd

+install -vdm 755 %{buildroot}%{_sharedstatedir}/conntrackd

+

+%check

+make %{?_smp_mflags} check

+

+%pre -p /bin/sh

+if ! getent group conntrackd >/dev/null; then

+    groupadd -r conntrackd

+fi

+if ! getent passwd conntrackd >/dev/null; then

+    useradd -r -g conntrackd -d /var/lib/conntrackd -s /sbin/nologin  -c "Conntrack tools User" conntrackd

+fi

+exit 0

+

+

+%post

+/sbin/ldconfig

+chown -R conntrackd:conntrackd /var/lib/conntrackd

+chown -R conntrackd:conntrackd /usr/share/conntrackd

+%systemd_post  conntrackd.service

+

+%preun

+/sbin/ldconfig

+%systemd_preun conntrackd.service

+

+%postun -p /bin/sh

+%systemd_postun_with_restart conntrackd.service

+if [ $1 -eq 0 ] ; then

+   getent passwd conntrackd > /dev/null

+   if [ "$?" == "0" ] ; then

+      userdel conntrackd

+   fi

+   getent group conntrackd >/dev/null

+   if [ "$?" == "0" ] ; then

+      groupdel conntrackd

+   fi

+fi

+exit

+

+%files

+%defattr(-,conntrackd,conntrackd)

+%{_sbindir}/conntrack

+%{_sbindir}/conntrackd

+%{_sbindir}/nfct

+%{_mandir}/man8/*

+%{_mandir}/man5/*

+%{_libdir}/%{name}/*.so

+%config(noreplace) %{_sysconfdir}/conntrackd/conntrackd.conf

+%{_unitdir}/conntrackd.service

+%{_datadir}/conntrackd

+%{_sharedstatedir}/conntrackd

+

+%changelog

+*   Fri Mar 01 2019 Ankit Jain <ankitja@vmware.com> 1.4.5-1

+-   Initial build. First version

+

new file mode 100644

@@ -0,0 +1,14 @@

+[Unit]

+Description=Conntrack Daemon

+Documentation=man:conntrackd(8) man:conntrackd.conf(5)

+After=network.target

+

+[Service]

+Type=notify

+ExecStart=/usr/sbin/conntrackd -C /etc/conntrackd/conntrackd.conf

+ExecReload=/usr/bin/kill -HUP $MAINPID

+Restart=on-failure

+KillSignal=SIGINT

+

+[Install]

+WantedBy=multi-user.target