diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-09-06 10:28:05 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-09-06 10:28:05 +0100 |
commit | f1af93971b7490792d8541bc790e0d8c6d787059 (patch) | |
tree | a38046712bbc3a3844d77452d16c84e716caa3d4 /net-analyzer/net-snmp/files | |
parent | fc637fb28da700da71ec2064d65ca5a7a31b9c6c (diff) |
gentoo resync : 06.08.2019
Diffstat (limited to 'net-analyzer/net-snmp/files')
3 files changed, 23 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, ¬_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); + |