commit:     1c9c4814190fc6adaa80cd74a98690cea8674396
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 21 08:09:50 2020 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Aug 21 08:14:34 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c9c4814

net-analyzer/net-snmp: Use corrected tarball

Someone upstream noticed[0] that the 5.9 tarball contained object files and
a new tarball minus those files was uploaded to replace the original
tarball both on Sourceforge and Github. However, the new tarball had
gzip (but not pigz) complaining about a format error. Let's use a freshly
rolled tarball instead and drop the code that removes the object files.

[0] https://sourceforge.net/p/net-snmp/mailman/message/37087476/

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 net-analyzer/net-snmp/Manifest                                       | 2 +-
 .../net-snmp/{net-snmp-5.9-r1.ebuild => net-snmp-5.9-r2.ebuild}      | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index e65dc054b55..56bc06453f0 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -1,3 +1,3 @@
 DIST net-snmp-5.7.3-patches-3.tar.xz 3176 BLAKE2B 
1a71d6743afb841f664c6058e32c7c411af62b0f36acd3bb9251804893ed12f462a0c5bab828e309eeec7824def2dca8fa866350b90a62ec4f0df1141b51ecae
 SHA512 
d8a91b9668320a1e19d062eb86dd4d16beb7c2d15ac7ebbb9d2a4bd298af39bbb0a2613504dbb0057cccdec731f08f2308c5a15395e1fbc29bb0611ed8aca636
 DIST net-snmp-5.8.1.pre1.tar.gz 6630615 BLAKE2B 
32ae7177fc08a773928da7f19cd06617feb1358c0dd21d39e08db460fa4267b6353f4afede1f5a500a628235a6a94d95700c84df6e85bda18b7a7a6e7bf3781f
 SHA512 
e1ad421970abb67490a08fa735bbe9ff77a6fc5a19b8bf6942bef80f5b328f8038373cd5995970085177bcfe939dfa309019512b2abce0e8cf779e693f7d6dbd
-DIST net-snmp-5.9.tar.gz 37424919 BLAKE2B 
673c7f5e05b5562821b907e9e06e7dd80e6f3c08521cdd71321cbe9774f0f60993682670b1188b89a39ba560d10f2234ca0fb4e76e867ab26f2c82799621e8de
 SHA512 
ddba2c2fc220ee18e3f8b6756a754e206d0d7dc9b9615c92596cd16b38557bd2c7327d7bb8164fa67d85a4c757eb4f7a7dad9584e4af13facfec6b1ccae7961b
+DIST net-snmp-5.9.tar.xz 4082580 BLAKE2B 
9dfd5a7dfe4ca18b16c71c9f5cb70c540d16aa36a0b2dacd3ddc465934f96ac473f77490af78d202bf6dad4eddea5d75665a770df74132aafda39f5f3a87d835
 SHA512 
3f1e27caa8e5306d451b61b08c2daf007929a850661962fcd29b528a80332a980184303a7e87c96d8d2774181758889dc825cb08e3c3b353c5e7ca1ebcc09173

diff --git a/net-analyzer/net-snmp/net-snmp-5.9-r1.ebuild 
b/net-analyzer/net-snmp/net-snmp-5.9-r2.ebuild
similarity index 96%
rename from net-analyzer/net-snmp/net-snmp-5.9-r1.ebuild
rename to net-analyzer/net-snmp/net-snmp-5.9-r2.ebuild
index 09e90cd5624..1e5af8e04ff 100644
--- a/net-analyzer/net-snmp/net-snmp-5.9-r1.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.9-r2.ebuild
@@ -13,8 +13,8 @@ inherit autotools distutils-r1 perl-module systemd
 DESCRIPTION="Software for generating and retrieving SNMP data"
 HOMEPAGE="http://www.net-snmp.org/";
 SRC_URI="
-       mirror://sourceforge/project/${PN}/${PN}/${PV/_rc*/}/${P/_rc/.rc}.tar.gz
        https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-3.tar.xz
+       https://dev.gentoo.org/~jer/${P}.tar.xz
 "
 
 # GPL-2 for the init scripts
@@ -85,9 +85,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-       find -type d -name .libs -depth -exec rm -r {} \; || die
-       find -type f -name '*.o' -o -name '*.lo' -exec rm {} \; || die
-
        # snmpconf generates config files with proper selinux context
        use selinux && eapply "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch
 

Reply via email to