From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 415CC138359 for ; Sat, 15 Aug 2020 13:18:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5AD93E0825; Sat, 15 Aug 2020 13:18:35 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 05D44E0825 for ; Sat, 15 Aug 2020 13:18:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6DBA734F392 for ; Sat, 15 Aug 2020 13:18:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E75812EE for ; Sat, 15 Aug 2020 13:18:31 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1597497510.41ce6d213a8daee9d1d607a836bec31a4b975085.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/net-snmp/files/, net-analyzer/net-snmp/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/net-snmp/Manifest net-analyzer/net-snmp/files/net-snmp-5.9-MakeMaker.patch net-analyzer/net-snmp/net-snmp-5.9.ebuild net-analyzer/net-snmp/net-snmp-99999999.ebuild X-VCS-Directories: net-analyzer/net-snmp/ net-analyzer/net-snmp/files/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 41ce6d213a8daee9d1d607a836bec31a4b975085 X-VCS-Branch: master Date: Sat, 15 Aug 2020 13:18:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 599a31a0-2c20-42ab-a4c6-0d153d8df653 X-Archives-Hash: e6718ae5af2d74e1872b3a6604bf69da commit: 41ce6d213a8daee9d1d607a836bec31a4b975085 Author: Jeroen Roovers gentoo org> AuthorDate: Sat Aug 15 13:18:04 2020 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Sat Aug 15 13:18:30 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41ce6d21 net-analyzer/net-snmp: Version 5.9 Package-Manager: Portage-3.0.2, Repoman-2.3.23 Signed-off-by: Jeroen Roovers gentoo.org> net-analyzer/net-snmp/Manifest | 1 + .../net-snmp/files/net-snmp-5.9-MakeMaker.patch | 10 +++++++ ...et-snmp-99999999.ebuild => net-snmp-5.9.ebuild} | 31 +++++++++------------- net-analyzer/net-snmp/net-snmp-99999999.ebuild | 20 +++++++------- 4 files changed, 34 insertions(+), 28 deletions(-) diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest index 810f50fdabf..49e33a99e38 100644 --- a/net-analyzer/net-snmp/Manifest +++ b/net-analyzer/net-snmp/Manifest @@ -3,3 +3,4 @@ DIST net-snmp-5.8.1.pre1.tar.gz 6630615 BLAKE2B 32ae7177fc08a773928da7f19cd06617 DIST net-snmp-5.8.1.pre2.tar.gz 6642893 BLAKE2B 4b2a1e87738c3bde49354f0cca84628f2953ee14f6b08ca53cf0bc5c320052cb4fe0f6eeb46551eaf2d45ba9c17f86ce06b64c00c1629b2d17bc351c0ccb37a8 SHA512 78cd9a29cc89ff7fa170ee767db3ca2077fc1d877f207c018887c2ea0148ffaf01eb013efc21b47f14c893a6ca48b3b439210ccd27dfc77f8c8e56bf9546f23e DIST net-snmp-5.8.1.rc1.tar.gz 6690067 BLAKE2B 35f9547de7b40c8a6f4a046e5cdb9b4a28650f0d87d51572659c5cbb0759503b9d328fc227fa2061f18a733ceaa8c22aa771fabe685a97fab1dc9b5ff98c2648 SHA512 294f2c5656bfc5141ef6aa5826f79b886094ea702ec20918c0ff20aa4100c8503b33a21086c6c028cff25c05504b9f8ed29533c89745586e32d63839345e2331 DIST net-snmp-5.8.tar.gz 6591680 BLAKE2B ac1bff4152310da57818a00d752a08a7fc61d697b02479d9952ca12d024d3d68dc8bfa674571e93d6f3597605b2fe91513fb6839057a80f2c3dd8d0cce0077f2 SHA512 27895a583b23f3e14c48562bc32f3ba83513d81aa848e878be9a3650f0458d45950635c937ef627135f80b757b663e71fab9a3bde4fd91889153998ae3468fe7 +DIST net-snmp-5.9.tar.gz 37424919 BLAKE2B 673c7f5e05b5562821b907e9e06e7dd80e6f3c08521cdd71321cbe9774f0f60993682670b1188b89a39ba560d10f2234ca0fb4e76e867ab26f2c82799621e8de SHA512 ddba2c2fc220ee18e3f8b6756a754e206d0d7dc9b9615c92596cd16b38557bd2c7327d7bb8164fa67d85a4c757eb4f7a7dad9584e4af13facfec6b1ccae7961b diff --git a/net-analyzer/net-snmp/files/net-snmp-5.9-MakeMaker.patch b/net-analyzer/net-snmp/files/net-snmp-5.9-MakeMaker.patch new file mode 100644 index 00000000000..1c6a3fd1eaf --- /dev/null +++ b/net-analyzer/net-snmp/files/net-snmp-5.9-MakeMaker.patch @@ -0,0 +1,10 @@ +--- a/perl/Makefile.PL ++++ b/perl/Makefile.PL +@@ -3,6 +3,7 @@ + use ExtUtils::MakeMaker; + use Config; + require 5; ++use lib '.'; + use MakefileSubs; + + # Prevent that MakeMaker complains about unknown parameter names. diff --git a/net-analyzer/net-snmp/net-snmp-99999999.ebuild b/net-analyzer/net-snmp/net-snmp-5.9.ebuild similarity index 92% copy from net-analyzer/net-snmp/net-snmp-99999999.ebuild copy to net-analyzer/net-snmp/net-snmp-5.9.ebuild index d75684cc5af..5f50c7d5aff 100644 --- a/net-analyzer/net-snmp/net-snmp-99999999.ebuild +++ b/net-analyzer/net-snmp/net-snmp-5.9.ebuild @@ -2,26 +2,25 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) -DISTUTILS_SINGLE_IMPL=yesplz DISTUTILS_OPTIONAL=yesplz -WANT_AUTOMAKE=none -PATCHSET=3 +DISTUTILS_SINGLE_IMPL=yesplz GENTOO_DEPEND_ON_PERL=no - -inherit autotools distutils-r1 git-r3 perl-module systemd +PATCHSET=3 +PYTHON_COMPAT=( python3_{6,7,8} ) +WANT_AUTOMAKE=none +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=" + 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 " # GPL-2 for the init scripts LICENSE="HPND BSD GPL-2" SLOT="0/40" -KEYWORDS="" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" IUSE=" X bzip2 doc elf kmem ipv6 libressl lm-sensors mfd-rewrites minimal mysql netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat zlib @@ -69,8 +68,6 @@ RDEPEND=" ) selinux? ( sec-policy/selinux-snmp ) " -S=${WORKDIR}/${P/_/.} -S=${WORKDIR}/${P/_p*/} RESTRICT=test PATCHES=( "${FILESDIR}"/${PN}-5.7.3-include-limits.patch @@ -79,6 +76,7 @@ PATCHES=( "${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}-99999999-tinfo.patch ) @@ -86,11 +84,6 @@ pkg_setup() { use python && python-single-r1_pkg_setup } -src_unpack() { - default - 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 @@ -132,7 +125,8 @@ src_configure() { $(use_with ssl openssl) \ $(use_with tcpd libwrap) \ $(use_with zlib) \ - --enable-shared --disable-static \ + --disable-static \ + --enable-shared \ --with-default-snmp-version="3" \ --with-install-prefix="${D}" \ --with-ldflags="${LDFLAGS}" \ @@ -144,8 +138,9 @@ src_configure() { } src_compile() { - for target in snmplib agent sedscript all; do - emake OTHERLDFLAGS="${LDFLAGS}" ${target} + local subdir + for subdir in snmplib agent/mibgroup agent apps .; do + emake OTHERLDFLAGS="${LDFLAGS}" -C ${subdir} all done use doc && emake docsdox diff --git a/net-analyzer/net-snmp/net-snmp-99999999.ebuild b/net-analyzer/net-snmp/net-snmp-99999999.ebuild index d75684cc5af..b3478934c9a 100644 --- a/net-analyzer/net-snmp/net-snmp-99999999.ebuild +++ b/net-analyzer/net-snmp/net-snmp-99999999.ebuild @@ -2,13 +2,12 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) -DISTUTILS_SINGLE_IMPL=yesplz DISTUTILS_OPTIONAL=yesplz -WANT_AUTOMAKE=none -PATCHSET=3 +DISTUTILS_SINGLE_IMPL=yesplz GENTOO_DEPEND_ON_PERL=no - +PATCHSET=3 +PYTHON_COMPAT=( python3_{6,7,8} ) +WANT_AUTOMAKE=none inherit autotools distutils-r1 git-r3 perl-module systemd DESCRIPTION="Software for generating and retrieving SNMP data" @@ -69,8 +68,6 @@ RDEPEND=" ) selinux? ( sec-policy/selinux-snmp ) " -S=${WORKDIR}/${P/_/.} -S=${WORKDIR}/${P/_p*/} RESTRICT=test PATCHES=( "${FILESDIR}"/${PN}-5.7.3-include-limits.patch @@ -79,6 +76,7 @@ PATCHES=( "${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}-99999999-tinfo.patch ) @@ -132,7 +130,8 @@ src_configure() { $(use_with ssl openssl) \ $(use_with tcpd libwrap) \ $(use_with zlib) \ - --enable-shared --disable-static \ + --disable-static \ + --enable-shared \ --with-default-snmp-version="3" \ --with-install-prefix="${D}" \ --with-ldflags="${LDFLAGS}" \ @@ -144,8 +143,9 @@ src_configure() { } src_compile() { - for target in snmplib agent sedscript all; do - emake OTHERLDFLAGS="${LDFLAGS}" ${target} + local subdir + for subdir in snmplib agent/mibgroup agent apps .; do + emake OTHERLDFLAGS="${LDFLAGS}" -C ${subdir} all done use doc && emake docsdox