Add version check for kernel sources to prevent building on unsupported kernels, drop old

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

4 files changed, 19 insertions, 95 deletions

diff --git a/net-firewall/ipt_netflow/ChangeLog b/net-firewall/ipt_netflow/ChangeLog
index 937b947bb3f7..840223d7841b 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipt_netflow/ChangeLog,v 1.17 2014/09/16 06:06:52 jer Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipt_netflow/ChangeLog,v 1.18 2015/01/09 20:35:29 pinkbyte Exp $
+
+  09 Jan 2015; Sergey Popov <pinkbyte@gentoo.org> -ipt_netflow-2.0-r1.ebuild,
+  ipt_netflow-2.0.1.ebuild:
+  Add version check for kernel sources to prevent building on unsupported
+  kernels, drop old
 
 *ipt_netflow-2.0.1 (16 Sep 2014)
 
diff --git a/net-firewall/ipt_netflow/Manifest b/net-firewall/ipt_netflow/Manifest
index a15d9eaae21e..fa60e7fb2c00 100644
--- a/net-firewall/ipt_netflow/Manifest
+++ b/net-firewall/ipt_netflow/Manifest
@@ -9,16 +9,18 @@ AUX ipt_netflow-2.0-configure.patch 276 SHA256 cf24753f0075b8015b8832799d993fcc1
 AUX ipt_netflow-2.0-pax-const.patch 1830 SHA256 e69b9e8f6daa91bb4b56002d201fceb06205b96dd1364b4c5b3fc86e1eddf9db SHA512 3bfaa367c03828bdab59007ea14057b3a3885125d538354301d861573ff04a6c53142234e2b249b3b9955f1c4edafd36ad33397f2015c7c456e69b2900aa6824 WHIRLPOOL 9ebde61106d197ad362816e388d7fa3a0df32b14c2ba854268f974119a40e498b51926c5cee71fd698db8c28570578a64c0bc3c0afa4c26418388eef4c6967c8
 DIST ipt_netflow-1.8.tgz 20921 SHA256 e705646698c1b0275eea0f34038fa7e00bf660d2bc591d3ac04afa0fe3f1ddd0 SHA512 2b0195bd56ecd04c52a11e3347b5e4fb09dc784a3394fee3e0a7e5749e39f4b6af48cd6748dd96ce33d13dd13ae05d096f2a9e0bade33d57a028d568d5b7da20 WHIRLPOOL cfd16cc4be9cab5157b2784c20f6792fd1208c0f5d58dcd8f8a3ee3870d12afe317897c7bf2b265c459ba3f0567cf331a2056ef0e95f6f2f28092318167ad5c4
 DIST ipt_netflow-2.0.1.tgz 46567 SHA256 486faab3b96af2eb7702188a2c50de7a11c9fcc224b4ace8e5ad02cd4d62de2d SHA512 3717439c5135285bb55d65848a049d56beb64dfaf7b06b71352e93c33bf6a69ae3091581d1874e67b24e65c552719dc7d58d79d861fe6bf6e9de671050da7f7e WHIRLPOOL 84af501748f61db1d76d217424560f5ca1d6b8a5b280e2d6d30431e05773a5338def0679c1e3cf1973dac2bf624b7e2629a6f37cd3024cc05ad75a0eb6b55c61
-DIST ipt_netflow-2.0.tgz 46456 SHA256 547ca6c2e8d82fc7d3d113d2ab3f602106d1efa7739167f8c7850a43e5bbe46e SHA512 7bf330ac665180218ea4cc42fe6ac6d365b45632039ff9601559f7a4675738c409853433b15dd431dba68cfe36269d6992754154411e2761041fec021e19bf8d WHIRLPOOL 1d54d2b1386f50e98cfaa082356559ec044f9b2088c70c024bc030482cc57ae5fac6de3e691f155f80fd6647b97c0f50f3292625511fe3c9ced404cfd4cff63c
 EBUILD ipt_netflow-1.8-r4.ebuild 1942 SHA256 6d4a5350a2412eb77cb065eb020eea1071bb8e4f9ff8c93f68dd640d241643df SHA512 ce0a8a9acd579150c85b9b35b46284a64fcc7209bbbcb596faf027c6770c8a6e1fdfd56304d076ca02a0f7ad88d030ca825a3543a513b338acc82cf041369779 WHIRLPOOL 3f550bb39453034fa8e42dc805e60a8f885ef9cad8fa1f9d8ab4a033c878f2199f836445d47e4e6d288c2fbda40e43dc54b7de1147e91256e08fc249dad665e0
