Better fix for #1470004

This commit is contained in:
Adam Williamson 2017-07-20 11:13:33 -07:00
parent 8885518709
commit 7da674056e
2 changed files with 7 additions and 17 deletions

View File

@ -1,14 +0,0 @@
diff -urNp old/configure.d/config_os_libs2 new/configure.d/config_os_libs2
--- old/configure.d/config_os_libs2 2017-07-18 09:44:00.600109376 +0200
+++ new/configure.d/config_os_libs2 2017-07-19 12:51:43.268001205 +0200
@@ -485,8 +485,8 @@ if test "x$with_mysql" = "xyes" ; then
[AC_MSG_RESULT(no)
AC_DEFINE([HAVE_BROKEN_LIBMYSQLCLIENT], 1,
[Define if using MY_INIT() causes a linker error])])
- CPPFLAGS="${_cppflags}"
- LIBS="${_libs}"
+# CPPFLAGS="${_cppflags}"
+# LIBS="${_libs}"
AC_MSG_CACHE_ADD(MYSQL Trap Logging: enabled)
else
AC_MSG_CACHE_ADD(MYSQL Trap Logging: unavailable)

View File

@ -11,7 +11,7 @@
Summary: A collection of SNMP protocol tools and libraries Summary: A collection of SNMP protocol tools and libraries
Name: net-snmp Name: net-snmp
Version: 5.7.3 Version: 5.7.3
Release: 19%{?dist} Release: 20%{?dist}
Epoch: 1 Epoch: 1
License: BSD License: BSD
@ -56,8 +56,12 @@ Patch16: net-snmp-5.7.3-strtok-r.patch
# Josef's patch from https://sourceforge.net/p/net-snmp/bugs/2782/#cbed # Josef's patch from https://sourceforge.net/p/net-snmp/bugs/2782/#cbed
# but with the config_os_libs2 portion removed # but with the config_os_libs2 portion removed
Patch17: net-snmp-5.7.3-mariadb102.patch Patch17: net-snmp-5.7.3-mariadb102.patch
# Fix issue with undefined symbol my_progname when try to load NetSNMP::TrapReceiver in perl script. (#1470004) # Fix issue with undefined symbol my_progname when try to load
Patch18: net-snmp-5.7.3-perl.patch # NetSNMP::TrapReceiver in perl script (#1470004)
# https://sourceforge.net/p/net-snmp/bugs/2792/
# https://sourceforge.net/p/net-snmp/bugs/2792/attachment/0001-Link-libnetsnmptrapd-against-MYSQL_LIBS.patch
# (rebased on 5.7.3)
Patch18: 0001-Link-libnetsnmptrapd-against-MYSQL_LIBS.patch
# This patch fix issue with new OpenSLL library in rawhide (f26+) # This patch fix issue with new OpenSLL library in rawhide (f26+)
# !!!WARNING!!! DO NOT USE IT FOR OLDER FEDORA RELEASES (>f26) # !!!WARNING!!! DO NOT USE IT FOR OLDER FEDORA RELEASES (>f26)