commit: 70942e923097a6370e6bf7f9d88f2b7325b26762 Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> AuthorDate: Wed Dec 23 00:14:43 2015 +0000 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> CommitDate: Wed Dec 23 00:14:59 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70942e92
net-firewall/iptables: version bump to 1.6.0 #568784 net-firewall/iptables/Manifest | 1 + net-firewall/iptables/iptables-1.6.0.ebuild | 113 ++++++++++++++++++++++++++++ net-firewall/iptables/metadata.xml | 1 + profiles/arch/alpha/package.use.mask | 4 + profiles/arch/hppa/package.use.mask | 4 + profiles/arch/ia64/package.use.mask | 4 + profiles/arch/powerpc/package.use.mask | 4 + profiles/arch/sparc/package.use.mask | 4 + 8 files changed, 135 insertions(+) diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest index 8e3fa0b..d954675 100644 --- a/net-firewall/iptables/Manifest +++ b/net-firewall/iptables/Manifest @@ -1,2 +1,3 @@ DIST iptables-1.4.17.tar.bz2 541137 SHA256 51e7a769469383b6ad308a6a19cdd2bd813cf4593e21a156a543a1cd70554925 SHA512 022f89cbf56408842bdeb1adbe05076addaad007599fdb662f32a1c134d743dade28c26842acc7545d2474903164be5fe3ec7fd1e276cd2c37bd3b33b8a30de1 WHIRLPOOL f2cb85d5f4080fce2c6673a58737ace3d55130f74c66207bc515d0c7b4ecd75bd7ac8540a862e8af133e740d34eee40833d72c9c3236c7ef4dc75cd43816ec41 DIST iptables-1.4.21.tar.bz2 547439 SHA256 52004c68021da9a599feed27f65defcfb22128f7da2c0531c0f75de0f479d3e0 SHA512 dd4baccdb080284d8620e6ed59beafc2677813f3e099051764b07f8e394f6d94ca11861b181f3cce7c55c66de64c1e2add13dc1a0b64e24050cd9fb7aea0689b WHIRLPOOL 475541d1b2b7fe4ee8fa3b537274ef082aab8bfd262201ee14cd53577dfac6f591445cc6d64ed93b226a4b71d54ae1b9ab4cbb378b5440861a585f770f0db200 +DIST iptables-1.6.0.tar.bz2 608288 SHA256 4bb72a0a0b18b5a9e79e87631ddc4084528e5df236bc7624472dcaa8480f1c60 SHA512 60360910db76e3265fb7b6456a55b91708263bde9c4e5b9cadf3832d2e2a9db3e6cb60c82e278ea0672618bd5c9566c374e00d19d35a2e8f330116c3ab6aaf51 WHIRLPOOL e5ab2398b0650883d31ea144777a6b00904a4e02434f0420037aa54cfc5e47359b95604e945ae3a1abbf3037c37aea2143d3a5457a500e12f1c1139b11655015 diff --git a/net-firewall/iptables/iptables-1.6.0.ebuild b/net-firewall/iptables/iptables-1.6.0.ebuild new file mode 100644 index 0000000..d3c06aa --- /dev/null +++ b/net-firewall/iptables/iptables-1.6.0.ebuild @@ -0,0 +1,113 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +# Force users doing their own patches to install their own tools +AUTOTOOLS_AUTO_DEPEND=no + +inherit eutils 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/11" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="conntrack ipv6 netlink nftables pcap static-libs" + +RDEPEND=" + conntrack? ( net-libs/libnetfilter_conntrack ) + netlink? ( net-libs/libnfnetlink ) + nftables? ( + >=net-libs/libmnl-1.0 + >=net-libs/libnftnl-1.0.5 + ) + pcap? ( net-libs/libpcap ) +" +DEPEND="${RDEPEND} + virtual/os-headers + virtual/pkgconfig + nftables? ( + sys-devel/flex + virtual/yacc + ) +" + +src_prepare() { + # use the saner headers from the kernel + rm -f include/linux/{kernel,types}.h + + # Only run autotools if user patched something + epatch_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 + + econf \ + --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) +} + +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 + + 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 +} diff --git a/net-firewall/iptables/metadata.xml b/net-firewall/iptables/metadata.xml index 7979119..ebd02a7 100644 --- a/net-firewall/iptables/metadata.xml +++ b/net-firewall/iptables/metadata.xml @@ -5,6 +5,7 @@ <use> <flag name='conntrack'>Build against <pkg>net-libs/libnetfilter_conntrack</pkg> when enables the connlabel matcher</flag> <flag name='netlink'>Build against libnfnetlink which enables the nfnl_osf util</flag> + <flag name='nftables'>Support nftables kernel interface</flag> <flag name='pcap'>Build against <pkg>net-libs/libpcap</pkg> which enables the nfbpf_compile util</flag> </use> <longdescription> diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask index d6d7547..ccf2253 100644 --- a/profiles/arch/alpha/package.use.mask +++ b/profiles/arch/alpha/package.use.mask @@ -2,6 +2,10 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ +# Mike Frysinger <[email protected]> (22 Dec 2015) +# Needs keywording. #569254 +net-firewall/iptables nftables + # Justin Lecher <[email protected]> (18 Nov 2015) # requires dev-python/restkit which requires # dev-python/socketpool which requires dev-python/gevent which requires diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask index a69a3ed..f293fc9 100644 --- a/profiles/arch/hppa/package.use.mask +++ b/profiles/arch/hppa/package.use.mask @@ -4,6 +4,10 @@ # DON'T TOUCH THIS FILE. Instead, file a bug and assign it to <[email protected]>. +# Mike Frysinger <[email protected]> (22 Dec 2015) +# Needs keywording. #569254 +net-firewall/iptables nftables + # Jeroen Roovers <[email protected]> (16 Aug 2015) # Bundles luajit which has not been ported to HPPA (bug #554376) app-text/texlive-core luajittex diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask index b22c144..2f72d49 100644 --- a/profiles/arch/ia64/package.use.mask +++ b/profiles/arch/ia64/package.use.mask @@ -2,6 +2,10 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ +# Mike Frysinger <[email protected]> (22 Dec 2015) +# Needs keywording. #569254 +net-firewall/iptables nftables + # Justin Lecher <[email protected]> (18 Nov 2015) # requires dev-python/restkit which requires # dev-python/socketpool which requires dev-python/gevent which requires diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask index 7a7cbb0..8be6980 100644 --- a/profiles/arch/powerpc/package.use.mask +++ b/profiles/arch/powerpc/package.use.mask @@ -2,6 +2,10 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ +# Mike Frysinger <[email protected]> (22 Dec 2015) +# Needs keywording. #569254 +net-firewall/iptables nftables + # Pacho Ramos <[email protected]> (15 Nov 2015) # Missing keywords media-sound/rhythmbox upnp-av diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask index fecfa8d..626ee11 100644 --- a/profiles/arch/sparc/package.use.mask +++ b/profiles/arch/sparc/package.use.mask @@ -2,6 +2,10 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ +# Mike Frysinger <[email protected]> (22 Dec 2015) +# Needs keywording. #569254 +net-firewall/iptables nftables + # Justin Lecher <[email protected]> (18 Nov 2015) # requires dev-python/restkit which requires # dev-python/socketpool which requires dev-python/gevent which requires
