Drop old

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0x60C0742D1F357D42)

5 files changed, 5 insertions, 241 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/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>