commit 16c27088cc561fad68cf124883746df54043da3d
Author: Jan Palus <[email protected]>
Date: Thu Nov 19 13:42:05 2020 +0100
fix build after glibc dropped rpc.h
iptables-rpc.patch | 24 ++++++++++++++++++++++++
iptables.spec | 3 +++
2 files changed, 27 insertions(+)
---
diff --git a/iptables.spec b/iptables.spec
index df19f00..9994ed8 100644
--- a/iptables.spec
+++ b/iptables.spec
@@ -75,6 +75,7 @@ Patch13: %{orgname}-imq.patch
Patch14: %{orgname}-owner-xid.patch
# adjusts xt_owner for vserver-enabled kernel
Patch15: %{orgname}-owner-struct-size-vs.patch
+Patch16: %{orgname}-rpc.patch
URL: https://netfilter.org/
BuildRequires: autoconf >= 2.50
BuildRequires: automake
@@ -86,6 +87,7 @@ BuildRequires: libnetfilter_conntrack-devel >= 1.0.6
BuildRequires: libnfnetlink-devel >= 1.0
%{?with_nftables:BuildRequires: libnftnl-devel >= 1.1.6}
%{?with_pcap:BuildRequires: libpcap-devel}
+BuildRequires: libtirpc-devel >= 0.2.0
BuildRequires: libtool
BuildRequires: pkgconfig >= 1:0.9.0
BuildRequires: rpmbuild(macros) >= 1.647
@@ -251,6 +253,7 @@ Uwaga: nie jest to w pełni zgodny zamiennik!
%patch14 -p1
%patch15 -p1
%endif
+%patch16 -p1
%build
%{__libtoolize}
diff --git a/iptables-rpc.patch b/iptables-rpc.patch
new file mode 100644
index 0000000..db8705e
--- /dev/null
+++ b/iptables-rpc.patch
@@ -0,0 +1,24 @@
+diff --color -urN iptables-1.8.5.orig/configure.ac iptables-1.8.5/configure.ac
+--- iptables-1.8.5.orig/configure.ac 2020-11-19 13:09:53.499861230 +0100
++++ iptables-1.8.5/configure.ac 2020-11-19 13:19:30.782935726 +0100
+@@ -167,6 +167,8 @@
+
+ AM_CONDITIONAL([HAVE_LIBNETFILTER_CONNTRACK], [test "$nfconntrack" = 1])
+
++PKG_CHECK_MODULES([TIRPC], [libtirpc])
++
+ AC_SUBST([blacklist_modules])
+ AC_SUBST([blacklist_x_modules])
+ AC_SUBST([blacklist_b_modules])
+diff --color -urN iptables-1.8.5.orig/extensions/GNUmakefile.in
iptables-1.8.5/extensions/GNUmakefile.in
+--- iptables-1.8.5.orig/extensions/GNUmakefile.in 2020-06-03
12:32:01.000000000 +0200
++++ iptables-1.8.5/extensions/GNUmakefile.in 2020-11-19 13:24:04.921129448
+0100
+@@ -22,7 +22,7 @@
+ kinclude_CPPFLAGS = @kinclude_CPPFLAGS@
+
+ AM_CFLAGS = ${regular_CFLAGS}
+-AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_builddir}/include
-I${top_builddir} -I${top_srcdir}/include -I${top_srcdir} ${kinclude_CPPFLAGS}
${CPPFLAGS} @libnetfilter_conntrack_CFLAGS@ @libnftnl_CFLAGS@
++AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_builddir}/include
-I${top_builddir} -I${top_srcdir}/include -I${top_srcdir} ${kinclude_CPPFLAGS}
${CPPFLAGS} @libnetfilter_conntrack_CFLAGS@ @libnftnl_CFLAGS@ @TIRPC_CFLAGS@
+ AM_DEPFLAGS = -Wp,-MMD,$(@D)/.$(@F).d,-MT,$@
+ AM_LDFLAGS = @noundef_LDFLAGS@
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/iptables.git/commitdiff/29b337f296b3174e2b553a1fd0d2d1fd72226be4
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
