commit: 36ff33603222f02db016a4a184e676f1e5b5c745 Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> AuthorDate: Wed Dec 2 07:17:57 2020 +0000 Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> CommitDate: Wed Dec 2 07:19:44 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36ff3360
net-firewall/ipt_netflow: drop old version Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Sergey Popov <pinkbyte <AT> gentoo.org> net-firewall/ipt_netflow/Manifest | 1 - .../ipt_netflow/files/ipt_netflow-2.3-flags.patch | 55 ----------- .../files/ipt_netflow-2.4-bridge_netfilter.patch | 61 ------------ net-firewall/ipt_netflow/ipt_netflow-2.4-r1.ebuild | 105 --------------------- 4 files changed, 222 deletions(-) diff --git a/net-firewall/ipt_netflow/Manifest b/net-firewall/ipt_netflow/Manifest index 592cc2926c3..595c50a16e3 100644 --- a/net-firewall/ipt_netflow/Manifest +++ b/net-firewall/ipt_netflow/Manifest @@ -1,2 +1 @@ -DIST ipt_netflow-2.4.tar.gz 92580 BLAKE2B 0197e7e5cdd9c94c7b80b38cb4e2879343139592421922bf73aeaac70ac3af54ea25934bb1474ff455a9f58eab2368995591542f46be48b5c8491a3b6a192f56 SHA512 3c80d02cfda996fbde8d258875df8795000fd8390b5a6f8296771a992067e153eca48f7f4602421529948beaf3030e164adfc2ffe5b528042fbdc15ffb56aa74 DIST ipt_netflow-2.5.1.tar.gz 94627 BLAKE2B 440daed1f0c02e4700c6d4a97da08abc7bf51c73cd824a67fd2b7b9394b47d493ca7acfea34467d93cdce6dded2c5b24b4a2600b9f717aa54561d1f88a123dbc SHA512 dd0bde358f788f2d62ace6a0b1529128f0a686f9b776deeae3502d45d06d13971e8ea249d2647d00b00e73625c515bc12a4b7bd8d34fafd5f3b32f290d48cdce diff --git a/net-firewall/ipt_netflow/files/ipt_netflow-2.3-flags.patch b/net-firewall/ipt_netflow/files/ipt_netflow-2.3-flags.patch deleted file mode 100644 index 0d89e5ba90a..00000000000 --- a/net-firewall/ipt_netflow/files/ipt_netflow-2.3-flags.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- a/Makefile.in -+++ b/Makefile.in -@@ -11,7 +11,7 @@ - SNMPTGSO = /usr/lib/snmp/dlmod/snmp_NETFLOW.so - SNMPCONF = /etc/snmp/snmpd.conf - SNMPLINE = dlmod netflow $(SNMPTGSO) --CC = gcc -+$(CC) ?= gcc - - # https://www.kernel.org/doc/Documentation/kbuild/modules.txt - # https://www.kernel.org/doc/Documentation/kbuild/makefiles.txt -@@ -22,29 +22,29 @@ - - ipt_NETFLOW.ko: version.h ipt_NETFLOW.c ipt_NETFLOW.h compat.h Makefile - @echo Compiling for kernel $(KVERSION) -- make -C $(KDIR) M=$(CURDIR) modules CONFIG_DEBUG_INFO=y -+ $(MAKE) -C $(KDIR) M=$(CURDIR) modules CONFIG_DEBUG_INFO=y - @touch $@ - sparse: | version.h ipt_NETFLOW.c ipt_NETFLOW.h compat.h Makefile - @rm -f ipt_NETFLOW.ko ipt_NETFLOW.o - @echo Compiling for kernel $(KVERSION) -- make -C $(KDIR) M=$(CURDIR) modules C=1 -+ $(MAKE) -C $(KDIR) M=$(CURDIR) modules C=1 - @touch ipt_NETFLOW.ko - coverity: - coverity-submit -v - - minstall: | ipt_NETFLOW.ko - @echo " *" -- make -C $(KDIR) M=$(CURDIR) modules_install INSTALL_MOD_PATH=$(DESTDIR) -+ $(MAKE) -C $(KDIR) M=$(CURDIR) modules_install INSTALL_MOD_PATH=$(DESTDIR) - $(DEPMOD) - mclean: -- make -C $(KDIR) M=$(CURDIR) clean -+ $(MAKE) -C $(KDIR) M=$(CURDIR) clean - lclean: - -rm -f *.so *_sh.o - clean: mclean lclean - -rm -f *.so *.o modules.order version.h - - snmp_NETFLOW.so: snmp_NETFLOW.c -- $(CC) -fPIC -shared -o $@ $< -lnetsnmp -+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIC -shared -o $@ $< -lnetsnmp - - sinstall: | snmp_NETFLOW.so IPT-NETFLOW-MIB.my - @echo " *" -@@ -64,7 +64,7 @@ - fi - - %_sh.o: libipt_NETFLOW.c -- $(CC) $(CFLAGS) -O2 -Wall -Wunused $(IPTABLES_CFLAGS) -fPIC -o $@ -c libipt_NETFLOW.c -+ $(CC) $(CFLAGS) $(LDFLAGS) -Wall -Wunused $(IPTABLES_CFLAGS) -fPIC -o $@ -c libipt_NETFLOW.c - - %.so: %_sh.o - $(CC) -shared -o $@ $< diff --git a/net-firewall/ipt_netflow/files/ipt_netflow-2.4-bridge_netfilter.patch b/net-firewall/ipt_netflow/files/ipt_netflow-2.4-bridge_netfilter.patch deleted file mode 100644 index cde23bc9fe7..00000000000 --- a/net-firewall/ipt_netflow/files/ipt_netflow-2.4-bridge_netfilter.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 9288e30f493d252ee85b492a894f78073e4f6d41 Mon Sep 17 00:00:00 2001 -From: ABC <[email protected]> -Date: Sat, 28 Sep 2019 23:29:40 +0300 -Subject: [PATCH] Don't compile physdev-override if BRIDGE_NETFILTER is - disabled. - -Fixes #120 "Compile error nf_bridge / nf_trace" reported by DocMAX. - -Fixes: 51bdc2b ("Use nf_bridge_info_get() instead of skb->nf_bridge"). ---- - compat.h | 2 ++ - configure | 1 + - ipt_NETFLOW.c | 5 +++++ - 3 files changed, 8 insertions(+) - -diff --git a/compat.h b/compat.h -index 0f9896b..66e224b 100644 ---- a/compat.h -+++ b/compat.h -@@ -680,11 +680,13 @@ static inline int is_vlan_dev(struct net_device *dev) - #endif - - #if LINUX_VERSION_CODE < KERNEL_VERSION(5,0,0) -+# ifdef CONFIG_BRIDGE_NETFILTER - static inline struct nf_bridge_info * - nf_bridge_info_get(const struct sk_buff *skb) - { - return skb->nf_bridge; - } -+# endif - #endif - - #if LINUX_VERSION_CODE >= KERNEL_VERSION(5,0,0) -diff --git a/configure b/configure -index 74eece5..8aae8bf 100755 ---- a/configure -+++ b/configure -@@ -470,6 +470,7 @@ kernel_check_config() { - kconfig CONFIG_NF_CONNTRACK_EVENTS "natevents" - kconfig CONFIG_IPV6 "IPv6" - kconfig CONFIG_IP6_NF_IPTABLES "ip6tables target" -+ kconfig CONFIG_BRIDGE_NETFILTER "physdev override" - } - - kernel_check_include() { -diff --git a/ipt_NETFLOW.c b/ipt_NETFLOW.c -index fe25655..064de6c 100644 ---- a/ipt_NETFLOW.c -+++ b/ipt_NETFLOW.c -@@ -83,6 +83,11 @@ - #if defined(CONFIG_NF_NAT_NEEDED) && LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39) - # include <net/netfilter/nf_conntrack_timestamp.h> - #endif -+#ifdef ENABLE_PHYSDEV_OVER -+# ifndef CONFIG_BRIDGE_NETFILTER -+# undef ENABLE_PHYSDEV_OVER -+# endif -+#endif - - #define IPT_NETFLOW_VERSION "2.4" /* Note that if you are using git, you - will see version in other format. */ diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.4-r1.ebuild b/net-firewall/ipt_netflow/ipt_netflow-2.4-r1.ebuild deleted file mode 100644 index e36de51a30c..00000000000 --- a/net-firewall/ipt_netflow/ipt_netflow-2.4-r1.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit linux-info linux-mod toolchain-funcs - -DESCRIPTION="Netflow iptables module" -HOMEPAGE=" - https://sourceforge.net/projects/ipt-netflow - https://github.com/aabc/ipt-netflow -" -SRC_URI="https://github.com/aabc/ipt-netflow/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" - -IUSE="debug natevents snmp" - -RDEPEND=" - net-firewall/iptables:0= - snmp? ( net-analyzer/net-snmp ) -" -DEPEND="${RDEPEND} - virtual/linux-sources - virtual/pkgconfig -" -PATCHES=( - "${FILESDIR}/${PN}-2.0-configure.patch" # bug #455984 - "${FILESDIR}/${PN}-2.3-flags.patch" - "${FILESDIR}/${P}-bridge_netfilter.patch" -) - -pkg_setup() { - linux-info_pkg_setup - - local CONFIG_CHECK="~IP_NF_IPTABLES VLAN_8021Q" - use debug && CONFIG_CHECK+=" ~DEBUG_FS" - if use natevents; then - CONFIG_CHECK+=" NF_CONNTRACK_EVENTS" - if kernel_is lt 5 2; then - CONFIG_CHECK+=" NF_NAT_NEEDED" - else - CONFIG_CHECK+=" NF_NAT" - fi - fi - - BUILD_TARGETS="all" - MODULE_NAMES="ipt_NETFLOW(ipt_netflow:${S})" - IPT_LIB="/usr/$(get_libdir)/xtables" - - linux-mod_pkg_setup -} - -src_unpack() { - default - - mv "${WORKDIR}"/${PN/_/-}-* "${WORKDIR}"/${P} || die -} - -src_prepare() { - default - - # Checking for directory is enough - sed -i -e 's:-s /etc/snmp/snmpd.conf:-d /etc/snmp:' configure || die -} - -do_conf() { - tc-export CC - 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 \ - --enable-aggregation \ - --enable-direction \ - --enable-macaddress \ - --enable-vlan \ - --ipt-lib="${IPT_LIB}" \ - --ipt-src="/usr/" \ - --ipt-ver="${IPT_VERSION}" \ - --kdir="${KV_DIR}" \ - --kver="${KV_FULL}" \ - $(use debug && echo '--enable-debugfs') \ - $(use natevents && echo '--enable-natevents') \ - $(use snmp && echo '--enable-snmp-rules' || echo '--disable-snmp-agent') -} - -src_compile() { - emake ARCH="$(tc-arch-kernel)" CC="$(tc-getCC)" LD="$(tc-getLD)" OBJDUMP="$(tc-getOBJDUMP)" 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* -}
