Compare commits

...

2 Commits
rawhide ... f25

Author SHA1 Message Date
Josef Ridky 93e3ae31c9 Update mysqllib patch 2017-07-26 10:55:05 +02:00
Josef Ridky b3be0e610b Resolves #1470004: Fix perl issue with use NetSNMP::TrapReceiver (add link to libmysqlclient.so) 2017-07-13 16:16:05 +02:00
2 changed files with 38 additions and 1 deletions

View File

@ -0,0 +1,28 @@
From 9432f629e66e4f9500f6335eab3ad427f84523b2 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Thu, 20 Jul 2017 10:31:47 -0700
Subject: [PATCH] Link libnetsnmptrapd against MYSQL_LIBS
When building with MySQL (MariaDB) support, this library must
be linked against the MySQL client library, or else it will
have unresolved symbols.
---
apps/Makefile.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apps/Makefile.in b/apps/Makefile.in
index 77404dd89..7da434522 100644
--- a/apps/Makefile.in
+++ b/apps/Makefile.in
@@ -204,7 +204,7 @@ snmpdf$(EXEEXT): snmpdf.$(OSUFFIX) $(USELIBS)
$(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:
--
2.13.0

View File

@ -11,7 +11,7 @@
Summary: A collection of SNMP protocol tools and libraries
Name: net-snmp
Version: 5.7.3
Release: 13%{?dist}
Release: 15%{?dist}
Epoch: 1
License: BSD
@ -51,6 +51,8 @@ Patch14: net-snmp-5.7.3-Remove-U64-typedef.patch
Patch15: net-snmp-5.7.3-Fix-Makefile-PL.patch
# Use strtok_r for strtok to avoid a race condition
Patch16: net-snmp-5.7.3-strtok-r.patch
# Fix perl issue with use NetSNMP::TrapReceiver (add link to libmysqlclient.so)
Patch17: net-snmp-5.7.3-mysqllib.patch
Requires(post): chkconfig
Requires(preun): chkconfig
@ -224,6 +226,7 @@ cp %{SOURCE12} .
%patch14 -p1 -b .U64
%patch15 -p1 -b .make
%patch16 -p1 -b .strtok-r
%patch17 -p1 -b .mysqllib
%ifarch sparc64 s390 s390x
# disable failing test - see https://bugzilla.redhat.com/show_bug.cgi?id=680697
@ -531,6 +534,12 @@ rm -rf ${RPM_BUILD_ROOT}
%endif
%changelog
* Wed Jul 26 2017 Josef Ridky <jridky@redhat.com> - 1:5.7.3-15
- Update mysqllib patch to upstream reported version (#1470004)
* Thu Jul 13 2017 Josef Ridky <jridky@redhat.com> - 1:5.7.3-14
- Fix perl issue with use NetSNMP::TrapReceiver (add link to libmysqlclient.so) (#1470004)
* Fri Aug 12 2016 Josef Ridky <jridky@redhat.com> - 1:5.7.3-13
- net-snmp.redhat.conf: update default configuration to conform to the best practices (#1359123)
- nmp_transport.c: use strtok_r for strtok to avoid a race condition (#1366282)