| 1 |
commit: 1dea22c44a8b1b99c603759f42b96120789e3b87 |
| 2 |
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Dec 31 18:08:06 2019 +0000 |
| 4 |
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Dec 31 18:11:24 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dea22c4 |
| 7 |
|
| 8 |
net-firewall/iptables: Fix USE="conntrack static-libs" compilation |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/586106 |
| 11 |
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org> |
| 12 |
Package-Manager: Portage-2.3.83, Repoman-2.3.20 |
| 13 |
|
| 14 |
.../iptables/files/iptables-1.8.2-link.patch | 24 ++++++++++++++++++++++ |
| 15 |
net-firewall/iptables/iptables-1.8.2-r2.ebuild | 5 +++-- |
| 16 |
net-firewall/iptables/iptables-1.8.3-r1.ebuild | 5 +++-- |
| 17 |
net-firewall/iptables/iptables-1.8.4.ebuild | 5 +++-- |
| 18 |
4 files changed, 33 insertions(+), 6 deletions(-) |
| 19 |
|
| 20 |
diff --git a/net-firewall/iptables/files/iptables-1.8.2-link.patch b/net-firewall/iptables/files/iptables-1.8.2-link.patch |
| 21 |
new file mode 100644 |
| 22 |
index 00000000000..c20f2e54b80 |
| 23 |
--- /dev/null |
| 24 |
+++ b/net-firewall/iptables/files/iptables-1.8.2-link.patch |
| 25 |
@@ -0,0 +1,24 @@ |
| 26 |
+From ee4fc7c558d9eb9c37035250046d4eac9af3fa28 Mon Sep 17 00:00:00 2001 |
| 27 |
+From: Sebastian Pipping <sebastian@×××××××.org> |
| 28 |
+Date: Thu, 27 Dec 2018 23:47:33 +0100 |
| 29 |
+Subject: [PATCH] Fix link errors for USE="conntrack static-libs" (bug #586106) |
| 30 |
+ |
| 31 |
+--- |
| 32 |
+ iptables/Makefile.am | 1 + |
| 33 |
+ 1 file changed, 1 insertion(+) |
| 34 |
+ |
| 35 |
+diff --git a/iptables/Makefile.am b/iptables/Makefile.am |
| 36 |
+index 581dc32..2c3db86 100644 |
| 37 |
+--- a/iptables/Makefile.am |
| 38 |
++++ b/iptables/Makefile.am |
| 39 |
+@@ -26,6 +26,7 @@ xtables_legacy_multi_LDADD += ../libiptc/libip6tc.la ../extensions/libext6.a |
| 40 |
+ endif |
| 41 |
+ xtables_legacy_multi_SOURCES += xshared.c |
| 42 |
+ xtables_legacy_multi_LDADD += ../libxtables/libxtables.la -lm |
| 43 |
++xtables_legacy_multi_LDADD += ${libnetfilter_conntrack_LIBS} |
| 44 |
+ |
| 45 |
+ # iptables using nf_tables api |
| 46 |
+ if ENABLE_NFTABLES |
| 47 |
+-- |
| 48 |
+2.19.1 |
| 49 |
+ |
| 50 |
|
| 51 |
diff --git a/net-firewall/iptables/iptables-1.8.2-r2.ebuild b/net-firewall/iptables/iptables-1.8.2-r2.ebuild |
| 52 |
index 65bb18d8aad..6fdac74e6d4 100644 |
| 53 |
--- a/net-firewall/iptables/iptables-1.8.2-r2.ebuild |
| 54 |
+++ b/net-firewall/iptables/iptables-1.8.2-r2.ebuild |
| 55 |
@@ -45,8 +45,9 @@ src_prepare() { |
| 56 |
# use the saner headers from the kernel |
| 57 |
rm -f include/linux/{kernel,types}.h |
| 58 |
|
| 59 |
- # Only run autotools if user patched something |
| 60 |
- eapply_user && eautoreconf || elibtoolize |
| 61 |
+ eapply "${FILESDIR}"/${P}-link.patch |
| 62 |
+ eapply_user |
| 63 |
+ eautoreconf |
| 64 |
} |
| 65 |
|
| 66 |
src_configure() { |
| 67 |
|
| 68 |
diff --git a/net-firewall/iptables/iptables-1.8.3-r1.ebuild b/net-firewall/iptables/iptables-1.8.3-r1.ebuild |
| 69 |
index 10842671810..52246a8ac41 100644 |
| 70 |
--- a/net-firewall/iptables/iptables-1.8.3-r1.ebuild |
| 71 |
+++ b/net-firewall/iptables/iptables-1.8.3-r1.ebuild |
| 72 |
@@ -47,8 +47,9 @@ src_prepare() { |
| 73 |
# use the saner headers from the kernel |
| 74 |
rm include/linux/{kernel,types}.h || die |
| 75 |
|
| 76 |
- # Only run autotools if user patched something |
| 77 |
- eapply_user && eautoreconf || elibtoolize |
| 78 |
+ eapply "${FILESDIR}"/${PN}-1.8.2-link.patch |
| 79 |
+ eapply_user |
| 80 |
+ eautoreconf |
| 81 |
} |
| 82 |
|
| 83 |
src_configure() { |
| 84 |
|
| 85 |
diff --git a/net-firewall/iptables/iptables-1.8.4.ebuild b/net-firewall/iptables/iptables-1.8.4.ebuild |
| 86 |
index 890475e4e57..8cb78dfb30b 100644 |
| 87 |
--- a/net-firewall/iptables/iptables-1.8.4.ebuild |
| 88 |
+++ b/net-firewall/iptables/iptables-1.8.4.ebuild |
| 89 |
@@ -47,8 +47,9 @@ src_prepare() { |
| 90 |
# use the saner headers from the kernel |
| 91 |
rm include/linux/{kernel,types}.h || die |
| 92 |
|
| 93 |
- # Only run autotools if user patched something |
| 94 |
- eapply_user && eautoreconf || elibtoolize |
| 95 |
+ eapply "${FILESDIR}"/${PN}-1.8.2-link.patch |
| 96 |
+ eapply_user |
| 97 |
+ eautoreconf |
| 98 |
} |
| 99 |
|
| 100 |
src_configure() { |
Archives