From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 29F81138334 for ; Fri, 27 Dec 2019 19:20:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5DE24E0B7B; Fri, 27 Dec 2019 19:20:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2D2F3E0B7B for ; Fri, 27 Dec 2019 19:20:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 94D8734DBE0 for ; Fri, 27 Dec 2019 19:20:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 09B5336 for ; Fri, 27 Dec 2019 19:20:05 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1577474403.d689f34b6a0bd248867c5e0f43df76f4326daaf3.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-firewall/ipt_netflow/, net-firewall/ipt_netflow/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-firewall/ipt_netflow/files/ipt_netflow-9999-flags.patch net-firewall/ipt_netflow/ipt_netflow-9999.ebuild X-VCS-Directories: net-firewall/ipt_netflow/files/ net-firewall/ipt_netflow/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: d689f34b6a0bd248867c5e0f43df76f4326daaf3 X-VCS-Branch: master Date: Fri, 27 Dec 2019 19:20:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3568a664-9844-402f-a20b-cdb08b1571d6 X-Archives-Hash: 0931e87cd389c52de25112a18e08ffce commit: d689f34b6a0bd248867c5e0f43df76f4326daaf3 Author: Jeroen Roovers gentoo org> AuthorDate: Fri Dec 27 19:17:42 2019 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Fri Dec 27 19:20:03 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d689f34b net-firewall/ipt_netflow: Update live ebuild Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Jeroen Roovers gentoo.org> .../ipt_netflow/files/ipt_netflow-9999-flags.patch | 57 ++++++++++++++++++++++ net-firewall/ipt_netflow/ipt_netflow-9999.ebuild | 10 ++-- 2 files changed, 64 insertions(+), 3 deletions(-) diff --git a/net-firewall/ipt_netflow/files/ipt_netflow-9999-flags.patch b/net-firewall/ipt_netflow/files/ipt_netflow-9999-flags.patch new file mode 100644 index 00000000000..675e8b16f72 --- /dev/null +++ b/net-firewall/ipt_netflow/files/ipt_netflow-9999-flags.patch @@ -0,0 +1,57 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -11,7 +11,7 @@ CARGS = @CARGS@ + 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,31 +22,31 @@ all: ipt_NETFLOW.ko libipt_NETFLOW.so libip6t_NETFLOW.so @SNMPTARGET@ + + ipt_NETFLOW.ko: version.h ipt_NETFLOW.c ipt_NETFLOW.h compat_def.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 $@ + compat_def.h: gen_compat_def + ./gen_compat_def > $@ + 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 compat_def.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 " *" +@@ -66,7 +66,7 @@ sinstall: | snmp_NETFLOW.so IPT-NETFLOW-MIB.my + 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/ipt_netflow-9999.ebuild b/net-firewall/ipt_netflow/ipt_netflow-9999.ebuild index 7414800f8c3..06411e1ae6d 100644 --- a/net-firewall/ipt_netflow/ipt_netflow-9999.ebuild +++ b/net-firewall/ipt_netflow/ipt_netflow-9999.ebuild @@ -27,7 +27,7 @@ DEPEND="${RDEPEND} " PATCHES=( "${FILESDIR}/${PN}-2.0-configure.patch" # bug #455984 - "${FILESDIR}/${PN}-2.3-flags.patch" + "${FILESDIR}/${PN}-9999-flags.patch" ) pkg_setup() { @@ -55,10 +55,14 @@ src_prepare() { default # Fix incorrect module version in sources - sed -i -e "/IPT_NETFLOW_VERSION/s/2.2/${PV}/" ipt_NETFLOW.c || die + sed -i \ + -e '/IPT_NETFLOW_VERSION/s#"[0-9.]*"#"'${PV}'"#' \ + ipt_NETFLOW.c || die # Checking for directory is enough - sed -i -e 's:-s /etc/snmp/snmpd.conf:-d /etc/snmp:' configure || die + sed -i \ + -e 's:-s /etc/snmp/snmpd.conf:-d /etc/snmp:' \ + configure || die } do_conf() {