Drop old

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

7 files changed, 16 insertions, 226 deletions

diff --git a/net-firewall/ipt_netflow/ChangeLog b/net-firewall/ipt_netflow/ChangeLog
index dfc92ceaa9c0..a46396441e13 100644
--- a/net-firewall/ipt_netflow/ChangeLog
+++ b/net-firewall/ipt_netflow/ChangeLog
@@ -1,6 +1,13 @@
 # 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.19 2015/01/09 20:39:26 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipt_netflow/ChangeLog,v 1.20 2015/01/09 20:40:12 pinkbyte Exp $
+
+  09 Jan 2015; Sergey Popov <pinkbyte@gentoo.org> -ipt_netflow-1.8-r4.ebuild,
+  -files/ipt_netflow-1.8-configure.patch,
+  -files/ipt_netflow-1.8-numphyspages-fix.patch,
+  -files/ipt_netflow-1.8-pax-const.patch,
+  -files/ipt_netflow-1.8-procfs-fix.patch:
+  Drop old
 
   09 Jan 2015; Sergey Popov <pinkbyte@gentoo.org> ipt_netflow-2.0.1.ebuild:
   Stable on amd64 and x86, wrt bug #535558
diff --git a/net-firewall/ipt_netflow/Manifest b/net-firewall/ipt_netflow/Manifest
index a25f3a6e1981..47610aee3146 100644
--- a/net-firewall/ipt_netflow/Manifest
+++ b/net-firewall/ipt_netflow/Manifest
@@ -1,26 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX ipt_netflow-1.8-configure.patch 352 SHA256 8ed19392b0cbfe3b286ac44cdab1e71fe6d4cab0c68c5cc6e7ee870bad76b3de SHA512 7e00aee7837a0806a39c5367451a140cd7e7e789d30cce72b1a000db0c6b8d97f5d9ff90616dad3bdf2054227628dae4dce693c3eb56d80c670ff589244cdd6c WHIRLPOOL 7f12720b71889af947ce73bdae838a70f171e801955b30c62d30b86a5abf6ceed1bbe5e29145c6c455a95c1e08757816e5eedccec2a993da0dae1525d24a9517
-AUX ipt_netflow-1.8-numphyspages-fix.patch 678 SHA256 1c6a7afc6fd56f9b89dea947b953220cbe2634f85a4471d445d1f9f9b2cc78bb SHA512 32c3611413b3d18e607698ad048ae47ba89d4d3262480732cc2967762bb98223848e253dd2caf475cac887c9e31e820a28bc0216d40a8a0a89117a360497149a WHIRLPOOL e9841ce6620f8c0b54734a406d19f903d86ae23d93a5058f47c7e26aab8815fbbd340a1daa308f40d9645516ff8997f4fe7bcb066bdbc053ef55b5ddc6b91d3b
-AUX ipt_netflow-1.8-pax-const.patch 1547 SHA256 c03e8dc5ff0f18b0ccf86e0c674ac2bbd04a803a8670a05ca8a19d867d7d92af SHA512 b269af88d9de3fb2d1b82c5f3cd3b2450c102476f52a8156328850d943ae99a5f1a2e52a9ec87ec354e079124ec9aebeec303091a88f9f86aec05f54c7d53df8 WHIRLPOOL 969a5c8f96e28e3a44a11cb008387e71f8b31b9a54226d6ac6bec90312cbd52b79503f1c13210b348dbfd8daf4534b7df05e00ccd992d88d23fe0a65d9123426
-AUX ipt_netflow-1.8-procfs-fix.patch 1318 SHA256 bdfed9dc128df52bd9bc5a007c4dba3e1b96e83bf70ac785b32b60c7d581c530 SHA512 66e8ee572f811e008653d87324cdb9a167591af17053e5fda14827c44a5ac5ea26e035c42b3261d249a9a0a5d5e4f532d57a64bd636db80522e832fd4f5c2b0b WHIRLPOOL 6077e3addc781e0b61f5f0a9ff7bce67c1a92db67b13388844397b8c3748ab5b78566c1d1fb6087ff13ff19c380d847a2b23a8e83b93529ee09e58474b3702b0
 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-1.8.tgz 20921 SHA256 e705646698c1b0275eea0f34038fa7e00bf660d2bc591d3ac04afa0fe3f1ddd0 SHA512 2b0195bd56ecd04c52a11e3347b5e4fb09dc784a3394fee3e0a7e5749e39f4b6af48cd6748dd96ce33d13dd13ae05d096f2a9e0bade33d57a028d568d5b7da20 WHIRLPOOL cfd16cc4be9cab5157b2784c20f6792fd1208c0f5d58dcd8f8a3ee3870d12afe317897c7bf2b265c459ba3f0567cf331a2056ef0e95f6f2f28092318167ad5c4
 DIST ipt_netflow-2.0.1.tgz 46567 SHA256 486faab3b96af2eb7702188a2c50de7a11c9fcc224b4ace8e5ad02cd4d62de2d SHA512 3717439c5135285bb55d65848a049d56beb64dfaf7b06b71352e93c33bf6a69ae3091581d1874e67b24e65c552719dc7d58d79d861fe6bf6e9de671050da7f7e WHIRLPOOL 84af501748f61db1d76d217424560f5ca1d6b8a5b280e2d6d30431e05773a5338def0679c1e3cf1973dac2bf624b7e2629a6f37cd3024cc05ad75a0eb6b55c61
