Drop old

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x60C0742D1F357D42

6 files changed, 14 insertions, 261 deletions

diff --git a/net-firewall/ipt_netflow/ChangeLog b/net-firewall/ipt_netflow/ChangeLog
index 67a05a4571ae..c3fe6dd32f27 100644
--- a/net-firewall/ipt_netflow/ChangeLog
+++ b/net-firewall/ipt_netflow/ChangeLog
@@ -1,6 +1,10 @@
 # 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.24 2015/05/13 09:35:56 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipt_netflow/ChangeLog,v 1.25 2015/05/18 15:39:22 pinkbyte Exp $
+
+  18 May 2015; Sergey Popov <pinkbyte@gentoo.org> -ipt_netflow-2.0.1.ebuild,
+  -ipt_netflow-2.0.1_p20150109.ebuild, -files/ipt_netflow-2.0-pax-const.patch:
+  Drop old
 
   13 May 2015; Agostino Sarubbo <ago@gentoo.org> ipt_netflow-2.1.ebuild:
   Stable for x86, wrt bug #546160
diff --git a/net-firewall/ipt_netflow/Manifest b/net-firewall/ipt_netflow/Manifest
index 334cf4e6ab96..2c34ac6f4acd 100644
--- a/net-firewall/ipt_netflow/Manifest
+++ b/net-firewall/ipt_netflow/Manifest
@@ -2,29 +2,18 @@
 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 87872 SHA256 1cc1ee518ecd6c7d8d792ea79c0f69d03ce450c10fefd37f053c43aac92e9931 SHA512 0055ebb1846077f94c1fbf701af8a07a432058c8e86e31c6f420d5c00c96b45012abdcdeef3c5b1ead7d20c7efd51ac65d000b6cb931d878f528f52de0ab9c21 WHIRLPOOL e46ffe69f58293cca0fc26c2ff13ee30e68e2a60a4b198c89fdb24ebc45a4376877285358d4e72019c811d70d0a77194dbc0d46f44c8076923fc626cfe2e7488
-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
 EBUILD ipt_netflow-2.1.ebuild 2162 SHA256 9c358fdf2a9d3f9d6654026980ae510bdea0b55995ded11f119046190ae58f5c SHA512 e907da49dbf323d8feaa408c1c3ac54873d855bb00e671dfc2729706129fb365087ba27f339f58bb018f7b80772c8ea28bbfd0bc06f1a08a79e5ed99e89bdebe WHIRLPOOL 7f0811bf57c277600d1bc8d44ca072bf0ec5ff189451cfca0f50e40dcd3e269901da6c892b50aba2e44b7ac194375895aaaa59833018f279ea1e340ebb3e94f9
