diff options
author | 2004-06-28 19:07:07 +0000 | |
---|---|---|
committer | 2004-06-28 19:07:07 +0000 | |
commit | f2d3535909201a9158ff00595c6a2819aba353c7 (patch) | |
tree | 176b5e6a0a30184a36ae2f8a496d8c399514224b /net-firewall/iptables | |
parent | glibc -> libc, add sed-4 dep (Manifest recommit) (diff) | |
download | gentoo-2-f2d3535909201a9158ff00595c6a2819aba353c7.tar.gz gentoo-2-f2d3535909201a9158ff00595c6a2819aba353c7.tar.bz2 gentoo-2-f2d3535909201a9158ff00595c6a2819aba353c7.zip |
Fix keywords.
Diffstat (limited to 'net-firewall/iptables')
-rw-r--r-- | net-firewall/iptables/iptables-1.2.11.ebuild | 93 | ||||
-rw-r--r-- | net-firewall/iptables/iptables-1.2.9-r2.ebuild | 5 |
2 files changed, 64 insertions, 34 deletions
diff --git a/net-firewall/iptables/iptables-1.2.11.ebuild b/net-firewall/iptables/iptables-1.2.11.ebuild index 929618619787..147cd449e0d6 100644 --- a/net-firewall/iptables/iptables-1.2.11.ebuild +++ b/net-firewall/iptables/iptables-1.2.11.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.2.11.ebuild,v 1.2 2004/06/24 22:41:08 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.2.11.ebuild,v 1.3 2004/06/28 19:07:07 aliz Exp $ inherit eutils flag-o-matic @@ -10,40 +10,53 @@ SRC_URI="http://www.iptables.org/files/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="-*" -#KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha arm ~hppa ~amd64 ~ia64" -IUSE="ipv6 static" - -# iptables is dependent on kernel sources. Strange but true. +KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64" +IUSE="ipv6 static extensions" DEPEND="virtual/linux-sources" -src_unpack() { - replace-flags -O0 -O2 - - if [ -z `get-flag O` ]; then - append-flags -O2 +pkg_setup() { + if use extensions; then + einfo "WARNING: 3rd party extensions has been enabled." + einfo "This means that iptables will use your currently installed" + einfo "kernel in /usr/src/linux as headers for iptables." + einfo "" + einfo "You may have to patch your kernel to allow iptables to build." + einfo "Please check http://cvs.iptables.org/patch-o-matic-ng/updates/ for patches" + einfo "for your kernel." fi +} + +src_unpack() { unpack ${A} ; cd ${S} -# epatch ${FILESDIR}/${PV}-files + epatch ${FILESDIR}/${PV}-files/04_all_install_ipv6_apps.patch.bz2 + epatch ${FILESDIR}/${PV}-files/05_all_install_all_dev_files.patch.bz2 # The folowing hack is needed because ${ARCH} is "sparc" and not "sparc64" # and epatch uses ??_${ARCH}_foo.${EPATCH_SUFFIX} when reading from directories -# [ "${PROFILE_ARCH}" = "sparc64" ] && -#epatch ${FILESDIR}/sparc64_limit_fix.patch.bz2 + [ "${PROFILE_ARCH}" = "sparc64" ] && epatch ${FILESDIR}/${PV}-files/sparc64_limit_fix.patch.bz2 + use hppa && epatch ${FILESDIR}/${PV}-files/03_hppa_gentoo.patch.bz2 + + if use extensions; then + epatch ${FILESDIR}/${PV}-files/01_all_grsecurity.patch.bz2 + epatch ${FILESDIR}/${PV}-files/02_all_imq.patch.bz2 + epatch ${FILESDIR}/${PV}-files/06_all_l7.patch.bz2 + + chmod +x extensions/.IMQ-test* + chmod +x extensions/.childlevel-test* + chmod +x extensions/.layer7-test* + fi - chmod +x extensions/.IMQ-test* - chmod +x extensions/.childlevel-test* - chmod +x extensions/.layer7-test* sed -i -e "s:-O2:${CFLAGS} -Iinclude:g" -e "s:/usr/local::g" -e "s:-Iinclude/::" Makefile } src_compile() { - # Only check_KV if /usr/src/linux exists - if [ -L ${ROOT}/usr/src/linux -o -d ${ROOT}/usr/src/linux ]; then - check_KV + replace-flags -O0 -O2 + + if [ -z `get-flag O` ]; then + append-flags -O2 fi # prevent it from causing ICMP errors. @@ -57,13 +70,31 @@ src_compile() { use ipv6 || myconf="${myconf} DO_IPV6=0" use static && myconf="${myconf} NO_SHARED_LIBS=0" - make ${myconf} \ - LIBDIR=/lib \ - BINDIR=/sbin \ - MANDIR=/usr/share/man \ - INCDIR=/usr/include \ - KERNEL_DIR=/usr/src/linux \ - || die + if use extensions; then + # Only check_KV if /usr/src/linux exists + if [ -L ${ROOT}/usr/src/linux -o -d ${ROOT}/usr/src/linux ]; then + check_KV + else + ewarn "You don't have kernel sources available at /usr/src/linux." + ewarn "Iptables will be built against linux-headers." + fi + + make ${myconf} \ + LIBDIR=/lib \ + BINDIR=/sbin \ + MANDIR=/usr/share/man \ + INCDIR=/usr/include \ + KERNEL_DIR=/usr/src/linux \ + || die "Please check http://cvs.iptables.org/patch-o-matic-ng/updates/ if your kernel needs to be patched for iptables" + else + make ${myconf} \ + LIBDIR=/lib \ + BINDIR=/sbin \ + MANDIR=/usr/share/man \ + INCDIR=/usr/include \ + KERNEL_DIR=/usr \ + || die + fi } src_install() { @@ -77,16 +108,16 @@ src_install() { dodoc COPYING dodir /var/lib/iptables ; keepdir /var/lib/iptables exeinto /etc/init.d - newexe ${FILESDIR}/${PF}.init iptables + newexe ${FILESDIR}/${PN}-${PV}-r1.init iptables insinto /etc/conf.d - newins ${FILESDIR}/${PF}.confd iptables + newins ${FILESDIR}/${PN}-${PV}-r1.confd iptables if use ipv6; then dodir /var/lib/ip6tables ; keepdir /var/lib/ip6tables exeinto /etc/init.d - newexe ${FILESDIR}/${PF/iptables/ip6tables}.init ip6tables + newexe ${FILESDIR}/${PN/iptables/ip6tables}-${PV}-r1.init ip6tables insinto /etc/conf.d - newins ${FILESDIR}/${PF/iptables/ip6tables}.confd ip6tables + newins ${FILESDIR}/${PN/iptables/ip6tables}-${PV}-r1.confd ip6tables fi } diff --git a/net-firewall/iptables/iptables-1.2.9-r2.ebuild b/net-firewall/iptables/iptables-1.2.9-r2.ebuild index 5581939f4673..aa5c40c55bf9 100644 --- a/net-firewall/iptables/iptables-1.2.9-r2.ebuild +++ b/net-firewall/iptables/iptables-1.2.9-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.2.9-r2.ebuild,v 1.4 2004/06/28 19:03:56 aliz Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.2.9-r2.ebuild,v 1.5 2004/06/28 19:07:07 aliz Exp $ inherit eutils flag-o-matic @@ -10,8 +10,7 @@ SRC_URI="http://www.iptables.org/files/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="-*" -#KEYWORDS="x86 ~ppc sparc ~mips alpha arm hppa amd64 ia64" +KEYWORDS="x86 ~ppc sparc ~mips alpha arm hppa amd64 ia64" IUSE="ipv6 static extensions" DEPEND="virtual/linux-sources" |