-EBUILD ipt_netflow-2.0-r1.ebuild 1930 SHA256 1686410870afd76f7d5876179503d7c76901b7c9d46e242cf75f84215960302c SHA512 ebff90e9ef79b9daa103f774dab5f2fab30a8875d59097e7f93e9a2d00913e0266865e9442998431a974cc97924c6659206a90fc0ac5cf163e5c9de149de6db6 WHIRLPOOL 3ec978904e8befbf9c99c1f1ee77e8ccbd9393d57079211ff40807c85d9b8121674078c4bfef732b2e11eefdf5702427c47416c8a3a4dabace78629a58022462
-EBUILD ipt_netflow-2.0.1.ebuild 1893 SHA256 ee714407398fbf70c590209f8dbb3b5e83858087e6dee692d46530987d5be63b SHA512 af3137b973f2b7cf9d83e40889367135ee37ffa91d8ba583615796a7df4cf4b1b7294068ab5f8a737cc196f7160823697fb66f67f477b4f160ebc67b891d1d8c WHIRLPOOL c4700ba639118f9bcf75e55b53e459fc02b2590d6ce15209b8726b803bee62c2759c5020351413eed786d3d2988fcc7dc6ee27756c75ed3a3a30897ee6e38329
-MISC ChangeLog 3557 SHA256 6a1590066da5bf191c396c7ae2c6c84df598480edeede4ba2f04ea2bd4531d23 SHA512 279bbb0abaa686bc092fbb51520d8200abb602a98a1cdf2f59d734f83a4e30e80bcabc8b7bfd44cdf977c5021fe8137d384188d517833e8e6cdc7f49ff2f741e WHIRLPOOL e1e267d7e75dda7d0d9553165c6d2608df60c166dffa140af0e8582a507fe7a4c209e57108fb7c6ae0d3838db9c70f8bb327e0712f7f059f948f4af6bb0789f5
+EBUILD ipt_netflow-2.0.1.ebuild 1963 SHA256 c1458eb07f051e8c27fe85ea28b5635147ddd6443849f07a822091bf724d6840 SHA512 cfb22c17585b1a4c286bc693a4b0182b3e2df32c68bdd79937e6d3a9477a719ea1fc69bc621ce424028a7d1401d83220192e8b3af6b57d5a1c2e48c9227ea044 WHIRLPOOL 103941d893073c1b75557cf092c97c10ce22452248089ee0c642c199d1db74ec12e297528a37b6520739502c777e094317ddae02ddd1506e8dc5cbf50ff60c54
+MISC ChangeLog 3763 SHA256 2bd721126a64dee05af8ac612df0c9e4d55ebf151a6ace9181e73caeabb59cfc SHA512 4b344ea19af3119ef4ea7d5d1d9698dd994568b1c3237f013bcbf16e9fa97bc947b603935477fb2d4ed3f7cf3313e5f4be2ebe137c7e45a21bb4241104689480 WHIRLPOOL 17b6ec43e7202824cbcaf83f7ee6acf42784585eadb38df69dc6cf627728e6660ba813b36470d3f2569d55528319653fce3b4b6657f77f112ed0940ba398ca23
 MISC metadata.xml 345 SHA256 dda378025b31263970cd5e6814fa081a36e4e2ba08e84013a9fc0a16f3625d26 SHA512 d599e44bca77388c107e18b966796ae77ecae297d771096096e5a5ee4626e01ddf1b91e3d585de4e3d7ec0c3f1d56286910e1e2c9b5f93920ecbd097f8638797 WHIRLPOOL 1b5c8c9b2832b502c45a1f0573d89ccd2477e1cb127639ef545bab9a004ac848d3640dfde7712aef5704fc5746c04f1d9c850aa772b1a425480b51d056e95001
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlQX030ACgkQVWmRsqeSphMJ0wCfQlbs34CVkK+08kUCg6pjpt9S
-H7EAnjDor7lQSuhQY6m4djOmncbs5Yi3
-=HSes
+iQEcBAEBCAAGBQJUsDuWAAoJECo/aRed9267QYwH/A1ey6kyKraToBnfZg/3UnlD
+Vl9FMInfMsisf9azHKrP1FOmQv3siMpdr5/74YX44d7dOOQuSTg7izfl+kJUHnGe
+Qodm7j/ZixoDng+JrmQp9HmzlEFMctm9V11kXC/fLBT1p3VNLuWYKks3KTYeAgez
+uEvr5GeYiCwjwNa+dtNfZ0wLWI6rz0iqDrJNc1lCEzFfQCA5/wQ6rR9Vp2BVHBGI
+Ctk6R5AynB5rqrG7aUnFRg9Md1hcElnrezHX4rCc0mK2bNZWctiVREV45MPPtfJ1
+3V/d46aaiqd5Qq8nYczwgwrDLt+rSwlKxw4U2ouNZ5LrpMOn4Yi0amk2JpRDCFA=
+=c7x1
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.0-r1.ebuild b/net-firewall/ipt_netflow/ipt_netflow-2.0-r1.ebuild
deleted file mode 100644
index d2ade4923940..000000000000
--- a/net-firewall/ipt_netflow/ipt_netflow-2.0-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2014 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.0-r1.ebuild,v 1.1 2014/08/19 07:21:25 pinkbyte Exp $
-
-EAPI=5
-inherit eutils linux-info linux-mod multilib toolchain-funcs
-
-DESCRIPTION="Netflow iptables module"
-HOMEPAGE="http://sourceforge.net/projects/ipt-netflow"
-SRC_URI="mirror://sourceforge/ipt-netflow/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="debug pax_kernel"
-
-RDEPEND="net-firewall/iptables"
-DEPEND="${RDEPEND}
-	virtual/linux-sources
-	virtual/pkgconfig
-"
-
-# set S before MODULE_NAMES
-S="${WORKDIR}/${PN/_/-}-${PV}"
-
-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
-
-	# bug #455984
-	epatch "${FILESDIR}/${PN}-2.0-configure.patch"
-
-	# bugs #466430 and #519480
-	if use pax_kernel; then
-		epatch "${FILESDIR}/${PN}-2.0-pax-const.patch"
-	fi
-
-	epatch_user
-}
-
-do_conf() {
-	echo ./configure $*
-	./configure $* || die 'configure failed'
-}
-
-src_configure() {
-	local IPT_VERSION="$($(tc-getPKG_CONFIG) --modversion xtables)"
-	# econf can not be used, cause configure script fails when see unknown parameter
-	# ipt-src need to be defined, see bug #455984
-	do_conf \
-		--ipt-lib="${IPT_LIB}" \
-		--ipt-src="/usr/" \
-		--ipt-ver="${IPT_VERSION}" \
-		--kdir="${KV_DIR}" \
-		--kver="${KV_FULL}" \
-		$(use debug && echo '--enable-debugfs')
-}
-
-src_compile() {
-	emake ARCH="$(tc-arch-kernel)" CC="$(tc-getCC)" all
-}
-
-src_install() {
-	linux-mod_src_install
-	exeinto "${IPT_LIB}"
-	doexe libipt_NETFLOW.so
-	doheader ipt_NETFLOW.h
-	dodoc README*
-}
diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.0.1.ebuild b/net-firewall/ipt_netflow/ipt_netflow-2.0.1.ebuild
index dd61633afaec..9b5cd6cd633b 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-2.0.1.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-2.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.0.1.ebuild,v 1.1 2014/09/16 06:06:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipt_netflow/ipt_netflow-2.0.1.ebuild,v 1.2 2015/01/09 20:35:29 pinkbyte Exp $
 
 EAPI=5
 inherit eutils linux-info linux-mod multilib toolchain-funcs
@@ -32,6 +32,7 @@ IPT_LIB="/usr/$(get_libdir)/xtables"
 pkg_setup() {
 	local CONFIG_CHECK="~IP_NF_IPTABLES"
 	use debug && CONFIG_CHECK+=" ~DEBUG_FS"
+	kernel_is -gt 3 16 && die "${P} requires kernel version < 3.17"
 	linux-mod_pkg_setup
 }