Version bump

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

3 files changed, 106 insertions, 9 deletions

diff --git a/net-firewall/ipt_netflow/ChangeLog b/net-firewall/ipt_netflow/ChangeLog
index 86f5b3088ba6..949dc1ab772a 100644
--- a/net-firewall/ipt_netflow/ChangeLog
+++ b/net-firewall/ipt_netflow/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-firewall/ipt_netflow
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipt_netflow/ChangeLog,v 1.21 2015/01/09 20:50:50 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipt_netflow/ChangeLog,v 1.22 2015/02/18 09:54:35 pinkbyte Exp $
+
+*ipt_netflow-2.1 (18 Feb 2015)
+
+  18 Feb 2015; Sergey Popov <pinkbyte@gentoo.org> +ipt_netflow-2.1.ebuild:
+  Version bump
 
 *ipt_netflow-2.0.1_p20150109 (09 Jan 2015)
 
diff --git a/net-firewall/ipt_netflow/Manifest b/net-firewall/ipt_netflow/Manifest
index a7e494473381..c0226a075fb0 100644
--- a/net-firewall/ipt_netflow/Manifest
+++ b/net-firewall/ipt_netflow/Manifest
@@ -3,20 +3,22 @@ Hash: SHA256
 
 AUX ipt_netflow-2.0-configure.patch 276 SHA256 cf24753f0075b8015b8832799d993fcc1671ab001033f40f7d0ee12ba469de50 SHA512 cb7b1a690a69eb68ce57d1b216324de3114c01a6bc2ca7e29fece702be62a0f903e6946426c49a8fcd08295466524eb464127655a8742507f999a318319cd3d0 WHIRLPOOL ca45617b098c4e57756b5aeacef9c638444c12cbbd3dea38de457fca9be89592e854c3b9bd70d36250dce4becee28fee94ecd321c857786dc93e92ff5316ab16
 AUX ipt_netflow-2.0-pax-const.patch 1830 SHA256 e69b9e8f6daa91bb4b56002d201fceb06205b96dd1364b4c5b3fc86e1eddf9db SHA512 3bfaa367c03828bdab59007ea14057b3a3885125d538354301d861573ff04a6c53142234e2b249b3b9955f1c4edafd36ad33397f2015c7c456e69b2900aa6824 WHIRLPOOL 9ebde61106d197ad362816e388d7fa3a0df32b14c2ba854268f974119a40e498b51926c5cee71fd698db8c28570578a64c0bc3c0afa4c26418388eef4c6967c8
+DIST ipt-netflow-2.1.tgz 635 SHA256 4c9af4437123ca1d65498a00b70a7a186972a21f14c8b3cc905b9f5d1705142c SHA512 d1bf6ce313d8d8cabfd9276a234a2b53b7c400044173e9319c0d235c87334a7ee1ae8895b47fdba684c018514f6da9d57dda9734330b9e50a8b63b017c06d49c WHIRLPOOL 8d635e1f0adfabecb2fbd11ca208a212c589037409dbbf6361a5225a76e5c345581a73b67fd58ff921825fce3a4bdf923c7e6aa0cf659602f9521198040352ed
 DIST ipt_netflow-2.0.1.tgz 46567 SHA256 486faab3b96af2eb7702188a2c50de7a11c9fcc224b4ace8e5ad02cd4d62de2d SHA512 3717439c5135285bb55d65848a049d56beb64dfaf7b06b71352e93c33bf6a69ae3091581d1874e67b24e65c552719dc7d58d79d861fe6bf6e9de671050da7f7e WHIRLPOOL 84af501748f61db1d76d217424560f5ca1d6b8a5b280e2d6d30431e05773a5338def0679c1e3cf1973dac2bf624b7e2629a6f37cd3024cc05ad75a0eb6b55c61
 DIST ipt_netflow-2.0.1_p20150109.tar.bz2 69870 SHA256 d657fd17a45b965f83906eb760d4811c691e4ced4421a22e0e6e9f504133fa6b SHA512 e113f911e466b9e8cabdc5c852693b0fca5d197d2f82c5effa63bd5337964f361b7199c9a8a3f33dcf77180bfb752fecc18ef862277f2b03e9a6270847565032 WHIRLPOOL 7625cab156a48cfea6e0a0cebde6415b4601d2b0cd67543a350c0e05ab102e3b8ac684d73325f82c58ff7754ca59862e92ef648054b54ce72b1436ad3a3a4542
 EBUILD ipt_netflow-2.0.1.ebuild 1961 SHA256 185174051cfa60a3f88d0316c809ee59eed213687747b9579acc3a5ada3d2691 SHA512 ead025e2097d55b6397024e9867c129c4204620ef6cfe3a1c7cfedc61860f5ff122223efe41882c9f14991b0700ba0839bed16efd2780866fe45fa759d2fd381 WHIRLPOOL d7e1313e3fb5110f50b9a7ed8dd7a98e97683987f1a0af9cfebb17b4a2d579b463b937614e8a76817f80c3ab114ef182f5d6598654ef9bf8e2c3481af873e967
 EBUILD ipt_netflow-2.0.1_p20150109.ebuild 1875 SHA256 aac16a33072bc00bb56825047f7e5219560b65b2ca8971b165310dca67ebe732 SHA512 4de2c35ff7fdee8df5be74f2ee49255498e195532b9dc957cc5a672d7010577b30161e4ad49201a13453d7740be87445fb9434732730e1fa74f2372ce7072d30 WHIRLPOOL 2734a6e2e285cd5517f20eb8876bb70eb95a7446b1fef124eb58d2d70020fdafbec24dedd3c3d4e6f07971908e890bfee2a1ab8f17dbe6a102e621073a4455d8
