From 10e654d69220a6a87a78431f29aea3a39d79e584 Mon Sep 17 00:00:00 2001 From: Daniel Ahlberg Date: Sat, 3 Jul 2004 15:36:32 +0000 Subject: Fix compilation in src_install --- net-firewall/iptables/ChangeLog | 10 +- net-firewall/iptables/Manifest | 46 +++--- .../iptables/files/digest-iptables-1.2.11-r1 | 1 - .../iptables/files/digest-iptables-1.2.11-r2 | 1 + .../iptables/files/digest-iptables-1.2.9-r3 | 1 - .../iptables/files/digest-iptables-1.2.9-r4 | 1 + net-firewall/iptables/iptables-1.2.11-r1.ebuild | 151 ------------------ net-firewall/iptables/iptables-1.2.11-r2.ebuild | 168 +++++++++++++++++++++ net-firewall/iptables/iptables-1.2.9-r3.ebuild | 142 ----------------- net-firewall/iptables/iptables-1.2.9-r4.ebuild | 165 ++++++++++++++++++++ 10 files changed, 368 insertions(+), 318 deletions(-) delete mode 100644 net-firewall/iptables/files/digest-iptables-1.2.11-r1 create mode 100644 net-firewall/iptables/files/digest-iptables-1.2.11-r2 delete mode 100644 net-firewall/iptables/files/digest-iptables-1.2.9-r3 create mode 100644 net-firewall/iptables/files/digest-iptables-1.2.9-r4 delete mode 100644 net-firewall/iptables/iptables-1.2.11-r1.ebuild create mode 100644 net-firewall/iptables/iptables-1.2.11-r2.ebuild delete mode 100644 net-firewall/iptables/iptables-1.2.9-r3.ebuild create mode 100644 net-firewall/iptables/iptables-1.2.9-r4.ebuild (limited to 'net-firewall') diff --git a/net-firewall/iptables/ChangeLog b/net-firewall/iptables/ChangeLog index a482e4b6a15e..bff5fe0e11ba 100644 --- a/net-firewall/iptables/ChangeLog +++ b/net-firewall/iptables/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-firewall/iptables # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.34 2004/07/02 10:31:32 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.35 2004/07/03 15:36:32 aliz Exp $ + +*iptables-1.2.9-r4 (03 Jul 2004) +*iptables-1.2.11-r2 (03 Jul 2004) + + 03 Jul 2004; Daniel Ahlberg iptables-1.2.11-r1.ebuild, + iptables-1.2.9-r3.ebuild: + For some reason iptables may decide to compile in the src_install section + too, make sure it compiles against the correct KERNEL_DIR. Closing #55489. 02 Jul 2004; Jeremy Huddleston iptables-1.2.11-r1.ebuild, iptables-1.2.7a-r3.ebuild, diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest index 78a1f4f0a8e3..4aad36fffec2 100644 --- a/net-firewall/iptables/Manifest +++ b/net-firewall/iptables/Manifest @@ -1,40 +1,42 @@ -MD5 8332dc9005723fb5d42a44c7eb5d643d ChangeLog 12063 MD5 3dc5f4c2b8833a4b3aa2fe9c426352fd iptables-1.2.7a-r3.ebuild 1972 -MD5 68481d5e196c5e00c0512688625f0410 iptables-1.2.9-r1.ebuild 3516 +MD5 1ce502debb728a3d6c8010391a4df780 iptables-1.2.9-r4.ebuild 5392 MD5 662217b275d0637dec337290c30528db iptables-1.2.9.ebuild 2797 +MD5 68481d5e196c5e00c0512688625f0410 iptables-1.2.9-r1.ebuild 3516 +MD5 f9c9b9740eaa23ca22b48544d932f2f3 iptables-1.2.11-r2.ebuild 5243 +MD5 8332dc9005723fb5d42a44c7eb5d643d ChangeLog 12063 MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220 -MD5 40a8b7facc92cf4e1fe7992e2bee8041 iptables-1.2.9-r3.ebuild 4716 -MD5 9f4abdf1bed56ddc4081309c2391d36c iptables-1.2.11-r1.ebuild 4655 -MD5 183ec92f9fee7f072d9edb36917b4f9e files/digest-iptables-1.2.7a-r3 68 -MD5 9366ae3d4d34c4dbf665b8539c609dd0 files/digest-iptables-1.2.9 67 -MD5 9366ae3d4d34c4dbf665b8539c609dd0 files/digest-iptables-1.2.9-r1 67 -MD5 9a6203c5e509f5c1fdcb62d9f2da7bb7 files/ip6tables-1.2.9-r1.confd 213 -MD5 7e146122ae2bb424410cb64f54ad0a9b files/ip6tables-1.2.9-r1.init 1795 -MD5 e16ca98d9b770d5e61b3eb760b13b7c7 files/ip6tables.confd 384 +MD5 f876be872ec78bc824f2503059338d8d files/iptables.confd 382 MD5 11b6d4adeda9db7a96bc9c1238320fb5 files/ip6tables.init 2107 -MD5 b4abd6e2518af2b4a14ba14c0392fe02 files/iptables-1.2.7a-hppa.diff 345 -MD5 20f328b3b857860fe333c14a71eb5e20 files/iptables-1.2.9-r1.confd 211 +MD5 1d34d1326df13874bd2f1997f3ee4d59 files/sparc64_limit_fix.patch.bz2 1227 +MD5 9366ae3d4d34c4dbf665b8539c609dd0 files/digest-iptables-1.2.9 67 MD5 521c8e99785dfc3c424a6b7bcdbed140 files/iptables-1.2.9-r1.init 1787 -MD5 f876be872ec78bc824f2503059338d8d files/iptables.confd 382 MD5 3b47fcf66505ee6154949e600a501e32 files/iptables.init 2091 -MD5 1d34d1326df13874bd2f1997f3ee4d59 files/sparc64_limit_fix.patch.bz2 1227 +MD5 9366ae3d4d34c4dbf665b8539c609dd0 files/digest-iptables-1.2.9-r1 67 MD5 9366ae3d4d34c4dbf665b8539c609dd0 files/digest-iptables-1.2.9-r3 67 -MD5 23c4c7ee1b86cd191e7b17b046289c91 files/iptables-1.2.9-hppa.patch.bz2 278 +MD5 9366ae3d4d34c4dbf665b8539c609dd0 files/digest-iptables-1.2.9-r4 67 +MD5 e16ca98d9b770d5e61b3eb760b13b7c7 files/ip6tables.confd 384 MD5 1457a4df1ce1faccfaccc8c7208bc432 files/digest-iptables-1.2.11-r1 68 +MD5 1457a4df1ce1faccfaccc8c7208bc432 files/digest-iptables-1.2.11-r2 68 +MD5 183ec92f9fee7f072d9edb36917b4f9e files/digest-iptables-1.2.7a-r3 68 +MD5 23c4c7ee1b86cd191e7b17b046289c91 files/iptables-1.2.9-hppa.patch.bz2 278 +MD5 9a6203c5e509f5c1fdcb62d9f2da7bb7 files/ip6tables-1.2.9-r1.confd 213 +MD5 b4abd6e2518af2b4a14ba14c0392fe02 files/iptables-1.2.7a-hppa.diff 345 +MD5 20f328b3b857860fe333c14a71eb5e20 files/iptables-1.2.9-r1.confd 211 +MD5 7e146122ae2bb424410cb64f54ad0a9b files/ip6tables-1.2.9-r1.init 1795 MD5 ea3ad4b64a781b66b711cb587d4a718b files/1.2.7a-files/01_all_grsecurity.patch.bz2 1163 MD5 c4f9d5d795f4ab2c221681e55ebac8dd files/1.2.7a-files/02_all_imq.patch.bz2 2936 MD5 0b7b54af1ab69e8e10ddcaab93fd62ff files/1.2.7a-files/03_all_mac_fix.patch.bz2 305 MD5 76d3e579f6be5bc9d4f22f7cdbfd8c71 files/1.2.7a-files/04_all_no_optimize_fix.patch.bz2 549 +MD5 0eacca16bacc2e2d7cc125d3aa65b30d files/1.2.9-files/04_all_install_ipv6_apps.patch.bz2 334 +MD5 1d34d1326df13874bd2f1997f3ee4d59 files/1.2.9-files/sparc64_limit_fix.patch.bz2 1227 MD5 d5afce91314f40a8448cd20a8b585ee5 files/1.2.9-files/01_all_grsecurity.patch.bz2 1224 -MD5 c4f9d5d795f4ab2c221681e55ebac8dd files/1.2.9-files/02_all_imq.patch.bz2 2936 MD5 23c4c7ee1b86cd191e7b17b046289c91 files/1.2.9-files/03_hppa_gentoo.patch.bz2 278 -MD5 0eacca16bacc2e2d7cc125d3aa65b30d files/1.2.9-files/04_all_install_ipv6_apps.patch.bz2 334 -MD5 2599393f05041feef25abb4f204e72cb files/1.2.9-files/05_all_install_all_dev_files.patch.bz2 1056 +MD5 c4f9d5d795f4ab2c221681e55ebac8dd files/1.2.9-files/02_all_imq.patch.bz2 2936 MD5 88d477ca9a41c15b1cc2d5253e371ada files/1.2.9-files/06_all_l7.patch.bz2 4455 -MD5 1d34d1326df13874bd2f1997f3ee4d59 files/1.2.9-files/sparc64_limit_fix.patch.bz2 1227 -MD5 1d104ede1329b4433cd31e2bf734aaaa files/1.2.11-files/grsecurity-1.2.8-iptables.patch.bz2 763 +MD5 2599393f05041feef25abb4f204e72cb files/1.2.9-files/05_all_install_all_dev_files.patch.bz2 1056 +MD5 0eacca16bacc2e2d7cc125d3aa65b30d files/1.2.11-files/install_ipv6_apps.patch.bz2 334 MD5 23c4c7ee1b86cd191e7b17b046289c91 files/1.2.11-files/hppa.patch.bz2 278 +MD5 66834df31d6b9d23cac3f4226a865cb2 files/1.2.11-files/iptables-layer7-0.9.0.patch.bz2 3815 MD5 e501a7bffac71e8c86aa8c62414d1621 files/1.2.11-files/install_all_dev_files.patch.bz2 1041 -MD5 0eacca16bacc2e2d7cc125d3aa65b30d files/1.2.11-files/install_ipv6_apps.patch.bz2 334 MD5 3e4bb17303647ee7a43279f6aa6f0d61 files/1.2.11-files/iptables-1.2.9-imq1.diff.bz2 1420 -MD5 66834df31d6b9d23cac3f4226a865cb2 files/1.2.11-files/iptables-layer7-0.9.0.patch.bz2 3815 +MD5 1d104ede1329b4433cd31e2bf734aaaa files/1.2.11-files/grsecurity-1.2.8-iptables.patch.bz2 763 diff --git a/net-firewall/iptables/files/digest-iptables-1.2.11-r1 b/net-firewall/iptables/files/digest-iptables-1.2.11-r1 deleted file mode 100644 index 5f9f67fb7252..000000000000 --- a/net-firewall/iptables/files/digest-iptables-1.2.11-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 0a5f5f226e41ce408a895bec995e8c05 iptables-1.2.11.tar.bz2 156988 diff --git a/net-firewall/iptables/files/digest-iptables-1.2.11-r2 b/net-firewall/iptables/files/digest-iptables-1.2.11-r2 new file mode 100644 index 000000000000..5f9f67fb7252 --- /dev/null +++ b/net-firewall/iptables/files/digest-iptables-1.2.11-r2 @@ -0,0 +1 @@ +MD5 0a5f5f226e41ce408a895bec995e8c05 iptables-1.2.11.tar.bz2 156988 diff --git a/net-firewall/iptables/files/digest-iptables-1.2.9-r3 b/net-firewall/iptables/files/digest-iptables-1.2.9-r3 deleted file mode 100644 index ef4d9437364b..000000000000 --- a/net-firewall/iptables/files/digest-iptables-1.2.9-r3 +++ /dev/null @@ -1 +0,0 @@ -MD5 8299db6ffbe98496d7f57dbb00f17e7d iptables-1.2.9.tar.bz2 186808 diff --git a/net-firewall/iptables/files/digest-iptables-1.2.9-r4 b/net-firewall/iptables/files/digest-iptables-1.2.9-r4 new file mode 100644 index 000000000000..ef4d9437364b --- /dev/null +++ b/net-firewall/iptables/files/digest-iptables-1.2.9-r4 @@ -0,0 +1 @@ +MD5 8299db6ffbe98496d7f57dbb00f17e7d iptables-1.2.9.tar.bz2 186808 diff --git a/net-firewall/iptables/iptables-1.2.11-r1.ebuild b/net-firewall/iptables/iptables-1.2.11-r1.ebuild deleted file mode 100644 index dcc54d2d13b8..000000000000 --- a/net-firewall/iptables/iptables-1.2.11-r1.ebuild +++ /dev/null @@ -1,151 +0,0 @@ -# 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-r1.ebuild,v 1.2 2004/07/02 10:31:32 eradicator Exp $ - -inherit eutils flag-o-matic - -#extensions versions - -DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools" -HOMEPAGE="http://www.iptables.org/" -SRC_URI="http://www.iptables.org/files/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64" -IUSE="ipv6 static extensions" -DEPEND="virtual/linux-sources" - -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/grsecurity-1.2.8-iptables.patch.bz2 - epatch ${FILESDIR}/${PV}-files/install_ipv6_apps.patch.bz2 - epatch ${FILESDIR}/${PV}-files/install_all_dev_files.patch.bz2 - use hppa && epatch ${FILESDIR}/${PV}-files/hppa.patch.bz2 - - sed -i "s:PF_EXT_SLIB=:PF_EXT_SLIB=stealth :g" extensions/Makefile - - if use extensions; then - epatch ${FILESDIR}/${PV}-files/iptables-1.2.9-imq1.diff.bz2 - epatch ${FILESDIR}/${PV}-files/iptables-layer7-0.9.0.patch.bz2 - - chmod +x extensions/.IMQ-test* - chmod +x extensions/.childlevel-test* - chmod +x extensions/.layer7-test* - - fi -} - -src_compile() { - replace-flags -O0 -O2 - - if [ -z `get-flag O` ]; then - append-flags -O2 - fi - - # prevent it from causing ICMP errors. - # http://bugs.gentoo.org/show_bug.cgi?id=23645 - filter-flags "-fstack-protector" - - # iptables and libraries are now installed to /sbin and /lib, so that - # systems with remote network-mounted /usr filesystems can get their - # network interfaces up and running correctly without /usr. - - use ipv6 || myconf="${myconf} DO_IPV6=0" - use static && myconf="${myconf} NO_SHARED_LIBS=0" - - 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 COPT_FLAGS="${CFLAGS}" ${myconf} \ - PREFIX= \ - 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 COPT_FLAGS="${CFLAGS}" ${myconf} \ - PREFIX= \ - LIBDIR=/lib \ - BINDIR=/sbin \ - MANDIR=/usr/share/man \ - INCDIR=/usr/include \ - KERNEL_DIR=/usr \ - || die - fi -} - -src_install() { - make COPT_FLAGS="${CFLAGS}" ${myconf} \ - PREFIX= \ - DESTDIR=${D} \ - MANDIR=/usr/share/man \ - install || die - make COPT_FLAGS="${CFLAGS}" ${myconf} \ - DESTDIR=${D} \ - PREFIX= \ - LIBDIR=/usr/lib \ - MANDIR=/usr/share/man \ - INCDIR=/usr/include \ - install-devel || die - - dodoc COPYING - dodir /var/lib/iptables ; keepdir /var/lib/iptables - exeinto /etc/init.d - newexe ${FILESDIR}/${PN}-${PV}-r1.init iptables - insinto /etc/conf.d - 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}/${PN/iptables/ip6tables}-${PV}-r1.init ip6tables - insinto /etc/conf.d - newins ${FILESDIR}/${PN/iptables/ip6tables}-${PV}-r1.confd ip6tables - fi -} - -pkg_postinst() { - einfo "This package now includes an initscript which loads and saves" - einfo "rules stored in /var/lib/iptables/rules-save" - use ipv6 >/dev/null && einfo "and /var/lib/ip6tables/rules-save" - einfo "This location can be changed in /etc/conf.d/iptables" - einfo "" - einfo "If you are using the iptables initsscript you should save your" - einfo "rules using the new iptables version before rebooting." - einfo "" - einfo "If you are uprading to a >=2.4.21 kernel you may need to rebuild" - einfo "iptables." - einfo "" - ewarn "!!! ipforwarding is now not a part of the iptables initscripts." - einfo "Until a more permanent solution is implemented adding the following" - einfo "to /etc/conf.d/local.start will enable ipforwarding at bootup:" - einfo " echo \"1\" > /proc/sys/net/ipv4/conf/all/forwarding" - if useq ipv6; then - einfo "and/or" - einfo " echo \"1\" > /proc/sys/net/ipv6/conf/all/forwarding" - einfo "for ipv6." - fi -} diff --git a/net-firewall/iptables/iptables-1.2.11-r2.ebuild b/net-firewall/iptables/iptables-1.2.11-r2.ebuild new file mode 100644 index 000000000000..f460c8034f8c --- /dev/null +++ b/net-firewall/iptables/iptables-1.2.11-r2.ebuild @@ -0,0 +1,168 @@ +# 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-r2.ebuild,v 1.1 2004/07/03 15:36:32 aliz Exp $ + +inherit eutils flag-o-matic + +#extensions versions + +DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools" +HOMEPAGE="http://www.iptables.org/" +SRC_URI="http://www.iptables.org/files/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64" +IUSE="ipv6 static extensions" +DEPEND="virtual/linux-sources" + +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/grsecurity-1.2.8-iptables.patch.bz2 + epatch ${FILESDIR}/${PV}-files/install_ipv6_apps.patch.bz2 + epatch ${FILESDIR}/${PV}-files/install_all_dev_files.patch.bz2 + use hppa && epatch ${FILESDIR}/${PV}-files/hppa.patch.bz2 + + sed -i "s:PF_EXT_SLIB=:PF_EXT_SLIB=stealth :g" extensions/Makefile + + if use extensions; then + epatch ${FILESDIR}/${PV}-files/iptables-1.2.9-imq1.diff.bz2 + epatch ${FILESDIR}/${PV}-files/iptables-layer7-0.9.0.patch.bz2 + + chmod +x extensions/.IMQ-test* + chmod +x extensions/.childlevel-test* + chmod +x extensions/.layer7-test* + + fi +} + +src_compile() { + replace-flags -O0 -O2 + + if [ -z `get-flag O` ]; then + append-flags -O2 + fi + + # prevent it from causing ICMP errors. + # http://bugs.gentoo.org/show_bug.cgi?id=23645 + filter-flags "-fstack-protector" + + # iptables and libraries are now installed to /sbin and /lib, so that + # systems with remote network-mounted /usr filesystems can get their + # network interfaces up and running correctly without /usr. + + use ipv6 || myconf="${myconf} DO_IPV6=0" + use static && myconf="${myconf} NO_SHARED_LIBS=0" + + 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 COPT_FLAGS="${CFLAGS}" ${myconf} \ + PREFIX= \ + 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 COPT_FLAGS="${CFLAGS}" ${myconf} \ + PREFIX= \ + LIBDIR=/lib \ + BINDIR=/sbin \ + MANDIR=/usr/share/man \ + INCDIR=/usr/include \ + KERNEL_DIR=/usr \ + || die + fi +} + +src_install() { + if use extensions; then + make DESTDIR=${D} ${myconf} \ + LIBDIR=/lib \ + MANDIR=/usr/share/man \ + INCDIR=/usr/include \ + KERNEL_DIR=/usr/src/linux \ + install || die "Please check http://cvs.iptables.org/patch-o-matic-ng/updates/ if your kernel needs to be patched for iptables" + + make DESTDIR=${D} ${myconf} \ + LIBDIR=/usr/lib \ + MANDIR=/usr/share/man \ + INCDIR=/usr/include \ + KERNEL_DIR=/usr/src/linux \ + install-devel || die "Please check http://cvs.iptables.org/patch-o-matic-ng/updates/ if your kernel needs to be patched for iptables" + else + make DESTDIR=${D} ${myconf} \ + LIBDIR=/lib \ + MANDIR=/usr/share/man \ + INCDIR=/usr/include \ + KERNEL_DIR=/usr \ + install || die + + make DESTDIR=${D} ${myconf} \ + LIBDIR=/usr/lib \ + MANDIR=/usr/share/man \ + INCDIR=/usr/include \ + KERNEL_DIR=/usr \ + install-devel || die + fi + + dodoc COPYING + dodir /var/lib/iptables ; keepdir /var/lib/iptables + exeinto /etc/init.d + newexe ${FILESDIR}/${PN}-${PV}-r1.init iptables + insinto /etc/conf.d + 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}/${PN/iptables/ip6tables}-${PV}-r1.init ip6tables + insinto /etc/conf.d + newins ${FILESDIR}/${PN/iptables/ip6tables}-${PV}-r1.confd ip6tables + fi +} + +pkg_postinst() { + einfo "This package now includes an initscript which loads and saves" + einfo "rules stored in /var/lib/iptables/rules-save" + use ipv6 >/dev/null && einfo "and /var/lib/ip6tables/rules-save" + einfo "This location can be changed in /etc/conf.d/iptables" + einfo "" + einfo "If you are using the iptables initsscript you should save your" + einfo "rules using the new iptables version before rebooting." + einfo "" + einfo "If you are uprading to a >=2.4.21 kernel you may need to rebuild" + einfo "iptables." + einfo "" + ewarn "!!! ipforwarding is now not a part of the iptables initscripts." + einfo "Until a more permanent solution is implemented adding the following" + einfo "to /etc/conf.d/local.start will enable ipforwarding at bootup:" + einfo " echo \"1\" > /proc/sys/net/ipv4/conf/all/forwarding" + if useq ipv6; then + einfo "and/or" + einfo " echo \"1\" > /proc/sys/net/ipv6/conf/all/forwarding" + einfo "for ipv6." + fi +} diff --git a/net-firewall/iptables/iptables-1.2.9-r3.ebuild b/net-firewall/iptables/iptables-1.2.9-r3.ebuild deleted file mode 100644 index e604c7ad7b03..000000000000 --- a/net-firewall/iptables/iptables-1.2.9-r3.ebuild +++ /dev/null @@ -1,142 +0,0 @@ -# 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-r3.ebuild,v 1.3 2004/07/02 10:31:32 eradicator Exp $ - -inherit eutils flag-o-matic - -DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools" -HOMEPAGE="http://www.iptables.org/" -SRC_URI="http://www.iptables.org/files/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="x86 ppc sparc ~mips alpha arm hppa amd64 ia64" -IUSE="ipv6 static extensions" -DEPEND="virtual/linux-sources" - -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/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}/${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 - - if [ -z `get-flag O` ]; then - append-flags -O2 - fi - - # prevent it from causing ICMP errors. - # http://bugs.gentoo.org/show_bug.cgi?id=23645 - filter-flags "-fstack-protector" - - sed -i -e "s:-O2:${CFLAGS} -Iinclude:g" -e "s:/usr/local::g" -e "s:-Iinclude/::" Makefile -} - -src_compile() { - # iptables and libraries are now installed to /sbin and /lib, so that - # systems with remote network-mounted /usr filesystems can get their - # network interfaces up and running correctly without /usr. - - use ipv6 || myconf="${myconf} DO_IPV6=0" - use static && myconf="${myconf} NO_SHARED_LIBS=0" - - 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() { - make DESTDIR=${D} MANDIR=/usr/share/man ${myconf} install || die - make DESTDIR=${D} ${myconf} \ - LIBDIR=/usr/lib \ - MANDIR=/usr/share/man \ - INCDIR=/usr/include \ - install-devel || die - - dodoc COPYING - dodir /var/lib/iptables ; keepdir /var/lib/iptables - exeinto /etc/init.d - newexe ${FILESDIR}/${PN}-${PV}-r1.init iptables - insinto /etc/conf.d - 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}/${PN/iptables/ip6tables}-${PV}-r1.init ip6tables - insinto /etc/conf.d - newins ${FILESDIR}/${PN/iptables/ip6tables}-${PV}-r1.confd ip6tables - fi -} - -pkg_postinst() { - einfo "This package now includes an initscript which loads and saves" - einfo "rules stored in /var/lib/iptables/rules-save" - use ipv6 >/dev/null && einfo "and /var/lib/ip6tables/rules-save" - einfo "This location can be changed in /etc/conf.d/iptables" - einfo "" - einfo "If you are using the iptables initsscript you should save your" - einfo "rules using the new iptables version before rebooting." - einfo "" - einfo "If you are uprading to a >=2.4.21 kernel you may need to rebuild" - einfo "iptables." - einfo "" - ewarn "!!! ipforwarding is now not a part of the iptables initscripts." - einfo "Until a more permanent solution is implemented adding the following" - einfo "to /etc/conf.d/local.start will enable ipforwarding at bootup:" - einfo " echo \"1\" > /proc/sys/net/ipv4/conf/all/forwarding" - if useq ipv6; then - einfo "and/or" - einfo " echo \"1\" > /proc/sys/net/ipv6/conf/all/forwarding" - einfo "for ipv6." - fi -} diff --git a/net-firewall/iptables/iptables-1.2.9-r4.ebuild b/net-firewall/iptables/iptables-1.2.9-r4.ebuild new file mode 100644 index 000000000000..bcaffe0874b9 --- /dev/null +++ b/net-firewall/iptables/iptables-1.2.9-r4.ebuild @@ -0,0 +1,165 @@ +# 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-r4.ebuild,v 1.1 2004/07/03 15:36:32 aliz Exp $ + +inherit eutils flag-o-matic + +DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools" +HOMEPAGE="http://www.iptables.org/" +SRC_URI="http://www.iptables.org/files/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="x86 ppc sparc ~mips alpha arm hppa amd64 ia64" +IUSE="ipv6 static extensions" +DEPEND="virtual/linux-sources" + +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/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}/${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 + + if [ -z `get-flag O` ]; then + append-flags -O2 + fi + + # prevent it from causing ICMP errors. + # http://bugs.gentoo.org/show_bug.cgi?id=23645 + filter-flags "-fstack-protector" + + sed -i -e "s:-O2:${CFLAGS} -Iinclude:g" -e "s:/usr/local::g" -e "s:-Iinclude/::" Makefile +} + +src_compile() { + # iptables and libraries are now installed to /sbin and /lib, so that + # systems with remote network-mounted /usr filesystems can get their + # network interfaces up and running correctly without /usr. + + use ipv6 || myconf="${myconf} DO_IPV6=0" + use static && myconf="${myconf} NO_SHARED_LIBS=0" + + 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() { + if use extensions; then + make DESTDIR=${D} ${myconf} \ + LIBDIR=/lib \ + MANDIR=/usr/share/man \ + INCDIR=/usr/include \ + KERNEL_DIR=/usr/src/linux \ + install || die "Please check http://cvs.iptables.org/patch-o-matic-ng/updates/ if your kernel needs to be patched for iptables" + + make DESTDIR=${D} ${myconf} \ + LIBDIR=/usr/lib \ + MANDIR=/usr/share/man \ + INCDIR=/usr/include \ + KERNEL_DIR=/usr/src/linux \ + install-devel || die "Please check http://cvs.iptables.org/patch-o-matic-ng/updates/ if your kernel needs to be patched for iptables" + else + make DESTDIR=${D} ${myconf} \ + LIBDIR=/lib \ + MANDIR=/usr/share/man \ + INCDIR=/usr/include \ + KERNEL_DIR=/usr \ + install || die + + make DESTDIR=${D} ${myconf} \ + LIBDIR=/usr/lib \ + MANDIR=/usr/share/man \ + INCDIR=/usr/include \ + KERNEL_DIR=/usr \ + install-devel || die + fi + + dodoc COPYING + dodir /var/lib/iptables ; keepdir /var/lib/iptables + exeinto /etc/init.d + newexe ${FILESDIR}/${PN}-${PV}-r1.init iptables + insinto /etc/conf.d + 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}/${PN/iptables/ip6tables}-${PV}-r1.init ip6tables + insinto /etc/conf.d + newins ${FILESDIR}/${PN/iptables/ip6tables}-${PV}-r1.confd ip6tables + fi +} + +pkg_postinst() { + einfo "This package now includes an initscript which loads and saves" + einfo "rules stored in /var/lib/iptables/rules-save" + use ipv6 >/dev/null && einfo "and /var/lib/ip6tables/rules-save" + einfo "This location can be changed in /etc/conf.d/iptables" + einfo "" + einfo "If you are using the iptables initsscript you should save your" + einfo "rules using the new iptables version before rebooting." + einfo "" + einfo "If you are uprading to a >=2.4.21 kernel you may need to rebuild" + einfo "iptables." + einfo "" + ewarn "!!! ipforwarding is now not a part of the iptables initscripts." + einfo "Until a more permanent solution is implemented adding the following" + einfo "to /etc/conf.d/local.start will enable ipforwarding at bootup:" + einfo " echo \"1\" > /proc/sys/net/ipv4/conf/all/forwarding" + if useq ipv6; then + einfo "and/or" + einfo " echo \"1\" > /proc/sys/net/ipv6/conf/all/forwarding" + einfo "for ipv6." + fi +} -- cgit v1.2.3-65-gdbad