commit: 3a10deb82c1bcadbc0977d26dce8650c2bf5ba0a Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> AuthorDate: Mon Jul 9 14:51:42 2018 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Mon Jul 9 14:51:59 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a10deb8
net-firewall/iptables: fix building with USE=-nftables Closes: https://bugs.gentoo.org/660790 Package-Manager: Portage-2.3.41, Repoman-2.3.9 ...es-1.8.0-fix-building-without-nft-backend.patch | 26 ++++++++++++++++++++++ net-firewall/iptables/iptables-1.8.0.ebuild | 7 ++++-- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/net-firewall/iptables/files/iptables-1.8.0-fix-building-without-nft-backend.patch b/net-firewall/iptables/files/iptables-1.8.0-fix-building-without-nft-backend.patch new file mode 100644 index 00000000000..6b19c87678b --- /dev/null +++ b/net-firewall/iptables/files/iptables-1.8.0-fix-building-without-nft-backend.patch @@ -0,0 +1,26 @@ +extensions: don't bother to build libebt/libarp extensions if nft backend was disabled + +Bug: https://bugs.gentoo.org/660790 +Reported-by: Thomas Deutschmann <whi...@gentoo.org> +Signed-off-by: Florian Westphal <f...@strlen.de> +--- + extensions/GNUmakefile.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in +index bee666e80e45..c0d73cd28c03 100644 +--- a/extensions/GNUmakefile.in ++++ b/extensions/GNUmakefile.in +@@ -40,8 +40,8 @@ endif + # Wildcard module list + # + pfx_build_mod := $(patsubst ${srcdir}/libxt_%.c,%,$(sort $(wildcard ${srcdir}/libxt_*.c))) +-pfb_build_mod := $(patsubst ${srcdir}/libebt_%.c,%,$(sort $(wildcard ${srcdir}/libebt_*.c))) +-pfa_build_mod := $(patsubst ${srcdir}/libarpt_%.c,%,$(sort $(wildcard ${srcdir}/libarpt_*.c))) ++@ENABLE_NFTABLES_TRUE@ pfb_build_mod := $(patsubst ${srcdir}/libebt_%.c,%,$(sort $(wildcard ${srcdir}/libebt_*.c))) ++@ENABLE_NFTABLES_TRUE@ pfa_build_mod := $(patsubst ${srcdir}/libarpt_%.c,%,$(sort $(wildcard ${srcdir}/libarpt_*.c))) + pfx_symlinks := NOTRACK state + @ENABLE_IPV4_TRUE@ pf4_build_mod := $(patsubst ${srcdir}/libipt_%.c,%,$(sort $(wildcard ${srcdir}/libipt_*.c))) + @ENABLE_IPV6_TRUE@ pf6_build_mod := $(patsubst ${srcdir}/libip6t_%.c,%,$(sort $(wildcard ${srcdir}/libip6t_*.c))) +-- +2.17.1 diff --git a/net-firewall/iptables/iptables-1.8.0.ebuild b/net-firewall/iptables/iptables-1.8.0.ebuild index 78051935b05..d4cee0085fc 100644 --- a/net-firewall/iptables/iptables-1.8.0.ebuild +++ b/net-firewall/iptables/iptables-1.8.0.ebuild @@ -41,12 +41,15 @@ RDEPEND="${COMMON_DEPEND} nftables? ( net-misc/ethertypes ) " +PATCHES=( "${FILESDIR}"/iptables-1.8.0-fix-building-without-nft-backend.patch ) + src_prepare() { # use the saner headers from the kernel rm -f include/linux/{kernel,types}.h - # Only run autotools if user patched something - eapply_user && eautoreconf || elibtoolize + default + + eautoreconf } src_configure() {
