commit: 4d679ab1fa2373d13ef13d6ad644af512ceaef02 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Wed Aug 19 08:36:47 2020 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Wed Aug 19 08:38:46 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d679ab1
net-firewall/ipt_netflow: Install libip6t_NETFLOW.so Package-Manager: Portage-3.0.3, Repoman-3.0.0 Closes: https://bugs.gentoo.org/737950 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> ...low-9999.ebuild => ipt_netflow-2.5.1-r1.ebuild} | 30 ++++++++++++---------- net-firewall/ipt_netflow/ipt_netflow-9999.ebuild | 7 +++-- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/net-firewall/ipt_netflow/ipt_netflow-9999.ebuild b/net-firewall/ipt_netflow/ipt_netflow-2.5.1-r1.ebuild similarity index 83% copy from net-firewall/ipt_netflow/ipt_netflow-9999.ebuild copy to net-firewall/ipt_netflow/ipt_netflow-2.5.1-r1.ebuild index d24c48cebca..637824868f6 100644 --- a/net-firewall/ipt_netflow/ipt_netflow-9999.ebuild +++ b/net-firewall/ipt_netflow/ipt_netflow-2.5.1-r1.ebuild @@ -2,18 +2,18 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit git-r3 linux-info linux-mod toolchain-funcs +inherit linux-info linux-mod toolchain-funcs DESCRIPTION="Netflow iptables module" HOMEPAGE=" https://sourceforge.net/projects/ipt-netflow https://github.com/aabc/ipt-netflow " -EGIT_REPO_URI="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="" +KEYWORDS="~amd64 ~x86" IUSE="debug natevents snmp" @@ -27,7 +27,7 @@ DEPEND="${RDEPEND} " PATCHES=( "${FILESDIR}/${PN}-2.0-configure.patch" # bug #455984 - "${FILESDIR}/${PN}-9999-gentoo.patch" + "${FILESDIR}/${PN}-2.5-gentoo.patch" ) pkg_setup() { @@ -51,18 +51,17 @@ pkg_setup() { linux-mod_pkg_setup } -src_prepare() { +src_unpack() { default - # Fix incorrect module version in sources - sed -i \ - -e '/IPT_NETFLOW_VERSION/s#"[0-9.]*"#"'${PV}'"#' \ - ipt_NETFLOW.c || die + 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 + sed -i -e 's:-s /etc/snmp/snmpd.conf:-d /etc/snmp:' configure || die } do_conf() { @@ -97,9 +96,12 @@ src_compile() { 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 + + exeinto "${IPT_LIB}" + doexe libip{,6}t_NETFLOW.so + doheader ipt_NETFLOW.h dodoc README* } diff --git a/net-firewall/ipt_netflow/ipt_netflow-9999.ebuild b/net-firewall/ipt_netflow/ipt_netflow-9999.ebuild index d24c48cebca..74ad5f1c71d 100644 --- a/net-firewall/ipt_netflow/ipt_netflow-9999.ebuild +++ b/net-firewall/ipt_netflow/ipt_netflow-9999.ebuild @@ -97,9 +97,12 @@ src_compile() { 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 + + exeinto "${IPT_LIB}" + doexe libip{,6}t_NETFLOW.so + doheader ipt_NETFLOW.h dodoc README* }
