summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2018-03-07 13:08:53 -0500
committerMike Gilbert <floppym@gentoo.org>2018-03-07 14:26:35 -0500
commit6fd85eaae9e4af4c6f4da0bcc14051616abadcd4 (patch)
tree5c6fcafc8793ca185d77cc198fa8a284ef83285f /net-firewall/iptables
parentnet-firewall/ebtables: drop /etc/ethertypes (diff)
downloadgentoo-6fd85eaae9e4af4c6f4da0bcc14051616abadcd4.tar.gz
gentoo-6fd85eaae9e4af4c6f4da0bcc14051616abadcd4.tar.bz2
gentoo-6fd85eaae9e4af4c6f4da0bcc14051616abadcd4.zip
net-firewall/iptables: drop /etc/ethertypes
Bug: https://bugs.gentoo.org/647458 Package-Manager: Portage-2.3.24_p18, Repoman-2.3.6_p99
Diffstat (limited to 'net-firewall/iptables')
-rw-r--r--net-firewall/iptables/iptables-1.6.1-r3.ebuild10
-rw-r--r--net-firewall/iptables/iptables-1.6.2-r1.ebuild10
-rw-r--r--net-firewall/iptables/iptables-1.6.2-r2.ebuild122
3 files changed, 138 insertions, 4 deletions
diff --git a/net-firewall/iptables/iptables-1.6.1-r3.ebuild b/net-firewall/iptables/iptables-1.6.1-r3.ebuild
index 67f06ce7ac09..f76df06504ed 100644
--- a/net-firewall/iptables/iptables-1.6.1-r3.ebuild
+++ b/net-firewall/iptables/iptables-1.6.1-r3.ebuild
@@ -19,7 +19,7 @@ SLOT="0/12"
KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86"
IUSE="conntrack ipv6 netlink nftables pcap static-libs"
-RDEPEND="
+COMMON_DEPEND="
conntrack? ( >=net-libs/libnetfilter_conntrack-1.0.6 )
netlink? ( net-libs/libnfnetlink )
nftables? (
@@ -28,7 +28,7 @@ RDEPEND="
)
pcap? ( net-libs/libpcap )
"
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
virtual/os-headers
virtual/pkgconfig
nftables? (
@@ -36,6 +36,12 @@ DEPEND="${RDEPEND}
virtual/yacc
)
"
+RDEPEND="${COMMON_DEPEND}
+ nftables? (
+ !<net-firewall/ebtables-2.0.10.4-r2
+ !net-misc/ethertypes
+ )
+"
src_prepare() {
# use the saner headers from the kernel
diff --git a/net-firewall/iptables/iptables-1.6.2-r1.ebuild b/net-firewall/iptables/iptables-1.6.2-r1.ebuild
index b6c9ab99f6ba..3ed3f6a11a02 100644
--- a/net-firewall/iptables/iptables-1.6.2-r1.ebuild
+++ b/net-firewall/iptables/iptables-1.6.2-r1.ebuild
@@ -19,7 +19,7 @@ SLOT="0/12"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
IUSE="conntrack ipv6 netlink nftables pcap static-libs"
-RDEPEND="
+COMMON_DEPEND="
conntrack? ( >=net-libs/libnetfilter_conntrack-1.0.6 )
netlink? ( net-libs/libnfnetlink )
nftables? (
@@ -28,7 +28,7 @@ RDEPEND="
)
pcap? ( net-libs/libpcap )
"
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
virtual/os-headers
virtual/pkgconfig
nftables? (
@@ -36,6 +36,12 @@ DEPEND="${RDEPEND}
virtual/yacc
)
"
+RDEPEND="${COMMON_DEPEND}
+ nftables? (
+ !<net-firewall/ebtables-2.0.10.4-r2
+ !net-misc/ethertypes
+ )
+"
src_prepare() {
# use the saner headers from the kernel
diff --git a/net-firewall/iptables/iptables-1.6.2-r2.ebuild b/net-firewall/iptables/iptables-1.6.2-r2.ebuild
new file mode 100644
index 000000000000..91954bd4d276
--- /dev/null
+++ b/net-firewall/iptables/iptables-1.6.2-r2.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Force users doing their own patches to install their own tools
+AUTOTOOLS_AUTO_DEPEND=no
+
+inherit ltprune multilib systemd toolchain-funcs autotools flag-o-matic
+
+DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
+HOMEPAGE="http://www.netfilter.org/projects/iptables/"
+SRC_URI="http://www.netfilter.org/projects/iptables/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+# Subslot tracks libxtables as that's the one other packages generally link
+# against and iptables changes. Will have to revisit if other sonames change.
+SLOT="0/12"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="conntrack ipv6 netlink nftables pcap static-libs"
+
+COMMON_DEPEND="
+ conntrack? ( >=net-libs/libnetfilter_conntrack-1.0.6 )
+ netlink? ( net-libs/libnfnetlink )
+ nftables? (
+ >=net-libs/libmnl-1.0:0=
+ >=net-libs/libnftnl-1.0.5:0=
+ )
+ pcap? ( net-libs/libpcap )
+"
+DEPEND="${COMMON_DEPEND}
+ virtual/os-headers
+ virtual/pkgconfig
+ nftables? (
+ sys-devel/flex
+ virtual/yacc
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ nftables? ( net-misc/ethertypes )
+"
+
+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
+}
+
+src_configure() {
+ # Some libs use $(AR) rather than libtool to build #444282
+ tc-export AR
+
+ # Hack around struct mismatches between userland & kernel for some ABIs. #472388
+ use amd64 && [[ ${ABI} == "x32" ]] && append-flags -fpack-struct
+
+ sed -i \
+ -e "/nfnetlink=[01]/s:=[01]:=$(usex netlink 1 0):" \
+ -e "/nfconntrack=[01]/s:=[01]:=$(usex conntrack 1 0):" \
+ configure || die
+
+ local myeconfargs=(
+ --sbindir="${EPREFIX}/sbin"
+ --libexecdir="${EPREFIX}/$(get_libdir)"
+ --enable-devel
+ --enable-shared
+ $(use_enable nftables)
+ $(use_enable pcap bpf-compiler)
+ $(use_enable pcap nfsynproxy)
+ $(use_enable static-libs static)
+ $(use_enable ipv6)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # Deal with parallel build errors.
+ use nftables && emake -C iptables xtables-config-parser.h
+ emake V=1
+}
+
+src_install() {
+ default
+ dodoc INCOMPATIBILITIES iptables/iptables.xslt
+
+ # all the iptables binaries are in /sbin, so might as well
+ # put these small files in with them
+ into /
+ dosbin iptables/iptables-apply
+ dosym iptables-apply /sbin/ip6tables-apply
+ doman iptables/iptables-apply.8
+
+ insinto /usr/include
+ doins include/iptables.h $(use ipv6 && echo include/ip6tables.h)
+ insinto /usr/include/iptables
+ doins include/iptables/internal.h
+
+ keepdir /var/lib/iptables
+ newinitd "${FILESDIR}"/${PN}.init iptables
+ newconfd "${FILESDIR}"/${PN}-1.4.13.confd iptables
+ if use ipv6 ; then
+ keepdir /var/lib/ip6tables
+ newinitd "${FILESDIR}"/iptables.init ip6tables
+ newconfd "${FILESDIR}"/ip6tables-1.4.13.confd ip6tables
+ fi
+
+ if use nftables; then
+ # Bug 647458
+ rm "${ED%/}"/etc/ethertypes || die
+ fi
+
+ systemd_dounit "${FILESDIR}"/systemd/iptables-{re,}store.service
+ if use ipv6 ; then
+ systemd_dounit "${FILESDIR}"/systemd/ip6tables-{re,}store.service
+ fi
+
+ # Move important libs to /lib #332175
+ gen_usr_ldscript -a ip{4,6}tc iptc xtables
+
+ prune_libtool_files
+}