From: Jeroen Roovers <jer@gentoo.org>
Date: Sun, 27 Aug 2017 11:03:28 +0000 (+0200)
Subject: net-analyzer/net-snmp: Fix includes (bug #628952).
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=b3fb887ce0d860d20eaf5eddb37ed206d782c155;p=gentoo.git

net-analyzer/net-snmp: Fix includes (bug #628952).

Package-Manager: Portage-2.3.8, Repoman-2.3.3
---

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
index 8660a3257560..dea1a0178531 100644
--- 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
@@ -35,3 +35,22 @@
      /** 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)
+