* [gentoo-commits] gentoo-x86 commit in net-firewall/iptables: ChangeLog iptables-1.4.0.ebuild
@ 2007-12-24 11:25 Mike Frysinger (vapier)
0 siblings, 0 replies; 3+ messages in thread
From: Mike Frysinger (vapier) @ 2007-12-24 11:25 UTC (permalink / raw
To: gentoo-commits
vapier 07/12/24 11:25:46
Modified: ChangeLog
Added: iptables-1.4.0.ebuild
Log:
Version bump #203161 by Nebojsa Trpkovic.
(Portage version: 2.1.4_rc11)
Revision Changes Path
1.154 net-firewall/iptables/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/iptables/ChangeLog?rev=1.154&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/iptables/ChangeLog?rev=1.154&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/iptables/ChangeLog?r1=1.153&r2=1.154
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- ChangeLog 24 Dec 2007 09:43:38 -0000 1.153
+++ ChangeLog 24 Dec 2007 11:25:46 -0000 1.154
@@ -1,6 +1,11 @@
# ChangeLog for net-firewall/iptables
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.153 2007/12/24 09:43:38 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.154 2007/12/24 11:25:46 vapier Exp $
+
+*iptables-1.4.0 (24 Dec 2007)
+
+ 24 Dec 2007; Mike Frysinger <vapier@gentoo.org> +iptables-1.4.0.ebuild:
+ Version bump #203161 by Nebojsa Trpkovic.
*iptables-1.3.8-r3 (24 Dec 2007)
1.1 net-firewall/iptables/iptables-1.4.0.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/iptables/iptables-1.4.0.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/iptables/iptables-1.4.0.ebuild?rev=1.1&content-type=text/plain
Index: iptables-1.4.0.ebuild
===================================================================
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.0.ebuild,v 1.1 2007/12/24 11:25:46 vapier Exp $
inherit eutils toolchain-funcs linux-info
L7_PV=2.17
L7_P=netfilter-layer7-v${L7_PV}
IMQ_PATCH=iptables-1.3.6-imq.diff
DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
HOMEPAGE="http://www.iptables.org/ http://www.linuximq.net/ http://l7-filter.sf.net/"
SRC_URI="http://iptables.org/projects/iptables/files/${P}.tar.bz2
imq? ( http://www.linuximq.net/patchs/${IMQ_PATCH} )
l7filter? ( mirror://sourceforge/l7-filter/${L7_P}.tar.gz )"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
IUSE="extensions imq ipv6 l7filter static"
DEPEND="virtual/os-headers
l7filter? ( virtual/linux-sources )
imq? ( virtual/linux-sources )"
RDEPEND=""
pkg_setup() {
if use l7filter || use imq || use extensions ; then
ewarn "WARNING: 3rd party extensions has been enabled."
ewarn "This means that iptables will use your currently installed"
ewarn "kernel in ${KERNEL_DIR} as headers for iptables."
ewarn
if use extensions ; then
ewarn "You may have to patch your kernel to allow iptables to build."
ewarn "Please check http://ftp.netfilter.org/pub/patch-o-matic-ng/snapshot/ for patches"
ewarn "for your kernel."
ewarn
fi
linux-info_pkg_setup
fi
if kernel_is ge 2 6 20
then
L7FILE=${KERNEL_DIR}/net/netfilter/xt_layer7.c
else
L7FILE=${KERNEL_DIR}/net/ipv4/netfilter/ipt_layer7.c
fi
if use l7filter && \
[ ! -f "${L7FILE}" ]; then
die "For layer 7 support emerge net-misc/l7-filter-${L7_PV} before this"
fi
if use imq && \
[ ! -f "${KERNEL_DIR}/net/ipv4/netfilter/ipt_IMQ.c" ]; then
die "For IMQ support add a patch from http://www.linuximq.net/patches.html to your kernel"
fi
}
src_unpack() {
unpack ${P}.tar.bz2
if use l7filter
then
unpack ${L7_P}.tar.gz
fi
cd "${S}"
# this provide's grsec's stealth match
EPATCH_OPTS="-p0" \
epatch "${FILESDIR}"/1.3.1-files/grsecurity-1.2.8-iptables.patch-1.3.1
sed -i \
-e "s/PF_EXT_SLIB:=/PF_EXT_SLIB:=stealth /g" \
extensions/Makefile || die "failed to enable stealth extension"
local check base=${PORTAGE_CONFIGROOT}/etc/portage/patches
for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
EPATCH_SOURCE=${base}/${CTARGET}/${check}
[[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check}
[[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check}
if [[ -d ${EPATCH_SOURCE} ]] ; then
EPATCH_SUFFIX="patch"
EPATCH_FORCE="yes" \
EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
epatch
break
fi
done
if use imq ; then
EPATCH_OPTS="-p1" epatch "${DISTDIR}"/${IMQ_PATCH}
for OA in extensions/.IMQ-test extensions/.IMQ-test6 ; do
mv ${OA} ${OA}.orig
tr '\015' '\012' < ${OA}.orig > ${OA}
rm ${OA}.orig
done
chmod +x extensions/.IMQ-test*
fi
if use l7filter ; then
#yes choosing 2.6.20 was deliberate - upstream mistake possibly
if kernel_is ge 2 6 20
then
L7_PATCH=iptables-1.3-for-kernel-2.6.20forward-layer7-${L7_PV}.patch
else
L7_PATCH=iptables-1.3-for-kernel-pre2.6.20-layer7-${L7_PV}.patch
fi
EPATCH_OPTS="-p1" epatch "${WORKDIR}"/${L7_P}/${L7_PATCH}
chmod +x extensions/.layer7-test*
fi
if ! use extensions ; then
cat <<-EOF > "${S}"/include/linux/compiler.h
#define __user
EOF
fi
}
src_defs() {
# these are used in both of src_compile and src_install
myconf=""
myconf="${myconf} PREFIX="
myconf="${myconf} LIBDIR=/$(get_libdir)"
myconf="${myconf} BINDIR=/sbin"
myconf="${myconf} MANDIR=/usr/share/man"
myconf="${myconf} INCDIR=/usr/include"
# 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"
export myconf
if ! use l7filter && ! use imq && ! use extensions ; then
export KERNEL_DIR=$(
# ugh -- iptables has scripts which check for the existence of
# files so we need to give it the right path to our toolchains
# include dir where the linux headers are.
# FYI IPTABLES: YOU FAIL
echo '#include <linux/limits.h>' | $(tc-getCPP) - | grep -o '/[^"]*linux/limits.h' | sed s:/include/linux/limits.h::
)
export KBUILD_OUTPUT=${KERNEL_DIR}
diemsg="failure"
else
diemsg="failure - with l7filter and/or imq patch and/or other miscellanious patches added"
fi
export diemsg
}
src_compile() {
src_defs
emake \
COPT_FLAGS="${CFLAGS}" ${myconf} \
CC="$(tc-getCC)" \
|| die "${diemsg}"
}
src_install() {
src_defs
emake ${myconf} \
DESTDIR="${D}" \
KERNEL_DIR="${KERNEL_DIR}" \
install install-devel || die "${diemsg}"
dodir /usr/$(get_libdir)
mv -f "${D}"/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)
keepdir /var/lib/iptables
newinitd "${FILESDIR}"/${PN}-1.3.2.init iptables
newconfd "${FILESDIR}"/${PN}-1.3.2.confd iptables
if use ipv6 ; then
keepdir /var/lib/ip6tables
newinitd "${FILESDIR}"/iptables-1.3.2.init ip6tables
newconfd "${FILESDIR}"/ip6tables-1.3.2.confd ip6tables
fi
}
pkg_postinst() {
elog "This package now includes an initscript which loads and saves"
elog "rules stored in /var/lib/iptables/rules-save"
use ipv6 && elog "and /var/lib/ip6tables/rules-save"
elog "This location can be changed in /etc/conf.d/iptables"
elog
elog "If you are using the iptables initsscript you should save your"
elog "rules using the new iptables version before rebooting."
elog
elog "If you are upgrading to a >=2.4.21 kernel you may need to rebuild"
elog "iptables."
elog
ewarn "!!! ipforwarding is not a part of the iptables initscripts."
ewarn
ewarn "To enable ipforwarding at bootup:"
ewarn "/etc/sysctl.conf and set net.ipv4.ip_forward = 1"
if use ipv6 ; then
ewarn "and/or"
ewarn " net.ipv6.ip_forward = 1"
ewarn "for ipv6."
fi
if has_version '=net-firewall/iptables-1.2*' ; then
ewarn
ewarn "When upgrading from iptables-1.2.x, you may be unable to remove"
ewarn "rules added with iptables-1.2.x. This is a known issue, please see:"
ewarn "http://bugs.gentoo.org/92535"
fi
}
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-firewall/iptables: ChangeLog iptables-1.4.0.ebuild
@ 2007-12-24 11:53 Peter Volkov (pva)
0 siblings, 0 replies; 3+ messages in thread
From: Peter Volkov (pva) @ 2007-12-24 11:53 UTC (permalink / raw
To: gentoo-commits
pva 07/12/24 11:53:40
Modified: ChangeLog iptables-1.4.0.ebuild
Log:
Updated l7-filter patches for iptables-1.4.x.
(Portage version: 2.1.3.19)
Revision Changes Path
1.155 net-firewall/iptables/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/iptables/ChangeLog?rev=1.155&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/iptables/ChangeLog?rev=1.155&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/iptables/ChangeLog?r1=1.154&r2=1.155
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- ChangeLog 24 Dec 2007 11:25:46 -0000 1.154
+++ ChangeLog 24 Dec 2007 11:53:40 -0000 1.155
@@ -1,6 +1,9 @@
# ChangeLog for net-firewall/iptables
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.154 2007/12/24 11:25:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.155 2007/12/24 11:53:40 pva Exp $
+
+ 24 Dec 2007; <pva@gentoo.org> iptables-1.4.0.ebuild:
+ Updated l7-filter patches for iptables-1.4.x.
*iptables-1.4.0 (24 Dec 2007)
1.2 net-firewall/iptables/iptables-1.4.0.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/iptables/iptables-1.4.0.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/iptables/iptables-1.4.0.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/iptables/iptables-1.4.0.ebuild?r1=1.1&r2=1.2
Index: iptables-1.4.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.0.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- iptables-1.4.0.ebuild 24 Dec 2007 11:25:46 -0000 1.1
+++ iptables-1.4.0.ebuild 24 Dec 2007 11:53:40 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.0.ebuild,v 1.1 2007/12/24 11:25:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.0.ebuild,v 1.2 2007/12/24 11:53:40 pva Exp $
inherit eutils toolchain-funcs linux-info
@@ -97,9 +97,13 @@
#yes choosing 2.6.20 was deliberate - upstream mistake possibly
if kernel_is ge 2 6 20
then
- L7_PATCH=iptables-1.3-for-kernel-2.6.20forward-layer7-${L7_PV}.patch
+ L7_PATCH=iptables-1.4-for-kernel-2.6.20forward-layer7-${L7_PV}.patch
else
- L7_PATCH=iptables-1.3-for-kernel-pre2.6.20-layer7-${L7_PV}.patch
+ eerror "Currently there is no l7-filter patch available for this"
+ eerror "kernel iptables-1.4 and kernel version pre 2.6.20."
+ eerror "If you need to compile iptables 1.4.x against Linux 2.6.19.x"
+ eerror "or earlier, with l7-filter patch, please, report upstream."
+ die "No patch available."
fi
EPATCH_OPTS="-p1" epatch "${WORKDIR}"/${L7_P}/${L7_PATCH}
chmod +x extensions/.layer7-test*
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-firewall/iptables: ChangeLog iptables-1.4.0.ebuild
@ 2007-12-27 21:48 Mike Frysinger (vapier)
0 siblings, 0 replies; 3+ messages in thread
From: Mike Frysinger (vapier) @ 2007-12-27 21:48 UTC (permalink / raw
To: gentoo-commits
vapier 07/12/27 21:48:29
Modified: ChangeLog iptables-1.4.0.ebuild
Log:
Punt USE=imq. Use user-custom patch dir in /etc/.
(Portage version: 2.1.4_rc11)
Revision Changes Path
1.156 net-firewall/iptables/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/iptables/ChangeLog?rev=1.156&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/iptables/ChangeLog?rev=1.156&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/iptables/ChangeLog?r1=1.155&r2=1.156
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- ChangeLog 24 Dec 2007 11:53:40 -0000 1.155
+++ ChangeLog 27 Dec 2007 21:48:28 -0000 1.156
@@ -1,6 +1,9 @@
# ChangeLog for net-firewall/iptables
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.155 2007/12/24 11:53:40 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.156 2007/12/27 21:48:28 vapier Exp $
+
+ 27 Dec 2007; Mike Frysinger <vapier@gentoo.org> iptables-1.4.0.ebuild:
+ Punt USE=imq. Use user-custom patch dir in /etc/.
24 Dec 2007; <pva@gentoo.org> iptables-1.4.0.ebuild:
Updated l7-filter patches for iptables-1.4.x.
1.3 net-firewall/iptables/iptables-1.4.0.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/iptables/iptables-1.4.0.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/iptables/iptables-1.4.0.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/iptables/iptables-1.4.0.ebuild?r1=1.2&r2=1.3
Index: iptables-1.4.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.0.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- iptables-1.4.0.ebuild 24 Dec 2007 11:53:40 -0000 1.2
+++ iptables-1.4.0.ebuild 27 Dec 2007 21:48:28 -0000 1.3
@@ -1,31 +1,28 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.0.ebuild,v 1.2 2007/12/24 11:53:40 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.0.ebuild,v 1.3 2007/12/27 21:48:28 vapier Exp $
inherit eutils toolchain-funcs linux-info
L7_PV=2.17
L7_P=netfilter-layer7-v${L7_PV}
-IMQ_PATCH=iptables-1.3.6-imq.diff
DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
-HOMEPAGE="http://www.iptables.org/ http://www.linuximq.net/ http://l7-filter.sf.net/"
+HOMEPAGE="http://www.iptables.org/ http://l7-filter.sf.net/"
SRC_URI="http://iptables.org/projects/iptables/files/${P}.tar.bz2
- imq? ( http://www.linuximq.net/patchs/${IMQ_PATCH} )
l7filter? ( mirror://sourceforge/l7-filter/${L7_P}.tar.gz )"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="extensions imq ipv6 l7filter static"
+IUSE="extensions ipv6 l7filter static"
DEPEND="virtual/os-headers
- l7filter? ( virtual/linux-sources )
- imq? ( virtual/linux-sources )"
+ l7filter? ( virtual/linux-sources )"
RDEPEND=""
pkg_setup() {
- if use l7filter || use imq || use extensions ; then
+ if use l7filter || use extensions ; then
ewarn "WARNING: 3rd party extensions has been enabled."
ewarn "This means that iptables will use your currently installed"
ewarn "kernel in ${KERNEL_DIR} as headers for iptables."
@@ -49,10 +46,6 @@
[ ! -f "${L7FILE}" ]; then
die "For layer 7 support emerge net-misc/l7-filter-${L7_PV} before this"
fi
- if use imq && \
- [ ! -f "${KERNEL_DIR}/net/ipv4/netfilter/ipt_IMQ.c" ]; then
- die "For IMQ support add a patch from http://www.linuximq.net/patches.html to your kernel"
- fi
}
src_unpack() {
@@ -84,15 +77,6 @@
fi
done
- if use imq ; then
- EPATCH_OPTS="-p1" epatch "${DISTDIR}"/${IMQ_PATCH}
- for OA in extensions/.IMQ-test extensions/.IMQ-test6 ; do
- mv ${OA} ${OA}.orig
- tr '\015' '\012' < ${OA}.orig > ${OA}
- rm ${OA}.orig
- done
- chmod +x extensions/.IMQ-test*
- fi
if use l7filter ; then
#yes choosing 2.6.20 was deliberate - upstream mistake possibly
if kernel_is ge 2 6 20
@@ -130,7 +114,7 @@
use ipv6 || myconf="${myconf} DO_IPV6=0"
use static && myconf="${myconf} NO_SHARED_LIBS=0"
export myconf
- if ! use l7filter && ! use imq && ! use extensions ; then
+ if ! use l7filter && ! use extensions ; then
export KERNEL_DIR=$(
# ugh -- iptables has scripts which check for the existence of
# files so we need to give it the right path to our toolchains
@@ -141,7 +125,7 @@
export KBUILD_OUTPUT=${KERNEL_DIR}
diemsg="failure"
else
- diemsg="failure - with l7filter and/or imq patch and/or other miscellanious patches added"
+ diemsg="failure - with l7filter and/or other miscellanious patches added"
fi
export diemsg
}
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2007-12-27 21:48 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-12-24 11:25 [gentoo-commits] gentoo-x86 commit in net-firewall/iptables: ChangeLog iptables-1.4.0.ebuild Mike Frysinger (vapier)
-- strict thread matches above, loose matches on Subject: below --
2007-12-24 11:53 Peter Volkov (pva)
2007-12-27 21:48 Mike Frysinger (vapier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox