commit: dcbf0e6a9fd159eeaf3229be6741956f4e63e986
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 17 06:06:23 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Aug 17 06:06:23 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcbf0e6a
net-analyzer/net-snmp: add 5.9.4
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-analyzer/net-snmp/Manifest | 1 +
.../{net-snmp-9999.ebuild => net-snmp-5.9.4.ebuild} | 14 +++++++++-----
net-analyzer/net-snmp/net-snmp-9999.ebuild | 2 +-
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index e203e4bdb4fb..b0d07d45b397 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -1,2 +1,3 @@
DIST net-snmp-5.7.3-patches-3.tar.xz 3176 BLAKE2B
1a71d6743afb841f664c6058e32c7c411af62b0f36acd3bb9251804893ed12f462a0c5bab828e309eeec7824def2dca8fa866350b90a62ec4f0df1141b51ecae
SHA512
d8a91b9668320a1e19d062eb86dd4d16beb7c2d15ac7ebbb9d2a4bd298af39bbb0a2613504dbb0057cccdec731f08f2308c5a15395e1fbc29bb0611ed8aca636
DIST net-snmp-5.9.3.tar.gz 6646950 BLAKE2B
b8e3de60e178ec16ad2848ad77f3bd4cbd35eaa9be103c0fa5d17514c29df4e69015ac53b54c9e565e3032b0c0bb47c19729e65310a6acefae901e101ea49451
SHA512
a476df4967029a2eb03d27b0e250170785d0a8c143d49b900ee958c3cbdfaccd415b70af40f6fbed9cb8819d522c35a6073a431091d908ccc7c018fa0aaa2abc
+DIST net-snmp-5.9.4.tar.gz 6681606 BLAKE2B
2f3dfdc4ce2f4d9a1a771a77e0b0c427a89e3de6dc217009df385baabc7d860ca7714fa76360a4d14521f1b88c9c13ad46b25d3975e33e8bc4bce3eb3b27b99d
SHA512
a510fa91a21e9ddc86a12fd1d0bc6b356e63f3ea53f184d2e31439004d41d902390664134dc40b3b828eabb4282eaf3da628a07c4d480fa00eff7e700950c423
diff --git a/net-analyzer/net-snmp/net-snmp-9999.ebuild
b/net-analyzer/net-snmp/net-snmp-5.9.4.ebuild
similarity index 92%
copy from net-analyzer/net-snmp/net-snmp-9999.ebuild
copy to net-analyzer/net-snmp/net-snmp-5.9.4.ebuild
index 1c946612076d..b3f01b402c12 100644
--- a/net-analyzer/net-snmp/net-snmp-9999.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.9.4.ebuild
@@ -6,7 +6,7 @@ EAPI=8
DISTUTILS_OPTIONAL=yes
DISTUTILS_SINGLE_IMPL=yes
GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{9..11} )
WANT_AUTOMAKE=none
inherit autotools distutils-r1 perl-module systemd
@@ -18,7 +18,7 @@ if [[ ${PV} == 9999 ]] ; then
inherit git-r3
else
# https://github.com/net-snmp/net-snmp/archive/refs/tags/v${PV}.tar.gz
-> ${P}.tar.gz
- SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
+ SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc ~x86"
fi
@@ -47,7 +47,7 @@ COMMON_DEPEND="
netlink? ( dev-libs/libnl:3 )
pcap? ( net-libs/libpcap )
pci? ( sys-apps/pciutils )
- pcre? ( dev-libs/libpcre2 )
+ pcre? ( dev-libs/libpcre )
perl? ( dev-lang/perl:= )
python? (
$(python_gen_cond_dep '
@@ -91,6 +91,11 @@ PATCHES=(
"${FILESDIR}"/${PN}-5.8-pcap.patch
"${FILESDIR}"/${PN}-5.8.1-mysqlclient.patch
"${FILESDIR}"/${PN}-5.9-MakeMaker.patch
+ # https://github.com/net-snmp/net-snmp/pull/493
+ "${FILESDIR}"/${PN}-5.9.3-0001-Fix-LDFLAGS-vs-LIBS-ordering.patch
+ "${FILESDIR}"/${PN}-5.9.3-0002-Tidy-up-net-snmp-config-output.patch
+
"${FILESDIR}"/${PN}-5.9.3-0003-Prune-Libs.private-entries-in-netsnmp-.pc.in.patch
+
"${FILESDIR}"/${PN}-5.9.3-0004-Search-for-ltinfo-in-configure-if-needed.patch
)
pkg_setup() {
@@ -142,8 +147,7 @@ src_configure() {
$(use_with netlink nl) \
$(use_with pcap) \
$(use_with pci) \
- $(use_with pcre pcre2-8) \
- --without-pcre \
+ $(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 1c946612076d..e00752e65c72 100644
--- a/net-analyzer/net-snmp/net-snmp-9999.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-9999.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == 9999 ]] ; then
inherit git-r3
else
# https://github.com/net-snmp/net-snmp/archive/refs/tags/v${PV}.tar.gz
-> ${P}.tar.gz
- SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
+ SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc ~x86"
fi
