diff options
author | Jeroen Roovers <jer@gentoo.org> | 2014-03-26 13:46:37 +0000 |
---|---|---|
committer | Jeroen Roovers <jer@gentoo.org> | 2014-03-26 13:46:37 +0000 |
commit | aa4cea92f197f72e2f5d269ecea586947debd1d6 (patch) | |
tree | 5d39f1c5d2f61bc8ca0ee996ea3c7178bd4157a8 /net-firewall/conntrack-tools | |
parent | Version bump. (diff) | |
download | gentoo-2-aa4cea92f197f72e2f5d269ecea586947debd1d6.tar.gz gentoo-2-aa4cea92f197f72e2f5d269ecea586947debd1d6.tar.bz2 gentoo-2-aa4cea92f197f72e2f5d269ecea586947debd1d6.zip |
Old.
(Portage version: 2.2.9-r1/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'net-firewall/conntrack-tools')
10 files changed, 8 insertions, 497 deletions
diff --git a/net-firewall/conntrack-tools/ChangeLog b/net-firewall/conntrack-tools/ChangeLog index 3b08613abfd6..9db48330ad86 100644 --- a/net-firewall/conntrack-tools/ChangeLog +++ b/net-firewall/conntrack-tools/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-firewall/conntrack-tools # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack-tools/ChangeLog,v 1.69 2014/03/26 07:56:40 wschlich Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack-tools/ChangeLog,v 1.70 2014/03/26 13:46:36 jer Exp $ + + 26 Mar 2014; Jeroen Roovers <jer@gentoo.org> -conntrack-tools-0.9.14.ebuild, + -conntrack-tools-1.2.2.ebuild, -conntrack-tools-1.2.2-r1.ebuild, + -conntrack-tools-1.4.1.ebuild, -files/conntrack-tools-0.9.14-include.patch, + -files/conntrack-tools-1.4.1-version.patch, -files/conntrackd.confd-r1, + -files/conntrackd.initd-r1, -files/conntrackd.initd-r2: + Old. 26 Mar 2014; Wolfram Schlich <wschlich@gentoo.org> metadata.xml: removed myself from metadata.xml diff --git a/net-firewall/conntrack-tools/conntrack-tools-0.9.14.ebuild b/net-firewall/conntrack-tools/conntrack-tools-0.9.14.ebuild deleted file mode 100644 index e41b1b58a995..000000000000 --- a/net-firewall/conntrack-tools/conntrack-tools-0.9.14.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2013 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.14.ebuild,v 1.9 2013/04/25 14:14:01 jer Exp $ - -EAPI="2" -inherit eutils linux-info - -DESCRIPTION="Connection tracking userspace tools" -HOMEPAGE="http://conntrack-tools.netfilter.org" -SRC_URI="http://www.netfilter.org/projects/conntrack-tools/files/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 hppa x86" -IUSE="" - -RDEPEND=" - >=net-libs/libnfnetlink-1.0.0 - >=net-libs/libnetfilter_conntrack-0.0.101 - !net-firewall/conntrack" -DEPEND="${RDEPEND} - virtual/pkgconfig - sys-devel/bison - sys-devel/flex" - -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 - ~NETFILTER_NETLINK ~NF_CONNTRACK_EVENTS" - - check_extra_config - - linux_config_exists || \ - linux_chkconfig_present "NF_CONNTRACK_IPV4" || \ - linux_chkconfig_present "NF_CONNTRACK_IPV6" || \ - ewarn "CONFIG_NF_CONNTRACK_IPV4 or CONFIG_NF_CONNTRACK_IPV6 " \ - "are not set when one at least should be." -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-include.patch -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - newinitd "${FILESDIR}/conntrackd.initd-r1" conntrackd || die - newconfd "${FILESDIR}/conntrackd.confd-r1" conntrackd || die - - insinto /etc/conntrackd - doins doc/stats/conntrackd.conf || die - - dodoc AUTHORS TODO || die - insinto /usr/share/doc/${PF} - doins -r doc/* || die -} diff --git a/net-firewall/conntrack-tools/conntrack-tools-1.2.2-r1.ebuild b/net-firewall/conntrack-tools/conntrack-tools-1.2.2-r1.ebuild deleted file mode 100644 index 7929d4060175..000000000000 --- a/net-firewall/conntrack-tools/conntrack-tools-1.2.2-r1.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack-tools/conntrack-tools-1.2.2-r1.ebuild,v 1.6 2013/04/25 15:42:24 jer Exp $ - -EAPI="4" - -inherit linux-info - -DESCRIPTION="Connection tracking userspace tools" -HOMEPAGE="http://conntrack-tools.netfilter.org" -SRC_URI="http://www.netfilter.org/projects/conntrack-tools/files/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 hppa x86" -IUSE="doc" - -RDEPEND=" - >=net-libs/libnetfilter_conntrack-1.0.1 - >=net-libs/libnetfilter_cttimeout-1.0.0 - >=net-libs/libnfnetlink-1.0.0 - net-libs/libmnl" -DEPEND="${RDEPEND} - doc? ( app-text/xmlto ) - virtual/pkgconfig - sys-devel/bison - sys-devel/flex" - -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 - ~NETFILTER_NETLINK ~NF_CONNTRACK_EVENTS" - - check_extra_config - - linux_config_exists || \ - linux_chkconfig_present "NF_CONNTRACK_IPV4" || \ - linux_chkconfig_present "NF_CONNTRACK_IPV6" || \ - ewarn "CONFIG_NF_CONNTRACK_IPV4 or CONFIG_NF_CONNTRACK_IPV6 " \ - "are not set when one at least should be." -} - -src_configure() { - econf --disable-silent-rules -} -src_compile() { - default - use doc && emake -C doc/manual -} - -src_install() { - default - - newinitd "${FILESDIR}/conntrackd.initd-r2" conntrackd - newconfd "${FILESDIR}/conntrackd.confd-r1" conntrackd - - insinto /etc/conntrackd - doins doc/stats/conntrackd.conf - - dodoc -r doc/sync doc/stats AUTHORS TODO - use doc && dohtml doc/manual/${PN}.html -} diff --git a/net-firewall/conntrack-tools/conntrack-tools-1.2.2.ebuild b/net-firewall/conntrack-tools/conntrack-tools-1.2.2.ebuild deleted file mode 100644 index b73d91fa60e8..000000000000 --- a/net-firewall/conntrack-tools/conntrack-tools-1.2.2.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack-tools/conntrack-tools-1.2.2.ebuild,v 1.2 2012/08/24 13:57:55 jer Exp $ - -EAPI="4" - -inherit linux-info - -DESCRIPTION="Connection tracking userspace tools" -HOMEPAGE="http://conntrack-tools.netfilter.org" -SRC_URI="http://www.netfilter.org/projects/conntrack-tools/files/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~x86" -IUSE="" - -RDEPEND=" - >=net-libs/libnetfilter_conntrack-1.0.1 - >=net-libs/libnetfilter_cttimeout-1.0.0 - >=net-libs/libnfnetlink-1.0.0 - net-libs/libmnl" -DEPEND="${RDEPEND} - virtual/pkgconfig - sys-devel/bison - sys-devel/flex" - -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 - ~NETFILTER_NETLINK ~NF_CONNTRACK_EVENTS" - - check_extra_config - - linux_config_exists || \ - linux_chkconfig_present "NF_CONNTRACK_IPV4" || \ - linux_chkconfig_present "NF_CONNTRACK_IPV6" || \ - ewarn "CONFIG_NF_CONNTRACK_IPV4 or CONFIG_NF_CONNTRACK_IPV6 " \ - "are not set when one at least should be." -} - -src_install() { - default - - newinitd "${FILESDIR}/conntrackd.initd-r1" conntrackd - newconfd "${FILESDIR}/conntrackd.confd-r1" conntrackd - - insinto /etc/conntrackd - doins doc/stats/conntrackd.conf - - insinto /usr/share/doc/${PF} - doins -r doc/* -} diff --git a/net-firewall/conntrack-tools/conntrack-tools-1.4.1.ebuild b/net-firewall/conntrack-tools/conntrack-tools-1.4.1.ebuild deleted file mode 100644 index e5e4f09931ef..000000000000 --- a/net-firewall/conntrack-tools/conntrack-tools-1.4.1.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack-tools/conntrack-tools-1.4.1.ebuild,v 1.6 2013/06/26 12:26:40 jer Exp $ - -EAPI=5 -inherit autotools eutils linux-info - -DESCRIPTION="Connection tracking userspace tools" -HOMEPAGE="http://conntrack-tools.netfilter.org" -SRC_URI="http://www.netfilter.org/projects/conntrack-tools/files/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 hppa x86" -IUSE="doc" - -RDEPEND=" - >=net-libs/libmnl-1.0.3 - >=net-libs/libnetfilter_conntrack-1.0.3 - >=net-libs/libnetfilter_cthelper-1.0.0 - >=net-libs/libnetfilter_cttimeout-1.0.0 - >=net-libs/libnetfilter_queue-1.0.2 - >=net-libs/libnfnetlink-1.0.1 -" -DEPEND="${RDEPEND} - doc? ( app-text/xmlto ) - virtual/pkgconfig - sys-devel/bison - sys-devel/flex" - -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 - ~NETFILTER_NETLINK ~NF_CONNTRACK_EVENTS" - - check_extra_config - - linux_config_exists || \ - linux_chkconfig_present "NF_CONNTRACK_IPV4" || \ - linux_chkconfig_present "NF_CONNTRACK_IPV6" || \ - ewarn "CONFIG_NF_CONNTRACK_IPV4 or CONFIG_NF_CONNTRACK_IPV6 " \ - "are not set when one at least should be." -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-version.patch - eautoreconf -} - -src_configure() { - econf --disable-silent-rules -} -src_compile() { - default - use doc && emake -C doc/manual -} - -src_install() { - default - - newinitd "${FILESDIR}/conntrackd.initd-r2" conntrackd - newconfd "${FILESDIR}/conntrackd.confd-r1" conntrackd - - insinto /etc/conntrackd - doins doc/stats/conntrackd.conf - - dodoc -r doc/sync doc/stats AUTHORS TODO - use doc && dohtml doc/manual/${PN}.html -} diff --git a/net-firewall/conntrack-tools/files/conntrack-tools-0.9.14-include.patch b/net-firewall/conntrack-tools/files/conntrack-tools-0.9.14-include.patch deleted file mode 100644 index 78a1db9d5c67..000000000000 --- a/net-firewall/conntrack-tools/files/conntrack-tools-0.9.14-include.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/parse.c -+++ b/src/parse.c -@@ -16,6 +16,7 @@ - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -+#include <stdio.h> /* NULL */ - #include "network.h" - - #include <libnetfilter_conntrack/libnetfilter_conntrack.h> diff --git a/net-firewall/conntrack-tools/files/conntrack-tools-1.4.1-version.patch b/net-firewall/conntrack-tools/files/conntrack-tools-1.4.1-version.patch deleted file mode 100644 index b49d16657051..000000000000 --- a/net-firewall/conntrack-tools/files/conntrack-tools-1.4.1-version.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -56,7 +56,7 @@ - - PKG_CHECK_MODULES([LIBNFNETLINK], [libnfnetlink >= 1.0.1]) - PKG_CHECK_MODULES([LIBMNL], [libmnl >= 1.0.3]) --PKG_CHECK_MODULES([LIBNETFILTER_CONNTRACK], [libnetfilter_conntrack >= 1.0.2]) -+PKG_CHECK_MODULES([LIBNETFILTER_CONNTRACK], [libnetfilter_conntrack >= 1.0.3]) - PKG_CHECK_MODULES([LIBNETFILTER_CTTIMEOUT], [libnetfilter_cttimeout >= 1.0.0]) - PKG_CHECK_MODULES([LIBNETFILTER_CTHELPER], [libnetfilter_cthelper >= 1.0.0]) - PKG_CHECK_MODULES([LIBNETFILTER_QUEUE], [libnetfilter_queue >= 1.0.2]) diff --git a/net-firewall/conntrack-tools/files/conntrackd.confd-r1 b/net-firewall/conntrack-tools/files/conntrackd.confd-r1 deleted file mode 100644 index 7c937cbd9e3e..000000000000 --- a/net-firewall/conntrack-tools/files/conntrackd.confd-r1 +++ /dev/null @@ -1,15 +0,0 @@ -# conntrackd config file -# default: /etc/conntrackd/conntrackd.conf -#CONNTRACKD_CFG=/etc/conntrackd/conntrackd.conf - -# conntrackd lockfile (must match the "LockFile" entry -# from the "General" section in the config file) -# default: /var/lock/conntrack.lock -#CONNTRACKD_LOCK=/var/lock/conntrack.lock - -# extra options for conntrackd -#CONNTRACKD_OPTS="" # you must NOT use -C here! - -# depend on a specific network interface -#RC_NEED="net.eth1" # baselayout-1 -#rc_need="net.eth1" # baselayout-2/OpenRC diff --git a/net-firewall/conntrack-tools/files/conntrackd.initd-r1 b/net-firewall/conntrack-tools/files/conntrackd.initd-r1 deleted file mode 100644 index 9394badca125..000000000000 --- a/net-firewall/conntrack-tools/files/conntrackd.initd-r1 +++ /dev/null @@ -1,99 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -CONNTRACKD_BIN="/usr/sbin/conntrackd" -CONNTRACKD_CFG=${CONNTRACKD_CFG:-/etc/conntrackd/conntrackd.conf} -CONNTRACKD_LOCK=${CONNTRACKD_LOCK:-/var/lock/conntrack.lock} - -depend() { - use logger - need net -} - -checkconfig() { - # check for netfilter conntrack kernel support - local nf_ct_available=0 - for k in net.netfilter.nf_conntrack_max \ - net.ipv4.netfilter.ip_conntrack_max \ - net.nf_conntrack_max; do - if sysctl -e -n ${k} &>/dev/null; then - nf_ct_available=1 # sysctl key found - break - fi - done - if [ ${nf_ct_available} -eq 0 ]; then - eerror - eerror "Your kernel is missing netfilter conntrack support!" - eerror "Make sure your kernel was compiled with netfilter conntrack support." - eerror - eerror "If it was compiled as a module you need to ensure the module is being" - eerror "loaded before starting conntrackd." - eerror "Either add an entry to /etc/modules.autoload/[...] (for baselayout-1)" - eerror "or /etc/conf.d/modules (for baselayout-2/OpenRC) or load the module" - eerror "by hand like this, depending on your kernel version:" - eerror - eerror " modprobe nf_conntrack # (for newer kernels)" - eerror " modprobe ip_conntrack # (for older kernels)" - eerror - return 1 - fi - # check if netfilter conntrack TCP window tracking is disabled - local nf_ct_tcp_be_liberal=0 - for k in net.netfilter.nf_conntrack_tcp_be_liberal \ - net.ipv4.netfilter.ip_conntrack_tcp_be_liberal; do - nf_ct_tcp_be_liberal=$(sysctl -e -n ${k} 2>/dev/null) - if [ ${?} -ne 0 ]; then - continue # sysctl key not found - else - break # sysctl key found - fi - done - if [ ${nf_ct_tcp_be_liberal} -ne 1 ]; then - eerror - eerror "You need to disable TCP window tracking!" - eerror "Add the following line to your /etc/sysctl.conf:" - eerror - eerror " ${k} = 1" - eerror - eerror "...and run this to activate the setting: sysctl -q -p" - eerror - return 1 - fi - # check for config file - if [ ! -e "${CONNTRACKD_CFG}" ]; then - eerror - eerror "The conntrackd config file (${CONNTRACKD_CFG})" - eerror "is missing!" - eerror - return 1 - fi - # check for leftover lockfile - if [ -f "${CONNTRACKD_LOCK}" ]; then - ewarn - ewarn "The conntrackd lockfile (${CONNTRACKD_LOCK})" - ewarn "exists although the service is not marked as started." - ewarn "Will remove the lockfile and start the service in 10s" - ewarn "if not interrupted..." - ewarn - sleep 10 - if ! rm -f "${CONNTRACKD_LOCK}"; then - eerror "Failed to remove the conntrackd lockfile (${CONNTRACKD_LOCK})" - return 1 - fi - fi -} - -start() { - checkconfig || return 1 - ebegin "Starting conntrackd" - start-stop-daemon --start --exec "${CONNTRACKD_BIN}" \ - -- -d -C "${CONNTRACKD_CFG}" ${CONNTRACKD_OPTS} - eend $? -} - -stop() { - ebegin "Stopping conntrackd" - start-stop-daemon --stop --exec "${CONNTRACKD_BIN}" - eend $? -} diff --git a/net-firewall/conntrack-tools/files/conntrackd.initd-r2 b/net-firewall/conntrack-tools/files/conntrackd.initd-r2 deleted file mode 100644 index 30cea6f514f1..000000000000 --- a/net-firewall/conntrack-tools/files/conntrackd.initd-r2 +++ /dev/null @@ -1,77 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -CONNTRACKD_BIN="/usr/sbin/conntrackd" -CONNTRACKD_CFG=${CONNTRACKD_CFG:-/etc/conntrackd/conntrackd.conf} -CONNTRACKD_LOCK=${CONNTRACKD_LOCK:-/var/lock/conntrack.lock} - -depend() { - use logger - need net -} - -checkconfig() { - # check for netfilter conntrack kernel support - local nf_ct_available=0 - for k in net.netfilter.nf_conntrack_max \ - net.ipv4.netfilter.ip_conntrack_max \ - net.nf_conntrack_max; do - if sysctl -e -n ${k} &>/dev/null; then - nf_ct_available=1 # sysctl key found - break - fi - done - if [ ${nf_ct_available} -eq 0 ]; then - eerror - eerror "Your kernel is missing netfilter conntrack support!" - eerror "Make sure your kernel was compiled with netfilter conntrack support." - eerror - eerror "If it was compiled as a module you need to ensure the module is being" - eerror "loaded before starting conntrackd." - eerror "Either add an entry to /etc/modules.autoload/[...] (for baselayout-1)" - eerror "or /etc/conf.d/modules (for baselayout-2/OpenRC) or load the module" - eerror "by hand like this, depending on your kernel version:" - eerror - eerror " modprobe nf_conntrack # (for newer kernels)" - eerror " modprobe ip_conntrack # (for older kernels)" - eerror - return 1 - fi - # check for config file - if [ ! -e "${CONNTRACKD_CFG}" ]; then - eerror - eerror "The conntrackd config file (${CONNTRACKD_CFG})" - eerror "is missing!" - eerror - return 1 - fi - # check for leftover lockfile - if [ -f "${CONNTRACKD_LOCK}" ]; then - ewarn - ewarn "The conntrackd lockfile (${CONNTRACKD_LOCK})" - ewarn "exists although the service is not marked as started." - ewarn "Will remove the lockfile and start the service in 10s" - ewarn "if not interrupted..." - ewarn - sleep 10 - if ! rm -f "${CONNTRACKD_LOCK}"; then - eerror "Failed to remove the conntrackd lockfile (${CONNTRACKD_LOCK})" - return 1 - fi - fi -} - -start() { - checkconfig || return 1 - ebegin "Starting conntrackd" - start-stop-daemon --start --exec "${CONNTRACKD_BIN}" \ - -- -d -C "${CONNTRACKD_CFG}" ${CONNTRACKD_OPTS} - eend $? -} - -stop() { - ebegin "Stopping conntrackd" - start-stop-daemon --stop --exec "${CONNTRACKD_BIN}" - eend $? -} |