From a20ee461897ce0e52562f92e71647377386bacc7 Mon Sep 17 00:00:00 2001 From: Cédric Krier Date: Wed, 19 Mar 2008 20:33:00 +0000 Subject: Fix kernel version and DEPEND for bug #213081 (Portage version: 2.1.4.4) --- net-firewall/conntrack-tools/ChangeLog | 8 ++- .../conntrack-tools-0.9.6-r1.ebuild | 62 ++++++++++++++++++++++ .../conntrack-tools/conntrack-tools-0.9.6.ebuild | 62 ---------------------- 3 files changed, 69 insertions(+), 63 deletions(-) create mode 100644 net-firewall/conntrack-tools/conntrack-tools-0.9.6-r1.ebuild delete mode 100644 net-firewall/conntrack-tools/conntrack-tools-0.9.6.ebuild diff --git a/net-firewall/conntrack-tools/ChangeLog b/net-firewall/conntrack-tools/ChangeLog index 088101ccf960..9fd3ae819390 100644 --- a/net-firewall/conntrack-tools/ChangeLog +++ b/net-firewall/conntrack-tools/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-firewall/conntrack-tools # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack-tools/ChangeLog,v 1.8 2008/03/19 13:05:06 cedk Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack-tools/ChangeLog,v 1.9 2008/03/19 20:33:00 cedk Exp $ + +*conntrack-tools-0.9.6-r1 (19 Mar 2008) + + 19 Mar 2008; Cédric Krier + -conntrack-tools-0.9.6.ebuild, +conntrack-tools-0.9.6-r1.ebuild: + Fix kernel version and DEPEND for bug #213081 19 Mar 2008; Cédric Krier -files/conntrack-tools-0.9.6-Werror.patch, conntrack-tools-0.9.6.ebuild: diff --git a/net-firewall/conntrack-tools/conntrack-tools-0.9.6-r1.ebuild b/net-firewall/conntrack-tools/conntrack-tools-0.9.6-r1.ebuild new file mode 100644 index 000000000000..1cd774dbd636 --- /dev/null +++ b/net-firewall/conntrack-tools/conntrack-tools-0.9.6-r1.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack-tools/conntrack-tools-0.9.6-r1.ebuild,v 1.1 2008/03/19 20:33:00 cedk Exp $ + +inherit linux-info + +DESCRIPTION="Connection tracking userspace tools" +HOMEPAGE="http://people.netfilter.org/pablo/conntrack-tools/" +SRC_URI="http://www.netfilter.org/projects/conntrack-tools/files/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~sparc ~x86" +IUSE="" + +DEPEND=">=net-libs/libnfnetlink-0.0.33 + >=net-libs/libnetfilter_conntrack-0.0.89" +RDEPEND="${DEPEND} + !net-firewall/conntrack" + +src_unpack() { + unpack ${A} + cd "${S}" + + sed -i -e '/-Werror \\/d' {.,src,extensions}/Makefile.in +} + +pkg_setup() { + linux-info_pkg_setup + + if kernel_is lt 2 6 18 ; then + die "${PN} requires at least 2.6.18 kernel version" + fi + + #netfilter core team has changed some option names with kernel 2.6.20 + if kernel_is lt 2 6 20 ; then + CONFIG_CHECK="IP_NF_CONNTRACK_NETLINK" + else + CONFIG_CHECK="NF_CT_NETLINK" + fi + CONFIG_CHECK="${CONFIG_CHECK} NF_CONNTRACK NF_CONNTRACK_IPV4 + NETFILTER_NETLINK NF_CONNTRACK_EVENTS" + + check_extra_config +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + + newinitd "${FILESDIR}/conntrackd.initd" conntrackd + newconfd "${FILESDIR}/conntrackd.confd" conntrackd + + insinto /etc/conntrackd + doins doc/stats/conntrackd.conf + + dodoc AUTHORS ChangeLog + + # Clean unnecessary .svn directories + find doc -type d -name ".svn" -print0 | xargs -0 -n1 rm -R + insinto /usr/share/doc/${PF} + doins -r doc +} diff --git a/net-firewall/conntrack-tools/conntrack-tools-0.9.6.ebuild b/net-firewall/conntrack-tools/conntrack-tools-0.9.6.ebuild deleted file mode 100644 index a1bc169c6e68..000000000000 --- a/net-firewall/conntrack-tools/conntrack-tools-0.9.6.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack-tools/conntrack-tools-0.9.6.ebuild,v 1.3 2008/03/19 13:05:06 cedk Exp $ - -inherit linux-info - -DESCRIPTION="Connection tracking userspace tools" -HOMEPAGE="http://people.netfilter.org/pablo/conntrack-tools/" -SRC_URI="http://www.netfilter.org/projects/conntrack-tools/files/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~sparc ~x86" -IUSE="" - -DEPEND=">=net-libs/libnfnetlink-0.0.32 - >=net-libs/libnetfilter_conntrack-0.0.89" -RDEPEND="${DEPEND} - !net-firewall/conntrack" - -src_unpack() { - unpack ${A} - cd "${S}" - - sed -i -e '/-Werror \\/d' {.,src,extensions}/Makefile.in -} - -pkg_setup() { - linux-info_pkg_setup - - if kernel_is lt 2 6 14 ; then - die "${PN} requires at least 2.6.14 kernel version" - fi - - #netfilter core team has changed some option names with kernel 2.6.20 - if kernel_is lt 2 6 20 ; then - CONFIG_CHECK="IP_NF_CONNTRACK_NETLINK" - else - CONFIG_CHECK="NF_CT_NETLINK" - fi - CONFIG_CHECK="${CONFIG_CHECK} NF_CONNTRACK NF_CONNTRACK_IPV4 - NETFILTER_NETLINK NF_CONNTRACK_EVENTS" - - check_extra_config -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - newinitd "${FILESDIR}/conntrackd.initd" conntrackd - newconfd "${FILESDIR}/conntrackd.confd" conntrackd - - insinto /etc/conntrackd - doins doc/stats/conntrackd.conf - - dodoc AUTHORS ChangeLog - - # Clean unnecessary .svn directories - find doc -type d -name ".svn" -print0 | xargs -0 -n1 rm -R - insinto /usr/share/doc/${PF} - doins -r doc -} -- cgit v1.2.3-65-gdbad