diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2018-11-09 21:46:09 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2018-11-10 08:59:45 +0100 |
commit | 374248fe50672549bd1e5cd53ddb5bdfdcc66b65 (patch) | |
tree | fbac9f1c41679d79634ef08ac614cb4b708c8386 /source/n/net-snmp/net-snmp-5.7.3-mariadb-10.2.8.diff | |
parent | 0e6f7049d6a514115df0164db47fbd8763cf5148 (diff) | |
download | current-374248fe50672549bd1e5cd53ddb5bdfdcc66b65.tar.gz |
Fri Nov 9 21:46:09 UTC 201820181109214609
a/udisks2-2.6.5-x86_64-3.txz: Rebuilt.
Recompiled against net-snmp-5.8.
ap/hplip-3.18.10-x86_64-2.txz: Rebuilt.
Recompiled against net-snmp-5.8.
d/bison-3.2.1-x86_64-1.txz: Upgraded.
d/meson-0.48.2-x86_64-1.txz: Upgraded.
l/pycairo-1.18.0-x86_64-1.txz: Upgraded.
n/bridge-utils-1.6-x86_64-1.txz: Upgraded.
n/net-snmp-5.8-x86_64-1.txz: Upgraded.
Shared library .so-version bump.
n/ntp-4.2.8p12-x86_64-2.txz: Rebuilt.
Recompiled against net-snmp-5.8.
n/php-7.2.12-x86_64-2.txz: Rebuilt.
Recompiled against net-snmp-5.8.
xap/blackbox-0.74-x86_64-2.txz: Rebuilt.
When building, don't install anything to the system. Thanks to Didier Spaier.
xap/sane-1.0.27-x86_64-4.txz: Rebuilt.
Recompiled against net-snmp-5.8.
extra/aspell-word-lists/aspell-ar-1.2_0-x86_64-1.txz: Added.
extra/aspell-word-lists/aspell-ast-0.01-x86_64-1.txz: Added.
extra/aspell-word-lists/aspell-ca-2.1.5_1-x86_64-1.txz: Upgraded.
extra/aspell-word-lists/aspell-de_alt-2.1_1-x86_64-1.txz: Added.
extra/aspell-word-lists/aspell-fy-0.12_0-x86_64-1.txz: Added.
extra/aspell-word-lists/aspell-grc-0.02_0-x86_64-1.txz: Added.
extra/aspell-word-lists/aspell-hy-0.10.0_0-x86_64-1.txz: Added.
extra/aspell-word-lists/aspell-ky-0.01_0-x86_64-1.txz: Added.
extra/aspell-word-lists/aspell-ml-0.03_1-x86_64-1.txz: Added.
extra/aspell-word-lists/aspell-pt_PT-20070510_0-x86_64-1.txz: Added.
extra/aspell-word-lists/aspell-tk-0.01_0-x86_64-1.txz: Added.
Diffstat (limited to 'source/n/net-snmp/net-snmp-5.7.3-mariadb-10.2.8.diff')
-rw-r--r-- | source/n/net-snmp/net-snmp-5.7.3-mariadb-10.2.8.diff | 61 |
1 files changed, 0 insertions, 61 deletions
diff --git a/source/n/net-snmp/net-snmp-5.7.3-mariadb-10.2.8.diff b/source/n/net-snmp/net-snmp-5.7.3-mariadb-10.2.8.diff deleted file mode 100644 index 4190fd44..00000000 --- a/source/n/net-snmp/net-snmp-5.7.3-mariadb-10.2.8.diff +++ /dev/null @@ -1,61 +0,0 @@ -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(); - |