-MISC ChangeLog 4373 SHA256 f861886888e9d59d056bdadbc78333fca7052ba5b0f0704e947667e8eadb086b SHA512 56c361955b76012898cba4d5e90b77b31b0109a578f671bdb0f64e1388e0975859eab7de12a748633af630c56a75f50b915c198791a5b5e410e1642e4c5f07f3 WHIRLPOOL 564f0fd0b63d4859f6004048e03d2cb4342d489e3d4a6dd997d9b93a1470baee17a781b77286720e0b264cbb0438e9b764597a25144a2bdca90b686bf0420a3d
+EBUILD ipt_netflow-2.1.ebuild 2169 SHA256 fce1e093c58b282181bafe603c5f71f97c94eb3fccff26999b2e439f9eddf4d6 SHA512 dac9bfa6ca6f8edc29966138239f7669228d4566828177937de97c6038ee12768741e2491cb2a58c503637ee2989c28898b2fed7fefa53f75315741eb781726d WHIRLPOOL c09e53bda2464f568de73066b275a0de0624ab2997e28de43f7bdfa16932ceee4de6c9eb93f98890137afbf093d7c426567e2e31265ef5e950528651bb5f2fd2
+MISC ChangeLog 4496 SHA256 b17b91285a72ee8d2ff209bc0acd135dfd1261dd45f9507d5c0a7053d6f73699 SHA512 12fe002fcccc94995c2074eac7fdea3473207331b7be488697d111fbe56d68b38a99fcfda8142d87ca1ee92908d3087597c1974fd9f62ce70e13cee1a986134e WHIRLPOOL 95f72464328027351b767475d3cc3878ebb57fdac248af85aef8bda1b0b07da8e7fe8ac26ce1de0cbcdda3eabaa99dd1fc73e16123b587963c54c67d715db23b
 MISC metadata.xml 345 SHA256 dda378025b31263970cd5e6814fa081a36e4e2ba08e84013a9fc0a16f3625d26 SHA512 d599e44bca77388c107e18b966796ae77ecae297d771096096e5a5ee4626e01ddf1b91e3d585de4e3d7ec0c3f1d56286910e1e2c9b5f93920ecbd097f8638797 WHIRLPOOL 1b5c8c9b2832b502c45a1f0573d89ccd2477e1cb127639ef545bab9a004ac848d3640dfde7712aef5704fc5746c04f1d9c850aa772b1a425480b51d056e95001
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUsD8rAAoJECo/aRed9267n9cIAJwbPgZ2w2h3ZXAaZ7tnZBag
-RSPAns8320i1bdQcGDEHTgDCvWk5h4W23qMu86l+29DgH+zrYjGN91eZC0ACllBC
-Q5Tx3LB+/bZ1zZ5mllFTLXzrMde3DDyCRXxsYHHaotkThc5/NCgfvwFbXHJ7vo0H
-elIqAX8BgQMGA++QLs1uo9mefoGaTITBg4WV2o98Pv3Wj+6EK0NXkjG04FLbl9nR
-eo0d4hsZtQ7fVj/3Z5s9EF2C5I8d/+quQnxvzBDD0BbVYNIpM8tPT4dEEizjrh55
-bD1Grzxusl0VERnImemPRa2j1DJd4mpjYMIN0aS0f76Mot/Rr3OlfZYiPFavkN8=
-=a9v6
+iQEcBAEBCAAGBQJU5GFbAAoJECo/aRed9267E3EH/37Z86DjyeO8tVuvRulCY41D
++I4R+J7MaA1A8tE2GCdh7sHll7NkE9dSVBeuB52w8sKiGhjybvI2ClSnC23K1vT2
+PyDmjVxnYx3MUTspIwjQvPQUFMqqEP87K6t1X9EVw+Yb4QkRGJG5xKx4MuzRWTO1
+aZeBUfU7CghiLn5E/xJMVDLCrVkn4DLENT/uAZl47y5xl+K4c6GQJiUQzwaJYFjU
+GhZtjiX3pdiS99/u0whs7ZRavNG5C1lDSzJAyfBw8wae9yE20O8dHJLtILvU28mM
+ZIXy2KHTMI6Kcu3U4nVacnQvu/y1sxeDZ9yCrIplgHQgyAlZSkHy3Xls1y8wXGE=
+=OFeI
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.1.ebuild b/net-firewall/ipt_netflow/ipt_netflow-2.1.ebuild
new file mode 100644
index 000000000000..f3a4bcfd3ccb
--- /dev/null
+++ b/net-firewall/ipt_netflow/ipt_netflow-2.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipt_netflow/ipt_netflow-2.1.ebuild,v 1.1 2015/02/18 09:54:35 pinkbyte Exp $
+
+EAPI=5
+MY_PN="${PN/_/-}"
+MY_P="${MY_PN}-${PV}"
+inherit eutils linux-info linux-mod multilib toolchain-funcs
+
+DESCRIPTION="Netflow iptables module"
+HOMEPAGE="http://sourceforge.net/projects/ipt-netflow"
+SRC_URI="mirror://sourceforge/${MY_PN}/${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}"
+
+BUILD_TARGETS="all"
+MODULE_NAMES="ipt_NETFLOW(ipt_netflow:${S})"
+
+IPT_LIB="/usr/$(get_libdir)/xtables"
+
+pkg_setup() {
+	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
+	epatch "${FILESDIR}/${PN}-2.0-configure.patch"
+
+	epatch_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*
+}