commit: d45e06d1e8292e123fa7e7420dd6c7b387da9383 Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> AuthorDate: Tue Jul 19 09:12:41 2016 +0000 Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> CommitDate: Tue Jul 19 09:12:41 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d45e06d1
net-firewall/ipt_netflow: drop old version Package-Manager: portage-2.2.28 net-firewall/ipt_netflow/Manifest | 1 - .../files/ipt_netflow-2.1-linux-3.19.patch | 45 ----------- .../ipt_netflow/ipt_netflow-2.1_p20160119.ebuild | 88 ---------------------- 3 files changed, 134 deletions(-) diff --git a/net-firewall/ipt_netflow/Manifest b/net-firewall/ipt_netflow/Manifest index 1dba461..65a6cfc 100644 --- a/net-firewall/ipt_netflow/Manifest +++ b/net-firewall/ipt_netflow/Manifest @@ -1,2 +1 @@ -DIST ipt-netflow-2.1_p20160119.tgz 86892 SHA256 9afb3f122f0f2b140d81b331d4500f8ad475898579fb5901ed1090d80783a4e5 SHA512 7f30683240d7516df01a4b4a37ea738980def764741c658c86e9c28ca638592a40e0b2458164105d76f88c90f780f058f5c17a0c60ffaeb775d7cdb38dbb4fe1 WHIRLPOOL fdb1a0bebeb8a2840005abd86cbd0fcbc241b4acaae2138d66d0a463807392a3076113b61d8d091ba0aa8f995ab9cc21a1f1f8e33bd9cd11bc1700b8392791d9 DIST ipt-netflow-2.2.tgz 96697 SHA256 81be0a334f74894756d022aee2c87b36c89a7aeca6ff1c91ef6b4f3458793198 SHA512 a406ab9bd18616414d8c99f427382a075bdb8000d8c40959f5b6d6e577d7eb4dfc7f8b773664a516ec2228d15590f21c3fbd6aa3d4302f6cdf03810e1702af74 WHIRLPOOL e9c5f13a3efa346b75ec47ceb033e83099744fa90d575d62135225a88f0093b1de556354d972772f13e7ea895659cd58e6e9a3c08817f62fd902336cc8771928 diff --git a/net-firewall/ipt_netflow/files/ipt_netflow-2.1-linux-3.19.patch b/net-firewall/ipt_netflow/files/ipt_netflow-2.1-linux-3.19.patch deleted file mode 100644 index 47fec4f..0000000 --- a/net-firewall/ipt_netflow/files/ipt_netflow-2.1-linux-3.19.patch +++ /dev/null @@ -1,45 +0,0 @@ -commit 582fd497a5f0f5ae5dce24cba042d856d63bfbe1 -Author: ABC <[email protected]> -Date: Mon Feb 16 21:53:54 2015 +0400 - - Compatibility of __get_cpu_var with linux 3.19. - - Fixes #28, thanks boyarsh@github. - -diff --git a/ipt_NETFLOW.h b/ipt_NETFLOW.h -index bc2734f..5548e57 100644 ---- a/ipt_NETFLOW.h -+++ b/ipt_NETFLOW.h -@@ -396,6 +396,9 @@ struct netflow_aggr_p { - __u16 aggr_port; - }; - -+#ifndef __get_cpu_var -+#define __get_cpu_var(var) (*this_cpu_ptr(&(var))) -+#endif - #define NETFLOW_STAT_INC(count) (__get_cpu_var(ipt_netflow_stat).count++) - #define NETFLOW_STAT_ADD(count, val) (__get_cpu_var(ipt_netflow_stat).count += (unsigned long long)val) - #define NETFLOW_STAT_SET(count, val) (__get_cpu_var(ipt_netflow_stat).count = (unsigned long long)val) -diff --git a/testing.sh b/testing.sh -index b465c8d..caa4f03 100755 ---- a/testing.sh -+++ b/testing.sh -@@ -6,7 +6,7 @@ if [ "$1" = "" ]; then - echo Maintainer only tool. - exit 1 - elif [ "$1" = all ]; then -- exec bash $0 linux-2.6.18 centos5 linux-3.11.2 centos6 linux-3.4.66 linux-3.9.11 centos7 linux-3.14 linux-3.17 -+ exec bash $0 linux-2.6.18 centos5 linux-3.11.2 centos6 linux-3.4.66 linux-3.9.11 centos7 linux-3.14 linux-3.17 linux-3.19 - exit 1 - fi - -@@ -33,6 +33,9 @@ readarray -t opts <<EOF - --enable-sampler=hash - --enable-promisc - EOF -+if [ "$SHORT" ]; then -+ opts=("") -+fi - - colorecho() { - echo -e "\033[1;32m$@\033[m" diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.1_p20160119.ebuild b/net-firewall/ipt_netflow/ipt_netflow-2.1_p20160119.ebuild deleted file mode 100644 index ecd1942..0000000 --- a/net-firewall/ipt_netflow/ipt_netflow-2.1_p20160119.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 -MY_PN="${PN/_/-}" -MY_P="${MY_PN}-${PV}" -inherit linux-info linux-mod toolchain-funcs - -DESCRIPTION="Netflow iptables module" -HOMEPAGE="http://sourceforge.net/projects/ipt-netflow"; -SRC_URI="http://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${MY_P}.tgz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" - -IUSE="debug snmp" - -RDEPEND=" - net-firewall/iptables - snmp? ( net-analyzer/net-snmp ) -" -DEPEND="${RDEPEND} - virtual/linux-sources - virtual/pkgconfig -" - -# set S before MODULE_NAMES -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - BUILD_TARGETS="all" - MODULE_NAMES="ipt_NETFLOW(ipt_netflow:${S})" - IPT_LIB="/usr/$(get_libdir)/xtables" - local CONFIG_CHECK="~IP_NF_IPTABLES" - use debug && CONFIG_CHECK+=" ~DEBUG_FS" - linux-mod_pkg_setup -} - -src_prepare() { - sed -i \ - -e 's:make -C:$(MAKE) -C:g' \ - -e 's:gcc -O2:$(CC) $(CFLAGS) $(LDFLAGS):' \ - -e 's:gcc:$(CC) $(CFLAGS) $(LDFLAGS):' \ - Makefile.in || die - - # Checking for directory is enough - sed -i -e 's:-s /etc/snmp/snmpd.conf:-d /etc/snmp:' configure || die - - # bug #455984 - eapply "${FILESDIR}/${PN}-2.0-configure.patch" - - eapply_user -} - -do_conf() { - echo ./configure $* - ./configure $* ${EXTRA_ECONF} || die 'configure failed' -} - -src_configure() { - local IPT_VERSION="$($(tc-getPKG_CONFIG) --modversion xtables)" - # this configure script is not based on autotools - # ipt-src need to be defined, see bug #455984 - do_conf \ - --disable-dkms \ - --ipt-lib="${IPT_LIB}" \ - --ipt-src="/usr/" \ - --ipt-ver="${IPT_VERSION}" \ - --kdir="${KV_DIR}" \ - --kver="${KV_FULL}" \ - $(use debug && echo '--enable-debugfs') \ - $(use snmp && echo '--enable-snmp-rules' || echo '--disable-snmp-agent') -} - -src_compile() { - emake ARCH="$(tc-arch-kernel)" CC="$(tc-getCC)" all -} - -src_install() { - linux-mod_src_install - exeinto "${IPT_LIB}" - doexe libipt_NETFLOW.so - use snmp && emake DESTDIR="${D}" SNMPTGSO="/usr/$(get_libdir)/snmp/dlmod/snmp_NETFLOW.so" sinstall - doheader ipt_NETFLOW.h - dodoc README* -}
