diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-05-08 14:01:34 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-05-08 14:01:34 +0100 |
| commit | 4645b6f17f0da81e9fe84081fb126a37102ba153 (patch) | |
| tree | e6c48cf3db2213af38cf528a5364fffd5c74c6d6 /net-firewall/conntrack-tools/files | |
| parent | ebce8994fe3cc4ca9fbc96ca837cb4c4e98adcbd (diff) | |
gentoo resync : 08.05.2018
Diffstat (limited to 'net-firewall/conntrack-tools/files')
| -rw-r--r-- | net-firewall/conntrack-tools/files/conntrack-tools-1.4.4-rpc.patch | 10 | ||||
| -rw-r--r-- | net-firewall/conntrack-tools/files/conntrack-tools-1.4.5-rpc.patch | 41 |
2 files changed, 45 insertions, 6 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 index 739857790c3d..01ef537a7352 100644 --- 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 @@ -1,6 +1,5 @@ -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 +--- a/configure.ac ++++ b/configure.ac @@ -50,6 +50,25 @@ AS_HELP_STRING([--enable-systemd], [Build systemd support]), [enable_systemd="$enableval"], [enable_systemd="no"]) @@ -27,9 +26,8 @@ diff -ruN conntrack-tools-1.4.4.orig/configure.ac conntrack-tools-1.4.4/configur 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 +--- a/src/helpers/Makefile.am ++++ b/src/helpers/Makefile.am @@ -22,8 +22,8 @@ ct_helper_ftp_la_CFLAGS = $(AM_CFLAGS) $(LIBNETFILTER_CONNTRACK_CFLAGS) diff --git a/net-firewall/conntrack-tools/files/conntrack-tools-1.4.5-rpc.patch b/net-firewall/conntrack-tools/files/conntrack-tools-1.4.5-rpc.patch new file mode 100644 index 000000000000..1f7fc44f44ad --- /dev/null +++ b/net-firewall/conntrack-tools/files/conntrack-tools-1.4.5-rpc.patch @@ -0,0 +1,41 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -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.7]) +--- a/src/helpers/Makefile.am ++++ b/src/helpers/Makefile.am +@@ -30,8 +30,8 @@ + ct_helper_mdns_la_CFLAGS = $(HELPER_CFLAGS) + + ct_helper_rpc_la_SOURCES = rpc.c +-ct_helper_rpc_la_LDFLAGS = $(HELPER_LDFLAGS) +-ct_helper_rpc_la_CFLAGS = $(HELPER_CFLAGS) ++ct_helper_rpc_la_LDFLAGS = $(HELPER_LDFLAGS) $(RPC_LIBS) ++ct_helper_rpc_la_CFLAGS = $(HELPER_CFLAGS) $(RPC_CFLAGS) + + ct_helper_tftp_la_SOURCES = tftp.c + ct_helper_tftp_la_LDFLAGS = $(HELPER_LDFLAGS) |