diff options
| -rw-r--r-- | net-firewall/ipt_netflow/files/ipt_netflow-9999-flags.patch | 57 | ||||
| -rw-r--r-- | 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 000000000000..675e8b16f725 --- /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 7414800f8c36..06411e1ae6d9 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() { |