- fix overly verbose log message (#221911)

- few minor tweaks for review - still not perfect
- fix linking with lcrypto (#231805)
This commit is contained in:
Radek Vokál 2007-03-12 14:51:44 +00:00
parent d01073d408
commit 7ed4671185
2 changed files with 22 additions and 2 deletions

View File

@ -0,0 +1,13 @@
--- net-snmp-5.4/agent/mibgroup/if-mib/ifTable/ifTable_data_access.c.old 2006-10-19 22:38:00.000000000 +0200
+++ net-snmp-5.4/agent/mibgroup/if-mib/ifTable/ifTable_data_access.c 2007-03-12 15:47:16.000000000 +0100
@@ -204,8 +204,8 @@
DEBUGMSGTL(("ifTable:access", "updating existing entry\n"));
#ifdef USING_IF_MIB_IFXTABLE_IFXTABLE_MODULE
- netsnmp_assert(strcmp(rowreq_ctx->data.ifName,
- ifentry->name) == 0);
+ int rc = strcmp(rowreq_ctx->data.ifName,ifentry->name);
+ netsnmp_assert(rc == 0);
#endif
/*
* if the interface was missing, but came back, clear the

View File

@ -37,6 +37,7 @@ Patch12: net-snmp-5.4-tcpConn-tcp6-fopen.patch
Patch13: net-snmp-5.4-ethtool-config.patch
Patch14: net-snmp-5.4-free.patch
Patch15: net-snmp-5.4-strange_libpath.patch
Patch16: net-snmp-5.4-snmpassert.patch
Requires(pre): /sbin/chkconfig
Requires(post): /sbin/chkconfig
@ -152,6 +153,7 @@ and applications.
%patch13 -p1 -b .ethtool-config
%patch14 -p1 -b .free
%patch15 -p1 -b .strange_libpath
%patch16 -p1 -b .verboselog
# Do this patch with a perl hack...
perl -pi -e "s|'\\\$install_libdir'|'%{_libdir}'|" ltmain.sh
@ -163,8 +165,8 @@ export LDFLAGS="-L%{_libdir}"
export LIBDIR="%{_libdir}"
%configure \
--enable-static --enable-shared \
--with-cflags="$RPM_OPT_FLAGS -lcrypto" \
--with-ldflags="$LDFLAGS" \
--with-cflags="$RPM_OPT_FLAGS" \
--with-ldflags="$LDFLAGS -lcrypto" \
--with-sys-location="Unknown" \
--with-logfile="/var/log/snmpd.log" \
--with-persistent-directory="/var/net-snmp" \
@ -356,6 +358,11 @@ rm -rf ${RPM_BUILD_ROOT}
%{_libdir}/lib*.so.*
%changelog
* Mon Mar 12 2007 Radek Vokál <rvokal@redhat.com> - 1:5.4-13
- fix overly verbose log message (#221911)
- few minor tweaks for review - still not perfect
- fix linking with lcrypto (#231805)
* Fri Mar 9 2007 Radek Vokál <rvokal@redhat.com> - 5.4-12
- lm_sensors-devel only where avaliable