diff options
| author |   Sebastian Pipping <sping@gentoo.org> | 2019-12-31 19:08:06 +0100 |
|---|---|---|
| committer | Sebastian Pipping <sping@gentoo.org> | 2019-12-31 19:11:24 +0100 |
| commit | 1dea22c44a8b1b99c603759f42b96120789e3b87 (patch) | |
| tree | 294de5486d360d3ae9810e7346eeae44b92a9312 | |
| parent | dev-libs/utfcpp: arm64 stable (bug #704258) (diff) | |
| download | gentoo-1dea22c44a8b1b99c603759f42b96120789e3b87.tar.gz gentoo-1dea22c44a8b1b99c603759f42b96120789e3b87.tar.bz2 gentoo-1dea22c44a8b1b99c603759f42b96120789e3b87.zip | |
net-firewall/iptables: Fix USE="conntrack static-libs" compilation
Closes: https://bugs.gentoo.org/586106
Signed-off-by: Sebastian Pipping <sping@gentoo.org>
Package-Manager: Portage-2.3.83, Repoman-2.3.20
| -rw-r--r-- | net-firewall/iptables/files/iptables-1.8.2-link.patch | 24 | ||||
| -rw-r--r-- | net-firewall/iptables/iptables-1.8.2-r2.ebuild | 5 | ||||
| -rw-r--r-- | net-firewall/iptables/iptables-1.8.3-r1.ebuild | 5 | ||||
| -rw-r--r-- | net-firewall/iptables/iptables-1.8.4.ebuild | 5 |
4 files changed, 33 insertions, 6 deletions
diff --git a/net-firewall/iptables/files/iptables-1.8.2-link.patch b/net-firewall/iptables/files/iptables-1.8.2-link.patch new file mode 100644 index 000000000000..c20f2e54b804 --- /dev/null +++ b/net-firewall/iptables/files/iptables-1.8.2-link.patch @@ -0,0 +1,24 @@ +From ee4fc7c558d9eb9c37035250046d4eac9af3fa28 Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping <sebastian@pipping.org> +Date: Thu, 27 Dec 2018 23:47:33 +0100 +Subject: [PATCH] Fix link errors for USE="conntrack static-libs" (bug #586106) + +--- + iptables/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/iptables/Makefile.am b/iptables/Makefile.am +index 581dc32..2c3db86 100644 +--- a/iptables/Makefile.am ++++ b/iptables/Makefile.am +@@ -26,6 +26,7 @@ xtables_legacy_multi_LDADD += ../libiptc/libip6tc.la ../extensions/libext6.a + endif + xtables_legacy_multi_SOURCES += xshared.c + xtables_legacy_multi_LDADD += ../libxtables/libxtables.la -lm ++xtables_legacy_multi_LDADD += ${libnetfilter_conntrack_LIBS} + + # iptables using nf_tables api + if ENABLE_NFTABLES +-- +2.19.1 + diff --git a/net-firewall/iptables/iptables-1.8.2-r2.ebuild b/net-firewall/iptables/iptables-1.8.2-r2.ebuild index 65bb18d8aad2..6fdac74e6d4b 100644 --- a/net-firewall/iptables/iptables-1.8.2-r2.ebuild +++ b/net-firewall/iptables/iptables-1.8.2-r2.ebuild @@ -45,8 +45,9 @@ 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 + eapply "${FILESDIR}"/${P}-link.patch + eapply_user + eautoreconf } src_configure() { diff --git a/net-firewall/iptables/iptables-1.8.3-r1.ebuild b/net-firewall/iptables/iptables-1.8.3-r1.ebuild index 108426718102..52246a8ac413 100644 --- a/net-firewall/iptables/iptables-1.8.3-r1.ebuild +++ b/net-firewall/iptables/iptables-1.8.3-r1.ebuild @@ -47,8 +47,9 @@ src_prepare() { # use the saner headers from the kernel rm include/linux/{kernel,types}.h || die - # Only run autotools if user patched something - eapply_user && eautoreconf || elibtoolize + eapply "${FILESDIR}"/${PN}-1.8.2-link.patch + eapply_user + eautoreconf } src_configure() { diff --git a/net-firewall/iptables/iptables-1.8.4.ebuild b/net-firewall/iptables/iptables-1.8.4.ebuild index 890475e4e57d..8cb78dfb30be 100644 --- a/net-firewall/iptables/iptables-1.8.4.ebuild +++ b/net-firewall/iptables/iptables-1.8.4.ebuild @@ -47,8 +47,9 @@ src_prepare() { # use the saner headers from the kernel rm include/linux/{kernel,types}.h || die - # Only run autotools if user patched something - eapply_user && eautoreconf || elibtoolize + eapply "${FILESDIR}"/${PN}-1.8.2-link.patch + eapply_user + eautoreconf } src_configure() { |