-MISC ChangeLog 4709 SHA256 28d5ba800187f5d8dda2b121930ec84d95044dd3b79642776ab89d3ca5a82db5 SHA512 2c51224bbbf5c2b9b44cd8b952900232e9038314cd6acaf33ed65a488fbd46abec76a3ad54612eb960dc51bcc43ac7c080964b131ce7b2a7d496bc8d07766699 WHIRLPOOL 88e9129c877c6eac7f753514f06b53664e753794e7879cb0aa7d18c9d404f02cf568b06f9cd77aea29c5364fba6c34be46a6ee62318d8d0936953130fe2c6969
-MISC metadata.xml 345 SHA256 dda378025b31263970cd5e6814fa081a36e4e2ba08e84013a9fc0a16f3625d26 SHA512 d599e44bca77388c107e18b966796ae77ecae297d771096096e5a5ee4626e01ddf1b91e3d585de4e3d7ec0c3f1d56286910e1e2c9b5f93920ecbd097f8638797 WHIRLPOOL 1b5c8c9b2832b502c45a1f0573d89ccd2477e1cb127639ef545bab9a004ac848d3640dfde7712aef5704fc5746c04f1d9c850aa772b1a425480b51d056e95001
+MISC ChangeLog 4882 SHA256 e29b4ebfe6ed7ce109d84f64913ec304b126d8b36764635ba8cd6f04845ca968 SHA512 56603b6a2b5c11a75ee6eedb2fe32e321522175795d78418d625d398ee2822b5791a342cd91b37c28ee7dce4ef100981c8ba1c6dd275e97bd4508de841464d17 WHIRLPOOL 756cb9df38189430c637a229e7d275a89b2ed94c6f6ceea15236c4a2bfff367e393cb5506afca85d038af9f0b5908d319b515333b3812dfca48c465242569312
+MISC metadata.xml 254 SHA256 e52c9cf66790c5d0546903589295bdbd82d8987534c9916670dedbed6b8874b1 SHA512 c83f5af17d5c3f334bae635762f6b62ef5d98c52705b67a8036b60edbdeb7d48f18e8b6b50895c421023023c95423dcfec3fcc5c6c363480ee596729b6be8021 WHIRLPOOL a95c23a3ef77afbadc01d64ac0e1e2c876a322f10454ea64e2ca729c9512fe6eb903e08c99e2a238cc5e4d63f12222c325428928908db78b4ed26dffd1712d65
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVUxr8AAoJELp701BxlEWfWVMP/irYtxtwWzCYw/7gH638St5C
-6VS/zJ2aASjszBB8wFvTsGaUSM793ibt/l2Gd0e2DaEZuyxkWUsGmpq/K7NSOGl6
-JPNANUBqysXKE7e0i6SkXH0sPIRA3W5t4YhjsTUxldyHSSSQ99PW7dGlXua3RpGl
-qKhXnkXrHNpV/hip9UhKMkMwrm6yg9l3pRUdTflq49JGxWpI8xFrwDjwXg1wY7V6
-9svCayL3KwMZhhZgUTRPtA3WrqCH1zQs9js4psGz0B/JodO4RrP1PFuDMrM0o/8B
-dzPSVTDY1FUS+aIQalH45i9G8CJxXDF1Lbri6tUf+SgUtFjvBApKbQW3uu4IuzYL
-bgnNVB3VPHPv4yLiqyfLo59sDuYVAXq0b2VgtJcKyGmlHicm9L6ukbJFvBzVqBoz
-/8jjhMKHdjFRKIwOHKDbqy6OgM6aPIv82QXfrLsnMJAmCpPo82we3Qh8401vFq7g
-e8+xePkn6vieIg4VoTPYc2cbJQ9YPolSOKKYg01C/d4lVAg+oyoAqn2+U9hzPRO/
-TfCW50rtsRZcTuL/nGgEXEfcAvt9EUxYq5pzKj6xKMtX5BGuli1voD2AqEAMXT24
-QQxWBuV6ekVKh3A3Z4vBTZkxJR7TaYu7x+IUsBUjH8d1RlnSopm58Q7ONOBbq35K
-r1NeLLXoY92/q1tjkwWr
-=XsW5
+iQEcBAEBCAAGBQJVWgepAAoJECo/aRed9267ERUH/jFLUYTB+r0Z8KhIIFJn9bN8
+4cFLrGDUH6GOuOZERh+zPwDAwgtLivLLXTFnglraLrjJjoHHwSBsGOMdJAPPbXFi
+dTizB3uBvsO6fRnt+jrMYDI8cL0no+N9W3CqHaVvk1DiPTffb3IKdFnJhdcKtGpp
+YfprrIPSioCU5Zv6ObQoUgyGlZCMZ2PxIxD0LV1h1S0zRi1KlxezRvY1U4fFeN6j
+t22uXCngMfQjSIQqjlexaNZlriR37g3GGXRHAqf7XQO21n4YOl0nRePSoVgR4nY2
+ik1MNwBokl3MiERs89qmRf5HmkAxtZ/lD18+e8uYf6pzdweOgVzbz8pE3QlSrDs=
+=UY7k
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/ipt_netflow/files/ipt_netflow-2.0-pax-const.patch b/net-firewall/ipt_netflow/files/ipt_netflow-2.0-pax-const.patch
deleted file mode 100644
index fdf369314427..000000000000
--- a/net-firewall/ipt_netflow/files/ipt_netflow-2.0-pax-const.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Patch by Jeremy Drake, https://bugs.gentoo.org/show_bug.cgi?id=466430
-
-Adds support for building with PaX hardened kernel
-
-Adapted to version 2.0 by Sergey Popov <pinkbyte@gentoo.org>
-
---- a/ipt_NETFLOW.c
-+++ b/ipt_NETFLOW.c
-@@ -845,13 +845,13 @@
- 			 void __user *buffer, size_t *lenp, loff_t *fpos)
- {
- 	void *orig = ctl->data;
-+	ctl_table_no_const lctl = *ctl;
- 	int ret, hsize;
- 
- 	if (write)
--		ctl->data = &hsize;
--	ret = proc_dointvec(ctl, write, BEFORE2632(filp,) buffer, lenp, fpos);
-+		lctl.data = &hsize;
-+	ret = proc_dointvec(&lctl, write, BEFORE2632(filp,) buffer, lenp, fpos);
- 	if (write) {
--		ctl->data = orig;
- 		if (hsize < LOCK_COUNT)
- 			return -EPERM;
- 		return set_hashsize(hsize)?:ret;
-@@ -864,6 +864,7 @@
- {
- 	int ret;
- 	struct ipt_netflow_sock *usock;
-+	ctl_table_no_const lctl = *ctl;
- 
- 	mutex_lock(&sock_lock);
- 	if (list_empty(&usock_list)) {
-@@ -875,8 +876,8 @@
- 		sndbuf = usock->sock->sk->sk_sndbuf;
- 	mutex_unlock(&sock_lock);
- 
--	ctl->data = &sndbuf;
--	ret = proc_dointvec(ctl, write, BEFORE2632(filp,) buffer, lenp, fpos);
-+	lctl.data = &sndbuf;
-+	ret = proc_dointvec(&lctl, write, BEFORE2632(filp,) buffer, lenp, fpos);
- 	if (!write)
- 		return ret;
- 	if (sndbuf < SOCK_MIN_SNDBUF)
-@@ -943,9 +944,10 @@
- {
- 	int ret;
- 	int val = 0;
-+	ctl_table_no_const lctl = *ctl;
- 
--	ctl->data = &val;
--	ret = proc_dointvec(ctl, write, BEFORE2632(filp,) buffer, lenp, fpos);
-+	lctl.data = &val;
-+	ret = proc_dointvec(&lctl, write, BEFORE2632(filp,) buffer, lenp, fpos);
- 
- 	if (!write)
- 		return ret;
-@@ -966,8 +968,9 @@
- 	int ret;
- 	int ver = protocol;
- 
--	ctl->data = &ver;
--	ret = proc_dointvec(ctl, write, BEFORE2632(filp,) buffer, lenp, fpos);
-+	ctl_table_no_const lctl = *ctl;
-+	lctl.data = &ver;
-+	ret = proc_dointvec(&lctl, write, BEFORE2632(filp,) buffer, lenp, fpos);
- 
- 	if (!write)
- 		return ret;
diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.0.1.ebuild b/net-firewall/ipt_netflow/ipt_netflow-2.0.1.ebuild
deleted file mode 100644
index 6890848ea57c..000000000000
--- a/net-firewall/ipt_netflow/ipt_netflow-2.0.1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# 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.3 2015/01/09 20:39:26 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"
-	kernel_is -gt 3 16 && die "${P} requires kernel version < 3.17"
-	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)"
-	# this configure script is not based on autotools
-	# 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_p20150109.ebuild b/net-firewall/ipt_netflow/ipt_netflow-2.0.1_p20150109.ebuild
deleted file mode 100644
index 92c461d95322..000000000000
--- a/net-firewall/ipt_netflow/ipt_netflow-2.0.1_p20150109.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# 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_p20150109.ebuild,v 1.1 2015/01/09 20:50:50 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="http://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="debug"
-
-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"
-
-	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 \
-		--disable-snmp-agent \
-		--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/metadata.xml b/net-firewall/ipt_netflow/metadata.xml
index a15e0edcfcfd..7b47a3a9c4a9 100644
--- a/net-firewall/ipt_netflow/metadata.xml
+++ b/net-firewall/ipt_netflow/metadata.xml
@@ -6,7 +6,4 @@
 		<email>pinkbyte@gentoo.org</email>
 		<name>Sergey Popov</name>
 	</maintainer>
-	<use>
-		<flag name="pax_kernel">Apply patch needed for pax enabled kernels</flag>
-	</use>
 </pkgmetadata>