-EBUILD ipt_netflow-1.8-r4.ebuild 1942 SHA256 6d4a5350a2412eb77cb065eb020eea1071bb8e4f9ff8c93f68dd640d241643df SHA512 ce0a8a9acd579150c85b9b35b46284a64fcc7209bbbcb596faf027c6770c8a6e1fdfd56304d076ca02a0f7ad88d030ca825a3543a513b338acc82cf041369779 WHIRLPOOL 3f550bb39453034fa8e42dc805e60a8f885ef9cad8fa1f9d8ab4a033c878f2199f836445d47e4e6d288c2fbda40e43dc54b7de1147e91256e08fc249dad665e0
 EBUILD ipt_netflow-2.0.1.ebuild 1961 SHA256 185174051cfa60a3f88d0316c809ee59eed213687747b9579acc3a5ada3d2691 SHA512 ead025e2097d55b6397024e9867c129c4204620ef6cfe3a1c7cfedc61860f5ff122223efe41882c9f14991b0700ba0839bed16efd2780866fe45fa759d2fd381 WHIRLPOOL d7e1313e3fb5110f50b9a7ed8dd7a98e97683987f1a0af9cfebb17b4a2d579b463b937614e8a76817f80c3ab114ef182f5d6598654ef9bf8e2c3481af873e967
