mirror of
git://slackware.nl/current.git
synced 2024-12-29 10:25:00 +01:00
646a5c1cbf
a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
61 lines
1.8 KiB
Diff
61 lines
1.8 KiB
Diff
diff -ur net-snmp-5.7.3.save/apps/Makefile.in net-snmp-5.7.3/apps/Makefile.in
|
|
--- net-snmp-5.7.3.save/apps/Makefile.in 2014-12-08 15:23:22.000000000 -0500
|
|
+++ net-snmp-5.7.3/apps/Makefile.in 2017-09-19 11:52:48.993729966 -0400
|
|
@@ -204,7 +204,7 @@
|
|
$(LINK) ${CFLAGS} -o $@ snmpdf.$(OSUFFIX) ${LDFLAGS} ${LIBS}
|
|
|
|
libnetsnmptrapd.$(LIB_EXTENSION)$(LIB_VERSION): $(LLIBTRAPD_OBJS)
|
|
- $(LIB_LD_CMD) $@ ${LLIBTRAPD_OBJS} $(MIBLIB) $(USELIBS) $(PERLLDOPTS_FOR_LIBS) $(LIB_LD_LIBS)
|
|
+ $(LIB_LD_CMD) $@ ${LLIBTRAPD_OBJS} $(MIBLIB) $(USELIBS) $(PERLLDOPTS_FOR_LIBS) $(LIB_LD_LIBS) $(MYSQL_LIBS)
|
|
$(RANLIB) $@
|
|
|
|
snmpinforminstall:
|
|
diff -ur net-snmp-5.7.3.save/apps/snmptrapd_sql.c net-snmp-5.7.3/apps/snmptrapd_sql.c
|
|
--- net-snmp-5.7.3.save/apps/snmptrapd_sql.c 2014-12-08 15:23:22.000000000 -0500
|
|
+++ net-snmp-5.7.3/apps/snmptrapd_sql.c 2017-09-19 11:56:10.127008022 -0400
|
|
@@ -50,10 +50,16 @@
|
|
#undef PACKAGE_STRING
|
|
#undef PACKAGE_TARNAME
|
|
#undef PACKAGE_VERSION
|
|
-#include <my_global.h>
|
|
-#include <my_sys.h>
|
|
#include <mysql.h>
|
|
#include <errmsg.h>
|
|
+#ifndef MYSQL_VERSION_ID
|
|
+#include <mysql_version.h>
|
|
+#endif
|
|
+#if MYSQL_VERSION_ID < 100000
|
|
+#include <my_config.h>
|
|
+#include <my_global.h>
|
|
+#include <my_sys.h>
|
|
+#endif
|
|
|
|
netsnmp_feature_require(container_fifo)
|
|
|
|
@@ -437,6 +443,7 @@
|
|
return -1;
|
|
}
|
|
|
|
+#if MYSQL_VERSION_ID < 100000
|
|
#ifdef HAVE_BROKEN_LIBMYSQLCLIENT
|
|
my_init();
|
|
#else
|
|
@@ -445,6 +452,7 @@
|
|
|
|
/** 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 +550,10 @@
|
|
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();
|
|
|