From 948d557b4a61dc14722668b6b11a4cf3cee07b01 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 13 Sep 2019 17:56:30 +0100 Subject: gentoo resync : 13.09.2019 --- net-analyzer/net-snmp/Manifest | 11 +- ...snmp-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch | 34 ++++ .../net-snmp/files/net-snmp-5.8-pcap.patch | 41 ++++ net-analyzer/net-snmp/metadata.xml | 3 +- net-analyzer/net-snmp/net-snmp-5.8-r1.ebuild | 6 +- net-analyzer/net-snmp/net-snmp-5.8-r2.ebuild | 6 +- net-analyzer/net-snmp/net-snmp-5.8-r4.ebuild | 206 +++++++++++++++++++++ net-analyzer/net-snmp/net-snmp-99999999.ebuild | 42 +++-- 8 files changed, 320 insertions(+), 29 deletions(-) create mode 100644 net-analyzer/net-snmp/files/net-snmp-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch create mode 100644 net-analyzer/net-snmp/files/net-snmp-5.8-pcap.patch create mode 100644 net-analyzer/net-snmp/net-snmp-5.8-r4.ebuild (limited to 'net-analyzer/net-snmp') diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest index df29868ad6f4..3b059f42287d 100644 --- a/net-analyzer/net-snmp/Manifest +++ b/net-analyzer/net-snmp/Manifest @@ -1,6 +1,8 @@ AUX net-snmp-5.1.2-snmpconf-selinux.patch 189 BLAKE2B ca3ac3cc5786226ca5ed73997df2b9ec5c75405f098ed8eb29a52f5187399a1a6fd357613ca10c8dad3a4a5c8f03e25771e785ec9673ae0d3da3970827b90afc SHA512 5859742fa90c297af17b1b1a4718af8d03edbb3a78f723c2cbde54576c68a5f562ed573cc0f8cfdd0bdee9d5accb769e6183dbd16d5e5aa66f0d43f174658f75 AUX net-snmp-5.7.3-include-limits.patch 578 BLAKE2B ae19f67f0e06a5010d8399e51f716cf7f2148ed9ed0737c00f195892346c2ec56985e2de9a12dbc111c98a012f591e69f6bac3d74ff8d83e36c56a9d0a21036e SHA512 47c27ac62c97a0b3ecfcfe05adeedd55436cc9cfc094a71f00df06cb5dece5f297c40fc255ad73e72a0c468a3c5f62afc98b79c0adc7d31a67813f25f1ec9415 +AUX net-snmp-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch 1257 BLAKE2B 2cdb98653d617e7c00a0ec2810d529e1b3e80668fdbbe771dd14a2dee3cf39dac069981bb2b8f8b9ae9fdaaef943a75662fc42cc8dd15000cdbf56ad6be6dc6c SHA512 3b5b48c1c1cad6953fe4687cca9a54161b6686bd887aa068f1ce61219d4772c839459eeecde8fde0863a75e65a9cfc0a8ec1a607e7e7aa47e2cfa19ef0dbcfab AUX net-snmp-5.8-my_bool.patch 751 BLAKE2B d0caff5c2cebb50cc2fcf4375d222f1146e3908698565eb7201d3e009b4bcbbccf653c336c1af9a23a8dc1a5f468da12d77d940ea4a00eb3f7c14db7dd45463e SHA512 5fe9d44653e5c26d1d1d6041b48f0abf5c38d148b8dfe82d6fc83290e66becc25dda43962a895994989f7267d5914f69969b118c999c324b7fac0184c383bbce +AUX net-snmp-5.8-pcap.patch 1030 BLAKE2B e082b3a9e889ee2f9abd3229ba09a7ac35ca61b5ef65b5fd3460b89ace7753d6bef55560b5c066705bbb1965625e9739f6ebfb78c3e5b5edee2607e3df0728ac SHA512 af60ee67f1407f846f2590008a7ee1d24777f1004547d6281d7bf21d79020e5ceb4b2d0502f08c7d9e25f0fd10b8c5a8e6309963f30f2e43167d1590194ce32e AUX net-snmp-5.8-tinfo.patch 340 BLAKE2B 59b75cc89e83d59249921f92ca3b54e3a6fb943a956bb603c891a253f2d015b23ef00029d42bb799625bfd3af2eab5803474fad2dace5d2013f7004221c71e8d SHA512 94598dd39c0067a161beba68bfa09ef4c0dc09376c94a4b0b7346a718e75da173a8c9cb37349c79ec6909fb82a39552ca84b170c3f7f07927386991771b4568e AUX snmpd.conf 552 BLAKE2B 9d2801b0ddc2148a62e332a1d355a9ddc050ec95aea2dde31f25413096c4b91dbab794c1e71b75f5baba1234d89729a6e8c50287098c04991a3eec4d9f512b3c SHA512 e64f93631e5cb2160d3fb26abb84fc74f5632d8875227d5c8dfa24809b25e8202dcf23251ea8f296aedf16298c31ce49b8e64fb6325c18775d8899a50b853bbc AUX snmpd.init.2 680 BLAKE2B ce21b60980c2a0d74c810bb473c6b4c70eb11a2fc0636ec4af8a262ce412324ba80bc6c72b2544d359b4e2f536cf329df99e0be7d96035fa20c25f9ab7dc4a16 SHA512 10394f04dee23537a195f5aed63a3e758ca90227e269076ae9d13f883c7bd666c1c43823d1b869c43f232e97dc4138e52648cae995327f7a7f676ba416ee6fff @@ -10,7 +12,8 @@ AUX snmptrapd.init.2 338 BLAKE2B 893a510af4cb7f4115c5995ecd40c6ac3c5d2fd4cf92524 AUX snmptrapd.service 190 BLAKE2B 6994e2f82e0ba03b31c2f079844a23c0070ff70726dd3c5976394c04bfd8da30917395b1a752f8e66502259d271ccf264c3e99f99e95df62b80447d4099d1dd7 SHA512 763682e3926fd1e7f28a013be2ad56cc53eed26a0415770906968e07a183128c9d5fb70d76513244ba0cc95fc2526b68c32207b5fda83b8f53c256549cfa1b1d DIST net-snmp-5.7.3-patches-3.tar.xz 3176 BLAKE2B 1a71d6743afb841f664c6058e32c7c411af62b0f36acd3bb9251804893ed12f462a0c5bab828e309eeec7824def2dca8fa866350b90a62ec4f0df1141b51ecae SHA512 d8a91b9668320a1e19d062eb86dd4d16beb7c2d15ac7ebbb9d2a4bd298af39bbb0a2613504dbb0057cccdec731f08f2308c5a15395e1fbc29bb0611ed8aca636 DIST net-snmp-5.8.tar.gz 6591680 BLAKE2B ac1bff4152310da57818a00d752a08a7fc61d697b02479d9952ca12d024d3d68dc8bfa674571e93d6f3597605b2fe91513fb6839057a80f2c3dd8d0cce0077f2 SHA512 27895a583b23f3e14c48562bc32f3ba83513d81aa848e878be9a3650f0458d45950635c937ef627135f80b757b663e71fab9a3bde4fd91889153998ae3468fe7 -EBUILD net-snmp-5.8-r1.ebuild 5264 BLAKE2B 08450602568f2b2854cb62c123709035259cf71435911fa34f9ba7aa512755d8a911373d831ec7645f1829c42281444da4bc85c6f30f7da1e2082290d0e3b572 SHA512 8d870aa51ac3d5d65dfef6e94ca38fe154d689c011d494e1a931852b34ddc17a5fb3382ba1637b3f7bffd6bf8e79c52a75a25a675c7b9b8a41ad1c8a8151f848 -EBUILD net-snmp-5.8-r2.ebuild 5321 BLAKE2B 495325377ce6ef83dbc4ad6b4ffae809ecc9e99ac5908a1a001c87ad275fe556cacc3866d0a2d712b49a9ae8c5d1fe11a70355cb457e4c9571b0448c02e2ee47 SHA512 9474859c802d792503a6d4235eac511de6210648092acf071f938e928675fb1cb560e33a78b34d1cebfde7098464c7df992fb78c67646c58d8a52bfa065bc671 -EBUILD net-snmp-99999999.ebuild 5227 BLAKE2B 30ce2a65e1628ce78759589124604cd9db583c05edfc7cd8c1ab05d31fec7368271eaa073dff921304849e835608f0e63d58c0775b85bd69d391a259b9d3d1a9 SHA512 9690b14e47ecb2e9e5d8f6d32a6e9c429b3c5561975f0045e82fa9616afaae1f892099f789243eb68fcb522e0318b19782bf82fbc848356c93aa97b3fd5ba47c -MISC metadata.xml 1193 BLAKE2B b53ad11776e58b025bb3655b4f3bb96580f0dbde557cfa037e272ab6e71411b4bec434a82df646da3f3b53e1eda24555cf26366084c27d8729ec0342249a5c93 SHA512 4b9d6d7d36786dd2176f0d90bc4f55f310595807d4a364132c098df60de2c0bab6e8619760de768667e1c13bbcf5d209a73469e06bd1d78323bea76ae4fdf981 +EBUILD net-snmp-5.8-r1.ebuild 5264 BLAKE2B 92dd24ccb4cb1b431bff22d4e3712fe86c126e64bd870b927a5c8cb5bb6ce8f32eff0cdaa55fb88e44ea0ad4d8d6bc9704c922ccf480cd20cf2af8c88ac3ce57 SHA512 91b3a19e4e96ba6f6bce0bd91d8b963b68d42da0cdc31a2bf527402367bbf1621c131e7c3848f005459f30290bdc839f64c79b80d1d0fe1c7840242a87b455b3 +EBUILD net-snmp-5.8-r2.ebuild 5321 BLAKE2B 6518dc5b01b36a4a231186bdee13c955b9df155d06e16c3561df12625b3f5637467dc8daaf27acac2694a1b22f54b8d29669ee779de54e25a1b17cc57c3efdb9 SHA512 c1de2dd6516e2230203d085090790ab566d500975ab94c14c07afafe8c1822b3458f60dae6bb2c55bb576d5c5c5ed73c697d51fa5d8ce947cca6b0198cfa3461 +EBUILD net-snmp-5.8-r4.ebuild 5493 BLAKE2B 97520422d339c0b95df79990463423963b96c0c2d33d5639ba6350315b7f9c9d91e1b973056b38dc8300fca1f18bdf0b6da7550e3b22a1e2938b8abe15eb7ada SHA512 6b8c6356f7ba8da4d49f932380d3929154670bbaa93f9baa639e4a91b97bb759df1f65db264f1040351fc0eab2354a99da20c9d495e84292625ef6cb584a92a0 +EBUILD net-snmp-99999999.ebuild 5318 BLAKE2B 4dcb3ceacf691790ee8a7553c1d1a1b8cfa672385cfb6446820a4a997a0a9b0d438ec9d2fd01407b50bc8c07cc0a5fe2808bf806438ba2aa5b99cd545cddd452 SHA512 1fc4beb414853e3b1a2b7bc66d89fe671e0ef93966289e4ad866ba811d5297a2dba35e386fc1e6926fe993861f36872df8173d98b05aebbfde42a537682cfd92 +MISC metadata.xml 1296 BLAKE2B 76a0264baf629293eac4127e3dbaf167b5af236e53e0de9cb1c65869242d13e6d5f3c90d47856d5f8c63eba34661698637dd7da56b307d9e6e07403bf91df320 SHA512 ff45396992b1804f3774bd532438b8e64327dfa71c109cde9073f6a5a17f6c3dcc2ba1278359fa10d5eb00c3ead0368706d29178466e9b8586b66e0219d7e4b0 diff --git a/net-analyzer/net-snmp/files/net-snmp-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch b/net-analyzer/net-snmp/files/net-snmp-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch new file mode 100644 index 000000000000..4e3001e1e473 --- /dev/null +++ b/net-analyzer/net-snmp/files/net-snmp-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch @@ -0,0 +1,34 @@ +--- a/net-snmp-config.in ++++ b/net-snmp-config.in +@@ -190,13 +190,13 @@ + #################################################### client lib + --libs) + # use this one == --netsnmp-libs + --external-libs +- echo $NSC_LDFLAGS $NSC_LIBDIR $NSC_SNMPLIBS $NSC_LIBS ++ echo $NSC_LIBDIR $NSC_SNMPLIBS $NSC_LIBS + ;; + --netsnmp-libs) + echo $NSC_LIBDIR $NSC_BASE_SNMP_LIBS + ;; + --external-libs) +- echo $NSC_LDFLAGS $NSC_LNETSNMPLIBS $NSC_LIBS @PERLLDOPTS_FOR_APPS@ ++ echo $NSC_LNETSNMPLIBS $NSC_LIBS @PERLLDOPTS_FOR_APPS@ + ;; + #################################################### agent lib + --base-agent-libs) +@@ -207,13 +207,13 @@ + ;; + --agent-libs) + # use this one == --netsnmp-agent-libs + --external-libs +- echo $NSC_LDFLAGS $NSC_LIBDIR $NSC_AGENTLIBS $NSC_LIBS ++ echo $NSC_LIBDIR $NSC_AGENTLIBS $NSC_LIBS + ;; + --netsnmp-agent-libs) + echo $NSC_LIBDIR $NSC_BASE_AGENT_LIBS + ;; + --external-agent-libs) +- echo $NSC_LDFLAGS $NSC_LMIBLIBS $NSC_LAGENTLIBS $NSC_LNETSNMPLIBS $NSC_LIBS ++ echo $NSC_LMIBLIBS $NSC_LAGENTLIBS $NSC_LNETSNMPLIBS $NSC_LIBS + ;; + #################################################### + --version|--ver*) diff --git a/net-analyzer/net-snmp/files/net-snmp-5.8-pcap.patch b/net-analyzer/net-snmp/files/net-snmp-5.8-pcap.patch new file mode 100644 index 000000000000..43692240acb6 --- /dev/null +++ b/net-analyzer/net-snmp/files/net-snmp-5.8-pcap.patch @@ -0,0 +1,41 @@ +--- a/configure.d/config_project_with_enable ++++ b/configure.d/config_project_with_enable +@@ -1187,6 +1187,11 @@ + [], + [with_bzip2="no"]) + ++AC_ARG_WITH([pcap], ++ [ --with-pcap[=DIR] use libpcap in DIR], ++ [], ++ [with_pcap="no"]) ++ + NETSNMP_ARG_WITH( + [mnttab], + AS_HELP_STRING( +--- a/configure.d/config_os_libs2 ++++ b/configure.d/config_os_libs2 +@@ -583,14 +590,16 @@ + ## + # libpcap + ## +-NETSNMP_BUILD_PCAP_PROG_TRUE='#' +-NETSNMP_BUILD_PCAP_PROG_FALSE='' +-AC_CHECK_LIB([pcap], [pcap_create], [ +- AC_CHECK_HEADERS([pcap/pcap.h], [ +- NETSNMP_BUILD_PCAP_PROG_TRUE='' +- NETSNMP_BUILD_PCAP_PROG_FALSE='#' +- ]) +-]) ++if test "x$with_pcap" = "xyes" ; then ++ NETSNMP_BUILD_PCAP_PROG_TRUE='#' ++ NETSNMP_BUILD_PCAP_PROG_FALSE='' ++ AC_CHECK_LIB([pcap], [pcap_create], [ ++ AC_CHECK_HEADERS([pcap/pcap.h], [ ++ NETSNMP_BUILD_PCAP_PROG_TRUE='' ++ NETSNMP_BUILD_PCAP_PROG_FALSE='#' ++ ]) ++ ]) ++fi + AC_SUBST(NETSNMP_BUILD_PCAP_PROG_TRUE) + AC_SUBST(NETSNMP_BUILD_PCAP_PROG_FALSE) + diff --git a/net-analyzer/net-snmp/metadata.xml b/net-analyzer/net-snmp/metadata.xml index 95e28946a27a..f3f6819a5361 100644 --- a/net-analyzer/net-snmp/metadata.xml +++ b/net-analyzer/net-snmp/metadata.xml @@ -10,10 +10,11 @@ Enable usage of /dev/kmem Use MFD rewrites of mib modules where available Use dev-libs/libnl to fetch TCP statistics instead of using /proc/net/tcp (Linux only). +Install snmppcap which reads from PCAP files and writes to the SNMP transport Use libpci (from sys-apps/pciutils) to look up network interface description. This feature is only available on Linux. Enable monitoring of app-arch/rpm. This flag requires the bzip2 and zlib flags to be enabled as well. -Build UCD compatibility library. Increases significantly the install size. Enable support for the legacy smux protocol (superseded by agentx) +Build UCD compatibility library. Increases significantly the install size. net-snmp diff --git a/net-analyzer/net-snmp/net-snmp-5.8-r1.ebuild b/net-analyzer/net-snmp/net-snmp-5.8-r1.ebuild index 32697e5f3148..99e0bd51b933 100644 --- a/net-analyzer/net-snmp/net-snmp-5.8-r1.ebuild +++ b/net-analyzer/net-snmp/net-snmp-5.8-r1.ebuild @@ -24,7 +24,7 @@ S=${WORKDIR}/${P/_/.} LICENSE="HPND BSD GPL-2" SLOT="0/35" KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86" -IUSE="X bzip2 doc elf kmem ipv6 libressl lm_sensors mfd-rewrites minimal mysql netlink pci perl python rpm selinux smux ssl tcpd ucd-compat zlib" +IUSE="X bzip2 doc elf kmem ipv6 libressl lm-sensors mfd-rewrites minimal mysql netlink pci perl python rpm selinux smux ssl tcpd ucd-compat zlib" COMMON_DEPEND=" ssl? ( @@ -44,7 +44,7 @@ COMMON_DEPEND=" ${PYTHON_DEPS} ) pci? ( sys-apps/pciutils ) - lm_sensors? ( sys-apps/lm_sensors ) + lm-sensors? ( sys-apps/lm-sensors ) netlink? ( dev-libs/libnl:3 ) mysql? ( dev-db/mysql-connector-c:0= ) perl? ( dev-lang/perl:= ) @@ -93,7 +93,7 @@ src_prepare() { src_configure() { # keep this in the same line, configure.ac arguments are passed down to config.h local mibs="host ucd-snmp/dlmod ucd-snmp/diskio ucd-snmp/extensible mibII/mta_sendmail etherlike-mib/dot3StatsTable" - use lm_sensors && mibs="${mibs} ucd-snmp/lmsensorsMib" + use lm-sensors && mibs="${mibs} ucd-snmp/lmsensorsMib" use smux && mibs="${mibs} smux" # Assume /etc/mtab is not present with a recent baselayout/openrc (bug #565136) diff --git a/net-analyzer/net-snmp/net-snmp-5.8-r2.ebuild b/net-analyzer/net-snmp/net-snmp-5.8-r2.ebuild index 2452860409a7..119ec81687a2 100644 --- a/net-analyzer/net-snmp/net-snmp-5.8-r2.ebuild +++ b/net-analyzer/net-snmp/net-snmp-5.8-r2.ebuild @@ -24,7 +24,7 @@ S=${WORKDIR}/${P/_/.} LICENSE="HPND BSD GPL-2" SLOT="0/35" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="X bzip2 doc elf kmem ipv6 libressl lm_sensors mfd-rewrites minimal mysql netlink pci perl python rpm selinux smux ssl tcpd ucd-compat zlib" +IUSE="X bzip2 doc elf kmem ipv6 libressl lm-sensors mfd-rewrites minimal mysql netlink pci perl python rpm selinux smux ssl tcpd ucd-compat zlib" COMMON_DEPEND=" ssl? ( @@ -44,7 +44,7 @@ COMMON_DEPEND=" ${PYTHON_DEPS} ) pci? ( sys-apps/pciutils ) - lm_sensors? ( sys-apps/lm_sensors ) + lm-sensors? ( sys-apps/lm-sensors ) netlink? ( dev-libs/libnl:3 ) mysql? ( dev-db/mysql-connector-c:0= ) perl? ( dev-lang/perl:= ) @@ -94,7 +94,7 @@ src_prepare() { src_configure() { # keep this in the same line, configure.ac arguments are passed down to config.h local mibs="host ucd-snmp/dlmod ucd-snmp/diskio ucd-snmp/extensible mibII/mta_sendmail etherlike-mib/dot3StatsTable" - use lm_sensors && mibs="${mibs} ucd-snmp/lmsensorsMib" + use lm-sensors && mibs="${mibs} ucd-snmp/lmsensorsMib" use smux && mibs="${mibs} smux" # Assume /etc/mtab is not present with a recent baselayout/openrc (bug #565136) diff --git a/net-analyzer/net-snmp/net-snmp-5.8-r4.ebuild b/net-analyzer/net-snmp/net-snmp-5.8-r4.ebuild new file mode 100644 index 000000000000..a7359956604a --- /dev/null +++ b/net-analyzer/net-snmp/net-snmp-5.8-r4.ebuild @@ -0,0 +1,206 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python2_7 ) +DISTUTILS_SINGLE_IMPL=yesplz +DISTUTILS_OPTIONAL=yesplz +WANT_AUTOMAKE=none +PATCHSET=3 +GENTOO_DEPEND_ON_PERL=no + +inherit autotools distutils-r1 eutils 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/_p*/}/${P/_p*/}.tar.gz + https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-3.tar.xz +" + +S=${WORKDIR}/${P/_/.} + +# GPL-2 for the init scripts +LICENSE="HPND BSD GPL-2" +SLOT="0/35" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~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 +" + +COMMON_DEPEND=" + bzip2? ( app-arch/bzip2 ) + elf? ( dev-libs/elfutils ) + lm-sensors? ( sys-apps/lm-sensors ) + mysql? ( dev-db/mysql-connector-c:0= ) + netlink? ( dev-libs/libnl:3 ) + pcap? ( net-libs/libpcap ) + pci? ( sys-apps/pciutils ) + perl? ( dev-lang/perl:= ) + python? ( + dev-python/setuptools[${PYTHON_USEDEP}] + ${PYTHON_DEPS} + ) + rpm? ( + app-arch/rpm + dev-libs/popt + ) + ssl? ( + !libressl? ( >=dev-libs/openssl-0.9.6d:0= ) + libressl? ( dev-libs/libressl:= ) + ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) + zlib? ( >=sys-libs/zlib-1.1.4 ) +" +DEPEND=" + ${COMMON_DEPEND} + doc? ( app-doc/doxygen ) +" +RDEPEND=" + ${COMMON_DEPEND} + perl? ( + X? ( dev-perl/Tk ) + !minimal? ( dev-perl/TermReadKey ) + ) + selinux? ( sec-policy/selinux-snmp ) +" + +REQUIRED_USE=" + python? ( ${PYTHON_REQUIRED_USE} ) + rpm? ( bzip2 zlib ) +" +S=${WORKDIR}/${P/_p*/} + +RESTRICT=test + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + # snmpconf generates config files with proper selinux context + use selinux && eapply "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch + + eapply "${FILESDIR}"/${PN}-5.7.3-include-limits.patch + eapply "${FILESDIR}"/${PN}-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch + eapply "${FILESDIR}"/${PN}-5.8-my_bool.patch + eapply "${FILESDIR}"/${PN}-5.8-pcap.patch + eapply "${FILESDIR}"/${PN}-5.8-tinfo.patch + + 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 + eapply "${WORKDIR}"/patches/*.patch + + eapply_user + + eautoconf +} + +src_configure() { + # keep this in the same line, configure.ac arguments are passed down to config.h + local mibs="host ucd-snmp/dlmod ucd-snmp/diskio ucd-snmp/extensible mibII/mta_sendmail etherlike-mib/dot3StatsTable" + use lm-sensors && mibs="${mibs} ucd-snmp/lmsensorsMib" + use smux && mibs="${mibs} smux" + + # Assume /etc/mtab is not present with a recent baselayout/openrc (bug #565136) + use kernel_linux && export ac_cv_ETC_MNTTAB=/etc/mtab + + econf \ + $(use_enable !ssl internal-md5) \ + $(use_enable ipv6) \ + $(use_enable mfd-rewrites) \ + $(use_enable perl embedded-perl) \ + $(use_enable ucd-compat ucd-snmp-compatibility) \ + $(use_with bzip2) \ + $(use_with elf) \ + $(use_with kmem kmem-usage) \ + $(use_with mysql) \ + $(use_with netlink nl) \ + $(use_with pcap) \ + $(use_with pci) \ + $(use_with perl perl-modules INSTALLDIRS=vendor) \ + $(use_with python python-modules) \ + $(use_with rpm) \ + $(use_with ssl openssl) \ + $(use_with tcpd libwrap) \ + $(use_with zlib) \ + --enable-shared --disable-static \ + --with-default-snmp-version="3" \ + --with-install-prefix="${D}" \ + --with-ldflags="${LDFLAGS}" \ + --with-logfile="/var/log/net-snmpd.log" \ + --with-mib-modules="${mibs}" \ + --with-persistent-directory="/var/lib/net-snmp" \ + --with-sys-contact="root@Unknown" \ + --with-sys-location="Unknown" +} + +src_compile() { + for target in snmplib agent sedscript all; do + emake OTHERLDFLAGS="${LDFLAGS}" ${target} + done + + use doc && emake docsdox +} + +src_install () { + # bug #317965 + emake -j1 DESTDIR="${D}" install + + if use perl ; then + perl_delete_localpod + if ! use X; then + rm "${D}"/usr/bin/tkmib || die + fi + else + rm -f \ + "${D}"/usr/bin/fixproc \ + "${D}"/usr/bin/ipf-mod.pl \ + "${D}"/usr/bin/mib2c \ + "${D}"/usr/bin/net-snmp-cert \ + "${D}"/usr/bin/snmp-bridge-mib \ + "${D}"/usr/bin/snmpcheck \ + "${D}"/usr/bin/snmpconf \ + "${D}"/usr/bin/tkmib \ + "${D}"/usr/bin/traptoemail \ + "${D}"/usr/share/snmp/mib2c.perl.conf \ + "${D}"/usr/share/snmp/snmp_perl_trapd.pl \ + || die + fi + + dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING README* TODO + newdoc EXAMPLE.conf.def EXAMPLE.conf + + if use doc; then + docinto html + dodoc -r docs/html/* + fi + + keepdir /var/lib/net-snmp + + newinitd "${FILESDIR}"/snmpd.init.2 snmpd + newconfd "${FILESDIR}"/snmpd.conf snmpd + + newinitd "${FILESDIR}"/snmptrapd.init.2 snmptrapd + newconfd "${FILESDIR}"/snmptrapd.conf snmptrapd + + systemd_dounit "${FILESDIR}"/snmpd.service + systemd_dounit "${FILESDIR}"/snmptrapd.service + + insinto /etc/snmp + newins "${S}"/EXAMPLE.conf snmpd.conf.example + + # Remove everything not required for an agent. + # Keep only the snmpd, snmptrapd, MIBs, headers and libraries. + if use minimal; then + rm -rf \ + "${D}"/**/*.pl \ + "${D}"/usr/bin/{encode_keychange,snmp{get,getnext,set,usm,walk,bulkwalk,table,trap,bulkget,translate,status,delta,test,df,vacm,netstat,inform,check,conf},fixproc,traptoemail} \ + "${D}"/usr/share/snmp/*.conf \ + "${D}"/usr/share/snmp/snmpconf-data \ + || die + fi + + prune_libtool_files +} diff --git a/net-analyzer/net-snmp/net-snmp-99999999.ebuild b/net-analyzer/net-snmp/net-snmp-99999999.ebuild index 66e5dca50e31..c6deae576b94 100644 --- a/net-analyzer/net-snmp/net-snmp-99999999.ebuild +++ b/net-analyzer/net-snmp/net-snmp-99999999.ebuild @@ -13,7 +13,7 @@ inherit autotools distutils-r1 eutils git-r3 perl-module systemd DESCRIPTION="Software for generating and retrieving SNMP data" HOMEPAGE="http://www.net-snmp.org/" -EGIT_REPO_URI="https://git.code.sf.net/p/net-snmp/code" +EGIT_REPO_URI="https://github.com/net-snmp/net-snmp" SRC_URI=" https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-3.tar.xz " @@ -22,34 +22,38 @@ SRC_URI=" LICENSE="HPND BSD GPL-2" SLOT="0/35" KEYWORDS="" -IUSE="X bzip2 doc elf kmem ipv6 libressl lm_sensors mfd-rewrites minimal mysql netlink pci perl python rpm selinux smux ssl tcpd ucd-compat zlib" +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 +" REQUIRED_USE=" python? ( ${PYTHON_REQUIRED_USE} ) rpm? ( bzip2 zlib ) " COMMON_DEPEND=" - ssl? ( - !libressl? ( >=dev-libs/openssl-0.9.6d:0= ) - libressl? ( dev-libs/libressl:= ) - ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) - rpm? ( - app-arch/rpm - dev-libs/popt - ) bzip2? ( app-arch/bzip2 ) - zlib? ( >=sys-libs/zlib-1.1.4 ) elf? ( dev-libs/elfutils ) + lm-sensors? ( sys-apps/lm-sensors ) + mysql? ( dev-db/mysql-connector-c:0= ) + netlink? ( dev-libs/libnl:3 ) + pcap? ( net-libs/libpcap ) + pci? ( sys-apps/pciutils ) + perl? ( dev-lang/perl:= ) python? ( dev-python/setuptools[${PYTHON_USEDEP}] ${PYTHON_DEPS} ) - pci? ( sys-apps/pciutils ) - lm_sensors? ( sys-apps/lm_sensors ) - netlink? ( dev-libs/libnl:3 ) - mysql? ( dev-db/mysql-connector-c:0= ) - perl? ( dev-lang/perl:= ) + rpm? ( + app-arch/rpm + dev-libs/popt + ) + ssl? ( + !libressl? ( >=dev-libs/openssl-0.9.6d:0= ) + libressl? ( dev-libs/libressl:= ) + ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) + zlib? ( >=sys-libs/zlib-1.1.4 ) " DEPEND=" ${COMMON_DEPEND} @@ -68,6 +72,7 @@ S=${WORKDIR}/${P/_p*/} RESTRICT=test PATCHES=( "${FILESDIR}"/${PN}-5.7.3-include-limits.patch + "${FILESDIR}"/${PN}-5.8-pcap.patch "${FILESDIR}"/${PN}-5.8-tinfo.patch ) @@ -96,7 +101,7 @@ src_prepare() { src_configure() { # keep this in the same line, configure.ac arguments are passed down to config.h local mibs="host ucd-snmp/dlmod ucd-snmp/diskio ucd-snmp/extensible mibII/mta_sendmail etherlike-mib/dot3StatsTable" - use lm_sensors && mibs="${mibs} ucd-snmp/lmsensorsMib" + use lm-sensors && mibs="${mibs} ucd-snmp/lmsensorsMib" use smux && mibs="${mibs} smux" # Assume /etc/mtab is not present with a recent baselayout/openrc (bug #565136) @@ -113,6 +118,7 @@ src_configure() { $(use_with kmem kmem-usage) \ $(use_with mysql) \ $(use_with netlink nl) \ + $(use_with pcap) \ $(use_with pci) \ $(use_with perl perl-modules INSTALLDIRS=vendor) \ $(use_with python python-modules) \ -- cgit v1.2.3