commit: 11cf0b7c0639c01860db7587d408f30e23dc0d22
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 15 22:57:30 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 15 22:57:30 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11cf0b7c
net-analyzer/net-snmp: fix automagic libpcre dep
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-analyzer/net-snmp/metadata.xml | 1 +
.../{net-snmp-5.9.3-r2.ebuild => net-snmp-5.9.3-r3.ebuild} | 4 +++-
net-analyzer/net-snmp/net-snmp-9999.ebuild | 11 +++++++++--
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/net-analyzer/net-snmp/metadata.xml
b/net-analyzer/net-snmp/metadata.xml
index 0cc021693ba5..86b7e8fce4f5 100644
--- a/net-analyzer/net-snmp/metadata.xml
+++ b/net-analyzer/net-snmp/metadata.xml
@@ -12,6 +12,7 @@
<flag name="netlink">Use <pkg>dev-libs/libnl</pkg> to fetch TCP
statistics instead of using /proc/net/tcp (Linux only).</flag>
<flag name="pcap">Install snmppcap which reads from PCAP files
and writes to the SNMP transport</flag>
<flag name="pci">Use libpci (from <pkg>sys-apps/pciutils</pkg>)
to look up network interface description. This feature is only available on
Linux.</flag>
+ <flag name="pcre">Add support for Perl Compatible Regular
Expressions in process table filtering.</flag>
<flag name="rpm">Enable monitoring of <pkg>app-arch/rpm</pkg>.
This flag requires the bzip2 and zlib flags to be enabled as well.</flag>
<flag name="smux">Enable support for the legacy smux protocol
(superseded by agentx)</flag>
<flag name="ucd-compat">Build UCD compatibility library.
Increases significantly the install size.</flag>
diff --git a/net-analyzer/net-snmp/net-snmp-5.9.3-r2.ebuild
b/net-analyzer/net-snmp/net-snmp-5.9.3-r3.ebuild
similarity index 97%
rename from net-analyzer/net-snmp/net-snmp-5.9.3-r2.ebuild
rename to net-analyzer/net-snmp/net-snmp-5.9.3-r3.ebuild
index 445393a852b7..e722811f3ceb 100644
--- a/net-analyzer/net-snmp/net-snmp-5.9.3-r2.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.9.3-r3.ebuild
@@ -30,7 +30,7 @@ LICENSE="HPND BSD GPL-2"
SLOT="0/40"
IUSE="
X bzip2 doc elf kmem ipv6 lm-sensors mfd-rewrites minimal mysql
- netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat
valgrind zlib
+ netlink pcap pci pcre perl python rpm selinux smux ssl tcpd ucd-compat
valgrind zlib
"
REQUIRED_USE="
python? ( ${PYTHON_REQUIRED_USE} )
@@ -47,6 +47,7 @@ COMMON_DEPEND="
netlink? ( dev-libs/libnl:3 )
pcap? ( net-libs/libpcap )
pci? ( sys-apps/pciutils )
+ pcre? ( dev-libs/libpcre )
perl? ( dev-lang/perl:= )
python? (
$(python_gen_cond_dep '
@@ -147,6 +148,7 @@ src_configure() {
$(use_with netlink nl) \
$(use_with pcap) \
$(use_with pci) \
+ $(use_with pcre) \
$(use_with perl perl-modules INSTALLDIRS=vendor) \
$(use_with python python-modules) \
$(use_with rpm) \
diff --git a/net-analyzer/net-snmp/net-snmp-9999.ebuild
b/net-analyzer/net-snmp/net-snmp-9999.ebuild
index 8d46910e24ac..c7a25ac6302a 100644
--- a/net-analyzer/net-snmp/net-snmp-9999.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-9999.ebuild
@@ -30,7 +30,7 @@ LICENSE="HPND BSD GPL-2"
SLOT="0/40"
IUSE="
X bzip2 doc elf kmem ipv6 lm-sensors mfd-rewrites minimal mysql
- netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat zlib
+ netlink pcap pci pcre perl python rpm selinux smux ssl tcpd ucd-compat
valgrind zlib
"
REQUIRED_USE="
python? ( ${PYTHON_REQUIRED_USE} )
@@ -47,6 +47,7 @@ COMMON_DEPEND="
netlink? ( dev-libs/libnl:3 )
pcap? ( net-libs/libpcap )
pci? ( sys-apps/pciutils )
+ pcre? ( dev-libs/libpcre )
perl? ( dev-lang/perl:= )
python? (
$(python_gen_cond_dep '
@@ -65,7 +66,10 @@ COMMON_DEPEND="
zlib? ( >=sys-libs/zlib-1.1.4 )
"
BDEPEND="doc? ( app-doc/doxygen )"
-DEPEND="${COMMON_DEPEND}"
+DEPEND="
+ ${COMMON_DEPEND}
+ valgrind? ( dev-util/valgrind )
+"
RDEPEND="
${COMMON_DEPEND}
perl? (
@@ -129,6 +133,8 @@ src_configure() {
# Assume /etc/mtab is not present with a recent baselayout/openrc (bug
#565136)
use kernel_linux && export ac_cv_ETC_MNTTAB=/etc/mtab
+ export ac_cv_header_valgrind_{valgrind,memcheck}_h=$(usex valgrind)
+
econf \
$(use_enable !ssl internal-md5) \
$(use_enable ipv6) \
@@ -142,6 +148,7 @@ src_configure() {
$(use_with netlink nl) \
$(use_with pcap) \
$(use_with pci) \
+ $(use_with pcre) \
$(use_with perl perl-modules INSTALLDIRS=vendor) \
$(use_with python python-modules) \
$(use_with rpm) \