-MISC ChangeLog 3883 SHA256 995de841b6d22baa6f553f2723b74e1f7dadc9cfb2e00c7c3d10062921f360ec SHA512 7fa678010609f854571c5aba4cb4e72097bc01d1662bd133a96797280c002d8862cd28a94ae18b25b1b2680c950707db24594dc40c66b32500a059e905d71e46 WHIRLPOOL 7a14a8df26814bb947957fa9cf2da4f3f4d31a5a619e47ac525a10ee6e45f85d08674ee37679b2750f1815314a7227c32e07ad4cbe576f10dd982765d5e7fa92
+MISC ChangeLog 4149 SHA256 61e06920bc311616ada3ddf9ac80c1f6ec425427c487e6ad0fad509739a70b34 SHA512 95384cdf30ef74efd028832a089d046e9245c3b80b7b0b8f889b9aa05442ed6e35448aca7e43de5e30a8c6c9ad0a01abd8752c1a085cd01936df78558a580d2a WHIRLPOOL 22dae07fa2a8702b4eb87ed6b3922c6322b49d99179b639e8307e1f59fcc64f3c24c5a6f9c2bd21cc211f8128d628b0f3355c8f00d05ce63afaa00fbaf8f2b18
 MISC metadata.xml 345 SHA256 dda378025b31263970cd5e6814fa081a36e4e2ba08e84013a9fc0a16f3625d26 SHA512 d599e44bca77388c107e18b966796ae77ecae297d771096096e5a5ee4626e01ddf1b91e3d585de4e3d7ec0c3f1d56286910e1e2c9b5f93920ecbd097f8638797 WHIRLPOOL 1b5c8c9b2832b502c45a1f0573d89ccd2477e1cb127639ef545bab9a004ac848d3640dfde7712aef5704fc5746c04f1d9c850aa772b1a425480b51d056e95001
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUsDx/AAoJECo/aRed9267q9wH/jgk2FdZozcIM6L0gdgSiD8+
-VVukZ8bDeWHhyyShjMk0xZ+3mxtX3l01YswgDtgT62Zr3nAIHSPFdvQodJ7QqwWw
-a2xY5Aoiy/fQx+1r2MHA7Rg2/PYRMd+7PUE2e6ZC0k1HCfNiCGKM5hPnjbdpbOcp
-7gg4goQ0NDJLVlixU3JyQGVD1PwRJjMMsnPhrHTsWbNZW7rmEbOWiq5/Pt+rJmSR
-jxopVnU29rXJFZFSjnWw1eeJHLAKqlSQC8VOSIROq73sTTt/UaNUvgkuYfNXGZ+g
-d30XYmbA4gXdZEcme9ApYMwF4grYmc18642gx5J3/a4iXR6Uhy4wWysfs6WK/Xo=
-=DnTI
+iQEcBAEBCAAGBQJUsDytAAoJECo/aRed9267MbwH/ilU3ZVMaC/1kLNfIkvRHflz
++D18+vzqQ5uV+pwPoWHTZ3u4AQN8yVS78nfXEC871PC5ilMC6UiR3VIxXAR+kze1
+g7nEIiohlqHK+yvT6A81Z/vT3T5foE3X0CSQ8eTcOPlfenuklJe5USQORvP38PWW
+mg6HVZZb9MpWWcK1006Em3/5ocSzcu00fKtw5GDn561XyyV0hrJgxvItkHoHIIqg
+nRbgn6TvnJE52kMyWkez01wtYRHRWOk8bO6Mz8dnZPaGi5gc3IyyTrA98JQg23Ts
+Vq7cQOMc2ANZn9wUf2xcNoWqipETe+GVAfg9w9oVxSjbr8Yx5T8Qxjwv9zrmbjw=
+=63LR
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/ipt_netflow/files/ipt_netflow-1.8-configure.patch b/net-firewall/ipt_netflow/files/ipt_netflow-1.8-configure.patch
deleted file mode 100644
index 493d6080e44a..000000000000
--- a/net-firewall/ipt_netflow/files/ipt_netflow-1.8-configure.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Patch by Jeroen Roovers from https://bugs.gentoo.org/show_bug.cgi?id=455984
-
-Fixes failure on configure stage with pkgconfig 0.28
---- a/configure
-+++ b/configure
-@@ -217,7 +217,6 @@
- iptables_ver		#IPTVER
- iptables_pkg_config
- iptables_dir		#IPTSRC
--iptables_src_version	#check IPTSRC match to IPTVER
- iptables_inc		#IPTINC
- iptables_modules	#IPTLIB
- 
diff --git a/net-firewall/ipt_netflow/files/ipt_netflow-1.8-numphyspages-fix.patch b/net-firewall/ipt_netflow/files/ipt_netflow-1.8-numphyspages-fix.patch
deleted file mode 100644
index b64980f02666..000000000000
--- a/net-firewall/ipt_netflow/files/ipt_netflow-1.8-numphyspages-fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-commit 76c1610c10f863e4f8b38e88af60044b42b79422
-Author: ABC <abc@telekom.ru>
-Date:   Mon Sep 30 11:07:07 2013 +0400
-
-    num_physpages to totalram_pages rename for linux 3.11
-
-diff --git a/ipt_NETFLOW.c b/ipt_NETFLOW.c
-index 5ec725d..71d4087 100644
---- a/ipt_NETFLOW.c
-+++ b/ipt_NETFLOW.c
-@@ -2025,6 +2025,9 @@ static int __init ipt_netflow_init(void)
- 
- 	/* determine hash size (idea from nf_conntrack_core.c) */
- 	if (!hashsize) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)
-+#define num_physpages totalram_pages
-+#endif
- 		hashsize = (((num_physpages << PAGE_SHIFT) / 16384)
- 					 / sizeof(struct hlist_head));
- 		if (num_physpages > (1024 * 1024 * 1024 / PAGE_SIZE))
diff --git a/net-firewall/ipt_netflow/files/ipt_netflow-1.8-pax-const.patch b/net-firewall/ipt_netflow/files/ipt_netflow-1.8-pax-const.patch
deleted file mode 100644
index b3e4b5f687a5..000000000000
--- a/net-firewall/ipt_netflow/files/ipt_netflow-1.8-pax-const.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Patch by Jeremy Drake, https://bugs.gentoo.org/show_bug.cgi?id=466430
-
-Adds support for building with PaX hardened kernel
-
---- a/ipt_NETFLOW.c
-+++ b/ipt_NETFLOW.c
-@@ -371,14 +371,13 @@
- static int hsize_procctl(ctl_table *ctl, int write, BEFORE2632(struct file *filp,)
- 			 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 < 1)
- 			return -EPERM;
- 		return set_hashsize(hsize)?:ret;
-@@ -391,6 +390,7 @@
- {
- 	int ret;
- 	struct ipt_netflow_sock *usock;
-+	ctl_table_no_const lctl = *ctl;
-        
- 	read_lock(&sock_lock);
- 	if (list_empty(&usock_list)) {
-@@ -401,8 +401,8 @@
- 	sndbuf = usock->sock->sk->sk_sndbuf;
- 	read_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)
-@@ -451,10 +451,11 @@
- {
- 	int ret;
- 	int val;
-+	ctl_table_no_const lctl = *ctl;
- 
- 	val = 0;
--	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;
diff --git a/net-firewall/ipt_netflow/files/ipt_netflow-1.8-procfs-fix.patch b/net-firewall/ipt_netflow/files/ipt_netflow-1.8-procfs-fix.patch
deleted file mode 100644
index 011a5260162d..000000000000
--- a/net-firewall/ipt_netflow/files/ipt_netflow-1.8-procfs-fix.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Patch from http://sourceforge.net/p/ipt-netflow/bugs-requests-patches/71/
-
---- a/ipt_NETFLOW.c
-+++ b/ipt_NETFLOW.c
-@@ -854,9 +854,15 @@
- ipt_netflow_find(const struct ipt_netflow_tuple *tuple, unsigned int hash)
- {
- 	struct ipt_netflow *nf;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,9,0)
- 	struct hlist_node *pos;
-+#endif
- 
--	hlist_for_each_entry(nf, pos, &ipt_netflow_hash[hash], hlist) {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,9,0)
-+	hlist_for_each_entry(nf, pos, &ipt_netflow_hash[hash], hlist) {
-+#else
-+	hlist_for_each_entry(nf, &ipt_netflow_hash[hash], hlist) {
-+#endif
- 		if (ipt_netflow_tuple_equal(tuple, &nf->tuple) &&
- 		    nf->nr_bytes < FLOW_FULL_WATERMARK) {
- 			NETFLOW_STAT_INC(found);
-@@ -1434,12 +1439,20 @@
- 	}
- 
- #ifdef CONFIG_PROC_FS
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- 	proc_stat = create_proc_entry("ipt_netflow", S_IRUGO, INIT_NET(proc_net_stat));
-+#else
-+	proc_stat = proc_create("ipt_netflow", S_IRUGO, INIT_NET(proc_net_stat), &nf_seq_fops);
-+#endif
- 	if (!proc_stat) {
- 		printk(KERN_ERR "Unable to create /proc/net/stat/ipt_netflow entry\n");
- 		goto err_free_netflow_slab;
- 	}
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- 	proc_stat->proc_fops = &nf_seq_fops;
-+#endif
-+
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
- 	proc_stat->owner = THIS_MODULE;
- #endif
diff --git a/net-firewall/ipt_netflow/ipt_netflow-1.8-r4.ebuild b/net-firewall/ipt_netflow/ipt_netflow-1.8-r4.ebuild
deleted file mode 100644
index 7e46e679ccd4..000000000000
--- a/net-firewall/ipt_netflow/ipt_netflow-1.8-r4.ebuild
+++ /dev/null
@@ -1,79 +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-1.8-r4.ebuild,v 1.3 2014/07/18 12:41:29 jer 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="pax_kernel"
-
-RDEPEND="net-firewall/iptables"
-DEPEND="${RDEPEND}
-	virtual/linux-sources
-	virtual/pkgconfig
-"
-
-BUILD_TARGETS="all"
-CONFIG_CHECK="~IP_NF_IPTABLES"
-MODULE_NAMES="ipt_NETFLOW(ipt_netflow:${S})"
-
-IPT_LIB="/usr/$(get_libdir)/xtables"
-
-src_prepare() {
-	sed -i \
-		-e 's:-I$(KDIR)/include::' \
-		-e 's:make -C:$(MAKE) -C:g' \
-		-e 's:gcc -O2:$(CC) $(CFLAGS) $(LDFLAGS):' \
-		-e 's:gcc:$(CC) $(CFLAGS) $(LDFLAGS):' \
-		Makefile.in || die
-	sed -i -e '/IPT_NETFLOW_VERSION/s/1.7.2/1.8/' ipt_NETFLOW.c || die
-
-	# bug #455984
-	epatch "${FILESDIR}"/${PN}-1.8-configure.patch
-
-	# compatibility with 3.10 kernel
-	epatch "${FILESDIR}"/${PN}-1.8-procfs-fix.patch
-
-	# compatibility with 3.11 kernel
-	epatch "${FILESDIR}"/${PN}-1.8-numphyspages-fix.patch
-
-	# bug #466430
-	if use pax_kernel; then
-		epatch "${FILESDIR}"/${PN}-1.8-pax-const.patch
-	fi
-
-	epatch_user
-}
-
-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
-	./configure \
-		--ipt-lib="${IPT_LIB}" \
-		--ipt-src="/usr/" \
-		--ipt-ver="${IPT_VERSION}" \
-		--kdir="${KV_DIR}" \
-		--kver="${KV_FULL}" \
-	|| die 'configure failed'
-}
-
-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*
-}