From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/net-snmp/files/, net-analyzer/net-snmp/
Date: Fri, 1 Jul 2022 08:41:13 +0000 (UTC) [thread overview]
Message-ID: <1656664838.b2f6635d7773958a92d502d57fabd9edfa185d59.sam@gentoo> (raw)
commit: b2f6635d7773958a92d502d57fabd9edfa185d59
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 1 08:38:00 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 1 08:40:38 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2f6635d
net-analyzer/net-snmp: add 5.9.2
Bug: https://bugs.gentoo.org/855500
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-analyzer/net-snmp/Manifest | 1 +
.../files/net-snmp-5.9.2-fix-LDFLAGS.patch | 18 ++++++++++++++
...-snmp-99999999.ebuild => net-snmp-5.9.2.ebuild} | 29 +++++++++++++++-------
...t-snmp-99999999.ebuild => net-snmp-9999.ebuild} | 29 +++++++++++++++-------
4 files changed, 59 insertions(+), 18 deletions(-)
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index b4a54d47a08d..ebce48029c46 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.1.tar.gz 6781346 BLAKE2B 4242ca77372005f995dfd228bec51d35b6b0f8c0ab0e44ed40cdb3cc0578b64e97444ffcb074dceca30739deadb46e68f1c75e87d3f1768d81b5e084b0fc0f5f SHA512 ae158ab41961ee2064d85187337979e6ff6ba90f3136b8a960e9ae46ee1408d9d2f0c5c4dfc3a3302e6dbb357cddf1221489435288c4f52182a03e94a9e450c3
+DIST net-snmp-5.9.2.tar.gz 6646200 BLAKE2B 95af69d530d3f5267bb75165cc2cf72128547a14fe4148d20610a45d42298475fb4c553c1e4eff1ffb4a368b609868b0ca36530c0f3a98800cf6290707bb3fb7 SHA512 d67810b15c4956a28ccb4d9a3870604bc94e71247d9a8d3a9959041268122b3500cf68a7912cfb01a6cff27f3f4364cbd106629ab80c12974f694b6c548bde59
diff --git a/net-analyzer/net-snmp/files/net-snmp-5.9.2-fix-LDFLAGS.patch b/net-analyzer/net-snmp/files/net-snmp-5.9.2-fix-LDFLAGS.patch
new file mode 100644
index 000000000000..158d8f1b5bee
--- /dev/null
+++ b/net-analyzer/net-snmp/files/net-snmp-5.9.2-fix-LDFLAGS.patch
@@ -0,0 +1,18 @@
+diff --git a/Makefile.top b/Makefile.top
+index d6394ca..f5119b5 100644
+--- a/Makefile.top
++++ b/Makefile.top
+@@ -86,11 +86,11 @@ LIBCURRENT = 41
+ LIBAGE = 2
+ LIBREVISION = 0
+
+-LIB_LD_CMD = $(LIBTOOL) --mode=link $(LINKCC) $(CFLAGS) -rpath $(libdir) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) @LD_NO_UNDEFINED@ -o
++LIB_LD_CMD = $(LIBTOOL) --mode=link $(LINKCC) $(CFLAGS) $(LDFLAGS) -rpath $(libdir) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) @LD_NO_UNDEFINED@ -o
+ LIB_EXTENSION = la
+ LIB_VERSION =
+ LIB_LDCONFIG_CMD = $(LIBTOOL) --mode=finish $(INSTALL_PREFIX)$(libdir)
+-LINK = $(LIBTOOL) --mode=link $(LINKCC)
++LINK = $(LIBTOOL) --mode=link $(LINKCC) $(LDFLAGS)
+ # RANLIB = @RANLIB@
+ RANLIB = :
+
diff --git a/net-analyzer/net-snmp/net-snmp-99999999.ebuild b/net-analyzer/net-snmp/net-snmp-5.9.2.ebuild
similarity index 86%
copy from net-analyzer/net-snmp/net-snmp-99999999.ebuild
copy to net-analyzer/net-snmp/net-snmp-5.9.2.ebuild
index 80a7944c40df..ca95665fcf9a 100644
--- a/net-analyzer/net-snmp/net-snmp-99999999.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.9.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
DISTUTILS_OPTIONAL=yes
DISTUTILS_SINGLE_IMPL=yes
@@ -9,12 +9,21 @@ GENTOO_DEPEND_ON_PERL=no
PYTHON_COMPAT=( python3_{8..10} )
WANT_AUTOMAKE=none
-inherit autotools distutils-r1 git-r3 perl-module systemd
+inherit autotools distutils-r1 perl-module systemd
DESCRIPTION="Software for generating and retrieving SNMP data"
-HOMEPAGE="http://www.net-snmp.org/"
-EGIT_REPO_URI="https://github.com/net-snmp/net-snmp"
-SRC_URI="https://dev.gentoo.org/~jsmolic/distfiles/${PN}-5.7.3-patches-3.tar.xz"
+HOMEPAGE="https://www.net-snmp.org/"
+if [[ ${PV} == 9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/net-snmp/net-snmp"
+ 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"
+
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+SRC_URI+=" https://dev.gentoo.org/~jsmolic/distfiles/${PN}-5.7.3-patches-3.tar.xz"
# GPL-2 for the init scripts
LICENSE="HPND BSD GPL-2"
@@ -67,13 +76,13 @@ RDEPEND="
"
PATCHES=(
- "${FILESDIR}"/${PN}-5.7.3-include-limits.patch
"${FILESDIR}"/${PN}-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch
"${FILESDIR}"/${PN}-5.8-pcap.patch
"${FILESDIR}"/${PN}-5.8.1-pkg-config.patch
"${FILESDIR}"/${PN}-5.8.1-net-snmp-config-libdir.patch
"${FILESDIR}"/${PN}-5.8.1-mysqlclient.patch
"${FILESDIR}"/${PN}-5.9-MakeMaker.patch
+ "${FILESDIR}"/${PN}-5.9.2-fix-LDFLAGS.patch
"${FILESDIR}"/${PN}-99999999-tinfo.patch
)
@@ -83,15 +92,18 @@ pkg_setup() {
src_unpack() {
default
- git-r3_src_unpack
+
+ [[ ${PV} == 9999 ]] && git-r3_src_unpack
}
src_prepare() {
# snmpconf generates config files with proper selinux context
use selinux && eapply "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch
+ mv "${WORKDIR}"/patches/0001-Fix-toolchain-quadruplet-detection-Gentoo-bug-432004.patch{,.disabled} || die
mv "${WORKDIR}"/patches/0002-Respect-DESTDIR-for-pythoninstall.patch{,.disabled} || die
mv "${WORKDIR}"/patches/0004-Don-t-report-CFLAGS-and-LDFLAGS-in-net-snmp-config.patch{,.disabled} || die
+ mv "${WORKDIR}"/patches/0005-Respect-LDFLAGS-properly.patch{,.disabled} || die
eapply "${WORKDIR}"/patches/*.patch
default
@@ -127,7 +139,6 @@ src_configure() {
$(use_with ssl openssl) \
$(use_with tcpd libwrap) \
$(use_with zlib) \
- --disable-static \
--enable-shared \
--with-default-snmp-version="3" \
--with-ldflags="${LDFLAGS}" \
diff --git a/net-analyzer/net-snmp/net-snmp-99999999.ebuild b/net-analyzer/net-snmp/net-snmp-9999.ebuild
similarity index 86%
rename from net-analyzer/net-snmp/net-snmp-99999999.ebuild
rename to net-analyzer/net-snmp/net-snmp-9999.ebuild
index 80a7944c40df..ca95665fcf9a 100644
--- a/net-analyzer/net-snmp/net-snmp-99999999.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
DISTUTILS_OPTIONAL=yes
DISTUTILS_SINGLE_IMPL=yes
@@ -9,12 +9,21 @@ GENTOO_DEPEND_ON_PERL=no
PYTHON_COMPAT=( python3_{8..10} )
WANT_AUTOMAKE=none
-inherit autotools distutils-r1 git-r3 perl-module systemd
+inherit autotools distutils-r1 perl-module systemd
DESCRIPTION="Software for generating and retrieving SNMP data"
-HOMEPAGE="http://www.net-snmp.org/"
-EGIT_REPO_URI="https://github.com/net-snmp/net-snmp"
-SRC_URI="https://dev.gentoo.org/~jsmolic/distfiles/${PN}-5.7.3-patches-3.tar.xz"
+HOMEPAGE="https://www.net-snmp.org/"
+if [[ ${PV} == 9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/net-snmp/net-snmp"
+ 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"
+
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+SRC_URI+=" https://dev.gentoo.org/~jsmolic/distfiles/${PN}-5.7.3-patches-3.tar.xz"
# GPL-2 for the init scripts
LICENSE="HPND BSD GPL-2"
@@ -67,13 +76,13 @@ RDEPEND="
"
PATCHES=(
- "${FILESDIR}"/${PN}-5.7.3-include-limits.patch
"${FILESDIR}"/${PN}-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch
"${FILESDIR}"/${PN}-5.8-pcap.patch
"${FILESDIR}"/${PN}-5.8.1-pkg-config.patch
"${FILESDIR}"/${PN}-5.8.1-net-snmp-config-libdir.patch
"${FILESDIR}"/${PN}-5.8.1-mysqlclient.patch
"${FILESDIR}"/${PN}-5.9-MakeMaker.patch
+ "${FILESDIR}"/${PN}-5.9.2-fix-LDFLAGS.patch
"${FILESDIR}"/${PN}-99999999-tinfo.patch
)
@@ -83,15 +92,18 @@ pkg_setup() {
src_unpack() {
default
- git-r3_src_unpack
+
+ [[ ${PV} == 9999 ]] && git-r3_src_unpack
}
src_prepare() {
# snmpconf generates config files with proper selinux context
use selinux && eapply "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch
+ mv "${WORKDIR}"/patches/0001-Fix-toolchain-quadruplet-detection-Gentoo-bug-432004.patch{,.disabled} || die
mv "${WORKDIR}"/patches/0002-Respect-DESTDIR-for-pythoninstall.patch{,.disabled} || die
mv "${WORKDIR}"/patches/0004-Don-t-report-CFLAGS-and-LDFLAGS-in-net-snmp-config.patch{,.disabled} || die
+ mv "${WORKDIR}"/patches/0005-Respect-LDFLAGS-properly.patch{,.disabled} || die
eapply "${WORKDIR}"/patches/*.patch
default
@@ -127,7 +139,6 @@ src_configure() {
$(use_with ssl openssl) \
$(use_with tcpd libwrap) \
$(use_with zlib) \
- --disable-static \
--enable-shared \
--with-default-snmp-version="3" \
--with-ldflags="${LDFLAGS}" \
next reply other threads:[~2022-07-01 8:41 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-01 8:41 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-11-19 19:36 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/net-snmp/files/, net-analyzer/net-snmp/ Sam James
2021-02-27 7:46 Sam James
2020-08-15 13:18 Jeroen Roovers
2020-08-06 5:51 Jeroen Roovers
2019-09-10 7:35 Jeroen Roovers
2019-09-09 6:58 Jeroen Roovers
2019-08-19 20:38 Jeroen Roovers
2018-02-21 20:44 Anthony G. Basile
2017-08-26 11:33 Jeroen Roovers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1656664838.b2f6635d7773958a92d502d57fabd9edfa185d59.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox