diff options
Diffstat (limited to 'net-analyzer/net-snmp')
-rw-r--r-- | net-analyzer/net-snmp/Manifest | 11 | ||||
-rw-r--r-- | net-analyzer/net-snmp/files/net-snmp-5.7.3-mariadb-10.2.patch | 56 | ||||
-rw-r--r-- | net-analyzer/net-snmp/files/net-snmp-5.7.3-perl524-2.patch | 70 | ||||
-rw-r--r-- | net-analyzer/net-snmp/files/net-snmp-5.8-my_bool.patch | 23 | ||||
-rw-r--r-- | net-analyzer/net-snmp/net-snmp-5.7.3-r5.ebuild | 192 | ||||
-rw-r--r-- | net-analyzer/net-snmp/net-snmp-5.7.3-r6.ebuild | 194 | ||||
-rw-r--r-- | net-analyzer/net-snmp/net-snmp-5.8-r2.ebuild (renamed from net-analyzer/net-snmp/net-snmp-5.7.3_p3-r1.ebuild) | 17 |
7 files changed, 34 insertions, 529 deletions
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest index b1b879a92247..df29868ad6f4 100644 --- a/net-analyzer/net-snmp/Manifest +++ b/net-analyzer/net-snmp/Manifest @@ -1,7 +1,6 @@ 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.7.3-mariadb-10.2.patch 1292 BLAKE2B 6b445dd00096924b975327c948c20942be70c1797605c9af22ca0395c06d1e4129170254a4d6b1f03948c18ef5d0e88250490a601df67736fafca973f0a1f042 SHA512 43b8d39837af147edf66b322d8e75bc82acc243f9eb6bb7ab11ed2975442ee975292d61d953d862679027d5110198ee30347de6209feb2abf3a6ede8547c0de1 -AUX net-snmp-5.7.3-perl524-2.patch 1776 BLAKE2B fdf872595094d83300ed950731b470db87b4cbf1eb584a109000d9af5fd329225d1d16f0509c6eabe6dae5602583f90dec7945596d912fb6137638a30d94e994 SHA512 ddd2ac301995114ea70890d89a320528e9009d9f49203ab9fa247b507e16dfa91cb517dd408290c530c1e0ca07f6ee431015958a625d68dd082d4c1e55d279ae +AUX net-snmp-5.8-my_bool.patch 751 BLAKE2B d0caff5c2cebb50cc2fcf4375d222f1146e3908698565eb7201d3e009b4bcbbccf653c336c1af9a23a8dc1a5f468da12d77d940ea4a00eb3f7c14db7dd45463e SHA512 5fe9d44653e5c26d1d1d6041b48f0abf5c38d148b8dfe82d6fc83290e66becc25dda43962a895994989f7267d5914f69969b118c999c324b7fac0184c383bbce 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 @@ -9,15 +8,9 @@ AUX snmpd.service 181 BLAKE2B e68aa957e78178c624faa41c93eee84dcadec817fd0b0fcba1 AUX snmptrapd.conf 517 BLAKE2B dced765351c6fbd74166da9c3631993a06135569e8bc7b2375e36e2823446de47c82e10992579a05bdd1f2803fc4694463f0f9e1e5e3510204a28184919d8a78 SHA512 283d1503ebca55046cc273f693a257be3e8e6f26b5db10a3b64a5455079a41568eb40c1a3f5dbc698b822502d5e8120ea80b9e2c3ac4aa1d830d318228c0beca AUX snmptrapd.init.2 338 BLAKE2B 893a510af4cb7f4115c5995ecd40c6ac3c5d2fd4cf9252404b49f8c58355b4def5d751df0b3c7878bcce0bf703ccb7ba022db108eb1496b68eb2bb4a035612da SHA512 316964703559082b1626280bd0532a32533185741d1919f255473ae6bfe30f82b71bee79093cb0b341c99427e14a5ed201b6aa2886a9123c89d5f5f78496f706 AUX snmptrapd.service 190 BLAKE2B 6994e2f82e0ba03b31c2f079844a23c0070ff70726dd3c5976394c04bfd8da30917395b1a752f8e66502259d271ccf264c3e99f99e95df62b80447d4099d1dd7 SHA512 763682e3926fd1e7f28a013be2ad56cc53eed26a0415770906968e07a183128c9d5fb70d76513244ba0cc95fc2526b68c32207b5fda83b8f53c256549cfa1b1d -DIST net-snmp-5.7.3-patches-2.tar.xz 3312 BLAKE2B 9cf2b3b5ec2f65dc8c017565666c148acb42354f8a03274f67c856fea530df27877026aa2c0477d90cd2f035503e15cd48c33b449a9522c34c9dca370f7ed7a6 SHA512 22ca6cc4dd1fd58a8cff53881d248155dbfdab765e9a3664320c8c4a5cfa35e741adfb0304bb38be7719ba1c7418f9b0f9178719951b82d70257c3c944c450ad DIST net-snmp-5.7.3-patches-3.tar.xz 3176 BLAKE2B 1a71d6743afb841f664c6058e32c7c411af62b0f36acd3bb9251804893ed12f462a0c5bab828e309eeec7824def2dca8fa866350b90a62ec4f0df1141b51ecae SHA512 d8a91b9668320a1e19d062eb86dd4d16beb7c2d15ac7ebbb9d2a4bd298af39bbb0a2613504dbb0057cccdec731f08f2308c5a15395e1fbc29bb0611ed8aca636 -DIST net-snmp-5.7.3-perl524-2.patch.gz 523 BLAKE2B 6762795cd6bcdccd5b49899cf572d5a498f3ab7fd20af69fad5f3fe45880e40f2aecfb0e9443a2a10773e25323ed5d0f271446d8fc03102e70fa8efd79e0d118 SHA512 bede47234b809d67f33c46654f3d09d0b255d835fb97eea23bfa888922dfb80ad287c305596a6b041ed03ec91dc7c647ecd54c3c79e0b4ce08978332de3cc007 -DIST net-snmp-5.7.3-perl524.patch.gz 9072 BLAKE2B d870e195bccb8178827791c9bd495d5c13a8848d176ae72b1c6b54b38eabc3b5aa4842d1841f422e3a71d9e9129b2acf303e8961ce98f82f5d9310c3a65e671d SHA512 2d3184ac7c96f75af5bf8c8d23f33d5636c701e052a638e5403a8d5aa34985abc38f6a366ba09a1d8499a05fd71d939a7ed4d530661e56a726386603b6f6e6a4 -DIST net-snmp-5.7.3.tar.gz 6382428 BLAKE2B df036da09658fdb4c52a99696fb6374cd582bc8da765e212285478ffb16c8725ddecd37842aba7835bc90ea74437ce00491dff569b1ce2c7499acf46968b3935 SHA512 0758bba5844cfd6c80959ac16b83906a2f830ba49fd0ab1bf9e191dc6a79d312a2e4760bd53b3e1a1c82759481f0064d088d5a3cf475d84b25679a6bd0f049bb DIST net-snmp-5.8.tar.gz 6591680 BLAKE2B ac1bff4152310da57818a00d752a08a7fc61d697b02479d9952ca12d024d3d68dc8bfa674571e93d6f3597605b2fe91513fb6839057a80f2c3dd8d0cce0077f2 SHA512 27895a583b23f3e14c48562bc32f3ba83513d81aa848e878be9a3650f0458d45950635c937ef627135f80b757b663e71fab9a3bde4fd91889153998ae3468fe7 -EBUILD net-snmp-5.7.3-r5.ebuild 5123 BLAKE2B 4b131228917ab3884ca81e2777e1de6f8a73fa8b5ca5bfb15aa3224e00a6f7aa0d750ff18339c5abfcb26c01c592c7f182a47bca26728e0e620971c846bb4838 SHA512 a0aa82e9b35f0e2e8f33fe4abe55b706ddb7e6918da85916189e54c1a7273f121a42d802ff0a13ab53e4ed382b398f0fc6834cf9686aedabf850a7fb55230c9a -EBUILD net-snmp-5.7.3-r6.ebuild 5156 BLAKE2B 29fbde65309d3169b9b9ce45aef271d70d583b859e27362c5c4c5185da1922abf5075f577b046c5e46042f2f1d335633cd81a56dd7e0fa99487f74797f91eb55 SHA512 e80156676b3b4841c24c6aa20af042ef6ea7c21fbf0ea08bb37af95ae4966a0a80f2bcede1e0231fa8065a21b4d97b12ce1828b012a8d887fe808898523405fa -EBUILD net-snmp-5.7.3_p3-r1.ebuild 5235 BLAKE2B 20975c562ad43c1a20d4116aa2d422285adbad4df23f7f975357668fbbed6951705fffcec1008498374c42f14ecc6dc96e471970fba95cc592b862019bf23c18 SHA512 c058c0f7351da016936c454830887510a204bc9ae7d798f81323a4a4228fa51ad52551a68e95125c88ed2f511b3d0ee6860cd09bce70ae9d8719ad9673e3f9cd 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 diff --git a/net-analyzer/net-snmp/files/net-snmp-5.7.3-mariadb-10.2.patch b/net-analyzer/net-snmp/files/net-snmp-5.7.3-mariadb-10.2.patch deleted file mode 100644 index dea1a0178531..000000000000 --- a/net-analyzer/net-snmp/files/net-snmp-5.7.3-mariadb-10.2.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- a/apps/snmptrapd_sql.c -+++ b/apps/snmptrapd_sql.c -@@ -54,6 +54,7 @@ - #include <my_sys.h> - #include <mysql.h> - #include <errmsg.h> -+#include <mysql_version.h> - - netsnmp_feature_require(container_fifo) - -@@ -437,6 +438,7 @@ netsnmp_mysql_init(void) - return -1; - } - -+#if MYSQL_VERSION_ID < 100000 - #ifdef HAVE_BROKEN_LIBMYSQLCLIENT - my_init(); - #else -@@ -445,6 +447,7 @@ netsnmp_mysql_init(void) - - /** load .my.cnf values */ - load_defaults ("my", _sql.groups, ¬_argc, ¬_argv); -+#endif - for(i=0; i < not_argc; ++i) { - if (NULL == not_argv[i]) - continue; -@@ -542,6 +545,10 @@ netsnmp_mysql_init(void) - return -1; - } - -+#if MYSQL_VERSION_ID > 100000 -+ mysql_options(_sql.conn, MYSQL_READ_DEFAULT_GROUP, "snmptrapd"); -+#endif -+ - /** try to connect; we'll try again later if we fail */ - (void) netsnmp_mysql_connect(); - ---- a/apps/snmptrapd_sql.c -+++ b/apps/snmptrapd_sql.c -@@ -50,11 +50,16 @@ - #undef PACKAGE_STRING - #undef PACKAGE_TARNAME - #undef PACKAGE_VERSION -+#ifdef HAVE_BROKEN_LIBMYSQLCLIENT -+#include <mysql.h> -+#include <errmsg.h> -+#else - #include <my_global.h> - #include <my_sys.h> - #include <mysql.h> - #include <errmsg.h> - #include <mysql_version.h> -+#endif - - netsnmp_feature_require(container_fifo) - diff --git a/net-analyzer/net-snmp/files/net-snmp-5.7.3-perl524-2.patch b/net-analyzer/net-snmp/files/net-snmp-5.7.3-perl524-2.patch deleted file mode 100644 index 45855597a867..000000000000 --- a/net-analyzer/net-snmp/files/net-snmp-5.7.3-perl524-2.patch +++ /dev/null @@ -1,70 +0,0 @@ ---- a/perl/ASN/Makefile.PL -+++ b/perl/ASN/Makefile.PL -@@ -1,3 +1,4 @@ -+package ASN; - use ExtUtils::MakeMaker; - require 5; - use Config; ---- a/perl/AnyData_SNMP/Makefile.PL -+++ b/perl/AnyData_SNMP/Makefile.PL -@@ -1,3 +1,4 @@ -+package AnyData_SNMP; - use ExtUtils::MakeMaker; - # See lib/ExtUtils/MakeMaker.pm for details of how to influence - # the contents of the Makefile that is written. ---- a/perl/OID/Makefile.PL -+++ b/perl/OID/Makefile.PL -@@ -1,3 +1,4 @@ -+package OID; - # See lib/ExtUtils/MakeMaker.pm for details of how to influence - # the contents of the Makefile that is written. - ---- a/perl/SNMP/Makefile.PL -+++ b/perl/SNMP/Makefile.PL -@@ -1,3 +1,4 @@ -+package SNMP; - use ExtUtils::MakeMaker; - require 5; - use Config; ---- a/perl/TrapReceiver/Makefile.PL -+++ b/perl/TrapReceiver/Makefile.PL -@@ -1,3 +1,4 @@ -+package TrapReceiver; - use ExtUtils::MakeMaker; - require 5; - use Config; ---- a/perl/agent/Makefile.PL -+++ b/perl/agent/Makefile.PL -@@ -1,3 +1,4 @@ -+package agent; - use ExtUtils::MakeMaker; - require 5; - use Config; ---- a/perl/agent/Support/Makefile.PL -+++ b/perl/agent/Support/Makefile.PL -@@ -1,3 +1,4 @@ -+package agent_Support; - use ExtUtils::MakeMaker; - require 5; - use Config; ---- a/perl/agent/default_store/Makefile.PL -+++ b/perl/agent/default_store/Makefile.PL -@@ -1,3 +1,4 @@ -+package agent_default_store; - use ExtUtils::MakeMaker; - require 5; - use Config; ---- a/perl/default_store/Makefile.PL -+++ b/perl/default_store/Makefile.PL -@@ -1,3 +1,4 @@ -+package default_store; - use ExtUtils::MakeMaker; - require 5; - use Config; ---- a/perl/manager/Makefile.PL -+++ b/perl/manager/Makefile.PL -@@ -1,3 +1,4 @@ -+package manager; - use ExtUtils::MakeMaker; - # See lib/ExtUtils/MakeMaker.pm for details of how to influence - # the contents of the Makefile that is written. diff --git a/net-analyzer/net-snmp/files/net-snmp-5.8-my_bool.patch b/net-analyzer/net-snmp/files/net-snmp-5.8-my_bool.patch new file mode 100644 index 000000000000..72127d053c0a --- /dev/null +++ b/net-analyzer/net-snmp/files/net-snmp-5.8-my_bool.patch @@ -0,0 +1,23 @@ +commit 9f4af8c42d515e6b214738cc97212dfbe7f749cf +Author: Andreas Hasenack <ahasenack2@users.sourceforge.net> +Date: Tue Feb 5 18:21:40 2019 -0800 + + apps/snmptrapd_sql: Fix build against MySQL 8 + + See also https://sourceforge.net/p/net-snmp/bugs/2922/. + + [bvanassche: changed 'int' into 'char'] + +diff --git a/apps/snmptrapd_sql.c b/apps/snmptrapd_sql.c +index 6126ca916..32a3b1799 100644 +--- a/apps/snmptrapd_sql.c ++++ b/apps/snmptrapd_sql.c +@@ -199,7 +199,7 @@ typedef struct sql_buf_t { + * static bind structures, plus 2 static buffers to bind to. + */ + static MYSQL_BIND _tbind[TBIND_MAX], _vbind[VBIND_MAX]; +-static my_bool _no_v3; ++static char _no_v3; + + static void _sql_process_queue(u_int dontcare, void *meeither); + diff --git a/net-analyzer/net-snmp/net-snmp-5.7.3-r5.ebuild b/net-analyzer/net-snmp/net-snmp-5.7.3-r5.ebuild deleted file mode 100644 index 8d923fa28d7b..000000000000 --- a/net-analyzer/net-snmp/net-snmp-5.7.3-r5.ebuild +++ /dev/null @@ -1,192 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) -DISTUTILS_SINGLE_IMPL=yesplz -DISTUTILS_OPTIONAL=yesplz -WANT_AUTOMAKE=none -PATCHSET=2 -GENTOO_DEPEND_ON_PERL=no - -inherit autotools distutils-r1 eutils perl-module systemd - -DESCRIPTION="Software for generating and retrieving SNMP data" -HOMEPAGE="http://net-snmp.sourceforge.net/" -SRC_URI=" - mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz - https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-${PATCHSET}.tar.xz - https://dev.gentoo.org/~dilfridge/distfiles/${P}-perl524.patch.gz - https://dev.gentoo.org/~dilfridge/distfiles/${P}-perl524-2.patch.gz -" - -S=${WORKDIR}/${P/_/.} - -# GPL-2 for the init scripts -LICENSE="HPND BSD GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86" -IUSE="X bzip2 doc elf ipv6 libressl lm_sensors mfd-rewrites minimal mysql netlink pci perl python rpm selinux smux ssl tcpd ucd-compat 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 ) - python? ( - dev-python/setuptools[${PYTHON_USEDEP}] - ${PYTHON_DEPS} - ) - pci? ( sys-apps/pciutils ) - lm_sensors? ( sys-apps/lm_sensors ) - netlink? ( dev-libs/libnl:3 ) - mysql? ( virtual/mysql ) - perl? ( dev-lang/perl:= ) -" -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 ) -" - -RESTRICT=test - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - # snmpconf generates config files with proper selinux context - use selinux && epatch "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch - - epatch "${WORKDIR}"/${P}-perl524.patch - epatch "${WORKDIR}"/${P}-perl524-2.patch - epatch "${FILESDIR}"/${PN}-5.7.3-include-limits.patch - - epatch "${WORKDIR}"/patches/*.patch - - epatch_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 mysql) \ - $(use_with netlink nl) \ - $(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 - - use doc && dohtml docs/html/* - - 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 -} diff --git a/net-analyzer/net-snmp/net-snmp-5.7.3-r6.ebuild b/net-analyzer/net-snmp/net-snmp-5.7.3-r6.ebuild deleted file mode 100644 index 060479915394..000000000000 --- a/net-analyzer/net-snmp/net-snmp-5.7.3-r6.ebuild +++ /dev/null @@ -1,194 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) -DISTUTILS_SINGLE_IMPL=yesplz -DISTUTILS_OPTIONAL=yesplz -WANT_AUTOMAKE=none -PATCHSET=2 -GENTOO_DEPEND_ON_PERL=no - -inherit autotools distutils-r1 eutils perl-module systemd - -DESCRIPTION="Software for generating and retrieving SNMP data" -HOMEPAGE="http://net-snmp.sourceforge.net/" -SRC_URI=" - mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz - https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-${PATCHSET}.tar.xz - https://dev.gentoo.org/~dilfridge/distfiles/${P}-perl524.patch.gz - https://dev.gentoo.org/~dilfridge/distfiles/${P}-perl524-2.patch.gz -" - -S=${WORKDIR}/${P/_/.} - -# GPL-2 for the init scripts -LICENSE="HPND BSD GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="X bzip2 doc elf ipv6 libressl lm_sensors mfd-rewrites minimal mysql netlink pci perl python rpm selinux smux ssl tcpd ucd-compat 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 ) - python? ( - dev-python/setuptools[${PYTHON_USEDEP}] - ${PYTHON_DEPS} - ) - pci? ( sys-apps/pciutils ) - lm_sensors? ( sys-apps/lm_sensors ) - netlink? ( dev-libs/libnl:3 ) - mysql? ( virtual/mysql ) - perl? ( dev-lang/perl:= ) -" -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 ) -" - -RESTRICT=test - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - # snmpconf generates config files with proper selinux context - use selinux && epatch "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch - - epatch "${WORKDIR}"/${P}-perl524.patch - epatch "${WORKDIR}"/${P}-perl524-2.patch - epatch "${FILESDIR}"/${PN}-5.7.3-include-limits.patch - - epatch "${WORKDIR}"/patches/*.patch - - epatch_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 mysql) \ - $(use_with netlink nl) \ - $(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 - - use doc && dohtml docs/html/* - - 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-5.7.3_p3-r1.ebuild b/net-analyzer/net-snmp/net-snmp-5.8-r2.ebuild index 4add1e5486bb..2452860409a7 100644 --- a/net-analyzer/net-snmp/net-snmp-5.7.3_p3-r1.ebuild +++ b/net-analyzer/net-snmp/net-snmp-5.8-r2.ebuild @@ -12,20 +12,19 @@ GENTOO_DEPEND_ON_PERL=no inherit autotools distutils-r1 eutils perl-module systemd DESCRIPTION="Software for generating and retrieving SNMP data" -HOMEPAGE="http://net-snmp.sourceforge.net/" +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-${PV/*_p/}.tar.xz - https://dev.gentoo.org/~dilfridge/distfiles/${P/_p*/}-perl524.patch.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" +SLOT="0/35" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="X bzip2 doc elf 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? ( @@ -79,11 +78,12 @@ src_prepare() { # snmpconf generates config files with proper selinux context use selinux && eapply "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch - eapply "${WORKDIR}"/${PN}-5.7.3-perl524.patch - eapply "${FILESDIR}"/${PN}-5.7.3-perl524-2.patch - eapply "${FILESDIR}"/${PN}-5.7.3-mariadb-10.2.patch eapply "${FILESDIR}"/${PN}-5.7.3-include-limits.patch + eapply "${FILESDIR}"/${PN}-5.8-my_bool.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 @@ -108,6 +108,7 @@ src_configure() { $(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 pci) \ |