[net-firewall/iptables] sync

This commit is contained in:
Robert Förster 2023-05-02 17:50:48 +02:00
parent 4961859465
commit 871bc19cf0
2 changed files with 8 additions and 29 deletions

View File

@ -1,24 +0,0 @@
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

View File

@ -1,4 +1,4 @@
# Copyright 1999-2022 Gentoo Authors # Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=8 EAPI=8
@ -34,7 +34,7 @@ BDEPEND="
virtual/pkgconfig virtual/pkgconfig
nftables? ( nftables? (
sys-devel/flex sys-devel/flex
virtual/yacc app-alternatives/yacc
) )
" "
RDEPEND=" RDEPEND="
@ -46,8 +46,7 @@ RDEPEND="
IDEPEND=">=app-eselect/eselect-iptables-20220320" IDEPEND=">=app-eselect/eselect-iptables-20220320"
PATCHES=( PATCHES=(
"${FILESDIR}/iptables-1.8.4-no-symlinks.patch" "${FILESDIR}"/${PN}-1.8.4-no-symlinks.patch
"${FILESDIR}/iptables-1.8.2-link.patch"
) )
src_prepare() { src_prepare() {
@ -93,7 +92,11 @@ src_compile() {
src_install() { src_install() {
default default
dodoc INCOMPATIBILITIES iptables/iptables.xslt # Managed by eselect-iptables
# https://bugs.gentoo.org/881295
rm "${ED}/usr/bin/iptables-xml" || die
dodoc iptables/iptables.xslt
# All the iptables binaries are in /sbin, so might as well # All the iptables binaries are in /sbin, so might as well
# put these small files in with them # put these small files in with them