From d743214a26125159f5eb5583a0098fb75dfebc18 Mon Sep 17 00:00:00 2001 From: Stuart Shelton Date: Thu, 25 Aug 2016 00:07:34 +0100 Subject: Add net-firewall/iptables-1.6.0-r1, update net-firewall/iptables-9999 --- net-firewall/iptables/Manifest | 3 +- net-firewall/iptables/iptables-1.6.0-r1.ebuild | 120 +++++++++++++++++++++++++ net-firewall/iptables/iptables-9999.ebuild | 41 +++++---- 3 files changed, 145 insertions(+), 19 deletions(-) create mode 100644 net-firewall/iptables/iptables-1.6.0-r1.ebuild (limited to 'net-firewall') diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest index 32da2a1f..fc0d29fd 100644 --- a/net-firewall/iptables/Manifest +++ b/net-firewall/iptables/Manifest @@ -10,5 +10,6 @@ AUX systemd/iptables-restore.service 391 SHA256 ace3b2085700bde96f0597e8c6f3b852 AUX systemd/iptables-store.service 240 SHA256 14965fd0f3cd4285e77ea1e3d9975a818b0d64fb0026b925d8434896b2cbf839 SHA512 a720e92b5571a2c3427101105e95e555f3b72541a53c5daa43e361c99ca28830e9e8dd27dbd7cfed40fbbe289ed180f9be7e0f3b6b0cd19bba022a531815fd5e WHIRLPOOL e3a5b77b2c19ad8445a21cc9c8680c2d632d968483357221fac1c309275bd17aa25c05cf23188d5ae644d5b1266c64b3dd5fe8fbdec9f2a439a212c3d1c767db AUX systemd/iptables.service 130 SHA256 c404c54c98521817aca75b96774a24684e0c7ed2fc8de2ced78f4ae4d8a6b99d SHA512 87114ccc7eb079d1ed43d77be35cf4c91702ca960883a4bbca5dfcf74aa6f086e44f4a4251441ac3a277c93eb10e7482157caf2d62bbf2a7f5327947ede25bef WHIRLPOOL 844296866dfe2fe6b1207c99d2f938f4c87a37592e95576f9504fe056fe82fc29878b9aa1a204fa31d6711fbe7ba5cd48f7a639e4839bbe366e6220246a0d3c3 DIST iptables-1.6.0.tar.bz2 608288 SHA256 4bb72a0a0b18b5a9e79e87631ddc4084528e5df236bc7624472dcaa8480f1c60 SHA512 60360910db76e3265fb7b6456a55b91708263bde9c4e5b9cadf3832d2e2a9db3e6cb60c82e278ea0672618bd5c9566c374e00d19d35a2e8f330116c3ab6aaf51 WHIRLPOOL e5ab2398b0650883d31ea144777a6b00904a4e02434f0420037aa54cfc5e47359b95604e945ae3a1abbf3037c37aea2143d3a5457a500e12f1c1139b11655015 +EBUILD iptables-1.6.0-r1.ebuild 3295 SHA256 1c0cf3a3db731ade408d54404047e5b0bcf806494acc3b7a04fc8ed6a08910cf SHA512 cdbbd4286e2df731a2e4f91f8c147e5ff1ed319bbfebb493e3760bb4f4c5f61df88f217133e5760e8f3c8dce6f37f9303e6274eab4f817e4225975e3a03e69d8 WHIRLPOOL 631edaf39bd09afef1569c8c730537181002ca85acd4db253ac0364b1079b45c97f326bcbd077075739a0229dfbcc9cab38498606a0ff1ae95d53afb76fa8e35 EBUILD iptables-1.6.0.ebuild 3307 SHA256 b382f04b62997bb5a0f805d0675ffefde4b0ea38231f7d8b2b048d83bc222d3c SHA512 24d8cbebf82fea1f367009e035708a1cd53e867df1e71cdbdc9dc57922da0082a7b6bf4921675edee7e1995ea033bf444fdd46f8e05f7863cd0423205ba143b7 WHIRLPOOL b27c8bb82c6932554c9266c2f81cbdea20b8527e9f0a00e8b4dfb1c27fb683b0ae4a85c3f6ea952d61dae5f2356a1668ca6367377fd46ec1a724704bf444db58 -EBUILD iptables-9999.ebuild 3246 SHA256 258162d4ee9b4c244ea15920618705905e148a7bd2e28d80d917bdaf71a2665c SHA512 7ef7f7ac4a9061a957c9cbd25933a2d1fa6afde9627ac0c12ab7ec25ca5fa1bce0e08eee59aa332c4664753cd65aa75fc2690dcafb3f14671fe187799f138a03 WHIRLPOOL d27cadae8bc19b5ea5efdd94806138aae62c94612aa5a741723d91fb14cff0fabd18cb359be7c942a78c4bcdf085a8b251f0aa0ccc195aa60f8625ac4a123da2 +EBUILD iptables-9999.ebuild 3229 SHA256 ccabbe083d4cb02da393377fc8ea27f550343e13886d76586c08efaafa837390 SHA512 29355ac36360f33a26b0dea26cc9a76498c62b6ba384ead1460cd458b5ed1e5365b690155b6be783d2c0dbb2bc2d334478472a65de4f624d55a0e1a3fb49a9a5 WHIRLPOOL 47de49917b47773e2eb3c1f0a1b6d00bf815447e8468c8baa2a40d0ee35cce4d12e40800135a97adc071c2ed12c3cbb17055dec8ce8b6a8384ed41e9155c2d52 diff --git a/net-firewall/iptables/iptables-1.6.0-r1.ebuild b/net-firewall/iptables/iptables-1.6.0-r1.ebuild new file mode 100644 index 00000000..62603d59 --- /dev/null +++ b/net-firewall/iptables/iptables-1.6.0-r1.ebuild @@ -0,0 +1,120 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id: a8fe28244ad1d8ad0870ecb6166e75498755c211 $ + +EAPI="5" + +# Force users doing their own patches to install their own tools +AUTOTOOLS_AUTO_DEPEND=no + +inherit autotools eutils flag-o-matic multilib systemd toolchain-funcs + +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 systemd" + +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 + + sed -i \ + -e '/define XT_LOCK_NAME/s:"/run/:"/var/run/:' \ + iptables/xshared.c || die + + econf \ + --sbindir="${EPREFIX}/sbin" \ + --libexecdir="${EPREFIX}/$(get_libdir)" \ + --enable-devel \ + --enable-shared \ + --enable-libipq \ + $(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 + + if use systemd; then + systemd_dounit "${FILESDIR}"/systemd/iptables-{re,}store.service + if use ipv6 ; then + systemd_dounit "${FILESDIR}"/systemd/ip6tables-{re,}store.service + fi + 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/iptables-9999.ebuild b/net-firewall/iptables/iptables-9999.ebuild index a2c83b63..fefaf68c 100644 --- a/net-firewall/iptables/iptables-9999.ebuild +++ b/net-firewall/iptables/iptables-9999.ebuild @@ -1,13 +1,12 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: ef4eb78c92d7f88400535ae1a4077879110157f0 $ EAPI="5" # Force users doing their own patches to install their own tools AUTOTOOLS_AUTO_DEPEND=no -inherit autotools eutils git-r3 multilib systemd toolchain-funcs +inherit autotools eutils flag-o-matic git-r3 multilib systemd toolchain-funcs DESCRIPTION="Linux kernel (3.13+) firewall, NAT and packet mangling tools, with nftables compatibility" HOMEPAGE="http://www.netfilter.org/projects/nftables/" @@ -15,37 +14,36 @@ HOMEPAGE="http://www.netfilter.org/projects/nftables/" 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/10" -KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="conntrack ipv6 netlink pcap static-libs systemd xlate" +SLOT="0/11" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="conntrack ipv6 netlink pcap static-libs systemd" REPO="iptables" EGIT_REPO_URI="git://git.netfilter.org/${REPO}.git" -EGIT_BRANCH="$( usex xlate 'xlate2' 'master' )" +#EGIT_BRANCH="$( usex xlate 'xlate2' 'master' )" #EGIT_COMMIT="${COMMIT}" RDEPEND=" conntrack? ( net-libs/libnetfilter_conntrack ) netlink? ( net-libs/libnfnetlink ) + >=net-libs/libmnl-1.0 + >=net-libs/libnftnl-1.0.6 pcap? ( net-libs/libpcap ) " DEPEND="${RDEPEND} + sys-devel/flex virtual/os-headers virtual/pkgconfig - =net-libs/libnftnl-9999 + virtual/yacc " src_prepare() { # use the saner headers from the kernel rm -f include/linux/{kernel,types}.h - eautoreconf - - epatch "${FILESDIR}"/${PN}-1.4.21-configure.patch #557586 - epatch "${FILESDIR}"/${PN}-1.4.21-static-connlabel-config.patch #558234 + epatch_user - # Only run autotools if user patched something - epatch_user && eautoreconf || elibtoolize + eautoreconf } src_configure() { @@ -60,12 +58,17 @@ src_configure() { -e "/nfconntrack=[01]/s:=[01]:=$(usex conntrack 1 0):" \ configure || die + sed -i \ + -e '/define XT_LOCK_NAME/s:"/run/:"/var/run/:' \ + iptables/xshared.c || die + econf \ --sbindir="${EPREFIX}/sbin" \ --libexecdir="${EPREFIX}/$(get_libdir)" \ --enable-devel \ --enable-shared \ --enable-libipq \ + --enable-nftables \ $(use_enable pcap bpf-compiler) \ $(use_enable pcap nfsynproxy) \ $(use_enable static-libs static) \ @@ -73,6 +76,8 @@ src_configure() { } src_compile() { + # Deal with parallel build errors. + emake -C iptables xtables-config-parser.h emake V=1 } @@ -93,8 +98,8 @@ src_install() { doins include/iptables/internal.h keepdir /var/lib/iptables - newinitd "${FILESDIR}"/iptables.init iptables - newconfd "${FILESDIR}"/iptables-1.4.13.confd 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 @@ -102,9 +107,9 @@ src_install() { fi if use systemd; then - systemd_dounit "${FILESDIR}"/systemd/iptables{,-{re,}store}.service + systemd_dounit "${FILESDIR}"/systemd/iptables-{re,}store.service if use ipv6 ; then - systemd_dounit "${FILESDIR}"/systemd/ip6tables{,-{re,}store}.service + systemd_dounit "${FILESDIR}"/systemd/ip6tables-{re,}store.service fi fi -- cgit v1.2.3-65-gdbad