From bce3ffc5a634e4246a08a4cd3f2dad9b8acded54 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 Package-Manager: portage-2.1.4.4 --- net-firewall/conntrack-tools/ChangeLog | 8 ++- net-firewall/conntrack-tools/Manifest | 4 +- .../conntrack-tools-0.9.6-r1.ebuild | 62 ++++++++++++++++++++++ .../conntrack-tools/conntrack-tools-0.9.6.ebuild | 62 ---------------------- 4 files changed, 71 insertions(+), 65 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 (limited to 'net-firewall') 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/Manifest b/net-firewall/conntrack-tools/Manifest index a77ced616083..7c88860813b9 100644 --- a/net-firewall/conntrack-tools/Manifest +++ b/net-firewall/conntrack-tools/Manifest @@ -3,6 +3,6 @@ AUX conntrackd.initd 728 RMD160 02179d3615234779aa370759926c0d3eb9764a68 SHA1 49 DIST conntrack-tools-0.9.5.tar.bz2 342826 RMD160 8bb9c80fcc9dea5d5d6b85310a78595aab81f597 SHA1 c632dd553f34502efa2e55d65a281f63a7160037 SHA256 e0ec7e6ea838e694b7b2fcdf9fa39f7de4404786ea91e76a5a4e5fd4f000a0cd DIST conntrack-tools-0.9.6.tar.bz2 364694 RMD160 9cc9b0354dceffc1496b93b1946c3fe956aded6b SHA1 7580e5a233be54480547bef9ae76f25282ee03ee SHA256 be75ecf9b6ca9f3562552332e623e2bbfb8a2210e81df0f49ad320353c4b7bf7 EBUILD conntrack-tools-0.9.5.ebuild 1304 RMD160 571d3bc59592112599eb6f8d0090ac8848e141d6 SHA1 e0143b837c89e179c61d55c559ad53125582c8f5 SHA256 deda35362f8723ab6fa78890777559383e4c6a7862736530cf1c01bcba20a6a0 -EBUILD conntrack-tools-0.9.6.ebuild 1598 RMD160 66fc1c3b65cae08e478c182b594989226036944f SHA1 62181a4639e30551a43543c30aa4dc843533efa8 SHA256 ffacd1737501b369ed4832621b4bf0aa7acefc71311e9a1c97ca1c23711ce317 -MISC ChangeLog 1381 RMD160 52ca6a4427a760c93295ae93c500573b617bc5ec SHA1 431f67cfdfb43b82bb559f3b58fa93878e37cc8a SHA256 5c0e8ed67e307ed691fdd146a2bbdbbde3dd413efe02184607dc2cd37f979e5f +EBUILD conntrack-tools-0.9.6-r1.ebuild 1601 RMD160 e4ce6dd721beea5b42f51d89a5ef12db38328601 SHA1 c0132af74ce2cb6f10ad1a16ddbb8a735f14b971 SHA256 72f8946ab95db69ca9d2810fadcc73a8e16d6e3bb3f880a957cf453585a1767c +MISC ChangeLog 1585 RMD160 7398d4196cfab495e1a47420602de46fedef64f7 SHA1 dfe886f159cefe0117b8e9af5fdabb074a9f9747 SHA256 100c3ed2f5d673e633057a8565cca6a2d627ba875e609691078e510b6550c312 MISC metadata.xml 453 RMD160 c711e2b9c00f47256f72e44eb70a14ee38ebc6a8 SHA1 68cd8e4d747510d6a01865c0fa17d5df604aaf83 SHA256 6a1b60775d924781e96bc2ffd94ffb47c5c041e2b9aba10b1a3e8239cb855f91 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