summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2019-08-19 22:38:22 +0200
committerJeroen Roovers <jer@gentoo.org>2019-08-19 22:38:37 +0200
commit8683418171b89fb2982bd0c0a3354c0c97b9a8bc (patch)
tree3531507e8a0b7799095353de4f75d6bffe34c965 /net-analyzer/net-snmp/files
parentnet-analyzer/net-snmp: Fix building against dev-db/mysql-connector-c-8.* (diff)
downloadgentoo-8683418171b89fb2982bd0c0a3354c0c97b9a8bc.tar.gz
gentoo-8683418171b89fb2982bd0c0a3354c0c97b9a8bc.tar.bz2
gentoo-8683418171b89fb2982bd0c0a3354c0c97b9a8bc.zip
net-analyzer/net-snmp: Old
Package-Manager: Portage-2.3.71, Repoman-2.3.17 Signed-off-by: Jeroen Roovers <jer@gentoo.org>
Diffstat (limited to 'net-analyzer/net-snmp/files')
-rw-r--r--net-analyzer/net-snmp/files/net-snmp-5.7.3-mariadb-10.2.patch56
-rw-r--r--net-analyzer/net-snmp/files/net-snmp-5.7.3-perl524-2.patch70
2 files changed, 0 insertions, 126 deletions
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, &not_argc, &not_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.